diff --git a/src/chat.rs b/src/chat.rs index 99769fbcf0..3ec12015a7 100644 --- a/src/chat.rs +++ b/src/chat.rs @@ -1857,7 +1857,6 @@ impl Chat { profile_image: self .get_profile_image(context) .await? - .map(Into::into) .unwrap_or_else(std::path::PathBuf::new), draft, is_muted: self.is_muted(), @@ -2571,7 +2570,6 @@ impl ChatIdBlocked { }, ) .await - .map_err(Into::into) } /// Returns the chat for the 1:1 chat with this contact. diff --git a/src/configure.rs b/src/configure.rs index 49c5fff2a5..1fd561fbc0 100644 --- a/src/configure.rs +++ b/src/configure.rs @@ -61,10 +61,7 @@ macro_rules! progress { impl Context { /// Checks if the context is already configured. pub async fn is_configured(&self) -> Result { - self.sql - .get_raw_config_bool("configured") - .await - .map_err(Into::into) + self.sql.get_raw_config_bool("configured").await } /// Configures this account with the currently set parameters. diff --git a/src/message.rs b/src/message.rs index 07e597955b..ed0afffa18 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1111,7 +1111,9 @@ impl Message { /// Updates message state from the vCard attachment. pub(crate) async fn try_set_vcard(&mut self, context: &Context, path: &Path) -> Result<()> { - let vcard = fs::read(path).await.context("Could not read {path}")?; + let vcard = fs::read(path) + .await + .with_context(|| format!("Could not read {path:?}"))?; if let Some(summary) = get_vcard_summary(&vcard) { self.param.set(Param::Summary1, summary); } else { diff --git a/src/peer_channels.rs b/src/peer_channels.rs index feccc73880..96be94562a 100644 --- a/src/peer_channels.rs +++ b/src/peer_channels.rs @@ -417,7 +417,6 @@ async fn get_iroh_gossip_peers(ctx: &Context, msg_id: MsgId) -> Result, _>>() - .map_err(Into::into) }, ) .await