2023-05-10 12:05:01 +00:00
|
|
|
def borrow-year [from: record, current: record] {
|
|
|
|
mut current = $current
|
|
|
|
|
|
|
|
$current.year = $current.year - 1
|
|
|
|
$current.month = $current.month + 12
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
|
|
|
def leap-year-days [year] {
|
|
|
|
if $year mod 400 == 0 {
|
|
|
|
29
|
|
|
|
} else if $year mod 4 == 0 and $year mod 100 != 0 {
|
|
|
|
29
|
|
|
|
} else {
|
|
|
|
28
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
def borrow-month [from: record, current: record] {
|
|
|
|
mut current = $current
|
|
|
|
if $from.month in [1, 3, 5, 7, 8, 10, 12] {
|
|
|
|
$current.day = $current.day + 31
|
|
|
|
$current.month = $current.month - 1
|
|
|
|
if $current.month < 0 {
|
|
|
|
$current = (borrow-year $from $current)
|
|
|
|
}
|
|
|
|
} else if $from.month in [4, 6, 9, 11] {
|
|
|
|
$current.day = $current.day + 30
|
|
|
|
$current.month = $current.month - 1
|
|
|
|
if $current.month < 0 {
|
|
|
|
$current = (borrow-year $from $current)
|
|
|
|
}
|
|
|
|
} else {
|
|
|
|
# oh February
|
|
|
|
let num_days_feb = (leap-year-days $current.year)
|
|
|
|
$current.day = $current.day + $num_days_feb
|
|
|
|
$current.month = $current.month - 1
|
|
|
|
if $current.month < 0 {
|
|
|
|
$current = (borrow-year $from $current)
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
|
|
|
def borrow-day [from: record, current: record] {
|
|
|
|
mut current = $current
|
|
|
|
$current.hour = $current.hour + 24
|
|
|
|
$current.day = $current.day - 1
|
|
|
|
if $current.day < 0 {
|
|
|
|
$current = (borrow-month $from $current)
|
|
|
|
}
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
|
|
|
def borrow-hour [from: record, current: record] {
|
|
|
|
mut current = $current
|
|
|
|
$current.minute = $current.minute + 60
|
|
|
|
$current.hour = $current.hour - 1
|
|
|
|
if $current.hour < 0 {
|
|
|
|
$current = (borrow-day $from $current)
|
|
|
|
}
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
|
|
|
def borrow-minute [from: record, current: record] {
|
|
|
|
mut current = $current
|
|
|
|
$current.second = $current.second + 60
|
|
|
|
$current.minute = $current.minute - 1
|
|
|
|
if $current.minute < 0 {
|
|
|
|
$current = (borrow-hour $from $current)
|
|
|
|
}
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
|
|
|
def borrow-second [from: record, current: record] {
|
|
|
|
mut current = $current
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
$current.nanosecond = $current.nanosecond + 1_000_000_000
|
2023-05-10 12:05:01 +00:00
|
|
|
$current.second = $current.second - 1
|
|
|
|
if $current.second < 0 {
|
|
|
|
$current = (borrow-minute $from $current)
|
|
|
|
}
|
|
|
|
|
|
|
|
$current
|
|
|
|
}
|
|
|
|
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
# Subtract later from earlier datetime and return the unit differences as a record
|
|
|
|
# Example:
|
|
|
|
# > dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12-07:00
|
|
|
|
# ╭─────────────┬────╮
|
|
|
|
# │ year │ 3 │
|
|
|
|
# │ month │ 11 │
|
|
|
|
# │ day │ 26 │
|
|
|
|
# │ hour │ 23 │
|
|
|
|
# │ minute │ 9 │
|
|
|
|
# │ second │ 33 │
|
|
|
|
# │ millisecond │ 0 │
|
|
|
|
# │ microsecond │ 0 │
|
|
|
|
# │ nanosecond │ 0 │
|
|
|
|
# ╰─────────────┴────╯
|
|
|
|
export def datetime-diff [
|
|
|
|
later: datetime, # a later datetime
|
|
|
|
earlier: datetime # earlier (starting) datetime
|
|
|
|
] {
|
|
|
|
if $earlier > $later {
|
2023-11-03 15:09:33 +00:00
|
|
|
let start = (metadata $later).span.start
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
let end = (metadata $earlier).span.end
|
2023-11-03 15:09:33 +00:00
|
|
|
error make {
|
|
|
|
msg: "Incompatible arguments",
|
|
|
|
label: {
|
|
|
|
span: {
|
|
|
|
start: $start
|
|
|
|
end: $end
|
|
|
|
}
|
|
|
|
text: $"First datetime must be >= second, but was actually ($later - $earlier) less than it."
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
}
|
2024-11-29 22:06:26 +00:00
|
|
|
let from_expanded = ($later | date to-timezone utc | into record)
|
|
|
|
let to_expanded = ($earlier | date to-timezone utc | into record)
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
|
|
|
|
mut result = { year: ($from_expanded.year - $to_expanded.year), month: ($from_expanded.month - $to_expanded.month), day:0, hour:0, minute:0, second:0, millisecond:0, microsecond:0, nanosecond:0}
|
2023-05-10 12:05:01 +00:00
|
|
|
|
|
|
|
if $result.month < 0 {
|
|
|
|
$result = (borrow-year $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
|
|
|
$result.day = $from_expanded.day - $to_expanded.day
|
|
|
|
if $result.day < 0 {
|
|
|
|
$result = (borrow-month $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
|
|
|
$result.hour = $from_expanded.hour - $to_expanded.hour
|
|
|
|
if $result.hour < 0 {
|
|
|
|
$result = (borrow-day $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
|
|
|
$result.minute = $from_expanded.minute - $to_expanded.minute
|
|
|
|
if $result.minute < 0 {
|
|
|
|
$result = (borrow-hour $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
|
|
|
$result.second = $from_expanded.second - $to_expanded.second
|
|
|
|
if $result.second < 0 {
|
|
|
|
$result = (borrow-minute $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
|
|
|
$result.nanosecond = $from_expanded.nanosecond - $to_expanded.nanosecond
|
|
|
|
if $result.nanosecond < 0 {
|
|
|
|
$result = (borrow-second $from_expanded $result)
|
|
|
|
}
|
|
|
|
|
2023-09-13 21:53:55 +00:00
|
|
|
$result.millisecond = ($result.nanosecond / 1_000_000 | into int) # don't want a float
|
2023-05-10 12:05:01 +00:00
|
|
|
$result.microsecond = (($result.nanosecond mod 1_000_000) / 1_000 | into int)
|
|
|
|
$result.nanosecond = ($result.nanosecond mod 1_000 | into int)
|
|
|
|
|
|
|
|
$result
|
|
|
|
}
|
|
|
|
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
# Convert record from datetime-diff into humanized string
|
|
|
|
# Example:
|
|
|
|
# > dt pretty-print-duration (dt datetime-diff 2023-05-07T04:08:45+12:00 2019-05-10T09:59:12+12:00)
|
|
|
|
# 3yrs 11months 27days 18hrs 9mins 33secs
|
|
|
|
export def pretty-print-duration [dur: record] {
|
2023-05-10 12:05:01 +00:00
|
|
|
mut result = ""
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.year != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.year > 1 {
|
|
|
|
$result = $"($dur.year)yrs "
|
|
|
|
} else {
|
|
|
|
$result = $"($dur.year)yr "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.month != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.month > 1 {
|
|
|
|
$result = $"($result)($dur.month)months "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.month)month "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.day != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.day > 1 {
|
|
|
|
$result = $"($result)($dur.day)days "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.day)day "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.hour != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.hour > 1 {
|
|
|
|
$result = $"($result)($dur.hour)hrs "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.hour)hr "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.minute != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.minute > 1 {
|
|
|
|
$result = $"($result)($dur.minute)mins "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.minute)min "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.second != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.second > 1 {
|
|
|
|
$result = $"($result)($dur.second)secs "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.second)sec "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.millisecond != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.millisecond > 1 {
|
|
|
|
$result = $"($result)($dur.millisecond)ms "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.millisecond)ms "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.microsecond != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.microsecond > 1 {
|
|
|
|
$result = $"($result)($dur.microsecond)µs "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.microsecond)µs "
|
|
|
|
}
|
|
|
|
}
|
std dt datetime-diff: fix uninitialized field ref when borrowing (#10466)
fixes #10455
@KAAtheWiseGit, I'm sorry, I didn't mean to block your first PR #10461,
didn't see you had submitted it till I got around to submitting this. If
you want to incoporate useful ideas from this PR into yours, I do not
mind deferring to you.
# Description
Changes made in `datetime-diff`:
* Initialize millisecond and microsecond fields in `$current`, to fix
the error when borrow needs to refer to them.
* Fix `borrow_nanoseconds` to borrow from seconds, not from (unused)
microseconds.
* Added error check to insist that first argument is >= second argument.
`datetime-diff` doesn't represent negative durations correctly (it tries
to borrow out of the year, resulting in negative year and positive all
other fields). We don't currently have a use case requiring negative
durations.
* Add comments so help is a bit clearer (I was surprised that the first
argument, named `$from` was actually supposed to be the *later*
datetime. The order of arguments is reasonable (reminiscent of <later>
<minus> <earlier>), so I just changed the param name to match its
purpose.
Changes made in `pretty-print-duration`:
* changed type of argument from `duration` to `record`. (it's not clear
why Nu was not complaining about this!)
* changed test for skipping a clause from `> 0` to `!= 0`. Even though
`datetime-diff` won't present a negative field in the record, user might
call `pretty-print-duration` with one, might as well handle it. (but I
think `hour:-2` will be rendered as `-2hr`, not `-2hrs`...).
* added help and an example.
# User-Facing Changes
none requiring code changes.
# Tests + Formatting
- :green_circle: `toolkit fmt`
- :green_circle: `toolkit clippy`
- :green_circle: `toolkit test`
- :green_circle: `toolkit test stdlib`
-
- # After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
2023-09-24 08:53:56 +00:00
|
|
|
if $dur.nanosecond != 0 {
|
2023-05-10 12:05:01 +00:00
|
|
|
if $dur.nanosecond > 1 {
|
|
|
|
$result = $"($result)($dur.nanosecond)ns "
|
|
|
|
} else {
|
|
|
|
$result = $"($result)($dur.nanosecond)ns "
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
$result
|
|
|
|
}
|