From 2dfbe7f9893ef8ff7efc86345941216e564323e7 Mon Sep 17 00:00:00 2001
From: Corey Richardson <corey@octayn.net>
Date: Thu, 10 Jul 2014 19:53:09 -0700
Subject: [PATCH] Use a nicer Show impl for Name

---
 src/librustuv/file.rs |  2 +-
 src/libsyntax/ast.rs  | 11 +++++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/librustuv/file.rs b/src/librustuv/file.rs
index 76b2c22e86e..26ba601f73e 100644
--- a/src/librustuv/file.rs
+++ b/src/librustuv/file.rs
@@ -547,7 +547,7 @@ mod test {
         let path = &"./tmp/mk_rm_dir".to_c_str();
         let mode = S_IWUSR | S_IRUSR;
 
-        let result = FsRequest::mkdir(l(), path, mode);
+        let result = FsRequest::mkdir(l(), path, mode as c_int);
         assert!(result.is_ok());
 
         let result = FsRequest::rmdir(l(), path);
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index 778f77ac7a8..8ba01914648 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -58,7 +58,14 @@ impl Ident {
 
 impl Show for Ident {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "\"{}\"#{}", token::get_ident(*self).get(), self.ctxt)
+        write!(f, "{}#{}", self.name, self.ctxt)
+    }
+}
+
+impl Show for Name {
+    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
+        let Name(nm) = *self;
+        write!(f, "\"{}\"({})", token::get_name(*self).get(), nm)
     }
 }
 
@@ -106,7 +113,7 @@ pub static ILLEGAL_CTXT : SyntaxContext = 1;
 
 /// A name is a part of an identifier, representing a string or gensym. It's
 /// the result of interning.
-#[deriving(Eq, Ord, PartialEq, PartialOrd, Hash, Encodable, Decodable, Clone, Show)]
+#[deriving(Eq, Ord, PartialEq, PartialOrd, Hash, Encodable, Decodable, Clone)]
 pub struct Name(pub u32);
 
 impl Name {