From f8f00fac5b2612ce857cca4cdae99c1205beec70 Mon Sep 17 00:00:00 2001 From: Anthony Ramine Date: Wed, 29 Jun 2016 17:35:13 +0200 Subject: [PATCH] Move util::time::duration_from_nanoseconds to its only caller --- components/compositing/delayed_composition.rs | 15 ++++++++++++++- components/util/time.rs | 11 ----------- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/components/compositing/delayed_composition.rs b/components/compositing/delayed_composition.rs index c2ae4b86fa9..36c0306011a 100644 --- a/components/compositing/delayed_composition.rs +++ b/components/compositing/delayed_composition.rs @@ -10,8 +10,9 @@ use compositor_thread::{CompositorProxy, Msg}; use std::sync::mpsc::{Receiver, Sender, channel}; use std::thread::{self, Builder}; +use std::time::Duration; +use std::u32; use time; -use util::time::duration_from_nanoseconds; /// The amount of time in nanoseconds that we give to the painting thread to paint. When this /// expires, we give up and composite anyway. @@ -92,3 +93,15 @@ impl DelayedCompositionTimer { } } +fn duration_from_nanoseconds(nanos: u64) -> Duration { + pub const NANOS_PER_SEC: u32 = 1_000_000_000; + + // Get number of seconds. + let secs = nanos / NANOS_PER_SEC as u64; + + // Get number of extra nanoseconds. This should always fit in a u32, but check anyway. + let subsec_nanos = nanos % NANOS_PER_SEC as u64; + assert!(subsec_nanos <= u32::MAX as u64); + + Duration::new(secs, subsec_nanos as u32) +} diff --git a/components/util/time.rs b/components/util/time.rs index 4a751c95ee1..dab092b8850 100644 --- a/components/util/time.rs +++ b/components/util/time.rs @@ -18,14 +18,3 @@ pub fn duration_from_seconds(secs: f64) -> Duration { Duration::new(whole_secs as u64, nanos as u32) } - -pub fn duration_from_nanoseconds(nanos: u64) -> Duration { - // Get number of seconds. - let secs = nanos / NANOS_PER_SEC as u64; - - // Get number of extra nanoseconds. This should always fit in a u32, but check anyway. - let subsec_nanos = nanos % NANOS_PER_SEC as u64; - assert!(subsec_nanos <= u32::MAX as u64); - - Duration::new(secs, subsec_nanos as u32) -}