Merging upstream version 1.68.2+dfsg1.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

522 files changed, 404 insertions, 36 deletions

diff --git a/src/test/ui/error-codes/E0001.rs b/tests/ui/error-codes/E0001.rs
index 2c95f02bf..2c95f02bf 100644
--- a/src/test/ui/error-codes/E0001.rs
+++ b/tests/ui/error-codes/E0001.rs
diff --git a/src/test/ui/error-codes/E0001.stderr b/tests/ui/error-codes/E0001.stderr
index 577c49032..577c49032 100644
--- a/src/test/ui/error-codes/E0001.stderr
+++ b/tests/ui/error-codes/E0001.stderr
diff --git a/src/test/ui/error-codes/E0004-2.rs b/tests/ui/error-codes/E0004-2.rs
index c7612fd50..c7612fd50 100644
--- a/src/test/ui/error-codes/E0004-2.rs
+++ b/tests/ui/error-codes/E0004-2.rs
diff --git a/src/test/ui/error-codes/E0004-2.stderr b/tests/ui/error-codes/E0004-2.stderr
index 6f5bb4309..e829bac19 100644
--- a/src/test/ui/error-codes/E0004-2.stderr
+++ b/tests/ui/error-codes/E0004-2.stderr
@@ -6,15 +6,12 @@ LL |     match x { }
    |
 note: `Option<i32>` defined here
   --> $SRC_DIR/core/src/option.rs:LL:COL
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
    |
-LL | pub enum Option<T> {
-   | ------------------
-...
-LL |     None,
-   |     ^^^^ not covered
-...
-LL |     Some(#[stable(feature = "rust1", since = "1.0.0")] T),
-   |     ^^^^ not covered
+   = note: not covered
+  ::: $SRC_DIR/core/src/option.rs:LL:COL
+   |
+   = note: not covered
    = note: the matched value is of type `Option<i32>`
 help: ensure that all possible cases are being handled by adding a match arm with a wildcard pattern, a match arm with multiple or-patterns as shown, or multiple match arms
    |
diff --git a/src/test/ui/error-codes/E0004.rs b/tests/ui/error-codes/E0004.rs
index 1ee9d2bad..1ee9d2bad 100644
--- a/src/test/ui/error-codes/E0004.rs
+++ b/tests/ui/error-codes/E0004.rs
diff --git a/src/test/ui/error-codes/E0004.stderr b/tests/ui/error-codes/E0004.stderr
index 4ac8c904f..4ac8c904f 100644
--- a/src/test/ui/error-codes/E0004.stderr
+++ b/tests/ui/error-codes/E0004.stderr
diff --git a/src/test/ui/error-codes/E0005.rs b/tests/ui/error-codes/E0005.rs
index f4730697e..f4730697e 100644
--- a/src/test/ui/error-codes/E0005.rs
+++ b/tests/ui/error-codes/E0005.rs
diff --git a/tests/ui/error-codes/E0005.stderr b/tests/ui/error-codes/E0005.stderr
new file mode 100644
index 000000000..4692b6641
--- /dev/null
+++ b/tests/ui/error-codes/E0005.stderr
@@ -0,0 +1,17 @@
+error[E0005]: refutable pattern in local binding
+  --> $DIR/E0005.rs:3:9
+   |
+LL |     let Some(y) = x;
+   |         ^^^^^^^ pattern `None` not covered
+   |
+   = note: `let` bindings require an "irrefutable pattern", like a `struct` or an `enum` with only one variant
+   = note: for more information, visit https://doc.rust-lang.org/book/ch18-02-refutability.html
+   = note: the matched value is of type `Option<i32>`
+help: you might want to use `let else` to handle the variant that isn't matched
+   |
+LL |     let Some(y) = x else { todo!() };
+   |                     ++++++++++++++++
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0010-teach.rs b/tests/ui/error-codes/E0010-teach.rs
index fc5dffb37..fc5dffb37 100644
--- a/src/test/ui/error-codes/E0010-teach.rs
+++ b/tests/ui/error-codes/E0010-teach.rs
diff --git a/src/test/ui/error-codes/E0010-teach.stderr b/tests/ui/error-codes/E0010-teach.stderr
index 33de9fd68..33de9fd68 100644
--- a/src/test/ui/error-codes/E0010-teach.stderr
+++ b/tests/ui/error-codes/E0010-teach.stderr
diff --git a/src/test/ui/error-codes/E0010.rs b/tests/ui/error-codes/E0010.rs
index e62997640..e62997640 100644
--- a/src/test/ui/error-codes/E0010.rs
+++ b/tests/ui/error-codes/E0010.rs
diff --git a/src/test/ui/error-codes/E0010.stderr b/tests/ui/error-codes/E0010.stderr
index 0042333b9..0042333b9 100644
--- a/src/test/ui/error-codes/E0010.stderr
+++ b/tests/ui/error-codes/E0010.stderr
diff --git a/tests/ui/error-codes/E0013.rs b/tests/ui/error-codes/E0013.rs
new file mode 100644
index 000000000..9b3982a78
--- /dev/null
+++ b/tests/ui/error-codes/E0013.rs
@@ -0,0 +1,4 @@
+static X: i32 = 42;
+const Y: i32 = X; //~ ERROR constants cannot refer to statics [E0013]
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0013.stderr b/tests/ui/error-codes/E0013.stderr
new file mode 100644
index 000000000..dc22053a6
--- /dev/null
+++ b/tests/ui/error-codes/E0013.stderr
@@ -0,0 +1,11 @@
+error[E0013]: constants cannot refer to statics
+  --> $DIR/E0013.rs:2:16
+   |
+LL | const Y: i32 = X;
+   |                ^
+   |
+   = help: consider extracting the value of the `static` to a `const`, and referring to that
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0013`.
diff --git a/tests/ui/error-codes/E0015.rs b/tests/ui/error-codes/E0015.rs
new file mode 100644
index 000000000..b0211358d
--- /dev/null
+++ b/tests/ui/error-codes/E0015.rs
@@ -0,0 +1,8 @@
+fn create_some() -> Option<u8> {
+    Some(1)
+}
+
+const FOO: Option<u8> = create_some();
+//~^ ERROR cannot call non-const fn `create_some` in constants [E0015]
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0015.stderr b/tests/ui/error-codes/E0015.stderr
new file mode 100644
index 000000000..ec1ce47b2
--- /dev/null
+++ b/tests/ui/error-codes/E0015.stderr
@@ -0,0 +1,11 @@
+error[E0015]: cannot call non-const fn `create_some` in constants
+  --> $DIR/E0015.rs:5:25
+   |
+LL | const FOO: Option<u8> = create_some();
+   |                         ^^^^^^^^^^^^^
+   |
+   = note: calls in constants are limited to constant functions, tuple structs and tuple variants
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0015`.
diff --git a/src/test/ui/error-codes/E0017.rs b/tests/ui/error-codes/E0017.rs
index c211ad1a2..c211ad1a2 100644
--- a/src/test/ui/error-codes/E0017.rs
+++ b/tests/ui/error-codes/E0017.rs
diff --git a/src/test/ui/error-codes/E0017.stderr b/tests/ui/error-codes/E0017.stderr
index 6e48f9582..6e48f9582 100644
--- a/src/test/ui/error-codes/E0017.stderr
+++ b/tests/ui/error-codes/E0017.stderr
diff --git a/src/test/ui/error-codes/E0023.rs b/tests/ui/error-codes/E0023.rs
index 7ac22bb71..7ac22bb71 100644
--- a/src/test/ui/error-codes/E0023.rs
+++ b/tests/ui/error-codes/E0023.rs
diff --git a/src/test/ui/error-codes/E0023.stderr b/tests/ui/error-codes/E0023.stderr
index 3e321b037..3e321b037 100644
--- a/src/test/ui/error-codes/E0023.stderr
+++ b/tests/ui/error-codes/E0023.stderr
diff --git a/src/test/ui/error-codes/E0025.rs b/tests/ui/error-codes/E0025.rs
index 549269a75..549269a75 100644
--- a/src/test/ui/error-codes/E0025.rs
+++ b/tests/ui/error-codes/E0025.rs
diff --git a/src/test/ui/error-codes/E0025.stderr b/tests/ui/error-codes/E0025.stderr
index dfec6d027..dfec6d027 100644
--- a/src/test/ui/error-codes/E0025.stderr
+++ b/tests/ui/error-codes/E0025.stderr
diff --git a/src/test/ui/error-codes/E0026-teach.rs b/tests/ui/error-codes/E0026-teach.rs
index 7c51004ff..7c51004ff 100644
--- a/src/test/ui/error-codes/E0026-teach.rs
+++ b/tests/ui/error-codes/E0026-teach.rs
diff --git a/src/test/ui/error-codes/E0026-teach.stderr b/tests/ui/error-codes/E0026-teach.stderr
index 1a80edcbb..1a80edcbb 100644
--- a/src/test/ui/error-codes/E0026-teach.stderr
+++ b/tests/ui/error-codes/E0026-teach.stderr
diff --git a/src/test/ui/error-codes/E0026.rs b/tests/ui/error-codes/E0026.rs
index 0b1ea1c7b..0b1ea1c7b 100644
--- a/src/test/ui/error-codes/E0026.rs
+++ b/tests/ui/error-codes/E0026.rs
diff --git a/src/test/ui/error-codes/E0026.stderr b/tests/ui/error-codes/E0026.stderr
index 031481812..031481812 100644
--- a/src/test/ui/error-codes/E0026.stderr
+++ b/tests/ui/error-codes/E0026.stderr
diff --git a/src/test/ui/error-codes/E0027.rs b/tests/ui/error-codes/E0027.rs
index e7eca1ce5..e7eca1ce5 100644
--- a/src/test/ui/error-codes/E0027.rs
+++ b/tests/ui/error-codes/E0027.rs
diff --git a/src/test/ui/error-codes/E0027.stderr b/tests/ui/error-codes/E0027.stderr
index 9ae97e4a9..9ae97e4a9 100644
--- a/src/test/ui/error-codes/E0027.stderr
+++ b/tests/ui/error-codes/E0027.stderr
diff --git a/src/test/ui/error-codes/E0029-teach.rs b/tests/ui/error-codes/E0029-teach.rs
index 3ff8cb348..3ff8cb348 100644
--- a/src/test/ui/error-codes/E0029-teach.rs
+++ b/tests/ui/error-codes/E0029-teach.rs
diff --git a/src/test/ui/error-codes/E0029-teach.stderr b/tests/ui/error-codes/E0029-teach.stderr
index b89b2e7d1..b89b2e7d1 100644
--- a/src/test/ui/error-codes/E0029-teach.stderr
+++ b/tests/ui/error-codes/E0029-teach.stderr
diff --git a/src/test/ui/error-codes/E0029.rs b/tests/ui/error-codes/E0029.rs
index d9b53e113..d9b53e113 100644
--- a/src/test/ui/error-codes/E0029.rs
+++ b/tests/ui/error-codes/E0029.rs
diff --git a/src/test/ui/error-codes/E0029.stderr b/tests/ui/error-codes/E0029.stderr
index f7250b39d..f7250b39d 100644
--- a/src/test/ui/error-codes/E0029.stderr
+++ b/tests/ui/error-codes/E0029.stderr
diff --git a/src/test/ui/error-codes/E0030-teach.rs b/tests/ui/error-codes/E0030-teach.rs
index 8caa4f093..8caa4f093 100644
--- a/src/test/ui/error-codes/E0030-teach.rs
+++ b/tests/ui/error-codes/E0030-teach.rs
diff --git a/src/test/ui/error-codes/E0030-teach.stderr b/tests/ui/error-codes/E0030-teach.stderr
index 800f66416..800f66416 100644
--- a/src/test/ui/error-codes/E0030-teach.stderr
+++ b/tests/ui/error-codes/E0030-teach.stderr
diff --git a/src/test/ui/error-codes/E0030.rs b/tests/ui/error-codes/E0030.rs
index a5d8f8726..a5d8f8726 100644
--- a/src/test/ui/error-codes/E0030.rs
+++ b/tests/ui/error-codes/E0030.rs
diff --git a/src/test/ui/error-codes/E0030.stderr b/tests/ui/error-codes/E0030.stderr
index 8a6114024..8a6114024 100644
--- a/src/test/ui/error-codes/E0030.stderr
+++ b/tests/ui/error-codes/E0030.stderr
diff --git a/tests/ui/error-codes/E0033-teach.rs b/tests/ui/error-codes/E0033-teach.rs
new file mode 100644
index 000000000..289561bad
--- /dev/null
+++ b/tests/ui/error-codes/E0033-teach.rs
@@ -0,0 +1,14 @@
+// compile-flags: -Z teach
+trait SomeTrait {
+    fn foo(&self);
+}
+struct S;
+impl SomeTrait for S {
+    fn foo(&self) {}
+}
+fn main() {
+    let trait_obj: &dyn SomeTrait = &S;
+
+    let &invalid = trait_obj;
+    //~^ ERROR E0033
+}
diff --git a/tests/ui/error-codes/E0033-teach.stderr b/tests/ui/error-codes/E0033-teach.stderr
new file mode 100644
index 000000000..31bc6719a
--- /dev/null
+++ b/tests/ui/error-codes/E0033-teach.stderr
@@ -0,0 +1,13 @@
+error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
+  --> $DIR/E0033-teach.rs:12:9
+   |
+LL |     let &invalid = trait_obj;
+   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
+   |
+   = note: This error indicates that a pointer to a trait type cannot be implicitly dereferenced by a pattern. Every trait defines a type, but because the size of trait implementors isn't fixed, this type has no compile-time size. Therefore, all accesses to trait types must be through pointers. If you encounter this error you should try to avoid dereferencing the pointer.
+           
+           You can read more about trait objects in the Trait Objects section of the Reference: https://doc.rust-lang.org/reference/types.html#trait-objects
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0033`.
diff --git a/tests/ui/error-codes/E0033.rs b/tests/ui/error-codes/E0033.rs
new file mode 100644
index 000000000..bd6ec2072
--- /dev/null
+++ b/tests/ui/error-codes/E0033.rs
@@ -0,0 +1,13 @@
+trait SomeTrait {
+    fn foo(&self);
+}
+struct S;
+impl SomeTrait for S {
+    fn foo(&self) {}
+}
+fn main() {
+    let trait_obj: &dyn SomeTrait = &S;
+
+    let &invalid = trait_obj;
+    //~^ ERROR E0033
+}
diff --git a/tests/ui/error-codes/E0033.stderr b/tests/ui/error-codes/E0033.stderr
new file mode 100644
index 000000000..ab2e780ee
--- /dev/null
+++ b/tests/ui/error-codes/E0033.stderr
@@ -0,0 +1,9 @@
+error[E0033]: type `&dyn SomeTrait` cannot be dereferenced
+  --> $DIR/E0033.rs:11:9
+   |
+LL |     let &invalid = trait_obj;
+   |         ^^^^^^^^ type `&dyn SomeTrait` cannot be dereferenced
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0033`.
diff --git a/src/test/ui/error-codes/E0034.rs b/tests/ui/error-codes/E0034.rs
index f962da115..f962da115 100644
--- a/src/test/ui/error-codes/E0034.rs
+++ b/tests/ui/error-codes/E0034.rs
diff --git a/src/test/ui/error-codes/E0034.stderr b/tests/ui/error-codes/E0034.stderr
index e29621702..e29621702 100644
--- a/src/test/ui/error-codes/E0034.stderr
+++ b/tests/ui/error-codes/E0034.stderr
diff --git a/src/test/ui/error-codes/E0038.rs b/tests/ui/error-codes/E0038.rs
index 9757e2ab1..9757e2ab1 100644
--- a/src/test/ui/error-codes/E0038.rs
+++ b/tests/ui/error-codes/E0038.rs
diff --git a/src/test/ui/error-codes/E0038.stderr b/tests/ui/error-codes/E0038.stderr
index 3773d6f52..3773d6f52 100644
--- a/src/test/ui/error-codes/E0038.stderr
+++ b/tests/ui/error-codes/E0038.stderr
diff --git a/src/test/ui/error-codes/E0040.fixed b/tests/ui/error-codes/E0040.fixed
index 139dc8f94..139dc8f94 100644
--- a/src/test/ui/error-codes/E0040.fixed
+++ b/tests/ui/error-codes/E0040.fixed
diff --git a/src/test/ui/error-codes/E0040.rs b/tests/ui/error-codes/E0040.rs
index 9ffc42d0c..9ffc42d0c 100644
--- a/src/test/ui/error-codes/E0040.rs
+++ b/tests/ui/error-codes/E0040.rs
diff --git a/src/test/ui/error-codes/E0040.stderr b/tests/ui/error-codes/E0040.stderr
index 9fcda1a93..9fcda1a93 100644
--- a/src/test/ui/error-codes/E0040.stderr
+++ b/tests/ui/error-codes/E0040.stderr
diff --git a/src/test/ui/error-codes/E0044.rs b/tests/ui/error-codes/E0044.rs
index d9cdaf83c..d9cdaf83c 100644
--- a/src/test/ui/error-codes/E0044.rs
+++ b/tests/ui/error-codes/E0044.rs
diff --git a/src/test/ui/error-codes/E0044.stderr b/tests/ui/error-codes/E0044.stderr
index e889c167b..e889c167b 100644
--- a/src/test/ui/error-codes/E0044.stderr
+++ b/tests/ui/error-codes/E0044.stderr
diff --git a/src/test/ui/error-codes/E0045.rs b/tests/ui/error-codes/E0045.rs
index fb3df56f7..fb3df56f7 100644
--- a/src/test/ui/error-codes/E0045.rs
+++ b/tests/ui/error-codes/E0045.rs
diff --git a/src/test/ui/error-codes/E0045.stderr b/tests/ui/error-codes/E0045.stderr
index fcc613b11..fcc613b11 100644
--- a/src/test/ui/error-codes/E0045.stderr
+++ b/tests/ui/error-codes/E0045.stderr
diff --git a/src/test/ui/error-codes/E0049.rs b/tests/ui/error-codes/E0049.rs
index 3dd910019..3dd910019 100644
--- a/src/test/ui/error-codes/E0049.rs
+++ b/tests/ui/error-codes/E0049.rs
diff --git a/src/test/ui/error-codes/E0049.stderr b/tests/ui/error-codes/E0049.stderr
index c0cd31faa..c0cd31faa 100644
--- a/src/test/ui/error-codes/E0049.stderr
+++ b/tests/ui/error-codes/E0049.stderr
diff --git a/src/test/ui/error-codes/E0050.rs b/tests/ui/error-codes/E0050.rs
index 98fb62785..98fb62785 100644
--- a/src/test/ui/error-codes/E0050.rs
+++ b/tests/ui/error-codes/E0050.rs
diff --git a/src/test/ui/error-codes/E0050.stderr b/tests/ui/error-codes/E0050.stderr
index fe9ac5e8e..fe9ac5e8e 100644
--- a/src/test/ui/error-codes/E0050.stderr
+++ b/tests/ui/error-codes/E0050.stderr
diff --git a/src/test/ui/error-codes/E0054.rs b/tests/ui/error-codes/E0054.rs
index 55bda4ead..55bda4ead 100644
--- a/src/test/ui/error-codes/E0054.rs
+++ b/tests/ui/error-codes/E0054.rs
diff --git a/src/test/ui/error-codes/E0054.stderr b/tests/ui/error-codes/E0054.stderr
index 6b1092760..6b1092760 100644
--- a/src/test/ui/error-codes/E0054.stderr
+++ b/tests/ui/error-codes/E0054.stderr
diff --git a/src/test/ui/error-codes/E0055.rs b/tests/ui/error-codes/E0055.rs
index fd5804bbc..fd5804bbc 100644
--- a/src/test/ui/error-codes/E0055.rs
+++ b/tests/ui/error-codes/E0055.rs
diff --git a/src/test/ui/error-codes/E0055.stderr b/tests/ui/error-codes/E0055.stderr
index a52c90962..a52c90962 100644
--- a/src/test/ui/error-codes/E0055.stderr
+++ b/tests/ui/error-codes/E0055.stderr
diff --git a/src/test/ui/error-codes/E0057.rs b/tests/ui/error-codes/E0057.rs
index 83f941f65..83f941f65 100644
--- a/src/test/ui/error-codes/E0057.rs
+++ b/tests/ui/error-codes/E0057.rs
diff --git a/src/test/ui/error-codes/E0057.stderr b/tests/ui/error-codes/E0057.stderr
index bea226f09..163737895 100644
--- a/src/test/ui/error-codes/E0057.stderr
+++ b/tests/ui/error-codes/E0057.stderr
@@ -11,8 +11,8 @@ LL |     let f = |x| x * 3;
    |             ^^^
 help: provide the argument
    |
-LL |     let a = f(/* value */);
-   |              ~~~~~~~~~~~~~
+LL |     let a = f(/* x */);
+   |              ~~~~~~~~~
 
 error[E0057]: this function takes 1 argument but 2 arguments were supplied
   --> $DIR/E0057.rs:5:13
diff --git a/src/test/ui/error-codes/E0059.rs b/tests/ui/error-codes/E0059.rs
index f775089bf..f775089bf 100644
--- a/src/test/ui/error-codes/E0059.rs
+++ b/tests/ui/error-codes/E0059.rs
diff --git a/src/test/ui/error-codes/E0059.stderr b/tests/ui/error-codes/E0059.stderr
index f331d0142..4f6abb22a 100644
--- a/src/test/ui/error-codes/E0059.stderr
+++ b/tests/ui/error-codes/E0059.stderr
@@ -6,9 +6,6 @@ LL | fn foo<F: Fn<i32>>(f: F) -> F::Output { f(3) }
    |
 note: required by a bound in `Fn`
   --> $SRC_DIR/core/src/ops/function.rs:LL:COL
-   |
-LL | pub trait Fn<Args: Tuple>: FnMut<Args> {
-   |                    ^^^^^ required by this bound in `Fn`
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0060.rs b/tests/ui/error-codes/E0060.rs
index 7050a1dff..7050a1dff 100644
--- a/src/test/ui/error-codes/E0060.rs
+++ b/tests/ui/error-codes/E0060.rs
diff --git a/src/test/ui/error-codes/E0060.stderr b/tests/ui/error-codes/E0060.stderr
index 934a18d89..934a18d89 100644
--- a/src/test/ui/error-codes/E0060.stderr
+++ b/tests/ui/error-codes/E0060.stderr
diff --git a/src/test/ui/error-codes/E0061.rs b/tests/ui/error-codes/E0061.rs
index b6fae6c63..b6fae6c63 100644
--- a/src/test/ui/error-codes/E0061.rs
+++ b/tests/ui/error-codes/E0061.rs
diff --git a/src/test/ui/error-codes/E0061.stderr b/tests/ui/error-codes/E0061.stderr
index fa4ccbe66..fa4ccbe66 100644
--- a/src/test/ui/error-codes/E0061.stderr
+++ b/tests/ui/error-codes/E0061.stderr
diff --git a/src/test/ui/error-codes/E0062.rs b/tests/ui/error-codes/E0062.rs
index 3b7f88750..3b7f88750 100644
--- a/src/test/ui/error-codes/E0062.rs
+++ b/tests/ui/error-codes/E0062.rs
diff --git a/src/test/ui/error-codes/E0062.stderr b/tests/ui/error-codes/E0062.stderr
index a3e140995..a3e140995 100644
--- a/src/test/ui/error-codes/E0062.stderr
+++ b/tests/ui/error-codes/E0062.stderr
diff --git a/src/test/ui/error-codes/E0063.rs b/tests/ui/error-codes/E0063.rs
index 48c9c13f0..48c9c13f0 100644
--- a/src/test/ui/error-codes/E0063.rs
+++ b/tests/ui/error-codes/E0063.rs
diff --git a/src/test/ui/error-codes/E0063.stderr b/tests/ui/error-codes/E0063.stderr
index 235e20402..235e20402 100644
--- a/src/test/ui/error-codes/E0063.stderr
+++ b/tests/ui/error-codes/E0063.stderr
diff --git a/src/test/ui/error-codes/E0067.rs b/tests/ui/error-codes/E0067.rs
index 5925443dd..5925443dd 100644
--- a/src/test/ui/error-codes/E0067.rs
+++ b/tests/ui/error-codes/E0067.rs
diff --git a/src/test/ui/error-codes/E0067.stderr b/tests/ui/error-codes/E0067.stderr
index ec0358cb7..ec0358cb7 100644
--- a/src/test/ui/error-codes/E0067.stderr
+++ b/tests/ui/error-codes/E0067.stderr
diff --git a/src/test/ui/error-codes/E0069.rs b/tests/ui/error-codes/E0069.rs
index a4ba9fd8d..a4ba9fd8d 100644
--- a/src/test/ui/error-codes/E0069.rs
+++ b/tests/ui/error-codes/E0069.rs
diff --git a/src/test/ui/error-codes/E0069.stderr b/tests/ui/error-codes/E0069.stderr
index ff9bbe01d..ff9bbe01d 100644
--- a/src/test/ui/error-codes/E0069.stderr
+++ b/tests/ui/error-codes/E0069.stderr
diff --git a/src/test/ui/error-codes/E0070.rs b/tests/ui/error-codes/E0070.rs
index 3aae0c9ff..3aae0c9ff 100644
--- a/src/test/ui/error-codes/E0070.rs
+++ b/tests/ui/error-codes/E0070.rs
diff --git a/src/test/ui/error-codes/E0070.stderr b/tests/ui/error-codes/E0070.stderr
index 8868bc257..8868bc257 100644
--- a/src/test/ui/error-codes/E0070.stderr
+++ b/tests/ui/error-codes/E0070.stderr
diff --git a/src/test/ui/error-codes/E0071.rs b/tests/ui/error-codes/E0071.rs
index bd8469de7..bd8469de7 100644
--- a/src/test/ui/error-codes/E0071.rs
+++ b/tests/ui/error-codes/E0071.rs
diff --git a/src/test/ui/error-codes/E0071.stderr b/tests/ui/error-codes/E0071.stderr
index ae312fc40..ae312fc40 100644
--- a/src/test/ui/error-codes/E0071.stderr
+++ b/tests/ui/error-codes/E0071.stderr
diff --git a/src/test/ui/error-codes/E0075.rs b/tests/ui/error-codes/E0075.rs
index 7feab0a8b..7feab0a8b 100644
--- a/src/test/ui/error-codes/E0075.rs
+++ b/tests/ui/error-codes/E0075.rs
diff --git a/src/test/ui/error-codes/E0075.stderr b/tests/ui/error-codes/E0075.stderr
index 3f927726a..3f927726a 100644
--- a/src/test/ui/error-codes/E0075.stderr
+++ b/tests/ui/error-codes/E0075.stderr
diff --git a/src/test/ui/error-codes/E0076.rs b/tests/ui/error-codes/E0076.rs
index a27072eb7..a27072eb7 100644
--- a/src/test/ui/error-codes/E0076.rs
+++ b/tests/ui/error-codes/E0076.rs
diff --git a/src/test/ui/error-codes/E0076.stderr b/tests/ui/error-codes/E0076.stderr
index 7d4ff8798..7d4ff8798 100644
--- a/src/test/ui/error-codes/E0076.stderr
+++ b/tests/ui/error-codes/E0076.stderr
diff --git a/src/test/ui/error-codes/E0077.rs b/tests/ui/error-codes/E0077.rs
index fa2d5e24f..fa2d5e24f 100644
--- a/src/test/ui/error-codes/E0077.rs
+++ b/tests/ui/error-codes/E0077.rs
diff --git a/src/test/ui/error-codes/E0077.stderr b/tests/ui/error-codes/E0077.stderr
index 9a84b2ec4..9a84b2ec4 100644
--- a/src/test/ui/error-codes/E0077.stderr
+++ b/tests/ui/error-codes/E0077.stderr
diff --git a/src/test/ui/error-codes/E0080.rs b/tests/ui/error-codes/E0080.rs
index ea3264b61..ea3264b61 100644
--- a/src/test/ui/error-codes/E0080.rs
+++ b/tests/ui/error-codes/E0080.rs
diff --git a/src/test/ui/error-codes/E0080.stderr b/tests/ui/error-codes/E0080.stderr
index 60ed9a435..60ed9a435 100644
--- a/src/test/ui/error-codes/E0080.stderr
+++ b/tests/ui/error-codes/E0080.stderr
diff --git a/src/test/ui/error-codes/E0081.rs b/tests/ui/error-codes/E0081.rs
index f53fda864..f53fda864 100644
--- a/src/test/ui/error-codes/E0081.rs
+++ b/tests/ui/error-codes/E0081.rs
diff --git a/src/test/ui/error-codes/E0081.stderr b/tests/ui/error-codes/E0081.stderr
index d4b21f689..d4b21f689 100644
--- a/src/test/ui/error-codes/E0081.stderr
+++ b/tests/ui/error-codes/E0081.stderr
diff --git a/src/test/ui/error-codes/E0084.rs b/tests/ui/error-codes/E0084.rs
index a550e0412..a550e0412 100644
--- a/src/test/ui/error-codes/E0084.rs
+++ b/tests/ui/error-codes/E0084.rs
diff --git a/src/test/ui/error-codes/E0084.stderr b/tests/ui/error-codes/E0084.stderr
index e1bda22b8..e1bda22b8 100644
--- a/src/test/ui/error-codes/E0084.stderr
+++ b/tests/ui/error-codes/E0084.stderr
diff --git a/src/test/ui/error-codes/E0091.rs b/tests/ui/error-codes/E0091.rs
index 2427f5cfe..2427f5cfe 100644
--- a/src/test/ui/error-codes/E0091.rs
+++ b/tests/ui/error-codes/E0091.rs
diff --git a/src/test/ui/error-codes/E0091.stderr b/tests/ui/error-codes/E0091.stderr
index a596b75e4..a596b75e4 100644
--- a/src/test/ui/error-codes/E0091.stderr
+++ b/tests/ui/error-codes/E0091.stderr
diff --git a/src/test/ui/error-codes/E0092.rs b/tests/ui/error-codes/E0092.rs
index ddaace98b..ddaace98b 100644
--- a/src/test/ui/error-codes/E0092.rs
+++ b/tests/ui/error-codes/E0092.rs
diff --git a/src/test/ui/error-codes/E0092.stderr b/tests/ui/error-codes/E0092.stderr
index 2d590a8e1..2d590a8e1 100644
--- a/src/test/ui/error-codes/E0092.stderr
+++ b/tests/ui/error-codes/E0092.stderr
diff --git a/src/test/ui/error-codes/E0093.rs b/tests/ui/error-codes/E0093.rs
index a2f0b1ae4..a2f0b1ae4 100644
--- a/src/test/ui/error-codes/E0093.rs
+++ b/tests/ui/error-codes/E0093.rs
diff --git a/src/test/ui/error-codes/E0093.stderr b/tests/ui/error-codes/E0093.stderr
index cb0305593..cb0305593 100644
--- a/src/test/ui/error-codes/E0093.stderr
+++ b/tests/ui/error-codes/E0093.stderr
diff --git a/src/test/ui/error-codes/E0094.rs b/tests/ui/error-codes/E0094.rs
index a2ec932c1..a2ec932c1 100644
--- a/src/test/ui/error-codes/E0094.rs
+++ b/tests/ui/error-codes/E0094.rs
diff --git a/src/test/ui/error-codes/E0094.stderr b/tests/ui/error-codes/E0094.stderr
index 531cd4c78..531cd4c78 100644
--- a/src/test/ui/error-codes/E0094.stderr
+++ b/tests/ui/error-codes/E0094.stderr
diff --git a/src/test/ui/error-codes/E0106.rs b/tests/ui/error-codes/E0106.rs
index cc3438727..cc3438727 100644
--- a/src/test/ui/error-codes/E0106.rs
+++ b/tests/ui/error-codes/E0106.rs
diff --git a/src/test/ui/error-codes/E0106.stderr b/tests/ui/error-codes/E0106.stderr
index d11a24f77..d11a24f77 100644
--- a/src/test/ui/error-codes/E0106.stderr
+++ b/tests/ui/error-codes/E0106.stderr
diff --git a/src/test/ui/error-codes/E0107.rs b/tests/ui/error-codes/E0107.rs
index d369fc2a5..d369fc2a5 100644
--- a/src/test/ui/error-codes/E0107.rs
+++ b/tests/ui/error-codes/E0107.rs
diff --git a/src/test/ui/error-codes/E0107.stderr b/tests/ui/error-codes/E0107.stderr
index 03430f8fa..03430f8fa 100644
--- a/src/test/ui/error-codes/E0107.stderr
+++ b/tests/ui/error-codes/E0107.stderr
diff --git a/src/test/ui/error-codes/E0109.rs b/tests/ui/error-codes/E0109.rs
index 2e3825649..2e3825649 100644
--- a/src/test/ui/error-codes/E0109.rs
+++ b/tests/ui/error-codes/E0109.rs
diff --git a/src/test/ui/error-codes/E0109.stderr b/tests/ui/error-codes/E0109.stderr
index 8f4cb86de..8f4cb86de 100644
--- a/src/test/ui/error-codes/E0109.stderr
+++ b/tests/ui/error-codes/E0109.stderr
diff --git a/src/test/ui/error-codes/E0110.rs b/tests/ui/error-codes/E0110.rs
index 314c7f5af..314c7f5af 100644
--- a/src/test/ui/error-codes/E0110.rs
+++ b/tests/ui/error-codes/E0110.rs
diff --git a/src/test/ui/error-codes/E0110.stderr b/tests/ui/error-codes/E0110.stderr
index 4ce2a0a41..4ce2a0a41 100644
--- a/src/test/ui/error-codes/E0110.stderr
+++ b/tests/ui/error-codes/E0110.stderr
diff --git a/src/test/ui/error-codes/E0116.rs b/tests/ui/error-codes/E0116.rs
index 898beb10b..898beb10b 100644
--- a/src/test/ui/error-codes/E0116.rs
+++ b/tests/ui/error-codes/E0116.rs
diff --git a/src/test/ui/error-codes/E0116.stderr b/tests/ui/error-codes/E0116.stderr
index a5ceeb4a5..a5ceeb4a5 100644
--- a/src/test/ui/error-codes/E0116.stderr
+++ b/tests/ui/error-codes/E0116.stderr
diff --git a/src/test/ui/error-codes/E0117.rs b/tests/ui/error-codes/E0117.rs
index 406d24e36..406d24e36 100644
--- a/src/test/ui/error-codes/E0117.rs
+++ b/tests/ui/error-codes/E0117.rs
diff --git a/src/test/ui/error-codes/E0117.stderr b/tests/ui/error-codes/E0117.stderr
index f144aa9f7..f144aa9f7 100644
--- a/src/test/ui/error-codes/E0117.stderr
+++ b/tests/ui/error-codes/E0117.stderr
diff --git a/src/test/ui/error-codes/E0118.rs b/tests/ui/error-codes/E0118.rs
index a61ba7bbf..a61ba7bbf 100644
--- a/src/test/ui/error-codes/E0118.rs
+++ b/tests/ui/error-codes/E0118.rs
diff --git a/src/test/ui/error-codes/E0118.stderr b/tests/ui/error-codes/E0118.stderr
index 8c6fa7947..8c6fa7947 100644
--- a/src/test/ui/error-codes/E0118.stderr
+++ b/tests/ui/error-codes/E0118.stderr
diff --git a/src/test/ui/error-codes/E0119.rs b/tests/ui/error-codes/E0119.rs
index 7f89e5a1a..7f89e5a1a 100644
--- a/src/test/ui/error-codes/E0119.rs
+++ b/tests/ui/error-codes/E0119.rs
diff --git a/src/test/ui/error-codes/E0119.stderr b/tests/ui/error-codes/E0119.stderr
index e08a2c7fc..e08a2c7fc 100644
--- a/src/test/ui/error-codes/E0119.stderr
+++ b/tests/ui/error-codes/E0119.stderr
diff --git a/src/test/ui/error-codes/E0120.rs b/tests/ui/error-codes/E0120.rs
index a0a301a06..a0a301a06 100644
--- a/src/test/ui/error-codes/E0120.rs
+++ b/tests/ui/error-codes/E0120.rs
diff --git a/src/test/ui/error-codes/E0120.stderr b/tests/ui/error-codes/E0120.stderr
index 75778f1f9..75778f1f9 100644
--- a/src/test/ui/error-codes/E0120.stderr
+++ b/tests/ui/error-codes/E0120.stderr
diff --git a/src/test/ui/error-codes/E0121.rs b/tests/ui/error-codes/E0121.rs
index 98cd6d54c..98cd6d54c 100644
--- a/src/test/ui/error-codes/E0121.rs
+++ b/tests/ui/error-codes/E0121.rs
diff --git a/src/test/ui/error-codes/E0121.stderr b/tests/ui/error-codes/E0121.stderr
index 023d7e011..023d7e011 100644
--- a/src/test/ui/error-codes/E0121.stderr
+++ b/tests/ui/error-codes/E0121.stderr
diff --git a/src/test/ui/error-codes/E0124.rs b/tests/ui/error-codes/E0124.rs
index 9d6a716a6..9d6a716a6 100644
--- a/src/test/ui/error-codes/E0124.rs
+++ b/tests/ui/error-codes/E0124.rs
diff --git a/src/test/ui/error-codes/E0124.stderr b/tests/ui/error-codes/E0124.stderr
index 73819a89d..73819a89d 100644
--- a/src/test/ui/error-codes/E0124.stderr
+++ b/tests/ui/error-codes/E0124.stderr
diff --git a/src/test/ui/error-codes/E0128.rs b/tests/ui/error-codes/E0128.rs
index f42c32b91..f42c32b91 100644
--- a/src/test/ui/error-codes/E0128.rs
+++ b/tests/ui/error-codes/E0128.rs
diff --git a/src/test/ui/error-codes/E0128.stderr b/tests/ui/error-codes/E0128.stderr
index eb66d4693..eb66d4693 100644
--- a/src/test/ui/error-codes/E0128.stderr
+++ b/tests/ui/error-codes/E0128.stderr
diff --git a/src/test/ui/error-codes/E0130.rs b/tests/ui/error-codes/E0130.rs
index d52350789..d52350789 100644
--- a/src/test/ui/error-codes/E0130.rs
+++ b/tests/ui/error-codes/E0130.rs
diff --git a/src/test/ui/error-codes/E0130.stderr b/tests/ui/error-codes/E0130.stderr
index a45571f40..a45571f40 100644
--- a/src/test/ui/error-codes/E0130.stderr
+++ b/tests/ui/error-codes/E0130.stderr
diff --git a/src/test/ui/error-codes/E0131.rs b/tests/ui/error-codes/E0131.rs
index 3ed739949..3ed739949 100644
--- a/src/test/ui/error-codes/E0131.rs
+++ b/tests/ui/error-codes/E0131.rs
diff --git a/src/test/ui/error-codes/E0131.stderr b/tests/ui/error-codes/E0131.stderr
index 4467e19e9..4467e19e9 100644
--- a/src/test/ui/error-codes/E0131.stderr
+++ b/tests/ui/error-codes/E0131.stderr
diff --git a/src/test/ui/error-codes/E0132.rs b/tests/ui/error-codes/E0132.rs
index fb5e5d7b9..fb5e5d7b9 100644
--- a/src/test/ui/error-codes/E0132.rs
+++ b/tests/ui/error-codes/E0132.rs
diff --git a/src/test/ui/error-codes/E0132.stderr b/tests/ui/error-codes/E0132.stderr
index c21363756..c21363756 100644
--- a/src/test/ui/error-codes/E0132.stderr
+++ b/tests/ui/error-codes/E0132.stderr
diff --git a/src/test/ui/error-codes/E0133.mir.stderr b/tests/ui/error-codes/E0133.mir.stderr
index b11d5e2c2..b11d5e2c2 100644
--- a/src/test/ui/error-codes/E0133.mir.stderr
+++ b/tests/ui/error-codes/E0133.mir.stderr
diff --git a/src/test/ui/error-codes/E0133.rs b/tests/ui/error-codes/E0133.rs
index dee1475ba..dee1475ba 100644
--- a/src/test/ui/error-codes/E0133.rs
+++ b/tests/ui/error-codes/E0133.rs
diff --git a/src/test/ui/error-codes/E0133.thir.stderr b/tests/ui/error-codes/E0133.thir.stderr
index f1d7aba2a..f1d7aba2a 100644
--- a/src/test/ui/error-codes/E0133.thir.stderr
+++ b/tests/ui/error-codes/E0133.thir.stderr
diff --git a/src/test/ui/error-codes/E0138.rs b/tests/ui/error-codes/E0138.rs
index 6f3c36282..6f3c36282 100644
--- a/src/test/ui/error-codes/E0138.rs
+++ b/tests/ui/error-codes/E0138.rs
diff --git a/src/test/ui/error-codes/E0138.stderr b/tests/ui/error-codes/E0138.stderr
index fa8c39427..fa8c39427 100644
--- a/src/test/ui/error-codes/E0138.stderr
+++ b/tests/ui/error-codes/E0138.stderr
diff --git a/src/test/ui/error-codes/E0152.rs b/tests/ui/error-codes/E0152.rs
index ee8e5e6df..ee8e5e6df 100644
--- a/src/test/ui/error-codes/E0152.rs
+++ b/tests/ui/error-codes/E0152.rs
diff --git a/src/test/ui/error-codes/E0152.stderr b/tests/ui/error-codes/E0152.stderr
index 29f7e4ad6..29f7e4ad6 100644
--- a/src/test/ui/error-codes/E0152.stderr
+++ b/tests/ui/error-codes/E0152.stderr
diff --git a/src/test/ui/error-codes/E0161.base.stderr b/tests/ui/error-codes/E0161.base.stderr
index 15d98b657..15d98b657 100644
--- a/src/test/ui/error-codes/E0161.base.stderr
+++ b/tests/ui/error-codes/E0161.base.stderr
diff --git a/src/test/ui/error-codes/E0161.rs b/tests/ui/error-codes/E0161.rs
index c906e3c35..c906e3c35 100644
--- a/src/test/ui/error-codes/E0161.rs
+++ b/tests/ui/error-codes/E0161.rs
diff --git a/src/test/ui/error-codes/E0164.rs b/tests/ui/error-codes/E0164.rs
index 2d412f754..2d412f754 100644
--- a/src/test/ui/error-codes/E0164.rs
+++ b/tests/ui/error-codes/E0164.rs
diff --git a/src/test/ui/error-codes/E0164.stderr b/tests/ui/error-codes/E0164.stderr
index 5a80d6ec3..5a80d6ec3 100644
--- a/src/test/ui/error-codes/E0164.stderr
+++ b/tests/ui/error-codes/E0164.stderr
diff --git a/src/test/ui/error-codes/E0184.rs b/tests/ui/error-codes/E0184.rs
index 0c448e4ad..0c448e4ad 100644
--- a/src/test/ui/error-codes/E0184.rs
+++ b/tests/ui/error-codes/E0184.rs
diff --git a/src/test/ui/error-codes/E0184.stderr b/tests/ui/error-codes/E0184.stderr
index bb3017b6e..bb3017b6e 100644
--- a/src/test/ui/error-codes/E0184.stderr
+++ b/tests/ui/error-codes/E0184.stderr
diff --git a/src/test/ui/error-codes/E0185.rs b/tests/ui/error-codes/E0185.rs
index 45eb8b0f2..45eb8b0f2 100644
--- a/src/test/ui/error-codes/E0185.rs
+++ b/tests/ui/error-codes/E0185.rs
diff --git a/src/test/ui/error-codes/E0185.stderr b/tests/ui/error-codes/E0185.stderr
index 8a99c0688..8a99c0688 100644
--- a/src/test/ui/error-codes/E0185.stderr
+++ b/tests/ui/error-codes/E0185.stderr
diff --git a/src/test/ui/error-codes/E0186.rs b/tests/ui/error-codes/E0186.rs
index 83ef78ef2..83ef78ef2 100644
--- a/src/test/ui/error-codes/E0186.rs
+++ b/tests/ui/error-codes/E0186.rs
diff --git a/src/test/ui/error-codes/E0186.stderr b/tests/ui/error-codes/E0186.stderr
index 8971d61fc..8971d61fc 100644
--- a/src/test/ui/error-codes/E0186.stderr
+++ b/tests/ui/error-codes/E0186.stderr
diff --git a/src/test/ui/error-codes/E0191.rs b/tests/ui/error-codes/E0191.rs
index 22f739b9e..22f739b9e 100644
--- a/src/test/ui/error-codes/E0191.rs
+++ b/tests/ui/error-codes/E0191.rs
diff --git a/src/test/ui/error-codes/E0191.stderr b/tests/ui/error-codes/E0191.stderr
index cf80c9c46..cf80c9c46 100644
--- a/src/test/ui/error-codes/E0191.stderr
+++ b/tests/ui/error-codes/E0191.stderr
diff --git a/src/test/ui/error-codes/E0194.rs b/tests/ui/error-codes/E0194.rs
index 8a43f38fc..8a43f38fc 100644
--- a/src/test/ui/error-codes/E0194.rs
+++ b/tests/ui/error-codes/E0194.rs
diff --git a/src/test/ui/error-codes/E0194.stderr b/tests/ui/error-codes/E0194.stderr
index f2c908eea..f2c908eea 100644
--- a/src/test/ui/error-codes/E0194.stderr
+++ b/tests/ui/error-codes/E0194.stderr
diff --git a/src/test/ui/error-codes/E0195.rs b/tests/ui/error-codes/E0195.rs
index f712ee42b..f712ee42b 100644
--- a/src/test/ui/error-codes/E0195.rs
+++ b/tests/ui/error-codes/E0195.rs
diff --git a/src/test/ui/error-codes/E0195.stderr b/tests/ui/error-codes/E0195.stderr
index 6eaa1750e..6eaa1750e 100644
--- a/src/test/ui/error-codes/E0195.stderr
+++ b/tests/ui/error-codes/E0195.stderr
diff --git a/src/test/ui/error-codes/E0197.rs b/tests/ui/error-codes/E0197.rs
index 4025a1f6c..4025a1f6c 100644
--- a/src/test/ui/error-codes/E0197.rs
+++ b/tests/ui/error-codes/E0197.rs
diff --git a/src/test/ui/error-codes/E0197.stderr b/tests/ui/error-codes/E0197.stderr
index 35e104264..35e104264 100644
--- a/src/test/ui/error-codes/E0197.stderr
+++ b/tests/ui/error-codes/E0197.stderr
diff --git a/src/test/ui/error-codes/E0198.rs b/tests/ui/error-codes/E0198.rs
index 041bbe8fd..041bbe8fd 100644
--- a/src/test/ui/error-codes/E0198.rs
+++ b/tests/ui/error-codes/E0198.rs
diff --git a/src/test/ui/error-codes/E0198.stderr b/tests/ui/error-codes/E0198.stderr
index bb2efefb4..bb2efefb4 100644
--- a/src/test/ui/error-codes/E0198.stderr
+++ b/tests/ui/error-codes/E0198.stderr
diff --git a/src/test/ui/error-codes/E0199.rs b/tests/ui/error-codes/E0199.rs
index 2421bf0a5..2421bf0a5 100644
--- a/src/test/ui/error-codes/E0199.rs
+++ b/tests/ui/error-codes/E0199.rs
diff --git a/src/test/ui/error-codes/E0199.stderr b/tests/ui/error-codes/E0199.stderr
index 99d808c0d..68c308b15 100644
--- a/src/test/ui/error-codes/E0199.stderr
+++ b/tests/ui/error-codes/E0199.stderr
@@ -2,7 +2,7 @@ error[E0199]: implementing the trait `Bar` is not unsafe
   --> $DIR/E0199.rs:6:1
    |
 LL | unsafe impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^^^^^^^^
    |
 help: remove `unsafe` from this trait implementation
    |
diff --git a/src/test/ui/error-codes/E0200.rs b/tests/ui/error-codes/E0200.rs
index 24806a6cb..24806a6cb 100644
--- a/src/test/ui/error-codes/E0200.rs
+++ b/tests/ui/error-codes/E0200.rs
diff --git a/src/test/ui/error-codes/E0200.stderr b/tests/ui/error-codes/E0200.stderr
index 1fd86aece..c70a2d4f3 100644
--- a/src/test/ui/error-codes/E0200.stderr
+++ b/tests/ui/error-codes/E0200.stderr
@@ -2,7 +2,7 @@ error[E0200]: the trait `Bar` requires an `unsafe impl` declaration
   --> $DIR/E0200.rs:5:1
    |
 LL | impl Bar for Foo { }
-   | ^^^^^^^^^^^^^^^^^^^^
+   | ^^^^^^^^^^^^^^^^
    |
    = note: the trait `Bar` enforces invariants that the compiler can't check. Review the trait documentation and make sure this implementation upholds those invariants before adding the `unsafe` keyword
 help: add `unsafe` to this trait implementation
diff --git a/src/test/ui/error-codes/E0201.rs b/tests/ui/error-codes/E0201.rs
index 04b37091b..04b37091b 100644
--- a/src/test/ui/error-codes/E0201.rs
+++ b/tests/ui/error-codes/E0201.rs
diff --git a/src/test/ui/error-codes/E0201.stderr b/tests/ui/error-codes/E0201.stderr
index 608ff6917..608ff6917 100644
--- a/src/test/ui/error-codes/E0201.stderr
+++ b/tests/ui/error-codes/E0201.stderr
diff --git a/src/test/ui/error-codes/E0206.rs b/tests/ui/error-codes/E0206.rs
index 0f3d427ce..0f3d427ce 100644
--- a/src/test/ui/error-codes/E0206.rs
+++ b/tests/ui/error-codes/E0206.rs
diff --git a/src/test/ui/error-codes/E0206.stderr b/tests/ui/error-codes/E0206.stderr
index 57ae2647d..57ae2647d 100644
--- a/src/test/ui/error-codes/E0206.stderr
+++ b/tests/ui/error-codes/E0206.stderr
diff --git a/src/test/ui/error-codes/E0207.rs b/tests/ui/error-codes/E0207.rs
index 7f5d4ab51..7f5d4ab51 100644
--- a/src/test/ui/error-codes/E0207.rs
+++ b/tests/ui/error-codes/E0207.rs
diff --git a/src/test/ui/error-codes/E0207.stderr b/tests/ui/error-codes/E0207.stderr
index 5ef51ed86..5ef51ed86 100644
--- a/src/test/ui/error-codes/E0207.stderr
+++ b/tests/ui/error-codes/E0207.stderr
diff --git a/tests/ui/error-codes/E0208.rs b/tests/ui/error-codes/E0208.rs
new file mode 100644
index 000000000..c67d42889
--- /dev/null
+++ b/tests/ui/error-codes/E0208.rs
@@ -0,0 +1,8 @@
+#![feature(rustc_attrs)]
+
+#[rustc_variance]
+struct Foo<'a, T> { //~ ERROR [-, o]
+    t: &'a mut T,
+}
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0208.stderr b/tests/ui/error-codes/E0208.stderr
new file mode 100644
index 000000000..dbbb41e79
--- /dev/null
+++ b/tests/ui/error-codes/E0208.stderr
@@ -0,0 +1,8 @@
+error: [-, o]
+  --> $DIR/E0208.rs:4:1
+   |
+LL | struct Foo<'a, T> {
+   | ^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
diff --git a/src/test/ui/error-codes/E0214.rs b/tests/ui/error-codes/E0214.rs
index fd73189f9..fd73189f9 100644
--- a/src/test/ui/error-codes/E0214.rs
+++ b/tests/ui/error-codes/E0214.rs
diff --git a/src/test/ui/error-codes/E0214.stderr b/tests/ui/error-codes/E0214.stderr
index e0179aac2..e0179aac2 100644
--- a/src/test/ui/error-codes/E0214.stderr
+++ b/tests/ui/error-codes/E0214.stderr
diff --git a/src/test/ui/error-codes/E0220.rs b/tests/ui/error-codes/E0220.rs
index e11a570df..e11a570df 100644
--- a/src/test/ui/error-codes/E0220.rs
+++ b/tests/ui/error-codes/E0220.rs
diff --git a/src/test/ui/error-codes/E0220.stderr b/tests/ui/error-codes/E0220.stderr
index 11763ce78..11763ce78 100644
--- a/src/test/ui/error-codes/E0220.stderr
+++ b/tests/ui/error-codes/E0220.stderr
diff --git a/src/test/ui/error-codes/E0221.rs b/tests/ui/error-codes/E0221.rs
index 7c7e139a0..7c7e139a0 100644
--- a/src/test/ui/error-codes/E0221.rs
+++ b/tests/ui/error-codes/E0221.rs
diff --git a/src/test/ui/error-codes/E0221.stderr b/tests/ui/error-codes/E0221.stderr
index 5414d77ad..5414d77ad 100644
--- a/src/test/ui/error-codes/E0221.stderr
+++ b/tests/ui/error-codes/E0221.stderr
diff --git a/tests/ui/error-codes/E0223.rs b/tests/ui/error-codes/E0223.rs
new file mode 100644
index 000000000..2fe252de2
--- /dev/null
+++ b/tests/ui/error-codes/E0223.rs
@@ -0,0 +1,10 @@
+trait MyTrait { type X; }
+struct MyStruct;
+impl MyTrait for MyStruct {
+    type X = ();
+}
+
+fn main() {
+    let foo: MyTrait::X;
+    //~^ ERROR ambiguous associated type
+}
diff --git a/tests/ui/error-codes/E0223.stderr b/tests/ui/error-codes/E0223.stderr
new file mode 100644
index 000000000..42945e42f
--- /dev/null
+++ b/tests/ui/error-codes/E0223.stderr
@@ -0,0 +1,9 @@
+error[E0223]: ambiguous associated type
+  --> $DIR/E0223.rs:8:14
+   |
+LL |     let foo: MyTrait::X;
+   |              ^^^^^^^^^^ help: use the fully-qualified path: `<MyStruct as MyTrait>::X`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0223`.
diff --git a/src/test/ui/error-codes/E0225.rs b/tests/ui/error-codes/E0225.rs
index b50f68e64..b50f68e64 100644
--- a/src/test/ui/error-codes/E0225.rs
+++ b/tests/ui/error-codes/E0225.rs
diff --git a/src/test/ui/error-codes/E0225.stderr b/tests/ui/error-codes/E0225.stderr
index a4b33a0b7..a4b33a0b7 100644
--- a/src/test/ui/error-codes/E0225.stderr
+++ b/tests/ui/error-codes/E0225.stderr
diff --git a/src/test/ui/error-codes/E0227.rs b/tests/ui/error-codes/E0227.rs
index 0f0a781d2..0f0a781d2 100644
--- a/src/test/ui/error-codes/E0227.rs
+++ b/tests/ui/error-codes/E0227.rs
diff --git a/src/test/ui/error-codes/E0227.stderr b/tests/ui/error-codes/E0227.stderr
index 26de5b4c4..26de5b4c4 100644
--- a/src/test/ui/error-codes/E0227.stderr
+++ b/tests/ui/error-codes/E0227.stderr
diff --git a/src/test/ui/error-codes/E0229.rs b/tests/ui/error-codes/E0229.rs
index 4c1934107..4c1934107 100644
--- a/src/test/ui/error-codes/E0229.rs
+++ b/tests/ui/error-codes/E0229.rs
diff --git a/src/test/ui/error-codes/E0229.stderr b/tests/ui/error-codes/E0229.stderr
index 46793314b..46793314b 100644
--- a/src/test/ui/error-codes/E0229.stderr
+++ b/tests/ui/error-codes/E0229.stderr
diff --git a/src/test/ui/error-codes/E0252.rs b/tests/ui/error-codes/E0252.rs
index 6b5163417..6b5163417 100644
--- a/src/test/ui/error-codes/E0252.rs
+++ b/tests/ui/error-codes/E0252.rs
diff --git a/src/test/ui/error-codes/E0252.stderr b/tests/ui/error-codes/E0252.stderr
index 2722dfe5e..2722dfe5e 100644
--- a/src/test/ui/error-codes/E0252.stderr
+++ b/tests/ui/error-codes/E0252.stderr
diff --git a/src/test/ui/error-codes/E0253.rs b/tests/ui/error-codes/E0253.rs
index 284b16da8..284b16da8 100644
--- a/src/test/ui/error-codes/E0253.rs
+++ b/tests/ui/error-codes/E0253.rs
diff --git a/src/test/ui/error-codes/E0253.stderr b/tests/ui/error-codes/E0253.stderr
index 8f21a0aab..8f21a0aab 100644
--- a/src/test/ui/error-codes/E0253.stderr
+++ b/tests/ui/error-codes/E0253.stderr
diff --git a/src/test/ui/error-codes/E0254.rs b/tests/ui/error-codes/E0254.rs
index e291268be..e291268be 100644
--- a/src/test/ui/error-codes/E0254.rs
+++ b/tests/ui/error-codes/E0254.rs
diff --git a/src/test/ui/error-codes/E0254.stderr b/tests/ui/error-codes/E0254.stderr
index b098f8e1a..b098f8e1a 100644
--- a/src/test/ui/error-codes/E0254.stderr
+++ b/tests/ui/error-codes/E0254.stderr
diff --git a/src/test/ui/error-codes/E0255.rs b/tests/ui/error-codes/E0255.rs
index d1c21eb79..d1c21eb79 100644
--- a/src/test/ui/error-codes/E0255.rs
+++ b/tests/ui/error-codes/E0255.rs
diff --git a/src/test/ui/error-codes/E0255.stderr b/tests/ui/error-codes/E0255.stderr
index 352c5ba5b..352c5ba5b 100644
--- a/src/test/ui/error-codes/E0255.stderr
+++ b/tests/ui/error-codes/E0255.stderr
diff --git a/src/test/ui/error-codes/E0259.rs b/tests/ui/error-codes/E0259.rs
index e7e94d586..e7e94d586 100644
--- a/src/test/ui/error-codes/E0259.rs
+++ b/tests/ui/error-codes/E0259.rs
diff --git a/src/test/ui/error-codes/E0259.stderr b/tests/ui/error-codes/E0259.stderr
index 06cbc5b4f..06cbc5b4f 100644
--- a/src/test/ui/error-codes/E0259.stderr
+++ b/tests/ui/error-codes/E0259.stderr
diff --git a/src/test/ui/error-codes/E0260.rs b/tests/ui/error-codes/E0260.rs
index f7eb220b0..f7eb220b0 100644
--- a/src/test/ui/error-codes/E0260.rs
+++ b/tests/ui/error-codes/E0260.rs
diff --git a/src/test/ui/error-codes/E0260.stderr b/tests/ui/error-codes/E0260.stderr
index 2d3305bd1..2d3305bd1 100644
--- a/src/test/ui/error-codes/E0260.stderr
+++ b/tests/ui/error-codes/E0260.stderr
diff --git a/src/test/ui/error-codes/E0261.rs b/tests/ui/error-codes/E0261.rs
index f05e09aa0..f05e09aa0 100644
--- a/src/test/ui/error-codes/E0261.rs
+++ b/tests/ui/error-codes/E0261.rs
diff --git a/src/test/ui/error-codes/E0261.stderr b/tests/ui/error-codes/E0261.stderr
index 0eab2dc0e..0eab2dc0e 100644
--- a/src/test/ui/error-codes/E0261.stderr
+++ b/tests/ui/error-codes/E0261.stderr
diff --git a/src/test/ui/error-codes/E0262.rs b/tests/ui/error-codes/E0262.rs
index 55264f138..55264f138 100644
--- a/src/test/ui/error-codes/E0262.rs
+++ b/tests/ui/error-codes/E0262.rs
diff --git a/src/test/ui/error-codes/E0262.stderr b/tests/ui/error-codes/E0262.stderr
index ad90b7171..ad90b7171 100644
--- a/src/test/ui/error-codes/E0262.stderr
+++ b/tests/ui/error-codes/E0262.stderr
diff --git a/src/test/ui/error-codes/E0263.rs b/tests/ui/error-codes/E0263.rs
index 92917678e..92917678e 100644
--- a/src/test/ui/error-codes/E0263.rs
+++ b/tests/ui/error-codes/E0263.rs
diff --git a/src/test/ui/error-codes/E0263.stderr b/tests/ui/error-codes/E0263.stderr
index e3f9aea29..e3f9aea29 100644
--- a/src/test/ui/error-codes/E0263.stderr
+++ b/tests/ui/error-codes/E0263.stderr
diff --git a/src/test/ui/error-codes/E0264.rs b/tests/ui/error-codes/E0264.rs
index 6adaf01fb..6adaf01fb 100644
--- a/src/test/ui/error-codes/E0264.rs
+++ b/tests/ui/error-codes/E0264.rs
diff --git a/src/test/ui/error-codes/E0264.stderr b/tests/ui/error-codes/E0264.stderr
index e8e35a12c..e8e35a12c 100644
--- a/src/test/ui/error-codes/E0264.stderr
+++ b/tests/ui/error-codes/E0264.stderr
diff --git a/src/test/ui/error-codes/E0267.rs b/tests/ui/error-codes/E0267.rs
index 45e875a0a..45e875a0a 100644
--- a/src/test/ui/error-codes/E0267.rs
+++ b/tests/ui/error-codes/E0267.rs
diff --git a/src/test/ui/error-codes/E0267.stderr b/tests/ui/error-codes/E0267.stderr
index 1f8657373..1f8657373 100644
--- a/src/test/ui/error-codes/E0267.stderr
+++ b/tests/ui/error-codes/E0267.stderr
diff --git a/src/test/ui/error-codes/E0268.rs b/tests/ui/error-codes/E0268.rs
index 742ba5441..742ba5441 100644
--- a/src/test/ui/error-codes/E0268.rs
+++ b/tests/ui/error-codes/E0268.rs
diff --git a/src/test/ui/error-codes/E0268.stderr b/tests/ui/error-codes/E0268.stderr
index 6422e8a94..6422e8a94 100644
--- a/src/test/ui/error-codes/E0268.stderr
+++ b/tests/ui/error-codes/E0268.stderr
diff --git a/src/test/ui/error-codes/E0271.rs b/tests/ui/error-codes/E0271.rs
index f27190754..f27190754 100644
--- a/src/test/ui/error-codes/E0271.rs
+++ b/tests/ui/error-codes/E0271.rs
diff --git a/src/test/ui/error-codes/E0271.stderr b/tests/ui/error-codes/E0271.stderr
index 1e2f43834..1e2f43834 100644
--- a/src/test/ui/error-codes/E0271.stderr
+++ b/tests/ui/error-codes/E0271.stderr
diff --git a/src/test/ui/error-codes/E0275.rs b/tests/ui/error-codes/E0275.rs
index 95d7f85f1..95d7f85f1 100644
--- a/src/test/ui/error-codes/E0275.rs
+++ b/tests/ui/error-codes/E0275.rs
diff --git a/src/test/ui/error-codes/E0275.stderr b/tests/ui/error-codes/E0275.stderr
index 451a683ac..cf9a7f69b 100644
--- a/src/test/ui/error-codes/E0275.stderr
+++ b/tests/ui/error-codes/E0275.stderr
@@ -9,7 +9,7 @@ note: required for `Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<Bar<
   --> $DIR/E0275.rs:6:9
    |
 LL | impl<T> Foo for T where Bar<T>: Foo {}
-   |         ^^^     ^
+   |         ^^^     ^               --- unsatisfied trait bound introduced here
    = note: the full type name has been written to '$TEST_BUILD_DIR/error-codes/E0275/E0275.long-type-hash.txt'
    = note: 127 redundant requirements hidden
    = note: required for `Bar<T>` to implement `Foo`
diff --git a/src/test/ui/error-codes/E0276.rs b/tests/ui/error-codes/E0276.rs
index 5e3d9f602..5e3d9f602 100644
--- a/src/test/ui/error-codes/E0276.rs
+++ b/tests/ui/error-codes/E0276.rs
diff --git a/src/test/ui/error-codes/E0276.stderr b/tests/ui/error-codes/E0276.stderr
index 1013f041b..1013f041b 100644
--- a/src/test/ui/error-codes/E0276.stderr
+++ b/tests/ui/error-codes/E0276.stderr
diff --git a/src/test/ui/error-codes/E0277-2.rs b/tests/ui/error-codes/E0277-2.rs
index 428518705..428518705 100644
--- a/src/test/ui/error-codes/E0277-2.rs
+++ b/tests/ui/error-codes/E0277-2.rs
diff --git a/src/test/ui/error-codes/E0277-2.stderr b/tests/ui/error-codes/E0277-2.stderr
index a2abf3793..a2abf3793 100644
--- a/src/test/ui/error-codes/E0277-2.stderr
+++ b/tests/ui/error-codes/E0277-2.stderr
diff --git a/src/test/ui/error-codes/E0277-3.rs b/tests/ui/error-codes/E0277-3.rs
index 428be7961..428be7961 100644
--- a/src/test/ui/error-codes/E0277-3.rs
+++ b/tests/ui/error-codes/E0277-3.rs
diff --git a/src/test/ui/error-codes/E0277-3.stderr b/tests/ui/error-codes/E0277-3.stderr
index 0127e1ccc..0127e1ccc 100644
--- a/src/test/ui/error-codes/E0277-3.stderr
+++ b/tests/ui/error-codes/E0277-3.stderr
diff --git a/src/test/ui/error-codes/E0277.rs b/tests/ui/error-codes/E0277.rs
index f0de4e3de..f0de4e3de 100644
--- a/src/test/ui/error-codes/E0277.rs
+++ b/tests/ui/error-codes/E0277.rs
diff --git a/src/test/ui/error-codes/E0277.stderr b/tests/ui/error-codes/E0277.stderr
index 2b4784d7e..2b4784d7e 100644
--- a/src/test/ui/error-codes/E0277.stderr
+++ b/tests/ui/error-codes/E0277.stderr
diff --git a/src/test/ui/error-codes/E0282.rs b/tests/ui/error-codes/E0282.rs
index f1f93b3ae..f1f93b3ae 100644
--- a/src/test/ui/error-codes/E0282.rs
+++ b/tests/ui/error-codes/E0282.rs
diff --git a/src/test/ui/error-codes/E0282.stderr b/tests/ui/error-codes/E0282.stderr
index d01aa3617..892d3a81f 100644
--- a/src/test/ui/error-codes/E0282.stderr
+++ b/tests/ui/error-codes/E0282.stderr
@@ -6,8 +6,8 @@ LL |     let x = "hello".chars().rev().collect();
    |
 help: consider giving `x` an explicit type
    |
-LL |     let x: _ = "hello".chars().rev().collect();
-   |          +++
+LL |     let x: Vec<_> = "hello".chars().rev().collect();
+   |          ++++++++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0283.rs b/tests/ui/error-codes/E0283.rs
index 0643af4b7..0643af4b7 100644
--- a/src/test/ui/error-codes/E0283.rs
+++ b/tests/ui/error-codes/E0283.rs
diff --git a/src/test/ui/error-codes/E0283.stderr b/tests/ui/error-codes/E0283.stderr
index 90316c6e9..90316c6e9 100644
--- a/src/test/ui/error-codes/E0283.stderr
+++ b/tests/ui/error-codes/E0283.stderr
diff --git a/src/test/ui/error-codes/E0297.rs b/tests/ui/error-codes/E0297.rs
index 27c7960d9..27c7960d9 100644
--- a/src/test/ui/error-codes/E0297.rs
+++ b/tests/ui/error-codes/E0297.rs
diff --git a/tests/ui/error-codes/E0297.stderr b/tests/ui/error-codes/E0297.stderr
new file mode 100644
index 000000000..293028f5f
--- /dev/null
+++ b/tests/ui/error-codes/E0297.stderr
@@ -0,0 +1,11 @@
+error[E0005]: refutable pattern in `for` loop binding
+  --> $DIR/E0297.rs:4:9
+   |
+LL |     for Some(x) in xs {}
+   |         ^^^^^^^ pattern `None` not covered
+   |
+   = note: the matched value is of type `Option<i32>`
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0005`.
diff --git a/src/test/ui/error-codes/E0308-2.rs b/tests/ui/error-codes/E0308-2.rs
index 157f992da..157f992da 100644
--- a/src/test/ui/error-codes/E0308-2.rs
+++ b/tests/ui/error-codes/E0308-2.rs
diff --git a/src/test/ui/error-codes/E0308-2.stderr b/tests/ui/error-codes/E0308-2.stderr
index de54a4172..3a8a81a73 100644
--- a/src/test/ui/error-codes/E0308-2.stderr
+++ b/tests/ui/error-codes/E0308-2.stderr
@@ -1,8 +1,8 @@
 error[E0308]: mismatched types
-  --> $DIR/E0308-2.rs:9:6
+  --> $DIR/E0308-2.rs:9:13
    |
 LL | impl Eq for &dyn DynEq {}
-   |      ^^ lifetime mismatch
+   |             ^^^^^^^^^^ lifetime mismatch
    |
    = note: expected trait `<&dyn DynEq as PartialEq>`
               found trait `<&(dyn DynEq + 'static) as PartialEq>`
diff --git a/src/test/ui/error-codes/E0308-4.rs b/tests/ui/error-codes/E0308-4.rs
index aaf7ef5bd..aaf7ef5bd 100644
--- a/src/test/ui/error-codes/E0308-4.rs
+++ b/tests/ui/error-codes/E0308-4.rs
diff --git a/src/test/ui/error-codes/E0308-4.stderr b/tests/ui/error-codes/E0308-4.stderr
index 39c067637..39c067637 100644
--- a/src/test/ui/error-codes/E0308-4.stderr
+++ b/tests/ui/error-codes/E0308-4.stderr
diff --git a/src/test/ui/error-codes/E0308.rs b/tests/ui/error-codes/E0308.rs
index dd9e0b284..dd9e0b284 100644
--- a/src/test/ui/error-codes/E0308.rs
+++ b/tests/ui/error-codes/E0308.rs
diff --git a/src/test/ui/error-codes/E0308.stderr b/tests/ui/error-codes/E0308.stderr
index 187b775f9..187b775f9 100644
--- a/src/test/ui/error-codes/E0308.stderr
+++ b/tests/ui/error-codes/E0308.stderr
diff --git a/tests/ui/error-codes/E0311.fixed b/tests/ui/error-codes/E0311.fixed
new file mode 100644
index 000000000..4410a4d70
--- /dev/null
+++ b/tests/ui/error-codes/E0311.fixed
@@ -0,0 +1,13 @@
+// run-rustfix
+
+#![allow(warnings)]
+
+fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+    with_restriction::<T>(x) //~ ERROR E0311
+}
+
+fn with_restriction<'a, T: 'a>(x: &'a ()) -> &'a () {
+    x
+}
+
+fn main() {}
diff --git a/src/test/ui/error-codes/E0311.rs b/tests/ui/error-codes/E0311.rs
index 566b518b4..99e454f4d 100644
--- a/src/test/ui/error-codes/E0311.rs
+++ b/tests/ui/error-codes/E0311.rs
@@ -1,3 +1,7 @@
+// run-rustfix
+
+#![allow(warnings)]
+
 fn no_restriction<T>(x: &()) -> &() {
     with_restriction::<T>(x) //~ ERROR E0311
 }
diff --git a/src/test/ui/error-codes/E0311.stderr b/tests/ui/error-codes/E0311.stderr
index 9873b5ae6..b0e6dd1e2 100644
--- a/src/test/ui/error-codes/E0311.stderr
+++ b/tests/ui/error-codes/E0311.stderr
@@ -1,23 +1,23 @@
 error[E0311]: the parameter type `T` may not live long enough
-  --> $DIR/E0311.rs:2:5
+  --> $DIR/E0311.rs:6:5
    |
 LL |     with_restriction::<T>(x)
    |     ^^^^^^^^^^^^^^^^^^^^^
    |
 note: the parameter type `T` must be valid for the anonymous lifetime defined here...
-  --> $DIR/E0311.rs:1:25
+  --> $DIR/E0311.rs:5:25
    |
 LL | fn no_restriction<T>(x: &()) -> &() {
    |                         ^^^
 note: ...so that the type `T` will meet its required lifetime bounds
-  --> $DIR/E0311.rs:2:5
+  --> $DIR/E0311.rs:6:5
    |
 LL |     with_restriction::<T>(x)
    |     ^^^^^^^^^^^^^^^^^^^^^
 help: consider adding an explicit lifetime bound...
    |
-LL | fn no_restriction<'a, T: 'a>(x: &()) -> &() {
-   |                   +++  ++++
+LL | fn no_restriction<'a, T: 'a>(x: &'a ()) -> &() {
+   |                   +++  ++++      ++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0328.rs b/tests/ui/error-codes/E0328.rs
index ef55f44dd..ef55f44dd 100644
--- a/src/test/ui/error-codes/E0328.rs
+++ b/tests/ui/error-codes/E0328.rs
diff --git a/src/test/ui/error-codes/E0328.stderr b/tests/ui/error-codes/E0328.stderr
index 70e6baf69..70e6baf69 100644
--- a/src/test/ui/error-codes/E0328.stderr
+++ b/tests/ui/error-codes/E0328.stderr
diff --git a/src/test/ui/error-codes/E0365.rs b/tests/ui/error-codes/E0365.rs
index 464109247..464109247 100644
--- a/src/test/ui/error-codes/E0365.rs
+++ b/tests/ui/error-codes/E0365.rs
diff --git a/src/test/ui/error-codes/E0365.stderr b/tests/ui/error-codes/E0365.stderr
index 5bfcf1394..5bfcf1394 100644
--- a/src/test/ui/error-codes/E0365.stderr
+++ b/tests/ui/error-codes/E0365.stderr
diff --git a/src/test/ui/error-codes/E0370.rs b/tests/ui/error-codes/E0370.rs
index 32a66b63b..32a66b63b 100644
--- a/src/test/ui/error-codes/E0370.rs
+++ b/tests/ui/error-codes/E0370.rs
diff --git a/src/test/ui/error-codes/E0370.stderr b/tests/ui/error-codes/E0370.stderr
index 7fb622ee8..7fb622ee8 100644
--- a/src/test/ui/error-codes/E0370.stderr
+++ b/tests/ui/error-codes/E0370.stderr
diff --git a/src/test/ui/error-codes/E0374.rs b/tests/ui/error-codes/E0374.rs
index 41fcedc32..41fcedc32 100644
--- a/src/test/ui/error-codes/E0374.rs
+++ b/tests/ui/error-codes/E0374.rs
diff --git a/src/test/ui/error-codes/E0374.stderr b/tests/ui/error-codes/E0374.stderr
index 68e15e6f8..68e15e6f8 100644
--- a/src/test/ui/error-codes/E0374.stderr
+++ b/tests/ui/error-codes/E0374.stderr
diff --git a/src/test/ui/error-codes/E0375.rs b/tests/ui/error-codes/E0375.rs
index 0c03a8761..0c03a8761 100644
--- a/src/test/ui/error-codes/E0375.rs
+++ b/tests/ui/error-codes/E0375.rs
diff --git a/src/test/ui/error-codes/E0375.stderr b/tests/ui/error-codes/E0375.stderr
index a68b3af5a..a68b3af5a 100644
--- a/src/test/ui/error-codes/E0375.stderr
+++ b/tests/ui/error-codes/E0375.stderr
diff --git a/src/test/ui/error-codes/E0376.rs b/tests/ui/error-codes/E0376.rs
index f092eb02c..f092eb02c 100644
--- a/src/test/ui/error-codes/E0376.rs
+++ b/tests/ui/error-codes/E0376.rs
diff --git a/src/test/ui/error-codes/E0376.stderr b/tests/ui/error-codes/E0376.stderr
index e91efb045..e91efb045 100644
--- a/src/test/ui/error-codes/E0376.stderr
+++ b/tests/ui/error-codes/E0376.stderr
diff --git a/tests/ui/error-codes/E0377.rs b/tests/ui/error-codes/E0377.rs
new file mode 100644
index 000000000..6da2c2095
--- /dev/null
+++ b/tests/ui/error-codes/E0377.rs
@@ -0,0 +1,14 @@
+#![feature(coerce_unsized)]
+use std::ops::CoerceUnsized;
+
+pub struct Foo<T: ?Sized> {
+    field_with_unsized_type: T,
+}
+
+pub struct Bar<T: ?Sized> {
+    field_with_unsized_type: T,
+}
+
+impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {} //~ ERROR E0377
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0377.stderr b/tests/ui/error-codes/E0377.stderr
new file mode 100644
index 000000000..bf7d8c8d3
--- /dev/null
+++ b/tests/ui/error-codes/E0377.stderr
@@ -0,0 +1,9 @@
+error[E0377]: the trait `CoerceUnsized` may only be implemented for a coercion between structures with the same definition; expected `Foo`, found `Bar`
+  --> $DIR/E0377.rs:12:1
+   |
+LL | impl<T, U> CoerceUnsized<Bar<U>> for Foo<T> where T: CoerceUnsized<U> {}
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0377`.
diff --git a/src/test/ui/error-codes/E0388.rs b/tests/ui/error-codes/E0388.rs
index 6049d95f0..6049d95f0 100644
--- a/src/test/ui/error-codes/E0388.rs
+++ b/tests/ui/error-codes/E0388.rs
diff --git a/src/test/ui/error-codes/E0388.stderr b/tests/ui/error-codes/E0388.stderr
index b51aa263d..b51aa263d 100644
--- a/src/test/ui/error-codes/E0388.stderr
+++ b/tests/ui/error-codes/E0388.stderr
diff --git a/src/test/ui/error-codes/E0389.rs b/tests/ui/error-codes/E0389.rs
index 41172b362..41172b362 100644
--- a/src/test/ui/error-codes/E0389.rs
+++ b/tests/ui/error-codes/E0389.rs
diff --git a/tests/ui/error-codes/E0389.stderr b/tests/ui/error-codes/E0389.stderr
new file mode 100644
index 000000000..51c4c92ad
--- /dev/null
+++ b/tests/ui/error-codes/E0389.stderr
@@ -0,0 +1,14 @@
+error[E0594]: cannot assign to `fancy_ref.num`, which is behind a `&` reference
+  --> $DIR/E0389.rs:8:5
+   |
+LL |     fancy_ref.num = 6;
+   |     ^^^^^^^^^^^^^^^^^ `fancy_ref` is a `&` reference, so the data it refers to cannot be written
+   |
+help: consider changing this to be a mutable reference
+   |
+LL |     let fancy_ref = &mut (&mut fancy);
+   |                     ~~~~~~~~~~~~~~~~~
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0594`.
diff --git a/src/test/ui/error-codes/E0390.rs b/tests/ui/error-codes/E0390.rs
index 507483dec..507483dec 100644
--- a/src/test/ui/error-codes/E0390.rs
+++ b/tests/ui/error-codes/E0390.rs
diff --git a/src/test/ui/error-codes/E0390.stderr b/tests/ui/error-codes/E0390.stderr
index 0e5a9ca76..0e5a9ca76 100644
--- a/src/test/ui/error-codes/E0390.stderr
+++ b/tests/ui/error-codes/E0390.stderr
diff --git a/src/test/ui/error-codes/E0392.rs b/tests/ui/error-codes/E0392.rs
index c98d900b6..c98d900b6 100644
--- a/src/test/ui/error-codes/E0392.rs
+++ b/tests/ui/error-codes/E0392.rs
diff --git a/src/test/ui/error-codes/E0392.stderr b/tests/ui/error-codes/E0392.stderr
index 622402999..622402999 100644
--- a/src/test/ui/error-codes/E0392.stderr
+++ b/tests/ui/error-codes/E0392.stderr
diff --git a/src/test/ui/error-codes/E0393.rs b/tests/ui/error-codes/E0393.rs
index 0c1a36980..0c1a36980 100644
--- a/src/test/ui/error-codes/E0393.rs
+++ b/tests/ui/error-codes/E0393.rs
diff --git a/src/test/ui/error-codes/E0393.stderr b/tests/ui/error-codes/E0393.stderr
index d9f70b729..d9f70b729 100644
--- a/src/test/ui/error-codes/E0393.stderr
+++ b/tests/ui/error-codes/E0393.stderr
diff --git a/src/test/ui/error-codes/E0396-fixed.rs b/tests/ui/error-codes/E0396-fixed.rs
index fe20da1a8..fe20da1a8 100644
--- a/src/test/ui/error-codes/E0396-fixed.rs
+++ b/tests/ui/error-codes/E0396-fixed.rs
diff --git a/src/test/ui/error-codes/E0396-fixed.stderr b/tests/ui/error-codes/E0396-fixed.stderr
index 2efbd6989..2efbd6989 100644
--- a/src/test/ui/error-codes/E0396-fixed.stderr
+++ b/tests/ui/error-codes/E0396-fixed.stderr
diff --git a/src/test/ui/error-codes/E0396.rs b/tests/ui/error-codes/E0396.rs
index 4415b70e7..4415b70e7 100644
--- a/src/test/ui/error-codes/E0396.rs
+++ b/tests/ui/error-codes/E0396.rs
diff --git a/src/test/ui/error-codes/E0396.stderr b/tests/ui/error-codes/E0396.stderr
index 8c87f4067..8c87f4067 100644
--- a/src/test/ui/error-codes/E0396.stderr
+++ b/tests/ui/error-codes/E0396.stderr
diff --git a/src/test/ui/error-codes/E0401.rs b/tests/ui/error-codes/E0401.rs
index 8f8d6b87e..8f8d6b87e 100644
--- a/src/test/ui/error-codes/E0401.rs
+++ b/tests/ui/error-codes/E0401.rs
diff --git a/src/test/ui/error-codes/E0401.stderr b/tests/ui/error-codes/E0401.stderr
index 9687eca61..fa4b91cac 100644
--- a/src/test/ui/error-codes/E0401.stderr
+++ b/tests/ui/error-codes/E0401.stderr
@@ -59,7 +59,7 @@ note: required by a bound in `bfnr`
    |
 LL |     fn bfnr<U, V: Baz<U>, W: Fn()>(y: T) {
    |                              ^^^^ required by this bound in `bfnr`
-help: consider specifying the type arguments in the function call
+help: consider specifying the generic arguments
    |
 LL |     bfnr::<U, V, W>(x);
    |         +++++++++++
diff --git a/src/test/ui/error-codes/E0403.rs b/tests/ui/error-codes/E0403.rs
index 8bccb631a..8bccb631a 100644
--- a/src/test/ui/error-codes/E0403.rs
+++ b/tests/ui/error-codes/E0403.rs
diff --git a/src/test/ui/error-codes/E0403.stderr b/tests/ui/error-codes/E0403.stderr
index d76a58a7c..d76a58a7c 100644
--- a/src/test/ui/error-codes/E0403.stderr
+++ b/tests/ui/error-codes/E0403.stderr
diff --git a/src/test/ui/error-codes/E0404.rs b/tests/ui/error-codes/E0404.rs
index b17333724..b17333724 100644
--- a/src/test/ui/error-codes/E0404.rs
+++ b/tests/ui/error-codes/E0404.rs
diff --git a/src/test/ui/error-codes/E0404.stderr b/tests/ui/error-codes/E0404.stderr
index 4ccb6c572..4ccb6c572 100644
--- a/src/test/ui/error-codes/E0404.stderr
+++ b/tests/ui/error-codes/E0404.stderr
diff --git a/src/test/ui/error-codes/E0405.rs b/tests/ui/error-codes/E0405.rs
index f03c4e19b..f03c4e19b 100644
--- a/src/test/ui/error-codes/E0405.rs
+++ b/tests/ui/error-codes/E0405.rs
diff --git a/src/test/ui/error-codes/E0405.stderr b/tests/ui/error-codes/E0405.stderr
index a22afe6f3..a22afe6f3 100644
--- a/src/test/ui/error-codes/E0405.stderr
+++ b/tests/ui/error-codes/E0405.stderr
diff --git a/src/test/ui/error-codes/E0407.rs b/tests/ui/error-codes/E0407.rs
index 962bd5741..962bd5741 100644
--- a/src/test/ui/error-codes/E0407.rs
+++ b/tests/ui/error-codes/E0407.rs
diff --git a/src/test/ui/error-codes/E0407.stderr b/tests/ui/error-codes/E0407.stderr
index 6f6d1ff6a..6f6d1ff6a 100644
--- a/src/test/ui/error-codes/E0407.stderr
+++ b/tests/ui/error-codes/E0407.stderr
diff --git a/src/test/ui/error-codes/E0408.rs b/tests/ui/error-codes/E0408.rs
index e91a98f38..e91a98f38 100644
--- a/src/test/ui/error-codes/E0408.rs
+++ b/tests/ui/error-codes/E0408.rs
diff --git a/src/test/ui/error-codes/E0408.stderr b/tests/ui/error-codes/E0408.stderr
index 132a94322..132a94322 100644
--- a/src/test/ui/error-codes/E0408.stderr
+++ b/tests/ui/error-codes/E0408.stderr
diff --git a/src/test/ui/error-codes/E0411.rs b/tests/ui/error-codes/E0411.rs
index 872370f2a..872370f2a 100644
--- a/src/test/ui/error-codes/E0411.rs
+++ b/tests/ui/error-codes/E0411.rs
diff --git a/src/test/ui/error-codes/E0411.stderr b/tests/ui/error-codes/E0411.stderr
index 4c99f9fcb..4c99f9fcb 100644
--- a/src/test/ui/error-codes/E0411.stderr
+++ b/tests/ui/error-codes/E0411.stderr
diff --git a/src/test/ui/error-codes/E0412.rs b/tests/ui/error-codes/E0412.rs
index 5f922a50a..5f922a50a 100644
--- a/src/test/ui/error-codes/E0412.rs
+++ b/tests/ui/error-codes/E0412.rs
diff --git a/src/test/ui/error-codes/E0412.stderr b/tests/ui/error-codes/E0412.stderr
index 7bdaa1807..7bdaa1807 100644
--- a/src/test/ui/error-codes/E0412.stderr
+++ b/tests/ui/error-codes/E0412.stderr
diff --git a/src/test/ui/error-codes/E0415.rs b/tests/ui/error-codes/E0415.rs
index 6177ac35b..6177ac35b 100644
--- a/src/test/ui/error-codes/E0415.rs
+++ b/tests/ui/error-codes/E0415.rs
diff --git a/src/test/ui/error-codes/E0415.stderr b/tests/ui/error-codes/E0415.stderr
index c2b8fdc7c..c2b8fdc7c 100644
--- a/src/test/ui/error-codes/E0415.stderr
+++ b/tests/ui/error-codes/E0415.stderr
diff --git a/src/test/ui/error-codes/E0416.rs b/tests/ui/error-codes/E0416.rs
index 88eece07a..88eece07a 100644
--- a/src/test/ui/error-codes/E0416.rs
+++ b/tests/ui/error-codes/E0416.rs
diff --git a/src/test/ui/error-codes/E0416.stderr b/tests/ui/error-codes/E0416.stderr
index 78acac5c6..78acac5c6 100644
--- a/src/test/ui/error-codes/E0416.stderr
+++ b/tests/ui/error-codes/E0416.stderr
diff --git a/src/test/ui/error-codes/E0423.rs b/tests/ui/error-codes/E0423.rs
index 5080a5e05..5080a5e05 100644
--- a/src/test/ui/error-codes/E0423.rs
+++ b/tests/ui/error-codes/E0423.rs
diff --git a/src/test/ui/error-codes/E0423.stderr b/tests/ui/error-codes/E0423.stderr
index ac70d905d..ac70d905d 100644
--- a/src/test/ui/error-codes/E0423.stderr
+++ b/tests/ui/error-codes/E0423.stderr
diff --git a/src/test/ui/error-codes/E0424.rs b/tests/ui/error-codes/E0424.rs
index 6e531942c..6e531942c 100644
--- a/src/test/ui/error-codes/E0424.rs
+++ b/tests/ui/error-codes/E0424.rs
diff --git a/src/test/ui/error-codes/E0424.stderr b/tests/ui/error-codes/E0424.stderr
index d02da3e4e..d02da3e4e 100644
--- a/src/test/ui/error-codes/E0424.stderr
+++ b/tests/ui/error-codes/E0424.stderr
diff --git a/src/test/ui/error-codes/E0425.rs b/tests/ui/error-codes/E0425.rs
index ec234ae99..ec234ae99 100644
--- a/src/test/ui/error-codes/E0425.rs
+++ b/tests/ui/error-codes/E0425.rs
diff --git a/src/test/ui/error-codes/E0425.stderr b/tests/ui/error-codes/E0425.stderr
index 9ef4608da..9ef4608da 100644
--- a/src/test/ui/error-codes/E0425.stderr
+++ b/tests/ui/error-codes/E0425.stderr
diff --git a/src/test/ui/error-codes/E0426.rs b/tests/ui/error-codes/E0426.rs
index 7a1dcde49..7a1dcde49 100644
--- a/src/test/ui/error-codes/E0426.rs
+++ b/tests/ui/error-codes/E0426.rs
diff --git a/src/test/ui/error-codes/E0426.stderr b/tests/ui/error-codes/E0426.stderr
index 035f2eb86..035f2eb86 100644
--- a/src/test/ui/error-codes/E0426.stderr
+++ b/tests/ui/error-codes/E0426.stderr
diff --git a/src/test/ui/error-codes/E0428.rs b/tests/ui/error-codes/E0428.rs
index eb9594fb8..eb9594fb8 100644
--- a/src/test/ui/error-codes/E0428.rs
+++ b/tests/ui/error-codes/E0428.rs
diff --git a/src/test/ui/error-codes/E0428.stderr b/tests/ui/error-codes/E0428.stderr
index 205bcf342..205bcf342 100644
--- a/src/test/ui/error-codes/E0428.stderr
+++ b/tests/ui/error-codes/E0428.stderr
diff --git a/src/test/ui/error-codes/E0429.rs b/tests/ui/error-codes/E0429.rs
index e74b27a78..e74b27a78 100644
--- a/src/test/ui/error-codes/E0429.rs
+++ b/tests/ui/error-codes/E0429.rs
diff --git a/src/test/ui/error-codes/E0429.stderr b/tests/ui/error-codes/E0429.stderr
index 08b99232e..08b99232e 100644
--- a/src/test/ui/error-codes/E0429.stderr
+++ b/tests/ui/error-codes/E0429.stderr
diff --git a/src/test/ui/error-codes/E0430.rs b/tests/ui/error-codes/E0430.rs
index ba2f671d6..ba2f671d6 100644
--- a/src/test/ui/error-codes/E0430.rs
+++ b/tests/ui/error-codes/E0430.rs
diff --git a/src/test/ui/error-codes/E0430.stderr b/tests/ui/error-codes/E0430.stderr
index 69a0d6e11..69a0d6e11 100644
--- a/src/test/ui/error-codes/E0430.stderr
+++ b/tests/ui/error-codes/E0430.stderr
diff --git a/src/test/ui/error-codes/E0431.rs b/tests/ui/error-codes/E0431.rs
index 2e2ccba17..2e2ccba17 100644
--- a/src/test/ui/error-codes/E0431.rs
+++ b/tests/ui/error-codes/E0431.rs
diff --git a/src/test/ui/error-codes/E0431.stderr b/tests/ui/error-codes/E0431.stderr
index adfd2d923..adfd2d923 100644
--- a/src/test/ui/error-codes/E0431.stderr
+++ b/tests/ui/error-codes/E0431.stderr
diff --git a/src/test/ui/error-codes/E0432.rs b/tests/ui/error-codes/E0432.rs
index 1fc95f945..1fc95f945 100644
--- a/src/test/ui/error-codes/E0432.rs
+++ b/tests/ui/error-codes/E0432.rs
diff --git a/src/test/ui/error-codes/E0432.stderr b/tests/ui/error-codes/E0432.stderr
index ed9536f16..ed9536f16 100644
--- a/src/test/ui/error-codes/E0432.stderr
+++ b/tests/ui/error-codes/E0432.stderr
diff --git a/src/test/ui/error-codes/E0433.rs b/tests/ui/error-codes/E0433.rs
index d555e6542..d555e6542 100644
--- a/src/test/ui/error-codes/E0433.rs
+++ b/tests/ui/error-codes/E0433.rs
diff --git a/src/test/ui/error-codes/E0433.stderr b/tests/ui/error-codes/E0433.stderr
index 265d8885c..265d8885c 100644
--- a/src/test/ui/error-codes/E0433.stderr
+++ b/tests/ui/error-codes/E0433.stderr
diff --git a/src/test/ui/error-codes/E0434.rs b/tests/ui/error-codes/E0434.rs
index db7037ee1..db7037ee1 100644
--- a/src/test/ui/error-codes/E0434.rs
+++ b/tests/ui/error-codes/E0434.rs
diff --git a/src/test/ui/error-codes/E0434.stderr b/tests/ui/error-codes/E0434.stderr
index 14508ccbc..14508ccbc 100644
--- a/src/test/ui/error-codes/E0434.stderr
+++ b/tests/ui/error-codes/E0434.stderr
diff --git a/src/test/ui/error-codes/E0435.fixed b/tests/ui/error-codes/E0435.fixed
index fdf896d2d..fdf896d2d 100644
--- a/src/test/ui/error-codes/E0435.fixed
+++ b/tests/ui/error-codes/E0435.fixed
diff --git a/src/test/ui/error-codes/E0435.rs b/tests/ui/error-codes/E0435.rs
index d9354efb8..d9354efb8 100644
--- a/src/test/ui/error-codes/E0435.rs
+++ b/tests/ui/error-codes/E0435.rs
diff --git a/src/test/ui/error-codes/E0435.stderr b/tests/ui/error-codes/E0435.stderr
index fc08fade9..fc08fade9 100644
--- a/src/test/ui/error-codes/E0435.stderr
+++ b/tests/ui/error-codes/E0435.stderr
diff --git a/src/test/ui/error-codes/E0437.rs b/tests/ui/error-codes/E0437.rs
index f8c15007d..f8c15007d 100644
--- a/src/test/ui/error-codes/E0437.rs
+++ b/tests/ui/error-codes/E0437.rs
diff --git a/src/test/ui/error-codes/E0437.stderr b/tests/ui/error-codes/E0437.stderr
index 217b16403..217b16403 100644
--- a/src/test/ui/error-codes/E0437.stderr
+++ b/tests/ui/error-codes/E0437.stderr
diff --git a/src/test/ui/error-codes/E0438.rs b/tests/ui/error-codes/E0438.rs
index 02898b886..02898b886 100644
--- a/src/test/ui/error-codes/E0438.rs
+++ b/tests/ui/error-codes/E0438.rs
diff --git a/src/test/ui/error-codes/E0438.stderr b/tests/ui/error-codes/E0438.stderr
index 853f0c3c2..853f0c3c2 100644
--- a/src/test/ui/error-codes/E0438.stderr
+++ b/tests/ui/error-codes/E0438.stderr
diff --git a/src/test/ui/error-codes/E0445.rs b/tests/ui/error-codes/E0445.rs
index a9a3aee25..a9a3aee25 100644
--- a/src/test/ui/error-codes/E0445.rs
+++ b/tests/ui/error-codes/E0445.rs
diff --git a/src/test/ui/error-codes/E0445.stderr b/tests/ui/error-codes/E0445.stderr
index 23b7a3350..23b7a3350 100644
--- a/src/test/ui/error-codes/E0445.stderr
+++ b/tests/ui/error-codes/E0445.stderr
diff --git a/src/test/ui/error-codes/E0446.rs b/tests/ui/error-codes/E0446.rs
index f61c7e546..f61c7e546 100644
--- a/src/test/ui/error-codes/E0446.rs
+++ b/tests/ui/error-codes/E0446.rs
diff --git a/src/test/ui/error-codes/E0446.stderr b/tests/ui/error-codes/E0446.stderr
index b6a195c40..b6a195c40 100644
--- a/src/test/ui/error-codes/E0446.stderr
+++ b/tests/ui/error-codes/E0446.stderr
diff --git a/src/test/ui/error-codes/E0449.rs b/tests/ui/error-codes/E0449.rs
index eba0d479e..eba0d479e 100644
--- a/src/test/ui/error-codes/E0449.rs
+++ b/tests/ui/error-codes/E0449.rs
diff --git a/src/test/ui/error-codes/E0449.stderr b/tests/ui/error-codes/E0449.stderr
index 8221a5e0a..8221a5e0a 100644
--- a/src/test/ui/error-codes/E0449.stderr
+++ b/tests/ui/error-codes/E0449.stderr
diff --git a/src/test/ui/error-codes/E0451.rs b/tests/ui/error-codes/E0451.rs
index aa8f051af..aa8f051af 100644
--- a/src/test/ui/error-codes/E0451.rs
+++ b/tests/ui/error-codes/E0451.rs
diff --git a/src/test/ui/error-codes/E0451.stderr b/tests/ui/error-codes/E0451.stderr
index 419cf117e..419cf117e 100644
--- a/src/test/ui/error-codes/E0451.stderr
+++ b/tests/ui/error-codes/E0451.stderr
diff --git a/src/test/ui/error-codes/E0452.rs b/tests/ui/error-codes/E0452.rs
index 5066cd99b..5066cd99b 100644
--- a/src/test/ui/error-codes/E0452.rs
+++ b/tests/ui/error-codes/E0452.rs
diff --git a/src/test/ui/error-codes/E0452.stderr b/tests/ui/error-codes/E0452.stderr
index f67b740ff..f67b740ff 100644
--- a/src/test/ui/error-codes/E0452.stderr
+++ b/tests/ui/error-codes/E0452.stderr
diff --git a/src/test/ui/error-codes/E0453.rs b/tests/ui/error-codes/E0453.rs
index ca9573c5b..ca9573c5b 100644
--- a/src/test/ui/error-codes/E0453.rs
+++ b/tests/ui/error-codes/E0453.rs
diff --git a/src/test/ui/error-codes/E0453.stderr b/tests/ui/error-codes/E0453.stderr
index f982ed26f..f982ed26f 100644
--- a/src/test/ui/error-codes/E0453.stderr
+++ b/tests/ui/error-codes/E0453.stderr
diff --git a/src/test/ui/error-codes/E0454.rs b/tests/ui/error-codes/E0454.rs
index ff5478382..ff5478382 100644
--- a/src/test/ui/error-codes/E0454.rs
+++ b/tests/ui/error-codes/E0454.rs
diff --git a/src/test/ui/error-codes/E0454.stderr b/tests/ui/error-codes/E0454.stderr
index b9a506fee..b9a506fee 100644
--- a/src/test/ui/error-codes/E0454.stderr
+++ b/tests/ui/error-codes/E0454.stderr
diff --git a/src/test/ui/error-codes/E0458.rs b/tests/ui/error-codes/E0458.rs
index 35e7e84d4..35e7e84d4 100644
--- a/src/test/ui/error-codes/E0458.rs
+++ b/tests/ui/error-codes/E0458.rs
diff --git a/src/test/ui/error-codes/E0458.stderr b/tests/ui/error-codes/E0458.stderr
index e641bba54..e641bba54 100644
--- a/src/test/ui/error-codes/E0458.stderr
+++ b/tests/ui/error-codes/E0458.stderr
diff --git a/src/test/ui/error-codes/E0459.rs b/tests/ui/error-codes/E0459.rs
index c56d8f0a8..c56d8f0a8 100644
--- a/src/test/ui/error-codes/E0459.rs
+++ b/tests/ui/error-codes/E0459.rs
diff --git a/src/test/ui/error-codes/E0459.stderr b/tests/ui/error-codes/E0459.stderr
index 8f0dd25e0..8f0dd25e0 100644
--- a/src/test/ui/error-codes/E0459.stderr
+++ b/tests/ui/error-codes/E0459.stderr
diff --git a/tests/ui/error-codes/E0462.rs b/tests/ui/error-codes/E0462.rs
new file mode 100644
index 000000000..f839ee783
--- /dev/null
+++ b/tests/ui/error-codes/E0462.rs
@@ -0,0 +1,11 @@
+// aux-build:found-staticlib.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+// normalize-stderr-test: "(lib)?found_staticlib\.[a-z]+" -> "libfound_staticlib.somelib"
+
+extern crate found_staticlib; //~ ERROR E0462
+
+fn main() {
+    found_staticlib::foo();
+}
diff --git a/tests/ui/error-codes/E0462.stderr b/tests/ui/error-codes/E0462.stderr
new file mode 100644
index 000000000..43e27965f
--- /dev/null
+++ b/tests/ui/error-codes/E0462.stderr
@@ -0,0 +1,13 @@
+error[E0462]: found staticlib `found_staticlib` instead of rlib or dylib
+  --> $DIR/E0462.rs:7:1
+   |
+LL | extern crate found_staticlib;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: the following crate versions were found:
+           crate `found_staticlib`: $TEST_BUILD_DIR/error-codes/E0462/auxiliary/libfound_staticlib.somelib
+   = help: please recompile that crate using --crate-type lib
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0462`.
diff --git a/src/test/ui/error-codes/E0463.rs b/tests/ui/error-codes/E0463.rs
index 683565281..683565281 100644
--- a/src/test/ui/error-codes/E0463.rs
+++ b/tests/ui/error-codes/E0463.rs
diff --git a/src/test/ui/error-codes/E0463.stderr b/tests/ui/error-codes/E0463.stderr
index 1aa66e1ec..1aa66e1ec 100644
--- a/src/test/ui/error-codes/E0463.stderr
+++ b/tests/ui/error-codes/E0463.stderr
diff --git a/tests/ui/error-codes/E0464.rs b/tests/ui/error-codes/E0464.rs
new file mode 100644
index 000000000..47717fbd5
--- /dev/null
+++ b/tests/ui/error-codes/E0464.rs
@@ -0,0 +1,14 @@
+// aux-build:crateresolve1-1.rs
+// aux-build:crateresolve1-2.rs
+// aux-build:crateresolve1-3.rs
+
+// normalize-stderr-test: "\.nll/" -> "/"
+// normalize-stderr-test: "\\\?\\" -> ""
+// normalize-stderr-test: "(lib)?crateresolve1-([123])\.[a-z]+" -> "libcrateresolve1-$2.somelib"
+
+// NOTE: This test is duplicated from `tests/ui/crate-loading/crateresolve1.rs`.
+
+extern crate crateresolve1;
+//~^ ERROR multiple candidates for `rlib` dependency `crateresolve1` found
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0464.stderr b/tests/ui/error-codes/E0464.stderr
new file mode 100644
index 000000000..574270f94
--- /dev/null
+++ b/tests/ui/error-codes/E0464.stderr
@@ -0,0 +1,13 @@
+error[E0464]: multiple candidates for `rlib` dependency `crateresolve1` found
+  --> $DIR/E0464.rs:11:1
+   |
+LL | extern crate crateresolve1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+   |
+   = note: candidate #1: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-1.somelib
+   = note: candidate #2: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-2.somelib
+   = note: candidate #3: $TEST_BUILD_DIR/error-codes/E0464/auxiliary/libcrateresolve1-3.somelib
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0464`.
diff --git a/src/test/ui/error-codes/E0478.rs b/tests/ui/error-codes/E0478.rs
index b1562dc0a..b1562dc0a 100644
--- a/src/test/ui/error-codes/E0478.rs
+++ b/tests/ui/error-codes/E0478.rs
diff --git a/src/test/ui/error-codes/E0478.stderr b/tests/ui/error-codes/E0478.stderr
index ec650085a..ec650085a 100644
--- a/src/test/ui/error-codes/E0478.stderr
+++ b/tests/ui/error-codes/E0478.stderr
diff --git a/src/test/ui/error-codes/E0492.rs b/tests/ui/error-codes/E0492.rs
index 2c735fcc9..2c735fcc9 100644
--- a/src/test/ui/error-codes/E0492.rs
+++ b/tests/ui/error-codes/E0492.rs
diff --git a/src/test/ui/error-codes/E0492.stderr b/tests/ui/error-codes/E0492.stderr
index 557c977e8..557c977e8 100644
--- a/src/test/ui/error-codes/E0492.stderr
+++ b/tests/ui/error-codes/E0492.stderr
diff --git a/src/test/ui/error-codes/E0496.rs b/tests/ui/error-codes/E0496.rs
index b57c9c79e..b57c9c79e 100644
--- a/src/test/ui/error-codes/E0496.rs
+++ b/tests/ui/error-codes/E0496.rs
diff --git a/src/test/ui/error-codes/E0496.stderr b/tests/ui/error-codes/E0496.stderr
index 80ca2b1fb..80ca2b1fb 100644
--- a/src/test/ui/error-codes/E0496.stderr
+++ b/tests/ui/error-codes/E0496.stderr
diff --git a/src/test/ui/error-codes/E0499.rs b/tests/ui/error-codes/E0499.rs
index 919f97c8a..919f97c8a 100644
--- a/src/test/ui/error-codes/E0499.rs
+++ b/tests/ui/error-codes/E0499.rs
diff --git a/src/test/ui/error-codes/E0499.stderr b/tests/ui/error-codes/E0499.stderr
index af5a1e186..af5a1e186 100644
--- a/src/test/ui/error-codes/E0499.stderr
+++ b/tests/ui/error-codes/E0499.stderr
diff --git a/src/test/ui/error-codes/E0501.rs b/tests/ui/error-codes/E0501.rs
index 3e39d9a63..3e39d9a63 100644
--- a/src/test/ui/error-codes/E0501.rs
+++ b/tests/ui/error-codes/E0501.rs
diff --git a/src/test/ui/error-codes/E0501.stderr b/tests/ui/error-codes/E0501.stderr
index 53d98d7e1..53d98d7e1 100644
--- a/src/test/ui/error-codes/E0501.stderr
+++ b/tests/ui/error-codes/E0501.stderr
diff --git a/src/test/ui/error-codes/E0502.rs b/tests/ui/error-codes/E0502.rs
index 958380ece..958380ece 100644
--- a/src/test/ui/error-codes/E0502.rs
+++ b/tests/ui/error-codes/E0502.rs
diff --git a/src/test/ui/error-codes/E0502.stderr b/tests/ui/error-codes/E0502.stderr
index 94cc89754..94cc89754 100644
--- a/src/test/ui/error-codes/E0502.stderr
+++ b/tests/ui/error-codes/E0502.stderr
diff --git a/src/test/ui/error-codes/E0503.rs b/tests/ui/error-codes/E0503.rs
index 88f5fc1bb..88f5fc1bb 100644
--- a/src/test/ui/error-codes/E0503.rs
+++ b/tests/ui/error-codes/E0503.rs
diff --git a/src/test/ui/error-codes/E0503.stderr b/tests/ui/error-codes/E0503.stderr
index fafe363eb..fafe363eb 100644
--- a/src/test/ui/error-codes/E0503.stderr
+++ b/tests/ui/error-codes/E0503.stderr
diff --git a/src/test/ui/error-codes/E0504.rs b/tests/ui/error-codes/E0504.rs
index c2658bef6..c2658bef6 100644
--- a/src/test/ui/error-codes/E0504.rs
+++ b/tests/ui/error-codes/E0504.rs
diff --git a/src/test/ui/error-codes/E0504.stderr b/tests/ui/error-codes/E0504.stderr
index e677e8916..e677e8916 100644
--- a/src/test/ui/error-codes/E0504.stderr
+++ b/tests/ui/error-codes/E0504.stderr
diff --git a/src/test/ui/error-codes/E0505.rs b/tests/ui/error-codes/E0505.rs
index 941f5f219..941f5f219 100644
--- a/src/test/ui/error-codes/E0505.rs
+++ b/tests/ui/error-codes/E0505.rs
diff --git a/src/test/ui/error-codes/E0505.stderr b/tests/ui/error-codes/E0505.stderr
index bd3f37f54..bd3f37f54 100644
--- a/src/test/ui/error-codes/E0505.stderr
+++ b/tests/ui/error-codes/E0505.stderr
diff --git a/src/test/ui/error-codes/E0506.rs b/tests/ui/error-codes/E0506.rs
index 062a44a52..062a44a52 100644
--- a/src/test/ui/error-codes/E0506.rs
+++ b/tests/ui/error-codes/E0506.rs
diff --git a/src/test/ui/error-codes/E0506.stderr b/tests/ui/error-codes/E0506.stderr
index d70406b75..d70406b75 100644
--- a/src/test/ui/error-codes/E0506.stderr
+++ b/tests/ui/error-codes/E0506.stderr
diff --git a/src/test/ui/error-codes/E0507.rs b/tests/ui/error-codes/E0507.rs
index bae90a44c..bae90a44c 100644
--- a/src/test/ui/error-codes/E0507.rs
+++ b/tests/ui/error-codes/E0507.rs
diff --git a/src/test/ui/error-codes/E0507.stderr b/tests/ui/error-codes/E0507.stderr
index ce8d1ef03..03630f389 100644
--- a/src/test/ui/error-codes/E0507.stderr
+++ b/tests/ui/error-codes/E0507.stderr
@@ -7,7 +7,7 @@ LL |     x.borrow().nothing_is_true();
    |     |          value moved due to this method call
    |     move occurs because value has type `TheDarkKnight`, which does not implement the `Copy` trait
    |
-note: this function takes ownership of the receiver `self`, which moves value
+note: `TheDarkKnight::nothing_is_true` takes ownership of the receiver `self`, which moves value
   --> $DIR/E0507.rs:6:24
    |
 LL |     fn nothing_is_true(self) {}
diff --git a/src/test/ui/error-codes/E0508-fail.rs b/tests/ui/error-codes/E0508-fail.rs
index 072c3d661..072c3d661 100644
--- a/src/test/ui/error-codes/E0508-fail.rs
+++ b/tests/ui/error-codes/E0508-fail.rs
diff --git a/src/test/ui/error-codes/E0508-fail.stderr b/tests/ui/error-codes/E0508-fail.stderr
index b69d7743b..208ba3072 100644
--- a/src/test/ui/error-codes/E0508-fail.stderr
+++ b/tests/ui/error-codes/E0508-fail.stderr
@@ -6,7 +6,11 @@ LL |     let _value = array[0];
    |                  |
    |                  cannot move out of here
    |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |                  help: consider borrowing here: `&array[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let _value = &array[0];
+   |                  +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0508.rs b/tests/ui/error-codes/E0508.rs
index 072c3d661..072c3d661 100644
--- a/src/test/ui/error-codes/E0508.rs
+++ b/tests/ui/error-codes/E0508.rs
diff --git a/src/test/ui/error-codes/E0508.stderr b/tests/ui/error-codes/E0508.stderr
index 5e7b56dcd..df2d3b0d3 100644
--- a/src/test/ui/error-codes/E0508.stderr
+++ b/tests/ui/error-codes/E0508.stderr
@@ -6,7 +6,11 @@ LL |     let _value = array[0];
    |                  |
    |                  cannot move out of here
    |                  move occurs because `array[_]` has type `NonCopy`, which does not implement the `Copy` trait
-   |                  help: consider borrowing here: `&array[0]`
+   |
+help: consider borrowing here
+   |
+LL |     let _value = &array[0];
+   |                  +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0509.rs b/tests/ui/error-codes/E0509.rs
index b2665c4cc..b2665c4cc 100644
--- a/src/test/ui/error-codes/E0509.rs
+++ b/tests/ui/error-codes/E0509.rs
diff --git a/src/test/ui/error-codes/E0509.stderr b/tests/ui/error-codes/E0509.stderr
index cbfbc3ccf..c00d9142e 100644
--- a/src/test/ui/error-codes/E0509.stderr
+++ b/tests/ui/error-codes/E0509.stderr
@@ -6,7 +6,11 @@ LL |     let fancy_field = drop_struct.fancy;
    |                       |
    |                       cannot move out of here
    |                       move occurs because `drop_struct.fancy` has type `FancyNum`, which does not implement the `Copy` trait
-   |                       help: consider borrowing here: `&drop_struct.fancy`
+   |
+help: consider borrowing here
+   |
+LL |     let fancy_field = &drop_struct.fancy;
+   |                       +
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0511.rs b/tests/ui/error-codes/E0511.rs
index a52f81a6c..a52f81a6c 100644
--- a/src/test/ui/error-codes/E0511.rs
+++ b/tests/ui/error-codes/E0511.rs
diff --git a/src/test/ui/error-codes/E0511.stderr b/tests/ui/error-codes/E0511.stderr
index d797b10d5..d797b10d5 100644
--- a/src/test/ui/error-codes/E0511.stderr
+++ b/tests/ui/error-codes/E0511.stderr
diff --git a/src/test/ui/error-codes/E0512.rs b/tests/ui/error-codes/E0512.rs
index e70992aee..e70992aee 100644
--- a/src/test/ui/error-codes/E0512.rs
+++ b/tests/ui/error-codes/E0512.rs
diff --git a/src/test/ui/error-codes/E0512.stderr b/tests/ui/error-codes/E0512.stderr
index 3fecce542..3fecce542 100644
--- a/src/test/ui/error-codes/E0512.stderr
+++ b/tests/ui/error-codes/E0512.stderr
diff --git a/src/test/ui/error-codes/E0516.rs b/tests/ui/error-codes/E0516.rs
index 834bb6309..834bb6309 100644
--- a/src/test/ui/error-codes/E0516.rs
+++ b/tests/ui/error-codes/E0516.rs
diff --git a/src/test/ui/error-codes/E0516.stderr b/tests/ui/error-codes/E0516.stderr
index 5243b7caf..5243b7caf 100644
--- a/src/test/ui/error-codes/E0516.stderr
+++ b/tests/ui/error-codes/E0516.stderr
diff --git a/src/test/ui/error-codes/E0517.rs b/tests/ui/error-codes/E0517.rs
index 1dcaa2d74..1dcaa2d74 100644
--- a/src/test/ui/error-codes/E0517.rs
+++ b/tests/ui/error-codes/E0517.rs
diff --git a/src/test/ui/error-codes/E0517.stderr b/tests/ui/error-codes/E0517.stderr
index 2f90d4d0b..2f90d4d0b 100644
--- a/src/test/ui/error-codes/E0517.stderr
+++ b/tests/ui/error-codes/E0517.stderr
diff --git a/src/test/ui/error-codes/E0518.rs b/tests/ui/error-codes/E0518.rs
index 9c99702ad..9c99702ad 100644
--- a/src/test/ui/error-codes/E0518.rs
+++ b/tests/ui/error-codes/E0518.rs
diff --git a/src/test/ui/error-codes/E0518.stderr b/tests/ui/error-codes/E0518.stderr
index 561446f81..561446f81 100644
--- a/src/test/ui/error-codes/E0518.stderr
+++ b/tests/ui/error-codes/E0518.stderr
diff --git a/tests/ui/error-codes/E0519.rs b/tests/ui/error-codes/E0519.rs
new file mode 100644
index 000000000..269ffd632
--- /dev/null
+++ b/tests/ui/error-codes/E0519.rs
@@ -0,0 +1,8 @@
+// no need to create a new aux file, we can use an existing.
+// aux-build: crateresolve1-1.rs
+
+// set same metadata as `crateresolve1`
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+extern crate crateresolve1; //~ ERROR E0519
diff --git a/tests/ui/error-codes/E0519.stderr b/tests/ui/error-codes/E0519.stderr
new file mode 100644
index 000000000..e24fc4aaa
--- /dev/null
+++ b/tests/ui/error-codes/E0519.stderr
@@ -0,0 +1,9 @@
+error[E0519]: the current crate is indistinguishable from one of its dependencies: it has the same crate-name `crateresolve1` and was compiled with the same `-C metadata` arguments. This will result in symbol conflicts between the two.
+  --> $DIR/E0519.rs:8:1
+   |
+LL | extern crate crateresolve1;
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to previous error
+
+For more information about this error, try `rustc --explain E0519`.
diff --git a/src/test/ui/error-codes/E0520.rs b/tests/ui/error-codes/E0520.rs
index ead78b7ff..ead78b7ff 100644
--- a/src/test/ui/error-codes/E0520.rs
+++ b/tests/ui/error-codes/E0520.rs
diff --git a/src/test/ui/error-codes/E0520.stderr b/tests/ui/error-codes/E0520.stderr
index 12ecead13..12ecead13 100644
--- a/src/test/ui/error-codes/E0520.stderr
+++ b/tests/ui/error-codes/E0520.stderr
diff --git a/src/test/ui/error-codes/E0522.rs b/tests/ui/error-codes/E0522.rs
index 1414e8240..1414e8240 100644
--- a/src/test/ui/error-codes/E0522.rs
+++ b/tests/ui/error-codes/E0522.rs
diff --git a/src/test/ui/error-codes/E0522.stderr b/tests/ui/error-codes/E0522.stderr
index 0a8a41598..0a8a41598 100644
--- a/src/test/ui/error-codes/E0522.stderr
+++ b/tests/ui/error-codes/E0522.stderr
diff --git a/src/test/ui/error-codes/E0527.rs b/tests/ui/error-codes/E0527.rs
index af055ff26..af055ff26 100644
--- a/src/test/ui/error-codes/E0527.rs
+++ b/tests/ui/error-codes/E0527.rs
diff --git a/src/test/ui/error-codes/E0527.stderr b/tests/ui/error-codes/E0527.stderr
index a2e6288b2..a2e6288b2 100644
--- a/src/test/ui/error-codes/E0527.stderr
+++ b/tests/ui/error-codes/E0527.stderr
diff --git a/src/test/ui/error-codes/E0528.rs b/tests/ui/error-codes/E0528.rs
index 0a337c961..0a337c961 100644
--- a/src/test/ui/error-codes/E0528.rs
+++ b/tests/ui/error-codes/E0528.rs
diff --git a/src/test/ui/error-codes/E0528.stderr b/tests/ui/error-codes/E0528.stderr
index 21615f954..21615f954 100644
--- a/src/test/ui/error-codes/E0528.stderr
+++ b/tests/ui/error-codes/E0528.stderr
diff --git a/src/test/ui/error-codes/E0529.rs b/tests/ui/error-codes/E0529.rs
index a82bc9ebc..a82bc9ebc 100644
--- a/src/test/ui/error-codes/E0529.rs
+++ b/tests/ui/error-codes/E0529.rs
diff --git a/src/test/ui/error-codes/E0529.stderr b/tests/ui/error-codes/E0529.stderr
index 96b22bb22..96b22bb22 100644
--- a/src/test/ui/error-codes/E0529.stderr
+++ b/tests/ui/error-codes/E0529.stderr
diff --git a/src/test/ui/error-codes/E0530.rs b/tests/ui/error-codes/E0530.rs
index 5bc40964f..5bc40964f 100644
--- a/src/test/ui/error-codes/E0530.rs
+++ b/tests/ui/error-codes/E0530.rs
diff --git a/src/test/ui/error-codes/E0530.stderr b/tests/ui/error-codes/E0530.stderr
index c31214413..c31214413 100644
--- a/src/test/ui/error-codes/E0530.stderr
+++ b/tests/ui/error-codes/E0530.stderr
diff --git a/src/test/ui/error-codes/E0532.rs b/tests/ui/error-codes/E0532.rs
index 486da0e02..486da0e02 100644
--- a/src/test/ui/error-codes/E0532.rs
+++ b/tests/ui/error-codes/E0532.rs
diff --git a/src/test/ui/error-codes/E0532.stderr b/tests/ui/error-codes/E0532.stderr
index eeccadccc..eeccadccc 100644
--- a/src/test/ui/error-codes/E0532.stderr
+++ b/tests/ui/error-codes/E0532.stderr
diff --git a/src/test/ui/error-codes/E0534.rs b/tests/ui/error-codes/E0534.rs
index a42424994..a42424994 100644
--- a/src/test/ui/error-codes/E0534.rs
+++ b/tests/ui/error-codes/E0534.rs
diff --git a/src/test/ui/error-codes/E0534.stderr b/tests/ui/error-codes/E0534.stderr
index 23f9cd7ce..23f9cd7ce 100644
--- a/src/test/ui/error-codes/E0534.stderr
+++ b/tests/ui/error-codes/E0534.stderr
diff --git a/src/test/ui/error-codes/E0559.rs b/tests/ui/error-codes/E0559.rs
index c6d04ff14..c6d04ff14 100644
--- a/src/test/ui/error-codes/E0559.rs
+++ b/tests/ui/error-codes/E0559.rs
diff --git a/src/test/ui/error-codes/E0559.stderr b/tests/ui/error-codes/E0559.stderr
index 63ee1cd78..63ee1cd78 100644
--- a/src/test/ui/error-codes/E0559.stderr
+++ b/tests/ui/error-codes/E0559.stderr
diff --git a/src/test/ui/error-codes/E0560.rs b/tests/ui/error-codes/E0560.rs
index 1d60f8948..1d60f8948 100644
--- a/src/test/ui/error-codes/E0560.rs
+++ b/tests/ui/error-codes/E0560.rs
diff --git a/src/test/ui/error-codes/E0560.stderr b/tests/ui/error-codes/E0560.stderr
index 6b634f185..6b634f185 100644
--- a/src/test/ui/error-codes/E0560.stderr
+++ b/tests/ui/error-codes/E0560.stderr
diff --git a/src/test/ui/error-codes/E0565-1.rs b/tests/ui/error-codes/E0565-1.rs
index 30fba0191..30fba0191 100644
--- a/src/test/ui/error-codes/E0565-1.rs
+++ b/tests/ui/error-codes/E0565-1.rs
diff --git a/src/test/ui/error-codes/E0565-1.stderr b/tests/ui/error-codes/E0565-1.stderr
index 1283a9c5e..1283a9c5e 100644
--- a/src/test/ui/error-codes/E0565-1.stderr
+++ b/tests/ui/error-codes/E0565-1.stderr
diff --git a/src/test/ui/error-codes/E0565-2.rs b/tests/ui/error-codes/E0565-2.rs
index 0319ecb11..0319ecb11 100644
--- a/src/test/ui/error-codes/E0565-2.rs
+++ b/tests/ui/error-codes/E0565-2.rs
diff --git a/src/test/ui/error-codes/E0565-2.stderr b/tests/ui/error-codes/E0565-2.stderr
index 097871bd3..097871bd3 100644
--- a/src/test/ui/error-codes/E0565-2.stderr
+++ b/tests/ui/error-codes/E0565-2.stderr
diff --git a/src/test/ui/error-codes/E0565.rs b/tests/ui/error-codes/E0565.rs
index df76f6b13..df76f6b13 100644
--- a/src/test/ui/error-codes/E0565.rs
+++ b/tests/ui/error-codes/E0565.rs
diff --git a/src/test/ui/error-codes/E0565.stderr b/tests/ui/error-codes/E0565.stderr
index 6ed90c0ae..6ed90c0ae 100644
--- a/src/test/ui/error-codes/E0565.stderr
+++ b/tests/ui/error-codes/E0565.stderr
diff --git a/src/test/ui/error-codes/E0572.rs b/tests/ui/error-codes/E0572.rs
index cb842c933..cb842c933 100644
--- a/src/test/ui/error-codes/E0572.rs
+++ b/tests/ui/error-codes/E0572.rs
diff --git a/src/test/ui/error-codes/E0572.stderr b/tests/ui/error-codes/E0572.stderr
index 36619f8de..36619f8de 100644
--- a/src/test/ui/error-codes/E0572.stderr
+++ b/tests/ui/error-codes/E0572.stderr
diff --git a/src/test/ui/error-codes/E0582.rs b/tests/ui/error-codes/E0582.rs
index ff25012d0..ff25012d0 100644
--- a/src/test/ui/error-codes/E0582.rs
+++ b/tests/ui/error-codes/E0582.rs
diff --git a/src/test/ui/error-codes/E0582.stderr b/tests/ui/error-codes/E0582.stderr
index 81a2f0046..81a2f0046 100644
--- a/src/test/ui/error-codes/E0582.stderr
+++ b/tests/ui/error-codes/E0582.stderr
diff --git a/src/test/ui/error-codes/E0583.rs b/tests/ui/error-codes/E0583.rs
index 969de79c0..969de79c0 100644
--- a/src/test/ui/error-codes/E0583.rs
+++ b/tests/ui/error-codes/E0583.rs
diff --git a/src/test/ui/error-codes/E0583.stderr b/tests/ui/error-codes/E0583.stderr
index c7bbbf114..c7bbbf114 100644
--- a/src/test/ui/error-codes/E0583.stderr
+++ b/tests/ui/error-codes/E0583.stderr
diff --git a/src/test/ui/error-codes/E0585.rs b/tests/ui/error-codes/E0585.rs
index 890b77b53..890b77b53 100644
--- a/src/test/ui/error-codes/E0585.rs
+++ b/tests/ui/error-codes/E0585.rs
diff --git a/src/test/ui/error-codes/E0585.stderr b/tests/ui/error-codes/E0585.stderr
index 53c82fb41..53c82fb41 100644
--- a/src/test/ui/error-codes/E0585.stderr
+++ b/tests/ui/error-codes/E0585.stderr
diff --git a/src/test/ui/error-codes/E0586.rs b/tests/ui/error-codes/E0586.rs
index 2ab8a2959..2ab8a2959 100644
--- a/src/test/ui/error-codes/E0586.rs
+++ b/tests/ui/error-codes/E0586.rs
diff --git a/src/test/ui/error-codes/E0586.stderr b/tests/ui/error-codes/E0586.stderr
index 0bbf9a608..0bbf9a608 100644
--- a/src/test/ui/error-codes/E0586.stderr
+++ b/tests/ui/error-codes/E0586.stderr
diff --git a/src/test/ui/error-codes/E0594.rs b/tests/ui/error-codes/E0594.rs
index 8b0cae7e1..8b0cae7e1 100644
--- a/src/test/ui/error-codes/E0594.rs
+++ b/tests/ui/error-codes/E0594.rs
diff --git a/src/test/ui/error-codes/E0594.stderr b/tests/ui/error-codes/E0594.stderr
index f4d96f4e4..f4d96f4e4 100644
--- a/src/test/ui/error-codes/E0594.stderr
+++ b/tests/ui/error-codes/E0594.stderr
diff --git a/src/test/ui/error-codes/E0596.rs b/tests/ui/error-codes/E0596.rs
index 9e2f5ee76..9e2f5ee76 100644
--- a/src/test/ui/error-codes/E0596.rs
+++ b/tests/ui/error-codes/E0596.rs
diff --git a/src/test/ui/error-codes/E0596.stderr b/tests/ui/error-codes/E0596.stderr
index 79bc258f1..3f9aebcc8 100644
--- a/src/test/ui/error-codes/E0596.stderr
+++ b/tests/ui/error-codes/E0596.stderr
@@ -1,10 +1,13 @@
 error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
   --> $DIR/E0596.rs:3:13
    |
-LL |     let x = 1;
-   |         - 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 = 1;
+   |         +++
 
 error: aborting due to previous error
 
diff --git a/src/test/ui/error-codes/E0597.rs b/tests/ui/error-codes/E0597.rs
index 7217e3512..7217e3512 100644
--- a/src/test/ui/error-codes/E0597.rs
+++ b/tests/ui/error-codes/E0597.rs
diff --git a/src/test/ui/error-codes/E0597.stderr b/tests/ui/error-codes/E0597.stderr
index b4a1180ad..b4a1180ad 100644
--- a/src/test/ui/error-codes/E0597.stderr
+++ b/tests/ui/error-codes/E0597.stderr
diff --git a/src/test/ui/error-codes/E0599.rs b/tests/ui/error-codes/E0599.rs
index a2d7bb2dc..a2d7bb2dc 100644
--- a/src/test/ui/error-codes/E0599.rs
+++ b/tests/ui/error-codes/E0599.rs
diff --git a/src/test/ui/error-codes/E0599.stderr b/tests/ui/error-codes/E0599.stderr
index a1fb58f48..a1fb58f48 100644
--- a/src/test/ui/error-codes/E0599.stderr
+++ b/tests/ui/error-codes/E0599.stderr
diff --git a/src/test/ui/error-codes/E0600.rs b/tests/ui/error-codes/E0600.rs
index 7731d8619..7731d8619 100644
--- a/src/test/ui/error-codes/E0600.rs
+++ b/tests/ui/error-codes/E0600.rs
diff --git a/src/test/ui/error-codes/E0600.stderr b/tests/ui/error-codes/E0600.stderr
index 95ac4510c..95ac4510c 100644
--- a/src/test/ui/error-codes/E0600.stderr
+++ b/tests/ui/error-codes/E0600.stderr
diff --git a/src/test/ui/error-codes/E0601.rs b/tests/ui/error-codes/E0601.rs
index 4380ddeac..4380ddeac 100644
--- a/src/test/ui/error-codes/E0601.rs
+++ b/tests/ui/error-codes/E0601.rs
diff --git a/src/test/ui/error-codes/E0601.stderr b/tests/ui/error-codes/E0601.stderr
index a687f5756..a687f5756 100644
--- a/src/test/ui/error-codes/E0601.stderr
+++ b/tests/ui/error-codes/E0601.stderr
diff --git a/src/test/ui/error-codes/E0602.rs b/tests/ui/error-codes/E0602.rs
index 8fadce526..8fadce526 100644
--- a/src/test/ui/error-codes/E0602.rs
+++ b/tests/ui/error-codes/E0602.rs
diff --git a/src/test/ui/error-codes/E0602.stderr b/tests/ui/error-codes/E0602.stderr
index 2b3722633..2b3722633 100644
--- a/src/test/ui/error-codes/E0602.stderr
+++ b/tests/ui/error-codes/E0602.stderr
diff --git a/src/test/ui/error-codes/E0603.rs b/tests/ui/error-codes/E0603.rs
index 24a9ba887..24a9ba887 100644
--- a/src/test/ui/error-codes/E0603.rs
+++ b/tests/ui/error-codes/E0603.rs
diff --git a/src/test/ui/error-codes/E0603.stderr b/tests/ui/error-codes/E0603.stderr
index ee902584f..ee902584f 100644
--- a/src/test/ui/error-codes/E0603.stderr
+++ b/tests/ui/error-codes/E0603.stderr
diff --git a/src/test/ui/error-codes/E0604.rs b/tests/ui/error-codes/E0604.rs
index b9c0d1f92..b9c0d1f92 100644
--- a/src/test/ui/error-codes/E0604.rs
+++ b/tests/ui/error-codes/E0604.rs
diff --git a/src/test/ui/error-codes/E0604.stderr b/tests/ui/error-codes/E0604.stderr
index 68da03928..68da03928 100644
--- a/src/test/ui/error-codes/E0604.stderr
+++ b/tests/ui/error-codes/E0604.stderr
diff --git a/src/test/ui/error-codes/E0605.rs b/tests/ui/error-codes/E0605.rs
index cfbf1aa2b..cfbf1aa2b 100644
--- a/src/test/ui/error-codes/E0605.rs
+++ b/tests/ui/error-codes/E0605.rs
diff --git a/src/test/ui/error-codes/E0605.stderr b/tests/ui/error-codes/E0605.stderr
index e385b3394..e385b3394 100644
--- a/src/test/ui/error-codes/E0605.stderr
+++ b/tests/ui/error-codes/E0605.stderr
diff --git a/tests/ui/error-codes/E0606.rs b/tests/ui/error-codes/E0606.rs
new file mode 100644
index 000000000..6f6c65138
--- /dev/null
+++ b/tests/ui/error-codes/E0606.rs
@@ -0,0 +1,4 @@
+fn main() {
+    let x = &(&0u8 as u8); //~ ERROR E0606
+    x as u8; //~ casting `&u8` as `u8` is invalid [E0606]
+}
diff --git a/tests/ui/error-codes/E0606.stderr b/tests/ui/error-codes/E0606.stderr
new file mode 100644
index 000000000..2492eb299
--- /dev/null
+++ b/tests/ui/error-codes/E0606.stderr
@@ -0,0 +1,26 @@
+error[E0606]: casting `&u8` as `u8` is invalid
+  --> $DIR/E0606.rs:2:14
+   |
+LL |     let x = &(&0u8 as u8);
+   |              ^^^^^^^^^^^^
+   |
+help: remove the unneeded borrow
+   |
+LL -     let x = &(&0u8 as u8);
+LL +     let x = &(0u8 as u8);
+   |
+
+error[E0606]: casting `&u8` as `u8` is invalid
+  --> $DIR/E0606.rs:3:5
+   |
+LL |     x as u8;
+   |     ^^^^^^^
+   |
+help: dereference the expression
+   |
+LL |     *x as u8;
+   |     +
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0606`.
diff --git a/src/test/ui/error-codes/E0607.rs b/tests/ui/error-codes/E0607.rs
index 65001c471..65001c471 100644
--- a/src/test/ui/error-codes/E0607.rs
+++ b/tests/ui/error-codes/E0607.rs
diff --git a/src/test/ui/error-codes/E0607.stderr b/tests/ui/error-codes/E0607.stderr
index a0fe02c1c..a0fe02c1c 100644
--- a/src/test/ui/error-codes/E0607.stderr
+++ b/tests/ui/error-codes/E0607.stderr
diff --git a/src/test/ui/error-codes/E0608.rs b/tests/ui/error-codes/E0608.rs
index 1e342d668..1e342d668 100644
--- a/src/test/ui/error-codes/E0608.rs
+++ b/tests/ui/error-codes/E0608.rs
diff --git a/src/test/ui/error-codes/E0608.stderr b/tests/ui/error-codes/E0608.stderr
index 3aec50993..3aec50993 100644
--- a/src/test/ui/error-codes/E0608.stderr
+++ b/tests/ui/error-codes/E0608.stderr
diff --git a/src/test/ui/error-codes/E0609.rs b/tests/ui/error-codes/E0609.rs
index e3a97f2fb..e3a97f2fb 100644
--- a/src/test/ui/error-codes/E0609.rs
+++ b/tests/ui/error-codes/E0609.rs
diff --git a/src/test/ui/error-codes/E0609.stderr b/tests/ui/error-codes/E0609.stderr
index 797e95d02..797e95d02 100644
--- a/src/test/ui/error-codes/E0609.stderr
+++ b/tests/ui/error-codes/E0609.stderr
diff --git a/src/test/ui/error-codes/E0610.rs b/tests/ui/error-codes/E0610.rs
index de246f371..de246f371 100644
--- a/src/test/ui/error-codes/E0610.rs
+++ b/tests/ui/error-codes/E0610.rs
diff --git a/src/test/ui/error-codes/E0610.stderr b/tests/ui/error-codes/E0610.stderr
index a2966eea4..a2966eea4 100644
--- a/src/test/ui/error-codes/E0610.stderr
+++ b/tests/ui/error-codes/E0610.stderr
diff --git a/src/test/ui/error-codes/E0614.rs b/tests/ui/error-codes/E0614.rs
index 6b4817b69..6b4817b69 100644
--- a/src/test/ui/error-codes/E0614.rs
+++ b/tests/ui/error-codes/E0614.rs
diff --git a/src/test/ui/error-codes/E0614.stderr b/tests/ui/error-codes/E0614.stderr
index 598117c2b..598117c2b 100644
--- a/src/test/ui/error-codes/E0614.stderr
+++ b/tests/ui/error-codes/E0614.stderr
diff --git a/src/test/ui/error-codes/E0615.rs b/tests/ui/error-codes/E0615.rs
index d04e4d5f7..d04e4d5f7 100644
--- a/src/test/ui/error-codes/E0615.rs
+++ b/tests/ui/error-codes/E0615.rs
diff --git a/src/test/ui/error-codes/E0615.stderr b/tests/ui/error-codes/E0615.stderr
index c12e1a3a6..c12e1a3a6 100644
--- a/src/test/ui/error-codes/E0615.stderr
+++ b/tests/ui/error-codes/E0615.stderr
diff --git a/src/test/ui/error-codes/E0616.rs b/tests/ui/error-codes/E0616.rs
index 98f87a83b..98f87a83b 100644
--- a/src/test/ui/error-codes/E0616.rs
+++ b/tests/ui/error-codes/E0616.rs
diff --git a/src/test/ui/error-codes/E0616.stderr b/tests/ui/error-codes/E0616.stderr
index da349ed2f..da349ed2f 100644
--- a/src/test/ui/error-codes/E0616.stderr
+++ b/tests/ui/error-codes/E0616.stderr
diff --git a/src/test/ui/error-codes/E0617.rs b/tests/ui/error-codes/E0617.rs
index b71ba0ed8..b71ba0ed8 100644
--- a/src/test/ui/error-codes/E0617.rs
+++ b/tests/ui/error-codes/E0617.rs
diff --git a/src/test/ui/error-codes/E0617.stderr b/tests/ui/error-codes/E0617.stderr
index ea91ad082..ea91ad082 100644
--- a/src/test/ui/error-codes/E0617.stderr
+++ b/tests/ui/error-codes/E0617.stderr
diff --git a/src/test/ui/error-codes/E0618.rs b/tests/ui/error-codes/E0618.rs
index 2616e7134..2616e7134 100644
--- a/src/test/ui/error-codes/E0618.rs
+++ b/tests/ui/error-codes/E0618.rs
diff --git a/src/test/ui/error-codes/E0618.stderr b/tests/ui/error-codes/E0618.stderr
index 793ec02a8..793ec02a8 100644
--- a/src/test/ui/error-codes/E0618.stderr
+++ b/tests/ui/error-codes/E0618.stderr
diff --git a/src/test/ui/error-codes/E0620.rs b/tests/ui/error-codes/E0620.rs
index 2831413ea..2831413ea 100644
--- a/src/test/ui/error-codes/E0620.rs
+++ b/tests/ui/error-codes/E0620.rs
diff --git a/src/test/ui/error-codes/E0620.stderr b/tests/ui/error-codes/E0620.stderr
index 65152b2b7..65152b2b7 100644
--- a/src/test/ui/error-codes/E0620.stderr
+++ b/tests/ui/error-codes/E0620.stderr
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.rs
index 44f174c0f..44f174c0f 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.rs
+++ b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.rs
diff --git a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
index b9edeb834..b9edeb834 100644
--- a/src/test/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
+++ b/tests/ui/error-codes/E0621-does-not-trigger-for-closures.stderr
diff --git a/src/test/ui/error-codes/E0622.rs b/tests/ui/error-codes/E0622.rs
index ae7378a70..ae7378a70 100644
--- a/src/test/ui/error-codes/E0622.rs
+++ b/tests/ui/error-codes/E0622.rs
diff --git a/src/test/ui/error-codes/E0622.stderr b/tests/ui/error-codes/E0622.stderr
index 8466dfe38..8466dfe38 100644
--- a/src/test/ui/error-codes/E0622.stderr
+++ b/tests/ui/error-codes/E0622.stderr
diff --git a/src/test/ui/error-codes/E0624.rs b/tests/ui/error-codes/E0624.rs
index 4c68b70fb..4c68b70fb 100644
--- a/src/test/ui/error-codes/E0624.rs
+++ b/tests/ui/error-codes/E0624.rs
diff --git a/src/test/ui/error-codes/E0624.stderr b/tests/ui/error-codes/E0624.stderr
index e59b8a8ae..e59b8a8ae 100644
--- a/src/test/ui/error-codes/E0624.stderr
+++ b/tests/ui/error-codes/E0624.stderr
diff --git a/src/test/ui/error-codes/E0637.rs b/tests/ui/error-codes/E0637.rs
index 382ce3ed0..382ce3ed0 100644
--- a/src/test/ui/error-codes/E0637.rs
+++ b/tests/ui/error-codes/E0637.rs
diff --git a/src/test/ui/error-codes/E0637.stderr b/tests/ui/error-codes/E0637.stderr
index 35a4b34fb..78341735e 100644
--- a/src/test/ui/error-codes/E0637.stderr
+++ b/tests/ui/error-codes/E0637.stderr
@@ -21,6 +21,12 @@ error[E0637]: `&` without an explicit lifetime name cannot be used here
    |
 LL |     T: Into<&u32>,
    |             ^ explicit lifetime name needed here
+   |
+help: consider introducing a higher-ranked lifetime here with `for<'a>`
+  --> $DIR/E0637.rs:13:8
+   |
+LL |     T: Into<&u32>,
+   |        ^
 
 error: aborting due to 3 previous errors
 
diff --git a/src/test/ui/error-codes/E0642.fixed b/tests/ui/error-codes/E0642.fixed
index fc6255e02..fc6255e02 100644
--- a/src/test/ui/error-codes/E0642.fixed
+++ b/tests/ui/error-codes/E0642.fixed
diff --git a/src/test/ui/error-codes/E0642.rs b/tests/ui/error-codes/E0642.rs
index 5f85f3935..5f85f3935 100644
--- a/src/test/ui/error-codes/E0642.rs
+++ b/tests/ui/error-codes/E0642.rs
diff --git a/src/test/ui/error-codes/E0642.stderr b/tests/ui/error-codes/E0642.stderr
index dd9e28ad4..dd9e28ad4 100644
--- a/src/test/ui/error-codes/E0642.stderr
+++ b/tests/ui/error-codes/E0642.stderr
diff --git a/src/test/ui/error-codes/E0646.rs b/tests/ui/error-codes/E0646.rs
index bb62428f5..bb62428f5 100644
--- a/src/test/ui/error-codes/E0646.rs
+++ b/tests/ui/error-codes/E0646.rs
diff --git a/src/test/ui/error-codes/E0646.stderr b/tests/ui/error-codes/E0646.stderr
index 069401b3f..069401b3f 100644
--- a/src/test/ui/error-codes/E0646.stderr
+++ b/tests/ui/error-codes/E0646.stderr
diff --git a/src/test/ui/error-codes/E0647.rs b/tests/ui/error-codes/E0647.rs
index fc085511c..fc085511c 100644
--- a/src/test/ui/error-codes/E0647.rs
+++ b/tests/ui/error-codes/E0647.rs
diff --git a/src/test/ui/error-codes/E0647.stderr b/tests/ui/error-codes/E0647.stderr
index 08cedfaef..08cedfaef 100644
--- a/src/test/ui/error-codes/E0647.stderr
+++ b/tests/ui/error-codes/E0647.stderr
diff --git a/src/test/ui/error-codes/E0648.rs b/tests/ui/error-codes/E0648.rs
index 8408a78c7..8408a78c7 100644
--- a/src/test/ui/error-codes/E0648.rs
+++ b/tests/ui/error-codes/E0648.rs
diff --git a/src/test/ui/error-codes/E0648.stderr b/tests/ui/error-codes/E0648.stderr
index 1a65825c7..1a65825c7 100644
--- a/src/test/ui/error-codes/E0648.stderr
+++ b/tests/ui/error-codes/E0648.stderr
diff --git a/src/test/ui/error-codes/E0657.rs b/tests/ui/error-codes/E0657.rs
index cb11de13f..cb11de13f 100644
--- a/src/test/ui/error-codes/E0657.rs
+++ b/tests/ui/error-codes/E0657.rs
diff --git a/src/test/ui/error-codes/E0657.stderr b/tests/ui/error-codes/E0657.stderr
index df76b45a5..df76b45a5 100644
--- a/src/test/ui/error-codes/E0657.stderr
+++ b/tests/ui/error-codes/E0657.stderr
diff --git a/src/test/ui/error-codes/E0658.rs b/tests/ui/error-codes/E0658.rs
index 9c9b95d70..9c9b95d70 100644
--- a/src/test/ui/error-codes/E0658.rs
+++ b/tests/ui/error-codes/E0658.rs
diff --git a/src/test/ui/error-codes/E0658.stderr b/tests/ui/error-codes/E0658.stderr
index 8d4234845..8d4234845 100644
--- a/src/test/ui/error-codes/E0658.stderr
+++ b/tests/ui/error-codes/E0658.stderr
diff --git a/src/test/ui/error-codes/E0659.rs b/tests/ui/error-codes/E0659.rs
index c00026bb7..c00026bb7 100644
--- a/src/test/ui/error-codes/E0659.rs
+++ b/tests/ui/error-codes/E0659.rs
diff --git a/src/test/ui/error-codes/E0659.stderr b/tests/ui/error-codes/E0659.stderr
index b0c73c636..b0c73c636 100644
--- a/src/test/ui/error-codes/E0659.stderr
+++ b/tests/ui/error-codes/E0659.stderr
diff --git a/src/test/ui/error-codes/E0705.rs b/tests/ui/error-codes/E0705.rs
index 05abcb629..05abcb629 100644
--- a/src/test/ui/error-codes/E0705.rs
+++ b/tests/ui/error-codes/E0705.rs
diff --git a/src/test/ui/error-codes/E0705.stderr b/tests/ui/error-codes/E0705.stderr
index 6fa843158..6fa843158 100644
--- a/src/test/ui/error-codes/E0705.stderr
+++ b/tests/ui/error-codes/E0705.stderr
diff --git a/tests/ui/error-codes/E0711.rs b/tests/ui/error-codes/E0711.rs
new file mode 100644
index 000000000..7b1a217bd
--- /dev/null
+++ b/tests/ui/error-codes/E0711.rs
@@ -0,0 +1,18 @@
+// copied from: tests/ui/feature-gates/stability-attribute-consistency.rs
+
+#![feature(staged_api)]
+
+#![stable(feature = "stable_test_feature", since = "1.0.0")]
+
+#[stable(feature = "foo", since = "1.0.0")]
+fn foo_stable_1_0_0() {}
+
+#[stable(feature = "foo", since = "1.29.0")]
+//~^ ERROR feature `foo` is declared stable since 1.29.0
+fn foo_stable_1_29_0() {}
+
+#[unstable(feature = "foo", issue = "none")]
+//~^ ERROR feature `foo` is declared unstable
+fn foo_unstable() {}
+
+fn main() {}
diff --git a/tests/ui/error-codes/E0711.stderr b/tests/ui/error-codes/E0711.stderr
new file mode 100644
index 000000000..f39cb4ecd
--- /dev/null
+++ b/tests/ui/error-codes/E0711.stderr
@@ -0,0 +1,15 @@
+error[E0711]: feature `foo` is declared stable since 1.29.0, but was previously declared stable since 1.0.0
+  --> $DIR/E0711.rs:10:1
+   |
+LL | #[stable(feature = "foo", since = "1.29.0")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error[E0711]: feature `foo` is declared unstable, but was previously declared stable
+  --> $DIR/E0711.rs:14:1
+   |
+LL | #[unstable(feature = "foo", issue = "none")]
+   | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+error: aborting due to 2 previous errors
+
+For more information about this error, try `rustc --explain E0711`.
diff --git a/src/test/ui/error-codes/E0718.rs b/tests/ui/error-codes/E0718.rs
index 909cae0ba..909cae0ba 100644
--- a/src/test/ui/error-codes/E0718.rs
+++ b/tests/ui/error-codes/E0718.rs
diff --git a/src/test/ui/error-codes/E0718.stderr b/tests/ui/error-codes/E0718.stderr
index 30378dd16..30378dd16 100644
--- a/src/test/ui/error-codes/E0718.stderr
+++ b/tests/ui/error-codes/E0718.stderr
diff --git a/src/test/ui/error-codes/E0719.rs b/tests/ui/error-codes/E0719.rs
index 3311e1909..3311e1909 100644
--- a/src/test/ui/error-codes/E0719.rs
+++ b/tests/ui/error-codes/E0719.rs
diff --git a/src/test/ui/error-codes/E0719.stderr b/tests/ui/error-codes/E0719.stderr
index b342d6343..b342d6343 100644
--- a/src/test/ui/error-codes/E0719.stderr
+++ b/tests/ui/error-codes/E0719.stderr
diff --git a/src/test/ui/error-codes/E0730.rs b/tests/ui/error-codes/E0730.rs
index 04f5e5d42..04f5e5d42 100644
--- a/src/test/ui/error-codes/E0730.rs
+++ b/tests/ui/error-codes/E0730.rs
diff --git a/src/test/ui/error-codes/E0730.stderr b/tests/ui/error-codes/E0730.stderr
index 067e8c57c..067e8c57c 100644
--- a/src/test/ui/error-codes/E0730.stderr
+++ b/tests/ui/error-codes/E0730.stderr
diff --git a/src/test/ui/error-codes/E0746.fixed b/tests/ui/error-codes/E0746.fixed
index ca8319aa0..ca8319aa0 100644
--- a/src/test/ui/error-codes/E0746.fixed
+++ b/tests/ui/error-codes/E0746.fixed
diff --git a/src/test/ui/error-codes/E0746.rs b/tests/ui/error-codes/E0746.rs
index bf5ba8fff..bf5ba8fff 100644
--- a/src/test/ui/error-codes/E0746.rs
+++ b/tests/ui/error-codes/E0746.rs
diff --git a/src/test/ui/error-codes/E0746.stderr b/tests/ui/error-codes/E0746.stderr
index 2153b59ad..2153b59ad 100644
--- a/src/test/ui/error-codes/E0746.stderr
+++ b/tests/ui/error-codes/E0746.stderr
diff --git a/src/test/ui/error-codes/E0767.rs b/tests/ui/error-codes/E0767.rs
index 14215d36a..14215d36a 100644
--- a/src/test/ui/error-codes/E0767.rs
+++ b/tests/ui/error-codes/E0767.rs
diff --git a/src/test/ui/error-codes/E0767.stderr b/tests/ui/error-codes/E0767.stderr
index ee8524730..ee8524730 100644
--- a/src/test/ui/error-codes/E0767.stderr
+++ b/tests/ui/error-codes/E0767.stderr
diff --git a/src/test/ui/error-codes/E0771.rs b/tests/ui/error-codes/E0771.rs
index 67e7d106a..67e7d106a 100644
--- a/src/test/ui/error-codes/E0771.rs
+++ b/tests/ui/error-codes/E0771.rs
diff --git a/src/test/ui/error-codes/E0771.stderr b/tests/ui/error-codes/E0771.stderr
index b759399a9..b759399a9 100644
--- a/src/test/ui/error-codes/E0771.stderr
+++ b/tests/ui/error-codes/E0771.stderr
diff --git a/src/test/ui/error-codes/E0777.rs b/tests/ui/error-codes/E0777.rs
index ff70f7368..ff70f7368 100644
--- a/src/test/ui/error-codes/E0777.rs
+++ b/tests/ui/error-codes/E0777.rs
diff --git a/src/test/ui/error-codes/E0777.stderr b/tests/ui/error-codes/E0777.stderr
index 14697d89e..14697d89e 100644
--- a/src/test/ui/error-codes/E0777.stderr
+++ b/tests/ui/error-codes/E0777.stderr
diff --git a/src/test/ui/error-codes/E0778.rs b/tests/ui/error-codes/E0778.rs
index 74653886d..74653886d 100644
--- a/src/test/ui/error-codes/E0778.rs
+++ b/tests/ui/error-codes/E0778.rs
diff --git a/src/test/ui/error-codes/E0778.stderr b/tests/ui/error-codes/E0778.stderr
index 42647e5c6..42647e5c6 100644
--- a/src/test/ui/error-codes/E0778.stderr
+++ b/tests/ui/error-codes/E0778.stderr
diff --git a/src/test/ui/error-codes/E0779.rs b/tests/ui/error-codes/E0779.rs
index c32dae12c..c32dae12c 100644
--- a/src/test/ui/error-codes/E0779.rs
+++ b/tests/ui/error-codes/E0779.rs
diff --git a/src/test/ui/error-codes/E0779.stderr b/tests/ui/error-codes/E0779.stderr
index 7c6a119a0..7c6a119a0 100644
--- a/src/test/ui/error-codes/E0779.stderr
+++ b/tests/ui/error-codes/E0779.stderr
diff --git a/src/test/ui/error-codes/E0790.rs b/tests/ui/error-codes/E0790.rs
index d99006d2d..d99006d2d 100644
--- a/src/test/ui/error-codes/E0790.rs
+++ b/tests/ui/error-codes/E0790.rs
diff --git a/src/test/ui/error-codes/E0790.stderr b/tests/ui/error-codes/E0790.stderr
index f68c0e7d2..fc025a3fc 100644
--- a/src/test/ui/error-codes/E0790.stderr
+++ b/tests/ui/error-codes/E0790.stderr
@@ -37,8 +37,8 @@ LL |     inner::MyTrait::my_fn();
    |
 help: use the fully-qualified path to the only available implementation
    |
-LL |     inner::<MyStruct as MyTrait>::my_fn();
-   |            ++++++++++++        +
+LL |     <MyStruct as inner::MyTrait>::my_fn();
+   |     ++++++++++++               +
 
 error[E0790]: cannot refer to the associated constant on trait without specifying the corresponding `impl` type
   --> $DIR/E0790.rs:30:13
@@ -51,8 +51,8 @@ LL |     let _ = inner::MyTrait::MY_ASSOC_CONST;
    |
 help: use the fully-qualified path to the only available implementation
    |
-LL |     let _ = inner::<MyStruct as MyTrait>::MY_ASSOC_CONST;
-   |                    ++++++++++++        +
+LL |     let _ = <MyStruct as inner::MyTrait>::MY_ASSOC_CONST;
+   |             ++++++++++++               +
 
 error[E0790]: cannot call associated function on trait without specifying the corresponding `impl` type
   --> $DIR/E0790.rs:50:5
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-1.rs b/tests/ui/error-codes/auxiliary/crateresolve1-1.rs
new file mode 100644
index 000000000..bd9c8483e
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-1.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-1
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 10 }
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-2.rs b/tests/ui/error-codes/auxiliary/crateresolve1-2.rs
new file mode 100644
index 000000000..bd0f08f45
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-2.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-2
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 20 }
diff --git a/tests/ui/error-codes/auxiliary/crateresolve1-3.rs b/tests/ui/error-codes/auxiliary/crateresolve1-3.rs
new file mode 100644
index 000000000..1226c2fbb
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/crateresolve1-3.rs
@@ -0,0 +1,6 @@
+// compile-flags:-C extra-filename=-3
+// no-prefer-dynamic
+#![crate_name = "crateresolve1"]
+#![crate_type = "lib"]
+
+pub fn f() -> isize { 30 }
diff --git a/tests/ui/error-codes/auxiliary/found-staticlib.rs b/tests/ui/error-codes/auxiliary/found-staticlib.rs
new file mode 100644
index 000000000..04e2c5978
--- /dev/null
+++ b/tests/ui/error-codes/auxiliary/found-staticlib.rs
@@ -0,0 +1,4 @@
+// no-prefer-dynamic
+#![crate_type = "staticlib"]
+
+pub fn foo() {}
diff --git a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs b/tests/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
index ad5bb107f..ad5bb107f 100644
--- a/src/test/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
+++ b/tests/ui/error-codes/e0119/auxiliary/complex_impl_support.rs
diff --git a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs b/tests/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
index 141f36369..141f36369 100644
--- a/src/test/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
+++ b/tests/ui/error-codes/e0119/auxiliary/issue-23563-a.rs
diff --git a/src/test/ui/error-codes/e0119/complex-impl.rs b/tests/ui/error-codes/e0119/complex-impl.rs
index 9149e4ce5..9149e4ce5 100644
--- a/src/test/ui/error-codes/e0119/complex-impl.rs
+++ b/tests/ui/error-codes/e0119/complex-impl.rs
diff --git a/src/test/ui/error-codes/e0119/complex-impl.stderr b/tests/ui/error-codes/e0119/complex-impl.stderr
index 654073eec..654073eec 100644
--- a/src/test/ui/error-codes/e0119/complex-impl.stderr
+++ b/tests/ui/error-codes/e0119/complex-impl.stderr
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.rs b/tests/ui/error-codes/e0119/conflict-with-std.rs
index c9db2bab1..c9db2bab1 100644
--- a/src/test/ui/error-codes/e0119/conflict-with-std.rs
+++ b/tests/ui/error-codes/e0119/conflict-with-std.rs
diff --git a/src/test/ui/error-codes/e0119/conflict-with-std.stderr b/tests/ui/error-codes/e0119/conflict-with-std.stderr
index ef888a1c2..ef888a1c2 100644
--- a/src/test/ui/error-codes/e0119/conflict-with-std.stderr
+++ b/tests/ui/error-codes/e0119/conflict-with-std.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-23563.rs b/tests/ui/error-codes/e0119/issue-23563.rs
index f578560c5..f578560c5 100644
--- a/src/test/ui/error-codes/e0119/issue-23563.rs
+++ b/tests/ui/error-codes/e0119/issue-23563.rs
diff --git a/src/test/ui/error-codes/e0119/issue-23563.stderr b/tests/ui/error-codes/e0119/issue-23563.stderr
index 1b2d64282..1b2d64282 100644
--- a/src/test/ui/error-codes/e0119/issue-23563.stderr
+++ b/tests/ui/error-codes/e0119/issue-23563.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-27403.rs b/tests/ui/error-codes/e0119/issue-27403.rs
index b03a564ff..b03a564ff 100644
--- a/src/test/ui/error-codes/e0119/issue-27403.rs
+++ b/tests/ui/error-codes/e0119/issue-27403.rs
diff --git a/src/test/ui/error-codes/e0119/issue-27403.stderr b/tests/ui/error-codes/e0119/issue-27403.stderr
index 9b3345c23..9b3345c23 100644
--- a/src/test/ui/error-codes/e0119/issue-27403.stderr
+++ b/tests/ui/error-codes/e0119/issue-27403.stderr
diff --git a/src/test/ui/error-codes/e0119/issue-28981.rs b/tests/ui/error-codes/e0119/issue-28981.rs
index 5fb7e9a99..5fb7e9a99 100644
--- a/src/test/ui/error-codes/e0119/issue-28981.rs
+++ b/tests/ui/error-codes/e0119/issue-28981.rs
diff --git a/src/test/ui/error-codes/e0119/issue-28981.stderr b/tests/ui/error-codes/e0119/issue-28981.stderr
index 97b570bc7..97b570bc7 100644
--- a/src/test/ui/error-codes/e0119/issue-28981.stderr
+++ b/tests/ui/error-codes/e0119/issue-28981.stderr
diff --git a/src/test/ui/error-codes/e0119/so-37347311.rs b/tests/ui/error-codes/e0119/so-37347311.rs
index d5f624bc4..d5f624bc4 100644
--- a/src/test/ui/error-codes/e0119/so-37347311.rs
+++ b/tests/ui/error-codes/e0119/so-37347311.rs
diff --git a/src/test/ui/error-codes/e0119/so-37347311.stderr b/tests/ui/error-codes/e0119/so-37347311.stderr
index 99367e808..99367e808 100644
--- a/src/test/ui/error-codes/e0119/so-37347311.stderr
+++ b/tests/ui/error-codes/e0119/so-37347311.stderr
diff --git a/src/test/ui/error-codes/ex-E0611.rs b/tests/ui/error-codes/ex-E0611.rs
index f18a3619f..f18a3619f 100644
--- a/src/test/ui/error-codes/ex-E0611.rs
+++ b/tests/ui/error-codes/ex-E0611.rs
diff --git a/src/test/ui/error-codes/ex-E0611.stderr b/tests/ui/error-codes/ex-E0611.stderr
index 1da7b33be..1da7b33be 100644
--- a/src/test/ui/error-codes/ex-E0611.stderr
+++ b/tests/ui/error-codes/ex-E0611.stderr
diff --git a/src/test/ui/error-codes/ex-E0612.rs b/tests/ui/error-codes/ex-E0612.rs
index c8ea53ae9..c8ea53ae9 100644
--- a/src/test/ui/error-codes/ex-E0612.rs
+++ b/tests/ui/error-codes/ex-E0612.rs
diff --git a/src/test/ui/error-codes/ex-E0612.stderr b/tests/ui/error-codes/ex-E0612.stderr
index b21b6fdfc..b21b6fdfc 100644
--- a/src/test/ui/error-codes/ex-E0612.stderr
+++ b/tests/ui/error-codes/ex-E0612.stderr