2019-05-10 16:59:12 +00:00
|
|
|
[package]
|
2022-03-13 18:30:27 +00:00
|
|
|
authors = ["The Nushell Project Developers"]
|
2023-05-20 12:57:51 +00:00
|
|
|
build = "scripts/build.rs"
|
2020-07-05 20:12:44 +00:00
|
|
|
default-run = "nu"
|
2020-04-06 07:16:14 +00:00
|
|
|
description = "A new type of shell"
|
2020-07-05 20:12:44 +00:00
|
|
|
documentation = "https://www.nushell.sh/book/"
|
2023-01-05 12:24:42 +00:00
|
|
|
edition = "2021"
|
2020-07-05 20:12:44 +00:00
|
|
|
exclude = ["images"]
|
|
|
|
|
homepage = "https://www.nushell.sh"
|
|
|
|
|
license = "MIT"
|
|
|
|
|
name = "nu"
|
2019-07-16 19:17:46 +00:00
|
|
|
repository = "https://github.com/nushell/nushell"
|
2022-05-04 01:56:31 +00:00
|
|
|
rust-version = "1.60"
|
2023-05-17 12:59:01 +00:00
|
|
|
version = "0.80.1"
|
2021-06-30 01:42:56 +00:00
|
|
|
|
|
|
|
|
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
|
|
|
|
|
|
2022-11-23 16:46:06 +00:00
|
|
|
[package.metadata.binstall]
|
|
|
|
|
pkg-url = "{ repo }/releases/download/{ version }/{ name }-{ version }-{ target }.{ archive-format }"
|
|
|
|
|
pkg-fmt = "tgz"
|
|
|
|
|
|
|
|
|
|
[package.metadata.binstall.overrides.x86_64-pc-windows-msvc]
|
|
|
|
|
pkg-fmt = "zip"
|
|
|
|
|
|
2021-08-25 19:29:36 +00:00
|
|
|
[workspace]
|
2021-10-28 06:12:33 +00:00
|
|
|
members = [
|
|
|
|
|
"crates/nu-cli",
|
|
|
|
|
"crates/nu-engine",
|
|
|
|
|
"crates/nu-parser",
|
2022-01-14 06:20:53 +00:00
|
|
|
"crates/nu-system",
|
2023-02-24 15:54:42 +00:00
|
|
|
"crates/nu-cmd-lang",
|
2023-05-19 17:56:08 +00:00
|
|
|
"crates/nu-cmd-dataframe",
|
2021-10-28 06:12:33 +00:00
|
|
|
"crates/nu-command",
|
|
|
|
|
"crates/nu-protocol",
|
|
|
|
|
"crates/nu-plugin",
|
2021-11-04 22:04:21 +00:00
|
|
|
"crates/nu_plugin_inc",
|
2021-12-06 17:28:11 +00:00
|
|
|
"crates/nu_plugin_gstat",
|
2021-12-02 05:42:56 +00:00
|
|
|
"crates/nu_plugin_example",
|
2022-02-01 18:45:48 +00:00
|
|
|
"crates/nu_plugin_query",
|
2022-07-25 16:32:56 +00:00
|
|
|
"crates/nu_plugin_custom_values",
|
2023-02-13 12:42:08 +00:00
|
|
|
"crates/nu_plugin_formats",
|
2023-04-07 20:12:27 +00:00
|
|
|
"crates/nu-std",
|
2022-03-16 22:21:06 +00:00
|
|
|
"crates/nu-utils",
|
2021-10-28 06:12:33 +00:00
|
|
|
]
|
2021-08-25 19:29:36 +00:00
|
|
|
|
2021-06-30 01:42:56 +00:00
|
|
|
[dependencies]
|
2023-05-17 12:59:01 +00:00
|
|
|
nu-cli = { path = "./crates/nu-cli", version = "0.80.1" }
|
|
|
|
|
nu-color-config = { path = "./crates/nu-color-config", version = "0.80.1" }
|
|
|
|
|
nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.80.1" }
|
2023-05-19 17:56:08 +00:00
|
|
|
nu-cmd-dataframe = { path = "./crates/nu-cmd-dataframe", version = "0.80.1", optional = true }
|
2023-05-17 12:59:01 +00:00
|
|
|
nu-command = { path = "./crates/nu-command", version = "0.80.1" }
|
|
|
|
|
nu-engine = { path = "./crates/nu-engine", version = "0.80.1" }
|
|
|
|
|
nu-json = { path = "./crates/nu-json", version = "0.80.1" }
|
|
|
|
|
nu-parser = { path = "./crates/nu-parser", version = "0.80.1" }
|
|
|
|
|
nu-path = { path = "./crates/nu-path", version = "0.80.1" }
|
|
|
|
|
nu-plugin = { path = "./crates/nu-plugin", optional = true, version = "0.80.1" }
|
|
|
|
|
nu-pretty-hex = { path = "./crates/nu-pretty-hex", version = "0.80.1" }
|
|
|
|
|
nu-protocol = { path = "./crates/nu-protocol", version = "0.80.1" }
|
|
|
|
|
nu-system = { path = "./crates/nu-system", version = "0.80.1" }
|
|
|
|
|
nu-table = { path = "./crates/nu-table", version = "0.80.1" }
|
|
|
|
|
nu-term-grid = { path = "./crates/nu-term-grid", version = "0.80.1" }
|
|
|
|
|
nu-std = { path = "./crates/nu-std", version = "0.80.1" }
|
|
|
|
|
nu-utils = { path = "./crates/nu-utils", version = "0.80.1" }
|
2023-03-14 18:46:42 +00:00
|
|
|
nu-ansi-term = "0.47.0"
|
2023-05-16 22:05:24 +00:00
|
|
|
reedline = { version = "0.19.1", features = ["bashisms", "sqlite"]}
|
2022-09-19 14:28:36 +00:00
|
|
|
|
2023-05-18 16:37:20 +00:00
|
|
|
crossterm = "0.26"
|
|
|
|
|
ctrlc = "3.2.1"
|
|
|
|
|
log = "0.4"
|
|
|
|
|
miette = { version = "5.7.0", features = ["fancy-no-backtrace"] }
|
|
|
|
|
serde_json = "1.0"
|
2022-08-09 16:44:37 +00:00
|
|
|
simplelog = "0.12.0"
|
|
|
|
|
time = "0.3.12"
|
2022-02-22 15:55:28 +00:00
|
|
|
|
2022-05-26 18:28:59 +00:00
|
|
|
[target.'cfg(not(target_os = "windows"))'.dependencies]
|
|
|
|
|
# Our dependencies don't use OpenSSL on Windows
|
2023-03-25 09:41:11 +00:00
|
|
|
openssl = { version = "0.10.48", features = ["vendored"], optional = true }
|
2022-06-09 12:08:15 +00:00
|
|
|
signal-hook = { version = "0.3.14", default-features = false }
|
2022-05-26 18:28:59 +00:00
|
|
|
|
2022-10-16 21:51:15 +00:00
|
|
|
[target.'cfg(windows)'.build-dependencies]
|
2023-04-26 12:14:55 +00:00
|
|
|
winresource = "0.1"
|
2022-10-16 21:51:15 +00:00
|
|
|
|
|
|
|
|
[target.'cfg(target_family = "unix")'.dependencies]
|
2023-03-12 08:03:02 +00:00
|
|
|
nix = { version = "0.26", default-features = false, features = [
|
`string | fill` counts clusters, not graphemes; and doesn't count ANSI escape codes (#8134)
Enhancement of new `fill` command (#7846) to handle content including
ANSI escape codes for formatting or multi-code-point Unicode grapheme
clusters.
In both of these cases, the content is (many) bytes longer than its
visible length, and `fill` was counting the extra bytes so not adding
enough fill characters.
# Description
This script:
```rust
# the teacher emoji `\u{1F9D1}\u{200D}\u{1F3EB}` is 3 code points, but only 1 print position wide.
echo "This output should be 3 print positions wide, with leading and trailing `+`"
$"\u{1F9D1}\u{200D}\u{1F3EB}" | fill -c "+" -w 3 -a "c"
echo "This output should be 3 print positions wide, with leading and trailing `+`"
$"(ansi green)a(ansi reset)" | fill -c "+" -w 3 -a c
echo ""
```
Was producing this output:
```rust
This output should be 3 print positions wide, with leading and trailing `+`
🧑🏫
This output should be 3 print positions wide, with leading and trailing `+`
a
```
After this PR, it produces this output:
```rust
This output should be 3 print positions wide, with leading and trailing `+`
+🧑🏫+
This output should be 3 print positions wide, with leading and trailing `+`
+a+
```
# User-Facing Changes
Users may have to undo fixes they may have introduced to work around the
former behavior. I have one such in my prompt string that I can now
revert.
# Tests + Formatting
Don't forget to add tests that cover your changes.
-- Done
Make sure you've run and fixed any issues with these commands:
- [x] `cargo fmt --all -- --check` to check standard code formatting
(`cargo fmt --all` applies these changes)
- [x] `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect` to check that you're using the standard code
style
- [x] `cargo test --workspace` to check that all tests pass
# After Submitting
`fill` command not documented in the book, and it still talks about `str
lpad/rpad`. I'll fix.
Note added dependency on a new library `print-positions`, which is an
iterator that yields a complete print position (cluster + Ansi sequence)
per call. Should this be vendored?
2023-02-20 12:32:20 +00:00
|
|
|
"signal",
|
|
|
|
|
"process",
|
|
|
|
|
"fs",
|
|
|
|
|
"term",
|
|
|
|
|
] }
|
2022-10-16 21:51:15 +00:00
|
|
|
atty = "0.2"
|
|
|
|
|
|
2021-07-30 20:02:16 +00:00
|
|
|
[dev-dependencies]
|
2023-05-17 12:59:01 +00:00
|
|
|
nu-test-support = { path = "./crates/nu-test-support", version = "0.80.1" }
|
2023-04-06 20:39:31 +00:00
|
|
|
tempfile = "3.5.0"
|
2021-12-16 09:40:05 +00:00
|
|
|
assert_cmd = "2.0.2"
|
2023-01-05 19:39:54 +00:00
|
|
|
criterion = "0.4"
|
2021-12-16 09:40:05 +00:00
|
|
|
pretty_assertions = "1.0.0"
|
2023-01-30 02:47:51 +00:00
|
|
|
serial_test = "1.0.0"
|
2023-03-20 17:27:29 +00:00
|
|
|
rstest = { version = "0.17.0", default-features = false }
|
2021-12-07 20:06:34 +00:00
|
|
|
|
|
|
|
|
[features]
|
2023-01-23 18:57:40 +00:00
|
|
|
plugin = [
|
|
|
|
|
"nu-plugin",
|
|
|
|
|
"nu-cli/plugin",
|
|
|
|
|
"nu-parser/plugin",
|
|
|
|
|
"nu-command/plugin",
|
|
|
|
|
"nu-protocol/plugin",
|
|
|
|
|
"nu-engine/plugin",
|
|
|
|
|
]
|
2022-11-23 00:58:11 +00:00
|
|
|
# extra used to be more useful but now it's the same as default. Leaving it in for backcompat with existing build scripts
|
2022-11-21 17:24:25 +00:00
|
|
|
extra = ["default"]
|
2022-11-23 00:58:11 +00:00
|
|
|
default = ["plugin", "which-support", "trash-support", "sqlite"]
|
2021-12-07 20:06:34 +00:00
|
|
|
stable = ["default"]
|
2022-03-09 02:05:58 +00:00
|
|
|
wasi = []
|
2022-11-21 17:24:25 +00:00
|
|
|
|
2022-04-28 11:33:17 +00:00
|
|
|
# Enable to statically link OpenSSL; otherwise the system version will be used. Not enabled by default because it takes a while to build
|
|
|
|
|
static-link-openssl = ["dep:openssl"]
|
2021-12-07 20:06:34 +00:00
|
|
|
|
|
|
|
|
# Stable (Default)
|
2022-03-30 18:37:31 +00:00
|
|
|
which-support = ["nu-command/which-support"]
|
2022-03-10 13:37:24 +00:00
|
|
|
trash-support = ["nu-command/trash-support"]
|
2022-01-20 18:02:53 +00:00
|
|
|
|
2021-12-07 20:06:34 +00:00
|
|
|
# Extra
|
2021-12-10 01:16:35 +00:00
|
|
|
|
2021-12-07 20:06:34 +00:00
|
|
|
# Dataframe feature for nushell
|
|
|
|
|
dataframe = ["nu-command/dataframe"]
|
|
|
|
|
|
2022-11-23 00:58:11 +00:00
|
|
|
# SQLite commands for nushell
|
|
|
|
|
sqlite = ["nu-command/sqlite"]
|
2022-04-24 09:29:21 +00:00
|
|
|
|
2021-12-07 20:06:34 +00:00
|
|
|
[profile.release]
|
2023-01-23 18:57:40 +00:00
|
|
|
opt-level = "s" # Optimize for size
|
2022-02-28 12:13:24 +00:00
|
|
|
strip = "debuginfo"
|
2022-03-10 13:37:24 +00:00
|
|
|
lto = "thin"
|
2022-02-28 12:13:24 +00:00
|
|
|
|
2022-03-16 22:21:06 +00:00
|
|
|
# build with `cargo build --profile profiling`
|
2022-02-28 12:13:24 +00:00
|
|
|
# to analyze performance with tooling like linux perf
|
|
|
|
|
[profile.profiling]
|
|
|
|
|
inherits = "release"
|
|
|
|
|
strip = false
|
|
|
|
|
debug = true
|
2021-12-07 20:06:34 +00:00
|
|
|
|
2022-05-16 04:02:11 +00:00
|
|
|
# build with `cargo build --profile ci`
|
|
|
|
|
# to analyze performance with tooling like linux perf
|
|
|
|
|
[profile.ci]
|
|
|
|
|
inherits = "dev"
|
|
|
|
|
strip = false
|
|
|
|
|
debug = false
|
|
|
|
|
|
2019-12-10 00:05:40 +00:00
|
|
|
# Main nu binary
|
2019-06-27 04:56:48 +00:00
|
|
|
[[bin]]
|
|
|
|
|
name = "nu"
|
|
|
|
|
path = "src/main.rs"
|
2023-02-12 22:22:00 +00:00
|
|
|
bench = false
|
2022-09-29 18:37:48 +00:00
|
|
|
|
2022-10-17 21:45:28 +00:00
|
|
|
# To use a development version of a dependency please use a global override here
|
|
|
|
|
# changing versions in each sub-crate of the workspace is tedious
|
2022-10-16 21:51:15 +00:00
|
|
|
[patch.crates-io]
|
2023-05-16 22:05:24 +00:00
|
|
|
# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main"}
|
2023-03-13 22:38:18 +00:00
|
|
|
# nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}
|
2023-01-05 19:39:54 +00:00
|
|
|
|
|
|
|
|
# Criterion benchmarking setup
|
|
|
|
|
# Run all benchmarks with `cargo bench`
|
|
|
|
|
# Run individual benchmarks like `cargo bench -- <regex>` e.g. `cargo bench -- parse`
|
|
|
|
|
[[bench]]
|
2023-01-11 01:51:25 +00:00
|
|
|
name = "benchmarks"
|
2023-01-23 18:57:40 +00:00
|
|
|
harness = false
|
