38 files changed, 103 insertions, 18 deletions
diff --git a/src/test/ui/issues/issue-29166.rs b/src/test/ui/borrowck/issue-29166.rs
index ca819ba39a2..ca819ba39a2 100644
--- a/src/test/ui/issues/issue-29166.rs
+++ b/src/test/ui/borrowck/issue-29166.rs
diff --git a/src/test/ui/issues/issue-51301.rs b/src/test/ui/borrowck/issue-51301.rs
index 7e0a5190fcd..7e0a5190fcd 100644
--- a/src/test/ui/issues/issue-51301.rs
+++ b/src/test/ui/borrowck/issue-51301.rs
diff --git a/src/test/ui/issues/issue-51301.stderr b/src/test/ui/borrowck/issue-51301.stderr
index f3decf7a991..f3decf7a991 100644
--- a/src/test/ui/issues/issue-51301.stderr
+++ b/src/test/ui/borrowck/issue-51301.stderr
diff --git a/src/test/ui/issues/issue-21486.rs b/src/test/ui/drop/issue-21486.rs
index 46d6ccd56bd..46d6ccd56bd 100644
--- a/src/test/ui/issues/issue-21486.rs
+++ b/src/test/ui/drop/issue-21486.rs
diff --git a/src/test/ui/issues/issue-15221.rs b/src/test/ui/hygiene/issue-15221.rs
index 4b8319a8304..4b8319a8304 100644
--- a/src/test/ui/issues/issue-15221.rs
+++ b/src/test/ui/hygiene/issue-15221.rs
diff --git a/src/test/ui/issues/issue-26930.rs b/src/test/ui/imports/issue-26930.rs
index 707e71b1124..707e71b1124 100644
--- a/src/test/ui/issues/issue-26930.rs
+++ b/src/test/ui/imports/issue-26930.rs
diff --git a/src/test/ui/issues/issue-5353.rs b/src/test/ui/issues/issue-5353.rs
deleted file mode 100644
index 1d6813d5a39..00000000000
--- a/src/test/ui/issues/issue-5353.rs
+++ /dev/null
@@ -1,18 +0,0 @@
-// check-pass
-#![allow(dead_code)]
-// pretty-expanded FIXME #23616
-
-const INVALID_ENUM : u32 = 0;
-const INVALID_VALUE : u32 = 1;
-
-fn gl_err_str(err: u32) -> String
-{
-  match err
-  {
-    INVALID_ENUM => { "Invalid enum".to_string() },
-    INVALID_VALUE => { "Invalid value".to_string() },
-    _ => { "Unknown error".to_string() }
-  }
-}
-
-pub fn main() {}
diff --git a/src/test/ui/issues/issue-42954.fixed b/src/test/ui/macros/issue-42954.fixed
index a73054c9257..a73054c9257 100644
--- a/src/test/ui/issues/issue-42954.fixed
+++ b/src/test/ui/macros/issue-42954.fixed
diff --git a/src/test/ui/issues/issue-42954.rs b/src/test/ui/macros/issue-42954.rs
index 5f9b0e31da5..5f9b0e31da5 100644
--- a/src/test/ui/issues/issue-42954.rs
+++ b/src/test/ui/macros/issue-42954.rs
diff --git a/src/test/ui/issues/issue-42954.stderr b/src/test/ui/macros/issue-42954.stderr
index 396a91994eb..396a91994eb 100644
--- a/src/test/ui/issues/issue-42954.stderr
+++ b/src/test/ui/macros/issue-42954.stderr
diff --git a/src/test/ui/issues/issue-51848.rs b/src/test/ui/macros/issue-51848.rs
index 4792bdd64f0..4792bdd64f0 100644
--- a/src/test/ui/issues/issue-51848.rs
+++ b/src/test/ui/macros/issue-51848.rs
diff --git a/src/test/ui/issues/issue-51848.stderr b/src/test/ui/macros/issue-51848.stderr
index c25bedf37b7..c25bedf37b7 100644
--- a/src/test/ui/issues/issue-51848.stderr
+++ b/src/test/ui/macros/issue-51848.stderr
diff --git a/src/test/ui/issues/issue-29227.rs b/src/test/ui/mir/issue-29227.rs
index e9dfc2840e5..e9dfc2840e5 100644
--- a/src/test/ui/issues/issue-29227.rs
+++ b/src/test/ui/mir/issue-29227.rs
diff --git a/src/test/ui/issues/issue-46845.rs b/src/test/ui/mir/issue-46845.rs
index fc85b25519a..fc85b25519a 100644
--- a/src/test/ui/issues/issue-46845.rs
+++ b/src/test/ui/mir/issue-46845.rs
diff --git a/src/test/ui/issues/issue-77002.rs b/src/test/ui/mir/issue-77002.rs
index 0c37346eaf8..0c37346eaf8 100644
--- a/src/test/ui/issues/issue-77002.rs
+++ b/src/test/ui/mir/issue-77002.rs
diff --git a/src/test/ui/issues/issue-39616.rs b/src/test/ui/parser/issue-39616.rs
index 46b5aa334ca..46b5aa334ca 100644
--- a/src/test/ui/issues/issue-39616.rs
+++ b/src/test/ui/parser/issue-39616.rs
diff --git a/src/test/ui/issues/issue-39616.stderr b/src/test/ui/parser/issue-39616.stderr
index 393d1f2e2ce..393d1f2e2ce 100644
--- a/src/test/ui/issues/issue-39616.stderr
+++ b/src/test/ui/parser/issue-39616.stderr
diff --git a/src/test/ui/issues/issue-49257.rs b/src/test/ui/parser/issue-49257.rs
index a7fa19d52fd..a7fa19d52fd 100644
--- a/src/test/ui/issues/issue-49257.rs
+++ b/src/test/ui/parser/issue-49257.rs
diff --git a/src/test/ui/issues/issue-49257.stderr b/src/test/ui/parser/issue-49257.stderr
index 846467f7f22..846467f7f22 100644
--- a/src/test/ui/issues/issue-49257.stderr
+++ b/src/test/ui/parser/issue-49257.stderr
diff --git a/src/test/ui/issues/auxiliary/issue-11225-1.rs b/src/test/ui/reachable/auxiliary/issue-11225-1.rs
index 2c6f899a0f4..2c6f899a0f4 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-1.rs
+++ b/src/test/ui/reachable/auxiliary/issue-11225-1.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-2.rs b/src/test/ui/reachable/auxiliary/issue-11225-2.rs
index 4381f0a4edf..4381f0a4edf 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-2.rs
+++ b/src/test/ui/reachable/auxiliary/issue-11225-2.rs
diff --git a/src/test/ui/issues/auxiliary/issue-11225-3.rs b/src/test/ui/reachable/auxiliary/issue-11225-3.rs
index 266e42a10b5..266e42a10b5 100644
--- a/src/test/ui/issues/auxiliary/issue-11225-3.rs
+++ b/src/test/ui/reachable/auxiliary/issue-11225-3.rs
diff --git a/src/test/ui/issues/issue-11225-1.rs b/src/test/ui/reachable/issue-11225-1.rs
index d1f2ea5e7de..d1f2ea5e7de 100644
--- a/src/test/ui/issues/issue-11225-1.rs
+++ b/src/test/ui/reachable/issue-11225-1.rs
diff --git a/src/test/ui/issues/issue-11225-2.rs b/src/test/ui/reachable/issue-11225-2.rs
index d41c75443f1..d41c75443f1 100644
--- a/src/test/ui/issues/issue-11225-2.rs
+++ b/src/test/ui/reachable/issue-11225-2.rs
diff --git a/src/test/ui/issues/issue-11225-3.rs b/src/test/ui/reachable/issue-11225-3.rs
index e69496baa26..e69496baa26 100644
--- a/src/test/ui/issues/issue-11225-3.rs
+++ b/src/test/ui/reachable/issue-11225-3.rs
diff --git a/src/test/ui/issues/issue-21058.rs b/src/test/ui/stdlib-unit-tests/issue-21058.rs
index 6facf0b2dd5..6facf0b2dd5 100644
--- a/src/test/ui/issues/issue-21058.rs
+++ b/src/test/ui/stdlib-unit-tests/issue-21058.rs
diff --git a/src/test/ui/suggestions/issue-105226.rs b/src/test/ui/suggestions/issue-105226.rs
new file mode 100644
index 00000000000..f123dbf4cae
--- /dev/null
+++ b/src/test/ui/suggestions/issue-105226.rs
@@ -0,0 +1,22 @@
+use std::fmt;
+
+struct S {
+}
+
+impl S {
+    fn hello<P>(&self, val: &P) where P: fmt::Display; {
+        //~^ ERROR non-item in item list
+        //~| ERROR associated function in `impl` without body
+        println!("val: {}", val);
+    }
+}
+
+impl S {
+    fn hello_empty<P>(&self, val: &P) where P: fmt::Display;
+    //~^ ERROR associated function in `impl` without body
+}
+
+fn main() {
+    let s = S{};
+    s.hello(&32);
+}
diff --git a/src/test/ui/suggestions/issue-105226.stderr b/src/test/ui/suggestions/issue-105226.stderr
new file mode 100644
index 00000000000..f16a8090103
--- /dev/null
+++ b/src/test/ui/suggestions/issue-105226.stderr
@@ -0,0 +1,31 @@
+error: non-item in item list
+  --> $DIR/issue-105226.rs:7:56
+   |
+LL | impl S {
+   |        - item list starts here
+LL |     fn hello<P>(&self, val: &P) where P: fmt::Display; {
+   |                                                      - ^ non-item starts here
+   |                                                      |
+   |                                                      help: consider removing this semicolon
+...
+LL | }
+   | - item list ends here
+
+error: associated function in `impl` without body
+  --> $DIR/issue-105226.rs:7:5
+   |
+LL |     fn hello<P>(&self, val: &P) where P: fmt::Display; {
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                                                      |
+   |                                                      help: provide a definition for the function: `{ <body> }`
+
+error: associated function in `impl` without body
+  --> $DIR/issue-105226.rs:15:5
+   |
+LL |     fn hello_empty<P>(&self, val: &P) where P: fmt::Display;
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^-
+   |                                                            |
+   |                                                            help: provide a definition for the function: `{ <body> }`
+
+error: aborting due to 3 previous errors
+
diff --git a/src/test/ui/issues/issue-38404.rs b/src/test/ui/traits/issue-38404.rs
index 1a92acc3404..1a92acc3404 100644
--- a/src/test/ui/issues/issue-38404.rs
+++ b/src/test/ui/traits/issue-38404.rs
diff --git a/src/test/ui/issues/issue-38404.stderr b/src/test/ui/traits/issue-38404.stderr
index d7721d7e69c..d7721d7e69c 100644
--- a/src/test/ui/issues/issue-38404.stderr
+++ b/src/test/ui/traits/issue-38404.stderr
diff --git a/src/test/ui/issues/issue-50480.rs b/src/test/ui/traits/issue-50480.rs
index 10597caf5b2..10597caf5b2 100644
--- a/src/test/ui/issues/issue-50480.rs
+++ b/src/test/ui/traits/issue-50480.rs
diff --git a/src/test/ui/issues/issue-50480.stderr b/src/test/ui/traits/issue-50480.stderr
index 0bb1f9ae035..0bb1f9ae035 100644
--- a/src/test/ui/issues/issue-50480.stderr
+++ b/src/test/ui/traits/issue-50480.stderr
diff --git a/src/test/ui/issues/issue-37515.rs b/src/test/ui/type-alias/issue-37515.rs
index b3a870d505a..b3a870d505a 100644
--- a/src/test/ui/issues/issue-37515.rs
+++ b/src/test/ui/type-alias/issue-37515.rs
diff --git a/src/test/ui/issues/issue-37515.stderr b/src/test/ui/type-alias/issue-37515.stderr
index f1e83ca74d8..f1e83ca74d8 100644
--- a/src/test/ui/issues/issue-37515.stderr
+++ b/src/test/ui/type-alias/issue-37515.stderr
diff --git a/src/test/ui/issues/issue-33575.rs b/src/test/ui/typeck/issue-33575.rs
index de544afae73..de544afae73 100644
--- a/src/test/ui/issues/issue-33575.rs
+++ b/src/test/ui/typeck/issue-33575.rs
diff --git a/src/test/ui/issues/issue-33575.stderr b/src/test/ui/typeck/issue-33575.stderr
index bbd8042d1cd..bbd8042d1cd 100644
--- a/src/test/ui/issues/issue-33575.stderr
+++ b/src/test/ui/typeck/issue-33575.stderr
diff --git a/src/test/ui/wf/hir-wf-canonicalized.rs b/src/test/ui/wf/hir-wf-canonicalized.rs
new file mode 100644
index 00000000000..bdb84409d00
--- /dev/null
+++ b/src/test/ui/wf/hir-wf-canonicalized.rs
@@ -0,0 +1,18 @@
+// incremental
+
+trait Foo {
+    type V;
+}
+
+trait Callback<T: Foo>: Fn(&Bar<'_, T>, &T::V) {}
+
+struct Bar<'a, T> {
+    callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+    //~^ ERROR the trait bound `Bar<'a, T>: Foo` is not satisfied
+    //~| ERROR the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+    //~| ERROR the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+}
+
+impl<T: Foo> Bar<'_, Bar<'_, T>> {}
+
+fn main() {}
diff --git a/src/test/ui/wf/hir-wf-canonicalized.stderr b/src/test/ui/wf/hir-wf-canonicalized.stderr
new file mode 100644
index 00000000000..9fd0f9c81eb
--- /dev/null
+++ b/src/test/ui/wf/hir-wf-canonicalized.stderr
@@ -0,0 +1,32 @@
+error[E0277]: the trait bound `Bar<'a, T>: Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `Bar<'a, T>`
+
+error[E0277]: the trait bound `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static): Foo` is not satisfied
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ the trait `Foo` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+
+error[E0277]: the size for values of type `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)` cannot be known at compilation time
+  --> $DIR/hir-wf-canonicalized.rs:10:15
+   |
+LL |     callback: Box<dyn Callback<dyn Callback<Bar<'a, T>>>>,
+   |               ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ doesn't have a size known at compile-time
+   |
+   = help: the trait `Sized` is not implemented for `(dyn Callback<Bar<'a, T>, for<'b, 'c, 'd> Output = ()> + 'static)`
+note: required by a bound in `Bar`
+  --> $DIR/hir-wf-canonicalized.rs:9:16
+   |
+LL | struct Bar<'a, T> {
+   |                ^ required by this bound in `Bar`
+help: consider relaxing the implicit `Sized` restriction
+   |
+LL | struct Bar<'a, T: ?Sized> {
+   |                 ++++++++
+
+error: aborting due to 3 previous errors
+
+For more information about this error, try `rustc --explain E0277`.