From 915695371ff79f7df437494790bcec378996adff Mon Sep 17 00:00:00 2001
From: Alexander Regueiro <alexreg@me.com>
Date: Thu, 3 May 2018 21:57:50 +0100
Subject: [PATCH 1/2] Minor fix to get build working

---
 miri/bin/miri.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/miri/bin/miri.rs b/miri/bin/miri.rs
index 6ba86c81e0..5491762c33 100644
--- a/miri/bin/miri.rs
+++ b/miri/bin/miri.rs
@@ -111,7 +111,7 @@ fn after_analysis<'a, 'tcx>(state: &mut CompileState<'a, 'tcx>) {
             fn visit_item(&mut self, i: &'hir hir::Item) {
                 if let hir::Item_::ItemFn(_, _, _, _, _, body_id) = i.node {
                     if i.attrs.iter().any(|attr| {
-                        attr.name().map_or(false, |n| n == "test")
+                        attr.name() == "test"
                     })
                     {
                         let did = self.0.hir.body_owner_def_id(body_id);

From 3d8c7a8dba7cab5d2d222cc08eaac648d6529b6a Mon Sep 17 00:00:00 2001
From: Alexander Regueiro <alexreg@me.com>
Date: Thu, 3 May 2018 23:29:13 +0100
Subject: [PATCH 2/2] Fixed build for latest nightly

---
 miri/fn_call.rs | 1 -
 miri/lib.rs     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/miri/fn_call.rs b/miri/fn_call.rs
index 51e5547de4..c763802bec 100644
--- a/miri/fn_call.rs
+++ b/miri/fn_call.rs
@@ -2,7 +2,6 @@ use rustc::ty::{self, Ty};
 use rustc::ty::layout::{self, Align, LayoutOf};
 use rustc::hir::def_id::{DefId, CRATE_DEF_INDEX};
 use rustc::mir;
-use rustc_target::spec::abi::Abi;
 use rustc_data_structures::indexed_vec::Idx;
 use rustc_target::spec::abi::Abi;
 use syntax::attr;
diff --git a/miri/lib.rs b/miri/lib.rs
index 9b18888451..8359f0ad7a 100644
--- a/miri/lib.rs
+++ b/miri/lib.rs
@@ -11,9 +11,8 @@ extern crate log;
 // From rustc.
 #[macro_use]
 extern crate rustc;
-extern crate rustc_mir;
-extern crate rustc_target;
 extern crate rustc_data_structures;
+extern crate rustc_mir;
 extern crate rustc_target;
 extern crate syntax;
 extern crate regex;