---

yaml
---
r: 177405
b: refs/heads/tmp
c: a6f9180
h: refs/heads/master
i:
  177403: 763bca0
v: v3

Author: Jorge Aparicio

[refs]

@@ -34,4 +34,4 @@ refs/heads/building: 126db549b038c84269a1e4fe46f051b2c15d6970
 refs/heads/beta: 44a287e6eb22ec3c2a687fc156813577464017f7
 refs/heads/windistfix: 7608dbad651f02e837ed05eef3d74a6662a6e928
 refs/tags/1.0.0-alpha: e42bd6d93a1d3433c486200587f8f9e12590a4d7
-refs/heads/tmp: 4b75931ce24f2c7ccf6486e434c24c6df595f4bc
+refs/heads/tmp: a6f9180fd61f509ebc6d666eda3f6bb42dd02573

branches/tmp/src/libsyntax/ext/deriving/mod.rs

@@ -107,6 +107,14 @@ pub fn expand_meta_derive(cx: &mut ExtCtxt,
 
                             "Rand" => expand!(rand::expand_deriving_rand),
 
+                            "Show" => {
+                                cx.span_warn(titem.span,
+                                             "derive(Show) is deprecated \
+                                              in favor of derive(Debug)");
+
+                                expand!(show::expand_deriving_show)
+                            },
+
                             "Debug" => expand!(show::expand_deriving_show),
 
                             "Default" => expand!(default::expand_deriving_default),