diff --git a/benchmarks/gradient-autoview.nu b/benchmarks/gradient-autoview.nu index 59abc124..37692cd7 100644 --- a/benchmarks/gradient-autoview.nu +++ b/benchmarks/gradient-autoview.nu @@ -4,9 +4,9 @@ let height = (term size).rows - 3 # calculate height let width = (term size).columns - 5 # calculate width let stamp_start = $width * 1.25 # calculate where to start Nu stamp -let stamp_end = $width * 1.3125 # calculate where to stop Nu stamp +let stamp_end = $width * 1.3 # calculate where to stop Nu stamp let stamp = 'Nu' -seq 0 $height | par-each { # create these in parallel +seq 0 $height | par-each {|| # create these in parallel let row_data = (seq 0 $width | each { |col| let fgcolor = 2 + 2 * $col if $fgcolor > $stamp_start and $fgcolor < $stamp_end { @@ -15,6 +15,6 @@ seq 0 $height | par-each { # create these in parallel $"(ansi -e '48;2;0;0;')($fgcolor)m (ansi -e '0m')" } } | str collect) - $"($row_data)" | table + print -n $"($row_data)" | table $nothing } | compact diff --git a/benchmarks/gradient_benchmark.nu b/benchmarks/gradient_benchmark.nu index 7d91b3c4..b80c7506 100644 --- a/benchmarks/gradient_benchmark.nu +++ b/benchmarks/gradient_benchmark.nu @@ -4,11 +4,11 @@ def iter_inc [incr mult iter] { $incr + $mult * $iter } -let is_release = input "Did you compile in a release mode? y/n " +let is_release = (input "Did you compile in a release mode? y/n ") if ($is_release | str downcase | str trim) == "y" { - $"running test 0 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 0 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 0. this has wrong output let 0 = (seq 10 | timeit { let height = 40 @@ -28,7 +28,7 @@ if ($is_release | str downcase | str trim) == "y" { } | math avg) - $"running test 1 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 1 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 1. Fixed newline to fix the output (char cr) let 1 = (seq 10 | timeit { let height = 40 @@ -47,7 +47,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 2. Replace (char sp) with just space let 2 = (seq 10 | timeit { let height = 40 @@ -66,14 +66,14 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 3 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 3 at (date now | date format '%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 let width = 160 let stamp = 'Nu' - let ansi1 = ansi -e '48;2;0;0;' - let ansi2 = ansi -e '0m' + let ansi1 = (ansi -e '48;2;0;0;') + let ansi2 = (ansi -e '0m') seq 0 $height | each { |row| let row_data = (seq 0 $width | each { |col| let fgcolor = (iter_inc 2 2 $col) @@ -87,7 +87,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 4 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 4 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 4. Inline iter_inc call let 4 = (seq 10 | timeit { let height = 40 @@ -106,7 +106,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 5 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 5 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 5. Combine (char sp) substitution and iter_inc inlining let 5 = (seq 10 | timeit { let height = 40 @@ -125,13 +125,13 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 6 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 6 at (date now | date format '%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 let width = 160 let stamp = 'Nu' - seq 0 $height | par-each { |row| + seq 0 $height | par-each -t 100 { |row| let row_data = (seq 0 $width | each { |col| let fgcolor = 2 + 2 * $col if $fgcolor > 200 and $fgcolor < 210 { @@ -144,9 +144,9 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - echo 'collating tests' + print 'collating tests' [ $0 $1 $2 $3 $4 $5 $6 ] } else { - echo "Compile in a release mode!" + print "Compile in a release mode!" } diff --git a/benchmarks/gradient_benchmark_no_check.nu b/benchmarks/gradient_benchmark_no_check.nu index 37f19d0e..392b85eb 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" { - $"running test 0 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 0 at (date now | date format '%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) - $"running test 1 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 1 at (date now | date format '%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 collect } | math avg) - $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 2 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" # 2. Replace (char sp) with just space let 2 = (seq 10 | timeit { let height = 40 @@ -67,14 +67,14 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 3 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 3 at (date now | date format '%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 let width = 160 let stamp = 'Nu' - let ansi1 = ansi -e '48;2;0;0;' - let ansi2 = ansi -e '0m' + let ansi1 = (ansi -e '48;2;0;0;') + let ansi2 = (ansi -e '0m') seq 0 $height | each { |row| let row_data = (seq 0 $width | each { |col| let fgcolor = (iter_inc 2 2 $col) @@ -88,7 +88,7 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 4 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 4 at (date now | date format '%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 collect } | math avg) - $"running test 5 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 5 at (date now | date format '%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,13 +126,13 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - $"running test 6 at (date now | date format '%Y-%m-%d %H:%M:%S.%3f')" + print $"running test 6 at (date now | date format '%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 let width = 160 let stamp = 'Nu' - seq 0 $height | par-each { |row| + seq 0 $height | par-each -t 100 { |row| let row_data = (seq 0 $width | each { |col| let fgcolor = 2 + 2 * $col if $fgcolor > 200 and $fgcolor < 210 { @@ -145,9 +145,9 @@ if ($is_release | str downcase | str trim) == "y" { } | str collect } | math avg) - echo 'collating tests' + print 'collating tests' [ $0 $1 $2 $3 $4 $5 $6 ] } else { - echo "Compile in a release mode!" + print "Compile in a release mode!" } diff --git a/coloring/24bit-1.nu b/coloring/24bit-1.nu index 6667e8c9..294f6cb2 100644 --- a/coloring/24bit-1.nu +++ b/coloring/24bit-1.nu @@ -33,3 +33,5 @@ def build-colorstr [ $"($bg)($fg)($slash_str)" # sleep 10ms | ignore } + +draw \ No newline at end of file diff --git a/custom-completions/cargo/cargo-completions.nu b/custom-completions/cargo/cargo-completions.nu index 52823321..7c069ffb 100644 --- a/custom-completions/cargo/cargo-completions.nu +++ b/custom-completions/cargo/cargo-completions.nu @@ -30,7 +30,7 @@ def "nu-complete cargo features" [] { # `cargo --list` is slow, `open` is faster. # TODO: Add caching. def "nu-complete cargo subcommands" [] { - ^cargo --list | lines | skip 1 | str collect "\n" | from ssv --noheaders | get column1 + ^cargo --list | lines | skip 1 | str join "\n" | from ssv --noheaders | get column1 } def "nu-complete cargo vcs" [] { [