---

yaml
---
r: 214188
b: refs/heads/auto
c: af7daa0
h: refs/heads/master
v: v3

Author: eddyb

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: b510ea1487286123c00f425b368a8328637ac947
+refs/heads/auto: af7daa0daff91f8a58708f2d98f94d49acc28c6a
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

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

@@ -45,7 +45,7 @@ pub trait Repr {
 }
 
 /// Produces a string suitable for showing to the user.
-pub trait UserString: Repr {
+pub trait UserString {
     fn user_string(&self) -> String;
 }
 
@@ -296,14 +296,6 @@ impl<'a, T: ?Sized +UserString> UserString for &'a T {
     }
 }
 
-impl<T:UserString> UserString for Vec<T> {
-    fn user_string(&self) -> String {
-        let strs: Vec<String> =
-            self.iter().map(|t| t.user_string()).collect();
-        strs.connect(", ")
-    }
-}
-
 impl Repr for def::Def {
     fn repr(&self) -> String {
         format!("{:?}", *self)
@@ -475,17 +467,6 @@ impl<'tcx> Repr for ty::TraitDef<'tcx> {
     }
 }
 
-impl Repr for ast::TraitItem {
-    fn repr(&self) -> String {
-        let kind = match self.node {
-            ast::ConstTraitItem(..) => "ConstTraitItem",
-            ast::MethodTraitItem(..) => "MethodTraitItem",
-            ast::TypeTraitItem(..) => "TypeTraitItem",
-        };
-        format!("{}({}, id={})", kind, self.ident, self.id)
-    }
-}
-
 impl Repr for ast::Expr {
     fn repr(&self) -> String {
         format!("expr({}: {})", self.id, pprust::expr_to_string(self))
@@ -794,12 +775,6 @@ impl UserString for ast::Name {
     }
 }
 
-impl Repr for ast::Ident {
-    fn repr(&self) -> String {
-        token::get_ident(*self).to_string()
-    }
-}
-
 impl Repr for ast::ExplicitSelf_ {
     fn repr(&self) -> String {
         format!("{:?}", *self)

branches/auto/src/librustc_trans/trans/meth.rs

@@ -62,7 +62,7 @@ pub fn trans_impl(ccx: &CrateContext,
     let _icx = push_ctxt("meth::trans_impl");
     let tcx = ccx.tcx();
 
-    debug!("trans_impl(name={}, id={})", name.repr(), id);
+    debug!("trans_impl(name={}, id={})", name, id);
 
     let mut v = TransItemVisitor { ccx: ccx };
 

branches/auto/src/librustc_typeck/collect.rs

@@ -635,7 +635,7 @@ fn convert_method<'a, 'tcx>(ccx: &CrateCtxt<'a, 'tcx>,
     let fty = ty::mk_bare_fn(ccx.tcx, Some(def_id),
                              ccx.tcx.mk_bare_fn(ty_method.fty.clone()));
     debug!("method {} (id {}) has type {}",
-            ident.repr(), id, fty.repr());
+            ident, id, fty.repr());
     ccx.tcx.tcache.borrow_mut().insert(def_id,TypeScheme {
         generics: ty_method.generics.clone(),
         ty: fty