diff options
| author | bors <bors@rust-lang.org> | 2014-03-07 20:36:42 -0800 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-03-07 20:36:42 -0800 |
| commit | 96e8c00e95b1980c429c5cfa4aae33e3cc60f3c5 (patch) | |
| tree | 1dcb1676da02712aae8573cf3b1dabd307b92533 /src/libsyntax/ast.rs | |
| parent | 4c90a7f018e19f94d7c32a96bf608fbd3ab56e12 (diff) | |
| parent | 4d7d101a76deea69e9078d9ed6bb93ecca70e52a (diff) | |
| download | rust-96e8c00e95b1980c429c5cfa4aae33e3cc60f3c5.tar.gz rust-96e8c00e95b1980c429c5cfa4aae33e3cc60f3c5.zip | |
auto merge of #12520 : thestinger/rust/cmp, r=brson
* `Ord` inherits from `Eq` * `TotalOrd` inherits from `TotalEq` * `TotalOrd` inherits from `Ord` * `TotalEq` inherits from `Eq` This is a partial implementation of #12517.
Diffstat (limited to 'src/libsyntax/ast.rs')
| -rw-r--r-- | src/libsyntax/ast.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs index a8480b6cfeb..0a959993517 100644 --- a/src/libsyntax/ast.rs +++ b/src/libsyntax/ast.rs @@ -39,7 +39,7 @@ pub fn P<T: 'static>(value: T) -> P<T> { // table) and a SyntaxContext to track renaming and // macro expansion per Flatt et al., "Macros // That Work Together" -#[deriving(Clone, Hash, TotalEq, TotalOrd, Show)] +#[deriving(Clone, Hash, Ord, TotalEq, TotalOrd, Show)] pub struct Ident { name: Name, ctxt: SyntaxContext @@ -151,7 +151,7 @@ pub type CrateNum = u32; pub type NodeId = u32; -#[deriving(Clone, TotalEq, TotalOrd, Eq, Encodable, Decodable, Hash, Show)] +#[deriving(Clone, TotalEq, TotalOrd, Ord, Eq, Encodable, Decodable, Hash, Show)] pub struct DefId { krate: CrateNum, node: NodeId, |