Format Rust code using rustfmt

halfmatthalfcat · Mar 28, 2022 · 3064ace · 3064ace
1 parent 92c2559
commit 3064ace
Show file tree

Hide file tree

Showing 6 changed files with 77 additions and 30 deletions.
diff --git a/src/ast.rs b/src/ast.rs
@@ -30,9 +30,9 @@ mod update;
 mod values;
 
 pub use column::{Column, DefaultValue, TypeDataLength, TypeFamily};
+pub use compare::{Comparable, Compare, JsonCompare, JsonType};
 #[cfg(feature = "postgresql")]
 pub use compare::{LtreeCompare, LtreeQuery};
-pub use compare::{Comparable, Compare, JsonCompare, JsonType};
 pub use conditions::ConditionTree;
 pub use conjunctive::Conjunctive;
 pub use cte::{CommonTableExpression, IntoCommonTableExpression};

diff --git a/src/tests/query.rs b/src/tests/query.rs
@@ -2980,8 +2980,7 @@ async fn ltree_select_is_not_ancestor(api: &mut dyn TestApi) -> crate::Result<()
 
     api.conn().insert(insert.into()).await?;
 
-    let select =
-        Select::from_table(&table).so_that(col!("path").ltree_is_not_ancestor(LtreeQuery::string("A.B")));
+    let select = Select::from_table(&table).so_that(col!("path").ltree_is_not_ancestor(LtreeQuery::string("A.B")));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 5);
@@ -3015,8 +3014,8 @@ async fn ltree_select_is_not_ancestor_any(api: &mut dyn TestApi) -> crate::Resul
 
     api.conn().insert(insert.into()).await?;
 
-    let select =
-        Select::from_table(&table).so_that(col!("path").ltree_is_not_ancestor(LtreeQuery::array(vec!["A.B.C", "B.C.D"])));
+    let select = Select::from_table(&table)
+        .so_that(col!("path").ltree_is_not_ancestor(LtreeQuery::array(vec!["A.B.C", "B.C.D"])));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 2);
@@ -3112,8 +3111,7 @@ async fn ltree_select_is_not_descendant(api: &mut dyn TestApi) -> crate::Result<
 
     api.conn().insert(insert.into()).await?;
 
-    let select =
-        Select::from_table(&table).so_that(col!("path").ltree_is_not_descendant(LtreeQuery::string("A.B")));
+    let select = Select::from_table(&table).so_that(col!("path").ltree_is_not_descendant(LtreeQuery::string("A.B")));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 5);
@@ -3217,7 +3215,8 @@ async fn ltree_select_match_any(api: &mut dyn TestApi) -> crate::Result<()> {
 
     api.conn().insert(insert.into()).await?;
 
-    let select = Select::from_table(&table).so_that(col!("path").ltree_match(LtreeQuery::array(vec!["foo.baz|bar.!foo", "foo.*.foo"])));
+    let select = Select::from_table(&table)
+        .so_that(col!("path").ltree_match(LtreeQuery::array(vec!["foo.baz|bar.!foo", "foo.*.foo"])));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 7);
@@ -3255,7 +3254,8 @@ async fn ltree_select_not_match(api: &mut dyn TestApi) -> crate::Result<()> {
 
     api.conn().insert(insert.into()).await?;
 
-    let select = Select::from_table(&table).so_that(col!("path").ltree_does_not_match(LtreeQuery::string("foo.*.baz|bar")));
+    let select =
+        Select::from_table(&table).so_that(col!("path").ltree_does_not_match(LtreeQuery::string("foo.*.baz|bar")));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 3);
@@ -3289,7 +3289,8 @@ async fn ltree_select_not_match_any(api: &mut dyn TestApi) -> crate::Result<()>
 
     api.conn().insert(insert.into()).await?;
 
-    let select = Select::from_table(&table).so_that(col!("path").ltree_does_not_match(LtreeQuery::array(vec!["foo.*.baz|bar", "foo.b*.*"])));
+    let select = Select::from_table(&table)
+        .so_that(col!("path").ltree_does_not_match(LtreeQuery::array(vec!["foo.*.baz|bar", "foo.b*.*"])));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 1);
@@ -3355,7 +3356,8 @@ async fn ltree_select_not_match_fulltext(api: &mut dyn TestApi) -> crate::Result
 
     api.conn().insert(insert.into()).await?;
 
-    let select = Select::from_table(&table).so_that(col!("path").ltree_does_not_match_fulltext(LtreeQuery::string("b* & !bar")));
+    let select =
+        Select::from_table(&table).so_that(col!("path").ltree_does_not_match_fulltext(LtreeQuery::string("b* & !bar")));
     let rows = api.conn().select(select).await?;
 
     assert_eq!(rows.len(), 6);

diff --git a/src/visitor/mssql.rs b/src/visitor/mssql.rs
@@ -1,12 +1,12 @@
 use super::Visitor;
-#[cfg(all(feature = "json", any(feature = "postgresql", feature = "mysql")))]
-use crate::prelude::{JsonExtract, JsonType};
 #[cfg(feature = "postgresql")]
 use crate::ast::LtreeQuery;
+#[cfg(all(feature = "json", any(feature = "postgresql", feature = "mysql")))]
+use crate::prelude::{JsonExtract, JsonType};
 use crate::{
     ast::{
-        Column, Comparable, Expression, ExpressionKind, Insert, IntoRaw, Join, JoinData, Joinable,
-        Merge, OnConflict, Order, Ordering, Row, Table, TypeDataLength, TypeFamily, Values,
+        Column, Comparable, Expression, ExpressionKind, Insert, IntoRaw, Join, JoinData, Joinable, Merge, OnConflict,
+        Order, Ordering, Row, Table, TypeDataLength, TypeFamily, Values,
     },
     error::{Error, ErrorKind},
     prelude::{Aliasable, Average, Query},
@@ -647,12 +647,22 @@ impl<'a> Visitor<'a> for Mssql<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_ancestor(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_ancestor(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MSSQL");
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_descendant(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_descendant(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MSSQL");
     }
 
@@ -662,7 +672,12 @@ impl<'a> Visitor<'a> for Mssql<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_match_fulltext(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_match_fulltext(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MSSQL");
     }
 }

diff --git a/src/visitor/mysql.rs b/src/visitor/mysql.rs
@@ -509,12 +509,22 @@ impl<'a> Visitor<'a> for Mysql<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_ancestor(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_ancestor(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MySQL");
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_descendant(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_descendant(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MySQL");
     }
 
@@ -524,7 +534,12 @@ impl<'a> Visitor<'a> for Mysql<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_match_fulltext(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_match_fulltext(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on MySQL");
     }
 }

diff --git a/src/visitor/postgres.rs b/src/visitor/postgres.rs
@@ -1,10 +1,10 @@
+use crate::error::Error;
+use crate::error::ErrorKind::Unsupported;
 use crate::{
     ast::*,
     visitor::{self, Visitor},
 };
 use std::fmt::{self, Write};
-use crate::error::Error;
-use crate::error::ErrorKind::Unsupported;
 
 /// A visitor to generate queries for the PostgreSQL database.
 ///
@@ -497,7 +497,7 @@ impl<'a> Visitor<'a> for Postgres<'a> {
             LtreeQuery::String(str) => {
                 self.write(" ~ ")?;
                 self.visit_parameterized(Value::text(str))?;
-            },
+            }
             LtreeQuery::Array(query_path) => {
                 self.write(" ? ")?;
 
@@ -545,7 +545,7 @@ impl<'a> Visitor<'a> for Postgres<'a> {
                 }
 
                 Ok(())
-            },
+            }
             LtreeQuery::Array(_) => Err(Error::builder(Unsupported("ltxtquery array".into())).build()),
         }
     }
@@ -1190,7 +1190,7 @@ mod tests {
         // This should error due to arrays of ltxtqueries not being supported
         let success = match Postgres::build(query) {
             Err(_) => true,
-            _ => false
+            _ => false,
         };
 
         assert!(success)
@@ -1223,7 +1223,7 @@ mod tests {
         // This should error due to arrays of ltxtqueries not being supported
         let success = match Postgres::build(query) {
             Err(_) => true,
-            _ => false
+            _ => false,
         };
 
         assert!(success);

diff --git a/src/visitor/sqlite.rs b/src/visitor/sqlite.rs
@@ -287,12 +287,22 @@ impl<'a> Visitor<'a> for Sqlite<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_ancestor(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_ancestor(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on SQLite");
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_is_descendant(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_is_descendant(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on SQLite");
     }
 
@@ -302,7 +312,12 @@ impl<'a> Visitor<'a> for Sqlite<'a> {
     }
 
     #[cfg(feature = "postgresql")]
-    fn visit_ltree_match_fulltext(&mut self, _left: Expression<'a>, _right: LtreeQuery<'a>, _not: bool) -> visitor::Result {
+    fn visit_ltree_match_fulltext(
+        &mut self,
+        _left: Expression<'a>,
+        _right: LtreeQuery<'a>,
+        _not: bool,
+    ) -> visitor::Result {
         unimplemented!("Ltree is not supported on SQLite");
     }
 }