Skip to content

Commit 4497705

Browse files
TheRustifyerTheRustifyer
committed
fix: compiler lints about unnecessary parenthesis
1 parent 86ef0f5 commit 4497705

26 files changed

Lines changed: 168 additions & 168 deletions

File tree

‎canyon_core/src/connection/clients/mssql.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ pub(crate) mod sqlserver_query_launcher {
2222
stmt: S,
2323
params: &[&'a dyn QueryParameter],
2424
conn: &SqlServerConnection,
25-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
25+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
2626
where
2727
S: AsRef<str> + Send,
2828
R: RowMapper,
@@ -43,7 +43,7 @@ pub(crate) mod sqlserver_query_launcher {
4343
stmt: &str,
4444
params: &[&'a dyn QueryParameter],
4545
conn: &SqlServerConnection,
46-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
46+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
4747
let result = execute_query(stmt, params, conn)
4848
.await?
4949
.into_results()
@@ -59,7 +59,7 @@ pub(crate) mod sqlserver_query_launcher {
5959
stmt: &str,
6060
params: &[&'a dyn QueryParameter],
6161
conn: &SqlServerConnection,
62-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
62+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6363
where
6464
R: RowMapper,
6565
{
@@ -75,7 +75,7 @@ pub(crate) mod sqlserver_query_launcher {
7575
stmt: &str,
7676
params: &[&'a dyn QueryParameter],
7777
conn: &SqlServerConnection,
78-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
78+
) -> Result<T, Box<dyn Error + Send + Sync>> {
7979
let row = execute_query(stmt, params, conn)
8080
.await?
8181
.into_row()
@@ -95,7 +95,7 @@ pub(crate) mod sqlserver_query_launcher {
9595
stmt: &str,
9696
params: &[&'a dyn QueryParameter],
9797
conn: &SqlServerConnection,
98-
) -> Result<u64, Box<(dyn Error + Send + Sync)>> {
98+
) -> Result<u64, Box<dyn Error + Send + Sync>> {
9999
let mssql_query = generate_mssql_stmt(stmt, params).await;
100100

101101
#[allow(mutable_transmutes)] // TODO: pls solve this elegantly someday :(
@@ -111,9 +111,9 @@ pub(crate) mod sqlserver_query_launcher {
111111

112112
async fn execute_query<'a>(
113113
stmt: &str,
114-
params: &[&'a (dyn QueryParameter)],
114+
params: &[&'a dyn QueryParameter],
115115
conn: &SqlServerConnection,
116-
) -> Result<QueryStream<'a>, Box<(dyn Error + Send + Sync)>> {
116+
) -> Result<QueryStream<'a>, Box<dyn Error + Send + Sync>> {
117117
let mssql_query = generate_mssql_stmt(stmt, params).await;
118118

119119
#[allow(mutable_transmutes)] // TODO: pls solve this elegantly someday :(
@@ -122,7 +122,7 @@ pub(crate) mod sqlserver_query_launcher {
122122
Ok(mssql_query.query(sqlservconn.client).await?)
123123
}
124124

125-
async fn generate_mssql_stmt<'a>(stmt: &str, params: &[&'a (dyn QueryParameter)]) -> Query<'a> {
125+
async fn generate_mssql_stmt<'a>(stmt: &str, params: &[&'a dyn QueryParameter]) -> Query<'a> {
126126
let mut stmt = String::from(stmt);
127127
if stmt.contains("RETURNING") {
128128
let c = stmt.clone();

‎canyon_core/src/connection/clients/mysql.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ pub(crate) mod mysql_query_launcher {
3434
stmt: S,
3535
params: &[&'_ dyn QueryParameter],
3636
conn: &MysqlConnection,
37-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
37+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
3838
where
3939
S: AsRef<str> + Send,
4040
R: RowMapper,
@@ -52,7 +52,7 @@ pub(crate) mod mysql_query_launcher {
5252
stmt: &str,
5353
params: &[&'a dyn QueryParameter],
5454
conn: &MysqlConnection,
55-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
55+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
5656
Ok(CanyonRows::MySQL(execute_query(stmt, params, conn).await?))
5757
}
5858

@@ -61,7 +61,7 @@ pub(crate) mod mysql_query_launcher {
6161
stmt: &str,
6262
params: &[&'a dyn QueryParameter],
6363
conn: &MysqlConnection,
64-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
64+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6565
where
6666
R: RowMapper,
6767
{
@@ -78,7 +78,7 @@ pub(crate) mod mysql_query_launcher {
7878
stmt: &str,
7979
params: &[&'a dyn QueryParameter],
8080
conn: &MysqlConnection,
81-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
81+
) -> Result<T, Box<dyn Error + Send + Sync>> {
8282
Ok(execute_query(stmt, params, conn)
8383
.await?
8484
.first()
@@ -93,7 +93,7 @@ pub(crate) mod mysql_query_launcher {
9393
stmt: S,
9494
params: &[&'_ dyn QueryParameter],
9595
conn: &MysqlConnection,
96-
) -> Result<Vec<Row>, Box<(dyn Error + Send + Sync)>>
96+
) -> Result<Vec<Row>, Box<dyn Error + Send + Sync>>
9797
where
9898
S: AsRef<str> + Send,
9999
{
@@ -123,7 +123,7 @@ pub(crate) mod mysql_query_launcher {
123123
stmt: S,
124124
params: &[&'_ dyn QueryParameter],
125125
conn: &MysqlConnection,
126-
) -> Result<u64, Box<(dyn Error + Send + Sync)>>
126+
) -> Result<u64, Box<dyn Error + Send + Sync>>
127127
where
128128
S: AsRef<str> + Send,
129129
{

‎canyon_core/src/connection/clients/postgresql.rs‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@ pub(crate) mod postgres_query_launcher {
2121
#[inline(always)]
2222
pub(crate) async fn query<S, R>(
2323
stmt: S,
24-
params: &[&'_ (dyn QueryParameter)],
24+
params: &[&'_ dyn QueryParameter],
2525
conn: &PostgreSqlConnection,
26-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
26+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
2727
where
2828
S: AsRef<str> + Send,
2929
R: RowMapper,
@@ -43,7 +43,7 @@ pub(crate) mod postgres_query_launcher {
4343
stmt: &str,
4444
params: &[&'a dyn QueryParameter],
4545
conn: &PostgreSqlConnection,
46-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
46+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
4747
let m_params: Vec<_> = params
4848
.iter()
4949
.map(|param| param.as_postgres_param())
@@ -59,7 +59,7 @@ pub(crate) mod postgres_query_launcher {
5959
stmt: &str,
6060
params: &[&'a dyn QueryParameter],
6161
conn: &PostgreSqlConnection,
62-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
62+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6363
where
6464
R: RowMapper,
6565
{
@@ -83,7 +83,7 @@ pub(crate) mod postgres_query_launcher {
8383
stmt: &str,
8484
params: &[&'a dyn QueryParameter],
8585
conn: &PostgreSqlConnection,
86-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
86+
) -> Result<T, Box<dyn Error + Send + Sync>> {
8787
let m_params: Vec<_> = params
8888
.iter()
8989
.map(|param| param.as_postgres_param())
@@ -95,9 +95,9 @@ pub(crate) mod postgres_query_launcher {
9595
#[inline(always)]
9696
pub(crate) async fn execute<S>(
9797
stmt: S,
98-
params: &[&'_ (dyn QueryParameter)],
98+
params: &[&'_ dyn QueryParameter],
9999
conn: &PostgreSqlConnection,
100-
) -> Result<u64, Box<(dyn Error + Send + Sync)>>
100+
) -> Result<u64, Box<dyn Error + Send + Sync>>
101101
where
102102
S: AsRef<str> + Send,
103103
{
@@ -107,7 +107,7 @@ pub(crate) mod postgres_query_launcher {
107107
.map_err(From::from)
108108
}
109109

110-
fn get_psql_params<'a>(params: &[&'a (dyn QueryParameter)]) -> Vec<&'a (dyn ToSql + Sync)> {
110+
fn get_psql_params<'a>(params: &[&'a dyn QueryParameter]) -> Vec<&'a (dyn ToSql + Sync)> {
111111
params
112112
.as_ref()
113113
.iter()

‎canyon_core/src/connection/contracts/impl/database_connection.rs‎

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,15 @@ impl DbConnection for DatabaseConnection {
1313
&self,
1414
stmt: &str,
1515
params: &[&'a dyn QueryParameter],
16-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
16+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
1717
db_conn_query_rows_impl(self, stmt, params).await
1818
}
1919

2020
async fn query<'a, S, R>(
2121
&self,
2222
stmt: S,
23-
params: &[&'a (dyn QueryParameter)],
24-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
23+
params: &[&'a dyn QueryParameter],
24+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
2525
where
2626
S: AsRef<str> + Send,
2727
R: RowMapper,
@@ -34,7 +34,7 @@ impl DbConnection for DatabaseConnection {
3434
&self,
3535
stmt: &str,
3636
params: &[&'a dyn QueryParameter],
37-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
37+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
3838
where
3939
R: RowMapper,
4040
{
@@ -45,19 +45,19 @@ impl DbConnection for DatabaseConnection {
4545
&self,
4646
stmt: &str,
4747
params: &[&'a dyn QueryParameter],
48-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
48+
) -> Result<T, Box<dyn Error + Send + Sync>> {
4949
db_conn_query_one_for_impl::<T>(self, stmt, params).await
5050
}
5151

5252
async fn execute<'a>(
5353
&self,
5454
stmt: &str,
5555
params: &[&'a dyn QueryParameter],
56-
) -> Result<u64, Box<(dyn Error + Send + Sync)>> {
56+
) -> Result<u64, Box<dyn Error + Send + Sync>> {
5757
db_conn_execute_impl(self, stmt, params).await
5858
}
5959

60-
fn get_database_type(&self) -> Result<DatabaseType, Box<(dyn Error + Send + Sync)>> {
60+
fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
6161
Ok(self.get_db_type())
6262
}
6363
}
@@ -67,15 +67,15 @@ impl DbConnection for &DatabaseConnection {
6767
&self,
6868
stmt: &str,
6969
params: &[&'a dyn QueryParameter],
70-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
70+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
7171
db_conn_query_rows_impl(self, stmt, params).await
7272
}
7373

7474
async fn query<'a, S, R>(
7575
&self,
7676
stmt: S,
77-
params: &[&'a (dyn QueryParameter)],
78-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
77+
params: &[&'a dyn QueryParameter],
78+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
7979
where
8080
S: AsRef<str> + Send,
8181
R: RowMapper,
@@ -88,7 +88,7 @@ impl DbConnection for &DatabaseConnection {
8888
&self,
8989
stmt: &str,
9090
params: &[&'a dyn QueryParameter],
91-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
91+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
9292
where
9393
R: RowMapper,
9494
{
@@ -99,19 +99,19 @@ impl DbConnection for &DatabaseConnection {
9999
&self,
100100
stmt: &str,
101101
params: &[&'a dyn QueryParameter],
102-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
102+
) -> Result<T, Box<dyn Error + Send + Sync>> {
103103
db_conn_query_one_for_impl::<T>(self, stmt, params).await
104104
}
105105

106106
async fn execute<'a>(
107107
&self,
108108
stmt: &str,
109109
params: &[&'a dyn QueryParameter],
110-
) -> Result<u64, Box<(dyn Error + Send + Sync)>> {
110+
) -> Result<u64, Box<dyn Error + Send + Sync>> {
111111
db_conn_execute_impl(self, stmt, params).await
112112
}
113113

114-
fn get_database_type(&self) -> Result<DatabaseType, Box<(dyn Error + Send + Sync)>> {
114+
fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
115115
Ok(self.get_db_type())
116116
}
117117
}
@@ -121,15 +121,15 @@ impl DbConnection for &mut DatabaseConnection {
121121
&self,
122122
stmt: &str,
123123
params: &[&'a dyn QueryParameter],
124-
) -> Result<CanyonRows, Box<(dyn Error + Send + Sync)>> {
124+
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
125125
db_conn_query_rows_impl(self, stmt, params).await
126126
}
127127

128128
async fn query<'a, S, R>(
129129
&self,
130130
stmt: S,
131-
params: &[&'a (dyn QueryParameter)],
132-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
131+
params: &[&'a dyn QueryParameter],
132+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
133133
where
134134
S: AsRef<str> + Send,
135135
R: RowMapper,
@@ -142,7 +142,7 @@ impl DbConnection for &mut DatabaseConnection {
142142
&self,
143143
stmt: &str,
144144
params: &[&'a dyn QueryParameter],
145-
) -> Result<Option<R::Output>, Box<(dyn Error + Send + Sync)>>
145+
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
146146
where
147147
R: RowMapper,
148148
{
@@ -153,19 +153,19 @@ impl DbConnection for &mut DatabaseConnection {
153153
&self,
154154
stmt: &str,
155155
params: &[&'a dyn QueryParameter],
156-
) -> Result<T, Box<(dyn Error + Send + Sync)>> {
156+
) -> Result<T, Box<dyn Error + Send + Sync>> {
157157
db_conn_query_one_for_impl::<T>(self, stmt, params).await
158158
}
159159

160160
async fn execute<'a>(
161161
&self,
162162
stmt: &str,
163163
params: &[&'a dyn QueryParameter],
164-
) -> Result<u64, Box<(dyn Error + Send + Sync)>> {
164+
) -> Result<u64, Box<dyn Error + Send + Sync>> {
165165
db_conn_execute_impl(self, stmt, params).await
166166
}
167167

168-
fn get_database_type(&self) -> Result<DatabaseType, Box<(dyn Error + Send + Sync)>> {
168+
fn get_database_type(&self) -> Result<DatabaseType, Box<dyn Error + Send + Sync>> {
169169
Ok(self.get_db_type())
170170
}
171171
}
@@ -210,8 +210,8 @@ where
210210
pub(crate) async fn db_conn_query_impl<'a, S, R>(
211211
c: &DatabaseConnection,
212212
stmt: S,
213-
params: &[&'a (dyn QueryParameter)],
214-
) -> Result<Vec<R>, Box<(dyn Error + Send + Sync)>>
213+
params: &[&'a dyn QueryParameter],
214+
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
215215
where
216216
S: AsRef<str> + Send,
217217
R: RowMapper,
@@ -233,7 +233,7 @@ pub(crate) async fn db_conn_query_one_for_impl<'a, T>(
233233
c: &DatabaseConnection,
234234
stmt: &str,
235235
params: &[&'a dyn QueryParameter],
236-
) -> Result<T, Box<(dyn Error + Send + Sync)>>
236+
) -> Result<T, Box<dyn Error + Send + Sync>>
237237
where
238238
T: FromSqlOwnedValue<T>,
239239
{
@@ -253,7 +253,7 @@ pub(crate) async fn db_conn_execute_impl<'a>(
253253
c: &DatabaseConnection,
254254
stmt: &str,
255255
params: &[&'a dyn QueryParameter],
256-
) -> Result<u64, Box<(dyn Error + Send + Sync)>> {
256+
) -> Result<u64, Box<dyn Error + Send + Sync>> {
257257
match c {
258258
#[cfg(feature = "postgres")]
259259
DatabaseConnection::Postgres(client) => client.execute(stmt, params).await,

0 commit comments

Comments
 (0)