From 9c48bf9d1334c4cff70d00767a670926bac1d57e Mon Sep 17 00:00:00 2001 From: link2xt Date: Thu, 2 Mar 2023 10:43:29 +0000 Subject: [PATCH] Upgrade rustyline to 11.0.0 --- Cargo.lock | 16 +++++++++++----- deltachat-repl/Cargo.toml | 2 +- deltachat-repl/src/main.rs | 2 +- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 93981f9c7..7f05ae3e2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2275,14 +2275,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.25.1" +version = "0.26.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f346ff70e7dbfd675fe90590b92d59ef2de15a8779ae305ebcbfd3f0caf59be4" +checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a" dependencies = [ - "autocfg", "bitflags", "cfg-if", "libc", + "static_assertions", ] [[package]] @@ -3084,9 +3084,9 @@ checksum = "5583e89e108996506031660fe09baa5011b9dd0341b89029313006d1fb508d70" [[package]] name = "rustyline" -version = "10.1.1" +version = "11.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1e83c32c3f3c33b08496e0d1df9ea8c64d39adb8eb36a1ebb1440c690697aef" +checksum = "5dfc8644681285d1fb67a467fb3021bfea306b99b4146b166a1fe3ada965eece" dependencies = [ "bitflags", "cfg-if", @@ -3369,6 +3369,12 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" +[[package]] +name = "static_assertions" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" + [[package]] name = "stop-token" version = "0.7.0" diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index ed209d9af..da20cbb01 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -12,7 +12,7 @@ dirs = "4" log = "0.4.16" pretty_env_logger = "0.4" rusqlite = "0.28" -rustyline = "10" +rustyline = "11" tokio = { version = "1", features = ["fs", "rt-multi-thread", "macros"] } [features] diff --git a/deltachat-repl/src/main.rs b/deltachat-repl/src/main.rs index 3798b9364..4cd3412d2 100644 --- a/deltachat-repl/src/main.rs +++ b/deltachat-repl/src/main.rs @@ -350,7 +350,7 @@ async fn start(args: Vec) -> Result<(), Error> { match readline { Ok(line) => { // TODO: ignore "set mail_pw" - rl.add_history_entry(line.as_str()); + rl.add_history_entry(line.as_str())?; let contine = Handle::current().block_on(async { match handle_cmd(line.trim(), ctx.clone(), &mut selected_chat).await { Ok(ExitResult::Continue) => true,