Skip to content

Commit 8d1a380

Browse files
committed
review comments
1 parent af45d8a commit 8d1a380

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

src/librustc_resolve/build_reduced_graph.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -485,7 +485,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
485485
module_path.push(Segment {
486486
ident: Ident { name: kw::PathRoot, span: source.ident.span },
487487
id: Some(self.r.next_node_id()),
488-
has_args: false,
488+
has_generic_args: false,
489489
});
490490
source.ident.name = crate_name;
491491
}

src/librustc_resolve/late/diagnostics.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -920,7 +920,9 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
920920
path: &[Segment],
921921
) -> Option<(Span, &'static str, String, Applicability)> {
922922
let (ident, span) = match path {
923-
[segment] if !segment.has_args => (segment.ident.to_string(), segment.ident.span),
923+
[segment] if !segment.has_generic_args => {
924+
(segment.ident.to_string(), segment.ident.span)
925+
}
924926
_ => return None,
925927
};
926928
let mut iter = ident.chars().map(|c| c.is_uppercase());

src/librustc_resolve/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ pub struct Segment {
233233
id: Option<NodeId>,
234234
/// Signals whether this `PathSegment` has generic arguments. Used to avoid providing
235235
/// nonsensical suggestions.
236-
has_args: bool,
236+
has_generic_args: bool,
237237
}
238238

239239
impl Segment {
@@ -242,7 +242,7 @@ impl Segment {
242242
}
243243

244244
fn from_ident(ident: Ident) -> Segment {
245-
Segment { ident, id: None, has_args: false }
245+
Segment { ident, id: None, has_generic_args: false }
246246
}
247247

248248
fn names_to_string(segments: &[Segment]) -> String {
@@ -252,7 +252,7 @@ impl Segment {
252252

253253
impl<'a> From<&'a ast::PathSegment> for Segment {
254254
fn from(seg: &'a ast::PathSegment) -> Segment {
255-
Segment { ident: seg.ident, id: Some(seg.id), has_args: seg.args.is_some() }
255+
Segment { ident: seg.ident, id: Some(seg.id), has_generic_args: seg.args.is_some() }
256256
}
257257
}
258258

@@ -2019,7 +2019,7 @@ impl<'a> Resolver<'a> {
20192019
path, opt_ns, record_used, path_span, crate_lint,
20202020
);
20212021

2022-
for (i, &Segment { ident, id, has_args: _ }) in path.iter().enumerate() {
2022+
for (i, &Segment { ident, id, has_generic_args: _ }) in path.iter().enumerate() {
20232023
debug!("resolve_path ident {} {:?} {:?}", i, ident, id);
20242024
let record_segment_res = |this: &mut Self, res| {
20252025
if record_used {

0 commit comments

Comments
 (0)