extern/nushell
1
0
Fork 1
mirror of https://github.com/nushell/nushell.git synced 2024-11-26 10:23:52 +01:00
Code Issues Packages Projects Releases Wiki Activity

Further clarify duration conversion (#2522)

Browse Source
This commit is contained in:
Chris Gillespie 2020-09-09 20:33:37 -07:00 committed by GitHub
parent 73e65df5f6
commit 0f7a9bbd31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
crates/nu-protocol/src/value/primitive.rs
View File

@ -14,10 +14,10 @@ use num_traits::sign::Signed;
use serde::{Deserialize, Serialize}; use serde::{Deserialize, Serialize};
use std::path::PathBuf; use std::path::PathBuf;
const NANOS_PER_SEC: u32 = 1000000000; const NANOS_PER_SEC: u32 = 1_000_000_000;
/// The most fundamental of structured values in Nu are the Primitive values. These values represent types like integers, strings, booleans, dates, etc that are then used /// The most fundamental of structured values in Nu are the Primitive values. These values represent types like integers, strings, booleans, dates, etc
/// as the buildig blocks to build up more complex structures. /// that are then used as the building blocks of more complex structures.
/// ///
/// Primitives also include marker values BeginningOfStream and EndOfStream which denote a change of condition in the stream /// Primitives also include marker values BeginningOfStream and EndOfStream which denote a change of condition in the stream
#[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Deserialize, Serialize)] #[derive(Debug, Clone, Ord, PartialOrd, Eq, PartialEq, Hash, Deserialize, Serialize)]
@ -90,6 +90,7 @@ impl Primitive {
pub fn into_chrono_duration(self, span: Span) -> Result<chrono::Duration, ShellError> { pub fn into_chrono_duration(self, span: Span) -> Result<chrono::Duration, ShellError> {
match self { match self {
Primitive::Duration(duration) => { Primitive::Duration(duration) => {
// Divide into seconds because BigInt can be larger than i64
let (secs, nanos) = duration.div_rem(&BigInt::from(NANOS_PER_SEC)); let (secs, nanos) = duration.div_rem(&BigInt::from(NANOS_PER_SEC));
let secs = match secs.to_i64() { let secs = match secs.to_i64() {
Some(secs) => secs, Some(secs) => secs,
@ -101,15 +102,11 @@ impl Primitive {
)) ))
} }
}; };
// This should never fail since nanos < 10^9. // This should never fail since NANOS_PER_SEC won't overflow
let nanos = match nanos.to_i64() { let nanos = nanos.to_i64().expect("Unexpected i64 overflow");
Some(nanos) => nanos,
None => return Err(ShellError::unexpected("Unexpected i64 overflow")),
};
let nanos = chrono::Duration::nanoseconds(nanos);
// This should also never fail since we are adding less than NANOS_PER_SEC. // This should also never fail since we are adding less than NANOS_PER_SEC.
chrono::Duration::seconds(secs) chrono::Duration::seconds(secs)
.checked_add(&nanos) .checked_add(&chrono::Duration::nanoseconds(nanos))
.ok_or_else(|| ShellError::unexpected("Unexpected duration overflow")) .ok_or_else(|| ShellError::unexpected("Unexpected duration overflow"))
} }
other => Err(ShellError::type_error( other => Err(ShellError::type_error(
@ -292,7 +289,7 @@ pub fn format_duration(duration: &BigInt) -> String {
let big_int_1000 = BigInt::from(1000); let big_int_1000 = BigInt::from(1000);
let big_int_60 = BigInt::from(60); let big_int_60 = BigInt::from(60);
let big_int_24 = BigInt::from(24); let big_int_24 = BigInt::from(24);
// We only want the biggest subvidision to have the negative sign. // We only want the biggest subdivision to have the negative sign.
let (sign, duration) = if duration.is_zero() || duration.is_positive() { let (sign, duration) = if duration.is_zero() || duration.is_positive() {
(1, duration.clone()) (1, duration.clone())
} else { } else {