From 91d7964513adb5aa29d1fa3f657555e110d54474 Mon Sep 17 00:00:00 2001
From: Ralf Jung <post@ralfj.de>
Date: Mon, 13 Apr 2020 00:41:39 +0200
Subject: [PATCH] rustup

---
 rust-version                | 2 +-
 src/bin/miri-rustc-tests.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rust-version b/rust-version
index 40c0005e0806..e051ed2ecc5c 100644
--- 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
index 97292cf1dbe5..bae7356eb72c 100644
--- 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();