280 files changed, 118 insertions, 23 deletions

diff --git a/src/test/ui/resolve/associated-fn-called-as-fn.rs b/tests/ui/resolve/associated-fn-called-as-fn.rs
index f31f3d67b..f31f3d67b 100644
--- a/src/test/ui/resolve/associated-fn-called-as-fn.rs
+++ b/tests/ui/resolve/associated-fn-called-as-fn.rs
diff --git a/src/test/ui/resolve/associated-fn-called-as-fn.stderr b/tests/ui/resolve/associated-fn-called-as-fn.stderr
index fbdea30d5..fbdea30d5 100644
--- a/src/test/ui/resolve/associated-fn-called-as-fn.stderr
+++ b/tests/ui/resolve/associated-fn-called-as-fn.stderr
diff --git a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
index cf769f31b..cf769f31b 100644
--- a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
+++ b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo.rs
diff --git a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
index 81c16ede9..81c16ede9 100644
--- a/src/test/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
+++ b/tests/ui/resolve/auxiliary/blind-item-mixed-crate-use-item-foo2.rs
diff --git a/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs b/tests/ui/resolve/auxiliary/extern-prelude-vec.rs
index a643c8889..a643c8889 100644
--- a/src/test/ui/resolve/auxiliary/extern-prelude-vec.rs
+++ b/tests/ui/resolve/auxiliary/extern-prelude-vec.rs
diff --git a/src/test/ui/resolve/auxiliary/extern-prelude.rs b/tests/ui/resolve/auxiliary/extern-prelude.rs
index 2fdfd85a1..2fdfd85a1 100644
--- a/src/test/ui/resolve/auxiliary/extern-prelude.rs
+++ b/tests/ui/resolve/auxiliary/extern-prelude.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-19452-aux.rs b/tests/ui/resolve/auxiliary/issue-19452-aux.rs
index 9c7bcec51..9c7bcec51 100644
--- a/src/test/ui/resolve/auxiliary/issue-19452-aux.rs
+++ b/tests/ui/resolve/auxiliary/issue-19452-aux.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-21221-3.rs b/tests/ui/resolve/auxiliary/issue-21221-3.rs
index 176c23180..176c23180 100644
--- a/src/test/ui/resolve/auxiliary/issue-21221-3.rs
+++ b/tests/ui/resolve/auxiliary/issue-21221-3.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-21221-4.rs b/tests/ui/resolve/auxiliary/issue-21221-4.rs
index 5e0d6cbdf..5e0d6cbdf 100644
--- a/src/test/ui/resolve/auxiliary/issue-21221-4.rs
+++ b/tests/ui/resolve/auxiliary/issue-21221-4.rs
diff --git a/src/test/ui/issues/auxiliary/issue-30535.rs b/tests/ui/resolve/auxiliary/issue-30535.rs
index 3608d4a2f..3608d4a2f 100644
--- a/src/test/ui/issues/auxiliary/issue-30535.rs
+++ b/tests/ui/resolve/auxiliary/issue-30535.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-3907.rs b/tests/ui/resolve/auxiliary/issue-3907.rs
index 5dc502930..5dc502930 100644
--- a/src/test/ui/resolve/auxiliary/issue-3907.rs
+++ b/tests/ui/resolve/auxiliary/issue-3907.rs
diff --git a/src/test/ui/resolve/auxiliary/issue-80079.rs b/tests/ui/resolve/auxiliary/issue-80079.rs
index 190ca75ab..190ca75ab 100644
--- a/src/test/ui/resolve/auxiliary/issue-80079.rs
+++ b/tests/ui/resolve/auxiliary/issue-80079.rs
diff --git a/src/test/ui/resolve/auxiliary/namespaced_enums.rs b/tests/ui/resolve/auxiliary/namespaced_enums.rs
index d3548c76c..d3548c76c 100644
--- a/src/test/ui/resolve/auxiliary/namespaced_enums.rs
+++ b/tests/ui/resolve/auxiliary/namespaced_enums.rs
diff --git a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs b/tests/ui/resolve/auxiliary/privacy-struct-ctor.rs
index 6d0bc7285..6d0bc7285 100644
--- a/src/test/ui/resolve/auxiliary/privacy-struct-ctor.rs
+++ b/tests/ui/resolve/auxiliary/privacy-struct-ctor.rs
diff --git a/src/test/ui/resolve/bad-env-capture.rs b/tests/ui/resolve/bad-env-capture.rs
index 83fd2544f..83fd2544f 100644
--- a/src/test/ui/resolve/bad-env-capture.rs
+++ b/tests/ui/resolve/bad-env-capture.rs
diff --git a/src/test/ui/resolve/bad-env-capture.stderr b/tests/ui/resolve/bad-env-capture.stderr
index 59b1fabfd..59b1fabfd 100644
--- a/src/test/ui/resolve/bad-env-capture.stderr
+++ b/tests/ui/resolve/bad-env-capture.stderr
diff --git a/src/test/ui/resolve/bad-env-capture2.rs b/tests/ui/resolve/bad-env-capture2.rs
index b04569c9d..b04569c9d 100644
--- a/src/test/ui/resolve/bad-env-capture2.rs
+++ b/tests/ui/resolve/bad-env-capture2.rs
diff --git a/src/test/ui/resolve/bad-env-capture2.stderr b/tests/ui/resolve/bad-env-capture2.stderr
index 811c259de..811c259de 100644
--- a/src/test/ui/resolve/bad-env-capture2.stderr
+++ b/tests/ui/resolve/bad-env-capture2.stderr
diff --git a/src/test/ui/resolve/bad-env-capture3.rs b/tests/ui/resolve/bad-env-capture3.rs
index 62f12fd1a..62f12fd1a 100644
--- a/src/test/ui/resolve/bad-env-capture3.rs
+++ b/tests/ui/resolve/bad-env-capture3.rs
diff --git a/src/test/ui/resolve/bad-env-capture3.stderr b/tests/ui/resolve/bad-env-capture3.stderr
index eab37fde9..eab37fde9 100644
--- a/src/test/ui/resolve/bad-env-capture3.stderr
+++ b/tests/ui/resolve/bad-env-capture3.stderr
diff --git a/src/test/ui/resolve/bad-expr-path.rs b/tests/ui/resolve/bad-expr-path.rs
index 31fc9cf2c..31fc9cf2c 100644
--- a/src/test/ui/resolve/bad-expr-path.rs
+++ b/tests/ui/resolve/bad-expr-path.rs
diff --git a/src/test/ui/resolve/bad-expr-path.stderr b/tests/ui/resolve/bad-expr-path.stderr
index 8261e8e53..8261e8e53 100644
--- a/src/test/ui/resolve/bad-expr-path.stderr
+++ b/tests/ui/resolve/bad-expr-path.stderr
diff --git a/src/test/ui/resolve/bad-expr-path2.rs b/tests/ui/resolve/bad-expr-path2.rs
index eb88edb90..eb88edb90 100644
--- a/src/test/ui/resolve/bad-expr-path2.rs
+++ b/tests/ui/resolve/bad-expr-path2.rs
diff --git a/src/test/ui/resolve/bad-expr-path2.stderr b/tests/ui/resolve/bad-expr-path2.stderr
index 6e11296d9..6e11296d9 100644
--- a/src/test/ui/resolve/bad-expr-path2.stderr
+++ b/tests/ui/resolve/bad-expr-path2.stderr
diff --git a/src/test/ui/resolve/bad-module.rs b/tests/ui/resolve/bad-module.rs
index b23e97c2c..b23e97c2c 100644
--- a/src/test/ui/resolve/bad-module.rs
+++ b/tests/ui/resolve/bad-module.rs
diff --git a/src/test/ui/resolve/bad-module.stderr b/tests/ui/resolve/bad-module.stderr
index 558760c67..558760c67 100644
--- a/src/test/ui/resolve/bad-module.stderr
+++ b/tests/ui/resolve/bad-module.stderr
diff --git a/src/test/ui/resolve/bad-type-env-capture.rs b/tests/ui/resolve/bad-type-env-capture.rs
index 53dfb1313..53dfb1313 100644
--- a/src/test/ui/resolve/bad-type-env-capture.rs
+++ b/tests/ui/resolve/bad-type-env-capture.rs
diff --git a/src/test/ui/resolve/bad-type-env-capture.stderr b/tests/ui/resolve/bad-type-env-capture.stderr
index b6282c2d0..b6282c2d0 100644
--- a/src/test/ui/resolve/bad-type-env-capture.stderr
+++ b/tests/ui/resolve/bad-type-env-capture.stderr
diff --git a/src/test/ui/resolve/blind-item-local-shadow.rs b/tests/ui/resolve/blind-item-local-shadow.rs
index 942aeb6fd..942aeb6fd 100644
--- a/src/test/ui/resolve/blind-item-local-shadow.rs
+++ b/tests/ui/resolve/blind-item-local-shadow.rs
diff --git a/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs b/tests/ui/resolve/blind-item-mixed-crate-use-item.rs
index 36d8ab151..36d8ab151 100644
--- a/src/test/ui/resolve/blind-item-mixed-crate-use-item.rs
+++ b/tests/ui/resolve/blind-item-mixed-crate-use-item.rs
diff --git a/src/test/ui/resolve/blind-item-mixed-use-item.rs b/tests/ui/resolve/blind-item-mixed-use-item.rs
index 4a3905496..4a3905496 100644
--- a/src/test/ui/resolve/blind-item-mixed-use-item.rs
+++ b/tests/ui/resolve/blind-item-mixed-use-item.rs
diff --git a/src/test/ui/resolve/block-with-trait-parent.rs b/tests/ui/resolve/block-with-trait-parent.rs
index bc86f94e9..bc86f94e9 100644
--- a/src/test/ui/resolve/block-with-trait-parent.rs
+++ b/tests/ui/resolve/block-with-trait-parent.rs
diff --git a/src/test/ui/resolve/crate-called-as-function.rs b/tests/ui/resolve/crate-called-as-function.rs
index e8f52c0c0..e8f52c0c0 100644
--- a/src/test/ui/resolve/crate-called-as-function.rs
+++ b/tests/ui/resolve/crate-called-as-function.rs
diff --git a/src/test/ui/resolve/crate-called-as-function.stderr b/tests/ui/resolve/crate-called-as-function.stderr
index eb42349af..eb42349af 100644
--- a/src/test/ui/resolve/crate-called-as-function.stderr
+++ b/tests/ui/resolve/crate-called-as-function.stderr
diff --git a/src/test/ui/resolve/crate-in-paths.rs b/tests/ui/resolve/crate-in-paths.rs
index 7ebd25918..7ebd25918 100644
--- a/src/test/ui/resolve/crate-in-paths.rs
+++ b/tests/ui/resolve/crate-in-paths.rs
diff --git a/src/test/ui/resolve/crate-in-paths.stderr b/tests/ui/resolve/crate-in-paths.stderr
index b7cf49507..b7cf49507 100644
--- a/src/test/ui/resolve/crate-in-paths.stderr
+++ b/tests/ui/resolve/crate-in-paths.stderr
diff --git a/src/test/ui/resolve/editions-crate-root-2015.rs b/tests/ui/resolve/editions-crate-root-2015.rs
index 4c890e3ae..4c890e3ae 100644
--- a/src/test/ui/resolve/editions-crate-root-2015.rs
+++ b/tests/ui/resolve/editions-crate-root-2015.rs
diff --git a/src/test/ui/resolve/editions-crate-root-2015.stderr b/tests/ui/resolve/editions-crate-root-2015.stderr
index 00cdd0c58..00cdd0c58 100644
--- a/src/test/ui/resolve/editions-crate-root-2015.stderr
+++ b/tests/ui/resolve/editions-crate-root-2015.stderr
diff --git a/src/test/ui/resolve/editions-crate-root-2018.rs b/tests/ui/resolve/editions-crate-root-2018.rs
index 61e4329bb..61e4329bb 100644
--- a/src/test/ui/resolve/editions-crate-root-2018.rs
+++ b/tests/ui/resolve/editions-crate-root-2018.rs
diff --git a/src/test/ui/resolve/editions-crate-root-2018.stderr b/tests/ui/resolve/editions-crate-root-2018.stderr
index 967a5a2fc..967a5a2fc 100644
--- a/src/test/ui/resolve/editions-crate-root-2018.stderr
+++ b/tests/ui/resolve/editions-crate-root-2018.stderr
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.rs b/tests/ui/resolve/enums-are-namespaced-xc.rs
index dfc16d6ce..dfc16d6ce 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.rs
+++ b/tests/ui/resolve/enums-are-namespaced-xc.rs
diff --git a/src/test/ui/resolve/enums-are-namespaced-xc.stderr b/tests/ui/resolve/enums-are-namespaced-xc.stderr
index 6448e596d..6448e596d 100644
--- a/src/test/ui/resolve/enums-are-namespaced-xc.stderr
+++ b/tests/ui/resolve/enums-are-namespaced-xc.stderr
diff --git a/src/test/ui/resolve/enums-pats-not-idents.rs b/tests/ui/resolve/enums-pats-not-idents.rs
index 5b918eef6..5b918eef6 100644
--- a/src/test/ui/resolve/enums-pats-not-idents.rs
+++ b/tests/ui/resolve/enums-pats-not-idents.rs
diff --git a/src/test/ui/resolve/enums-pats-not-idents.stderr b/tests/ui/resolve/enums-pats-not-idents.stderr
index 072b88716..072b88716 100644
--- a/src/test/ui/resolve/enums-pats-not-idents.stderr
+++ b/tests/ui/resolve/enums-pats-not-idents.stderr
diff --git a/src/test/ui/resolve/export-fully-qualified.rs b/tests/ui/resolve/export-fully-qualified.rs
index 4e73a2c54..4e73a2c54 100644
--- a/src/test/ui/resolve/export-fully-qualified.rs
+++ b/tests/ui/resolve/export-fully-qualified.rs
diff --git a/src/test/ui/resolve/export-fully-qualified.stderr b/tests/ui/resolve/export-fully-qualified.stderr
index 7ee352e12..7ee352e12 100644
--- a/src/test/ui/resolve/export-fully-qualified.stderr
+++ b/tests/ui/resolve/export-fully-qualified.stderr
diff --git a/src/test/ui/resolve/extern-prelude-fail.rs b/tests/ui/resolve/extern-prelude-fail.rs
index 7d387025a..7d387025a 100644
--- a/src/test/ui/resolve/extern-prelude-fail.rs
+++ b/tests/ui/resolve/extern-prelude-fail.rs
diff --git a/src/test/ui/resolve/extern-prelude-fail.stderr b/tests/ui/resolve/extern-prelude-fail.stderr
index a1591914b..a1591914b 100644
--- a/src/test/ui/resolve/extern-prelude-fail.stderr
+++ b/tests/ui/resolve/extern-prelude-fail.stderr
diff --git a/src/test/ui/resolve/extern-prelude.rs b/tests/ui/resolve/extern-prelude.rs
index 50fed6034..50fed6034 100644
--- a/src/test/ui/resolve/extern-prelude.rs
+++ b/tests/ui/resolve/extern-prelude.rs
diff --git a/src/test/ui/resolve/filter-intrinsics.rs b/tests/ui/resolve/filter-intrinsics.rs
index c0956ef85..c0956ef85 100644
--- a/src/test/ui/resolve/filter-intrinsics.rs
+++ b/tests/ui/resolve/filter-intrinsics.rs
diff --git a/src/test/ui/resolve/filter-intrinsics.stderr b/tests/ui/resolve/filter-intrinsics.stderr
index 955070891..955070891 100644
--- a/src/test/ui/resolve/filter-intrinsics.stderr
+++ b/tests/ui/resolve/filter-intrinsics.stderr
diff --git a/src/test/ui/resolve/impl-items-vis-unresolved.rs b/tests/ui/resolve/impl-items-vis-unresolved.rs
index 1494c1cf9..1494c1cf9 100644
--- a/src/test/ui/resolve/impl-items-vis-unresolved.rs
+++ b/tests/ui/resolve/impl-items-vis-unresolved.rs
diff --git a/src/test/ui/resolve/impl-items-vis-unresolved.stderr b/tests/ui/resolve/impl-items-vis-unresolved.stderr
index f2293d28e..f2293d28e 100644
--- a/src/test/ui/resolve/impl-items-vis-unresolved.stderr
+++ b/tests/ui/resolve/impl-items-vis-unresolved.stderr
diff --git a/src/test/ui/resolve/issue-100365.rs b/tests/ui/resolve/issue-100365.rs
index 1d8835036..1d8835036 100644
--- a/src/test/ui/resolve/issue-100365.rs
+++ b/tests/ui/resolve/issue-100365.rs
diff --git a/src/test/ui/resolve/issue-100365.stderr b/tests/ui/resolve/issue-100365.stderr
index 372d77266..372d77266 100644
--- a/src/test/ui/resolve/issue-100365.stderr
+++ b/tests/ui/resolve/issue-100365.stderr
diff --git a/src/test/ui/resolve/issue-101749-2.rs b/tests/ui/resolve/issue-101749-2.rs
index 4d3d46944..4d3d46944 100644
--- a/src/test/ui/resolve/issue-101749-2.rs
+++ b/tests/ui/resolve/issue-101749-2.rs
diff --git a/src/test/ui/resolve/issue-101749-2.stderr b/tests/ui/resolve/issue-101749-2.stderr
index 370d4b145..370d4b145 100644
--- a/src/test/ui/resolve/issue-101749-2.stderr
+++ b/tests/ui/resolve/issue-101749-2.stderr
diff --git a/src/test/ui/resolve/issue-101749.fixed b/tests/ui/resolve/issue-101749.fixed
index 3e5544296..3e5544296 100644
--- a/src/test/ui/resolve/issue-101749.fixed
+++ b/tests/ui/resolve/issue-101749.fixed
diff --git a/src/test/ui/resolve/issue-101749.rs b/tests/ui/resolve/issue-101749.rs
index fd67ccab6..fd67ccab6 100644
--- a/src/test/ui/resolve/issue-101749.rs
+++ b/tests/ui/resolve/issue-101749.rs
diff --git a/src/test/ui/resolve/issue-101749.stderr b/tests/ui/resolve/issue-101749.stderr
index dd29d7fc0..dd29d7fc0 100644
--- a/src/test/ui/resolve/issue-101749.stderr
+++ b/tests/ui/resolve/issue-101749.stderr
diff --git a/src/test/ui/resolve/issue-10200.rs b/tests/ui/resolve/issue-10200.rs
index fe36a7e00..fe36a7e00 100644
--- a/src/test/ui/resolve/issue-10200.rs
+++ b/tests/ui/resolve/issue-10200.rs
diff --git a/src/test/ui/resolve/issue-10200.stderr b/tests/ui/resolve/issue-10200.stderr
index e60489f5b..e60489f5b 100644
--- a/src/test/ui/resolve/issue-10200.stderr
+++ b/tests/ui/resolve/issue-10200.stderr
diff --git a/src/test/ui/resolve/issue-102946.rs b/tests/ui/resolve/issue-102946.rs
index c6feca6f3..c6feca6f3 100644
--- a/src/test/ui/resolve/issue-102946.rs
+++ b/tests/ui/resolve/issue-102946.rs
diff --git a/src/test/ui/resolve/issue-102946.stderr b/tests/ui/resolve/issue-102946.stderr
index 65be0258e..65be0258e 100644
--- a/src/test/ui/resolve/issue-102946.stderr
+++ b/tests/ui/resolve/issue-102946.stderr
diff --git a/src/test/ui/resolve/issue-103202.rs b/tests/ui/resolve/issue-103202.rs
index 469d9d7c8..469d9d7c8 100644
--- a/src/test/ui/resolve/issue-103202.rs
+++ b/tests/ui/resolve/issue-103202.rs
diff --git a/tests/ui/resolve/issue-103202.stderr b/tests/ui/resolve/issue-103202.stderr
new file mode 100644
index 000000000..d4d141fb0
--- /dev/null
+++ b/tests/ui/resolve/issue-103202.stderr
@@ -0,0 +1,14 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/issue-103202.rs:4:17
+   |
+LL |     fn f(self: &S::x) {}
+   |                 ^^^^
+   |
+help: if there were a trait named `Example` with associated type `x` implemented for `S`, you could use the fully-qualified path
+   |
+LL |     fn f(self: &<S as Example>::x) {}
+   |                 ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/resolve/issue-103474.rs b/tests/ui/resolve/issue-103474.rs
index 14f2259e1..14f2259e1 100644
--- a/src/test/ui/resolve/issue-103474.rs
+++ b/tests/ui/resolve/issue-103474.rs
diff --git a/src/test/ui/resolve/issue-103474.stderr b/tests/ui/resolve/issue-103474.stderr
index 415d23155..415d23155 100644
--- a/src/test/ui/resolve/issue-103474.stderr
+++ b/tests/ui/resolve/issue-103474.stderr
diff --git a/tests/ui/resolve/issue-104700-inner_scope.rs b/tests/ui/resolve/issue-104700-inner_scope.rs
new file mode 100644
index 000000000..e8f28c113
--- /dev/null
+++ b/tests/ui/resolve/issue-104700-inner_scope.rs
@@ -0,0 +1,11 @@
+fn main() {
+    let foo = 1;
+    {
+        let bar = 2;
+        let test_func = |x| x > 3;
+    }
+    if bar == 2 { //~ ERROR cannot find value
+        println!("yes");
+    }
+    test_func(1); //~ ERROR cannot find function
+}
diff --git a/tests/ui/resolve/issue-104700-inner_scope.stderr b/tests/ui/resolve/issue-104700-inner_scope.stderr
new file mode 100644
index 000000000..051b234fc
--- /dev/null
+++ b/tests/ui/resolve/issue-104700-inner_scope.stderr
@@ -0,0 +1,21 @@
+error[E0425]: cannot find value `bar` in this scope
+  --> $DIR/issue-104700-inner_scope.rs:7:8
+   |
+LL |     if bar == 2 {
+   |        ^^^
+   |
+help: the binding `bar` is available in a different scope in the same function
+  --> $DIR/issue-104700-inner_scope.rs:4:13
+   |
+LL |         let bar = 2;
+   |             ^^^
+
+error[E0425]: cannot find function `test_func` in this scope
+  --> $DIR/issue-104700-inner_scope.rs:10:5
+   |
+LL |     test_func(1);
+   |     ^^^^^^^^^ not found in this scope
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0425`.
diff --git a/src/test/ui/resolve/issue-105069.rs b/tests/ui/resolve/issue-105069.rs
index 73455cf77..73455cf77 100644
--- a/src/test/ui/resolve/issue-105069.rs
+++ b/tests/ui/resolve/issue-105069.rs
diff --git a/src/test/ui/resolve/issue-105069.stderr b/tests/ui/resolve/issue-105069.stderr
index 1e6c9c6e2..1e6c9c6e2 100644
--- a/src/test/ui/resolve/issue-105069.stderr
+++ b/tests/ui/resolve/issue-105069.stderr
diff --git a/src/test/ui/resolve/issue-12796.rs b/tests/ui/resolve/issue-12796.rs
index 942d6b9a5..942d6b9a5 100644
--- a/src/test/ui/resolve/issue-12796.rs
+++ b/tests/ui/resolve/issue-12796.rs
diff --git a/src/test/ui/resolve/issue-12796.stderr b/tests/ui/resolve/issue-12796.stderr
index a01fd2d65..a01fd2d65 100644
--- a/src/test/ui/resolve/issue-12796.stderr
+++ b/tests/ui/resolve/issue-12796.stderr
diff --git a/src/test/ui/resolve/issue-14254.rs b/tests/ui/resolve/issue-14254.rs
index 78add29ca..78add29ca 100644
--- a/src/test/ui/resolve/issue-14254.rs
+++ b/tests/ui/resolve/issue-14254.rs
diff --git a/src/test/ui/resolve/issue-14254.stderr b/tests/ui/resolve/issue-14254.stderr
index 690a40f7e..690a40f7e 100644
--- a/src/test/ui/resolve/issue-14254.stderr
+++ b/tests/ui/resolve/issue-14254.stderr
diff --git a/src/test/ui/resolve/issue-16058.rs b/tests/ui/resolve/issue-16058.rs
index 048aaf65f..048aaf65f 100644
--- a/src/test/ui/resolve/issue-16058.rs
+++ b/tests/ui/resolve/issue-16058.rs
diff --git a/src/test/ui/resolve/issue-16058.stderr b/tests/ui/resolve/issue-16058.stderr
index c47d22cef..c47d22cef 100644
--- a/src/test/ui/resolve/issue-16058.stderr
+++ b/tests/ui/resolve/issue-16058.stderr
diff --git a/src/test/ui/resolve/issue-17518.rs b/tests/ui/resolve/issue-17518.rs
index edaebc812..edaebc812 100644
--- a/src/test/ui/resolve/issue-17518.rs
+++ b/tests/ui/resolve/issue-17518.rs
diff --git a/src/test/ui/resolve/issue-17518.stderr b/tests/ui/resolve/issue-17518.stderr
index 034d0d01b..034d0d01b 100644
--- a/src/test/ui/resolve/issue-17518.stderr
+++ b/tests/ui/resolve/issue-17518.stderr
diff --git a/src/test/ui/resolve/issue-18252.rs b/tests/ui/resolve/issue-18252.rs
index f6ebe2920..f6ebe2920 100644
--- a/src/test/ui/resolve/issue-18252.rs
+++ b/tests/ui/resolve/issue-18252.rs
diff --git a/src/test/ui/resolve/issue-18252.stderr b/tests/ui/resolve/issue-18252.stderr
index d9006c0a6..d9006c0a6 100644
--- a/src/test/ui/resolve/issue-18252.stderr
+++ b/tests/ui/resolve/issue-18252.stderr
diff --git a/src/test/ui/resolve/issue-19452.rs b/tests/ui/resolve/issue-19452.rs
index 1d3aa49ea..1d3aa49ea 100644
--- a/src/test/ui/resolve/issue-19452.rs
+++ b/tests/ui/resolve/issue-19452.rs
diff --git a/src/test/ui/resolve/issue-19452.stderr b/tests/ui/resolve/issue-19452.stderr
index eff89241f..eff89241f 100644
--- a/src/test/ui/resolve/issue-19452.stderr
+++ b/tests/ui/resolve/issue-19452.stderr
diff --git a/src/test/ui/resolve/issue-21221-1.rs b/tests/ui/resolve/issue-21221-1.rs
index b180624d2..b180624d2 100644
--- a/src/test/ui/resolve/issue-21221-1.rs
+++ b/tests/ui/resolve/issue-21221-1.rs
diff --git a/src/test/ui/resolve/issue-21221-1.stderr b/tests/ui/resolve/issue-21221-1.stderr
index 538eeead9..538eeead9 100644
--- a/src/test/ui/resolve/issue-21221-1.stderr
+++ b/tests/ui/resolve/issue-21221-1.stderr
diff --git a/src/test/ui/resolve/issue-21221-2.rs b/tests/ui/resolve/issue-21221-2.rs
index dc13e46cb..dc13e46cb 100644
--- a/src/test/ui/resolve/issue-21221-2.rs
+++ b/tests/ui/resolve/issue-21221-2.rs
diff --git a/src/test/ui/resolve/issue-21221-2.stderr b/tests/ui/resolve/issue-21221-2.stderr
index d4fd7cb12..d4fd7cb12 100644
--- a/src/test/ui/resolve/issue-21221-2.stderr
+++ b/tests/ui/resolve/issue-21221-2.stderr
diff --git a/src/test/ui/resolve/issue-21221-3.rs b/tests/ui/resolve/issue-21221-3.rs
index f0c0a9fd6..f0c0a9fd6 100644
--- a/src/test/ui/resolve/issue-21221-3.rs
+++ b/tests/ui/resolve/issue-21221-3.rs
diff --git a/src/test/ui/resolve/issue-21221-3.stderr b/tests/ui/resolve/issue-21221-3.stderr
index f12e5b09b..f12e5b09b 100644
--- a/src/test/ui/resolve/issue-21221-3.stderr
+++ b/tests/ui/resolve/issue-21221-3.stderr
diff --git a/src/test/ui/resolve/issue-21221-4.rs b/tests/ui/resolve/issue-21221-4.rs
index 88d5bd06c..88d5bd06c 100644
--- a/src/test/ui/resolve/issue-21221-4.rs
+++ b/tests/ui/resolve/issue-21221-4.rs
diff --git a/src/test/ui/resolve/issue-21221-4.stderr b/tests/ui/resolve/issue-21221-4.stderr
index fc15444d0..fc15444d0 100644
--- a/src/test/ui/resolve/issue-21221-4.stderr
+++ b/tests/ui/resolve/issue-21221-4.stderr
diff --git a/src/test/ui/resolve/issue-22692.rs b/tests/ui/resolve/issue-22692.rs
index 31a762614..31a762614 100644
--- a/src/test/ui/resolve/issue-22692.rs
+++ b/tests/ui/resolve/issue-22692.rs
diff --git a/src/test/ui/resolve/issue-22692.stderr b/tests/ui/resolve/issue-22692.stderr
index 6962aa161..6962aa161 100644
--- a/src/test/ui/resolve/issue-22692.stderr
+++ b/tests/ui/resolve/issue-22692.stderr
diff --git a/src/test/ui/resolve/issue-2330.rs b/tests/ui/resolve/issue-2330.rs
index 4560caba0..4560caba0 100644
--- a/src/test/ui/resolve/issue-2330.rs
+++ b/tests/ui/resolve/issue-2330.rs
diff --git a/src/test/ui/resolve/issue-2330.stderr b/tests/ui/resolve/issue-2330.stderr
index 877cf68b5..877cf68b5 100644
--- a/src/test/ui/resolve/issue-2330.stderr
+++ b/tests/ui/resolve/issue-2330.stderr
diff --git a/src/test/ui/resolve/issue-23305.rs b/tests/ui/resolve/issue-23305.rs
index 6d7fe7c50..6d7fe7c50 100644
--- a/src/test/ui/resolve/issue-23305.rs
+++ b/tests/ui/resolve/issue-23305.rs
diff --git a/src/test/ui/resolve/issue-23305.stderr b/tests/ui/resolve/issue-23305.stderr
index aad1b583a..aad1b583a 100644
--- a/src/test/ui/resolve/issue-23305.stderr
+++ b/tests/ui/resolve/issue-23305.stderr
diff --git a/src/test/ui/resolve/issue-2356.rs b/tests/ui/resolve/issue-2356.rs
index fe9bf4d44..fe9bf4d44 100644
--- a/src/test/ui/resolve/issue-2356.rs
+++ b/tests/ui/resolve/issue-2356.rs
diff --git a/src/test/ui/resolve/issue-2356.stderr b/tests/ui/resolve/issue-2356.stderr
index 36f3da7c9..36f3da7c9 100644
--- a/src/test/ui/resolve/issue-2356.stderr
+++ b/tests/ui/resolve/issue-2356.stderr
diff --git a/src/test/ui/resolve/issue-23716.rs b/tests/ui/resolve/issue-23716.rs
index e9139c0aa..e9139c0aa 100644
--- a/src/test/ui/resolve/issue-23716.rs
+++ b/tests/ui/resolve/issue-23716.rs
diff --git a/src/test/ui/resolve/issue-23716.stderr b/tests/ui/resolve/issue-23716.stderr
index 8b89c350c..8b89c350c 100644
--- a/src/test/ui/resolve/issue-23716.stderr
+++ b/tests/ui/resolve/issue-23716.stderr
diff --git a/src/test/ui/resolve/issue-24968.rs b/tests/ui/resolve/issue-24968.rs
index 19e16abce..19e16abce 100644
--- a/src/test/ui/resolve/issue-24968.rs
+++ b/tests/ui/resolve/issue-24968.rs
diff --git a/src/test/ui/resolve/issue-24968.stderr b/tests/ui/resolve/issue-24968.stderr
index 82f5a1d5b..82f5a1d5b 100644
--- a/src/test/ui/resolve/issue-24968.stderr
+++ b/tests/ui/resolve/issue-24968.stderr
diff --git a/src/test/ui/resolve/issue-26545.rs b/tests/ui/resolve/issue-26545.rs
index 5652ee747..5652ee747 100644
--- a/src/test/ui/resolve/issue-26545.rs
+++ b/tests/ui/resolve/issue-26545.rs
diff --git a/src/test/ui/resolve/issue-26545.stderr b/tests/ui/resolve/issue-26545.stderr
index d3c866925..d3c866925 100644
--- a/src/test/ui/resolve/issue-26545.stderr
+++ b/tests/ui/resolve/issue-26545.stderr
diff --git a/src/test/ui/resolve/issue-3021-c.rs b/tests/ui/resolve/issue-3021-c.rs
index 94ed1fdf7..94ed1fdf7 100644
--- a/src/test/ui/resolve/issue-3021-c.rs
+++ b/tests/ui/resolve/issue-3021-c.rs
diff --git a/src/test/ui/resolve/issue-3021-c.stderr b/tests/ui/resolve/issue-3021-c.stderr
index 5176efc3a..5176efc3a 100644
--- a/src/test/ui/resolve/issue-3021-c.stderr
+++ b/tests/ui/resolve/issue-3021-c.stderr
diff --git a/src/test/ui/resolve/issue-3021.rs b/tests/ui/resolve/issue-3021.rs
index a672261f8..a672261f8 100644
--- a/src/test/ui/resolve/issue-3021.rs
+++ b/tests/ui/resolve/issue-3021.rs
diff --git a/src/test/ui/resolve/issue-3021.stderr b/tests/ui/resolve/issue-3021.stderr
index d5b015eec..d5b015eec 100644
--- a/src/test/ui/resolve/issue-3021.stderr
+++ b/tests/ui/resolve/issue-3021.stderr
diff --git a/src/test/ui/issues/issue-30535.rs b/tests/ui/resolve/issue-30535.rs
index d48f00d5a..d48f00d5a 100644
--- a/src/test/ui/issues/issue-30535.rs
+++ b/tests/ui/resolve/issue-30535.rs
diff --git a/src/test/ui/issues/issue-30535.stderr b/tests/ui/resolve/issue-30535.stderr
index e3692934b..e3692934b 100644
--- a/src/test/ui/issues/issue-30535.stderr
+++ b/tests/ui/resolve/issue-30535.stderr
diff --git a/src/test/ui/resolve/issue-31845.rs b/tests/ui/resolve/issue-31845.rs
index f6dc11502..f6dc11502 100644
--- a/src/test/ui/resolve/issue-31845.rs
+++ b/tests/ui/resolve/issue-31845.rs
diff --git a/src/test/ui/resolve/issue-31845.stderr b/tests/ui/resolve/issue-31845.stderr
index 562819385..562819385 100644
--- a/src/test/ui/resolve/issue-31845.stderr
+++ b/tests/ui/resolve/issue-31845.stderr
diff --git a/src/test/ui/resolve/issue-33876.rs b/tests/ui/resolve/issue-33876.rs
index e233ec631..e233ec631 100644
--- a/src/test/ui/resolve/issue-33876.rs
+++ b/tests/ui/resolve/issue-33876.rs
diff --git a/src/test/ui/resolve/issue-33876.stderr b/tests/ui/resolve/issue-33876.stderr
index 52308f2a7..52308f2a7 100644
--- a/src/test/ui/resolve/issue-33876.stderr
+++ b/tests/ui/resolve/issue-33876.stderr
diff --git a/src/test/ui/resolve/issue-35675.rs b/tests/ui/resolve/issue-35675.rs
index 683761667..683761667 100644
--- a/src/test/ui/resolve/issue-35675.rs
+++ b/tests/ui/resolve/issue-35675.rs
diff --git a/src/test/ui/resolve/issue-35675.stderr b/tests/ui/resolve/issue-35675.stderr
index 4a06196d5..4a06196d5 100644
--- a/src/test/ui/resolve/issue-35675.stderr
+++ b/tests/ui/resolve/issue-35675.stderr
diff --git a/src/test/ui/resolve/issue-3907-2.rs b/tests/ui/resolve/issue-3907-2.rs
index 46f145e63..46f145e63 100644
--- a/src/test/ui/resolve/issue-3907-2.rs
+++ b/tests/ui/resolve/issue-3907-2.rs
diff --git a/src/test/ui/resolve/issue-3907-2.stderr b/tests/ui/resolve/issue-3907-2.stderr
index 782cfeec4..782cfeec4 100644
--- a/src/test/ui/resolve/issue-3907-2.stderr
+++ b/tests/ui/resolve/issue-3907-2.stderr
diff --git a/src/test/ui/resolve/issue-3907.rs b/tests/ui/resolve/issue-3907.rs
index 6211de427..6211de427 100644
--- a/src/test/ui/resolve/issue-3907.rs
+++ b/tests/ui/resolve/issue-3907.rs
diff --git a/src/test/ui/resolve/issue-3907.stderr b/tests/ui/resolve/issue-3907.stderr
index 6fc61cae8..6fc61cae8 100644
--- a/src/test/ui/resolve/issue-3907.stderr
+++ b/tests/ui/resolve/issue-3907.stderr
diff --git a/src/test/ui/resolve/issue-39226.rs b/tests/ui/resolve/issue-39226.rs
index 0f784f02b..0f784f02b 100644
--- a/src/test/ui/resolve/issue-39226.rs
+++ b/tests/ui/resolve/issue-39226.rs
diff --git a/src/test/ui/resolve/issue-39226.stderr b/tests/ui/resolve/issue-39226.stderr
index 5045ec6c3..5045ec6c3 100644
--- a/src/test/ui/resolve/issue-39226.stderr
+++ b/tests/ui/resolve/issue-39226.stderr
diff --git a/src/test/ui/issues/issue-39559-2.rs b/tests/ui/resolve/issue-39559-2.rs
index 07d3a82b1..07d3a82b1 100644
--- a/src/test/ui/issues/issue-39559-2.rs
+++ b/tests/ui/resolve/issue-39559-2.rs
diff --git a/src/test/ui/issues/issue-39559-2.stderr b/tests/ui/resolve/issue-39559-2.stderr
index ea27e7bd2..e9d8eb083 100644
--- a/src/test/ui/issues/issue-39559-2.stderr
+++ b/tests/ui/resolve/issue-39559-2.stderr
@@ -5,6 +5,7 @@ LL |     let array: [usize; Dim3::dim()]
    |                        ^^^^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error[E0015]: cannot call non-const fn `<Dim3 as Dim>::dim` in constants
   --> $DIR/issue-39559-2.rs:16:15
@@ -13,6 +14,7 @@ LL |         = [0; Dim3::dim()];
    |               ^^^^^^^^^^^
    |
    = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+   = help: add `#![feature(const_trait_impl)]` to the crate attributes to enable
 
 error: aborting due to 2 previous errors
 
diff --git a/src/test/ui/issues/issue-39559.rs b/tests/ui/resolve/issue-39559.rs
index 58d259407..58d259407 100644
--- a/src/test/ui/issues/issue-39559.rs
+++ b/tests/ui/resolve/issue-39559.rs
diff --git a/src/test/ui/issues/issue-39559.stderr b/tests/ui/resolve/issue-39559.stderr
index 7626f827f..7626f827f 100644
--- a/src/test/ui/issues/issue-39559.stderr
+++ b/tests/ui/resolve/issue-39559.stderr
diff --git a/src/test/ui/resolve/issue-42944.rs b/tests/ui/resolve/issue-42944.rs
index a4404857a..7e439c10b 100644
--- a/src/test/ui/resolve/issue-42944.rs
+++ b/tests/ui/resolve/issue-42944.rs
@@ -1,5 +1,5 @@
 mod foo {
-    pub struct Bx(());
+    pub struct Bx(pub(in crate::foo) ());
 }
 
 mod bar {
diff --git a/tests/ui/resolve/issue-42944.stderr b/tests/ui/resolve/issue-42944.stderr
new file mode 100644
index 000000000..4ffa9402c
--- /dev/null
+++ b/tests/ui/resolve/issue-42944.stderr
@@ -0,0 +1,32 @@
+error[E0425]: cannot find function, tuple struct or tuple variant `Bx` in this scope
+  --> $DIR/issue-42944.rs:16:9
+   |
+LL |         Bx(());
+   |         ^^ not found in this scope
+   |
+note: tuple struct `foo::Bx` exists but is inaccessible
+  --> $DIR/issue-42944.rs:2:5
+   |
+LL |     pub struct Bx(pub(in crate::foo) ());
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ not accessible
+
+error[E0423]: cannot initialize a tuple struct which contains private fields
+  --> $DIR/issue-42944.rs:9:9
+   |
+LL |         Bx(());
+   |         ^^
+   |
+note: constructor is not visible here due to private fields
+  --> $DIR/issue-42944.rs:2:19
+   |
+LL |     pub struct Bx(pub(in crate::foo) ());
+   |                   ^^^^^^^^^^^^^^^^^^^^^ private field
+help: consider making the field publicly accessible
+   |
+LL |     pub struct Bx(pub ());
+   |                   ~~~
+
+error: aborting due to 2 previous errors
+
+Some errors have detailed explanations: E0423, E0425.
+For more information about an error, try `rustc --explain E0423`.
diff --git a/src/test/ui/resolve/issue-49074.rs b/tests/ui/resolve/issue-49074.rs
index 752bb345b..752bb345b 100644
--- a/src/test/ui/resolve/issue-49074.rs
+++ b/tests/ui/resolve/issue-49074.rs
diff --git a/src/test/ui/resolve/issue-49074.stderr b/tests/ui/resolve/issue-49074.stderr
index bbfeb4ea9..bbfeb4ea9 100644
--- a/src/test/ui/resolve/issue-49074.stderr
+++ b/tests/ui/resolve/issue-49074.stderr
diff --git a/src/test/ui/resolve/issue-5035-2.rs b/tests/ui/resolve/issue-5035-2.rs
index b831bb4be..b831bb4be 100644
--- a/src/test/ui/resolve/issue-5035-2.rs
+++ b/tests/ui/resolve/issue-5035-2.rs
diff --git a/src/test/ui/resolve/issue-5035-2.stderr b/tests/ui/resolve/issue-5035-2.stderr
index 939392733..558e6b7b1 100644
--- a/src/test/ui/resolve/issue-5035-2.stderr
+++ b/tests/ui/resolve/issue-5035-2.stderr
@@ -6,6 +6,10 @@ LL | fn foo(_x: K) {}
    |
    = help: the trait `Sized` is not implemented for `(dyn I + 'static)`
    = help: unsized fn params are gated as an unstable feature
+help: you can use `impl Trait` as the argument type
+   |
+LL | fn foo(_x: impl K) {}
+   |            ++++
 help: function arguments must have a statically known size, borrowed types always have a known size
    |
 LL | fn foo(_x: &K) {}
diff --git a/src/test/ui/resolve/issue-5035.rs b/tests/ui/resolve/issue-5035.rs
index 49fa312f9..49fa312f9 100644
--- a/src/test/ui/resolve/issue-5035.rs
+++ b/tests/ui/resolve/issue-5035.rs
diff --git a/src/test/ui/resolve/issue-5035.stderr b/tests/ui/resolve/issue-5035.stderr
index 32b972b21..32b972b21 100644
--- a/src/test/ui/resolve/issue-5035.stderr
+++ b/tests/ui/resolve/issue-5035.stderr
diff --git a/src/test/ui/resolve/issue-50599.rs b/tests/ui/resolve/issue-50599.rs
index 72238a591..72238a591 100644
--- a/src/test/ui/resolve/issue-50599.rs
+++ b/tests/ui/resolve/issue-50599.rs
diff --git a/src/test/ui/resolve/issue-50599.stderr b/tests/ui/resolve/issue-50599.stderr
index b07482c83..b07482c83 100644
--- a/src/test/ui/resolve/issue-50599.stderr
+++ b/tests/ui/resolve/issue-50599.stderr
diff --git a/src/test/ui/resolve/issue-5099.rs b/tests/ui/resolve/issue-5099.rs
index b5abccb4b..b5abccb4b 100644
--- a/src/test/ui/resolve/issue-5099.rs
+++ b/tests/ui/resolve/issue-5099.rs
diff --git a/src/test/ui/resolve/issue-5099.stderr b/tests/ui/resolve/issue-5099.stderr
index e9b2a9c4d..e9b2a9c4d 100644
--- a/src/test/ui/resolve/issue-5099.stderr
+++ b/tests/ui/resolve/issue-5099.stderr
diff --git a/src/test/ui/resolve/issue-54379.rs b/tests/ui/resolve/issue-54379.rs
index 807c54393..807c54393 100644
--- a/src/test/ui/resolve/issue-54379.rs
+++ b/tests/ui/resolve/issue-54379.rs
diff --git a/src/test/ui/resolve/issue-54379.stderr b/tests/ui/resolve/issue-54379.stderr
index 750727273..750727273 100644
--- a/src/test/ui/resolve/issue-54379.stderr
+++ b/tests/ui/resolve/issue-54379.stderr
diff --git a/src/test/ui/resolve/issue-55673.rs b/tests/ui/resolve/issue-55673.rs
index 0436bd397..0436bd397 100644
--- a/src/test/ui/resolve/issue-55673.rs
+++ b/tests/ui/resolve/issue-55673.rs
diff --git a/src/test/ui/resolve/issue-55673.stderr b/tests/ui/resolve/issue-55673.stderr
index 39318f959..39318f959 100644
--- a/src/test/ui/resolve/issue-55673.stderr
+++ b/tests/ui/resolve/issue-55673.stderr
diff --git a/src/test/ui/resolve/issue-57523.rs b/tests/ui/resolve/issue-57523.rs
index 976238cc3..976238cc3 100644
--- a/src/test/ui/resolve/issue-57523.rs
+++ b/tests/ui/resolve/issue-57523.rs
diff --git a/src/test/ui/resolve/issue-5927.rs b/tests/ui/resolve/issue-5927.rs
index 14f95827b..14f95827b 100644
--- a/src/test/ui/resolve/issue-5927.rs
+++ b/tests/ui/resolve/issue-5927.rs
diff --git a/src/test/ui/resolve/issue-5927.stderr b/tests/ui/resolve/issue-5927.stderr
index d6cd6853d..d6cd6853d 100644
--- a/src/test/ui/resolve/issue-5927.stderr
+++ b/tests/ui/resolve/issue-5927.stderr
diff --git a/src/test/ui/resolve/issue-60057.rs b/tests/ui/resolve/issue-60057.rs
index b52343ada..b52343ada 100644
--- a/src/test/ui/resolve/issue-60057.rs
+++ b/tests/ui/resolve/issue-60057.rs
diff --git a/src/test/ui/resolve/issue-60057.stderr b/tests/ui/resolve/issue-60057.stderr
index 4d915fcd9..4d915fcd9 100644
--- a/src/test/ui/resolve/issue-60057.stderr
+++ b/tests/ui/resolve/issue-60057.stderr
diff --git a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.rs b/tests/ui/resolve/issue-65025-extern-static-parent-generics.rs
index ce45f630e..ce45f630e 100644
--- a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.rs
+++ b/tests/ui/resolve/issue-65025-extern-static-parent-generics.rs
diff --git a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.stderr b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr
index 6bbf76dd1..6bbf76dd1 100644
--- a/src/test/ui/resolve/issue-65025-extern-static-parent-generics.stderr
+++ b/tests/ui/resolve/issue-65025-extern-static-parent-generics.stderr
diff --git a/src/test/ui/resolve/issue-65035-static-with-parent-generics.rs b/tests/ui/resolve/issue-65035-static-with-parent-generics.rs
index f96c04841..f96c04841 100644
--- a/src/test/ui/resolve/issue-65035-static-with-parent-generics.rs
+++ b/tests/ui/resolve/issue-65035-static-with-parent-generics.rs
diff --git a/src/test/ui/resolve/issue-65035-static-with-parent-generics.stderr b/tests/ui/resolve/issue-65035-static-with-parent-generics.stderr
index 7ed572f80..7ed572f80 100644
--- a/src/test/ui/resolve/issue-65035-static-with-parent-generics.stderr
+++ b/tests/ui/resolve/issue-65035-static-with-parent-generics.stderr
diff --git a/src/test/ui/resolve/issue-6702.rs b/tests/ui/resolve/issue-6702.rs
index 954dc36f3..954dc36f3 100644
--- a/src/test/ui/resolve/issue-6702.rs
+++ b/tests/ui/resolve/issue-6702.rs
diff --git a/src/test/ui/resolve/issue-6702.stderr b/tests/ui/resolve/issue-6702.stderr
index a118f9419..a118f9419 100644
--- a/src/test/ui/resolve/issue-6702.stderr
+++ b/tests/ui/resolve/issue-6702.stderr
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
index c377ecea9..c377ecea9 100644
--- a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
+++ b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.rs
diff --git a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
index 109409d27..109409d27 100644
--- a/src/test/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
+++ b/tests/ui/resolve/issue-69401-trait-fn-no-body-ty-local.stderr
diff --git a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
index 49462f52f..49462f52f 100644
--- a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
+++ b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.rs
diff --git a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
index 1354abb4f..1354abb4f 100644
--- a/src/test/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
+++ b/tests/ui/resolve/issue-70736-async-fn-no-body-def-collector.stderr
diff --git a/src/test/ui/resolve/issue-73427.rs b/tests/ui/resolve/issue-73427.rs
index 5c2459a59..5c2459a59 100644
--- a/src/test/ui/resolve/issue-73427.rs
+++ b/tests/ui/resolve/issue-73427.rs
diff --git a/src/test/ui/resolve/issue-73427.stderr b/tests/ui/resolve/issue-73427.stderr
index 4af5f29d8..4af5f29d8 100644
--- a/src/test/ui/resolve/issue-73427.stderr
+++ b/tests/ui/resolve/issue-73427.stderr
diff --git a/src/test/ui/resolve/issue-80079.rs b/tests/ui/resolve/issue-80079.rs
index 4795ed062..4795ed062 100644
--- a/src/test/ui/resolve/issue-80079.rs
+++ b/tests/ui/resolve/issue-80079.rs
diff --git a/src/test/ui/resolve/issue-80079.stderr b/tests/ui/resolve/issue-80079.stderr
index 93e8c0341..93e8c0341 100644
--- a/src/test/ui/resolve/issue-80079.stderr
+++ b/tests/ui/resolve/issue-80079.stderr
diff --git a/src/test/ui/resolve/issue-81508.rs b/tests/ui/resolve/issue-81508.rs
index 23605cd2f..23605cd2f 100644
--- a/src/test/ui/resolve/issue-81508.rs
+++ b/tests/ui/resolve/issue-81508.rs
diff --git a/src/test/ui/resolve/issue-81508.stderr b/tests/ui/resolve/issue-81508.stderr
index 7258174ba..7258174ba 100644
--- a/src/test/ui/resolve/issue-81508.stderr
+++ b/tests/ui/resolve/issue-81508.stderr
diff --git a/src/test/ui/resolve/issue-82156.rs b/tests/ui/resolve/issue-82156.rs
index 6215259e4..6215259e4 100644
--- a/src/test/ui/resolve/issue-82156.rs
+++ b/tests/ui/resolve/issue-82156.rs
diff --git a/src/test/ui/resolve/issue-82156.stderr b/tests/ui/resolve/issue-82156.stderr
index d53599dcc..d53599dcc 100644
--- a/src/test/ui/resolve/issue-82156.stderr
+++ b/tests/ui/resolve/issue-82156.stderr
diff --git a/src/test/ui/resolve/issue-82865.rs b/tests/ui/resolve/issue-82865.rs
index 07d88c413..07d88c413 100644
--- a/src/test/ui/resolve/issue-82865.rs
+++ b/tests/ui/resolve/issue-82865.rs
diff --git a/src/test/ui/resolve/issue-82865.stderr b/tests/ui/resolve/issue-82865.stderr
index 730fd6d60..730fd6d60 100644
--- a/src/test/ui/resolve/issue-82865.stderr
+++ b/tests/ui/resolve/issue-82865.stderr
diff --git a/src/test/ui/resolve/issue-85348.rs b/tests/ui/resolve/issue-85348.rs
index 3a33c1934..3a33c1934 100644
--- a/src/test/ui/resolve/issue-85348.rs
+++ b/tests/ui/resolve/issue-85348.rs
diff --git a/src/test/ui/resolve/issue-85348.stderr b/tests/ui/resolve/issue-85348.stderr
index f839dd927..42b43f825 100644
--- a/src/test/ui/resolve/issue-85348.stderr
+++ b/tests/ui/resolve/issue-85348.stderr
@@ -21,8 +21,8 @@ LL |         let mut N;
    |
 help: consider giving `N` an explicit type
    |
-LL |         let mut N: _;
-   |                  +++
+LL |         let mut N: /* Type */;
+   |                  ++++++++++++
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/resolve/issue-85671.rs b/tests/ui/resolve/issue-85671.rs
index 337ec307e..337ec307e 100644
--- a/src/test/ui/resolve/issue-85671.rs
+++ b/tests/ui/resolve/issue-85671.rs
diff --git a/src/test/ui/resolve/issue-88472.rs b/tests/ui/resolve/issue-88472.rs
index 6bf7caedd..6bf7caedd 100644
--- a/src/test/ui/resolve/issue-88472.rs
+++ b/tests/ui/resolve/issue-88472.rs
diff --git a/src/test/ui/resolve/issue-88472.stderr b/tests/ui/resolve/issue-88472.stderr
index 8431fc977..8431fc977 100644
--- a/src/test/ui/resolve/issue-88472.stderr
+++ b/tests/ui/resolve/issue-88472.stderr
diff --git a/src/test/ui/resolve/issue-90113.rs b/tests/ui/resolve/issue-90113.rs
index f6658b45e..f6658b45e 100644
--- a/src/test/ui/resolve/issue-90113.rs
+++ b/tests/ui/resolve/issue-90113.rs
diff --git a/src/test/ui/resolve/issue-90113.stderr b/tests/ui/resolve/issue-90113.stderr
index 1b7872057..1b7872057 100644
--- a/src/test/ui/resolve/issue-90113.stderr
+++ b/tests/ui/resolve/issue-90113.stderr
diff --git a/src/test/ui/resolve/levenshtein.rs b/tests/ui/resolve/levenshtein.rs
index a6f471625..a6f471625 100644
--- a/src/test/ui/resolve/levenshtein.rs
+++ b/tests/ui/resolve/levenshtein.rs
diff --git a/src/test/ui/resolve/levenshtein.stderr b/tests/ui/resolve/levenshtein.stderr
index 9a2d61ea4..cf4782101 100644
--- a/src/test/ui/resolve/levenshtein.stderr
+++ b/tests/ui/resolve/levenshtein.stderr
@@ -18,11 +18,9 @@ error[E0412]: cannot find type `Opiton` in this scope
    |
 LL | type B = Opiton<u8>; // Misspelled type name from the prelude.
    |          ^^^^^^ help: an enum with a similar name exists: `Option`
+  --> $SRC_DIR/core/src/option.rs:LL:COL
    |
-  ::: $SRC_DIR/core/src/option.rs:LL:COL
-   |
-LL | pub enum Option<T> {
-   | ------------------ similarly named enum `Option` defined here
+   = note: similarly named enum `Option` defined here
 
 error[E0412]: cannot find type `Baz` in this scope
   --> $DIR/levenshtein.rs:16:14
diff --git a/src/test/ui/resolve/macro-determinacy-non-module.rs b/tests/ui/resolve/macro-determinacy-non-module.rs
index 3215e0cd3..3215e0cd3 100644
--- a/src/test/ui/resolve/macro-determinacy-non-module.rs
+++ b/tests/ui/resolve/macro-determinacy-non-module.rs
diff --git a/src/test/ui/resolve/missing-in-namespace.rs b/tests/ui/resolve/missing-in-namespace.rs
index e1dedb072..e1dedb072 100644
--- a/src/test/ui/resolve/missing-in-namespace.rs
+++ b/tests/ui/resolve/missing-in-namespace.rs
diff --git a/src/test/ui/resolve/missing-in-namespace.stderr b/tests/ui/resolve/missing-in-namespace.stderr
index fc925ba3b..fc925ba3b 100644
--- a/src/test/ui/resolve/missing-in-namespace.stderr
+++ b/tests/ui/resolve/missing-in-namespace.stderr
diff --git a/src/test/ui/resolve/name-clash-nullary.rs b/tests/ui/resolve/name-clash-nullary.rs
index b5f5e1214..b5f5e1214 100644
--- a/src/test/ui/resolve/name-clash-nullary.rs
+++ b/tests/ui/resolve/name-clash-nullary.rs
diff --git a/src/test/ui/resolve/name-clash-nullary.stderr b/tests/ui/resolve/name-clash-nullary.stderr
index 76c4b5914..76c4b5914 100644
--- a/src/test/ui/resolve/name-clash-nullary.stderr
+++ b/tests/ui/resolve/name-clash-nullary.stderr
diff --git a/src/test/ui/resolve/name-collision-in-trait-fn-sig.rs b/tests/ui/resolve/name-collision-in-trait-fn-sig.rs
index fba4ffa1c..fba4ffa1c 100644
--- a/src/test/ui/resolve/name-collision-in-trait-fn-sig.rs
+++ b/tests/ui/resolve/name-collision-in-trait-fn-sig.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude-nested.rs b/tests/ui/resolve/no-implicit-prelude-nested.rs
index c314967da..c314967da 100644
--- a/src/test/ui/resolve/no-implicit-prelude-nested.rs
+++ b/tests/ui/resolve/no-implicit-prelude-nested.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude-nested.stderr b/tests/ui/resolve/no-implicit-prelude-nested.stderr
index 198b630c5..198b630c5 100644
--- a/src/test/ui/resolve/no-implicit-prelude-nested.stderr
+++ b/tests/ui/resolve/no-implicit-prelude-nested.stderr
diff --git a/src/test/ui/resolve/no-implicit-prelude.rs b/tests/ui/resolve/no-implicit-prelude.rs
index 4b0ca4d52..4b0ca4d52 100644
--- a/src/test/ui/resolve/no-implicit-prelude.rs
+++ b/tests/ui/resolve/no-implicit-prelude.rs
diff --git a/src/test/ui/resolve/no-implicit-prelude.stderr b/tests/ui/resolve/no-implicit-prelude.stderr
index 36a9b65b7..36a9b65b7 100644
--- a/src/test/ui/resolve/no-implicit-prelude.stderr
+++ b/tests/ui/resolve/no-implicit-prelude.stderr
diff --git a/src/test/ui/resolve/no-std-1.rs b/tests/ui/resolve/no-std-1.rs
index 5b59e9b4e..5b59e9b4e 100644
--- a/src/test/ui/resolve/no-std-1.rs
+++ b/tests/ui/resolve/no-std-1.rs
diff --git a/src/test/ui/resolve/no-std-2.rs b/tests/ui/resolve/no-std-2.rs
index 487d41649..487d41649 100644
--- a/src/test/ui/resolve/no-std-2.rs
+++ b/tests/ui/resolve/no-std-2.rs
diff --git a/src/test/ui/resolve/no-std-3.rs b/tests/ui/resolve/no-std-3.rs
index f6c4ed579..f6c4ed579 100644
--- a/src/test/ui/resolve/no-std-3.rs
+++ b/tests/ui/resolve/no-std-3.rs
diff --git a/src/test/ui/resolve/pathless-extern-ok.rs b/tests/ui/resolve/pathless-extern-ok.rs
index 0ffa5eb89..0ffa5eb89 100644
--- a/src/test/ui/resolve/pathless-extern-ok.rs
+++ b/tests/ui/resolve/pathless-extern-ok.rs
diff --git a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.rs b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
index bd496875e..bd496875e 100644
--- a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
+++ b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.rs
diff --git a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
index 5790e425c..5790e425c 100644
--- a/src/test/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
+++ b/tests/ui/resolve/point-at-type-parameter-shadowing-another-type.stderr
diff --git a/src/test/ui/resolve/privacy-enum-ctor.rs b/tests/ui/resolve/privacy-enum-ctor.rs
index f0d2cf8c0..f0d2cf8c0 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.rs
+++ b/tests/ui/resolve/privacy-enum-ctor.rs
diff --git a/src/test/ui/resolve/privacy-enum-ctor.stderr b/tests/ui/resolve/privacy-enum-ctor.stderr
index d734fa76b..a24fe4d23 100644
--- a/src/test/ui/resolve/privacy-enum-ctor.stderr
+++ b/tests/ui/resolve/privacy-enum-ctor.stderr
@@ -264,15 +264,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:27:20
    |
 LL |             Fn(u8),
-   |             -- fn(u8) -> Z {Z::Fn} defined here
+   |             -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |         let _: Z = Z::Fn;
-   |                -   ^^^^^ expected enum `Z`, found fn item
+   |                -   ^^^^^ expected enum `Z`, found enum constructor
    |                |
    |                expected due to this
    |
-   = note: expected enum `Z`
-           found fn item `fn(u8) -> Z {Z::Fn}`
+   = note:          expected enum `Z`
+           found enum constructor `fn(u8) -> Z {Z::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |         let _: Z = Z::Fn(/* u8 */);
@@ -305,15 +305,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:43:16
    |
 LL |         Fn(u8),
-   |         -- fn(u8) -> E {E::Fn} defined here
+   |         -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |     let _: E = m::E::Fn;
-   |            -   ^^^^^^^^ expected enum `E`, found fn item
+   |            -   ^^^^^^^^ expected enum `E`, found enum constructor
    |            |
    |            expected due to this
    |
-   = note: expected enum `E`
-           found fn item `fn(u8) -> E {E::Fn}`
+   = note:          expected enum `E`
+           found enum constructor `fn(u8) -> E {E::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = m::E::Fn(/* u8 */);
@@ -346,15 +346,15 @@ error[E0308]: mismatched types
   --> $DIR/privacy-enum-ctor.rs:51:16
    |
 LL |         Fn(u8),
-   |         -- fn(u8) -> E {E::Fn} defined here
+   |         -- `Fn` defines an enum variant constructor here, which should be called
 ...
 LL |     let _: E = E::Fn;
-   |            -   ^^^^^ expected enum `E`, found fn item
+   |            -   ^^^^^ expected enum `E`, found enum constructor
    |            |
    |            expected due to this
    |
-   = note: expected enum `E`
-           found fn item `fn(u8) -> E {E::Fn}`
+   = note:          expected enum `E`
+           found enum constructor `fn(u8) -> E {E::Fn}`
 help: use parentheses to construct this tuple variant
    |
 LL |     let _: E = E::Fn(/* u8 */);
diff --git a/src/test/ui/resolve/privacy-struct-ctor.rs b/tests/ui/resolve/privacy-struct-ctor.rs
index 0eecc7f8c..0eecc7f8c 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.rs
+++ b/tests/ui/resolve/privacy-struct-ctor.rs
diff --git a/src/test/ui/resolve/privacy-struct-ctor.stderr b/tests/ui/resolve/privacy-struct-ctor.stderr
index 17a666a40..c1fcaaf05 100644
--- a/src/test/ui/resolve/privacy-struct-ctor.stderr
+++ b/tests/ui/resolve/privacy-struct-ctor.stderr
@@ -53,6 +53,10 @@ note: the tuple struct constructor `Z` is defined here
    |
 LL |         pub(in m) struct Z(pub(in m::n) u8);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |         pub(in m) struct Z(pub u8);
+   |                            ~~~
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:29:8
@@ -68,6 +72,10 @@ note: the tuple struct constructor `S` is defined here
    |
 LL |     pub struct S(u8);
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct S(pub u8);
+   |                  +++
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:31:19
@@ -83,6 +91,10 @@ note: the tuple struct constructor `S` is defined here
    |
 LL |     pub struct S(u8);
    |     ^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |     pub struct S(pub u8);
+   |                  +++
 
 error[E0603]: tuple struct constructor `Z` is private
   --> $DIR/privacy-struct-ctor.rs:35:11
@@ -98,6 +110,10 @@ note: the tuple struct constructor `Z` is defined here
    |
 LL |         pub(in m) struct Z(pub(in m::n) u8);
    |         ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+help: consider making the field publicly accessible
+   |
+LL |         pub(in m) struct Z(pub u8);
+   |                            ~~~
 
 error[E0603]: tuple struct constructor `S` is private
   --> $DIR/privacy-struct-ctor.rs:41:16
diff --git a/src/test/ui/resolve/raw-ident-in-path.rs b/tests/ui/resolve/raw-ident-in-path.rs
index 7f1163beb..7f1163beb 100644
--- a/src/test/ui/resolve/raw-ident-in-path.rs
+++ b/tests/ui/resolve/raw-ident-in-path.rs
diff --git a/src/test/ui/resolve/raw-ident-in-path.stderr b/tests/ui/resolve/raw-ident-in-path.stderr
index 771dacbbb..771dacbbb 100644
--- a/src/test/ui/resolve/raw-ident-in-path.stderr
+++ b/tests/ui/resolve/raw-ident-in-path.stderr
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.rs b/tests/ui/resolve/resolve-assoc-suggestions.rs
index ee9bce60c..ee9bce60c 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.rs
+++ b/tests/ui/resolve/resolve-assoc-suggestions.rs
diff --git a/src/test/ui/resolve/resolve-assoc-suggestions.stderr b/tests/ui/resolve/resolve-assoc-suggestions.stderr
index 8def9aa20..8def9aa20 100644
--- a/src/test/ui/resolve/resolve-assoc-suggestions.stderr
+++ b/tests/ui/resolve/resolve-assoc-suggestions.stderr
diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.rs b/tests/ui/resolve/resolve-bad-import-prefix.rs
index 325c69b43..325c69b43 100644
--- a/src/test/ui/resolve/resolve-bad-import-prefix.rs
+++ b/tests/ui/resolve/resolve-bad-import-prefix.rs
diff --git a/src/test/ui/resolve/resolve-bad-import-prefix.stderr b/tests/ui/resolve/resolve-bad-import-prefix.stderr
index 852b9c6af..852b9c6af 100644
--- a/src/test/ui/resolve/resolve-bad-import-prefix.stderr
+++ b/tests/ui/resolve/resolve-bad-import-prefix.stderr
diff --git a/src/test/ui/resolve/resolve-bad-visibility.rs b/tests/ui/resolve/resolve-bad-visibility.rs
index 7d48bb97b..7d48bb97b 100644
--- a/src/test/ui/resolve/resolve-bad-visibility.rs
+++ b/tests/ui/resolve/resolve-bad-visibility.rs
diff --git a/src/test/ui/resolve/resolve-bad-visibility.stderr b/tests/ui/resolve/resolve-bad-visibility.stderr
index 2ac41b875..2ac41b875 100644
--- a/src/test/ui/resolve/resolve-bad-visibility.stderr
+++ b/tests/ui/resolve/resolve-bad-visibility.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
index 3cb6ab52e..3cb6ab52e 100644
--- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
index ea6cb9eb0..ea6cb9eb0 100644
--- a/src/test/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-extern-crate-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
index 10772e7a4..10772e7a4 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
index abf068a1f..abf068a1f 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-import-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.fixed b/tests/ui/resolve/resolve-conflict-import-vs-import.fixed
index e429513b5..e429513b5 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.fixed
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.fixed
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs b/tests/ui/resolve/resolve-conflict-import-vs-import.rs
index 43853117a..43853117a 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr
index 632be50f4..632be50f4 100644
--- a/src/test/ui/resolve/resolve-conflict-import-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-import-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
index 122606249..122606249 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
+++ b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.rs
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
index 7b9fb6c63..7b9fb6c63 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
+++ b/tests/ui/resolve/resolve-conflict-item-vs-extern-crate.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs b/tests/ui/resolve/resolve-conflict-item-vs-import.rs
index 4308c7a27..4308c7a27 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-item-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr
index 5e5c9f6b3..5e5c9f6b3 100644
--- a/src/test/ui/resolve/resolve-conflict-item-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-item-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs b/tests/ui/resolve/resolve-conflict-type-vs-import.rs
index 3abce8396..3abce8396 100644
--- a/src/test/ui/resolve/resolve-conflict-type-vs-import.rs
+++ b/tests/ui/resolve/resolve-conflict-type-vs-import.rs
diff --git a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr
index 198ef1031..198ef1031 100644
--- a/src/test/ui/resolve/resolve-conflict-type-vs-import.stderr
+++ b/tests/ui/resolve/resolve-conflict-type-vs-import.stderr
diff --git a/src/test/ui/resolve/resolve-hint-macro.fixed b/tests/ui/resolve/resolve-hint-macro.fixed
index 54e016084..54e016084 100644
--- a/src/test/ui/resolve/resolve-hint-macro.fixed
+++ b/tests/ui/resolve/resolve-hint-macro.fixed
diff --git a/src/test/ui/resolve/resolve-hint-macro.rs b/tests/ui/resolve/resolve-hint-macro.rs
index f16e8c075..f16e8c075 100644
--- a/src/test/ui/resolve/resolve-hint-macro.rs
+++ b/tests/ui/resolve/resolve-hint-macro.rs
diff --git a/src/test/ui/resolve/resolve-hint-macro.stderr b/tests/ui/resolve/resolve-hint-macro.stderr
index 1e7ab48ef..1e7ab48ef 100644
--- a/src/test/ui/resolve/resolve-hint-macro.stderr
+++ b/tests/ui/resolve/resolve-hint-macro.stderr
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs b/tests/ui/resolve/resolve-inconsistent-binding-mode.rs
index 43e9378b7..43e9378b7 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.rs
+++ b/tests/ui/resolve/resolve-inconsistent-binding-mode.rs
diff --git a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr
index c805c9eb1..c805c9eb1 100644
--- a/src/test/ui/resolve/resolve-inconsistent-binding-mode.stderr
+++ b/tests/ui/resolve/resolve-inconsistent-binding-mode.stderr
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.rs b/tests/ui/resolve/resolve-inconsistent-names.rs
index 9a40b2034..9a40b2034 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.rs
+++ b/tests/ui/resolve/resolve-inconsistent-names.rs
diff --git a/src/test/ui/resolve/resolve-inconsistent-names.stderr b/tests/ui/resolve/resolve-inconsistent-names.stderr
index 773c9f6cd..773c9f6cd 100644
--- a/src/test/ui/resolve/resolve-inconsistent-names.stderr
+++ b/tests/ui/resolve/resolve-inconsistent-names.stderr
diff --git a/src/test/ui/resolve/resolve-issue-2428.rs b/tests/ui/resolve/resolve-issue-2428.rs
index 5f3473e9f..5f3473e9f 100644
--- a/src/test/ui/resolve/resolve-issue-2428.rs
+++ b/tests/ui/resolve/resolve-issue-2428.rs
diff --git a/src/test/ui/resolve/resolve-label.rs b/tests/ui/resolve/resolve-label.rs
index ac5410cd3..ac5410cd3 100644
--- a/src/test/ui/resolve/resolve-label.rs
+++ b/tests/ui/resolve/resolve-label.rs
diff --git a/src/test/ui/resolve/resolve-label.stderr b/tests/ui/resolve/resolve-label.stderr
index 5729348ef..5729348ef 100644
--- a/src/test/ui/resolve/resolve-label.stderr
+++ b/tests/ui/resolve/resolve-label.stderr
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.rs b/tests/ui/resolve/resolve-primitive-fallback.rs
index 992bcd797..05cabd9e3 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.rs
+++ b/tests/ui/resolve/resolve-primitive-fallback.rs
@@ -2,7 +2,7 @@ fn main() {
     // Make sure primitive type fallback doesn't work in value namespace
     std::mem::size_of(u16);
     //~^ ERROR expected value, found builtin type `u16`
-    //~| ERROR this function takes 0 arguments but 1 argument was supplied
+    //~| ERROR function takes 0 arguments but 1 argument was supplied
 
     // Make sure primitive type fallback doesn't work with global paths
     let _: ::u8;
diff --git a/src/test/ui/resolve/resolve-primitive-fallback.stderr b/tests/ui/resolve/resolve-primitive-fallback.stderr
index 6d5d5bad9..964302e92 100644
--- a/src/test/ui/resolve/resolve-primitive-fallback.stderr
+++ b/tests/ui/resolve/resolve-primitive-fallback.stderr
@@ -28,9 +28,6 @@ LL |     std::mem::size_of(u16);
    |
 note: function defined here
   --> $SRC_DIR/core/src/mem/mod.rs:LL:COL
-   |
-LL | pub const fn size_of<T>() -> usize {
-   |              ^^^^^^^
 help: remove the extra argument
    |
 LL |     std::mem::size_of();
diff --git a/src/test/ui/resolve/resolve-pseudo-shadowing.rs b/tests/ui/resolve/resolve-pseudo-shadowing.rs
index 85c684ca0..85c684ca0 100644
--- a/src/test/ui/resolve/resolve-pseudo-shadowing.rs
+++ b/tests/ui/resolve/resolve-pseudo-shadowing.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.rs b/tests/ui/resolve/resolve-self-in-impl-2.rs
index f586760c8..f586760c8 100644
--- a/src/test/ui/resolve/resolve-self-in-impl-2.rs
+++ b/tests/ui/resolve/resolve-self-in-impl-2.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl-2.stderr b/tests/ui/resolve/resolve-self-in-impl-2.stderr
index 3791fe90a..3791fe90a 100644
--- a/src/test/ui/resolve/resolve-self-in-impl-2.stderr
+++ b/tests/ui/resolve/resolve-self-in-impl-2.stderr
diff --git a/src/test/ui/resolve/resolve-self-in-impl.rs b/tests/ui/resolve/resolve-self-in-impl.rs
index d0872d1b7..d0872d1b7 100644
--- a/src/test/ui/resolve/resolve-self-in-impl.rs
+++ b/tests/ui/resolve/resolve-self-in-impl.rs
diff --git a/src/test/ui/resolve/resolve-self-in-impl.stderr b/tests/ui/resolve/resolve-self-in-impl.stderr
index b3042d413..b3042d413 100644
--- a/src/test/ui/resolve/resolve-self-in-impl.stderr
+++ b/tests/ui/resolve/resolve-self-in-impl.stderr
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.rs b/tests/ui/resolve/resolve-speculative-adjustment.rs
index 81f757829..81f757829 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.rs
+++ b/tests/ui/resolve/resolve-speculative-adjustment.rs
diff --git a/src/test/ui/resolve/resolve-speculative-adjustment.stderr b/tests/ui/resolve/resolve-speculative-adjustment.stderr
index be11a7ebe..be11a7ebe 100644
--- a/src/test/ui/resolve/resolve-speculative-adjustment.stderr
+++ b/tests/ui/resolve/resolve-speculative-adjustment.stderr
diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs b/tests/ui/resolve/resolve-type-param-in-item-in-trait.rs
index c77a66524..c77a66524 100644
--- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.rs
+++ b/tests/ui/resolve/resolve-type-param-in-item-in-trait.rs
diff --git a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr b/tests/ui/resolve/resolve-type-param-in-item-in-trait.stderr
index 0a6d1cc3b..0a6d1cc3b 100644
--- a/src/test/ui/resolve/resolve-type-param-in-item-in-trait.stderr
+++ b/tests/ui/resolve/resolve-type-param-in-item-in-trait.stderr
diff --git a/src/test/ui/resolve/resolve-unknown-trait.rs b/tests/ui/resolve/resolve-unknown-trait.rs
index 290893bbb..290893bbb 100644
--- a/src/test/ui/resolve/resolve-unknown-trait.rs
+++ b/tests/ui/resolve/resolve-unknown-trait.rs
diff --git a/src/test/ui/resolve/resolve-unknown-trait.stderr b/tests/ui/resolve/resolve-unknown-trait.stderr
index e19cfe617..e19cfe617 100644
--- a/src/test/ui/resolve/resolve-unknown-trait.stderr
+++ b/tests/ui/resolve/resolve-unknown-trait.stderr
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.rs b/tests/ui/resolve/resolve-variant-assoc-item.rs
index db4fedfb0..db4fedfb0 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.rs
+++ b/tests/ui/resolve/resolve-variant-assoc-item.rs
diff --git a/src/test/ui/resolve/resolve-variant-assoc-item.stderr b/tests/ui/resolve/resolve-variant-assoc-item.stderr
index 4be101996..4be101996 100644
--- a/src/test/ui/resolve/resolve-variant-assoc-item.stderr
+++ b/tests/ui/resolve/resolve-variant-assoc-item.stderr
diff --git a/src/test/ui/resolve/shadow-const-param.rs b/tests/ui/resolve/shadow-const-param.rs
index c435c16dc..c435c16dc 100644
--- a/src/test/ui/resolve/shadow-const-param.rs
+++ b/tests/ui/resolve/shadow-const-param.rs
diff --git a/src/test/ui/resolve/shadow-const-param.stderr b/tests/ui/resolve/shadow-const-param.stderr
index fbd0d8110..fbd0d8110 100644
--- a/src/test/ui/resolve/shadow-const-param.stderr
+++ b/tests/ui/resolve/shadow-const-param.stderr
diff --git a/src/test/ui/resolve/suggest-path-for-tuple-struct.rs b/tests/ui/resolve/suggest-path-for-tuple-struct.rs
index c8bc3e79f..c8bc3e79f 100644
--- a/src/test/ui/resolve/suggest-path-for-tuple-struct.rs
+++ b/tests/ui/resolve/suggest-path-for-tuple-struct.rs
diff --git a/src/test/ui/resolve/suggest-path-for-tuple-struct.stderr b/tests/ui/resolve/suggest-path-for-tuple-struct.stderr
index 4764cf2db..4764cf2db 100644
--- a/src/test/ui/resolve/suggest-path-for-tuple-struct.stderr
+++ b/tests/ui/resolve/suggest-path-for-tuple-struct.stderr
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
index d5d6b13d6..d5d6b13d6 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
+++ b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.rs
diff --git a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
index a4ce0deeb..a4ce0deeb 100644
--- a/src/test/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
+++ b/tests/ui/resolve/suggest-path-instead-of-mod-dot-item.stderr
diff --git a/src/test/ui/resolve/token-error-correct-2.rs b/tests/ui/resolve/token-error-correct-2.rs
index f7c7d908c..f7c7d908c 100644
--- a/src/test/ui/resolve/token-error-correct-2.rs
+++ b/tests/ui/resolve/token-error-correct-2.rs
diff --git a/src/test/ui/resolve/token-error-correct-2.stderr b/tests/ui/resolve/token-error-correct-2.stderr
index cca9f2dc8..cca9f2dc8 100644
--- a/src/test/ui/resolve/token-error-correct-2.stderr
+++ b/tests/ui/resolve/token-error-correct-2.stderr
diff --git a/src/test/ui/resolve/token-error-correct-3.rs b/tests/ui/resolve/token-error-correct-3.rs
index 52934085f..52934085f 100644
--- a/src/test/ui/resolve/token-error-correct-3.rs
+++ b/tests/ui/resolve/token-error-correct-3.rs
diff --git a/src/test/ui/resolve/token-error-correct-3.stderr b/tests/ui/resolve/token-error-correct-3.stderr
index 77c87c784..77c87c784 100644
--- a/src/test/ui/resolve/token-error-correct-3.stderr
+++ b/tests/ui/resolve/token-error-correct-3.stderr
diff --git a/src/test/ui/resolve/token-error-correct-4.fixed b/tests/ui/resolve/token-error-correct-4.fixed
index 064b9e74e..064b9e74e 100644
--- a/src/test/ui/resolve/token-error-correct-4.fixed
+++ b/tests/ui/resolve/token-error-correct-4.fixed
diff --git a/src/test/ui/resolve/token-error-correct-4.rs b/tests/ui/resolve/token-error-correct-4.rs
index 5e31d71e7..5e31d71e7 100644
--- a/src/test/ui/resolve/token-error-correct-4.rs
+++ b/tests/ui/resolve/token-error-correct-4.rs
diff --git a/src/test/ui/resolve/token-error-correct-4.stderr b/tests/ui/resolve/token-error-correct-4.stderr
index 81e5a1336..81e5a1336 100644
--- a/src/test/ui/resolve/token-error-correct-4.stderr
+++ b/tests/ui/resolve/token-error-correct-4.stderr
diff --git a/src/test/ui/resolve/token-error-correct.rs b/tests/ui/resolve/token-error-correct.rs
index 4f74df0bf..4f74df0bf 100644
--- a/src/test/ui/resolve/token-error-correct.rs
+++ b/tests/ui/resolve/token-error-correct.rs
diff --git a/src/test/ui/resolve/token-error-correct.stderr b/tests/ui/resolve/token-error-correct.stderr
index ca0c4c18a..ca0c4c18a 100644
--- a/src/test/ui/resolve/token-error-correct.stderr
+++ b/tests/ui/resolve/token-error-correct.stderr
diff --git a/src/test/ui/resolve/tuple-struct-alias.rs b/tests/ui/resolve/tuple-struct-alias.rs
index 298e7e479..298e7e479 100644
--- a/src/test/ui/resolve/tuple-struct-alias.rs
+++ b/tests/ui/resolve/tuple-struct-alias.rs
diff --git a/src/test/ui/resolve/tuple-struct-alias.stderr b/tests/ui/resolve/tuple-struct-alias.stderr
index a739ea43e..a739ea43e 100644
--- a/src/test/ui/resolve/tuple-struct-alias.stderr
+++ b/tests/ui/resolve/tuple-struct-alias.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
index ecd3f5881..ecd3f5881 100644
--- a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
+++ b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.rs
diff --git a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
index f32e0404e..f32e0404e 100644
--- a/src/test/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
+++ b/tests/ui/resolve/typo-suggestion-for-variable-with-name-similar-to-struct-field.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.rs b/tests/ui/resolve/typo-suggestion-mistyped-in-path.rs
index 3ce17a14f..3ce17a14f 100644
--- a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.rs
+++ b/tests/ui/resolve/typo-suggestion-mistyped-in-path.rs
diff --git a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.stderr b/tests/ui/resolve/typo-suggestion-mistyped-in-path.stderr
index 89b69e140..89b69e140 100644
--- a/src/test/ui/resolve/typo-suggestion-mistyped-in-path.stderr
+++ b/tests/ui/resolve/typo-suggestion-mistyped-in-path.stderr
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.rs b/tests/ui/resolve/typo-suggestion-named-underscore.rs
index a2b05db03..a2b05db03 100644
--- a/src/test/ui/resolve/typo-suggestion-named-underscore.rs
+++ b/tests/ui/resolve/typo-suggestion-named-underscore.rs
diff --git a/src/test/ui/resolve/typo-suggestion-named-underscore.stderr b/tests/ui/resolve/typo-suggestion-named-underscore.stderr
index 65d1b084a..65d1b084a 100644
--- a/src/test/ui/resolve/typo-suggestion-named-underscore.stderr
+++ b/tests/ui/resolve/typo-suggestion-named-underscore.stderr
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
index 87f9ce097..87f9ce097 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
+++ b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.rs
diff --git a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
index 8addc0303..8addc0303 100644
--- a/src/test/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
+++ b/tests/ui/resolve/unboxed-closure-sugar-nonexistent-trait.stderr
diff --git a/src/test/ui/resolve/unresolved_static_type_field.rs b/tests/ui/resolve/unresolved_static_type_field.rs
index 494ad083f..494ad083f 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.rs
+++ b/tests/ui/resolve/unresolved_static_type_field.rs
diff --git a/src/test/ui/resolve/unresolved_static_type_field.stderr b/tests/ui/resolve/unresolved_static_type_field.stderr
index 06926b53d..06926b53d 100644
--- a/src/test/ui/resolve/unresolved_static_type_field.stderr
+++ b/tests/ui/resolve/unresolved_static_type_field.stderr
diff --git a/src/test/ui/resolve/use-self-in-inner-fn.rs b/tests/ui/resolve/use-self-in-inner-fn.rs
index eccb315fe..eccb315fe 100644
--- a/src/test/ui/resolve/use-self-in-inner-fn.rs
+++ b/tests/ui/resolve/use-self-in-inner-fn.rs
diff --git a/src/test/ui/resolve/use-self-in-inner-fn.stderr b/tests/ui/resolve/use-self-in-inner-fn.stderr
index 966093499..966093499 100644
--- a/src/test/ui/resolve/use-self-in-inner-fn.stderr
+++ b/tests/ui/resolve/use-self-in-inner-fn.stderr
diff --git a/src/test/ui/resolve/use_suggestion.rs b/tests/ui/resolve/use_suggestion.rs
index 8c9bc6d76..8c9bc6d76 100644
--- a/src/test/ui/resolve/use_suggestion.rs
+++ b/tests/ui/resolve/use_suggestion.rs
diff --git a/src/test/ui/resolve/use_suggestion.stderr b/tests/ui/resolve/use_suggestion.stderr
index 54ad85383..54ad85383 100644
--- a/src/test/ui/resolve/use_suggestion.stderr
+++ b/tests/ui/resolve/use_suggestion.stderr
diff --git a/src/test/ui/resolve/use_suggestion_placement.fixed b/tests/ui/resolve/use_suggestion_placement.fixed
index d1686f7fd..d1686f7fd 100644
--- a/src/test/ui/resolve/use_suggestion_placement.fixed
+++ b/tests/ui/resolve/use_suggestion_placement.fixed
diff --git a/src/test/ui/resolve/use_suggestion_placement.rs b/tests/ui/resolve/use_suggestion_placement.rs
index 5be91f270..5be91f270 100644
--- a/src/test/ui/resolve/use_suggestion_placement.rs
+++ b/tests/ui/resolve/use_suggestion_placement.rs
diff --git a/src/test/ui/resolve/use_suggestion_placement.stderr b/tests/ui/resolve/use_suggestion_placement.stderr
index 0aadd82f6..0aadd82f6 100644
--- a/src/test/ui/resolve/use_suggestion_placement.stderr
+++ b/tests/ui/resolve/use_suggestion_placement.stderr
diff --git a/src/test/ui/resolve/visibility-indeterminate.rs b/tests/ui/resolve/visibility-indeterminate.rs
index 0e1142db3..0e1142db3 100644
--- a/src/test/ui/resolve/visibility-indeterminate.rs
+++ b/tests/ui/resolve/visibility-indeterminate.rs
diff --git a/src/test/ui/resolve/visibility-indeterminate.stderr b/tests/ui/resolve/visibility-indeterminate.stderr
index 84d82ce85..84d82ce85 100644
--- a/src/test/ui/resolve/visibility-indeterminate.stderr
+++ b/tests/ui/resolve/visibility-indeterminate.stderr