diff options
| author | Alexander Korolkov <alexander.korolkov@gmail.com> | 2015-02-05 15:04:07 +0300 |
|---|---|---|
| committer | Alexander Korolkov <alexander.korolkov@gmail.com> | 2015-02-08 20:00:30 +0300 |
| commit | 34afe5e193182a0029abe1ae8258f79f4cd56cd9 (patch) | |
| tree | b3b464820ac3147838891a66351701f8071ce00c /src/libserialize | |
| parent | 725cc06464abda7a657780f12feaefb7f10333c6 (diff) | |
| download | rust-34afe5e193182a0029abe1ae8258f79f4cd56cd9.tar.gz rust-34afe5e193182a0029abe1ae8258f79f4cd56cd9.zip | |
Rename Show to Debug, String to Display
Update reference.md: - derive() no longer supports Zero trait - derive() now supports Copy trait
Diffstat (limited to 'src/libserialize')
| -rw-r--r-- | src/libserialize/json.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libserialize/json.rs b/src/libserialize/json.rs index b8383577987..daa358647d8 100644 --- a/src/libserialize/json.rs +++ b/src/libserialize/json.rs @@ -1032,7 +1032,7 @@ pub fn as_pretty_json<T>(t: &T) -> AsPrettyJson<T> { impl Json { /// Borrow this json object as a pretty object to generate a pretty - /// representation for it via `Show`. + /// representation for it via `Display`. pub fn pretty(&self) -> PrettyJson { PrettyJson { inner: self } } @@ -3540,7 +3540,7 @@ mod tests { fn test_hashmap_with_enum_key() { use std::collections::HashMap; use json; - #[derive(RustcEncodable, Eq, Hash, PartialEq, RustcDecodable, Show)] + #[derive(RustcEncodable, Eq, Hash, PartialEq, RustcDecodable, Debug)] enum Enum { Foo, #[allow(dead_code)] |