diff options
| author | bors <bors@rust-lang.org> | 2014-03-22 23:46:58 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-22 23:46:58 -0700 |
| commit | 2ddb60565423bdc225ccc8dd4ebfb653c5650ba2 (patch) | |
| tree | 3d878e1f45ced463d7178aed9c4dff9cc19ebf01 /src/libsyntax/parse | |
| parent | 3d9fdf71656aa51c65f167e19b0d8cb54023b05e (diff) | |
| parent | 3829ac2a52f12b08501cb25d82de32f39fbe801e (diff) | |
| download | rust-2ddb60565423bdc225ccc8dd4ebfb653c5650ba2.tar.gz rust-2ddb60565423bdc225ccc8dd4ebfb653c5650ba2.zip | |
auto merge of #13088 : thestinger/rust/hashmap, r=cmr
Closes #5283
Diffstat (limited to 'src/libsyntax/parse')
| -rw-r--r-- | src/libsyntax/parse/obsolete.rs | 2 | ||||
| -rw-r--r-- | src/libsyntax/parse/token.rs | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/libsyntax/parse/obsolete.rs b/src/libsyntax/parse/obsolete.rs index 1d7bf2ef6da..63b3fb09ee3 100644 --- a/src/libsyntax/parse/obsolete.rs +++ b/src/libsyntax/parse/obsolete.rs @@ -23,7 +23,7 @@ use parse::parser::Parser; use parse::token; /// The specific types of unsupported syntax -#[deriving(Eq, Hash)] +#[deriving(Eq, TotalEq, Hash)] pub enum ObsoleteSyntax { ObsoleteSwap, ObsoleteUnsafeBlock, diff --git a/src/libsyntax/parse/token.rs b/src/libsyntax/parse/token.rs index eebb98294d5..15525912955 100644 --- a/src/libsyntax/parse/token.rs +++ b/src/libsyntax/parse/token.rs @@ -24,7 +24,7 @@ use std::local_data; use std::path::BytesContainer; #[allow(non_camel_case_types)] -#[deriving(Clone, Encodable, Decodable, Eq, Hash, Show)] +#[deriving(Clone, Encodable, Decodable, Eq, TotalEq, Hash, Show)] pub enum BinOp { PLUS, MINUS, @@ -39,7 +39,7 @@ pub enum BinOp { } #[allow(non_camel_case_types)] -#[deriving(Clone, Encodable, Decodable, Eq, Hash, Show)] +#[deriving(Clone, Encodable, Decodable, Eq, TotalEq, Hash, Show)] pub enum Token { /* Expression-operator symbols. */ EQ, @@ -103,7 +103,7 @@ pub enum Token { EOF, } -#[deriving(Clone, Encodable, Decodable, Eq, Hash)] +#[deriving(Clone, Encodable, Decodable, Eq, TotalEq, Hash)] /// For interpolation during macro expansion. pub enum Nonterminal { NtItem(@ast::Item), |