diff --git a/crates/arti-client/src/client.rs b/crates/arti-client/src/client.rs
index a550b8e1f..99d523d0e 100644
--- a/crates/arti-client/src/client.rs
+++ b/crates/arti-client/src/client.rs
@@ -1023,8 +1023,8 @@ impl<R: Runtime> TorClient<R> {
 
                 if let Some(keymgr) = &self.keymgr {
                     // TODO hs: use a real client id (loaded from the config)
-                    let client_id = HsClientSpecifier::new("default".into())
-                        .map_err(|e| ErrorDetail::Keystore(e))?;
+                    let client_id =
+                        HsClientSpecifier::new("default".into()).map_err(ErrorDetail::Keystore)?;
                     let desc_enc_key_spec = HsClientSecretKeySpecifier::new(
                         client_id.clone(),
                         hsid,
diff --git a/crates/arti/src/cfg.rs b/crates/arti/src/cfg.rs
index d6d10b606..dd2c9639a 100644
--- a/crates/arti/src/cfg.rs
+++ b/crates/arti/src/cfg.rs
@@ -289,6 +289,7 @@ mod test {
     use itertools::{chain, EitherOrBoth, Itertools};
     use regex::Regex;
     use std::collections::HashSet;
+    use std::fmt::Write as _;
     use std::iter;
     use std::time::Duration;
     use tor_config::load::{ConfigResolveError, ResolutionResults};
@@ -639,10 +640,10 @@ mod test {
                 .collect_vec();
 
             if !reports.is_empty() {
-                let reports = reports
-                    .iter()
-                    .map(|(k, s)| format!("  {}: {}\n", s, k))
-                    .collect::<String>();
+                let reports = reports.iter().fold(String::new(), |mut out, (k, s)| {
+                    writeln!(out, "  {}: {}", s, k).unwrap();
+                    out
+                });
 
                 panic!(
                     r"
diff --git a/crates/tor-chanmgr/src/factory.rs b/crates/tor-chanmgr/src/factory.rs
index 824b59de5..474717a6d 100644
--- a/crates/tor-chanmgr/src/factory.rs
+++ b/crates/tor-chanmgr/src/factory.rs
@@ -160,7 +160,7 @@ impl ChannelFactory for CompoundFactory {
                 Some(mgr) => mgr
                     .factory_for_transport(a.transport())
                     .await
-                    .map_err(|e| crate::Error::Pt(e))?
+                    .map_err(crate::Error::Pt)?
                     .ok_or_else(|| crate::Error::NoSuchTransport(a.transport().clone().into()))?,
                 None => return Err(crate::Error::NoSuchTransport(a.transport().clone().into())),
             },