---

yaml
---
r: 97663
b: refs/heads/snap-stage3
c: b8c60f9
h: refs/heads/master
i:
  97661: 46aacd0
  97659: 72d1e83
  97655: 4295a56
  97647: 17799fb
  97631: 53b16b8
  97599: 4e23e30
  97535: 0b96d76
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 0da105a8b7b6b1e0568e8ff20f6ff4b13cc7ecc2
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c74c854adc83eb311aef722e64c0af81ea09f1a1
+refs/heads/snap-stage3: b8c60f906b897f413997f17f0376402061993c8d
 refs/heads/try: c274a6888410ce3e357e014568b43310ed787d36
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustc/middle/ty.rs

@@ -810,23 +810,23 @@ impl Vid for TyVid {
 }
 
 impl ToStr for TyVid {
-    fn to_str(&self) -> ~str { format!("<V{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<generic \\#{}>", self.to_uint()) }
 }
 
 impl Vid for IntVid {
     fn to_uint(&self) -> uint { let IntVid(v) = *self; v }
 }
 
 impl ToStr for IntVid {
-    fn to_str(&self) -> ~str { format!("<VI{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<generic integer \\#{}>", self.to_uint()) }
 }
 
 impl Vid for FloatVid {
     fn to_uint(&self) -> uint { let FloatVid(v) = *self; v }
 }
 
 impl ToStr for FloatVid {
-    fn to_str(&self) -> ~str { format!("<VF{}>", self.to_uint()) }
+    fn to_str(&self) -> ~str { format!("<generic float \\#{}>", self.to_uint()) }
 }
 
 impl Vid for RegionVid {

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

@@ -10,6 +10,6 @@
 
 fn main() {
     match None {
-        Err(_) => () //~ ERROR mismatched types: expected `std::option::Option<<V1>>` but found `std::result::Result<<V2>,<V3>>`
+        Err(_) => () //~ ERROR mismatched types: expected `std::option::Option<<generic #1>>` but found `std::result::Result<<generic #2>,<generic #3>>`
     }
 }

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

@@ -12,5 +12,5 @@
 
 static A: (int,int) = (4,2);
 fn main() {
-    match 42 { A => () } //~ ERROR mismatched types: expected `<VI0>` but found `(int,int)` (expected integral variable but found tuple)
+    match 42 { A => () } //~ ERROR mismatched types: expected `<generic integer #0>` but found `(int,int)` (expected integral variable but found tuple)
 }

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

@@ -0,0 +1,19 @@
+// Copyright 2014 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+struct Foo<T,U>(T);
+
+fn main() {
+    match Foo(1.1) {
+        1 => {}
+        //~^ ERROR expected `Foo<<generic float #0>,<generic #2>>` but found `<generic integer #0>`
+    }
+
+}