Skip to content

Commit

Permalink
update to current reedline (#9877)
Browse files Browse the repository at this point in the history
# Description

This PR updates nushell to use the latest reedline. I swear that was the
only change I made. The other reordering stuff is by my vscode extension
I guess.

closes nushell/nushell#9123

# User-Facing Changes
<!-- List of all changes that impact the user experience here. This
helps us keep track of breaking changes. -->

# Tests + Formatting
<!--
Don't forget to add tests that cover your changes.

Make sure you've run and fixed any issues with these commands:

- `cargo fmt --all -- --check` to check standard code formatting (`cargo
fmt --all` applies these changes)
- `cargo clippy --workspace -- -D warnings -D clippy::unwrap_used -A
clippy::needless_collect -A clippy::result_large_err` to check that
you're using the standard code style
- `cargo test --workspace` to check that all tests pass
- `cargo run -- -c "use std testing; testing run-tests --path
crates/nu-std"` to run the tests for the standard library

> **Note**
> from `nushell` you can also use the `toolkit` as follows
> ```bash
> use toolkit.nu # or use an `env_change` hook to activate it
automatically
> toolkit check pr
> ```
-->

# After Submitting
<!-- If your PR had any user-facing changes, update [the
documentation](https://github.com/nushell/nushell.github.io) after the
PR is merged, if necessary. This will help us keep the docs up to date.
-->
  • Loading branch information
fdncred authored Aug 1, 2023
1 parent fea8227 commit 778a00e
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
3 changes: 1 addition & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 4 additions & 5 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,12 +69,11 @@ nu-utils = { path = "./crates/nu-utils", version = "0.83.2" }
nu-ansi-term = "0.49.0"
reedline = { version = "0.22.0", features = ["bashisms", "sqlite"]}

mimalloc = { version = "0.1.37", default-features = false, optional = true}

crossterm = "0.26"
ctrlc = "3.4"
log = "0.4"
miette = { version = "5.10", features = ["fancy-no-backtrace"] }
mimalloc = { version = "0.1.37", default-features = false, optional = true}
serde_json = "1.0"
simplelog = "0.12"
time = "0.3"
Expand All @@ -98,12 +97,12 @@ is-terminal = "0.4.8"

[dev-dependencies]
nu-test-support = { path = "./crates/nu-test-support", version = "0.83.2" }
tempfile = "3.7"
assert_cmd = "2.0"
criterion = "0.5"
pretty_assertions = "1.4"
serial_test = "2.0"
rstest = { version = "0.17", default-features = false }
serial_test = "2.0"
tempfile = "3.7"

[features]
plugin = [
Expand Down Expand Up @@ -165,7 +164,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.git", branch = "main"}
reedline = { git = "https://github.com/nushell/reedline.git", branch = "main"}
# nu-ansi-term = {git = "https://github.com/nushell/nu-ansi-term.git", branch = "main"}

# Criterion benchmarking setup
Expand Down

0 comments on commit 778a00e

Please sign in to comment.