Cargo fmt.

Signed-off-by: Bruce Ritchie <[email protected]>
risinglightdb · Dec 12, 2024 · 6f6aef4 · 6f6aef4
1 parent ae5d26b
commit 6f6aef4
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 12 deletions.
diff --git a/sqllogictest-bin/src/main.rs b/sqllogictest-bin/src/main.rs
@@ -16,7 +16,10 @@ use itertools::Itertools;
 use quick_junit::{NonSuccessKind, Report, TestCase, TestCaseStatus, TestSuite};
 use rand::distributions::DistString;
 use rand::seq::SliceRandom;
-use sqllogictest::{default_column_validator, default_normalizer, default_validator, update_record_with_output, AsyncDB, Injected, MakeConnection, Record, Runner};
+use sqllogictest::{
+    default_column_validator, default_normalizer, default_validator, update_record_with_output,
+    AsyncDB, Injected, MakeConnection, Record, Runner,
+};
 
 #[derive(Default, Copy, Clone, Debug, PartialEq, Eq, ValueEnum)]
 #[must_use]

diff --git a/sqllogictest/src/parser.rs b/sqllogictest/src/parser.rs
@@ -850,8 +850,10 @@ fn parse_inner<T: ColumnType>(loc: &Location, script: &str) -> Result<Vec<Record
                 });
             }
             ["control", res @ ..] => match res {
-                ["resultmode", result_mode] =>  match ResultMode::try_from_str(result_mode) {
-                    Ok(result_mode) => records.push(Record::Control(Control::ResultMode(result_mode))),
+                ["resultmode", result_mode] => match ResultMode::try_from_str(result_mode) {
+                    Ok(result_mode) => {
+                        records.push(Record::Control(Control::ResultMode(result_mode)))
+                    }
                     Err(k) => return Err(k.at(loc)),
                 },
                 ["sortmode", sort_mode] => match SortMode::try_from_str(sort_mode) {
@@ -871,7 +873,7 @@ fn parse_inner<T: ColumnType>(loc: &Location, script: &str) -> Result<Vec<Record
                         ParseErrorKind::InvalidNumber((*threshold).into()).at(loc.clone())
                     })?,
                 });
-            },
+            }
             _ => return Err(ParseErrorKind::InvalidLine(line.into()).at(loc)),
         }
     }

diff --git a/sqllogictest/src/runner.rs b/sqllogictest/src/runner.rs
@@ -467,9 +467,14 @@ pub fn default_normalizer(s: &String) -> String {
 /// # Default
 ///
 /// By default, the ([`default_validator`]) will be used compare normalized results.
-pub type Validator = fn(normalizer: Normalizer, actual: &[Vec<String>], expected: &[String]) -> bool;
+pub type Validator =
+    fn(normalizer: Normalizer, actual: &[Vec<String>], expected: &[String]) -> bool;
 
-pub fn default_validator(normalizer: Normalizer, actual: &[Vec<String>], expected: &[String]) -> bool {
+pub fn default_validator(
+    normalizer: Normalizer,
+    actual: &[Vec<String>],
+    expected: &[String],
+) -> bool {
     let expected_results = expected.iter().map(normalizer).collect_vec();
     // Default, we compare normalized results. Whitespace characters are ignored.
     let normalized_rows = actual
@@ -1032,11 +1037,11 @@ impl<D: AsyncDB, M: MakeConnection<Conn = D>> Runner<D, M> {
                         }
 
                         let actual_results = match self.result_mode {
-                            Some(ResultMode::ValueWise) =>
-                                rows.into_iter()
-                                    .flat_map(|strs| strs.into_iter())
-                                    .map(|str| vec![str.to_string()])
-                                    .collect_vec(),
+                            Some(ResultMode::ValueWise) => rows
+                                .into_iter()
+                                .flat_map(|strs| strs.into_iter())
+                                .map(|str| vec![str.to_string()])
+                                .collect_vec(),
                             // default to rowwise
                             _ => rows.clone(),
                         };
@@ -1591,7 +1596,10 @@ pub fn update_record_with_output<T: ColumnType>(
                     connection,
                     expected: match expected {
                         QueryExpect::Results {
-                            sort_mode, label, result_mode, ..
+                            sort_mode,
+                            label,
+                            result_mode,
+                            ..
                         } => QueryExpect::Results {
                             results,
                             types,