Skip to content

Commit

Permalink
fix: upgrade rustyline dependencies (#3476)
Browse files Browse the repository at this point in the history
Description
---
Upgrades `rustyline` dependencies from 6.0 to 9.0.

Motivation and Context
---
There is a security issue in the `nix` crate used by the `rustyline` crate: #3441


How Has This Been Tested?
---
Standard unit tests and CI for basic compatibility checking.
And manual testing for checking the new version of `rustline` has no issues in a terminal.
  • Loading branch information
therustmonk authored Oct 19, 2021
1 parent 75277ff commit a05ac5e
Show file tree
Hide file tree
Showing 4 changed files with 70 additions and 14 deletions.
76 changes: 65 additions & 11 deletions Cargo.lock

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

4 changes: 2 additions & 2 deletions applications/tari_base_node/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ futures = { version = "^0.3.16", default-features = false, features = ["alloc"]
log = { version = "0.4.8", features = ["std"] }
num_cpus = "1"
regex = "1"
rustyline = "6.0"
rustyline-derive = "0.3"
rustyline = "9.0"
rustyline-derive = "0.5"
strum = "^0.19"
strum_macros = "0.18.0"
thiserror = "^1.0.26"
Expand Down
2 changes: 2 additions & 0 deletions applications/tari_base_node/src/parser.rs
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,8 @@ impl Completer for Parser {

/// This allows us to make hints based on historic inputs
impl Hinter for Parser {
type Hint = String;

fn hint(&self, line: &str, pos: usize, ctx: &rustyline::Context<'_>) -> Option<String> {
self.hinter.hint(line, pos, ctx)
}
Expand Down
2 changes: 1 addition & 1 deletion applications/tari_console_wallet/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ log = { version = "0.4.8", features = ["std"] }
qrcode = { version = "0.12" }
regex = "1.5.4"
rpassword = "5.0"
rustyline = "6.0"
rustyline = "9.0"
strum = "^0.19"
strum_macros = "^0.19"
tokio = { version = "1.11", features = ["signal"] }
Expand Down

0 comments on commit a05ac5e

Please sign in to comment.