Bump reedline to dev (and strum) (#12150)

Resolve version duplication around `strum(_macros)`

- Pull recent reedline (`strum` update)
- Update `strum` in `nu-protocol`
This commit is contained in:
Stefan Holderbach 2024-03-10 20:31:54 +01:00 committed by GitHub
parent 3a983bb5db
commit 27edef4874
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 7 deletions

9
Cargo.lock generated
View file

@ -3103,7 +3103,7 @@ dependencies = [
"rstest",
"serde",
"serde_json",
"strum 0.25.0",
"strum 0.26.1",
"strum_macros 0.26.1",
"thiserror",
"typetag",
@ -4520,8 +4520,7 @@ dependencies = [
[[package]]
name = "reedline"
version = "0.30.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "413a9fa6a5d8c937d3ae1e975bfb6a918bb0b6cdfae6a10416218c837a31b8fc"
source = "git+https://github.com/nushell/reedline?branch=main#0698712701418a7212ebf75d5724d72eccc4b43f"
dependencies = [
"arboard",
"chrono",
@ -4533,8 +4532,8 @@ dependencies = [
"serde",
"serde_json",
"strip-ansi-escapes",
"strum 0.25.0",
"strum_macros 0.25.3",
"strum 0.26.1",
"strum_macros 0.26.1",
"thiserror",
"unicode-segmentation",
"unicode-width",

View file

@ -197,7 +197,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/nushell/reedline", branch = "main" }
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`

View file

@ -35,7 +35,7 @@ plugin = ["serde_json"]
[dev-dependencies]
serde_json = { workspace = true }
strum = "0.25"
strum = "0.26"
strum_macros = "0.26"
nu-test-support = { path = "../nu-test-support", version = "0.91.1" }
rstest = { workspace = true }