diff --git a/Cargo.lock b/Cargo.lock index 0b298351e..d675beb91 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2164,15 +2164,13 @@ dependencies = [ [[package]] name = "nix" -version = "0.23.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f866317acbd3a240710c63f065ffb1e4fd466259045ccb504130b7f668f35c6" +checksum = "195cdbc1741b8134346d515b3a56a1c94b0912758009cfd53f99ea0f57b065fc" dependencies = [ "bitflags", - "cc", "cfg-if", "libc", - "memoffset", ] [[package]] @@ -3015,9 +3013,9 @@ checksum = "a0a5f7c728f5d284929a1cccb5bc19884422bfe6ef4d6c409da2c41838983fcf" [[package]] name = "rustyline" -version = "9.1.2" +version = "10.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db7826789c0e25614b03e5a54a0717a86f9ff6e6e5247f92b369472869320039" +checksum = "1d1cd5ae51d3f7bf65d7969d579d502168ef578f289452bd8ccc91de28fda20e" dependencies = [ "bitflags", "cfg-if", @@ -3030,7 +3028,6 @@ dependencies = [ "nix", "radix_trie", "scopeguard", - "smallvec", "unicode-segmentation", "unicode-width", "utf8parse", diff --git a/Cargo.toml b/Cargo.toml index 7d44a3ba1..8ba45572d 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -57,7 +57,7 @@ rand = "0.8" regex = "1.6" rusqlite = { version = "0.27", features = ["sqlcipher"] } rust-hsluv = "0.1" -rustyline = { version = "9", optional = true } +rustyline = { version = "10", optional = true } sanitize-filename = "0.4" serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } diff --git a/examples/repl/main.rs b/examples/repl/main.rs index 1c35fe181..ffe1f20dd 100644 --- a/examples/repl/main.rs +++ b/examples/repl/main.rs @@ -23,7 +23,6 @@ use deltachat::securejoin::*; use deltachat::{EventType, Events}; use log::{error, info, warn}; use rustyline::completion::{Completer, FilenameCompleter, Pair}; -use rustyline::config::OutputStreamType; use rustyline::error::ReadlineError; use rustyline::highlight::{Highlighter, MatchingBracketHighlighter}; use rustyline::hint::{Hinter, HistoryHinter}; @@ -314,7 +313,6 @@ async fn start(args: Vec) -> Result<(), Error> { .history_ignore_space(true) .completion_type(CompletionType::List) .edit_mode(EditMode::Emacs) - .output_stream(OutputStreamType::Stdout) .build(); let mut selected_chat = ChatId::default(); @@ -325,7 +323,7 @@ async fn start(args: Vec) -> Result<(), Error> { highlighter: MatchingBracketHighlighter::new(), hinter: HistoryHinter {}, }; - let mut rl = Editor::with_config(config); + let mut rl = Editor::with_config(config)?; rl.set_helper(Some(h)); rl.bind_sequence(KeyEvent::alt('N'), Cmd::HistorySearchForward); rl.bind_sequence(KeyEvent::alt('P'), Cmd::HistorySearchBackward);