holm/nushell
1
1
Fork 0
forked from extern/nushell
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renamed time units (#2356)

Browse Source 
* Changed time units as outlined in issue #2353.
Also applied changes to to_str for Unit - not sure if that was what was wanted.

* Forgot the tests!

* Updated primitive.rs to match changes.

* Updated where example to match changes.

* And the html test!
This commit is contained in:
Matt Clarke 2020-08-15 21:03:28 +02:00 committed by GitHub
parent c6588c661a
commit c59f860b48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/nu-cli/src/commands/where_.rs
View File

@ -57,7 +57,7 @@ impl WholeStreamCommand for Where {
}, },
Example { Example {
description: "List all files that were modified in the last two months", description: "List all files that were modified in the last two months",
example: "ls | where modified <= 2M", example: "ls | where modified <= 2mon",
result: None, result: None,
}, },
] ]

12
crates/nu-cli/tests/commands/math/mod.rs
View File

@ -166,11 +166,11 @@ fn duration_math() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", pipeline( cwd: "tests/fixtures/formats", pipeline(
r#" r#"
= 1w + 1d = 1wk + 1day
"# "#
)); ));
assert_eq!(actual.out, "8d"); assert_eq!(actual.out, "8day");
} }
#[test] #[test]
@ -178,11 +178,11 @@ fn duration_math_with_nanoseconds() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", pipeline( cwd: "tests/fixtures/formats", pipeline(
r#" r#"
= 1w + 10ns = 1wk + 10ns
"# "#
)); ));
assert_eq!(actual.out, "7d 10ns"); assert_eq!(actual.out, "7day 10ns");
} }
#[test] #[test]
@ -190,11 +190,11 @@ fn duration_math_with_negative() {
let actual = nu!( let actual = nu!(
cwd: "tests/fixtures/formats", pipeline( cwd: "tests/fixtures/formats", pipeline(
r#" r#"
= 1d - 1w = 1day - 1wk
"# "#
)); ));
assert_eq!(actual.out, "-6d"); assert_eq!(actual.out, "-6day");
} }
#[test] #[test]

2
crates/nu-cli/tests/format_conversions/html.rs
View File

@ -86,6 +86,6 @@ fn test_html_color_where_flag_dark_false() {
); );
assert_eq!( assert_eq!(
actual.out, actual.out,
r"<html><style>body { background-color:white;color:black; }</style><body>Filter table to match the condition.<br><br>Usage:<br> &gt; where &lt;condition&gt; {flags} <br><br>Parameters:<br> &lt;condition&gt; the condition that must match<br><br>Flags:<br> -h, --help: Display this help message<br><br>Examples:<br> List all files in the current directory with sizes greater than 2kb<br> &gt; <span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>size<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&gt;<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>kb<span style='color:black;font-weight:normal;'><br><br> List only the files in the current directory<br> &gt; </span></span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>type<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>==<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>File<span style='color:black;font-weight:normal;'><br><br> List all files with names that contain &quot;Car&quot;<br> &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>name<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>=~<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>&quot;Car&quot;<span style='color:black;font-weight:normal;'><br><br> List all files that were modified in the last two months<br> &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>modified<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&lt;=<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>M<span style='color:black;font-weight:normal;'><br><br></body></html></span></span></span>" r"<html><style>body { background-color:white;color:black; }</style><body>Filter table to match the condition.<br><br>Usage:<br> &gt; where &lt;condition&gt; {flags} <br><br>Parameters:<br> &lt;condition&gt; the condition that must match<br><br>Flags:<br> -h, --help: Display this help message<br><br>Examples:<br> List all files in the current directory with sizes greater than 2kb<br> &gt; <span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>size<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&gt;<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>kb<span style='color:black;font-weight:normal;'><br><br> List only the files in the current directory<br> &gt; </span></span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>type<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>==<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>File<span style='color:black;font-weight:normal;'><br><br> List all files with names that contain &quot;Car&quot;<br> &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>name<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>=~<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:green;'>&quot;Car&quot;<span style='color:black;font-weight:normal;'><br><br> List all files that were modified in the last two months<br> &gt; </span><span style='color:#037979;font-weight:bold;'>ls<span style='color:black;font-weight:normal;'></span></span></span></span><span style='color:black;'> | <span style='color:black;font-weight:normal;'></span><span style='color:#037979;font-weight:bold;'>where<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;font-weight:bold;'>modified<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#717100;'>&lt;=<span style='color:black;font-weight:normal;'></span></span></span><span style='color:black;'> <span style='color:black;font-weight:normal;'></span><span style='color:#c800c8;font-weight:bold;'>2<span style='color:black;font-weight:normal;'></span></span><span style='color:#037979;font-weight:bold;'>mon<span style='color:black;font-weight:normal;'><br><br></body></html></span></span></span>"
); );
} }

14
crates/nu-parser/src/parse.rs
View File

@ -316,13 +316,13 @@ fn parse_unit(lite_arg: &Spanned<String>) -> (SpannedExpression, Option<ParseErr
(Unit::Nanosecond, vec!["ns"]), (Unit::Nanosecond, vec!["ns"]),
(Unit::Microsecond, vec!["us"]), (Unit::Microsecond, vec!["us"]),
(Unit::Millisecond, vec!["ms"]), (Unit::Millisecond, vec!["ms"]),
(Unit::Second, vec!["s"]), (Unit::Second, vec!["sec"]),
(Unit::Minute, vec!["m"]), (Unit::Minute, vec!["min"]),
(Unit::Hour, vec!["h"]), (Unit::Hour, vec!["hr"]),
(Unit::Day, vec!["d"]), (Unit::Day, vec!["day"]),
(Unit::Week, vec!["w"]), (Unit::Week, vec!["wk"]),
(Unit::Month, vec!["M"]), (Unit::Month, vec!["mon"]),
(Unit::Year, vec!["y"]), (Unit::Year, vec!["yr"]),
]; ];
for unit_group in unit_groups.iter() { for unit_group in unit_groups.iter() {

14
crates/nu-protocol/src/hir.rs
View File

@ -465,13 +465,13 @@ impl Unit {
Unit::Nanosecond => "ns", Unit::Nanosecond => "ns",
Unit::Microsecond => "us", Unit::Microsecond => "us",
Unit::Millisecond => "ms", Unit::Millisecond => "ms",
Unit::Second => "s", Unit::Second => "sec",
Unit::Minute => "m", Unit::Minute => "min",
Unit::Hour => "h", Unit::Hour => "hr",
Unit::Day => "d", Unit::Day => "day",
Unit::Week => "w", Unit::Week => "wk",
Unit::Month => "M", Unit::Month => "mon",
Unit::Year => "y", Unit::Year => "yr",
} }
} }

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

@ -302,19 +302,19 @@ pub fn format_duration(duration: &BigInt) -> String {
let mut output_prep = vec![]; let mut output_prep = vec![];
if !days.is_zero() { if !days.is_zero() {
output_prep.push(format!("{}d", days)); output_prep.push(format!("{}day", days));
} }
if !hours.is_zero() { if !hours.is_zero() {
output_prep.push(format!("{}h", hours)); output_prep.push(format!("{}hr", hours));
} }
if !mins.is_zero() { if !mins.is_zero() {
output_prep.push(format!("{}m", mins)); output_prep.push(format!("{}min", mins));
} }
if !secs.is_zero() { if !secs.is_zero() {
output_prep.push(format!("{}s", secs)); output_prep.push(format!("{}sec", secs));
} }
if !millis.is_zero() { if !millis.is_zero() {