---

yaml
---
r: 157693
b: refs/heads/snap-stage3
c: 3cbc3f4
h: refs/heads/master
i:
  157691: d033d23
v: v3

Author: Jakub Bukaj

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 065caf34f5ff29e04605f95d9c5d511af219439a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 3db13f4892bc06ee038aef01dc9e5daf0451a561
+refs/heads/snap-stage3: 3cbc3f4802b9dd8125f2605cf4dab7a18839c4e8
 refs/heads/try: 0ee4d8b0b112c608646fa75463ab4dc59132efd9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/test/compile-fail/type-parameter-names.rs

@@ -11,6 +11,9 @@
 // Test that we print out the names of type parameters correctly in
 // our error messages.
 
-fn foo<Foo, Bar>(x: Foo) -> Bar { x } //~ ERROR expected `Bar`, found `Foo`
+fn foo<Foo, Bar>(x: Foo) -> Bar {
+    x
+//~^ ERROR expected `Bar`, found `Foo` (expected type parameter, found a different type parameter)
+}
 
 fn main() {}