---

yaml
---
r: 152564
b: refs/heads/try2
c: ebde8cf
h: refs/heads/master
v: v3

Author: schmee

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 9945052e64737a21a7d9a6cb337bda1a4eed3e0a
+refs/heads/try2: ebde8cfa618756ee615cb543c832b53653ce2977
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/util/ppaux.rs

@@ -351,8 +351,8 @@ pub fn ty_to_str(cx: &ctxt, typ: t) -> String {
       ty_uint(t) => ast_util::uint_ty_to_str(t, None,
                                              ast_util::AutoSuffix).to_string(),
       ty_float(t) => ast_util::float_ty_to_str(t).to_string(),
-      ty_box(typ) => format!("@{}", ty_to_str(cx, typ)),
-      ty_uniq(typ) => format!("~{}", ty_to_str(cx, typ)),
+      ty_box(typ) => format!("Gc<{}>", ty_to_str(cx, typ)),
+      ty_uniq(typ) => format!("Box<{}>", ty_to_str(cx, typ)),
       ty_ptr(ref tm) => format!("*{}", mt_to_str(cx, tm)),
       ty_rptr(r, ref tm) => {
           let mut buf = region_ptr_to_str(cx, r);

branches/try2/src/test/compile-fail/autoderef-full-lval.rs

@@ -26,13 +26,13 @@ struct fish {
 fn main() {
     let a: clam = clam{x: box(GC) 1, y: box(GC) 2};
     let b: clam = clam{x: box(GC) 10, y: box(GC) 20};
-    let z: int = a.x + b.y; //~ ERROR binary operation `+` cannot be applied to type `@int`
+    let z: int = a.x + b.y; //~ ERROR binary operation `+` cannot be applied to type `Gc<int>`
     println!("{:?}", z);
     assert_eq!(z, 21);
     let forty: fish = fish{a: box(GC) 40};
     let two: fish = fish{a: box(GC) 2};
     let answer: int = forty.a + two.a;
-    //~^ ERROR binary operation `+` cannot be applied to type `@int`
+    //~^ ERROR binary operation `+` cannot be applied to type `Gc<int>`
     println!("{:?}", answer);
     assert_eq!(answer, 42);
 }

branches/try2/src/test/compile-fail/issue-14915.rs

@@ -0,0 +1,21 @@
+// 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.
+
+use std::gc::{GC,Gc};
+
+fn main() {
+    let x: Box<int> = box 0;
+    let y: Gc<int> = box (GC) 0;
+
+    println!("{}", x + 1); //~ ERROR binary operation `+` cannot be applied to type `Box<int>`
+    //~^ ERROR cannot determine a type for this bounded type parameter: unconstrained type
+    println!("{}", y + 1);
+    //~^ ERROR binary operation `+` cannot be applied to type `Gc<int>`
+}

branches/try2/src/test/compile-fail/issue-7013.rs

@@ -32,7 +32,7 @@ struct A {
 
 fn main() {
     let a = A {v: box B{v: None} as Box<Foo+Send>};
-    //~^ ERROR cannot pack type `~B`, which does not fulfill `Send`
+    //~^ ERROR cannot pack type `Box<B>`, which does not fulfill `Send`
     let v = Rc::new(RefCell::new(a));
     let w = v.clone();
     let b = &*v;

branches/try2/src/test/compile-fail/issue-7061.rs

@@ -16,7 +16,7 @@ struct BarStruct;
 
 impl<'a> BarStruct {
     fn foo(&'a mut self) -> Gc<BarStruct> { self }
-    //~^ ERROR: error: mismatched types: expected `@BarStruct` but found `&'a mut BarStruct
+    //~^ ERROR: error: mismatched types: expected `Gc<BarStruct>` but found `&'a mut BarStruct
 }
 
 fn main() {}

branches/try2/src/test/compile-fail/regions-infer-paramd-indirect.rs

@@ -33,7 +33,7 @@ impl<'a> set_f<'a> for c<'a> {
     }
 
     fn set_f_bad(&self, b: Gc<b>) {
-        self.f = b; //~ ERROR mismatched types: expected `@@&'a int` but found `@@&int`
+        self.f = b; //~ ERROR mismatched types: expected `Gc<Gc<&'a int>>` but found `Gc<Gc<&int>>`
         //~^ ERROR cannot infer
     }
 }