about summary refs log tree commit diff
path: root/src/libsyntax/ext/deriving/zero.rs
diff options
context:
space:
mode:
authorFelix S. Klock II <pnkfelix@pnkfx.org>2014-07-07 09:13:49 +0200
committerFelix S. Klock II <pnkfelix@pnkfx.org>2014-07-11 17:32:23 +0200
commit5cee57869c527ee798c8aeb0e17e82fb36848c4f (patch)
treec4dc23e67ff6cd75b9d852ed645b50fb51b4d34b /src/libsyntax/ext/deriving/zero.rs
parentc8ae44682d76bb40eb1471eeb42603eaecd0b392 (diff)
downloadrust-5cee57869c527ee798c8aeb0e17e82fb36848c4f.tar.gz
rust-5cee57869c527ee798c8aeb0e17e82fb36848c4f.zip
Removed dead structures after changes to PartialOrd/Ord derivings.
Remove the `NonMatchesExplode` variant now that no deriving impl uses it.
Removed `EnumNonMatching` entirely.
Remove now irrelevant `on_matching` field and `HandleNonMatchingEnums` type.
Removed unused `EnumNonMatchFunc` type def.

Drive-by: revise `EnumNonMatchCollapsedFunc` doc.

Made all calls to `expand_enum_method_body` go directly to
`build_enum_match_tuple`.

Alpha-rename `enum_nonmatch_g` back to `enum_nonmatch_f` to reduce overall diff noise.
Inline sole call of `some_ordering_const`.
Inline sole call of `ordering_const`.

Removed a bunch of code that became dead after the above changes.
Diffstat (limited to 'src/libsyntax/ext/deriving/zero.rs')
-rw-r--r--src/libsyntax/ext/deriving/zero.rs6
1 files changed, 0 insertions, 6 deletions
diff --git a/src/libsyntax/ext/deriving/zero.rs b/src/libsyntax/ext/deriving/zero.rs
index 59a0d1ed5ce..973f9d518cd 100644
--- a/src/libsyntax/ext/deriving/zero.rs
+++ b/src/libsyntax/ext/deriving/zero.rs
@@ -39,7 +39,6 @@ pub fn expand_deriving_zero(cx: &mut ExtCtxt,
                 args: Vec::new(),
                 ret_ty: Self,
                 attributes: attrs.clone(),
-                on_nonmatching: NonMatchHandlingIrrelevant,
                 combine_substructure: combine_substructure(|a, b, c| {
                     zero_substructure(a, b, c)
                 })
@@ -51,16 +50,11 @@ pub fn expand_deriving_zero(cx: &mut ExtCtxt,
                 args: Vec::new(),
                 ret_ty: Literal(Path::new(vec!("bool"))),
                 attributes: attrs,
-                on_nonmatching: NonMatchHandlingIrrelevant,
                 combine_substructure: combine_substructure(|cx, span, substr| {
                     cs_and(|cx, span, _, _| cx.span_bug(span,
                                                         "Non-matching enum \
                                                          variant in \
                                                          deriving(Zero)"),
-                           |cx, span, _, _| cx.span_bug(span,
-                                                        "Non-matching enum \
-                                                         variant in \
-                                                         deriving(Zero)"),
                            cx, span, substr)
                 })
             }