about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorManish Goregaokar <manishsmail@gmail.com>2016-01-14 04:22:19 +0530
committerManish Goregaokar <manishsmail@gmail.com>2016-01-14 11:04:40 +0530
commit3e248aa09ff211e76bb0a8ca53267c5a903c23ce (patch)
tree56c5c305ff9533e91a9bc0640049641ae29e0480 /src/libstd
parent6f4ede44dec50d58d10349c12256de5f3b254ade (diff)
parent416267fb19f1e9d78de6a39ac3753488efb81f14 (diff)
downloadrust-3e248aa09ff211e76bb0a8ca53267c5a903c23ce.tar.gz
rust-3e248aa09ff211e76bb0a8ca53267c5a903c23ce.zip
Rollup merge of #30818 - sfackler:duration-hash, r=alexcrichton
tikue pointed out in IRC that this was missing.
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/time/duration.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/time/duration.rs b/src/libstd/time/duration.rs
index ad1be82d6d8..7ecb3920cc8 100644
--- a/src/libstd/time/duration.rs
+++ b/src/libstd/time/duration.rs
@@ -40,7 +40,7 @@ const MILLIS_PER_SEC: u64 = 1_000;
 /// let ten_millis = Duration::from_millis(10);
 /// ```
 #[stable(feature = "duration", since = "1.3.0")]
-#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug)]
+#[derive(Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
 pub struct Duration {
     secs: u64,
     nanos: u32, // Always 0 <= nanos < NANOS_PER_SEC