feat: update dependencies

* feat: update dependencies

updates

- pgp
- async-std
- surf
- mailparse

* simplify dev deps

* more deps

* fixup

* fixup

Cargo.toml

@@ -12,7 +12,7 @@ lto = true
 deltachat_derive = { path = "./deltachat_derive" }
 
 libc = "0.2.51"
-pgp = { version = "0.6.0", default-features = false } 
+pgp = { version = "0.7.0", default-features = false } 
 hex = "0.4.0"
 sha2 = "0.9.0"
 rand = "0.7.0"
@@ -25,7 +25,7 @@ email = { git = "https://github.com/deltachat/rust-email", branch = "master" }
 lettre_email = { git = "https://github.com/deltachat/lettre", branch = "master" }
 async-imap = "0.4.0"
 async-native-tls = { version = "0.3.3" }
-async-std = { version = "1.6.1", features = ["unstable"] }
+async-std = { version = "1.6.4", features = ["unstable"] }
 base64 = "0.12"
 charset = "0.1"
 percent-encoding = "2.0"
@@ -36,11 +36,11 @@ indexmap = "1.3.0"
 kamadak-exif = "0.5"
 lazy_static = "1.4.0"
 regex = "1.1.6"
-rusqlite = { version = "0.23", features = ["bundled"] }
+rusqlite = { version = "0.24", features = ["bundled"] }
-r2d2_sqlite = "0.16.0"
+r2d2_sqlite = "0.17.0"
 r2d2 = "0.8.5"
-strum = "0.18.0"
+strum = "0.19.0"
-strum_macros = "0.18.0"
+strum_macros = "0.19.0"
 backtrace = "0.3.33"
 byteorder = "1.3.1"
 itertools = "0.9.0"
@@ -49,7 +49,7 @@ escaper = "0.1.0"
 bitflags = "1.1.0"
 sanitize-filename = "0.2.1"
 stop-token = { version = "0.1.1", features = ["unstable"] }
-mailparse = "0.12.1"
+mailparse = "0.13.0"
 encoded-words = { git = "https://github.com/async-email/encoded-words", branch="master" }
 native-tls = "0.2.3"
 image = { version = "0.23.5", default-features=false, features = ["gif", "jpeg", "ico", "png", "pnm", "webp", "bmp"] }
@@ -75,8 +75,8 @@ tempfile = "3.0"
 pretty_assertions = "0.6.1"
 pretty_env_logger = "0.4.0"
 proptest = "0.10"
-async-std = { version = "1.6.0", features = ["unstable", "attributes"] }
+async-std = { version = "1.6.4", features = ["unstable", "attributes"] }
-smol = "0.1.10"
+futures-lite = "1.7.0"
 criterion = "0.3"
 
 [workspace]

src/oauth2.rs

@@ -170,16 +170,14 @@ pub async fn dc_get_oauth2_access_token(
         }
 
         // ... and POST
-        let response = surf::post(post_url).body_form(&post_param);
+        let mut req = surf::post(post_url).build();
-        if response.is_err() {
+        if let Err(err) = req.body_form(&post_param) {
-            warn!(
+            warn!(context, "Error calling OAuth2 at {}: {:?}", token_url, err);
-                context,
-                "Error calling OAuth2 at {}: {:?}", token_url, response
-            );
             return None;
         }
 
-        let parsed: Result<Response, _> = response.unwrap().recv_json().await;
+        let client = surf::Client::new();
+        let parsed: Result<Response, _> = client.recv_json(req).await;
         if parsed.is_err() {
             warn!(
                 context,

src/pgp.rs

@@ -458,7 +458,7 @@ mod tests {
             let mut keyring = Keyring::new();
             keyring.add(KEYS.alice_public.clone());
             keyring.add(KEYS.bob_public.clone());
-            smol::block_on(pk_encrypt(CLEARTEXT, keyring, Some(KEYS.alice_secret.clone()))).unwrap()
+            futures_lite::future::block_on(pk_encrypt(CLEARTEXT, keyring, Some(KEYS.alice_secret.clone()))).unwrap()
         };
 
         /// A cyphertext encrypted to Alice & Bob, not signed.
@@ -466,7 +466,7 @@ mod tests {
             let mut keyring = Keyring::new();
             keyring.add(KEYS.alice_public.clone());
             keyring.add(KEYS.bob_public.clone());
-            smol::block_on(pk_encrypt(CLEARTEXT, keyring, None)).unwrap()
+            futures_lite::future::block_on(pk_encrypt(CLEARTEXT, keyring, None)).unwrap()
         };
     }