Skip to content

Commit 1d5ead4

Browse files
vivi
committed
Add Hash impl for SystemTime and Instant
Closes #46670.
1 parent a3a7203 commit 1d5ead4

File tree

5 files changed

+34
-11
lines changed

5 files changed

+34
-11
lines changed

‎src/libstd/sys/redox/time.rs

+10-2
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ use fmt;
1313
use sys::{cvt, syscall};
1414
use time::Duration;
1515
use convert::TryInto;
16+
use core::hash::{Hash, Hasher};
1617

1718
const NSEC_PER_SEC: u64 = 1_000_000_000;
1819

@@ -110,12 +111,19 @@ impl Ord for Timespec {
110111
}
111112
}
112113

113-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
114+
impl Hash for Timespec {
115+
fn hash<H : Hasher>(&self, state: &mut H) {
116+
self.t.tv_sec.hash(state);
117+
self.t.tv_nsec.hash(state);
118+
}
119+
}
120+
121+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
114122
pub struct Instant {
115123
t: Timespec,
116124
}
117125

118-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
126+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
119127
pub struct SystemTime {
120128
t: Timespec,
121129
}

‎src/libstd/sys/unix/time.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
use cmp::Ordering;
1212
use libc;
1313
use time::Duration;
14+
use core::hash::{Hash, Hasher};
1415

1516
pub use self::inner::{Instant, SystemTime, UNIX_EPOCH};
1617
use convert::TryInto;
@@ -111,6 +112,13 @@ impl Ord for Timespec {
111112
}
112113
}
113114

115+
impl Hash for Timespec {
116+
fn hash<H : Hasher>(&self, state: &mut H) {
117+
self.t.tv_sec.hash(state);
118+
self.t.tv_nsec.hash(state);
119+
}
120+
}
121+
114122
#[cfg(any(target_os = "macos", target_os = "ios"))]
115123
mod inner {
116124
use fmt;
@@ -123,12 +131,12 @@ mod inner {
123131
use super::NSEC_PER_SEC;
124132
use super::Timespec;
125133

126-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
134+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
127135
pub struct Instant {
128136
t: u64
129137
}
130138

131-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
139+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
132140
pub struct SystemTime {
133141
t: Timespec,
134142
}
@@ -255,12 +263,12 @@ mod inner {
255263

256264
use super::Timespec;
257265

258-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
266+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
259267
pub struct Instant {
260268
t: Timespec,
261269
}
262270

263-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
271+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
264272
pub struct SystemTime {
265273
t: Timespec,
266274
}

‎src/libstd/sys/wasm/time.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@
1111
use fmt;
1212
use time::Duration;
1313

14-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug)]
14+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Debug, Hash)]
1515
pub struct Instant;
1616

17-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
17+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
1818
pub struct SystemTime;
1919

2020
pub const UNIX_EPOCH: SystemTime = SystemTime;

‎src/libstd/sys/windows/time.rs

+8-1
Original file line numberDiff line numberDiff line change
@@ -17,11 +17,12 @@ use sys::cvt;
1717
use sys_common::mul_div_u64;
1818
use time::Duration;
1919
use convert::TryInto;
20+
use core::hash::{Hash, Hasher};
2021

2122
const NANOS_PER_SEC: u64 = 1_000_000_000;
2223
const INTERVALS_PER_SEC: u64 = NANOS_PER_SEC / 100;
2324

24-
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
25+
#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug, Hash)]
2526
pub struct Instant {
2627
t: c::LARGE_INTEGER,
2728
}
@@ -173,6 +174,12 @@ impl From<c::FILETIME> for SystemTime {
173174
}
174175
}
175176

177+
impl Hash for SystemTime {
178+
fn hash<H : Hasher>(&self, state: &mut H) {
179+
self.intervals().hash(state)
180+
}
181+
}
182+
176183
fn dur2intervals(d: &Duration) -> i64 {
177184
d.as_secs()
178185
.checked_mul(INTERVALS_PER_SEC)

‎src/libstd/time/mod.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ mod duration;
6666
/// println!("{}", now.elapsed().as_secs());
6767
/// }
6868
/// ```
69-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
69+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
7070
#[stable(feature = "time2", since = "1.8.0")]
7171
pub struct Instant(time::Instant);
7272

@@ -118,7 +118,7 @@ pub struct Instant(time::Instant);
118118
/// }
119119
/// }
120120
/// ```
121-
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord)]
121+
#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Hash)]
122122
#[stable(feature = "time2", since = "1.8.0")]
123123
pub struct SystemTime(time::SystemTime);
124124

0 commit comments

Comments
 (0)