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

8
src/libserialize/json.rs
View file

@ -2458,14 +2458,6 @@ impl<'a> fmt::String for PrettyJson<'a> {
}
}
#[cfg(stage0)]
//NOTE(stage0): remove impl after snapshot
impl<'a, T: Encodable> fmt::Show for AsJson<'a, T> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt::String::fmt(self, f)
}
}
impl<'a, T: Encodable> fmt::String for AsJson<'a, T> {
/// Encodes a json value into a string
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {