Skip to content

Commit f955b98

Browse files
committed
PR Feedback; use .unwrap() for the Ok path and update comment
1 parent 674ebd1 commit f955b98

File tree

1 file changed

+20
-29
lines changed

1 file changed

+20
-29
lines changed

database/src/pool.rs

Lines changed: 20 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ pub trait Connection: Send + Sync {
181181
async fn purge_artifact(&self, aid: &ArtifactId);
182182

183183
/// Add an item to the `benchmark_requests`, if the `benchmark_request`
184-
/// exists it will be ignored
184+
/// exists an Error will be returned
185185
async fn insert_benchmark_request(
186186
&self,
187187
benchmark_request: &BenchmarkRequest,
@@ -439,18 +439,15 @@ mod tests {
439439
);
440440

441441
let db = db.connection().await;
442-
assert!(db
443-
.insert_benchmark_request(&master_benchmark_request)
442+
db.insert_benchmark_request(&master_benchmark_request)
444443
.await
445-
.is_ok());
446-
assert!(db
447-
.insert_benchmark_request(&try_benchmark_request)
444+
.unwrap();
445+
db.insert_benchmark_request(&try_benchmark_request)
448446
.await
449-
.is_ok());
450-
assert!(db
451-
.insert_benchmark_request(&release_benchmark_request)
447+
.unwrap();
448+
db.insert_benchmark_request(&release_benchmark_request)
452449
.await
453-
.is_ok());
450+
.unwrap();
454451
// duplicate insert
455452
assert!(db
456453
.insert_benchmark_request(&master_benchmark_request)
@@ -498,18 +495,15 @@ mod tests {
498495
);
499496

500497
let db = db.connection().await;
501-
assert!(db
502-
.insert_benchmark_request(&master_benchmark_request)
498+
db.insert_benchmark_request(&master_benchmark_request)
503499
.await
504-
.is_ok());
505-
assert!(db
506-
.insert_benchmark_request(&try_benchmark_request)
500+
.unwrap();
501+
db.insert_benchmark_request(&try_benchmark_request)
507502
.await
508-
.is_ok());
509-
assert!(db
510-
.insert_benchmark_request(&release_benchmark_request)
503+
.unwrap();
504+
db.insert_benchmark_request(&release_benchmark_request)
511505
.await
512-
.is_ok());
506+
.unwrap();
513507

514508
let requests = db
515509
.get_benchmark_requests_by_status(&[BenchmarkRequestStatus::ArtifactsReady])
@@ -543,10 +537,9 @@ mod tests {
543537
);
544538

545539
let mut db = db.connection().await;
546-
assert!(db
547-
.insert_benchmark_request(&master_benchmark_request)
540+
db.insert_benchmark_request(&master_benchmark_request)
548541
.await
549-
.is_ok());
542+
.unwrap();
550543

551544
db.update_benchmark_request_status(
552545
&master_benchmark_request,
@@ -586,10 +579,9 @@ mod tests {
586579
"cranelift",
587580
"",
588581
);
589-
assert!(db
590-
.insert_benchmark_request(&try_benchmark_request)
582+
db.insert_benchmark_request(&try_benchmark_request)
591583
.await
592-
.is_ok());
584+
.unwrap();
593585
db.attach_shas_to_try_benchmark_request(pr, "foo", "bar")
594586
.await
595587
.unwrap();
@@ -625,7 +617,7 @@ mod tests {
625617
"cranelift",
626618
"",
627619
);
628-
assert!(db.insert_benchmark_request(&completed_try).await.is_ok());
620+
db.insert_benchmark_request(&completed_try).await.unwrap();
629621

630622
let try_benchmark_request = BenchmarkRequest::create_try(
631623
None,
@@ -637,10 +629,9 @@ mod tests {
637629
"",
638630
);
639631
// deliberately insert twice
640-
assert!(db
641-
.insert_benchmark_request(&try_benchmark_request)
632+
db.insert_benchmark_request(&try_benchmark_request)
642633
.await
643-
.is_ok());
634+
.unwrap();
644635
// this one should fail
645636
assert!(db
646637
.insert_benchmark_request(&try_benchmark_request)

0 commit comments

Comments
 (0)