Skip to content

Commit

Permalink
Update to 7/6 rustc.
Browse files Browse the repository at this point in the history
  • Loading branch information
jdm committed Jul 6, 2020
1 parent 745eb88 commit 6843d51
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 8 deletions.
1 change: 0 additions & 1 deletion components/compositing/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
* file, You can obtain one at https://mozilla.org/MPL/2.0/. */

#![deny(unsafe_code)]
#![feature(track_caller)]

#[macro_use]
extern crate log;
Expand Down
12 changes: 6 additions & 6 deletions components/script_plugins/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
/// 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) {
return;
}
Expand Down Expand Up @@ -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
fn check_fn(
&mut self,
cx: &LateContext<'a, 'tcx>,
cx: &LateContext<'tcx>,
kind: visit::FnKind<'tcx>,
decl: &'tcx hir::FnDecl,
body: &'tcx hir::Body,
Expand Down Expand Up @@ -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,
cx: &'a LateContext<'b, 'tcx>,
cx: &'a LateContext<'tcx>,
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>;

fn visit_expr(&mut self, expr: &'tcx hir::Expr) {
Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2020-06-30
nightly-2020-07-06

0 comments on commit 6843d51

Please sign in to comment.