Merge pull request #410 from RalfJung/rustup

fix for latest rust nightly
rust-lang · Jul 17, 2018 · 911aedf · 911aedf
2 parents f18fc27 + 72756b7
commit 911aedf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 22 deletions.
diff --git a/rustc_tests/Cargo.lock b/rustc_tests/Cargo.lock
diff --git a/rustc_tests/src/main.rs b/rustc_tests/src/main.rs
@@ -90,7 +90,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
         struct Visitor<'a, 'tcx: 'a>(TyCtxt<'a, 'tcx, 'tcx>, &'a CompileState<'a, 'tcx>);
         impl<'a, 'tcx: 'a, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'a, 'tcx> {
             fn visit_item(&mut self, i: &'hir hir::Item) {
-                if let hir::Item_::ItemFn(.., body_id) = i.node {
+                if let hir::ItemKind::Fn(.., body_id) = i.node {
                     if i.attrs.iter().any(|attr| attr.name() == "test") {
                         let did = self.0.hir.body_owner_def_id(body_id);
                         println!("running test: {}", self.0.def_path_debug_str(did));

diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -112,7 +112,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>, use_start_fn: bo
         );
         impl<'a, 'tcx: 'a, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'a, 'tcx> {
             fn visit_item(&mut self, i: &'hir hir::Item) {
-                if let hir::Item_::ItemFn(.., body_id) = i.node {
+                if let hir::ItemKind::Fn(.., body_id) = i.node {
                     if i.attrs.iter().any(|attr| {
                         attr.name() == "test"
                     })