Rebase fallout

Author: oli-obk

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>,
 }

src/bootstrap/tool.rs

@@ -484,6 +484,7 @@ impl Step for Rustfmt {
             tool: "rustfmt",
             mode: Mode::Librustc,
             path: "src/tools/rustfmt",
+            expectation: BuildExpectation::None,
         })
     }
 }