From f0420c5a6cc3c6c8f4158d911496da1a33e6fc5a Mon Sep 17 00:00:00 2001 From: Stefan Holderbach Date: Mon, 17 Oct 2022 23:45:28 +0200 Subject: [PATCH] Pin reedline to the 0.13.0 release (#6789) See the release notes: https://github.com/nushell/reedline/releases/tag/v0.13.0 --- Cargo.lock | 5 +++-- Cargo.toml | 6 ++++-- crates/nu-cli/Cargo.toml | 2 +- crates/nu-command/Cargo.toml | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9387ba93ec..893e512305 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4070,8 +4070,9 @@ dependencies = [ [[package]] name = "reedline" -version = "0.12.0" -source = "git+https://github.com/nushell/reedline.git?branch=main#f949f560f7bdd446a9f0af33baaf7298d2f3853a" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "555a4285d183a94d140d749712a6600b10e70d7cd6aef91e3cfb65ba09b1d75e" dependencies = [ "chrono", "crossterm 0.24.0", diff --git a/Cargo.toml b/Cargo.toml index 149edb76f6..fa83653f19 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -52,7 +52,7 @@ nu-system = { path = "./crates/nu-system", version = "0.69.2" } nu-table = { path = "./crates/nu-table", version = "0.69.2" } nu-term-grid = { path = "./crates/nu-term-grid", version = "0.69.2" } nu-utils = { path = "./crates/nu-utils", version = "0.69.2" } -reedline = { version = "0.12.0", features = ["bashisms", "sqlite"]} +reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} rayon = "1.5.1" is_executable = "1.0.1" @@ -127,5 +127,7 @@ debug = false name = "nu" path = "src/main.rs" +# 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 [patch.crates-io] -reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } +# reedline = { git = "https://github.com/nushell/reedline.git", branch = "main" } diff --git a/crates/nu-cli/Cargo.toml b/crates/nu-cli/Cargo.toml index b0ff5a2de0..327a0029ee 100644 --- a/crates/nu-cli/Cargo.toml +++ b/crates/nu-cli/Cargo.toml @@ -20,7 +20,7 @@ nu-protocol = { path = "../nu-protocol", version = "0.69.2" } nu-utils = { path = "../nu-utils", version = "0.69.2" } nu-ansi-term = "0.46.0" nu-color-config = { path = "../nu-color-config", version = "0.69.2" } -reedline = { version = "0.12.0", features = ["bashisms", "sqlite"]} +reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} atty = "0.2.14" chrono = "0.4.21" diff --git a/crates/nu-command/Cargo.toml b/crates/nu-command/Cargo.toml index e64feea62a..849318bc1a 100644 --- a/crates/nu-command/Cargo.toml +++ b/crates/nu-command/Cargo.toml @@ -88,7 +88,7 @@ unicode-segmentation = "1.8.0" url = "2.2.1" uuid = { version = "1.1.2", features = ["v4"] } which = { version = "4.3.0", optional = true } -reedline = { version = "0.12.0", features = ["bashisms", "sqlite"]} +reedline = { version = "0.13.0", features = ["bashisms", "sqlite"]} wax = { version = "0.5.0", features = ["diagnostics"] } rusqlite = { version = "0.28.0", features = ["bundled"], optional = true } sqlparser = { version = "0.23.0", features = ["serde"], optional = true }