Skip to content

Commit a1c2d8f

Browse files
committed
Auto merge of #151107 - JonathanBrouwer:rollup-9CIxxuZ, r=JonathanBrouwer
Rollup of 11 pull requests Successful merges: - rust-lang/rust#149408 (refactor: remove Ord bound from BinaryHeap::new etc) - rust-lang/rust#150406 (Change some `matches!(.., .. if ..)` with let-chains) - rust-lang/rust#150723 (std: move `errno` and related functions into `sys::io`) - rust-lang/rust#150877 (resolve: Refactor away the side table `decl_parent_modules`) - rust-lang/rust#150902 (Update to_uppercase docs to avoid ß->SS example) - rust-lang/rust#151034 (std: Change UEFI env vars to volatile storage) - rust-lang/rust#151036 (Better handle when trying to iterate on a `Range` of a type that isn't `Step`) - rust-lang/rust#151067 (Avoid should-fail in two ui tests and a codegen-llvm test) - rust-lang/rust#151072 (also handle ENOTTY ioctl errors when checking pidfd -> pid support) - rust-lang/rust#151077 (Recognize potential `impl<const N: usize>` to `impl<N>` mistake) - rust-lang/rust#151096 (Remove `Deref`/`DerefMut` impl for `Providers`.) Failed merges: - rust-lang/rust#150939 (resolve: Relax some asserts in glob overwriting and add tests) r? @ghost
2 parents c451663 + a4c47d1 commit a1c2d8f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

src/bin/miri.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ impl rustc_driver::Callbacks for MiriDepCompilerCalls {
305305
config.override_queries = Some(|_, local_providers| {
306306
// We need to add #[used] symbols to exported_symbols for `lookup_link_section`.
307307
// FIXME handle this somehow in rustc itself to avoid this hack.
308-
local_providers.exported_non_generic_symbols = |tcx, LocalCrate| {
308+
local_providers.queries.exported_non_generic_symbols = |tcx, LocalCrate| {
309309
let reachable_set = tcx
310310
.with_stable_hashing_context(|hcx| tcx.reachable_set(()).to_sorted(&hcx, true));
311311
tcx.arena.alloc_from_iter(

0 commit comments

Comments
 (0)