From d4b98b221ddc74524e3c3824e28126b9965150bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Miku=C5=82a?= Date: Fri, 29 Jun 2018 12:52:04 +0200 Subject: [PATCH] Rusutp --- rustc_tests/src/main.rs | 2 +- src/bin/miri.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/rustc_tests/src/main.rs b/rustc_tests/src/main.rs index 3e2cd032a80e..64cd380970e4 100644 --- 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::Item_::ItemFn(.., 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 index 35e83d49125e..3001500d2e07 100644 --- a/src/bin/miri.rs +++ b/src/bin/miri.rs @@ -25,7 +25,7 @@ use std::path::PathBuf; struct MiriCompilerCalls { default: Box, /// Whether to begin interpretation at the start_fn lang item or not - /// + /// /// If false, the interpretation begins at the `main` function start_fn: bool, } @@ -115,7 +115,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::Item_::ItemFn(.., body_id) = i.node { if i.attrs.iter().any(|attr| { attr.name() == "test" })