diff --git a/components/script_plugins/lib.rs b/components/script_plugins/lib.rs index b544b95ca1a..ba8475212f8 100644 --- a/components/script_plugins/lib.rs +++ b/components/script_plugins/lib.rs @@ -95,7 +95,7 @@ fn has_lint_attr(sym: &Symbols, attrs: &[Attribute], name: Symbol) -> bool { fn is_unrooted_ty<'tcx>( sym: &'_ Symbols, cx: &LateContext<'tcx>, - ty: &'tcx ty::TyS<'tcx>, + ty: ty::Ty<'tcx>, in_new_function: bool, ) -> bool { let mut ret = false; @@ -279,7 +279,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass { let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx); for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) { - if is_unrooted_ty(&self.symbols, cx, ty, false) { + if is_unrooted_ty(&self.symbols, cx, *ty, false) { cx.lint(UNROOTED_MUST_ROOT, |lint| { lint.build("Type must be rooted").set_span(arg.span).emit() }) diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 976e39c6b47..a3875e2c679 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -645,7 +645,7 @@ class MachCommands(CommandBase): # https://internals.rust-lang.org/t/exploring-crate-graph-build-times-with-cargo-build-ztimings/10975 # Prepend so that e.g. `-Ztimings` (which means `-Ztimings=info,html`) # given on the command line can override it - opts = ["-Ztimings=info"] + opts + opts = ["--timings"] + opts if very_verbose: print(["Calling", "cargo", "build"] + opts) diff --git a/rust-toolchain b/rust-toolchain index 3fe568ef809..d9207092a56 100644 --- a/rust-toolchain +++ b/rust-toolchain @@ -1 +1 @@ -nightly-2022-01-20 +nightly-2022-03-06