diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2015-01-07 17:18:01 -0800 |
| commit | dd38f46d71872fba50833fd22313ef49eb01d079 (patch) | |
| tree | f4306baac76c8869273d49e0dd8da0251df4bc2d /src/libstd/path | |
| parent | b21a0cee19ab1cdbe57c7f277a9cc9f2658ebce2 (diff) | |
| parent | 321d9ddff21b532300a9ced6ae7ce5f902c0fbf5 (diff) | |
| download | rust-dd38f46d71872fba50833fd22313ef49eb01d079.tar.gz rust-dd38f46d71872fba50833fd22313ef49eb01d079.zip | |
rollup merge of #20708: aturon/new-int-modules
Conflicts: src/libserialize/lib.rs
Diffstat (limited to 'src/libstd/path')
| -rw-r--r-- | src/libstd/path/mod.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/path/mod.rs b/src/libstd/path/mod.rs index 581969e98fb..aa59d60d7a4 100644 --- a/src/libstd/path/mod.rs +++ b/src/libstd/path/mod.rs @@ -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) |