diff options
| author | bors <bors@rust-lang.org> | 2017-12-20 14:47:21 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-12-20 14:47:21 +0000 |
| commit | 81622c6b02536bdcf56145beb317da0d336703c1 (patch) | |
| tree | 2624499fcf70ff3d8f4072b6aab9a42b9ec9342a /src/libstd/time | |
| parent | df8dfdeff68e60a68d026a3374cfb8159d0495cb (diff) | |
| parent | 66e5c790682204d35191dd62332c6f503cdeddbd (diff) | |
| download | rust-81622c6b02536bdcf56145beb317da0d336703c1.tar.gz rust-81622c6b02536bdcf56145beb317da0d336703c1.zip | |
Auto merge of #46874 - kennytm:rollup, r=kennytm
Rollup of 14 pull requests - Successful merges: #46359, #46517, #46671, #46751, #46760, #46787, #46794, #46828, #46831, #46835, #46851, #46852, #46856, #46870 - Failed merges:
Diffstat (limited to 'src/libstd/time')
| -rw-r--r-- | src/libstd/time/mod.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs index d4993ded843..6ce3b3e8a00 100644 --- a/src/libstd/time/mod.rs +++ b/src/libstd/time/mod.rs @@ -66,7 +66,7 @@ mod duration; /// println!("{}", now.elapsed().as_secs()); /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[stable(feature = "time2", since = "1.8.0")] pub struct Instant(time::Instant); @@ -118,7 +118,7 @@ pub struct Instant(time::Instant); /// } /// } /// ``` -#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)] +#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)] #[stable(feature = "time2", since = "1.8.0")] pub struct SystemTime(time::SystemTime); |
