---

yaml
---
r: 177835
b: refs/heads/snap-stage3
c: a6f9180
h: refs/heads/master
i:
  177833: 4d5bf21
  177831: 2fb949b
v: v3

Author: Jorge Aparicio

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 474b324eda10440d6568ef872a7307d38e7de95b
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 4b75931ce24f2c7ccf6486e434c24c6df595f4bc
+refs/heads/snap-stage3: a6f9180fd61f509ebc6d666eda3f6bb42dd02573
 refs/heads/try: fde4472848b662a4d1236388c4cf15e2450237e6
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/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),