diff options
| author | bors <bors@rust-lang.org> | 2023-05-15 15:18:09 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-05-15 15:18:09 +0000 |
| commit | 63b2ee0fafdb0043cb302a6d2e138122fb2c52bd (patch) | |
| tree | d3f7fe85c1bf630cec573627d33a2ff835001989 /compiler/rustc_mir_transform/src/coverage/query.rs | |
| parent | 2913ad6db0f72fed5139253faed73200c7af3535 (diff) | |
| parent | eeebb6590aa39148f88e62d019798ccb9e11f6a5 (diff) | |
| download | rust-63b2ee0fafdb0043cb302a6d2e138122fb2c52bd.tar.gz rust-63b2ee0fafdb0043cb302a6d2e138122fb2c52bd.zip | |
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
Diffstat (limited to 'compiler/rustc_mir_transform/src/coverage/query.rs')
| -rw-r--r-- | compiler/rustc_mir_transform/src/coverage/query.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/rustc_mir_transform/src/coverage/query.rs b/compiler/rustc_mir_transform/src/coverage/query.rs index bf01b45eb40..74b4b4a07c5 100644 --- a/compiler/rustc_mir_transform/src/coverage/query.rs +++ b/compiler/rustc_mir_transform/src/coverage/query.rs @@ -2,7 +2,7 @@ use super::*; use rustc_middle::mir::coverage::*; use rustc_middle::mir::{self, Body, Coverage, CoverageInfo}; -use rustc_middle::ty::query::Providers; +use rustc_middle::query::Providers; use rustc_middle::ty::{self, TyCtxt}; use rustc_span::def_id::DefId; |