Skip to content

Commit af5a17f

Browse files
committed
Update rustc to 3/6 nightly.
1 parent ecb4f42 commit af5a17f

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

components/script_plugins/lib.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ fn has_lint_attr(sym: &Symbols, attrs: &[Attribute], name: Symbol) -> bool {
9595
fn is_unrooted_ty<'tcx>(
9696
sym: &'_ Symbols,
9797
cx: &LateContext<'tcx>,
98-
ty: &'tcx ty::TyS<'tcx>,
98+
ty: ty::Ty<'tcx>,
9999
in_new_function: bool,
100100
) -> bool {
101101
let mut ret = false;
@@ -279,7 +279,7 @@ impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
279279
let sig = cx.tcx.type_of(def_id).fn_sig(cx.tcx);
280280

281281
for (arg, ty) in decl.inputs.iter().zip(sig.inputs().skip_binder().iter()) {
282-
if is_unrooted_ty(&self.symbols, cx, ty, false) {
282+
if is_unrooted_ty(&self.symbols, cx, *ty, false) {
283283
cx.lint(UNROOTED_MUST_ROOT, |lint| {
284284
lint.build("Type must be rooted").set_span(arg.span).emit()
285285
})

python/servo/build_commands.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ def build(self, release=False, dev=False, jobs=None, params=None, media_stack=No
645645
# https://internals.rust-lang.org/t/exploring-crate-graph-build-times-with-cargo-build-ztimings/10975
646646
# Prepend so that e.g. `-Ztimings` (which means `-Ztimings=info,html`)
647647
# given on the command line can override it
648-
opts = ["-Ztimings=info"] + opts
648+
opts = ["--timings"] + opts
649649

650650
if very_verbose:
651651
print(["Calling", "cargo", "build"] + opts)

rust-toolchain

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
nightly-2022-01-20
1+
nightly-2022-03-06

0 commit comments

Comments
 (0)