From e68edb89ad1b34a3112c1cddd5541917743ccecd Mon Sep 17 00:00:00 2001
From: Vitaliy Busko <vitaliy.opensource@gmail.com>
Date: Thu, 19 Oct 2023 04:24:35 +0700
Subject: [PATCH] refactor(compiler/resolve): simplify some code
Removes unnecessary allocates and double-sorting the same vector,
makes the code a little nicer.
---
compiler/rustc_resolve/src/check_unused.rs | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/compiler/rustc_resolve/src/check_unused.rs b/compiler/rustc_resolve/src/check_unused.rs
index 7dbbd4c34ea7d..6b39d7907f140 100644
--- a/compiler/rustc_resolve/src/check_unused.rs
+++ b/compiler/rustc_resolve/src/check_unused.rs
@@ -338,7 +338,7 @@ impl Resolver<'_, '_> {
for unused in visitor.unused_imports.values() {
let mut fixes = Vec::new();
- let mut spans = match calc_unused_spans(unused, unused.use_tree, unused.use_tree_id) {
+ let spans = match calc_unused_spans(unused, unused.use_tree, unused.use_tree_id) {
UnusedSpanResult::Used => continue,
UnusedSpanResult::FlatUnused(span, remove) => {
fixes.push((remove, String::new()));
@@ -356,20 +356,19 @@ impl Resolver<'_, '_> {
}
};
- let len = spans.len();
- spans.sort();
- let ms = MultiSpan::from_spans(spans.clone());
- let mut span_snippets = spans
+ let ms = MultiSpan::from_spans(spans);
+
+ let mut span_snippets = ms
+ .primary_spans()
.iter()
- .filter_map(|s| match tcx.sess.source_map().span_to_snippet(*s) {
- Ok(s) => Some(format!("`{s}`")),
- _ => None,
- })
+ .filter_map(|span| tcx.sess.source_map().span_to_snippet(*span).ok())
+ .map(|s| format!("`{s}`"))
.collect::<Vec<String>>();
span_snippets.sort();
+
let msg = format!(
"unused import{}{}",
- pluralize!(len),
+ pluralize!(ms.primary_spans().len()),
if !span_snippets.is_empty() {
format!(": {}", span_snippets.join(", "))
} else {
@@ -379,7 +378,7 @@ impl Resolver<'_, '_> {
let fix_msg = if fixes.len() == 1 && fixes[0].0 == unused.item_span {
"remove the whole `use` item"
- } else if spans.len() > 1 {
+ } else if ms.primary_spans().len() > 1 {
"remove the unused imports"
} else {
"remove the unused import"