From 687c5d13ea09aceaa79b4eb1b854791ad0f27b89 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 18 Mar 2019 13:30:57 +0100 Subject: [PATCH 1/3] bump Rust; remove stabilized feature --- rust-version | 2 +- src/lib.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rust-version b/rust-version index 7abca8ef4694..0979a384dd32 100644 --- a/rust-version +++ b/rust-version @@ -1 +1 @@ -nightly-2019-03-11 +nightly-2019-03-18 diff --git a/src/lib.rs b/src/lib.rs index cf6a885c605c..ee739a5435ac 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -1,4 +1,4 @@ -#![feature(rustc_private, range_contains)] +#![feature(rustc_private)] #![allow(clippy::cast_lossless)] From 8ee67994cc2ef98efb3f820a8f7012d24812cc06 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Mon, 18 Mar 2019 13:48:37 +0100 Subject: [PATCH 2/3] fix for rustc change --- src/bin/miri-rustc-tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs index 43bf466c70ee..f1f1e1a7c6be 100644 --- a/src/bin/miri-rustc-tests.rs +++ b/src/bin/miri-rustc-tests.rs @@ -47,7 +47,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls { impl<'a, 'tcx: 'a, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'a, 'tcx> { fn visit_item(&mut self, i: &'hir hir::Item) { if let hir::ItemKind::Fn(.., body_id) = i.node { - if i.attrs.iter().any(|attr| attr.name() == "test") { + if i.attrs.iter().any(|attr| attr.ident_str() == Some("test")) { let config = MiriConfig { validate: true, args: vec![] }; let did = self.0.hir().body_owner_def_id(body_id); println!("running test: {}", self.0.def_path_debug_str(did)); From 5d3825fc4800a04ded444ba442d5080abe7c4c38 Mon Sep 17 00:00:00 2001 From: Oliver Scherer Date: Mon, 18 Mar 2019 15:08:36 +0100 Subject: [PATCH 3/3] Update src/bin/miri-rustc-tests.rs Co-Authored-By: RalfJung --- src/bin/miri-rustc-tests.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs index f1f1e1a7c6be..e54be4644f25 100644 --- a/src/bin/miri-rustc-tests.rs +++ b/src/bin/miri-rustc-tests.rs @@ -47,7 +47,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls { impl<'a, 'tcx: 'a, 'hir> itemlikevisit::ItemLikeVisitor<'hir> for Visitor<'a, 'tcx> { fn visit_item(&mut self, i: &'hir hir::Item) { if let hir::ItemKind::Fn(.., body_id) = i.node { - if i.attrs.iter().any(|attr| attr.ident_str() == Some("test")) { + if i.attrs.iter().any(|attr| attr.check_name("test")) { let config = MiriConfig { validate: true, args: vec![] }; let did = self.0.hir().body_owner_def_id(body_id); println!("running test: {}", self.0.def_path_debug_str(did));