Rollup merge of rust-lang#68762 - ForNeVeR:patch-1, r=alexcrichton

Centril · web-flow · commit 2716fa209f0a · 2020-02-05T07:37:15.000+01:00
Strip unnecessary subexpression It became unnecessary since a06baa5 reformatted the file. The comment is currently a bit misleading.
diff --git 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> {

Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,6 @@ mod inner {`
`282`	`282`	`(cfg!(target_os = "linux") && cfg!(target_arch = "x86_64"))`
`283`	`283`	`\|\| (cfg!(target_os = "linux") && cfg!(target_arch = "x86"))`
`284`	`284`	`\|\| cfg!(target_os = "fuchsia")`
`285`		- \|\| false // last clause, used so `\|\|` is always trailing above
`286`	`285`	`}`
`287`	`286`
`288`	`287`	`pub fn checked_sub_instant(&self, other: &Instant) -> Option<Duration> {`