Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 22 additions & 2 deletions src/libsyntax/ext/deriving/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -70,8 +70,28 @@ pub fn expand_meta_deriving(cx: &mut ExtCtxt,

"Hash" => expand!(hash::expand_deriving_hash),

"Encodable" => expand!(encodable::expand_deriving_encodable),
"Decodable" => expand!(decodable::expand_deriving_decodable),
"RustcEncodable" => {
expand!(encodable::expand_deriving_encodable)
}
"RustcDecodable" => {
expand!(decodable::expand_deriving_decodable)
}
"Encodable" => {
// NOTE: uncomment after a stage0 snap
// cx.span_warn(titem.span,
// "deriving(Encodable) is deprecated \
// in favor of deriving(RustcEncodable)");

expand!(encodable::expand_deriving_encodable)
}
"Decodable" =>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@alexcrichton Today's auto-rollup build failed with:

/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/libsyntax/ext/deriving/mod.rs:126:1: 126:2 error: incorrect close delimiter: `}`
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-opt/build/src/libsyntax/ext/deriving/mod.rs:126 }
                                                                                                     ^

Possibly because of a missing { on this line after "Decodable" =>?

// NOTE: uncomment after a stage0 snap
// cx.span_warn(titem.span,
// "deriving(Decodable) is deprecated \
// in favor of deriving(RustcDecodable)");

expand!(decodable::expand_deriving_decodable)
}

"PartialEq" => expand!(eq::expand_deriving_eq),
"Eq" => expand!(totaleq::expand_deriving_totaleq),
Expand Down