nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-25 16:24:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

diagnostics: use module_path to check crate import instead of strings

Browse Source
This commit is contained in:
Michael Howell 2022-12-06 08:42:30 -07:00
parent e237690a28
commit dca160a06a
1 changed files with 4 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
compiler/rustc_resolve/src/diagnostics.rs
View File

@ -2126,26 +2126,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
let source_map = self.r.session.source_map();
// Make sure this is actually crate-relative.
let use_and_crate = import.use_span.with_hi(after_crate_name.lo());
let is_definitely_crate =
source_map.span_to_snippet(use_and_crate).map_or(false, |s| {
let mut s = s.trim();
debug!("check_for_module_export_macro: s={s:?}",);
s = s
.split_whitespace()
.rev()
.next()
.expect("split_whitespace always yields at least once");
debug!("check_for_module_export_macro: s={s:?}",);
if s.ends_with("::") {
s = &s[..s.len() - 2];
} else {
return false;
}
s = s.trim();
debug!("check_for_module_export_macro: s={s:?}",);
s != "self" && s != "super"
});
let is_definitely_crate = import
.module_path
.first()
.map_or(false, |f| f.ident.name != kw::SelfLower && f.ident.name != kw::Super);
// Add the import to the start, with a `{` if required.
let start_point = source_map.start_point(after_crate_name);