Auto merge of #1327 - RalfJung:rustup, r=RalfJung

rustup
rust-lang · Apr 12, 2020 · 4545eff · 4545eff
2 parents 85dff8b + 91d7964
commit 4545eff
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-0c835b0cca83fe21090562603e4bda77c183ace3
+4d1fbaccb822b6d52dc786589de7918d3c5effb1
diff --git a/src/bin/miri-rustc-tests.rs b/src/bin/miri-rustc-tests.rs
@@ -41,7 +41,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
                                 .any(|attr| attr.check_name(rustc_span::symbol::sym::test))
                             {
                                 let config = miri::MiriConfig::default();
-                                let did = self.0.hir().body_owner_def_id(body_id);
+                                let did = self.0.hir().body_owner_def_id(body_id).to_def_id();
                                 println!("running test: {}", self.0.def_path_debug_str(did));
                                 miri::eval_main(self.0, did, config);
                                 self.0.sess.abort_if_errors();