---

yaml
---
r: 157695
b: refs/heads/snap-stage3
c: a2624fc
h: refs/heads/master
i:
  157693: b43f4ac
  157691: d033d23
  157687: 2f247d5
  157679: 84cf7c2
  157663: e4f8975
  157631: 7516639
  157567: bcc719a
  157439: f3eba8f
  157183: 648ccd8
  156671: 2f2ba5b
  155647: c808558
v: v3

Author: Jakub Bukaj

[refs]

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

branches/snap-stage3/src/librustc/util/ppaux.rs

@@ -376,9 +376,8 @@ pub fn ty_to_string(cx: &ctxt, typ: t) -> String {
                 format!("_#{}i", vid),
             ty::FloatVar(ty::FloatVid { index: vid }) if print_var_ids =>
                 format!("_#{}f", vid),
-            ty::TyVar(_) => "_".to_string(),
-            ty::IntVar(_) => "_#i".to_string(),
-            ty::FloatVar(_) => "_#f".to_string(),
+            ty::TyVar(_) | ty::IntVar(_) | ty::FloatVar(_) =>
+                "_".to_string(),
             ty::SkolemizedTy(v) => format!("SkolemizedTy({})", v),
             ty::SkolemizedIntTy(v) => format!("SkolemizedIntTy({})", v)
         }

branches/snap-stage3/src/test/compile-fail/issue-13482.rs

@@ -12,7 +12,7 @@ fn main() {
   let x = [1,2];
   let y = match x {
     [] => None,
-//~^ ERROR types: expected `[_#i, ..2]`, found `[_, ..0]`
+//~^ ERROR types: expected `[_, ..2]`, found `[_, ..0]`
 //         (expected array of 2 elements, found array of 0 elements)
     [a,_] => Some(a)
   };

branches/snap-stage3/src/test/compile-fail/issue-4201.rs

@@ -12,7 +12,7 @@ fn main() {
     let a = if true {
         0
     } else if false {
-//~^ ERROR if may be missing an else clause: expected `()`, found `_#i`
+//~^ ERROR if may be missing an else clause: expected `()`, found `_`
         1
     };
 }

branches/snap-stage3/src/test/compile-fail/issue-4968.rs

@@ -13,6 +13,6 @@
 const A: (int,int) = (4,2);
 fn main() {
     match 42 { A => () }
-    //~^ ERROR mismatched types: expected `_#i`, found `(int, int)`
+    //~^ ERROR mismatched types: expected `_`, found `(int, int)`
     //         (expected integral variable, found tuple)
 }

branches/snap-stage3/src/test/compile-fail/repeat_count.rs

@@ -18,7 +18,7 @@ fn main() {
     let c = [0, ..true]; //~ ERROR expected positive integer for repeat count, found boolean
     //~^ ERROR: expected `uint`, found `bool`
     let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count, found float
-    //~^ ERROR: expected `uint`, found `_#f`
+    //~^ ERROR: expected `uint`, found `_`
     let e = [0, .."foo"]; //~ ERROR expected positive integer for repeat count, found string
     //~^ ERROR: expected `uint`, found `&'static str`
     let f = [0, ..-4];

branches/snap-stage3/src/test/compile-fail/slightly-nice-generic-literal-messages.rs

@@ -13,7 +13,7 @@ struct Foo<T,U>(T);
 fn main() {
     match Foo(1.1) {
         1 => {}
-    //~^ ERROR expected `Foo<_#f, _>`, found `_#i`
+    //~^ ERROR expected `Foo<_, _>`, found `_`
     }
 
 }