cleanup

Author: abr-egn

.evergreen/run-tests.sh

@@ -33,13 +33,10 @@ if [ "Windows_NT" == "$OS" ]; then
   export SSL_CERT_DIR=$(cygpath /etc/ssl/certs --windows)
 fi
 
-CARGO_OPTIONS+=("--nocapture")
-export TEST_FILE=aggregate-write-readPreference.json
-cargo_test "test::spec::crud::run_unified"
-#cargo_test ""
+cargo_test ""
 
 # cargo-nextest doesn't support doc tests
-#RUST_BACKTRACE=1 cargo test --doc $(cargo_test_options)
-#((CARGO_RESULT = ${CARGO_RESULT} || $?))
+RUST_BACKTRACE=1 cargo test --doc $(cargo_test_options)
+((CARGO_RESULT = ${CARGO_RESULT} || $?))
 
 exit $CARGO_RESULT

src/client/executor.rs

@@ -498,7 +498,7 @@ impl Client {
         self.inner.topology.update_command_with_read_pref(
             connection.address(),
             &mut cmd,
-            Some(&effective_criteria),
+            &effective_criteria,
         );
 
         match session {

src/sdam/description/topology.rs

@@ -205,7 +205,7 @@ impl TopologyDescription {
         &self,
         address: &ServerAddress,
         command: &mut Command,
-        criteria: Option<&SelectionCriteria>,
+        criteria: &SelectionCriteria,
     ) {
         let server_type = self
             .get_server_description(address)
@@ -220,8 +220,7 @@ impl TopologyDescription {
             }
             (TopologyType::Single, ServerType::Standalone) => {}
             (TopologyType::Single, _) => {
-                let specified_read_pref =
-                    criteria.and_then(SelectionCriteria::as_read_pref).cloned();
+                let specified_read_pref = criteria.as_read_pref().cloned();
 
                 let resolved_read_pref = match specified_read_pref {
                     Some(ReadPreference::Primary) | None => ReadPreference::PrimaryPreferred {
@@ -235,11 +234,10 @@ impl TopologyDescription {
             }
             _ => {
                 let read_pref = match criteria {
-                    Some(SelectionCriteria::ReadPreference(rp)) => rp.clone(),
-                    Some(SelectionCriteria::Predicate(_)) => ReadPreference::PrimaryPreferred {
+                    SelectionCriteria::ReadPreference(rp) => rp.clone(),
+                    SelectionCriteria::Predicate(_) => ReadPreference::PrimaryPreferred {
                         options: Default::default(),
                     },
-                    None => ReadPreference::Primary,
                 };
                 if read_pref != ReadPreference::Primary {
                     command.set_read_preference(read_pref)
@@ -251,10 +249,10 @@ impl TopologyDescription {
     fn update_command_read_pref_for_mongos(
         &self,
         command: &mut Command,
-        criteria: Option<&SelectionCriteria>,
+        criteria: &SelectionCriteria,
     ) {
         let read_preference = match criteria {
-            Some(SelectionCriteria::ReadPreference(rp)) => rp,
+            SelectionCriteria::ReadPreference(rp) => rp,
             _ => return,
         };
         match read_preference {

src/sdam/topology.rs

@@ -200,7 +200,7 @@ impl Topology {
         &self,
         server_address: &ServerAddress,
         command: &mut Command,
-        criteria: Option<&SelectionCriteria>,
+        criteria: &SelectionCriteria,
     ) {
         self.watcher
             .peek_latest()