diff --git a/Cargo.lock b/Cargo.lock index b01707711..a07c482b3 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -738,13 +738,11 @@ checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1" [[package]] name = "clipboard-win" -version = "4.5.0" +version = "5.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7191c27c2357d9b7ef96baac1773290d4ca63b24205b82a3fd8a0637afcf0362" +checksum = "c57002a5d9be777c1ef967e33674dac9ebd310d8893e4e3437b14d5f0f6372cc" dependencies = [ "error-code", - "str-buf", - "winapi", ] [[package]] @@ -1110,7 +1108,7 @@ dependencies = [ "encoded-words", "escaper", "fast-socks5", - "fd-lock 4.0.2", + "fd-lock", "format-flowed", "futures", "futures-lite", @@ -1777,13 +1775,9 @@ dependencies = [ [[package]] name = "error-code" -version = "2.3.1" +version = "3.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f18991e7bf11e7ffee451b5318b5c1a73c52d0d0ada6e5a3017c8c1ced6a21" -dependencies = [ - "libc", - "str-buf", -] +checksum = "281e452d3bad4005426416cdba5ccfd4f5c1280e10099e21db27f7c1c28347fc" [[package]] name = "escaper" @@ -1862,17 +1856,6 @@ version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" -[[package]] -name = "fd-lock" -version = "3.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef033ed5e9bad94e55838ca0ca906db0e043f517adda0c8b79c7a8c66c93c1b5" -dependencies = [ - "cfg-if", - "rustix", - "windows-sys 0.48.0", -] - [[package]] name = "fd-lock" version = "4.0.2" @@ -3005,11 +2988,11 @@ dependencies = [ [[package]] name = "nix" -version = "0.26.4" +version = "0.27.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "598beaf3cc6fdd9a5dfb1630c2800c7acd31df7aaf0f565796fba2b53ca1af1b" +checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.4.1", "cfg-if", "libc", ] @@ -4225,21 +4208,20 @@ checksum = "7ffc183a10b4478d04cbbbfc96d0873219d962dd5accaff2ffbd4ceb7df837f4" [[package]] name = "rustyline" -version = "12.0.0" +version = "13.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "994eca4bca05c87e86e15d90fc7a91d1be64b4482b38cb2d27474568fe7c9db9" +checksum = "02a2d683a4ac90aeef5b1013933f6d977bd37d51ff3f4dad829d4931a7e6be86" dependencies = [ "bitflags 2.4.1", "cfg-if", "clipboard-win", - "fd-lock 3.0.13", + "fd-lock", "home", "libc", "log", "memchr", "nix", "radix_trie", - "scopeguard", "unicode-segmentation", "unicode-width", "utf8parse", @@ -4690,12 +4672,6 @@ dependencies = [ "pin-project-lite", ] -[[package]] -name = "str-buf" -version = "1.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e08d8363704e6c71fc928674353e6b7c23dcea9d82d7012c8faf2a3a025f8d0" - [[package]] name = "strsim" version = "0.10.0" diff --git a/deltachat-repl/Cargo.toml b/deltachat-repl/Cargo.toml index f63443518..1c7de3b3c 100644 --- a/deltachat-repl/Cargo.toml +++ b/deltachat-repl/Cargo.toml @@ -12,7 +12,7 @@ dirs = "5" log = "0.4.20" pretty_env_logger = "0.5" rusqlite = "0.30" -rustyline = "12" +rustyline = "13" 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 17659b6ee..49d2b840e 100644 --- a/deltachat-repl/src/main.rs +++ b/deltachat-repl/src/main.rs @@ -299,8 +299,8 @@ impl Highlighter for DcHelper { self.highlighter.highlight(line, pos) } - fn highlight_char(&self, line: &str, pos: usize) -> bool { - self.highlighter.highlight_char(line, pos) + fn highlight_char(&self, line: &str, pos: usize, forced: bool) -> bool { + self.highlighter.highlight_char(line, pos, forced) } } diff --git a/deny.toml b/deny.toml index a2de59e71..ee800c2e9 100644 --- a/deny.toml +++ b/deny.toml @@ -33,7 +33,6 @@ skip = [ { name = "ed25519-dalek", version = "1.0.1" }, { name = "ed25519", version = "1.5.3" }, { name = "event-listener", version = "2.5.3" }, - { name = "fd-lock", version = "3.0.13" }, { name = "getrandom", version = "<0.2" }, { name = "h2", version = "0.3.22" }, { name = "http-body", version = "0.4.5" },