Fix clippy errors and warnings with Rust 1.72 (#4169)

* clippy: fix auto-fixable issues * clippy: fix incorrect_clone_impl_on_copy_type lint * clippy: fix manual_try_fold * clippy: fix auto-fixable problems in quaint * clippy: allow module_inception in tests * se: fix deprecation warnings * clippy: fix redundant_pattern_matching * clippy: fix zero_prefixed_literal * qe: disable clippy::needless_raw_string_hashes in tests `insta` relies on triple-hash strings in snapshots, see https://prisma-company.slack.com/archives/C4GCG53BP/p1692960497395659?thread_ts=1692960083.600799&cid=C4GCG53BP * qe: disable clippy::needless_raw_string_hashes in black-box-tests * qe: disable clippy::needless_raw_string_hashes in protocol_adapter tests * se: fix needless_raw_string_hashes * quaint: fix formatting
prisma · Aug 25, 2023 · f957933 · f957933
1 parent 9f8ddf5
commit f957933
Show file tree

Hide file tree

Showing 48 changed files with 171 additions and 172 deletions.
diff --git a/psl/psl-core/src/validate/validation_pipeline/validations/fields.rs b/psl/psl-core/src/validate/validation_pipeline/validations/fields.rs
@@ -325,13 +325,13 @@ pub(super) fn validate_unsupported_field_type(field: ScalarFieldWalker<'_>, ctx:
     let source = if let Some(s) = ctx.datasource { s } else { return };
 
     static TYPE_REGEX: Lazy<Regex> = Lazy::new(|| {
-        Regex::new(r#"(?x)
+        Regex::new(r"(?x)
     ^                           # beginning of the string
     (?P<prefix>[^(]+)           # a required prefix that is any character until the first opening brace
     (?:\((?P<params>.*?)\))?    # (optional) an opening parenthesis, a closing parenthesis and captured params in-between
     (?P<suffix>.+)?             # (optional) captured suffix after the params until the end of the string
     $                           # end of the string
-    "#).unwrap()
+    ").unwrap()
     });
 
     let connector = source.active_connector;

diff --git a/psl/psl-core/src/validate/validation_pipeline/validations/relation_fields.rs b/psl/psl-core/src/validate/validation_pipeline/validations/relation_fields.rs
@@ -307,17 +307,17 @@ mod tests {
     use super::is_leftwise_included_it;
     #[test]
     fn test_is_left_wise_included() {
-        let item = vec![1, 2];
-        let group = vec![1, 2, 3, 4];
+        let item = [1, 2];
+        let group = [1, 2, 3, 4];
         assert!(is_leftwise_included_it(item.iter(), group.iter()));
-        let item = vec![1, 2, 3, 4];
-        let group = vec![1, 2, 3, 4];
+        let item = [1, 2, 3, 4];
+        let group = [1, 2, 3, 4];
         assert!(is_leftwise_included_it(item.iter(), group.iter()));
-        let item = vec![1, 2, 3, 4];
-        let group = vec![1, 2];
+        let item = [1, 2, 3, 4];
+        let group = [1, 2];
         assert!(!is_leftwise_included_it(item.iter(), group.iter()));
-        let item = vec![2, 3];
-        let group = vec![1, 2, 3, 4];
+        let item = [2, 3];
+        let group = [1, 2, 3, 4];
         assert!(!is_leftwise_included_it(item.iter(), group.iter()));
     }
 }
diff --git a/psl/psl-core/src/validate/validation_pipeline/validations/relations/many_to_many/embedded.rs b/psl/psl-core/src/validate/validation_pipeline/validations/relations/many_to_many/embedded.rs
@@ -194,7 +194,7 @@ pub(crate) fn validate_no_referential_actions(
         field
             .explicit_on_delete_span()
             .into_iter()
-            .chain(field.explicit_on_update_span().into_iter())
+            .chain(field.explicit_on_update_span())
     });
 
     for span in referential_action_spans {

diff --git a/psl/psl-core/src/validate/validation_pipeline/validations/relations/many_to_many/implicit.rs b/psl/psl-core/src/validate/validation_pipeline/validations/relations/many_to_many/implicit.rs
@@ -49,7 +49,7 @@ pub(crate) fn validate_no_referential_actions(relation: ImplicitManyToManyRelati
         field
             .explicit_on_delete_span()
             .into_iter()
-            .chain(field.explicit_on_update_span().into_iter())
+            .chain(field.explicit_on_update_span())
     });
 
     for span in referential_action_spans {

diff --git a/psl/psl/tests/parsing/literals.rs b/psl/psl/tests/parsing/literals.rs
@@ -378,7 +378,7 @@ fn sql_server_absolute_windows_ca_file_should_not_be_modified() {
         .unwrap();
 
     assert_eq!(
-        r#"sqlserver://localhost:1433;trustServerCertificateCA=C:{\\}path{\}customCA.crt"#,
+        r"sqlserver://localhost:1433;trustServerCertificateCA=C:{\\}path{\}customCA.crt",
         url
     )
 }
diff --git a/psl/schema-ast/src/parser/parse_expression.rs b/psl/schema-ast/src/parser/parse_expression.rs
@@ -113,8 +113,8 @@ fn parse_string_literal(token: Pair<'_>, diagnostics: &mut Diagnostics) -> Strin
                     final_span.start += start;
                     final_span.end = final_span.start + 1 + c.len_utf8();
                     diagnostics.push_error(DatamodelError::new_static(
-                        r#"Unknown escape sequence. If the value is a windows-style path, `\` must be escaped as `\\`."#,
-                        final_span
+                        r"Unknown escape sequence. If the value is a windows-style path, `\` must be escaped as `\\`.",
+                        final_span,
                     ));
                 }
             },
@@ -162,7 +162,7 @@ fn try_parse_unicode_codepoint(
                 }
                 (consumed_second_codepoint, Some(second_codepoint)) => {
                     // UTF-16 surrogate with
-                    let char = match char::decode_utf16([first_codepoint, second_codepoint].into_iter()).next() {
+                    let char = match char::decode_utf16([first_codepoint, second_codepoint]).next() {
                         Some(Ok(c)) => Some(c),
                         _ => {
                             diagnostics.push_error(unicode_sequence_error(

diff --git a/quaint/src/ast/compare.rs b/quaint/src/ast/compare.rs
@@ -126,7 +126,7 @@ impl<'a> Compare<'a> {
             let base_select = super::Select::from_table(ident).column(selected_columns.remove(0));
 
             // We know we have the same amount of columns on both sides,
-            let column_pairs = cols.into_iter().zip(selected_columns.into_iter());
+            let column_pairs = cols.into_iter().zip(selected_columns);
 
             // Adding to the new select a condition to filter out the rest of
             // the tuple, so if our tuple is `(a, b) IN (SELECT x, y ..)`, this

diff --git a/quaint/src/ast/merge.rs b/quaint/src/ast/merge.rs
@@ -106,7 +106,7 @@ impl<'a> TryFrom<Insert<'a>> for Merge<'a> {
 
         let query = match insert.values.kind {
             ExpressionKind::Row(row) => {
-                let cols_vals = columns.iter().zip(row.values.into_iter());
+                let cols_vals = columns.iter().zip(row.values);
 
                 let select = cols_vals.fold(Select::default(), |query, (col, val)| {
                     query.value(val.alias(col.name.clone()))
@@ -117,14 +117,14 @@ impl<'a> TryFrom<Insert<'a>> for Merge<'a> {
             ExpressionKind::Values(values) => {
                 let mut rows = values.rows;
                 let row = rows.pop().unwrap();
-                let cols_vals = columns.iter().zip(row.values.into_iter());
+                let cols_vals = columns.iter().zip(row.values);
 
                 let select = cols_vals.fold(Select::default(), |query, (col, val)| {
                     query.value(val.alias(col.name.clone()))
                 });
 
                 let union = rows.into_iter().fold(Union::new(select), |union, row| {
-                    let cols_vals = columns.iter().zip(row.values.into_iter());
+                    let cols_vals = columns.iter().zip(row.values);
 
                     let select = cols_vals.fold(Select::default(), |query, (col, val)| {
                         query.value(val.alias(col.name.clone()))

diff --git a/quaint/src/ast/update.rs b/quaint/src/ast/update.rs
@@ -150,10 +150,7 @@ impl<'a> Update<'a> {
     /// # }
     /// ```
     #[cfg(any(feature = "postgresql", feature = "sqlite"))]
-    #[cfg_attr(
-        feature = "docs",
-        doc(cfg(any(feature = "postgresql", feature = "sqlite")))
-    )]
+    #[cfg_attr(feature = "docs", doc(cfg(any(feature = "postgresql", feature = "sqlite"))))]
     pub fn returning<K, I>(mut self, columns: I) -> Self
     where
         K: Into<Column<'a>>,

diff --git a/quaint/src/tests/query.rs b/quaint/src/tests/query.rs
@@ -2991,7 +2991,7 @@ async fn generate_binary_uuid(api: &mut dyn TestApi) -> crate::Result<()> {
     let val = res.into_single()?;
 
     // If it is a byte type and has a value, it's a generated UUID.
-    assert!(matches!(val, Value::Bytes(x) if matches!(x, Some(_))));
+    assert!(matches!(val, Value::Bytes(x) if x.is_some()));
 
     Ok(())
 }
@@ -3004,7 +3004,7 @@ async fn generate_swapped_binary_uuid(api: &mut dyn TestApi) -> crate::Result<()
     let val = res.into_single()?;
 
     // If it is a byte type and has a value, it's a generated UUID.
-    assert!(matches!(val, Value::Bytes(x) if matches!(x, Some(_))));
+    assert!(matches!(val, Value::Bytes(x) if x.is_some()));
 
     Ok(())
 }
@@ -3017,7 +3017,7 @@ async fn generate_native_uuid(api: &mut dyn TestApi) -> crate::Result<()> {
     let val = res.into_single()?;
 
     // If it is a text type and has a value, it's a generated string UUID.
-    assert!(matches!(val, Value::Text(x) if matches!(x, Some(_))));
+    assert!(matches!(val, Value::Text(x) if x.is_some()));
 
     Ok(())
 }

diff --git a/quaint/src/tests/types/sqlite.rs b/quaint/src/tests/types/sqlite.rs
@@ -175,7 +175,7 @@ async fn test_get_int64_from_int32_field_fails(api: &mut dyn TestApi) -> crate::
     let select = Select::from_table(&table).column("value").order_by("id".descend());
     let res = api.conn().select(select).await;
 
-    assert!(matches!(res, Err(_)));
+    assert!(res.is_err());
 
     Ok(())
 }
diff --git a/quaint/src/visitor.rs b/quaint/src/visitor.rs
@@ -315,7 +315,7 @@ pub trait Visitor<'a> {
 
         {
             self.write(" SET ")?;
-            let pairs = update.columns.into_iter().zip(update.values.into_iter());
+            let pairs = update.columns.into_iter().zip(update.values);
             let len = pairs.len();
 
             for (i, (key, value)) in pairs.enumerate() {
@@ -365,7 +365,7 @@ pub trait Visitor<'a> {
     }
 
     fn visit_update_set(&mut self, update: Update<'a>) -> Result {
-        let pairs = update.columns.into_iter().zip(update.values.into_iter());
+        let pairs = update.columns.into_iter().zip(update.values);
         let len = pairs.len();
 
         for (i, (key, value)) in pairs.enumerate() {

diff --git a/query-engine/black-box-tests/tests/black_box_tests.rs b/query-engine/black-box-tests/tests/black_box_tests.rs
@@ -1,3 +1,5 @@
+#![allow(clippy::module_inception, clippy::needless_raw_string_hashes)]
+
 mod helpers;
 
 mod metrics;

diff --git a/query-engine/black-box-tests/tests/metrics/smoke_tests.rs b/query-engine/black-box-tests/tests/metrics/smoke_tests.rs
@@ -26,7 +26,7 @@ mod smoke_tests {
             let res = client
                 .post("http://0.0.0.0:57582/")
                 .body(
-                    r###"
+                    r#"
                     {
                         "action": "findMany",
                         "modelName": "Person",
@@ -38,7 +38,7 @@ mod smoke_tests {
                             }
                         }
                     }
-                    "###,
+                    "#,
                 )
                 .send()
                 .await

diff --git a/query-engine/black-box-tests/tests/protocols/mismatched.rs b/query-engine/black-box-tests/tests/protocols/mismatched.rs
@@ -1,7 +1,7 @@
 use crate::helpers::*;
 use query_engine_tests::*;
 
-const JSON_QUERY: &str = r###"
+const JSON_QUERY: &str = r#"
 {
     "action": "findMany",
     "modelName": "Person",
@@ -13,15 +13,15 @@ const JSON_QUERY: &str = r###"
         }
     }
 }
-"###;
+"#;
 
-const GRAPHQL_QUERY: &str = r###"
+const GRAPHQL_QUERY: &str = r#"
 {
   "operationName": null,
   "variables": {},
   "query": "{\n  findManyPerson {\n    id\n  }\n}\n"
 }
-"###;
+"#;
 
 #[test_suite(schema(schema))]
 mod mismatched {

diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/interactive_tx.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/new/interactive_tx.rs
@@ -357,7 +357,7 @@ mod interactive_tx {
         // Mongo for example doesn't read the inner commit value.
         is_one_of!(
             run_query!(&runner, r#"query { findManyTestModel { id }}"#),
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"id":1}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"id":1},{"id":2}]}}"#
             ]

diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/json_filters.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/filters/json_filters.rs
@@ -208,15 +208,15 @@ mod json_filters {
         // MySQL has slightly different semantics and also coerces null to [null].
         is_one_of!(
             run_query!(runner, jsonq(&runner, r#"array_contains: "null""#, None)),
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"id":7}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"id":7},{"id":8}]}}"#
             ]
         );
 
         is_one_of!(
             run_query!(runner, jsonq(&runner, r#"array_contains: "[null]""#, None)),
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"id":7}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"id":7},{"id":8}]}}"#
             ]

diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/views.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/queries/views.rs
@@ -104,9 +104,9 @@ mod views {
                 &runner,
                 r#"{ findManyTestView(orderBy: { children: { _count: asc } }) { id _count { children } } }"#
             ),
-            vec![
+            [
                 r#"{"data":{"findManyTestView":[{"id":2,"_count":{"children":0}},{"id":3,"_count":{"children":0}},{"id":1,"_count":{"children":2}}]}}"#,
-                r#"{"data":{"findManyTestView":[{"id":3,"_count":{"children":0}},{"id":2,"_count":{"children":0}},{"id":1,"_count":{"children":2}}]}}"#,
+                r#"{"data":{"findManyTestView":[{"id":3,"_count":{"children":0}},{"id":2,"_count":{"children":0}},{"id":1,"_count":{"children":2}}]}}"#
             ]
         );
 

diff --git a/query-engine/connector-test-kit-rs/query-engine-tests/tests/query_engine_tests.rs b/query-engine/connector-test-kit-rs/query-engine-tests/tests/query_engine_tests.rs
@@ -1,4 +1,8 @@
-#![allow(clippy::module_inception, clippy::too_many_arguments)]
+#![allow(
+    clippy::module_inception,
+    clippy::too_many_arguments,
+    clippy::needless_raw_string_hashes
+)]
 
 mod new;
 mod queries;

diff --git a/.../connector-test-kit-rs/query-engine-tests/tests/writes/top_level_mutations/update_many.rs b/.../connector-test-kit-rs/query-engine-tests/tests/writes/top_level_mutations/update_many.rs
@@ -131,7 +131,7 @@ mod update_many {
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "increment", "10").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":12},{"optInt":13}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":10},{"optInt":12},{"optInt":13}]}}"#
             ]
@@ -140,7 +140,7 @@ mod update_many {
         // optInts before this op are now: null/10, 12, 13
         is_one_of!(
             query_number_operation(&runner, "optInt", "decrement", "10").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":2},{"optInt":3}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":0},{"optInt":2},{"optInt":3}]}}"#
             ]
@@ -149,7 +149,7 @@ mod update_many {
         // optInts before this op are now: null/0, 2, 3
         is_one_of!(
             query_number_operation(&runner, "optInt", "multiply", "2").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":4},{"optInt":6}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":0},{"optInt":4},{"optInt":6}]}}"#
             ]
@@ -160,7 +160,7 @@ mod update_many {
             // optInts before this op are now: null/0, 4, 6
             is_one_of!(
                 query_number_operation(&runner, "optInt", "divide", "3").await?,
-                vec![
+                [
                     r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":1},{"optInt":2}]}}"#,
                     r#"{"data":{"findManyTestModel":[{"optInt":0},{"optInt":1},{"optInt":2}]}}"#
                 ]
@@ -169,15 +169,15 @@ mod update_many {
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "set", "5").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":5},{"optInt":5},{"optInt":5}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":5},{"optInt":5},{"optInt":5}]}}"#
             ]
         );
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "set", "null").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":null},{"optInt":null}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":null},{"optInt":null}]}}"#
             ]
@@ -196,7 +196,7 @@ mod update_many {
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "increment", "10").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":12},{"optInt":13}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":10},{"optInt":12},{"optInt":13}]}}"#
             ]
@@ -205,7 +205,7 @@ mod update_many {
         // optInts before this op are now: null/10, 12, 13
         is_one_of!(
             query_number_operation(&runner, "optInt", "decrement", "10").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":2},{"optInt":3}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":0},{"optInt":2},{"optInt":3}]}}"#
             ]
@@ -214,23 +214,23 @@ mod update_many {
         // optInts before this op are now: null/0, 2, 3
         is_one_of!(
             query_number_operation(&runner, "optInt", "multiply", "2").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":4},{"optInt":6}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":0},{"optInt":4},{"optInt":6}]}}"#
             ]
         );
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "set", "5").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":5},{"optInt":5},{"optInt":5}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":5},{"optInt":5},{"optInt":5}]}}"#
             ]
         );
 
         is_one_of!(
             query_number_operation(&runner, "optInt", "set", "null").await?,
-            vec![
+            [
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":null},{"optInt":null}]}}"#,
                 r#"{"data":{"findManyTestModel":[{"optInt":null},{"optInt":null},{"optInt":null}]}}"#
             ]

diff --git a/query-engine/connectors/mongodb-query-connector/src/value.rs b/query-engine/connectors/mongodb-query-connector/src/value.rs
@@ -139,7 +139,7 @@ impl IntoBson for (&MongoDbType, PrismaValue) {
                 }
 
                 let mut bytes: [u8; 12] = [0x0; 12];
-                bytes.iter_mut().set_from(b.into_iter());
+                bytes.iter_mut().set_from(b);
 
                 Bson::ObjectId(ObjectId::from_bytes(bytes))
             }