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_span/src | |
| 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_span/src')
| -rw-r--r-- | compiler/rustc_span/src/edit_distance.rs | 2 | ||||
| -rw-r--r-- | compiler/rustc_span/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/compiler/rustc_span/src/edit_distance.rs b/compiler/rustc_span/src/edit_distance.rs index 4f120db48f0..8a2baaa42e2 100644 --- a/compiler/rustc_span/src/edit_distance.rs +++ b/compiler/rustc_span/src/edit_distance.rs @@ -11,7 +11,7 @@ use std::{cmp, mem}; -use crate::symbol::Symbol; +use crate::Symbol; #[cfg(test)] mod tests; diff --git a/compiler/rustc_span/src/lib.rs b/compiler/rustc_span/src/lib.rs index 6e25de847fc..d5c2a337b4c 100644 --- a/compiler/rustc_span/src/lib.rs +++ b/compiler/rustc_span/src/lib.rs @@ -67,7 +67,7 @@ mod span_encoding; pub use span_encoding::{DUMMY_SP, Span}; pub mod symbol; -pub use symbol::{Symbol, sym}; +pub use symbol::{Ident, MacroRulesNormalizedIdent, Symbol, kw, sym}; mod analyze_source_file; pub mod fatal_error; |
