Skip to content

Commit 64da710

Browse files
leftwoleftwo
authored
Various clippy fixes (#1071)
1 parent 8a6aef5 commit 64da710

File tree

15 files changed

+54
-76
lines changed

15 files changed

+54
-76
lines changed

‎agent/src/datafile.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl DataFile {
246246
if let Some(r) = inner
247247
.running_snapshots
248248
.entry(request.id.clone())
249-
.or_insert_with(BTreeMap::default)
249+
.or_default()
250250
.get(&request.name)
251251
{
252252
return Ok(r.clone());

‎crudd/src/main.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -566,8 +566,7 @@ async fn main() -> Result<()> {
566566
let guest = Arc::new(Guest::new());
567567

568568
let _join_handle =
569-
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)
570-
.await?;
569+
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)?;
571570
eprintln!("Crucible runtime is spawned");
572571

573572
// IO time

‎crutest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -699,7 +699,7 @@ async fn main() -> Result<()> {
699699
}
700700

701701
let _join_handle =
702-
up_main(crucible_opts, opt.gen, None, guest.clone(), pr, None).await?;
702+
up_main(crucible_opts, opt.gen, None, guest.clone(), pr, None)?;
703703
println!("Crucible runtime is spawned");
704704

705705
if let Workload::CliServer { listen, port } = opt.workload {

‎downstairs/src/region.rs

+6-7
Original file line numberDiff line numberDiff line change
@@ -722,9 +722,8 @@ impl Region {
722722
HashMap::new();
723723

724724
for write in writes {
725-
let extent_vec = batched_writes
726-
.entry(write.eid as usize)
727-
.or_insert_with(Vec::new);
725+
let extent_vec =
726+
batched_writes.entry(write.eid as usize).or_default();
728727
extent_vec.push(write);
729728
}
730729

@@ -4183,7 +4182,7 @@ pub(crate) mod test {
41834182
let (_dir, mut region, mut data) = prepare_random_region().await?;
41844183

41854184
// Call region_write with a multiple disjoint large contiguous ranges
4186-
let writes = vec![
4185+
let writes = [
41874186
prepare_writes(1..4, &mut data),
41884187
prepare_writes(15..24, &mut data),
41894188
prepare_writes(27..28, &mut data),
@@ -4202,7 +4201,7 @@ pub(crate) mod test {
42024201
let (_dir, mut region, mut data) = prepare_random_region().await?;
42034202

42044203
// Call region_write with a multiple disjoint non-contiguous ranges
4205-
let writes = vec![
4204+
let writes = [
42064205
prepare_writes(0..1, &mut data),
42074206
prepare_writes(14..15, &mut data),
42084207
prepare_writes(19..20, &mut data),
@@ -4282,7 +4281,7 @@ pub(crate) mod test {
42824281
let mut data: Vec<u8> = vec![0; region.def().total_size() as usize];
42834282

42844283
// Call region_write with a multiple disjoint large contiguous ranges
4285-
let writes = vec![
4284+
let writes = [
42864285
prepare_writes(1..4, &mut data),
42874286
prepare_writes(15..24, &mut data),
42884287
prepare_writes(27..28, &mut data),
@@ -4312,7 +4311,7 @@ pub(crate) mod test {
43124311
let mut data: Vec<u8> = vec![0; region.def().total_size() as usize];
43134312

43144313
// Call region_write with a multiple disjoint non-contiguous ranges
4315-
let writes = vec![
4314+
let writes = [
43164315
prepare_writes(0..1, &mut data),
43174316
prepare_writes(14..15, &mut data),
43184317
prepare_writes(19..20, &mut data),

‎dsc/src/main.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ async fn region_create_test(
12641264
// an option to the test to allow it from the command line.
12651265
// Since the larger sizes can currently take minutes/hours, those
12661266
// are commented out as well.
1267-
let region_size = vec![
1267+
let region_size = [
12681268
1024 * 1024 * 1024, // 1 GiB
12691269
1024 * 1024 * 1024 * 10, // 10 GiB
12701270
1024 * 1024 * 1024 * 100, // 100 GiB
@@ -1277,7 +1277,7 @@ async fn region_create_test(
12771277
// The list of blocks per extent file, in crucible: extent_size
12781278
// XXX This is again some self selected interesting values. Expect
12791279
// these to change as we learn more.
1280-
let extent_size = vec![4096, 8192, 16384, 32768];
1280+
let extent_size = [4096, 8192, 16384, 32768];
12811281

12821282
// This header is the same for both the regular and the long test.
12831283
print!(

‎hammer/src/main.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ async fn main() -> Result<()> {
140140
guest.clone(),
141141
None,
142142
None,
143-
)
144-
.await?;
143+
)?;
145144
println!("Crucible runtime is spawned");
146145

147146
cpfs.push(crucible::CruciblePseudoFile::from(guest)?);

‎integration_tests/src/lib.rs

+13-15
Original file line numberDiff line numberDiff line change
@@ -3071,7 +3071,7 @@ mod test {
30713071
let guest = Arc::new(Guest::new());
30723072
let gc = guest.clone();
30733073

3074-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3074+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
30753075

30763076
guest.activate().await?;
30773077
guest.query_work_queue().await?;
@@ -3115,7 +3115,7 @@ mod test {
31153115
let guest = Arc::new(Guest::new());
31163116
let gc = guest.clone();
31173117

3118-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3118+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
31193119

31203120
guest.activate().await?;
31213121
guest.query_work_queue().await?;
@@ -3150,7 +3150,7 @@ mod test {
31503150
let guest = Arc::new(Guest::new());
31513151
let gc = guest.clone();
31523152
let log = csl();
3153-
let _jh = up_main(opts, 1, None, gc, None, Some(log.clone())).await?;
3153+
let _jh = up_main(opts, 1, None, gc, None, Some(log.clone()))?;
31543154

31553155
guest.activate().await?;
31563156

@@ -3226,7 +3226,7 @@ mod test {
32263226
let gc = guest.clone();
32273227

32283228
// Read-only Upstairs should return errors if writes are attempted.
3229-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3229+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
32303230

32313231
guest.activate().await?;
32323232

@@ -3258,7 +3258,7 @@ mod test {
32583258
let guest = Arc::new(Guest::new());
32593259
let gc = guest.clone();
32603260
let log = csl();
3261-
let _jh = up_main(opts, 1, None, gc, None, Some(log.clone())).await?;
3261+
let _jh = up_main(opts, 1, None, gc, None, Some(log.clone()))?;
32623262

32633263
guest.activate().await?;
32643264

@@ -3306,7 +3306,7 @@ mod test {
33063306
let guest = Arc::new(Guest::new());
33073307
let gc = guest.clone();
33083308

3309-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3309+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
33103310

33113311
guest.activate().await?;
33123312
guest.query_work_queue().await?;
@@ -3379,7 +3379,7 @@ mod test {
33793379
let guest = Arc::new(Guest::new());
33803380
let gc = guest.clone();
33813381

3382-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3382+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
33833383

33843384
guest.activate().await?;
33853385
guest.query_work_queue().await?;
@@ -3437,7 +3437,7 @@ mod test {
34373437
let guest = Arc::new(Guest::new());
34383438
let gc = guest.clone();
34393439

3440-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3440+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
34413441

34423442
guest.activate().await?;
34433443
guest.query_work_queue().await?;
@@ -3496,7 +3496,7 @@ mod test {
34963496
let guest = Arc::new(Guest::new());
34973497
let gc = guest.clone();
34983498

3499-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3499+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
35003500

35013501
guest.activate().await?;
35023502
guest.query_work_queue().await?;
@@ -3553,7 +3553,7 @@ mod test {
35533553
let guest = Arc::new(Guest::new());
35543554
let gc = guest.clone();
35553555

3556-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3556+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
35573557

35583558
guest.activate().await?;
35593559
guest.query_work_queue().await?;
@@ -3610,7 +3610,7 @@ mod test {
36103610
let guest = Arc::new(Guest::new());
36113611
let gc = guest.clone();
36123612

3613-
let _join_handle = up_main(opts, 1, None, gc, None, None).await?;
3613+
let _join_handle = up_main(opts, 1, None, gc, None, None)?;
36143614

36153615
guest.activate().await?;
36163616
guest.query_work_queue().await?;
@@ -3665,8 +3665,7 @@ mod test {
36653665
let guest = Arc::new(Guest::new());
36663666
let gc = guest.clone();
36673667

3668-
let _join_handle =
3669-
up_main(opts, 1, None, gc, None, None).await.unwrap();
3668+
let _join_handle = up_main(opts, 1, None, gc, None, None).unwrap();
36703669

36713670
guest.activate().await.unwrap();
36723671

@@ -3702,8 +3701,7 @@ mod test {
37023701
let guest = Arc::new(Guest::new());
37033702
let gc = guest.clone();
37043703

3705-
let _join_handle =
3706-
up_main(opts, 1, None, gc, None, None).await.unwrap();
3704+
let _join_handle = up_main(opts, 1, None, gc, None, None).unwrap();
37073705

37083706
guest.activate().await.unwrap();
37093707

‎measure_iops/src/main.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,7 @@ async fn main() -> Result<()> {
113113

114114
let guest = Arc::new(guest);
115115
let _join_handle =
116-
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)
117-
.await?;
116+
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)?;
118117
println!("Crucible runtime is spawned");
119118

120119
guest.activate().await?;

‎nbd_server/src/main.rs

+1-2
Original file line numberDiff line numberDiff line change
@@ -94,8 +94,7 @@ async fn main() -> Result<()> {
9494
let guest = Arc::new(Guest::new());
9595

9696
let _join_handle =
97-
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)
98-
.await?;
97+
up_main(crucible_opts, opt.gen, None, guest.clone(), None, None)?;
9998
println!("Crucible runtime is spawned");
10099

101100
// NBD server

‎upstairs/src/active_jobs.rs

+3-5
Original file line numberDiff line numberDiff line change
@@ -368,7 +368,7 @@ impl BlockMap {
368368
/// If such a range exists, returns its starting address (i.e. the key to
369369
/// look it up in [`self.addr_to_jobs`].
370370
fn find_split_location(&self, i: ImpactedAddr) -> Option<ImpactedAddr> {
371-
match self.addr_to_jobs.range(..i).rev().next() {
371+
match self.addr_to_jobs.range(..i).next_back() {
372372
Some((start, (end, _))) if i < *end => Some(*start),
373373
_ => None,
374374
}
@@ -381,8 +381,7 @@ impl BlockMap {
381381
let Some(mut pos) = self
382382
.addr_to_jobs
383383
.range(..r.start)
384-
.rev()
385-
.next()
384+
.next_back()
386385
.map(|(start, _)| *start)
387386
.or_else(|| self.addr_to_jobs.first_key_value().map(|(k, _)| *k))
388387
else {
@@ -432,8 +431,7 @@ impl BlockMap {
432431
let start = self
433432
.addr_to_jobs
434433
.range(..=r.start)
435-
.rev()
436-
.next()
434+
.next_back()
437435
.map(|(start, _)| *start)
438436
.unwrap_or(r.start);
439437
self.addr_to_jobs

0 commit comments

Comments
 (0)