bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

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

1
src/libstd/path/mod.rs
View file

@ -823,7 +823,6 @@ pub struct Display<'a, P:'a> {
filename: bool
}
//NOTE(stage0): replace with deriving(Show) after snapshot
impl<'a, P: GenericPath> fmt::Show for Display<'a, P> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)