mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use stable sort to sort multipart diagnostics

Browse Source
This commit is contained in:
Folkert 2024-08-08 23:55:59 +02:00
parent 9337f7afa6
commit 38874a6927
No known key found for this signature in database
GPG Key ID: 1F17F6FFD112B97C
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compiler/rustc_borrowck/src/diagnostics/conflict_errors.rs
View File

@ -1124,8 +1124,8 @@ fn visit_expr(&mut self, ex: &'hir hir::Expr<'hir>) -> Self::Result {
err.multipart_suggestion(
"consider moving the expression out of the loop so it is only moved once",
vec![
(parent.span, "value".to_string()),
(span.shrink_to_lo(), format!("let mut value = {value};{indent}")),
(parent.span, "value".to_string()),
],
Applicability::MaybeIncorrect,
);

4
compiler/rustc_errors/src/diagnostic.rs
View File

@ -920,8 +920,8 @@ pub fn multipart_suggestion_with_style(
applicability: Applicability,
style: SuggestionStyle,
) -> &mut Self {
suggestion.sort_unstable();
suggestion.dedup_by(|(s1, m1), (s2, m2)| s1.source_equal(*s2) && m1 == m2);
let mut seen = crate::FxHashSet::default();
suggestion.retain(|(span, msg)| seen.insert((span.lo(), span.hi(), msg.clone())));
let parts = suggestion
.into_iter()