diff options
| author | bors <bors@rust-lang.org> | 2015-10-20 19:02:27 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-10-20 19:02:27 +0000 |
| commit | 97ba52ec379e17cc0984224b756282b68bc3a53b (patch) | |
| tree | 0813e72c21cda0c618d92b8fe0bd8b9782cb6548 /src/libsyntax | |
| parent | 5e9f3056425783171025d6f07e096e4a7f9ec545 (diff) | |
| parent | 025cf758649bcbc13b90e35c49504581b7b51de2 (diff) | |
| download | rust-97ba52ec379e17cc0984224b756282b68bc3a53b.tar.gz rust-97ba52ec379e17cc0984224b756282b68bc3a53b.zip | |
Auto merge of #29148 - petrochenkov:noshow, r=alexcrichton
Closes https://github.com/rust-lang/rust/issues/29145 [breaking-change], needs a crater run.
Diffstat (limited to 'src/libsyntax')
| -rw-r--r-- | src/libsyntax/ext/deriving/debug.rs (renamed from src/libsyntax/ext/deriving/show.rs) | 2 | ||||
| -rw-r--r-- | src/libsyntax/ext/deriving/mod.rs | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/libsyntax/ext/deriving/show.rs b/src/libsyntax/ext/deriving/debug.rs index 4d70ca1ebf1..537375f7084 100644 --- a/src/libsyntax/ext/deriving/show.rs +++ b/src/libsyntax/ext/deriving/debug.rs @@ -18,7 +18,7 @@ use ext::deriving::generic::ty::*; use parse::token; use ptr::P; -pub fn expand_deriving_show(cx: &mut ExtCtxt, +pub fn expand_deriving_debug(cx: &mut ExtCtxt, span: Span, mitem: &MetaItem, item: &Annotatable, diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs index c7f582854ae..d26bb794c88 100644 --- a/src/libsyntax/ext/deriving/mod.rs +++ b/src/libsyntax/ext/deriving/mod.rs @@ -60,7 +60,7 @@ pub mod clone; pub mod encodable; pub mod decodable; pub mod hash; -pub mod show; +pub mod debug; pub mod default; pub mod primitive; @@ -173,7 +173,7 @@ derive_traits! { "PartialOrd" => partial_ord::expand_deriving_partial_ord, "Ord" => ord::expand_deriving_ord, - "Debug" => show::expand_deriving_show, + "Debug" => debug::expand_deriving_debug, "Default" => default::expand_deriving_default, @@ -184,7 +184,6 @@ derive_traits! { "Copy" => bounds::expand_deriving_copy, // deprecated - "Show" => show::expand_deriving_show, "Encodable" => encodable::expand_deriving_encodable, "Decodable" => decodable::expand_deriving_decodable, } @@ -192,7 +191,6 @@ derive_traits! { #[inline] // because `name` is a compile-time constant fn warn_if_deprecated(ecx: &mut ExtCtxt, sp: Span, name: &str) { if let Some(replacement) = match name { - "Show" => Some("Debug"), "Encodable" => Some("RustcEncodable"), "Decodable" => Some("RustcDecodable"), _ => None, |