Use bleeding edge reedline, with fix for #5593 (#5598)

Fixes #5593 (OOM introduced with #5587 when no config was present and an attempt was
made to allocate all memory in advance)

Includes also other changes to reedline:

- Vi word definition fixed and `w` and `e` work as expected
This commit is contained in:
Stefan Holderbach 2022-05-20 17:35:25 +02:00 committed by GitHub
parent 0ba86d7eb8
commit 06199d731b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 5 deletions

3
Cargo.lock generated
View file

@ -3737,8 +3737,7 @@ dependencies = [
[[package]] [[package]]
name = "reedline" name = "reedline"
version = "0.5.0" version = "0.5.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/nushell/reedline?branch=main#85daf4e4fc7c18644077440009db3f70dcd8202c"
checksum = "d96c36021d0668f3b4f8c054fce3a9b9b0aa83fc60aa6c59df0e2165f9980763"
dependencies = [ dependencies = [
"chrono", "chrono",
"crossterm", "crossterm",

View file

@ -55,7 +55,7 @@ nu-utils = { path = "./crates/nu-utils", version = "0.62.1" }
openssl = { version = "0.10.38", features = ["vendored"], optional = true } openssl = { version = "0.10.38", features = ["vendored"], optional = true }
pretty_env_logger = "0.4.0" pretty_env_logger = "0.4.0"
rayon = "1.5.1" rayon = "1.5.1"
reedline = { version = "0.5.0", features = ["bashisms"]} reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
is_executable = "1.0.1" is_executable = "1.0.1"
[dev-dependencies] [dev-dependencies]

View file

@ -18,7 +18,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.62.1" }
nu-utils = { path = "../nu-utils", version = "0.62.1" } nu-utils = { path = "../nu-utils", version = "0.62.1" }
nu-ansi-term = "0.45.1" nu-ansi-term = "0.45.1"
nu-color-config = { path = "../nu-color-config", version = "0.62.1" } nu-color-config = { path = "../nu-color-config", version = "0.62.1" }
reedline = { version = "0.5.0", features = ["bashisms"]} reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
crossterm = "0.23.0" crossterm = "0.23.0"
miette = { version = "4.5.0", features = ["fancy"] } miette = { version = "4.5.0", features = ["fancy"] }
thiserror = "1.0.29" thiserror = "1.0.29"

View file

@ -82,7 +82,7 @@ unicode-segmentation = "1.8.0"
url = "2.2.1" url = "2.2.1"
uuid = { version = "0.8.2", features = ["v4"] } uuid = { version = "0.8.2", features = ["v4"] }
which = { version = "4.2.2", optional = true } which = { version = "4.2.2", optional = true }
reedline = { version = "0.5.0", features = ["bashisms"]} reedline = { git = "https://github.com/nushell/reedline", branch = "main", features = ["bashisms"]}
wax = { version = "0.4.0", features = ["diagnostics"] } wax = { version = "0.4.0", features = ["diagnostics"] }
rusqlite = { version = "0.27.0", features = ["bundled"], optional = true } rusqlite = { version = "0.27.0", features = ["bundled"], optional = true }
sqlparser = { version = "0.16.0", features = ["serde"], optional = true } sqlparser = { version = "0.16.0", features = ["serde"], optional = true }