From be47e43db625fe43041c472154ef2b23f160be95 Mon Sep 17 00:00:00 2001 From: Antoine Stevan <44101798+amtoine@users.noreply.github.com> Date: Fri, 4 Aug 2023 16:08:10 +0200 Subject: [PATCH] rename `date format` to `format date` (#571) --- benchmarks/gradient_benchmark.nu | 14 +++++++------- benchmarks/gradient_benchmark_no_check.nu | 14 +++++++------- make_release/Readme.md | 2 +- make_release/release-note/create-pr | 2 +- make_release/release-note/list-merged-prs | 4 ++-- modules/docker/docker.nu | 2 +- modules/log/log.nu | 2 +- modules/prompt/oh-my-minimal.nu | 4 ++-- modules/prompt/oh-my-v2.nu | 2 +- modules/prompt/powerline/power.nu | 4 ++-- modules/prompt/shell_space.nu | 2 +- modules/weather/get-weather.nu | 4 ++-- modules/weather/timed_weather_run.nu | 4 ++-- modules/weather/timed_weather_run_env.nu | 4 ++-- modules/weather/weatherdark.nu | 4 ++-- sourced/misc/nu_defs.nu | 4 ++-- sourced/misc/table_grouping.nu | 2 +- 17 files changed, 37 insertions(+), 37 deletions(-) diff --git a/benchmarks/gradient_benchmark.nu b/benchmarks/gradient_benchmark.nu index 9c214a4..7898bf0 100644 --- a/benchmarks/gradient_benchmark.nu +++ b/benchmarks/gradient_benchmark.nu @@ -7,7 +7,7 @@ def iter_inc [incr mult iter] { let is_release = (input "Did you compile in a release mode? y/n ") if ($is_release | str downcase | str trim) == "y" { - print $"running test 0 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 0 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 0. this has wrong output let 0 = (seq 1 10 | each { timeit { let height = 40 @@ -27,7 +27,7 @@ if ($is_release | str downcase | str trim) == "y" { }} | math avg) - print $"running test 1 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 1 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 1. Fixed newline to fix the output (char cr) let 1 = (seq 1 10 | each { timeit { let height = 40 @@ -46,7 +46,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join }} | math avg) - print $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 2 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 2. Replace (char sp) with just space let 2 = (seq 1 10 | each { timeit { let height = 40 @@ -65,7 +65,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join }} | math avg) - print $"running test 3 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 3 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 3. Precompute (ansi -e '48;2;0;0;') and (ansi -e '0m') -- seems to be slower let 3 = (seq 1 10 | each { timeit { let height = 40 @@ -86,7 +86,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join }} | math avg) - print $"running test 4 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 4 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 4. Inline iter_inc call let 4 = (seq 1 10 | each { timeit { let height = 40 @@ -105,7 +105,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join }} | math avg) - print $"running test 5 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 5 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 5. Combine (char sp) substitution and iter_inc inlining let 5 = (seq 1 10 | each { timeit { let height = 40 @@ -124,7 +124,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join }} | math avg) - print $"running test 6 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 6 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 6. The above with par-each outer loop (using par-each anywhere else breaks the output) let 6 = (seq 1 10 | each { timeit { let height = 40 diff --git a/benchmarks/gradient_benchmark_no_check.nu b/benchmarks/gradient_benchmark_no_check.nu index 3a484c2..cc9d74d 100644 --- a/benchmarks/gradient_benchmark_no_check.nu +++ b/benchmarks/gradient_benchmark_no_check.nu @@ -9,7 +9,7 @@ let is_release = "y" if ($is_release | str downcase | str trim) == "y" { - print $"running test 0 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 0 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 0. this has wrong output let 0 = (seq 10 | timeit { let height = 40 @@ -29,7 +29,7 @@ if ($is_release | str downcase | str trim) == "y" { } | math avg) - print $"running test 1 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 1 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 1. Fixed newline to fix the output (char cr) let 1 = (seq 10 | timeit { let height = 40 @@ -48,7 +48,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join } | math avg) - print $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 2 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 2. Replace (char sp) with just space let 2 = (seq 10 | timeit { let height = 40 @@ -67,7 +67,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join } | math avg) - print $"running test 3 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 3 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 3. Precompute (ansi -e '48;2;0;0;') and (ansi -e '0m') -- seems to be slower let 3 = (seq 10 | timeit { let height = 40 @@ -88,7 +88,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join } | math avg) - print $"running test 4 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 4 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 4. Inline iter_inc call let 4 = (seq 10 | timeit { let height = 40 @@ -107,7 +107,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join } | math avg) - print $"running test 5 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 5 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 5. Combine (char sp) substitution and iter_inc inlining let 5 = (seq 10 | timeit { let height = 40 @@ -126,7 +126,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str join } | math avg) - print $"running test 6 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 6 at (date now | format date '%Y-%m-%d %H:%M:%S.%3f')" # 6. The above with par-each outer loop (using par-each anywhere else breaks the output) let 6 = (seq 10 | timeit { let height = 40 diff --git a/make_release/Readme.md b/make_release/Readme.md index 7be7412..eff1c25 100644 --- a/make_release/Readme.md +++ b/make_release/Readme.md @@ -82,7 +82,7 @@ - [ ] tweet about the new release ## 7. Create the next release note PR on the website -- [ ] run `./make_release/release-note/create-pr 0.xx.0 ((date now) + 4wk | date format "%Y-%m-%d" | into datetime)` +- [ ] run `./make_release/release-note/create-pr 0.xx.0 ((date now) + 4wk | format date "%Y-%m-%d" | into datetime)` ## 8. Bump the version as development - [ ] bump the patch version on [`nushell`] ([example][nushell dev example]) by running diff --git a/make_release/release-note/create-pr b/make_release/release-note/create-pr index d8032c4..3fe0716 100755 --- a/make_release/release-note/create-pr +++ b/make_release/release-note/create-pr @@ -43,7 +43,7 @@ def main [ let branch = $"release-notes-($version)" let blog_path = ( - $repo | path join "blog" $"($date | date format "%Y-%m-%d")-nushell_($version | str replace --all --string '.' '_').md" + $repo | path join "blog" $"($date | format date "%Y-%m-%d")-nushell_($version | str replace --all --string '.' '_').md" ) let title = $"Release notes for `($version)`" diff --git a/make_release/release-note/list-merged-prs b/make_release/release-note/list-merged-prs index 0162cd6..a6fed25 100755 --- a/make_release/release-note/list-merged-prs +++ b/make_release/release-note/list-merged-prs @@ -15,9 +15,9 @@ def main [ --pretty: bool # pretty-print for the MarkDown release not --no-author: bool # do not group the contributions by author ] { - let date = $date | default ((date now) - 4wk) | date format "%Y-%m-%d" + let date = $date | default ((date now) - 4wk) | format date "%Y-%m-%d" - let since = (date now | date format %F | into datetime) - ($date | into datetime) + let since = (date now | format date %F | into datetime) - ($date | into datetime) log info $"listing PRs in ($repo) since ($date) \(($since) ago\)" let query = if $label == null { diff --git a/modules/docker/docker.nu b/modules/docker/docker.nu index e872f21..59d1b2f 100644 --- a/modules/docker/docker.nu +++ b/modules/docker/docker.nu @@ -334,7 +334,7 @@ export def container-create [ $debug $appimage $netadmin $clip $mnt $vols $workdir $cache ] | flatten) - let name = $"($img | split row '/' | last | str replace ':' '-')_(date now | date format %m%d%H%M)" + let name = $"($img | split row '/' | last | str replace ':' '-')_(date now | format date %m%d%H%M)" if $dry_run { echo $"docker ($ns | str join ' ') run --name ($name) ($args|str join ' ') ($img) ($cmd | flatten)" } else { diff --git a/modules/log/log.nu b/modules/log/log.nu index 1a9e0bc..3c1e08b 100644 --- a/modules/log/log.nu +++ b/modules/log/log.nu @@ -6,7 +6,7 @@ def logtime [msg act] { | into string | str replace ' ' '') - echo $'($start | date format '%Y-%m-%d_%H:%M:%S%z')(char tab)($period)(char tab)($msg)(char newline)' + echo $'($start | format date '%Y-%m-%d_%H:%M:%S%z')(char tab)($period)(char tab)($msg)(char newline)' | save -a ~/.cache/nushell/time.log return $result diff --git a/modules/prompt/oh-my-minimal.nu b/modules/prompt/oh-my-minimal.nu index e447f08..a477ba1 100644 --- a/modules/prompt/oh-my-minimal.nu +++ b/modules/prompt/oh-my-minimal.nu @@ -217,7 +217,7 @@ export def get_right_prompt [os use_nerd_fonts] { }) (ansi { fg: $TERM_FG bg: $TIME_BG}) (char space) - (date now | date format '%m/%d/%Y %I:%M:%S%.3f') + (date now | format date '%m/%d/%Y %I:%M:%S%.3f') (char space) ($R) ] | str join) @@ -231,7 +231,7 @@ export def get_right_prompt [os use_nerd_fonts] { }) (ansi { fg: $TERM_FG bg: $TIME_BG}) (char space) - (date now | date format '%I:%M:%S %p') + (date now | format date '%I:%M:%S %p') (char space) ($R) ] | str join) diff --git a/modules/prompt/oh-my-v2.nu b/modules/prompt/oh-my-v2.nu index 87fe7e2..a918041 100644 --- a/modules/prompt/oh-my-v2.nu +++ b/modules/prompt/oh-my-v2.nu @@ -351,7 +351,7 @@ def get_time_segment [os color_mode] { ($time_color) ($time_bg_color) (char space) - (date now | date format '%I:%M:%S %p') + (date now | format date '%I:%M:%S %p') (char space) ($R) ] | str join) diff --git a/modules/prompt/powerline/power.nu b/modules/prompt/powerline/power.nu index 3e53aa6..2f90565 100644 --- a/modules/prompt/powerline/power.nu +++ b/modules/prompt/powerline/power.nu @@ -84,7 +84,7 @@ def time_segment [] { } else { $'($theme.fst)%y-%m-%d[%w]%H:%M:%S' } - [$bg $"(date now | date format $format)"] + [$bg $"(date now | format date $format)"] } } @@ -94,7 +94,7 @@ def logtime [msg act] { let result = (do $act) let period = ($"((date now) - $start | into duration -c ns)" | str replace ' ' '') - echo $'($start | date format '%Y-%m-%d_%H:%M:%S%z')(char tab)($period)(char tab)($msg)(char newline)' + echo $'($start | format date '%Y-%m-%d_%H:%M:%S%z')(char tab)($period)(char tab)($msg)(char newline)' | save -a ~/.cache/nushell/power_time.log $result diff --git a/modules/prompt/shell_space.nu b/modules/prompt/shell_space.nu index 5433519..816502a 100644 --- a/modules/prompt/shell_space.nu +++ b/modules/prompt/shell_space.nu @@ -11,7 +11,7 @@ def workspaces [] { def create_right_prompt [] { let time_segment = ([ - (date now | date format '%r'), + (date now | format date '%r'), " ", (workspaces) ] | str join) diff --git a/modules/weather/get-weather.nu b/modules/weather/get-weather.nu index 69acf9c..6c147cb 100644 --- a/modules/weather/get-weather.nu +++ b/modules/weather/get-weather.nu @@ -73,7 +73,7 @@ def get_weather_by_ip [locIdx: int, units: string, token: string] { let forecast = ($forecast_data.list | each {|day| { id: ($day.weather.0.id) - dt: ($day.dt | into string | into datetime -z local | date format '%a, %b %e') #'%Y-%m-%d') + dt: ($day.dt | into string | into datetime -z local | format date '%a, %b %e') #'%Y-%m-%d') high: ($day.temp.max) low: ($day.temp.min) } @@ -111,7 +111,7 @@ def get_weather_by_ip [locIdx: int, units: string, token: string] { let forecast = ($forecast_data.list | each {|day| { id: ($day.weather.0.id) - dt: ($day.dt | into string | into datetime -z local | date format '%a, %b %e') #'%Y-%m-%d') + dt: ($day.dt | into string | into datetime -z local | format date '%a, %b %e') #'%Y-%m-%d') high: ($day.temp.max) low: ($day.temp.min) } diff --git a/modules/weather/timed_weather_run.nu b/modules/weather/timed_weather_run.nu index daedfa7..812ebf9 100644 --- a/modules/weather/timed_weather_run.nu +++ b/modules/weather/timed_weather_run.nu @@ -55,7 +55,7 @@ def timed_weather_run [ Source: "expired-cache" Emoji: ($emoji) } - $weather_table | upsert last_run_time {(date now | date format '%Y-%m-%d %H:%M:%S %z')} | save $weather_runtime_file + $weather_table | upsert last_run_time {(date now | format date '%Y-%m-%d %H:%M:%S %z')} | save $weather_runtime_file } } else { # $"Unable to find [($weather_runtime_file)], creating it(char nl)" @@ -67,7 +67,7 @@ def timed_weather_run [ Source: "initial" Emoji: ($emoji) } - $weather_table | upsert last_run_time {(date now | date format '%Y-%m-%d %H:%M:%S %z')} | save $weather_runtime_file + $weather_table | upsert last_run_time {(date now | format date '%Y-%m-%d %H:%M:%S %z')} | save $weather_runtime_file } } else { echo "Your command did not run because you are not on Windows..." diff --git a/modules/weather/timed_weather_run_env.nu b/modules/weather/timed_weather_run_env.nu index 11588ca..75cab90 100644 --- a/modules/weather/timed_weather_run_env.nu +++ b/modules/weather/timed_weather_run_env.nu @@ -9,7 +9,7 @@ use get-weather.nu get_weather # Create a mutable weather table to hold the weather data -$env.WEATHER = (get_weather | upsert last_run_time { (date now | date format '%Y-%m-%d %H:%M:%S %z')}) +$env.WEATHER = (get_weather | upsert last_run_time { (date now | format date '%Y-%m-%d %H:%M:%S %z')}) #command to run at interval def-env timed_weather_run [ @@ -30,7 +30,7 @@ def-env timed_weather_run [ } else { # $"interval met, running command: [($command)](char nl)" - $env.WEATHER = (get_weather | upsert last_run_time { (date now | date format '%Y-%m-%d %H:%M:%S %z')}) + $env.WEATHER = (get_weather | upsert last_run_time { (date now | format date '%Y-%m-%d %H:%M:%S %z')}) let temp = ($env.WEATHER.Temperature) let emoji = ($env.WEATHER.Emoji) { diff --git a/modules/weather/weatherdark.nu b/modules/weather/weatherdark.nu index b935eb9..27c2828 100644 --- a/modules/weather/weatherdark.nu +++ b/modules/weather/weatherdark.nu @@ -132,7 +132,7 @@ export def-env get_weather_by_interval [INTERVAL_WEATHER] { if ($LAST_WEATHER_TIME | into datetime) + $INTERVAL_WEATHER < (date now) { let WEATHER = (get_weather_for_prompt (get_location 0)) - let NEW_WEATHER_TIME = (date now | date format '%Y-%m-%d %H:%M:%S %z') + let NEW_WEATHER_TIME = (date now | format date '%Y-%m-%d %H:%M:%S %z') $last_runtime_data | upsert weather $WEATHER | upsert last_weather_time $NEW_WEATHER_TIME | save $weather_runtime_file @@ -142,7 +142,7 @@ export def-env get_weather_by_interval [INTERVAL_WEATHER] { } } else { let WEATHER = (get_weather_for_prompt (get_location 0)) - let LAST_WEATHER_TIME = (date now | date format '%Y-%m-%d %H:%M:%S %z') + let LAST_WEATHER_TIME = (date now | format date '%Y-%m-%d %H:%M:%S %z') let WEATHER_DATA = { "weather": ($WEATHER) diff --git a/sourced/misc/nu_defs.nu b/sourced/misc/nu_defs.nu index cc838dc..ba1cb26 100644 --- a/sourced/misc/nu_defs.nu +++ b/sourced/misc/nu_defs.nu @@ -406,12 +406,12 @@ def gnu-plot [ # date string YYYY-MM-DD def ymd [] { - (date now | date format %Y-%m-%d) + (date now | format date %Y-%m-%d) } # date string DD-MM-YYYY def dmy [] { - (date now | date format %d-%m-%Y) + (date now | format date %d-%m-%Y) } # create directory and cd into it. diff --git a/sourced/misc/table_grouping.nu b/sourced/misc/table_grouping.nu index 6ae9df6..00ba8c3 100644 --- a/sourced/misc/table_grouping.nu +++ b/sourced/misc/table_grouping.nu @@ -46,7 +46,7 @@ print ($table | group-by user_login | transpose user prs | each { |row| # ╰───┴──────────────────────────────────────────────────────────┴─────────────────┴───────────────────────────────────────────────────────╯ def log [message:any] { - let now = (date now | date format '%Y%m%d_%H%M%S.%f') + let now = (date now | format date '%Y%m%d_%H%M%S.%f') let mess = ([$now '|DBG|' $message (char newline)] | str join) echo $mess }