about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2014-04-17 22:41:22 -0700
committerbors <bors@rust-lang.org>2014-04-17 22:41:22 -0700
commitc834bf45c4e5b19ae4e496ebfa007771447091a8 (patch)
tree26f276d03e77c32ea9b2635b7ec86fc73b3f44b0 /src/libstd
parent29a39700a1a46de2046bd6913da9c38d064a5a8f (diff)
parent506008f9a0334fe5381397cac2f2f3ca85f1a6d6 (diff)
downloadrust-c834bf45c4e5b19ae4e496ebfa007771447091a8.tar.gz
rust-c834bf45c4e5b19ae4e496ebfa007771447091a8.zip
auto merge of #13580 : DiamondLovesYou/rust/std-result-hash, r=alexcrichton
Title says it all.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/result.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/result.rs b/src/libstd/result.rs
index 0b6897ba2dc..493ff8c485f 100644
--- a/src/libstd/result.rs
+++ b/src/libstd/result.rs
@@ -275,7 +275,7 @@ use option::{None, Option, Some};
 /// `Result` is a type that represents either success (`Ok`) or failure (`Err`).
 ///
 /// See the [`std::result`](index.html) module documentation for details.
-#[deriving(Clone, Eq, Ord, TotalEq, TotalOrd, Show)]
+#[deriving(Clone, Eq, Ord, TotalEq, TotalOrd, Show, Hash)]
 #[must_use]
 pub enum Result<T, E> {
     /// Contains the success value