Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-29 10:10:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update rustc to 3/6 nightly.

Browse source
This commit is contained in:
Josh Matthews 2022-03-06 18:04:42 -05:00
parent ecb4f4225a
commit af5a17f94b
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/script_plugins/lib.rs
View file

@ -95,7 +95,7 @@ fn has_lint_attr(sym: &Symbols, attrs: &[Attribute], name: Symbol) -> bool {
fn is_unrooted_ty<'tcx>( fn is_unrooted_ty<'tcx>(
sym: &'_ Symbols, sym: &'_ Symbols,
cx: &LateContext<'tcx>, cx: &LateContext<'tcx>,
ty: &'tcx ty::TyS<'tcx>, ty: ty::Ty<'tcx>,
in_new_function: bool, in_new_function: bool,
) -> bool { ) -> bool {
let mut ret = false; 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); 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()) { 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| { cx.lint(UNROOTED_MUST_ROOT, |lint| {
lint.build("Type must be rooted").set_span(arg.span).emit() lint.build("Type must be rooted").set_span(arg.span).emit()
}) })

2
python/servo/build_commands.py
View file

@ -645,7 +645,7 @@ class MachCommands(CommandBase):
# https://internals.rust-lang.org/t/exploring-crate-graph-build-times-with-cargo-build-ztimings/10975 # 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`) # Prepend so that e.g. `-Ztimings` (which means `-Ztimings=info,html`)
# given on the command line can override it # given on the command line can override it
opts = ["-Ztimings=info"] + opts opts = ["--timings"] + opts
if very_verbose: if very_verbose:
print(["Calling", "cargo", "build"] + opts) print(["Calling", "cargo", "build"] + opts)

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2022-01-20 nightly-2022-03-06