From d5beecb79c71340c36fa79d994ac5848fb1159db Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Thu, 2 Apr 2020 15:14:53 +0200 Subject: [PATCH] correct factual mistake in Windows message, and use "+" sugar --- src/shims/time.rs | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/shims/time.rs b/src/shims/time.rs index d501fa8a0fdb..735b52528fda 100644 --- a/src/shims/time.rs +++ b/src/shims/time.rs @@ -100,11 +100,9 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriEvalContextExt<'mir, 'tcx let NANOS_PER_INTERVAL = NANOS_PER_SEC / INTERVALS_PER_SEC; let SECONDS_TO_UNIX_EPOCH = INTERVALS_TO_UNIX_EPOCH / INTERVALS_PER_SEC; - let duration = system_time_to_duration(&SystemTime::now())? - .checked_add(Duration::from_secs(SECONDS_TO_UNIX_EPOCH)) - .unwrap(); + let duration = system_time_to_duration(&SystemTime::now())? + Duration::from_secs(SECONDS_TO_UNIX_EPOCH); let duration_ticks = u64::try_from(duration.as_nanos() / u128::from(NANOS_PER_INTERVAL)) - .map_err(|_| err_unsup_format!("programs running longer than 2^64 ticks are not supported"))?; + .map_err(|_| err_unsup_format!("programs running more than 2^64 Windows ticks after the Windows epoch are not supported"))?; let dwLowDateTime = u32::try_from(duration_ticks & 0x00000000FFFFFFFF).unwrap(); let dwHighDateTime = u32::try_from((duration_ticks & 0xFFFFFFFF00000000) >> 32).unwrap();