nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 23:04:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

review comment

Browse Source
This commit is contained in:
Michael Goulet 2023-01-09 18:07:34 +00:00
parent 050bc95ce2
commit 1d66a675bb
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -161,7 +161,7 @@ impl<'a> Resolver<'a> {
found_use,
DiagnosticMode::Normal,
path,
None,
"",
);
err.emit();
} else if let Some((span, msg, sugg, appl)) = suggestion {
@ -691,7 +691,7 @@ impl<'a> Resolver<'a> {
FoundUse::Yes,
DiagnosticMode::Pattern,
vec![],
None,
"",
);
}
err
@ -1346,7 +1346,7 @@ impl<'a> Resolver<'a> {
FoundUse::Yes,
DiagnosticMode::Normal,
vec![],
None,
"",
);
if macro_kind == MacroKind::Derive && (ident.name == sym::Send || ident.name == sym::Sync) {
@ -2328,7 +2328,7 @@ pub(crate) fn import_candidates(
use_placement_span: Option<Span>,
candidates: &[ImportSuggestion],
mode: DiagnosticMode,
append: Option<&str>,
append: &str,
) {
show_candidates(
session,
@ -2358,12 +2358,11 @@ fn show_candidates(
found_use: FoundUse,
mode: DiagnosticMode,
path: Vec<Segment>,
append: Option<&str>,
append: &str,
) {
if candidates.is_empty() {
return;
}
let append = append.unwrap_or("");
let mut accessible_path_strings: Vec<(String, &str, Option<DefId>, &Option<String>)> =
Vec::new();

10
compiler/rustc_resolve/src/imports.rs
View File

@ -554,7 +554,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
Some(err.span),
&candidates,
DiagnosticMode::Import,
(source != target).then(|| format!(" as {target}")).as_deref(),
(source != target)
.then(|| format!(" as {target}"))
.as_deref()
.unwrap_or(""),
),
ImportKind::Single { nested: true, source, target, .. } => {
import_candidates(
@ -564,7 +567,10 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
None,
&candidates,
DiagnosticMode::Normal,
(source != target).then(|| format!(" as {target}")).as_deref(),
(source != target)
.then(|| format!(" as {target}"))
.as_deref()
.unwrap_or(""),
);
}
_ => {}