diff options
| author | bors <bors@rust-lang.org> | 2024-12-18 02:56:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2024-12-18 02:56:38 +0000 |
| commit | a89ca2c85e61d03c6e41be89508ed3d012f916f8 (patch) | |
| tree | 5101d43e44eb7dae8f58f17ced5b92a9584beb04 /compiler/rustc_middle/src/query/keys.rs | |
| parent | 52890e82153cd8716d97a96f47fb6ac99dec65be (diff) | |
| parent | 2620eb42d72d24baa1ca1056a769862b92c85f7f (diff) | |
| download | rust-a89ca2c85e61d03c6e41be89508ed3d012f916f8.tar.gz rust-a89ca2c85e61d03c6e41be89508ed3d012f916f8.zip | |
Auto merge of #134243 - nnethercote:re-export-more-rustc_span, r=jieyouxu
Re-export more `rustc_span::symbol` things from `rustc_span`.
`rustc_span::symbol` defines some things that are re-exported from `rustc_span`, such as `Symbol` and `sym`. But it doesn't re-export some closely related things such as `Ident` and `kw`. So you can do `use rustc_span::{Symbol, sym}` but you have to do `use rustc_span::symbol::{Ident, kw}`, which is inconsistent for no good reason.
This commit re-exports `Ident`, `kw`, and `MacroRulesNormalizedIdent`, and changes many `rustc_span::symbol::` qualifiers to `rustc_span::`. This is a 300+ net line of code reduction, mostly because many files with two `use rustc_span` items can be reduced to one.
r? `@jieyouxu`
Diffstat (limited to 'compiler/rustc_middle/src/query/keys.rs')
| -rw-r--r-- | compiler/rustc_middle/src/query/keys.rs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/compiler/rustc_middle/src/query/keys.rs b/compiler/rustc_middle/src/query/keys.rs index 66fec2dd0f7..e243425c0b7 100644 --- a/compiler/rustc_middle/src/query/keys.rs +++ b/compiler/rustc_middle/src/query/keys.rs @@ -4,8 +4,7 @@ use rustc_hir::def_id::{CrateNum, DefId, LOCAL_CRATE, LocalDefId, LocalModDefId, use rustc_hir::hir_id::{HirId, OwnerId}; use rustc_query_system::dep_graph::DepNodeIndex; use rustc_query_system::query::{DefIdCache, DefaultCache, SingleCache, VecCache}; -use rustc_span::symbol::{Ident, Symbol}; -use rustc_span::{DUMMY_SP, Span}; +use rustc_span::{DUMMY_SP, Ident, Span, Symbol}; use crate::infer::canonical::CanonicalQueryInput; use crate::mir::mono::CollectionMode; |
