diff options
| author | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-08 13:16:12 +0100 |
|---|---|---|
| committer | Oliver Schneider <git-spam-no-reply9815368754983@oli-obk.de> | 2016-02-11 12:34:48 +0100 |
| commit | 05e25de4f0add7ae3cd0e8f66cd4558c5bfa42aa (patch) | |
| tree | 587130bb0d9d974e579d5a92a4893412351069fe /src/libsyntax_ext/deriving/generic/mod.rs | |
| parent | f875f4c4c24e8a14c04bbe4eedd230c4aa3c1431 (diff) | |
| download | rust-05e25de4f0add7ae3cd0e8f66cd4558c5bfa42aa.tar.gz rust-05e25de4f0add7ae3cd0e8f66cd4558c5bfa42aa.zip | |
[breaking-change] don't glob export ast::BinOp_
Diffstat (limited to 'src/libsyntax_ext/deriving/generic/mod.rs')
| -rw-r--r-- | src/libsyntax_ext/deriving/generic/mod.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax_ext/deriving/generic/mod.rs b/src/libsyntax_ext/deriving/generic/mod.rs index 3af701739b4..9eb516cd07a 100644 --- a/src/libsyntax_ext/deriving/generic/mod.rs +++ b/src/libsyntax_ext/deriving/generic/mod.rs @@ -194,8 +194,7 @@ use std::vec; use syntax::abi::Abi; use syntax::abi; -use syntax::ast; -use syntax::ast::{EnumDef, Expr, Ident, Generics, VariantData}; +use syntax::ast::{EnumDef, Expr, Ident, Generics, VariantData, BinOpKind, self}; use syntax::ast_util; use syntax::attr; use syntax::attr::AttrMetaMethods; @@ -1279,8 +1278,9 @@ impl<'a> MethodDef<'a> { Some(first) => { let first_expr = cx.expr_ident(sp, first); let id = cx.expr_ident(sp, ident); - let test = cx.expr_binary(sp, ast::BiEq, first_expr, id); - discriminant_test = cx.expr_binary(sp, ast::BiAnd, discriminant_test, test) + let test = cx.expr_binary(sp, BinOpKind::Eq, first_expr, id); + discriminant_test = cx.expr_binary(sp, BinOpKind::And, + discriminant_test, test) } None => { first_ident = Some(ident); |
