From 34afe5e193182a0029abe1ae8258f79f4cd56cd9 Mon Sep 17 00:00:00 2001
From: Alexander Korolkov <alexander.korolkov@gmail.com>
Date: Thu, 5 Feb 2015 15:04:07 +0300
Subject: Rename Show to Debug, String to Display

Update reference.md:
 - derive() no longer supports Zero trait
 - derive() now supports Copy trait
---
 src/libserialize/json.rs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/libserialize')

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)]
-- 
cgit 1.4.1-3-g733a5