Rollup merge of rust-lang#76958 - est31:ns, r=oli-obk

RalfJung · web-flow · commit c08034ddd79c · 2020-09-21T10:40:39.000+02:00
Replace manual as_nanos and as_secs_f64 reimplementations
diff --git a/test/src/bench.rs b/test/src/bench.rs
@@ -98,10 +98,6 @@ fn fmt_thousands_sep(mut n: usize, sep: char) -> String {
     output
 }
 
-fn ns_from_dur(dur: Duration) -> u64 {
-    dur.as_secs() * 1_000_000_000 + (dur.subsec_nanos() as u64)
-}
-
 fn ns_iter_inner<T, F>(inner: &mut F, k: u64) -> u64
 where
     F: FnMut() -> T,
@@ -110,7 +106,7 @@ where
     for _ in 0..k {
         black_box(inner());
     }
-    ns_from_dur(start.elapsed())
+    start.elapsed().as_nanos() as u64
 }
 
 pub fn iter<T, F>(inner: &mut F) -> stats::Summary

Original file line number	Diff line number	Diff line change
`@@ -98,10 +98,6 @@ fn fmt_thousands_sep(mut n: usize, sep: char) -> String {`
`98`	`98`	`output`
`99`	`99`	`}`
`100`	`100`
`101`		`-fn ns_from_dur(dur: Duration) -> u64 {`
`102`		`- dur.as_secs() * 1_000_000_000 + (dur.subsec_nanos() as u64)`
`103`		`-}`
`104`		`-`
`105`	`101`	`fn ns_iter_inner<T, F>(inner: &mut F, k: u64) -> u64`
`106`	`102`	`where`
`107`	`103`	`F: FnMut() -> T,`
`@@ -110,7 +106,7 @@ where`
`110`	`106`	`for _ in 0..k {`
`111`	`107`	`black_box(inner());`
`112`	`108`	`}`
`113`		`- ns_from_dur(start.elapsed())`
	`109`	`+ start.elapsed().as_nanos() as u64`
`114`	`110`	`}`
`115`	`111`
`116`	`112`	`pub fn iter<T, F>(inner: &mut F) -> stats::Summary`