32 files changed, 8 insertions, 9 deletions
diff --git a/src/test/ui/codemap_tests/bad-format-args.rs b/tests/ui/codemap_tests/bad-format-args.rs
index e89a45a84..e89a45a84 100644
--- a/src/test/ui/codemap_tests/bad-format-args.rs
+++ b/tests/ui/codemap_tests/bad-format-args.rs
diff --git a/src/test/ui/codemap_tests/bad-format-args.stderr b/tests/ui/codemap_tests/bad-format-args.stderr
index 8f79beaa9..8f79beaa9 100644
--- a/src/test/ui/codemap_tests/bad-format-args.stderr
+++ b/tests/ui/codemap_tests/bad-format-args.stderr
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
index 414acfd84..414acfd84 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
+++ b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.rs
diff --git a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
index 2c1c3c2dc..2c1c3c2dc 100644
--- a/src/test/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
+++ b/tests/ui/codemap_tests/coherence-overlapping-inherent-impl-trait.stderr
diff --git a/src/test/ui/codemap_tests/empty_span.rs b/tests/ui/codemap_tests/empty_span.rs
index 7753e2ece..7753e2ece 100644
--- a/src/test/ui/codemap_tests/empty_span.rs
+++ b/tests/ui/codemap_tests/empty_span.rs
diff --git a/src/test/ui/codemap_tests/empty_span.stderr b/tests/ui/codemap_tests/empty_span.stderr
index e36f59ee5..e36f59ee5 100644
--- a/src/test/ui/codemap_tests/empty_span.stderr
+++ b/tests/ui/codemap_tests/empty_span.stderr
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.rs b/tests/ui/codemap_tests/huge_multispan_highlight.rs
index 623c59081..623c59081 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.rs
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.rs
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr b/tests/ui/codemap_tests/huge_multispan_highlight.stderr
index a60f1c77a..9f8ce3b61 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.stderr
+++ b/tests/ui/codemap_tests/huge_multispan_highlight.stderr
@@ -1,11 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/huge_multispan_highlight.rs:90:13
    |
-LL |     let x = "foo";
-   |         - help: consider changing this to be mutable: `mut x`
-...
 LL |     let y = &mut x;
    |             ^^^^^^ cannot borrow as mutable
+   |
+help: consider changing this to be mutable
+   |
+LL |     let mut x = "foo";
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/issue-11715.rs b/tests/ui/codemap_tests/issue-11715.rs
index 617d57ff7..617d57ff7 100644
--- a/src/test/ui/codemap_tests/issue-11715.rs
+++ b/tests/ui/codemap_tests/issue-11715.rs
diff --git a/src/test/ui/codemap_tests/issue-11715.stderr b/tests/ui/codemap_tests/issue-11715.stderr
index a6b2b2e50..a6b2b2e50 100644
--- a/src/test/ui/codemap_tests/issue-11715.stderr
+++ b/tests/ui/codemap_tests/issue-11715.stderr
diff --git a/src/test/ui/codemap_tests/issue-28308.rs b/tests/ui/codemap_tests/issue-28308.rs
index 81493f8c4..81493f8c4 100644
--- a/src/test/ui/codemap_tests/issue-28308.rs
+++ b/tests/ui/codemap_tests/issue-28308.rs
diff --git a/src/test/ui/codemap_tests/issue-28308.stderr b/tests/ui/codemap_tests/issue-28308.stderr
index 7daa0510c..7daa0510c 100644
--- a/src/test/ui/codemap_tests/issue-28308.stderr
+++ b/tests/ui/codemap_tests/issue-28308.stderr
diff --git a/src/test/ui/codemap_tests/one_line.rs b/tests/ui/codemap_tests/one_line.rs
index bb36813db..bb36813db 100644
--- a/src/test/ui/codemap_tests/one_line.rs
+++ b/tests/ui/codemap_tests/one_line.rs
diff --git a/src/test/ui/codemap_tests/one_line.stderr b/tests/ui/codemap_tests/one_line.stderr
index 6fe6e2613..6fe6e2613 100644
--- a/src/test/ui/codemap_tests/one_line.stderr
+++ b/tests/ui/codemap_tests/one_line.stderr
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs b/tests/ui/codemap_tests/overlapping_inherent_impls.rs
index 66af21226..66af21226 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.rs
+++ b/tests/ui/codemap_tests/overlapping_inherent_impls.rs
diff --git a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr b/tests/ui/codemap_tests/overlapping_inherent_impls.stderr
index 6fca12e18..6fca12e18 100644
--- a/src/test/ui/codemap_tests/overlapping_inherent_impls.stderr
+++ b/tests/ui/codemap_tests/overlapping_inherent_impls.stderr
diff --git a/src/test/ui/codemap_tests/tab.rs b/tests/ui/codemap_tests/tab.rs
index 64569f2e7..64569f2e7 100644
--- a/src/test/ui/codemap_tests/tab.rs
+++ b/tests/ui/codemap_tests/tab.rs
diff --git a/src/test/ui/codemap_tests/tab.stderr b/tests/ui/codemap_tests/tab.stderr
index c3f19d20d..c3f19d20d 100644
--- a/src/test/ui/codemap_tests/tab.stderr
+++ b/tests/ui/codemap_tests/tab.stderr
diff --git a/src/test/ui/codemap_tests/tab_2.rs b/tests/ui/codemap_tests/tab_2.rs
index 644697c32..644697c32 100644
--- a/src/test/ui/codemap_tests/tab_2.rs
+++ b/tests/ui/codemap_tests/tab_2.rs
diff --git a/src/test/ui/codemap_tests/tab_2.stderr b/tests/ui/codemap_tests/tab_2.stderr
index 0bfdc3ac2..0bfdc3ac2 100644
--- a/src/test/ui/codemap_tests/tab_2.stderr
+++ b/tests/ui/codemap_tests/tab_2.stderr
diff --git a/src/test/ui/codemap_tests/tab_3.rs b/tests/ui/codemap_tests/tab_3.rs
index 58b034d0f..58b034d0f 100644
--- a/src/test/ui/codemap_tests/tab_3.rs
+++ b/tests/ui/codemap_tests/tab_3.rs
diff --git a/src/test/ui/codemap_tests/tab_3.stderr b/tests/ui/codemap_tests/tab_3.stderr
index 080f6c394..17bea2f36 100644
--- a/src/test/ui/codemap_tests/tab_3.stderr
+++ b/tests/ui/codemap_tests/tab_3.stderr
@@ -9,16 +9,13 @@ LL |     {
 LL |         println!("{:?}", some_vec);
    |                          ^^^^^^^^ value borrowed here after move
    |
-note: this function takes ownership of the receiver `self`, which moves `some_vec`
+note: `into_iter` takes ownership of the receiver `self`, which moves `some_vec`
   --> $SRC_DIR/core/src/iter/traits/collect.rs:LL:COL
-   |
-LL |     fn into_iter(self) -> Self::IntoIter;
-   |                  ^^^^
    = note: this error originates in the macro `$crate::format_args_nl` which comes from the expansion of the macro `println` (in Nightly builds, run with -Z macro-backtrace for more info)
-help: consider cloning the value if the performance cost is acceptable
+help: you can `clone` the value and consume it, but this might not be your desired behavior
    |
 LL |     some_vec.clone().into_iter();
-   |             ++++++++
+   |              ++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/codemap_tests/two_files.rs b/tests/ui/codemap_tests/two_files.rs
index 71d97d3c2..71d97d3c2 100644
--- a/src/test/ui/codemap_tests/two_files.rs
+++ b/tests/ui/codemap_tests/two_files.rs
diff --git a/src/test/ui/codemap_tests/two_files.stderr b/tests/ui/codemap_tests/two_files.stderr
index 2eb3fd567..2eb3fd567 100644
--- a/src/test/ui/codemap_tests/two_files.stderr
+++ b/tests/ui/codemap_tests/two_files.stderr
diff --git a/src/test/ui/codemap_tests/two_files_data.rs b/tests/ui/codemap_tests/two_files_data.rs
index b4d2f5d3c..b4d2f5d3c 100644
--- a/src/test/ui/codemap_tests/two_files_data.rs
+++ b/tests/ui/codemap_tests/two_files_data.rs
diff --git a/src/test/ui/codemap_tests/unicode.expanded.stdout b/tests/ui/codemap_tests/unicode.expanded.stdout
index d14bb42b2..d14bb42b2 100644
--- a/src/test/ui/codemap_tests/unicode.expanded.stdout
+++ b/tests/ui/codemap_tests/unicode.expanded.stdout
diff --git a/src/test/ui/codemap_tests/unicode.normal.stderr b/tests/ui/codemap_tests/unicode.normal.stderr
index 05ceb6910..05ceb6910 100644
--- a/src/test/ui/codemap_tests/unicode.normal.stderr
+++ b/tests/ui/codemap_tests/unicode.normal.stderr
diff --git a/src/test/ui/codemap_tests/unicode.rs b/tests/ui/codemap_tests/unicode.rs
index 4df9a5270..4df9a5270 100644
--- a/src/test/ui/codemap_tests/unicode.rs
+++ b/tests/ui/codemap_tests/unicode.rs
diff --git a/src/test/ui/codemap_tests/unicode_2.rs b/tests/ui/codemap_tests/unicode_2.rs
index 3301e7a18..3301e7a18 100644
--- a/src/test/ui/codemap_tests/unicode_2.rs
+++ b/tests/ui/codemap_tests/unicode_2.rs
diff --git a/src/test/ui/codemap_tests/unicode_2.stderr b/tests/ui/codemap_tests/unicode_2.stderr
index 19aae1d3c..19aae1d3c 100644
--- a/src/test/ui/codemap_tests/unicode_2.stderr
+++ b/tests/ui/codemap_tests/unicode_2.stderr
diff --git a/src/test/ui/codemap_tests/unicode_3.rs b/tests/ui/codemap_tests/unicode_3.rs
index 34582de45..34582de45 100644
--- a/src/test/ui/codemap_tests/unicode_3.rs
+++ b/tests/ui/codemap_tests/unicode_3.rs
diff --git a/src/test/ui/codemap_tests/unicode_3.stderr b/tests/ui/codemap_tests/unicode_3.stderr
index a35ed99d8..a35ed99d8 100644
--- a/src/test/ui/codemap_tests/unicode_3.stderr
+++ b/tests/ui/codemap_tests/unicode_3.stderr