about summary refs log tree commit diff
path: root/src/libsyntax/parse
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-02-01 22:31:26 -0800
committerbors <bors@rust-lang.org>2014-02-01 22:31:26 -0800
commitdce61c980e0f5e18972caa22e0b78995f0501f51 (patch)
tree0ae33048d5cf665a58759f4353f8679b9553bb74 /src/libsyntax/parse
parent16f1a72f0ab6ebf9e3279e3dd4873b6dc13220ec (diff)
parentc19a7b68577f28547bdfb357798d05163ccb6824 (diff)
downloadrust-dce61c980e0f5e18972caa22e0b78995f0501f51.tar.gz
rust-dce61c980e0f5e18972caa22e0b78995f0501f51.zip
auto merge of #11948 : huonw/rust/show, r=alexcrichton
- renames `Default` to `Show`
- introduces some hidden `std::fmt::secret_...` functions, designed to work-around the lack of UFCS (with UFCS they can be replaced by referencing the trait methods directly) because I'm going to convert the traits to have methods rather than static functions, since `#[deriving]` works much better with true methods.

I'm blocked on a snapshot after this. (I could probably do a large number of `#[cfg]`s, but I can work on other things in the meantime.)
Diffstat (limited to 'src/libsyntax/parse')
-rw-r--r--src/libsyntax/parse/token.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs
index d6edccd33a4..6d2acd3d803 100644
--- a/src/libsyntax/parse/token.rs
+++ b/src/libsyntax/parse/token.rs
@@ -587,7 +587,7 @@ impl BytesContainer for InternedString {
     }
 }
 
-impl fmt::Default for InternedString {
+impl fmt::Show for InternedString {
     fn fmt(obj: &InternedString, f: &mut fmt::Formatter) {
         write!(f.buf, "{}", obj.string.as_slice());
     }