diff options
| author | bors <bors@rust-lang.org> | 2020-02-06 01:46:46 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-02-06 01:46:46 +0000 |
| commit | ed853b861993ee5f3798037a3560f573c62b17cd (patch) | |
| tree | 25faf97afd6634038ef9737e03947a07486b021f /src/libstd/sys | |
| parent | a25d58b41b273993c27a2533dc193b799abbf43f (diff) | |
| parent | b37f968632fc2c66f144d132bb9bb6187709f1de (diff) | |
| download | rust-ed853b861993ee5f3798037a3560f573c62b17cd.tar.gz rust-ed853b861993ee5f3798037a3560f573c62b17cd.zip | |
Auto merge of #68861 - Dylan-DPC:rollup-0m09hsg, r=Dylan-DPC
Rollup of 8 pull requests Successful merges: - #68762 (Strip unnecessary subexpression) - #68790 (Improve `merge_from_succ`) - #68809 (Make more arithmetic functions unstably const) - #68832 (Clean up E0264, E0267 and E0268 explanations) - #68840 (On suggesting `#![recursion_limit = "X"]`, note current crate name) - #68846 (doc fix on doc attribute) - #68851 (Fix issue number of `capacity` method) - #68858 (Merge item id stable hashing functions) Failed merges: r? @ghost
Diffstat (limited to 'src/libstd/sys')
| -rw-r--r-- | src/libstd/sys/unix/time.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/libstd/sys/unix/time.rs b/src/libstd/sys/unix/time.rs index 23104419978..6707f790cab 100644 --- a/src/libstd/sys/unix/time.rs +++ b/src/libstd/sys/unix/time.rs @@ -282,7 +282,6 @@ mod inner { (cfg!(target_os = "linux") && cfg!(target_arch = "x86_64")) || (cfg!(target_os = "linux") && cfg!(target_arch = "x86")) || cfg!(target_os = "fuchsia") - || false // last clause, used so `||` is always trailing above } pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> { |