Skip to content

Commit df15e58

Browse files
committed
Auto merge of #111601 - matthiaskrgr:rollup-e5dguzb, r=matthiaskrgr
Rollup of 8 pull requests Successful merges: - #108291 (Fix more benchmark test with black_box) - #108356 (improve doc test for UnsafeCell::raw_get) - #110049 (Don't claim `LocalKey::with` prevents a reference to be sent across threads) - #111525 (Stop checking for the absence of something that doesn't exist) - #111538 (Make sure the build.rustc version is either the same or 1 apart) - #111578 (Move expansion of query macros in rustc_middle to rustc_middle::query) - #111584 (Number lexing tweaks) - #111587 (Custom MIR: Support `Rvalue::CopyForDeref`) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents 43399d6 + 46c8cc4 commit df15e58

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/bin/miri.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ use rustc_middle::{
2828
middle::exported_symbols::{
2929
ExportedSymbol, SymbolExportInfo, SymbolExportKind, SymbolExportLevel,
3030
},
31-
query::LocalCrate,
32-
ty::{query::ExternProviders, TyCtxt},
31+
query::{ExternProviders, LocalCrate},
32+
ty::TyCtxt,
3333
};
3434
use rustc_session::config::OptLevel;
3535

0 commit comments

Comments
 (0)