ref(logging): Remove message from LogExt::log_err (#4235)

This removes the message that needed to be supplied to LogExt::log_err
calls.  This was from a time before we adopted anyhow and now we are
better off using anyhow::Context::context for the message: it is more
consistent, composes better and is less custom.

The benefit of the composition can be seen in the FFI calls which need
to both log the error as well as return it to the caller via
the set_last_error mechanism.

It also removes the LogExt::ok_or_log_msg funcion for the same reason,
the message is obsoleted by anyhow's context.

src/configure.rs

@@ -156,7 +156,9 @@ async fn on_configure_completed(
                     Some(stock_str::aeap_explanation_and_link(context, &old_addr, &new_addr).await);
                 chat::add_device_msg(context, None, Some(&mut msg))
                     .await
-                    .ok_or_log_msg(context, "Cannot add AEAP explanation");
+                    .context("Cannot add AEAP explanation")
+                    .log_err(context)
+                    .ok();
             }
         }
     }

src/imap/scan_folders.rs

@@ -70,7 +70,9 @@ impl Imap {
                 loop {
                     self.fetch_move_delete(context, folder.name(), folder_meaning)
                         .await
-                        .ok_or_log_msg(context, "Can't fetch new msgs in scanned folder");
+                        .context("Can't fetch new msgs in scanned folder")
+                        .log_err(context)
+                        .ok();
 
                     let session = self.session.as_mut().context("no session")?;
                     // If the server sent an unsocicited EXISTS during the fetch, we need to fetch again
@@ -105,7 +107,11 @@ impl Imap {
         let list = session
             .list(Some(""), Some("*"))
             .await?
-            .filter_map(|f| async { f.ok_or_log_msg(context, "list_folders() can't get folder") });
+            .filter_map(|f| async {
+                f.context("list_folders() can't get folder")
+                    .log_err(context)
+                    .ok()
+            });
         Ok(list.collect().await)
     }
 }

src/log.rs

@@ -66,7 +66,7 @@ where
     Self: std::marker::Sized,
 {
     #[track_caller]
-    fn log_err_inner(self, context: &Context, msg: Option<&str>) -> Result<T, E>;
+    fn log_err_inner(self, context: &Context) -> Result<T, E>;
 
     /// Emits a warning if the receiver contains an Err value.
     ///
@@ -79,8 +79,8 @@ where
     /// like warn!(), since the file!() and line!() macros don't work with track_caller)  
     /// See <https://github.com/rust-lang/rust/issues/78840> for progress on this.
     #[track_caller]
-    fn log_err(self, context: &Context, msg: &str) -> Result<T, E> {
-        self.log_err_inner(context, Some(msg))
+    fn log_err(self, context: &Context) -> Result<T, E> {
+        self.log_err_inner(context)
     }
 
     /// Emits a warning if the receiver contains an Err value and returns an [`Option<T>`].
@@ -99,50 +99,21 @@ where
     /// For a note on the `track_caller` feature, see the doc comment on `log_err()`.
     #[track_caller]
     fn ok_or_log(self, context: &Context) -> Option<T> {
-        self.log_err_inner(context, None).ok()
-    }
-
-    /// Like `ok_or_log()`, but you can pass an extra message that is prepended in the log.
-    ///
-    /// Example:
-    /// ```text
-    /// if let Err(e) = do_something() {
-    ///     warn!(context, "Something went wrong: {:#}", e);
-    /// }
-    /// ```
-    /// is equivalent to:
-    /// ```text
-    /// do_something().ok_or_log_msg(context, "Something went wrong");
-    /// ```
-    /// and is also equivalent to:
-    /// ```text
-    /// use anyhow::Context as _;
-    /// do_something().context("Something went wrong").ok_or_log(context);
-    /// ```
-    ///
-    /// For a note on the `track_caller` feature, see the doc comment on `log_err()`.
-    #[track_caller]
-    fn ok_or_log_msg(self, context: &Context, msg: &'static str) -> Option<T> {
-        self.log_err_inner(context, Some(msg)).ok()
+        self.log_err_inner(context).ok()
     }
 }
 
 impl<T, E: std::fmt::Display> LogExt<T, E> for Result<T, E> {
     #[track_caller]
-    fn log_err_inner(self, context: &Context, msg: Option<&str>) -> Result<T, E> {
+    fn log_err_inner(self, context: &Context) -> Result<T, E> {
         if let Err(e) = &self {
             let location = std::panic::Location::caller();
 
-            let separator = if msg.is_none() { "" } else { ": " };
-            let msg = msg.unwrap_or_default();
-
             // We are using Anyhow's .context() and to show the inner error, too, we need the {:#}:
             let full = format!(
-                "{file}:{line}: {msg}{separator}{e:#}",
+                "{file}:{line}: {e:#}",
                 file = location.file(),
                 line = location.line(),
-                msg = msg,
-                separator = separator,
                 e = e
             );
             // We can't use the warn!() macro here as the file!() and line!() macros

src/receive_imf.rs

@@ -691,7 +691,8 @@ async fn add_parts(
             } else if allow_creation {
                 if let Ok(chat) = ChatIdBlocked::get_for_contact(context, from_id, create_blocked)
                     .await
-                    .log_err(context, "Failed to get (new) chat for contact")
+                    .context("Failed to get (new) chat for contact")
+                    .log_err(context)
                 {
                     chat_id = Some(chat.id);
                     chat_id_blocked = chat.blocked;
@@ -843,7 +844,8 @@ async fn add_parts(
             // maybe an Autocrypt Setup Message
             if let Ok(chat) = ChatIdBlocked::get_for_contact(context, ContactId::SELF, Blocked::Not)
                 .await
-                .log_err(context, "Failed to get (new) chat for contact")
+                .context("Failed to get (new) chat for contact")
+                .log_err(context)
             {
                 chat_id = Some(chat.id);
                 chat_id_blocked = chat.blocked;

src/sql.rs

@@ -757,7 +757,9 @@ pub async fn housekeeping(context: &Context) -> Result<()> {
             (),
         )
         .await
-        .ok_or_log_msg(context, "failed to remove old MDNs");
+        .context("failed to remove old MDNs")
+        .log_err(context)
+        .ok();
 
     info!(context, "Housekeeping done.");
     Ok(())