bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Rollup merge of #103953 - TaKO8Ki:remove-unused-arg-from-throw_unresolved_import_error, r=oli-obk

Browse source 
Remove unused argument from `throw_unresolved_import_error`

`throw_unresolved_import_error` does not need the second argument.
This commit is contained in:
Matthias Krüger 2022-11-04 12:18:03 +01:00 • committed by GitHub
commit 1edd63f1e7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -473,7 +473,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) {
@ -505,29 +505,21 @@ 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() { let span = MultiSpan::from_spans(errors.iter().map(|(_, err)| err.span).collect());
(span.unwrap(), "unresolved import".to_string()) let paths = errors.iter().map(|(path, _)| format!("`{}`", path)).collect::<Vec<_>>();
} else { let msg = format!("unresolved import{} {}", pluralize!(paths.len()), paths.join(", "),);
let span = MultiSpan::from_spans(errors.iter().map(|(_, err)| err.span).collect());
let paths = errors.iter().map(|(path, _)| format!("`{}`", path)).collect::<Vec<_>>();
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);