From 81bacf9038b26cc746501a47e27af6c808654618 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 02:32:35 +0000 Subject: [PATCH 1/5] cargo: bump human-panic from 1.1.0 to 1.1.1 Bumps [human-panic](https://github.com/rust-cli/human-panic) from 1.1.0 to 1.1.1. - [Release notes](https://github.com/rust-cli/human-panic/releases) - [Changelog](https://github.com/rust-cli/human-panic/blob/master/CHANGELOG.md) - [Commits](https://github.com/rust-cli/human-panic/compare/v1.1.0...v1.1.1) --- updated-dependencies: - dependency-name: human-panic dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- Cargo.lock | 27 +++++++++------------------ 1 file changed, 9 insertions(+), 18 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79224d433..1291fb2c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -577,9 +577,9 @@ checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" [[package]] name = "concolor" -version = "0.0.11" +version = "0.0.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "318d6c16e73b3a900eb212ad6a82fc7d298c5ab8184c7a9998646455bc474a16" +checksum = "f7b3e3c41e9488eeda196b6806dbf487742107d61b2e16485bcca6c25ed5755b" dependencies = [ "bitflags", "concolor-query", @@ -952,7 +952,7 @@ dependencies = [ "tokio-io-timeout", "tokio-stream", "tokio-tar", - "toml 0.7.2", + "toml", "trust-dns-resolver", "url", "uuid 1.3.0", @@ -1769,9 +1769,9 @@ checksum = "c4a1e36c821dbe04574f602848a19f742f4fb3c98d40449f11bcad18d6b17421" [[package]] name = "human-panic" -version = "1.1.0" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87eb03e654582b31967d414b86711a7bbd7c6b28a6b7d32857b7d1d45c0926f9" +checksum = "86d13dc3bae03e53a5e81a3944773631df2c5a33c060e195c1f7bf3fd0d2a696" dependencies = [ "backtrace", "concolor", @@ -1779,8 +1779,8 @@ dependencies = [ "serde", "serde_derive", "termcolor", - "toml 0.5.11", - "uuid 0.8.2", + "toml", + "uuid 1.3.0", ] [[package]] @@ -2458,9 +2458,9 @@ dependencies = [ [[package]] name = "os_info" -version = "2.0.8" +version = "3.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc1b4330bb29087e791ae2a5cf56be64fb8946a4ff5aec2ba11c6ca51f5d60" +checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" dependencies = [ "log", "serde", @@ -3633,15 +3633,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "toml" -version = "0.5.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" -dependencies = [ - "serde", -] - [[package]] name = "toml" version = "0.7.2" From e866053070f4f78256dfad26cad5d4aa0efa7ddc Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 2 Mar 2023 02:32:53 +0000 Subject: [PATCH 2/5] cargo: bump async-native-tls from 0.4.0 to 0.5.0 Bumps [async-native-tls](https://github.com/async-email/async-native-tls) from 0.4.0 to 0.5.0. - [Release notes](https://github.com/async-email/async-native-tls/releases) - [Commits](https://github.com/async-email/async-native-tls/compare/v0.4.0...v0.5.0) --- updated-dependencies: - dependency-name: async-native-tls dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- Cargo.lock | 16 ++++++++++++++-- Cargo.toml | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 79224d433..253328d21 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -126,7 +126,7 @@ version = "0.6.0" source = "git+https://github.com/async-email/async-imap?branch=master#90270474a5a494669e7c63c13471d189afdc98ae" dependencies = [ "async-channel", - "async-native-tls", + "async-native-tls 0.4.0", "base64 0.13.1", "byte-pool", "chrono", @@ -163,6 +163,18 @@ dependencies = [ "url", ] +[[package]] +name = "async-native-tls" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9343dc5acf07e79ff82d0c37899f079db3534d99f189a1837c8e549c99405bec" +dependencies = [ + "native-tls", + "thiserror", + "tokio", + "url", +] + [[package]] name = "async-smtp" version = "0.8.0" @@ -895,7 +907,7 @@ dependencies = [ "anyhow", "async-channel", "async-imap", - "async-native-tls", + "async-native-tls 0.5.0", "async-smtp", "async_zip", "backtrace", diff --git a/Cargo.toml b/Cargo.toml index 4378fae09..b6a2fa267 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -31,7 +31,7 @@ ratelimit = { path = "./deltachat-ratelimit" } anyhow = "1" async-channel = "1.8.0" async-imap = { git = "https://github.com/async-email/async-imap", branch = "master", default-features = false, features = ["runtime-tokio"] } -async-native-tls = { version = "0.4", default-features = false, features = ["runtime-tokio"] } +async-native-tls = { version = "0.5", default-features = false, features = ["runtime-tokio"] } async-smtp = { version = "0.8", default-features = false, features = ["runtime-tokio"] } async_zip = { version = "0.0.9", default-features = false, features = ["deflate"] } backtrace = "0.3" From 9c48bf9d1334c4cff70d00767a670926bac1d57e Mon Sep 17 00:00:00 2001 From: link2xt Date: Thu, 2 Mar 2023 10:43:29 +0000 Subject: [PATCH 3/5] 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, From 3453aac27e42a851512355082d2c53bab53d5f60 Mon Sep 17 00:00:00 2001 From: Simon Laux Date: Thu, 2 Mar 2023 13:57:17 +0100 Subject: [PATCH 4/5] jsonrpc: ts bindings: update .npmignore (#4119) to remove files from the npm package that is not needed by end users. #ignore-changelog --- deltachat-jsonrpc/typescript/.npmignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/deltachat-jsonrpc/typescript/.npmignore b/deltachat-jsonrpc/typescript/.npmignore index 3d8ebf962..5c7ed502e 100644 --- a/deltachat-jsonrpc/typescript/.npmignore +++ b/deltachat-jsonrpc/typescript/.npmignore @@ -4,3 +4,9 @@ docs coverage yarn* package-lock.json +.prettierignore +example.html +report_api_coverage.mjs +scripts +dist/example +dist/test \ No newline at end of file From f5c334a1e4ac648fcb4b6220c741675de16e91f7 Mon Sep 17 00:00:00 2001 From: Floris Bruynooghe Date: Thu, 2 Mar 2023 11:56:11 +0100 Subject: [PATCH 5/5] ci: Make sure clippy script check everything Also disable missing_docs_in_private_items as this is like 300+ errors currently. --- deltachat-ffi/src/lib.rs | 2 +- scripts/clippy.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/deltachat-ffi/src/lib.rs b/deltachat-ffi/src/lib.rs index 1aa22fb92..48f4d9808 100644 --- a/deltachat-ffi/src/lib.rs +++ b/deltachat-ffi/src/lib.rs @@ -1,4 +1,4 @@ -#![warn(unused, clippy::all, clippy::missing_docs_in_private_items)] +#![warn(unused, clippy::all)] #![allow( non_camel_case_types, non_snake_case, diff --git a/scripts/clippy.sh b/scripts/clippy.sh index d9cfcd5de..f462c4651 100755 --- a/scripts/clippy.sh +++ b/scripts/clippy.sh @@ -1,3 +1,3 @@ #!/bin/sh # Run clippy for all Rust code in the project. -cargo clippy --workspace --tests --examples --benches -- -D warnings +cargo clippy --workspace --all-targets -- -D warnings