From 01555b1da1bb0fb289b1c971a046b315c751c861 Mon Sep 17 00:00:00 2001
From: Oliver Schneider <git-no-reply-9879165716479413131@oli-obk.de>
Date: Sun, 17 Sep 2017 21:45:54 +0200
Subject: [PATCH] Rebase fallout

---
 src/bootstrap/check.rs | 2 ++
 src/bootstrap/tool.rs  | 1 +
 2 files changed, 3 insertions(+)

diff --git a/src/bootstrap/check.rs b/src/bootstrap/check.rs
index 78ec2579c4aa7..95ac2be5423c6 100644
--- a/src/bootstrap/check.rs
+++ b/src/bootstrap/check.rs
@@ -298,6 +298,8 @@ impl Step for Rustfmt {
         try_run(build, &mut cargo);
     }
 }
+
+#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
 pub struct Miri {
     host: Interned<String>,
 }
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
index 4e422473b9ad4..1617351af4cf1 100644
--- a/src/bootstrap/tool.rs
+++ b/src/bootstrap/tool.rs
@@ -484,6 +484,7 @@ impl Step for Rustfmt {
             tool: "rustfmt",
             mode: Mode::Librustc,
             path: "src/tools/rustfmt",
+            expectation: BuildExpectation::None,
         })
     }
 }