diff options
| author | bors <bors@rust-lang.org> | 2015-12-01 07:40:41 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-12-01 07:40:41 +0000 |
| commit | 0bfdedb0103e4fa6d89d7bc192dade6e8b26164a (patch) | |
| tree | 2235079208858d2390b0793c305b51425813acae /src | |
| parent | c212c0e1d1ff9f061c8149b4831e5fa1cb7e5b83 (diff) | |
| parent | 903444015cc1978a6c940b922e41b0ba6d0172ed (diff) | |
| download | rust-0bfdedb0103e4fa6d89d7bc192dade6e8b26164a.tar.gz rust-0bfdedb0103e4fa6d89d7bc192dade6e8b26164a.zip | |
Auto merge of #30118 - alexcrichton:fix-time-again, r=aturon
I believe that because Windows' unit of resolution is 100ns that this unit of time will ensure that the assertions will hold true as it's representable in the native format. cc #29970
Diffstat (limited to 'src')
| -rw-r--r-- | src/libstd/time/mod.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libstd/time/mod.rs b/src/libstd/time/mod.rs index 261f3e266d7..d400d12e23f 100644 --- a/src/libstd/time/mod.rs +++ b/src/libstd/time/mod.rs @@ -235,7 +235,7 @@ mod tests { let (a, b) = ($a, $b); if a != b { let (a, b) = if a > b {(a, b)} else {(b, a)}; - assert!(a - Duration::new(0, 1) <= b); + assert!(a - Duration::new(0, 100) <= b); } }) } |
