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

Tweak wording

Browse source
This commit is contained in:
Esteban Kuber 2022-05-03 02:07:47 +00:00
parent 57967269e9
commit 4934a9e643
10 changed files with 32 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2484,15 +2484,14 @@ fn show_candidates(
("one of these", "items", String::new())
};
let tail = if path.len() > 1 { "..." } else { "" };
let instead = if let Instead::Yes = instead { " instead" } else { "" };
let mut msg = if let IsPattern::Yes = is_pattern {
format!(
"if you meant to match on {}{}{}, use the full path in the pattern{}",
kind, instead, name, tail
"if you meant to match on {}{}{}, use the full path in the pattern",
kind, instead, name
)
} else {
format!("consider importing {} {}{}{}", determiner, kind, instead, tail)
format!("consider importing {} {}{}", determiner, kind, instead)
};
for note in accessible_path_strings.iter().flat_map(|cand| cand.3.as_ref()) {
@ -2523,7 +2522,7 @@ fn show_candidates(
if let [first, .., last] = &path[..] {
err.span_suggestion_verbose(
first.ident.span.until(last.ident.span),
"...and refer to it directly",
&format!("if you import `{}`, refer to it directly", last.ident),
String::new(),
Applicability::Unspecified,
);