Skip to content

Commit 472bd3c

Browse files
authored
minor: update clippy to 1.75 (#1010)
1 parent 3fc0085 commit 472bd3c

File tree

7 files changed

+13
-21
lines changed

7 files changed

+13
-21
lines changed

.evergreen/check-clippy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ source ./.evergreen/env.sh
66
source ./.evergreen/feature-combinations.sh
77

88
# Pin clippy to the latest version. This should be updated when new versions of Rust are released.
9-
CLIPPY_VERSION=1.71.0
9+
CLIPPY_VERSION=1.75.0
1010

1111
rustup install $CLIPPY_VERSION
1212

src/sdam/monitor.rs

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -626,19 +626,11 @@ impl MonitorRequestReceiver {
626626
};
627627
tokio::pin!(wait_for_check_request);
628628

629-
loop {
630-
tokio::select! {
631-
_ = self.individual_check_request_receiver.changed() => {
632-
break;
633-
}
634-
_ = &mut wait_for_check_request => {
635-
break;
636-
}
637-
_ = self.handle_listener.wait_for_all_handle_drops() => {
638-
// Don't continue waiting after server has been removed from the topology.
639-
break;
640-
}
641-
}
629+
tokio::select! {
630+
_ = self.individual_check_request_receiver.changed() => (),
631+
_ = &mut wait_for_check_request => (),
632+
// Don't continue waiting after server has been removed from the topology.
633+
_ = self.handle_listener.wait_for_all_handle_drops() => (),
642634
}
643635
})
644636
.await;

src/test/client.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ async fn list_authorized_databases() {
308308
.unwrap();
309309

310310
assert_eq!(result.len(), 1);
311-
assert_eq!(result.get(0).unwrap(), name);
311+
assert_eq!(result.first().unwrap(), name);
312312
}
313313

314314
for name in dbs {

src/test/spec/initial_dns_seedlist_discovery.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,11 +98,11 @@ async fn run_test(mut test_file: TestFile) {
9898
};
9999

100100
if let Some(true) = test_file.error {
101-
assert!(matches!(result, Err(_)), "{}", test_file.comment.unwrap());
101+
assert!(result.is_err(), "{}", test_file.comment.unwrap());
102102
return;
103103
}
104104

105-
assert!(matches!(result, Ok(_)), "non-Ok result: {:?}", result);
105+
assert!(result.is_ok(), "non-Ok result: {:?}", result);
106106

107107
let options = result.unwrap();
108108

src/test/spec/write_error.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ async fn details() {
4343
.reply
4444
.get_array("writeErrors")
4545
.unwrap()
46-
.get(0)
46+
.first()
4747
.unwrap()
4848
.as_document()
4949
.unwrap()

src/test/util.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ pub(crate) fn log_uncaptured<S: AsRef<str>>(text: S) {
528528
let mut sinks = vec![&mut stderr as &mut dyn Write];
529529
let mut other;
530530
let other_path = std::env::var("LOG_UNCAPTURED").unwrap_or("/dev/tty".to_string());
531-
if let Ok(f) = std::fs::OpenOptions::new().append(true).open(&other_path) {
531+
if let Ok(f) = std::fs::OpenOptions::new().append(true).open(other_path) {
532532
other = f;
533533
sinks.push(&mut other);
534534
}

src/test/util/trace.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,13 +194,13 @@ pub(crate) fn max_verbosity_levels_for_test_case(
194194
o.test_file_entities()
195195
.unwrap()
196196
.iter()
197-
.for_each(|e| update_merged_levels(e))
197+
.for_each(&mut update_merged_levels)
198198
});
199199

200200
// test-file level entities. these might not all actually be used by this particular
201201
// test case but we include them for simplicity.
202202
if let Some(ref entities) = entities {
203-
entities.iter().for_each(|e| update_merged_levels(e));
203+
entities.iter().for_each(update_merged_levels);
204204
};
205205

206206
merged_levels

0 commit comments

Comments
 (0)