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

Auto merge of #27179 - jdm:rustup, r=SimonSapin

Browse source 
Update to 7/6 rustc.
This commit is contained in:
bors-servo 2020-07-06 10:06:58 -04:00 • committed by GitHub
commit cf30457776
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

1
components/compositing/lib.rs
View file

@ -3,7 +3,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */ * file, You can obtain one at https://mozilla.org/MPL/2.0/. */
#![deny(unsafe_code)] #![deny(unsafe_code)]
#![feature(track_caller)]
#[macro_use] #[macro_use]
extern crate log; extern crate log;

12
components/script_plugins/lib.rs
View file

@ -202,10 +202,10 @@ impl LintPass for UnrootedPass {
} }
} }
impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass { impl<'tcx> LateLintPass<'tcx> for UnrootedPass {
/// All structs containing #[unrooted_must_root_lint::must_root] types /// All structs containing #[unrooted_must_root_lint::must_root] types
/// must be #[unrooted_must_root_lint::must_root] themselves /// must be #[unrooted_must_root_lint::must_root] themselves
fn check_item(&mut self, cx: &LateContext<'a, 'tcx>, item: &'tcx hir::Item) { fn check_item(&mut self, cx: &LateContext<'tcx>, item: &'tcx hir::Item) {
if has_lint_attr(&self.symbols, &item.attrs, self.symbols.must_root) { if has_lint_attr(&self.symbols, &item.attrs, self.symbols.must_root) {
return; return;
} }
@ -256,7 +256,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
/// Function arguments that are #[unrooted_must_root_lint::must_root] types are not allowed /// Function arguments that are #[unrooted_must_root_lint::must_root] types are not allowed
fn check_fn( fn check_fn(
&mut self, &mut self,
cx: &LateContext<'a, 'tcx>, cx: &LateContext<'tcx>,
kind: visit::FnKind<'tcx>, kind: visit::FnKind<'tcx>,
decl: &'tcx hir::FnDecl, decl: &'tcx hir::FnDecl,
body: &'tcx hir::Body, body: &'tcx hir::Body,
@ -302,13 +302,13 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for UnrootedPass {
} }
} }
struct FnDefVisitor<'a, 'b: 'a, 'tcx: 'a + 'b> { struct FnDefVisitor<'a, 'tcx: 'a> {
symbols: &'a Symbols, symbols: &'a Symbols,
cx: &'a LateContext<'b, 'tcx>, cx: &'a LateContext<'tcx>,
in_new_function: bool, in_new_function: bool,
} }
impl<'a, 'b, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'b, 'tcx> { impl<'a, 'tcx> visit::Visitor<'tcx> for FnDefVisitor<'a, 'tcx> {
type Map = rustc_middle::hir::map::Map<'tcx>; type Map = rustc_middle::hir::map::Map<'tcx>;
fn visit_expr(&mut self, expr: &'tcx hir::Expr) { fn visit_expr(&mut self, expr: &'tcx hir::Expr) {

2
rust-toolchain
View file

@ -1 +1 @@
nightly-2020-06-30 nightly-2020-07-06