bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

diagnostics: suggest changing s@self::{macro}@::macro for exported

Browse source 
Fixes #99695
This commit is contained in:
Michael Howell 2022-11-12 21:46:05 -07:00
parent 5ce39f42bd
commit e9d8d238ef
4 changed files with 78 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_resolve/src/diagnostics.rs
View file

@ -2125,9 +2125,31 @@ 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"
});
// Add the import to the start, with a `{` if required.
let start_point = source_map.start_point(after_crate_name);
if let Ok(start_snippet) = source_map.span_to_snippet(start_point) {
if is_definitely_crate && let Ok(start_snippet) = source_map.span_to_snippet(start_point) {
corrections.push((
start_point,
if has_nested {
@ -2139,6 +2161,12 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
format!("{{{}, {}", import_snippet, start_snippet)
},
));
} else {
// If the root import is module-relative, add the import separately
corrections.push((
source_map.start_point(import.use_span).shrink_to_lo(),
format!("use {module_name}::{import_snippet};\n"),
));
}
// Add a `};` to the end if nested, matching the `{` added at the start.