OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

review comments

This commit is contained in:
Esteban Küber 2020-06-17 16:29:03 -07:00
parent af45d8a5bb
commit 8d1a3801fa
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/librustc_resolve/build_reduced_graph.rs
View File

@ -485,7 +485,7 @@ impl<'a, 'b> BuildReducedGraphVisitor<'a, 'b> {
module_path.push(Segment { module_path.push(Segment {
ident: Ident { name: kw::PathRoot, span: source.ident.span }, ident: Ident { name: kw::PathRoot, span: source.ident.span },
id: Some(self.r.next_node_id()), id: Some(self.r.next_node_id()),
has_args: false, has_generic_args: false,
}); });
source.ident.name = crate_name; source.ident.name = crate_name;
} }

4
src/librustc_resolve/late/diagnostics.rs
View File

@ -920,7 +920,9 @@ impl<'a> LateResolutionVisitor<'a, '_, '_> {
path: &[Segment], path: &[Segment],
) -> Option<(Span, &'static str, String, Applicability)> { ) -> Option<(Span, &'static str, String, Applicability)> {
let (ident, span) = match path { let (ident, span) = match path {
[segment] if !segment.has_args => (segment.ident.to_string(), segment.ident.span), [segment] if !segment.has_generic_args => {
(segment.ident.to_string(), segment.ident.span)
}
_ => return None, _ => return None,
}; };
let mut iter = ident.chars().map(|c| c.is_uppercase()); let mut iter = ident.chars().map(|c| c.is_uppercase());

8
src/librustc_resolve/lib.rs
View File

@ -233,7 +233,7 @@ pub struct Segment {
id: Option<NodeId>, id: Option<NodeId>,
/// Signals whether this `PathSegment` has generic arguments. Used to avoid providing /// Signals whether this `PathSegment` has generic arguments. Used to avoid providing
/// nonsensical suggestions. /// nonsensical suggestions.
has_args: bool, has_generic_args: bool,
} }
impl Segment { impl Segment {
@ -242,7 +242,7 @@ impl Segment {
} }
fn from_ident(ident: Ident) -> Segment { fn from_ident(ident: Ident) -> Segment {
Segment { ident, id: None, has_args: false } Segment { ident, id: None, has_generic_args: false }
} }
fn names_to_string(segments: &[Segment]) -> String { fn names_to_string(segments: &[Segment]) -> String {
@ -252,7 +252,7 @@ impl Segment {
impl<'a> From<&'a ast::PathSegment> for Segment { impl<'a> From<&'a ast::PathSegment> for Segment {
fn from(seg: &'a ast::PathSegment) -> Segment { fn from(seg: &'a ast::PathSegment) -> Segment {
Segment { ident: seg.ident, id: Some(seg.id), has_args: seg.args.is_some() } Segment { ident: seg.ident, id: Some(seg.id), has_generic_args: seg.args.is_some() }
} }
} }
@ -2019,7 +2019,7 @@ impl<'a> Resolver<'a> {
path, opt_ns, record_used, path_span, crate_lint, path, opt_ns, record_used, path_span, crate_lint,
); );
for (i, &Segment { ident, id, has_args: _ }) in path.iter().enumerate() { for (i, &Segment { ident, id, has_generic_args: _ }) in path.iter().enumerate() {
debug!("resolve_path ident {} {:?} {:?}", i, ident, id); debug!("resolve_path ident {} {:?} {:?}", i, ident, id);
let record_segment_res = |this: &mut Self, res| { let record_segment_res = |this: &mut Self, res| {
if record_used { if record_used {