diff --git a/crates/nu-command/src/formats/to/nuon.rs b/crates/nu-command/src/formats/to/nuon.rs index c712fa132..4eaf4dfe3 100644 --- a/crates/nu-command/src/formats/to/nuon.rs +++ b/crates/nu-command/src/formats/to/nuon.rs @@ -182,11 +182,7 @@ pub fn value_to_string( Value::Filesize { val, .. } => Ok(format!("{}b", *val)), Value::Float { val, .. } => { // This serialises these as 'nan', 'inf' and '-inf', respectively. - if &val.round() == val - && val != &f64::NAN - && val != &f64::INFINITY - && val != &f64::NEG_INFINITY - { + if &val.round() == val && val.is_finite() { Ok(format!("{}.0", *val)) } else { Ok(format!("{}", *val)) diff --git a/crates/nu-command/src/strings/str_/case/mod.rs b/crates/nu-command/src/strings/str_/case/mod.rs index 1f76caf03..321ef66e4 100644 --- a/crates/nu-command/src/strings/str_/case/mod.rs +++ b/crates/nu-command/src/strings/str_/case/mod.rs @@ -1,13 +1,13 @@ -pub mod camel_case; -pub mod capitalize; -pub mod downcase; -pub mod kebab_case; -pub mod pascal_case; -pub mod screaming_snake_case; -pub mod snake_case; -pub mod str_; -pub mod title_case; -pub mod upcase; +mod camel_case; +mod capitalize; +mod downcase; +mod kebab_case; +mod pascal_case; +mod screaming_snake_case; +mod snake_case; +mod str_; +mod title_case; +mod upcase; pub use camel_case::SubCommand as StrCamelCase; pub use capitalize::SubCommand as StrCapitalize; diff --git a/crates/nu-command/tests/commands/rm.rs b/crates/nu-command/tests/commands/rm.rs index f02613086..f0aced78c 100644 --- a/crates/nu-command/tests/commands/rm.rs +++ b/crates/nu-command/tests/commands/rm.rs @@ -389,7 +389,7 @@ fn rm_prints_filenames_on_error() { set_dir_read_only(test_dir, true); let _cleanup = Cleanup { - dir_to_clean: &test_dir, + dir_to_clean: test_dir, }; // This rm is expected to fail, and stderr output indicating so is also expected. diff --git a/crates/nu-json/src/ser.rs b/crates/nu-json/src/ser.rs index ba644eb46..246a5db20 100644 --- a/crates/nu-json/src/ser.rs +++ b/crates/nu-json/src/ser.rs @@ -695,6 +695,12 @@ struct HjsonFormatter<'a> { braces_same_line: bool, } +impl<'a> Default for HjsonFormatter<'a> { + fn default() -> Self { + Self::new() + } +} + impl<'a> HjsonFormatter<'a> { /// Construct a formatter that defaults to using two spaces for indentation. pub fn new() -> Self {