Skip to content

Commit 6b4f2bf

Browse files
committed
chore: clippy & typos
1 parent 42953f5 commit 6b4f2bf

File tree

2 files changed

+10
-8
lines changed

2 files changed

+10
-8
lines changed

iroh-willow/src/session/reconciler.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ impl Target {
547547
self.mark_our_next_range_pending();
548548
}
549549

550-
// If we know for sure that our range is empty, we can skip creating the entry iterator alltogether.
550+
// If we know for sure that our range is empty, we can skip creating the entry iterator.
551551
let mut iter = if is_empty {
552552
None
553553
} else {

iroh/tests/spaces.rs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ use iroh_willow::{
2121
use proptest::{collection::vec, prelude::Strategy, sample::select};
2222
use test_strategy::proptest;
2323
use testresult::TestResult;
24-
use tracing::info;
24+
use tracing::{error, info};
2525

2626
/// Spawn an iroh node in a separate thread and tokio runtime, and return
2727
/// the address and client.
@@ -82,7 +82,7 @@ fn test_get_many_weird_result(
8282
) {
8383
iroh_test::logging::setup_multithreaded();
8484

85-
tokio::runtime::Builder::new_current_thread()
85+
let res = tokio::runtime::Builder::new_current_thread()
8686
.enable_all()
8787
.build()
8888
.unwrap()
@@ -147,7 +147,7 @@ fn test_get_many_weird_result(
147147

148148
// We sync in both directions. This will only create a single session under the hood.
149149
// Awaiting both intents ensures that the sync completed on both sides.
150-
// Alernatively, we could sync from one side only, the result must be the same, however we miss
150+
// Alternatively, we could sync from one side only, the result must be the same, however we miss
151151
// an event in the client currently to know when the betty peer (accepting peer) has finished.
152152
let fut_x = async {
153153
space_x
@@ -166,7 +166,7 @@ fn test_get_many_weird_result(
166166
anyhow::Ok(())
167167
};
168168
let fut = async { tokio::try_join!(fut_x, fut_y) };
169-
tokio::time::timeout(Duration::from_secs(5), fut).await??;
169+
tokio::time::timeout(Duration::from_secs(10), fut).await??;
170170

171171
info!("[{i}/{count}] sync complete");
172172

@@ -197,8 +197,11 @@ fn test_get_many_weird_result(
197197
tokio::try_join!(iroh_x.shutdown(false), iroh_y.shutdown(false))?;
198198

199199
Ok(())
200-
})
201-
.map_err(AnyhowStdErr)?;
200+
});
201+
if let Err(err) = &res {
202+
error!(?err, "FAILED");
203+
}
204+
res.map_err(AnyhowStdErr)?;
202205
}
203206

204207
async fn space_to_map(
@@ -240,7 +243,6 @@ struct AnyhowStdErr(anyhow::Error);
240243

241244
impl std::fmt::Display for AnyhowStdErr {
242245
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
243-
println!("FAIL: {self:?}");
244246
self.0.fmt(f)
245247
}
246248
}

0 commit comments

Comments
 (0)