Skip to content

Commit 82611a0

Browse files
borsbors
committed
Auto merge of #38232 - jseyfried:refactor_global_paths, r=nrc
Refactor global paths This PR removes the field `global: bool` from `ast::Path` and `hir::Path`, instead representing a global path `::foo::bar` as `{{root}}::foo::bar`, where `{{root}}` is a virtual keyword `keywords::CrateRoot`. Also, fixes #38016. r? @nrc
2 parents c8e7ec4 + 8a1acb2 commit 82611a0

File tree

28 files changed

+244
-258
lines changed

28 files changed

+244
-258
lines changed

‎src/librustc/hir/lowering.rs

Lines changed: 22 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ pub struct LoweringContext<'a> {
8181
}
8282

8383
pub trait Resolver {
84-
// Resolve a global hir path generated by the lowerer when expanding `for`, `if let`, etc.
84+
// Resolve a hir path generated by the lowerer when expanding `for`, `if let`, etc.
8585
fn resolve_hir_path(&mut self, path: &mut hir::Path, is_value: bool);
8686

8787
// Obtain the resolution for a node id
@@ -337,7 +337,6 @@ impl<'a> LoweringContext<'a> {
337337

338338
let proj_start = p.segments.len() - resolution.depth;
339339
let path = P(hir::Path {
340-
global: p.global,
341340
def: resolution.base_def,
342341
segments: p.segments[..proj_start].iter().enumerate().map(|(i, segment)| {
343342
let param_mode = match (qself_position, param_mode) {
@@ -404,12 +403,17 @@ impl<'a> LoweringContext<'a> {
404403
id: NodeId,
405404
p: &Path,
406405
name: Option<Name>,
407-
param_mode: ParamMode)
406+
param_mode: ParamMode,
407+
defaults_to_global: bool)
408408
-> hir::Path {
409+
let mut segments = p.segments.iter();
410+
if defaults_to_global && p.is_global() {
411+
segments.next();
412+
}
413+
409414
hir::Path {
410-
global: p.global,
411415
def: self.expect_full_def(id),
412-
segments: p.segments.iter().map(|segment| {
416+
segments: segments.map(|segment| {
413417
self.lower_path_segment(segment, param_mode)
414418
}).chain(name.map(|name| {
415419
hir::PathSegment {
@@ -424,9 +428,10 @@ impl<'a> LoweringContext<'a> {
424428
fn lower_path(&mut self,
425429
id: NodeId,
426430
p: &Path,
427-
param_mode: ParamMode)
431+
param_mode: ParamMode,
432+
defaults_to_global: bool)
428433
-> hir::Path {
429-
self.lower_path_extra(id, p, None, param_mode)
434+
self.lower_path_extra(id, p, None, param_mode, defaults_to_global)
430435
}
431436

432437
fn lower_path_segment(&mut self,
@@ -602,8 +607,8 @@ impl<'a> LoweringContext<'a> {
602607
// Check if the where clause type is a plain type parameter.
603608
match bound_pred.bounded_ty.node {
604609
TyKind::Path(None, ref path)
605-
if !path.global && path.segments.len() == 1 &&
606-
bound_pred.bound_lifetimes.is_empty() => {
610+
if path.segments.len() == 1 &&
611+
bound_pred.bound_lifetimes.is_empty() => {
607612
if let Some(Def::TyParam(def_id)) =
608613
self.resolver.get_resolution(bound_pred.bounded_ty.id)
609614
.map(|d| d.base_def) {
@@ -677,7 +682,7 @@ impl<'a> LoweringContext<'a> {
677682
span}) => {
678683
hir::WherePredicate::EqPredicate(hir::WhereEqPredicate {
679684
id: id,
680-
path: self.lower_path(id, path, ParamMode::Explicit),
685+
path: self.lower_path(id, path, ParamMode::Explicit, false),
681686
ty: self.lower_ty(ty),
682687
span: span,
683688
})
@@ -707,7 +712,7 @@ impl<'a> LoweringContext<'a> {
707712

708713
fn lower_trait_ref(&mut self, p: &TraitRef) -> hir::TraitRef {
709714
hir::TraitRef {
710-
path: self.lower_path(p.ref_id, &p.path, ParamMode::Explicit),
715+
path: self.lower_path(p.ref_id, &p.path, ParamMode::Explicit, false),
711716
ref_id: p.ref_id,
712717
}
713718
}
@@ -800,7 +805,7 @@ impl<'a> LoweringContext<'a> {
800805
};
801806

802807
let mut path = self.lower_path_extra(import.id, path, suffix,
803-
ParamMode::Explicit);
808+
ParamMode::Explicit, true);
804809
path.span = span;
805810
self.items.insert(import.id, hir::Item {
806811
id: import.id,
@@ -814,7 +819,7 @@ impl<'a> LoweringContext<'a> {
814819
path
815820
}
816821
};
817-
let path = P(self.lower_path(id, path, ParamMode::Explicit));
822+
let path = P(self.lower_path(id, path, ParamMode::Explicit, true));
818823
let kind = match view_path.node {
819824
ViewPathSimple(ident, _) => {
820825
*name = ident.name;
@@ -1135,7 +1140,6 @@ impl<'a> LoweringContext<'a> {
11351140
Some(def) => {
11361141
hir::PatKind::Path(hir::QPath::Resolved(None, P(hir::Path {
11371142
span: pth1.span,
1138-
global: false,
11391143
def: def,
11401144
segments: hir_vec![
11411145
hir::PathSegment::from_name(pth1.node.name)
@@ -1878,7 +1882,7 @@ impl<'a> LoweringContext<'a> {
18781882
Visibility::Crate(_) => hir::Visibility::Crate,
18791883
Visibility::Restricted { ref path, id } => {
18801884
hir::Visibility::Restricted {
1881-
path: P(self.lower_path(id, path, ParamMode::Explicit)),
1885+
path: P(self.lower_path(id, path, ParamMode::Explicit, true)),
18821886
id: id
18831887
}
18841888
}
@@ -1971,7 +1975,6 @@ impl<'a> LoweringContext<'a> {
19711975

19721976
let expr_path = hir::ExprPath(hir::QPath::Resolved(None, P(hir::Path {
19731977
span: span,
1974-
global: false,
19751978
def: def,
19761979
segments: hir_vec![hir::PathSegment::from_name(id)],
19771980
})));
@@ -2139,17 +2142,12 @@ impl<'a> LoweringContext<'a> {
21392142
/// `fld.cx.use_std`, and `::core::b::c::d` otherwise.
21402143
/// The path is also resolved according to `is_value`.
21412144
fn std_path(&mut self, span: Span, components: &[&str], is_value: bool) -> hir::Path {
2142-
let idents = self.crate_root.iter().chain(components);
2143-
2144-
let segments: Vec<_> = idents.map(|name| {
2145-
hir::PathSegment::from_name(Symbol::intern(name))
2146-
}).collect();
2147-
21482145
let mut path = hir::Path {
21492146
span: span,
2150-
global: true,
21512147
def: Def::Err,
2152-
segments: segments.into(),
2148+
segments: iter::once(keywords::CrateRoot.name()).chain({
2149+
self.crate_root.into_iter().chain(components.iter().cloned()).map(Symbol::intern)
2150+
}).map(hir::PathSegment::from_name).collect(),
21532151
};
21542152

21552153
self.resolver.resolve_hir_path(&mut path, is_value);

‎src/librustc/hir/mod.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,15 +105,18 @@ pub struct LifetimeDef {
105105
#[derive(Clone, PartialEq, Eq, RustcEncodable, RustcDecodable, Hash)]
106106
pub struct Path {
107107
pub span: Span,
108-
/// A `::foo` path, is relative to the crate root rather than current
109-
/// module (like paths in an import).
110-
pub global: bool,
111108
/// The definition that the path resolved to.
112109
pub def: Def,
113110
/// The segments in the path: the things separated by `::`.
114111
pub segments: HirVec<PathSegment>,
115112
}
116113

114+
impl Path {
115+
pub fn is_global(&self) -> bool {
116+
!self.segments.is_empty() && self.segments[0].name == keywords::CrateRoot.name()
117+
}
118+
}
119+
117120
impl fmt::Debug for Path {
118121
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
119122
write!(f, "path({})", print::path_to_string(self))

‎src/librustc/hir/print.rs

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1643,17 +1643,14 @@ impl<'a> State<'a> {
16431643
-> io::Result<()> {
16441644
self.maybe_print_comment(path.span.lo)?;
16451645

1646-
let mut first = !path.global;
1647-
for segment in &path.segments {
1648-
if first {
1649-
first = false
1650-
} else {
1646+
for (i, segment) in path.segments.iter().enumerate() {
1647+
if i > 0 {
16511648
word(&mut self.s, "::")?
16521649
}
1653-
1654-
self.print_name(segment.name)?;
1655-
1656-
self.print_path_parameters(&segment.parameters, colons_before_params)?;
1650+
if segment.name != keywords::CrateRoot.name() && segment.name != "$crate" {
1651+
self.print_name(segment.name)?;
1652+
self.print_path_parameters(&segment.parameters, colons_before_params)?;
1653+
}
16571654
}
16581655

16591656
Ok(())
@@ -1673,15 +1670,14 @@ impl<'a> State<'a> {
16731670
space(&mut self.s)?;
16741671
self.word_space("as")?;
16751672

1676-
let mut first = !path.global;
1677-
for segment in &path.segments[..path.segments.len() - 1] {
1678-
if first {
1679-
first = false
1680-
} else {
1673+
for (i, segment) in path.segments[..path.segments.len() - 1].iter().enumerate() {
1674+
if i > 0 {
16811675
word(&mut self.s, "::")?
16821676
}
1683-
self.print_name(segment.name)?;
1684-
self.print_path_parameters(&segment.parameters, colons_before_params)?;
1677+
if segment.name != keywords::CrateRoot.name() && segment.name != "$crate" {
1678+
self.print_name(segment.name)?;
1679+
self.print_path_parameters(&segment.parameters, colons_before_params)?;
1680+
}
16851681
}
16861682

16871683
word(&mut self.s, ">")?;

‎src/librustc/infer/error_reporting.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1620,7 +1620,6 @@ impl<'a, 'gcx, 'tcx> Rebuilder<'a, 'gcx, 'tcx> {
16201620
new_segs.push(new_seg);
16211621
hir::Path {
16221622
span: path.span,
1623-
global: path.global,
16241623
def: path.def,
16251624
segments: new_segs.into()
16261625
}

‎src/librustc_const_eval/_match.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,6 @@ impl Witness {
324324
let v = ctor.variant_for_adt(adt);
325325
let qpath = hir::QPath::Resolved(None, P(hir::Path {
326326
span: DUMMY_SP,
327-
global: false,
328327
def: Def::Err,
329328
segments: vec![hir::PathSegment::from_name(v.name)].into(),
330329
}));

‎src/librustc_incremental/calculate_svh/svh_visitor.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -189,7 +189,6 @@ enum SawAbiComponent<'a> {
189189
SawStructField,
190190
SawVariant,
191191
SawQPath,
192-
SawPath(bool),
193192
SawPathSegment,
194193
SawPathParameters,
195194
SawBlock,
@@ -678,7 +677,6 @@ impl<'a, 'hash, 'tcx> visit::Visitor<'tcx> for StrictVersionHashVisitor<'a, 'has
678677

679678
fn visit_path(&mut self, path: &'tcx Path, _: ast::NodeId) {
680679
debug!("visit_path: st={:?}", self.st);
681-
SawPath(path.global).hash(self.st);
682680
hash_span!(self, path.span);
683681
visit::walk_path(self, path)
684682
}

‎src/librustc_lint/bad_style.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ impl<'a, 'tcx> LateLintPass<'a, 'tcx> for NonUpperCaseGlobals {
382382
fn check_pat(&mut self, cx: &LateContext, p: &hir::Pat) {
383383
// Lint for constants that look like binding identifiers (#7526)
384384
if let PatKind::Path(hir::QPath::Resolved(None, ref path)) = p.node {
385-
if !path.global && path.segments.len() == 1 && path.segments[0].parameters.is_empty() {
385+
if path.segments.len() == 1 && path.segments[0].parameters.is_empty() {
386386
if let Def::Const(..) = path.def {
387387
NonUpperCaseGlobals::check_upper_case(cx,
388388
"constant in pattern",

‎src/librustc_passes/ast_validation.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,8 @@ impl<'a> Visitor<'a> for AstValidator<'a> {
154154
}
155155

156156
fn visit_path(&mut self, path: &'a Path, id: NodeId) {
157-
if path.global && path.segments.len() > 0 {
158-
let ident = path.segments[0].identifier;
157+
if path.segments.len() >= 2 && path.is_global() {
158+
let ident = path.segments[1].identifier;
159159
if token::Ident(ident).is_path_segment_keyword() {
160160
self.session.add_lint(lint::builtin::SUPER_OR_SELF_IN_GLOBAL_PATH,
161161
id,

‎src/librustc_resolve/build_reduced_graph.rs

Lines changed: 18 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ use syntax::ext::base::Determinacy::Undetermined;
4040
use syntax::ext::expand::mark_tts;
4141
use syntax::ext::hygiene::Mark;
4242
use syntax::ext::tt::macro_rules;
43+
use syntax::parse::token;
4344
use syntax::symbol::keywords;
4445
use syntax::visit::{self, Visitor};
4546

@@ -112,7 +113,7 @@ impl<'a> Resolver<'a> {
112113
// Extract and intern the module part of the path. For
113114
// globs and lists, the path is found directly in the AST;
114115
// for simple paths we have to munge the path a little.
115-
let module_path: Vec<_> = match view_path.node {
116+
let mut module_path: Vec<_> = match view_path.node {
116117
ViewPathSimple(_, ref full_path) => {
117118
full_path.segments
118119
.split_last()
@@ -132,6 +133,12 @@ impl<'a> Resolver<'a> {
132133
}
133134
};
134135

136+
// This can be removed once warning cycle #36888 is complete.
137+
if module_path.len() >= 2 && module_path[0].name == keywords::CrateRoot.name() &&
138+
token::Ident(module_path[1]).is_path_segment_keyword() {
139+
module_path.remove(0);
140+
}
141+
135142
// Build up the import directives.
136143
let is_prelude = attr::contains_name(&item.attrs, "prelude_import");
137144

@@ -193,18 +200,16 @@ impl<'a> Resolver<'a> {
193200
let rename = node.rename.unwrap_or(node.name);
194201
(module_path.clone(), node.name, rename)
195202
} else {
196-
let ident = match module_path.last() {
197-
Some(&ident) => ident,
198-
None => {
199-
resolve_error(
200-
self,
201-
source_item.span,
202-
ResolutionError::
203-
SelfImportOnlyInImportListWithNonEmptyPrefix
204-
);
205-
continue;
206-
}
207-
};
203+
let ident = *module_path.last().unwrap();
204+
if ident.name == keywords::CrateRoot.name() {
205+
resolve_error(
206+
self,
207+
source_item.span,
208+
ResolutionError::
209+
SelfImportOnlyInImportListWithNonEmptyPrefix
210+
);
211+
continue;
212+
}
208213
let module_path = module_path.split_last().unwrap().1;
209214
let rename = node.rename.unwrap_or(ident);
210215
(module_path.to_vec(), ident, rename)

0 commit comments

Comments
 (0)