user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

rollup merge of #20708: aturon/new-int-modules

Browse source 
Conflicts:
	src/libserialize/lib.rs
This commit is contained in:
Alex Crichton 2015-01-07 17:18:01 -08:00
commit dd38f46d71
35 changed files with 130 additions and 416 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libsyntax/ast.rs
View file

@ -100,7 +100,6 @@ impl Ident {
}
}
//NOTE(stage0): remove after snapshot
impl fmt::Show for Ident {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "{}#{}", self.name, self.ctxt)
@ -1085,7 +1084,6 @@ pub enum IntTy {
TyI64,
}
//NOTE(stage0): remove after snapshot
impl fmt::Show for IntTy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)
@ -1127,7 +1125,6 @@ impl UintTy {
}
}
//NOTE(stage0): remove after snapshot
impl fmt::Show for UintTy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)
@ -1146,7 +1143,6 @@ pub enum FloatTy {
TyF64,
}
//NOTE(stage0): remove after snapshot
impl fmt::Show for FloatTy {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)

9
src/libsyntax/ast_map/mod.rs
View file

@ -32,7 +32,7 @@ use std::slice;
pub mod blocks;
#[derive(Clone, Copy, PartialEq)]
#[derive(Clone, Copy, PartialEq, Show)]
pub enum PathElem {
PathMod(Name),
PathName(Name)
@ -46,13 +46,6 @@ impl PathElem {
}
}
//NOTE(stage0): replace with deriving(Show) after snapshot
impl fmt::Show for PathElem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)
}
}
impl fmt::String for PathElem {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
let slot = token::get_name(self.name());