diff options
| author | bors <bors@rust-lang.org> | 2024-04-12 04:16:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-04-12 04:16:12 +0000 |
| commit | 6475796a813f2153d3bfc92c6089ed0f0c1c5b46 (patch) | |
| tree | 66b7bc80390e86b2381d299fef14b762aa23cc07 /compiler/rustc_query_impl/src/lib.rs | |
| parent | 46961d24071fdc43252d5d54e1e866040a256923 (diff) | |
| parent | 2679ea09fef39a3e01728208ae8059fbfd9de8fd (diff) | |
| download | rust-6475796a813f2153d3bfc92c6089ed0f0c1c5b46.tar.gz rust-6475796a813f2153d3bfc92c6089ed0f0c1c5b46.zip | |
Auto merge of #123838 - matthiaskrgr:rollup-zkgwyye, r=matthiaskrgr
Rollup of 7 pull requests Successful merges: - #123599 (remove some things that do not need to be) - #123763 (Set the host library path in run-make v2) - #123775 (Make `PlaceRef` and `OperandValue::Ref` share a common `PlaceValue` type) - #123789 (move QueryKeyStringCache from rustc_middle to rustc_query_impl, where it actually used) - #123826 (Move rare overflow error to a cold function) - #123827 (linker: Avoid some allocations in search directory iteration) - #123829 (Fix revisions syntax in cfg(ub_checks) test) r? `@ghost` `@rustbot` modify labels: rollup
Diffstat (limited to 'compiler/rustc_query_impl/src/lib.rs')
| -rw-r--r-- | compiler/rustc_query_impl/src/lib.rs | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/compiler/rustc_query_impl/src/lib.rs b/compiler/rustc_query_impl/src/lib.rs index 52767155532..3373835d813 100644 --- a/compiler/rustc_query_impl/src/lib.rs +++ b/compiler/rustc_query_impl/src/lib.rs @@ -13,6 +13,7 @@ extern crate rustc_middle; use crate::plumbing::{__rust_begin_short_backtrace, encode_all_query_results, try_mark_green}; +use crate::profiling_support::QueryKeyStringCache; use field_offset::offset_of; use rustc_data_structures::stable_hasher::HashStable; use rustc_data_structures::sync::AtomicU64; @@ -21,9 +22,7 @@ use rustc_middle::dep_graph::DepNodeIndex; use rustc_middle::dep_graph::{self, DepKind, DepKindStruct}; use rustc_middle::query::erase::{erase, restore, Erase}; use rustc_middle::query::on_disk_cache::{CacheEncoder, EncodedDepNodeIndex, OnDiskCache}; -use rustc_middle::query::plumbing::{ - DynamicQuery, QueryKeyStringCache, QuerySystem, QuerySystemFns, -}; +use rustc_middle::query::plumbing::{DynamicQuery, QuerySystem, QuerySystemFns}; use rustc_middle::query::AsLocalKey; use rustc_middle::query::{ queries, DynamicQueries, ExternProviders, Providers, QueryCaches, QueryEngine, QueryStates, |
