Get rid of unnecessary "async move" and ".await"

CHANGELOG.md

@@ -1,11 +1,5 @@
 # Changelog 
 
-## 1.0.0-beta.19
-
-- #1058 timeout smtp-send if it doesn't complete in 15 minutes 
-
-- #1059 trim down logging
-
 ## 1.0.0-beta.18
 
 - #1056 avoid panicking when we couldn't read imap-server's greeting

Cargo.lock

@@ -657,7 +657,7 @@ dependencies = [
 
 [[package]]
 name = "deltachat"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.18"
 dependencies = [
  "async-imap 0.1.1 (git+https://github.com/async-email/async-imap?branch=dcc-stable)",
  "async-native-tls 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
@@ -734,9 +734,9 @@ dependencies = [
 
 [[package]]
 name = "deltachat_ffi"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.18"
 dependencies = [
- "deltachat 1.0.0-beta.19",
+ "deltachat 1.0.0-beta.18",
  "deltachat-provider-database 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
  "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
  "human-panic 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)",

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.18"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"
 license = "MPL"

deltachat-ffi/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deltachat_ffi"
-version = "1.0.0-beta.19"
+version = "1.0.0-beta.18"
 description = "Deltachat FFI"
 authors = ["Delta Chat Developers (ML) <delta@codespeak.net>"]
 edition = "2018"

src/dc_receive_imf.rs

@@ -1546,6 +1546,10 @@ fn dc_add_or_lookup_contacts_by_address_list(
         }
     };
 
+    info!(
+        context,
+        "dc_add_or_lookup_contacts_by_address raw={:?} addrs={:?}", addr_list_raw, addrs
+    );
     for addr in addrs.iter() {
         match addr {
             mailparse::MailAddr::Single(info) => {
@@ -1587,6 +1591,10 @@ fn add_or_lookup_contact_by_addr(
         .map(normalize_name)
         .unwrap_or_default();
 
+    info!(
+        context,
+        "looking up addr={:?} display_name={:?}", addr, display_name_normalized
+    );
     let (row_id, _modified) =
         Contact::add_or_lookup(context, display_name_normalized, addr, origin)?;
     ensure!(row_id > 0, "could not add contact: {:?}", addr);

src/log.rs

@@ -8,8 +8,9 @@ macro_rules! info {
     ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
         let formatted = format!($msg, $($args),*);
         let thread = ::std::thread::current();
-        let full = format!("{thid:?} {file}:{line}: {msg}",
+        let full = format!("{thid:?}/{thname} {file}:{line}: {msg}",
                            thid = thread.id(),
+                           thname = thread.name().unwrap_or("unnamed"),
                            file = file!(),
                            line = line!(),
                            msg = &formatted);
@@ -25,8 +26,9 @@ macro_rules! warn {
     ($ctx:expr, $msg:expr, $($args:expr),* $(,)?) => {{
         let formatted = format!($msg, $($args),*);
         let thread = ::std::thread::current();
-        let full = format!("{thid:?} {file}:{line}: {msg}",
+        let full = format!("{thid:?}/{thname} {file}:{line}: {msg}",
                            thid = thread.id(),
+                           thname = thread.name().unwrap_or("unnamed"),
                            file = file!(),
                            line = line!(),
                            msg = &formatted);