From b2fc7269161b49754a4c3c9f86d123640531561f Mon Sep 17 00:00:00 2001 From: ysthakur <45539777+ysthakur@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:22:18 -0400 Subject: [PATCH] Use reedline main again --- Cargo.lock | 6 +++--- Cargo.toml | 44 ++++++++++++++++++++++---------------------- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index f0d06e95c5..b677165d8b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3730,9 +3730,9 @@ dependencies = [ [[package]] name = "os_pipe" -version = "1.1.5" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "57119c3b893986491ec9aa85056780d3a0f3cf4da7cc09dd3650dbd6c6738fb9" +checksum = "29d73ba8daf8fac13b0501d1abeddcfe21ba7401ada61a819144b6c2a4f32209" dependencies = [ "libc", "windows-sys 0.52.0", @@ -4819,7 +4819,7 @@ dependencies = [ [[package]] name = "reedline" version = "0.32.0" -source = "git+https://github.com/ysthakur/reedline?branch=fuzzy-select-underline#a747c7110eb5113c347c99cd6f1ee09d2c4a0084" +source = "git+https://github.com/ysthakur/reedline?branch=fuzzy-select-underline#f66f07cdc6c1b6a464a81aad9b2d6e62f852be93" dependencies = [ "arboard", "chrono", diff --git a/Cargo.toml b/Cargo.toml index 235aaf7b54..7e5f436bbf 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ license = "MIT" name = "nu" repository = "https://github.com/nushell/nushell" rust-version = "1.77.2" -version = "0.93.1" +version = "0.94.3" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html @@ -118,7 +118,7 @@ num-traits = "0.2" omnipath = "0.1" once_cell = "1.18" open = "5.1" -os_pipe = { version = "1.1", features = ["io_safety"] } +os_pipe = { version = "1.2", features = ["io_safety"] } pathdiff = "0.2" percent-encoding = "2" pretty_assertions = "1.4" @@ -174,22 +174,22 @@ windows = "0.54" winreg = "0.52" [dependencies] -nu-cli = { path = "./crates/nu-cli", version = "0.93.1" } -nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.93.1" } -nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.93.1" } -nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.93.1", optional = true } -nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.93.1" } -nu-command = { path = "./crates/nu-command", version = "0.93.1" } -nu-engine = { path = "./crates/nu-engine", version = "0.93.1" } -nu-explore = { path = "./crates/nu-explore", version = "0.93.1" } -nu-lsp = { path = "./crates/nu-lsp/", version = "0.93.1" } -nu-parser = { path = "./crates/nu-parser", version = "0.93.1" } -nu-path = { path = "./crates/nu-path", version = "0.93.1" } -nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.93.1" } -nu-protocol = { path = "./crates/nu-protocol", version = "0.93.1" } -nu-std = { path = "./crates/nu-std", version = "0.93.1" } -nu-system = { path = "./crates/nu-system", version = "0.93.1" } -nu-utils = { path = "./crates/nu-utils", version = "0.93.1" } +nu-cli = { path = "./crates/nu-cli", version = "0.94.3" } +nu-cmd-base = { path = "./crates/nu-cmd-base", version = "0.94.3" } +nu-cmd-lang = { path = "./crates/nu-cmd-lang", version = "0.94.3" } +nu-cmd-plugin = { path = "./crates/nu-cmd-plugin", version = "0.94.3", optional = true } +nu-cmd-extra = { path = "./crates/nu-cmd-extra", version = "0.94.3" } +nu-command = { path = "./crates/nu-command", version = "0.94.3" } +nu-engine = { path = "./crates/nu-engine", version = "0.94.3" } +nu-explore = { path = "./crates/nu-explore", version = "0.94.3" } +nu-lsp = { path = "./crates/nu-lsp/", version = "0.94.3" } +nu-parser = { path = "./crates/nu-parser", version = "0.94.3" } +nu-path = { path = "./crates/nu-path", version = "0.94.3" } +nu-plugin-engine = { path = "./crates/nu-plugin-engine", optional = true, version = "0.94.3" } +nu-protocol = { path = "./crates/nu-protocol", version = "0.94.3" } +nu-std = { path = "./crates/nu-std", version = "0.94.3" } +nu-system = { path = "./crates/nu-system", version = "0.94.3" } +nu-utils = { path = "./crates/nu-utils", version = "0.94.3" } reedline = { workspace = true, features = ["bashisms", "sqlite"] } @@ -218,9 +218,9 @@ nix = { workspace = true, default-features = false, features = [ ] } [dev-dependencies] -nu-test-support = { path = "./crates/nu-test-support", version = "0.93.1" } -nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.93.1" } -nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.93.1" } +nu-test-support = { path = "./crates/nu-test-support", version = "0.94.3" } +nu-plugin-protocol = { path = "./crates/nu-plugin-protocol", version = "0.94.3" } +nu-plugin-core = { path = "./crates/nu-plugin-core", version = "0.94.3" } assert_cmd = "2.0" dirs-next = { workspace = true } tango-bench = "0.5" @@ -298,7 +298,7 @@ bench = false # 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/ysthakur/reedline", branch = "fuzzy-select-underline" } +# reedline = { git = "https://github.com/nushell/reedline", branch = "main" } # nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"} # Run all benchmarks with `cargo bench`