diff --git a/make_release/release-note/notes.nu b/make_release/release-note/notes.nu index b1bb26e..43fe6d0 100755 --- a/make_release/release-note/notes.nu +++ b/make_release/release-note/notes.nu @@ -68,7 +68,7 @@ export def write-toc [file: path] { let data = ( $lines - | range $content_start.. + | slice $content_start.. | wrap line | insert level { get line | split chars | take while { $in == '#' } | length @@ -128,7 +128,7 @@ export def write-toc [file: path] { } [ - ...($lines | range ..<$content_start) + ...($lines | slice ..<$content_start) ...$table_of_contents ...$content ] diff --git a/modules/argx/mod.nu b/modules/argx/mod.nu index a31f6e1..8f9eadc 100644 --- a/modules/argx/mod.nu +++ b/modules/argx/mod.nu @@ -36,7 +36,7 @@ export def get-sign [cmd] { # "test -h [123 (3213 3)] 123 `a sdf` --cd --ef sadf -g" | token export def token [] { - let s = ($in | split row '' | range 1..-2) + let s = ($in | split row '' | slice 1..-2) let s = if ($s | last) == ' ' { $s } else { $s | append ' ' } mut par = [] mut res = [] @@ -58,11 +58,11 @@ export def token [] { $par ++= [$c] } if $c in ['}' ']' ')'] { - $par = ($par | range ..-2) + $par = ($par | slice ..-2) } if $c in ['"' "'" '`'] { if ($par | length) > 0 and ($par | last) == $c { - $par = ($par | range ..-2) + $par = ($par | slice ..-2) } else { $par ++= [$c] } @@ -109,8 +109,8 @@ export def parse [] { } } $opt._args = $pos - let p = $pos | range 1..($sign.positional | length) - let rest = $pos | range (($sign.positional | length) + 1)..-1 + let p = $pos | slice 1..($sign.positional | length) + let rest = $pos | slice (($sign.positional | length) + 1)..-1 $opt._pos = ( $p | enumerate | reduce -f {} {|it, acc| $acc | upsert ($sign.positional | get $it.index) $it.item diff --git a/modules/completion-generator/completion-generator.nu b/modules/completion-generator/completion-generator.nu index 0dcb691..16e9a13 100644 --- a/modules/completion-generator/completion-generator.nu +++ b/modules/completion-generator/completion-generator.nu @@ -7,7 +7,7 @@ export def 'from tree' [ let argv = $ctx.0 | str substring 0..$ctx.1 | split row -r '\s+' - | range $cmd_len.. + | slice $cmd_len.. | where not ($it | str starts-with '-') let menu = $argv | reduce -f {schema: $schema, path: []} {|x, acc| diff --git a/modules/docker/mod.nu b/modules/docker/mod.nu index b147dba..e9f0940 100644 --- a/modules/docker/mod.nu +++ b/modules/docker/mod.nu @@ -87,7 +87,7 @@ def parse-img [] { let tag = $n.1? | default 'latest' let repo = $n.0 | split row '/' let image = $repo | last - let repo = $repo | range 0..-2 | str join '/' + let repo = $repo | slice 0..-2 | str join '/' {image: $image, tag: $tag, repo: $repo} } @@ -98,7 +98,7 @@ export def image-select [name] { let fs = [image tag repo] for i in 2..0 { let r = $imgs | filter {|x| - $fs | range 0..$i | all {|y| ($n | get $y) == ($x | get $y) } + $fs | slice 0..$i | all {|y| ($n | get $y) == ($x | get $y) } } if ($r | is-not-empty) { return ($r | sort-by -r created | first | get name) diff --git a/modules/fnm/fnm.nu b/modules/fnm/fnm.nu index 7787db8..acfdafd 100644 --- a/modules/fnm/fnm.nu +++ b/modules/fnm/fnm.nu @@ -8,7 +8,7 @@ export-env { ) # fnm-prefixed vars - for v in ($pwsh_vars | range 1..) { + for v in ($pwsh_vars | slice 1..) { $env_vars = ($env_vars | insert $v.key $v.value) } diff --git a/modules/kubernetes/complete.nu b/modules/kubernetes/complete.nu index 3c09cb3..03ab171 100644 --- a/modules/kubernetes/complete.nu +++ b/modules/kubernetes/complete.nu @@ -75,7 +75,7 @@ export def "nu-complete kube jsonpath" [context: string] { } } else if ($path | str starts-with '.') { let row = $path | split row '.' - let p = $row | range ..-2 | str join '.' + let p = $row | slice ..-2 | str join '.' if ($p | is-empty) { $r = ( kubectl get ...$ns -o json $kind $res | from json diff --git a/modules/kubernetes/helm.nu b/modules/kubernetes/helm.nu index e81d444..9e5a8b1 100644 --- a/modules/kubernetes/helm.nu +++ b/modules/kubernetes/helm.nu @@ -117,7 +117,7 @@ export def kh [ --app (-a): string='test' ] { let values = if ($values | is-empty) { [] } else { [--set-json (record-to-set-json $values)] } - let target = $valuefile | split row '.' | range ..-2 | append [out yaml] | str join '.' + let target = $valuefile | split row '.' | slice ..-2 | append [out yaml] | str join '.' if (not ($target | path exists)) and (([yes no] | input list $'create ($target)?') in [no]) { return } helm template --debug $app $chart -f $valuefile ...$values ...($namespace | with-flag -n) | save -f $target diff --git a/modules/kubernetes/refine.nu b/modules/kubernetes/refine.nu index 1ad4438..7d8d44b 100644 --- a/modules/kubernetes/refine.nu +++ b/modules/kubernetes/refine.nu @@ -8,7 +8,7 @@ def safe_get [path obj] { if ($p | describe -d).type == closure { $r = ($r | do $p $r) - $ps = ($ps | range 1..) + $ps = ($ps | slice 1..) continue } @@ -28,7 +28,7 @@ def safe_get [path obj] { $r = null } } - $ps = ($ps | range 1..) + $ps = ($ps | slice 1..) } $r } diff --git a/modules/kubernetes/utils.nu b/modules/kubernetes/utils.nu index c94bf8f..d86f9ce 100644 --- a/modules/kubernetes/utils.nu +++ b/modules/kubernetes/utils.nu @@ -62,7 +62,7 @@ export def get_cellpath [record path] { export def set_cellpath [record path value] { if ($path | length) > 1 { $record | upsert ($path | first) {|it| - set_cellpath ($it | get ($path | first)) ($path | range 1..) $value + set_cellpath ($it | get ($path | first)) ($path | slice 1..) $value } } else { $record | upsert ($path | last) $value diff --git a/modules/prompt/powerline/power.nu b/modules/prompt/powerline/power.nu index 6529d56..923d2e8 100644 --- a/modules/prompt/powerline/power.nu +++ b/modules/prompt/powerline/power.nu @@ -32,7 +32,7 @@ export def "pwd_abbr" [] { let last = ($dir_comp | last) let body = ( $dir_comp - |range 1..-2 + |slice 1..-2 |each {|x| $x | str substring ..2 } ) $dir_comp = ([$first $body $last] | flatten) @@ -206,7 +206,7 @@ def left_prompt [segment] { } }) let stop = ($segment | length) - 1 - let cs = ($segment | each {|x| $x.0 } | append $segment.0.0 | range 1..) + let cs = ($segment | each {|x| $x.0 } | append $segment.0.0 | slice 1..) $segment | zip $cs | enumerate @@ -310,7 +310,7 @@ def squash [thunk] { def left_prompt_gen [segment] { let stop = ($segment | length) - 1 let vs = ($segment | each {|x| [$x.color (get_component $x)]}) - let cs = ($segment | each {|x| $x.color } | append $segment.0.color | range 1..) + let cs = ($segment | each {|x| $x.color } | append $segment.0.color | slice 1..) let thunk = ($vs | zip $cs | enumerate @@ -470,9 +470,9 @@ export def --env inject [pos idx define theme? config?] { $prev | prepend $define } else { [ - ($prev | range 0..($idx - 1)) + ($prev | slice 0..($idx - 1)) $define - ($prev | range $idx..) + ($prev | slice $idx..) ] | flatten } diff --git a/sourced/cool-oneliners/file_cat.nu b/sourced/cool-oneliners/file_cat.nu index 0fcbc97..3cc0613 100644 --- a/sourced/cool-oneliners/file_cat.nu +++ b/sourced/cool-oneliners/file_cat.nu @@ -1,8 +1,8 @@ # Combine two files into one def create_files [] { - [0,1,2,3] | range 0..3 | save a.json - [4,5,6,7] | range 0..3 | save b.json + [0,1,2,3] | slice 0..3 | save a.json + [4,5,6,7] | slice 0..3 | save b.json } create_files diff --git a/themes/mod.nu b/themes/mod.nu index f7a4945..e3a3dad 100644 --- a/themes/mod.nu +++ b/themes/mod.nu @@ -1,7 +1,7 @@ def "ansi_names" [] { [ ...(ansi --list | get name) - ...(ansi --list | get 'short name' | range 133..338) + ...(ansi --list | get 'short name' | slice 133..338) ] } @@ -54,16 +54,16 @@ export def "preview theme" [] { # This draws the table with two tables merged # let row_count = ($color_table | length) # let row_count_half = (($color_table | length) / 2 | math floor) - # let table1 = ($color_table | range 0..$row_count_half | rename datatypes dtvals) - # let table2 = ($color_table | range $row_count_half..$row_count | rename shapes shpvals) + # let table1 = ($color_table | slice 0..$row_count_half | rename datatypes dtvals) + # let table2 = ($color_table | slice $row_count_half..$row_count | rename shapes shpvals) # echo $table1 | merge $table2 # This draws the table with three tables merged let row_count = ($color_table | length) let row_count_third = (($color_table | length) / 3 | math floor) - let table1 = ($color_table | range 0..$row_count_third | rename key1 val1) - let table2 = ($color_table | range $row_count_third..($row_count_third * 2) | rename key2 val2) - let table3 = ($color_table | range ($row_count_third * 2)..$row_count | rename key3 val3) + let table1 = ($color_table | slice 0..$row_count_third | rename key1 val1) + let table2 = ($color_table | slice $row_count_third..($row_count_third * 2) | rename key2 val2) + let table3 = ($color_table | slice ($row_count_third * 2)..$row_count | rename key3 val3) echo $table1 | merge $table2 | merge $table3 }