about summary refs log tree commit diff
path: root/src/libsyntax
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2014-12-17 11:26:52 -0800
committerAlex Crichton <alex@alexcrichton.com>2014-12-17 11:50:32 -0800
commit5c98952409c9123b5f26b3c620029cd1914a07b6 (patch)
treed996edc2a0a259556be226b4f60437f961fb09b2 /src/libsyntax
parent76fbb5d527a2893c4d4c88b24d0f5d6dd0dcef32 (diff)
Test fixes and rebase conflicts
Diffstat (limited to 'src/libsyntax')
-rw-r--r--src/libsyntax/ext/deriving/mod.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs
index 5fb320b9136..839e99c81d1 100644
--- a/src/libsyntax/ext/deriving/mod.rs
+++ b/src/libsyntax/ext/deriving/mod.rs
@@ -84,7 +84,7 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,
 
                                 expand!(encodable::expand_deriving_encodable)
                             }
-                            "Decodable" =>
+                            "Decodable" => {
                                 // NOTE: uncomment after a stage0 snap
                                 // cx.span_warn(titem.span,
                                 //              "deriving(Decodable) is deprecated \