Auto merge of #1903 - bjorn3:rustup, r=oli-obk

rustup Rustup for rust-lang/rust#85830
rust-lang · Oct 26, 2021 · 04e5c78 · 04e5c78
2 parents 084c660 + 9944a2d
commit 04e5c78
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/rust-version b/rust-version
@@ -1 +1 @@
-e015ef5b2633960e7653b744d7a1c3d1d336313a
+c7a30c8b6860d1f3459086f7a91074db1b54bc37
diff --git a/src/bin/miri.rs b/src/bin/miri.rs
@@ -25,7 +25,7 @@ use rustc_hir::{self as hir, def_id::LOCAL_CRATE, Node};
 use rustc_interface::interface::Config;
 use rustc_middle::{
     middle::exported_symbols::{ExportedSymbol, SymbolExportLevel},
-    ty::{query::Providers, TyCtxt},
+    ty::{query::ExternProviders, TyCtxt},
 };
 use rustc_session::{config::ErrorOutputType, search_paths::PathKind, CtfeBacktrace};
 
@@ -37,7 +37,7 @@ impl rustc_driver::Callbacks for MiriCompilerCalls {
     fn config(&mut self, config: &mut Config) {
         config.override_queries = Some(|_, _, external_providers| {
             external_providers.used_crate_source = |tcx, cnum| {
-                let mut providers = Providers::default();
+                let mut providers = ExternProviders::default();
                 rustc_metadata::provide_extern(&mut providers);
                 let mut crate_source = (providers.used_crate_source)(tcx, cnum);
                 // HACK: rustc will emit "crate ... required to be available in rlib format, but