bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

remove unused argument from throw_unresolved_import_error

Browse source
This commit is contained in:
Takayuki Maeda 2022-11-04 13:59:04 +09:00
parent 33b55ac39f
commit 97ddc6343a
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

22
compiler/rustc_resolve/src/imports.rs
View file

@ -450,7 +450,7 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
{ {
// In the case of a new import line, throw a diagnostic message // In the case of a new import line, throw a diagnostic message
// for the previous line. // for the previous line.
self.throw_unresolved_import_error(errors, None); self.throw_unresolved_import_error(errors);
errors = vec![]; errors = vec![];
} }
if seen_spans.insert(err.span) { if seen_spans.insert(err.span) {
@ -482,30 +482,22 @@ impl<'a, 'b> ImportResolver<'a, 'b> {
} }
if !errors.is_empty() { if !errors.is_empty() {
self.throw_unresolved_import_error(errors, None); self.throw_unresolved_import_error(errors);
} }
} }
fn throw_unresolved_import_error( fn throw_unresolved_import_error(&self, errors: Vec<(String, UnresolvedImportError)>) {
&self, if errors.is_empty() {
errors: Vec<(String, UnresolvedImportError)>, return;
span: Option<MultiSpan>, }
) {
/// Upper limit on the number of `span_label` messages. /// Upper limit on the number of `span_label` messages.
const MAX_LABEL_COUNT: usize = 10; const MAX_LABEL_COUNT: usize = 10;
let (span, msg) = if errors.is_empty() {
(span.unwrap(), "unresolved import".to_string())
} else {
let span = MultiSpan::from_spans(errors.iter().map(|(_, err)| err.span).collect()); let span = MultiSpan::from_spans(errors.iter().map(|(_, err)| err.span).collect());
let paths = errors.iter().map(|(path, _)| format!("`{}`", path)).collect::<Vec<_>>(); let paths = errors.iter().map(|(path, _)| format!("`{}`", path)).collect::<Vec<_>>();
let msg = format!("unresolved import{} {}", pluralize!(paths.len()), paths.join(", "),); let msg = format!("unresolved import{} {}", pluralize!(paths.len()), paths.join(", "),);
(span, msg)
};
let mut diag = struct_span_err!(self.r.session, span, E0432, "{}", &msg); let mut diag = struct_span_err!(self.r.session, span, E0432, "{}", &msg);
if let Some((_, UnresolvedImportError { note: Some(note), .. })) = errors.iter().last() { if let Some((_, UnresolvedImportError { note: Some(note), .. })) = errors.iter().last() {