Skip to content

Commit f8e724d

Browse files
TheRustifyerTheRustifyer
committed
fix: new clippy lints on v.1.90 onwards for the core module
1 parent d84e7dd commit f8e724d

File tree

9 files changed

+93
-87
lines changed

9 files changed

+93
-87
lines changed

‎canyon_core/src/canyon.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,7 @@ impl Canyon {
7676
// TODO: just call Canyon::init()? Why should we raise this error?
7777
// I guess that there's no point in making it fail for the user to manually start Canyon when we can handle everything
7878
// internally
79-
Box::new(std::io::Error::new(
80-
std::io::ErrorKind::Other,
79+
Box::new(std::io::Error::other(
8180
"Canyon not initialized. Call `Canyon::init()` first.",
8281
))
8382
})?)

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

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ pub(crate) mod sqlserver_query_launcher {
1818
use tiberius::QueryStream;
1919

2020
#[inline(always)]
21-
pub(crate) async fn query<'a, S, R>(
21+
pub(crate) async fn query<S, R>(
2222
stmt: S,
23-
params: &[&'a dyn QueryParameter],
23+
params: &[&'_ dyn QueryParameter],
2424
conn: &SqlServerConnection,
2525
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
2626
where
@@ -39,9 +39,9 @@ pub(crate) mod sqlserver_query_launcher {
3939
}
4040

4141
#[inline(always)]
42-
pub(crate) async fn query_rows<'a>(
42+
pub(crate) async fn query_rows(
4343
stmt: &str,
44-
params: &[&'a dyn QueryParameter],
44+
params: &[&'_ dyn QueryParameter],
4545
conn: &SqlServerConnection,
4646
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
4747
let result = execute_query(stmt, params, conn)
@@ -55,9 +55,9 @@ pub(crate) mod sqlserver_query_launcher {
5555
Ok(CanyonRows::Tiberius(result))
5656
}
5757

58-
pub(crate) async fn query_one<'a, R>(
58+
pub(crate) async fn query_one<R>(
5959
stmt: &str,
60-
params: &[&'a dyn QueryParameter],
60+
params: &[&'_ dyn QueryParameter],
6161
conn: &SqlServerConnection,
6262
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6363
where
@@ -71,9 +71,9 @@ pub(crate) mod sqlserver_query_launcher {
7171
}
7272
}
7373

74-
pub(crate) async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
74+
pub(crate) async fn query_one_for<T: FromSqlOwnedValue<T>>(
7575
stmt: &str,
76-
params: &[&'a dyn QueryParameter],
76+
params: &[&'_ dyn QueryParameter],
7777
conn: &SqlServerConnection,
7878
) -> Result<T, Box<dyn Error + Send + Sync>> {
7979
let row = execute_query(stmt, params, conn)
@@ -91,9 +91,9 @@ pub(crate) mod sqlserver_query_launcher {
9191
)
9292
}
9393

94-
pub(crate) async fn execute<'a>(
94+
pub(crate) async fn execute(
9595
stmt: &str,
96-
params: &[&'a dyn QueryParameter],
96+
params: &[&'_ dyn QueryParameter],
9797
conn: &SqlServerConnection,
9898
) -> Result<u64, Box<dyn Error + Send + Sync>> {
9999
let mssql_query = generate_mssql_stmt(stmt, params).await;

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -48,18 +48,18 @@ pub(crate) mod mysql_query_launcher {
4848
}
4949

5050
#[inline(always)]
51-
pub(crate) async fn query_rows<'a>(
51+
pub(crate) async fn query_rows(
5252
stmt: &str,
53-
params: &[&'a dyn QueryParameter],
53+
params: &[&'_ dyn QueryParameter],
5454
conn: &MysqlConnection,
5555
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
5656
Ok(CanyonRows::MySQL(execute_query(stmt, params, conn).await?))
5757
}
5858

5959
#[inline(always)]
60-
pub(crate) async fn query_one<'a, R>(
60+
pub(crate) async fn query_one<R>(
6161
stmt: &str,
62-
params: &[&'a dyn QueryParameter],
62+
params: &[&'_ dyn QueryParameter],
6363
conn: &MysqlConnection,
6464
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6565
where
@@ -74,9 +74,9 @@ pub(crate) mod mysql_query_launcher {
7474
}
7575

7676
#[inline(always)]
77-
pub(crate) async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
77+
pub(crate) async fn query_one_for<T: FromSqlOwnedValue<T>>(
7878
stmt: &str,
79-
params: &[&'a dyn QueryParameter],
79+
params: &[&'_ dyn QueryParameter],
8080
conn: &MysqlConnection,
8181
) -> Result<T, Box<dyn Error + Send + Sync>> {
8282
Ok(execute_query(stmt, params, conn)

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

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,9 @@ pub(crate) mod postgres_query_launcher {
3939
}
4040

4141
#[inline(always)]
42-
pub(crate) async fn query_rows<'a>(
42+
pub(crate) async fn query_rows(
4343
stmt: &str,
44-
params: &[&'a dyn QueryParameter],
44+
params: &[&'_ dyn QueryParameter],
4545
conn: &PostgreSqlConnection,
4646
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
4747
let m_params: Vec<_> = params
@@ -55,9 +55,9 @@ pub(crate) mod postgres_query_launcher {
5555
/// *NOTE*: implementation details of `query_one` when handling errors are
5656
/// discussed [here](https://github.com/sfackler/rust-postgres/issues/790#issuecomment-2095729043)
5757
#[inline(always)]
58-
pub(crate) async fn query_one<'a, R>(
58+
pub(crate) async fn query_one<R>(
5959
stmt: &str,
60-
params: &[&'a dyn QueryParameter],
60+
params: &[&'_ dyn QueryParameter],
6161
conn: &PostgreSqlConnection,
6262
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
6363
where
@@ -79,9 +79,9 @@ pub(crate) mod postgres_query_launcher {
7979
}
8080

8181
#[inline(always)]
82-
pub(crate) async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
82+
pub(crate) async fn query_one_for<T: FromSqlOwnedValue<T>>(
8383
stmt: &str,
84-
params: &[&'a dyn QueryParameter],
84+
params: &[&'_ dyn QueryParameter],
8585
conn: &PostgreSqlConnection,
8686
) -> Result<T, Box<dyn Error + Send + Sync>> {
8787
let m_params: Vec<_> = params
@@ -93,9 +93,9 @@ pub(crate) mod postgres_query_launcher {
9393
}
9494

9595
#[inline(always)]
96-
pub(crate) async fn execute<S>(
96+
pub(crate) async fn execute<'a, S>(
9797
stmt: S,
98-
params: &[&'_ dyn QueryParameter],
98+
params: &'a [&'a (dyn QueryParameter + 'a)],
9999
conn: &PostgreSqlConnection,
100100
) -> Result<u64, Box<dyn Error + Send + Sync>>
101101
where
@@ -107,9 +107,8 @@ 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 [&'a dyn QueryParameter]) -> Vec<&'a (dyn ToSql + Sync)> {
111111
params
112-
.as_ref()
113112
.iter()
114113
.map(|param| param.as_postgres_param())
115114
.collect::<Vec<_>>()

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

Lines changed: 38 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,18 @@ use crate::{
99
use std::error::Error;
1010

1111
impl DbConnection for DatabaseConnection {
12-
async fn query_rows<'a>(
12+
async fn query_rows(
1313
&self,
1414
stmt: &str,
15-
params: &[&'a dyn QueryParameter],
15+
params: &[&'_ dyn QueryParameter],
1616
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
1717
db_conn_query_rows_impl(self, stmt, params).await
1818
}
1919

20-
async fn query<'a, S, R>(
20+
async fn query<S, R>(
2121
&self,
2222
stmt: S,
23-
params: &[&'a dyn QueryParameter],
23+
params: &[&'_ dyn QueryParameter],
2424
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
2525
where
2626
S: AsRef<str> + Send,
@@ -30,29 +30,29 @@ impl DbConnection for DatabaseConnection {
3030
db_conn_query_impl(self, stmt, params).await
3131
}
3232

33-
async fn query_one<'a, R>(
33+
async fn query_one<R>(
3434
&self,
3535
stmt: &str,
36-
params: &[&'a dyn QueryParameter],
36+
params: &[&'_ dyn QueryParameter],
3737
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
3838
where
3939
R: RowMapper,
4040
{
4141
db_conn_query_one_impl::<R>(self, stmt, params).await
4242
}
4343

44-
async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
44+
async fn query_one_for<T: FromSqlOwnedValue<T>>(
4545
&self,
4646
stmt: &str,
47-
params: &[&'a dyn QueryParameter],
47+
params: &[&'_ dyn QueryParameter],
4848
) -> Result<T, Box<dyn Error + Send + Sync>> {
4949
db_conn_query_one_for_impl::<T>(self, stmt, params).await
5050
}
5151

52-
async fn execute<'a>(
52+
async fn execute(
5353
&self,
5454
stmt: &str,
55-
params: &[&'a dyn QueryParameter],
55+
params: &[&'_ dyn QueryParameter],
5656
) -> Result<u64, Box<dyn Error + Send + Sync>> {
5757
db_conn_execute_impl(self, stmt, params).await
5858
}
@@ -63,18 +63,18 @@ impl DbConnection for DatabaseConnection {
6363
}
6464

6565
impl DbConnection for &DatabaseConnection {
66-
async fn query_rows<'a>(
66+
async fn query_rows(
6767
&self,
6868
stmt: &str,
69-
params: &[&'a dyn QueryParameter],
69+
params: &[&'_ dyn QueryParameter],
7070
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
7171
db_conn_query_rows_impl(self, stmt, params).await
7272
}
7373

74-
async fn query<'a, S, R>(
74+
async fn query<S, R>(
7575
&self,
7676
stmt: S,
77-
params: &[&'a dyn QueryParameter],
77+
params: &[&'_ dyn QueryParameter],
7878
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
7979
where
8080
S: AsRef<str> + Send,
@@ -84,29 +84,29 @@ impl DbConnection for &DatabaseConnection {
8484
db_conn_query_impl(self, stmt, params).await
8585
}
8686

87-
async fn query_one<'a, R>(
87+
async fn query_one<R>(
8888
&self,
8989
stmt: &str,
90-
params: &[&'a dyn QueryParameter],
90+
params: &[&'_ dyn QueryParameter],
9191
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
9292
where
9393
R: RowMapper,
9494
{
9595
db_conn_query_one_impl::<R>(self, stmt, params).await
9696
}
9797

98-
async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
98+
async fn query_one_for<T: FromSqlOwnedValue<T>>(
9999
&self,
100100
stmt: &str,
101-
params: &[&'a dyn QueryParameter],
101+
params: &[&'_ dyn QueryParameter],
102102
) -> Result<T, Box<dyn Error + Send + Sync>> {
103103
db_conn_query_one_for_impl::<T>(self, stmt, params).await
104104
}
105105

106-
async fn execute<'a>(
106+
async fn execute(
107107
&self,
108108
stmt: &str,
109-
params: &[&'a dyn QueryParameter],
109+
params: &[&'_ dyn QueryParameter],
110110
) -> Result<u64, Box<dyn Error + Send + Sync>> {
111111
db_conn_execute_impl(self, stmt, params).await
112112
}
@@ -117,18 +117,18 @@ impl DbConnection for &DatabaseConnection {
117117
}
118118

119119
impl DbConnection for &mut DatabaseConnection {
120-
async fn query_rows<'a>(
120+
async fn query_rows(
121121
&self,
122122
stmt: &str,
123-
params: &[&'a dyn QueryParameter],
123+
params: &[&'_ dyn QueryParameter],
124124
) -> Result<CanyonRows, Box<dyn Error + Send + Sync>> {
125125
db_conn_query_rows_impl(self, stmt, params).await
126126
}
127127

128-
async fn query<'a, S, R>(
128+
async fn query<S, R>(
129129
&self,
130130
stmt: S,
131-
params: &[&'a dyn QueryParameter],
131+
params: &[&'_ dyn QueryParameter],
132132
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
133133
where
134134
S: AsRef<str> + Send,
@@ -138,29 +138,29 @@ impl DbConnection for &mut DatabaseConnection {
138138
db_conn_query_impl(self, stmt, params).await
139139
}
140140

141-
async fn query_one<'a, R>(
141+
async fn query_one<R>(
142142
&self,
143143
stmt: &str,
144-
params: &[&'a dyn QueryParameter],
144+
params: &[&'_ dyn QueryParameter],
145145
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
146146
where
147147
R: RowMapper,
148148
{
149149
db_conn_query_one_impl::<R>(self, stmt, params).await
150150
}
151151

152-
async fn query_one_for<'a, T: FromSqlOwnedValue<T>>(
152+
async fn query_one_for<T: FromSqlOwnedValue<T>>(
153153
&self,
154154
stmt: &str,
155-
params: &[&'a dyn QueryParameter],
155+
params: &[&'_ dyn QueryParameter],
156156
) -> Result<T, Box<dyn Error + Send + Sync>> {
157157
db_conn_query_one_for_impl::<T>(self, stmt, params).await
158158
}
159159

160-
async fn execute<'a>(
160+
async fn execute(
161161
&self,
162162
stmt: &str,
163-
params: &[&'a dyn QueryParameter],
163+
params: &[&'_ dyn QueryParameter],
164164
) -> Result<u64, Box<dyn Error + Send + Sync>> {
165165
db_conn_execute_impl(self, stmt, params).await
166166
}
@@ -187,10 +187,10 @@ pub(crate) async fn db_conn_query_rows_impl<'a>(
187187
}
188188
}
189189

190-
pub(crate) async fn db_conn_query_one_impl<'a, R>(
190+
pub(crate) async fn db_conn_query_one_impl<R>(
191191
c: &DatabaseConnection,
192192
stmt: &str,
193-
params: &[&'a (dyn QueryParameter + 'a)],
193+
params: &[&'_ (dyn QueryParameter + '_)],
194194
) -> Result<Option<R::Output>, Box<dyn Error + Send + Sync>>
195195
where
196196
R: RowMapper,
@@ -207,10 +207,10 @@ where
207207
}
208208
}
209209

210-
pub(crate) async fn db_conn_query_impl<'a, S, R>(
210+
pub(crate) async fn db_conn_query_impl<S, R>(
211211
c: &DatabaseConnection,
212212
stmt: S,
213-
params: &[&'a dyn QueryParameter],
213+
params: &[&'_ dyn QueryParameter],
214214
) -> Result<Vec<R>, Box<dyn Error + Send + Sync>>
215215
where
216216
S: AsRef<str> + Send,
@@ -229,10 +229,10 @@ where
229229
}
230230
}
231231

232-
pub(crate) async fn db_conn_query_one_for_impl<'a, T>(
232+
pub(crate) async fn db_conn_query_one_for_impl<T>(
233233
c: &DatabaseConnection,
234234
stmt: &str,
235-
params: &[&'a dyn QueryParameter],
235+
params: &[&'_ dyn QueryParameter],
236236
) -> Result<T, Box<dyn Error + Send + Sync>>
237237
where
238238
T: FromSqlOwnedValue<T>,
@@ -249,10 +249,10 @@ where
249249
}
250250
}
251251

252-
pub(crate) async fn db_conn_execute_impl<'a>(
252+
pub(crate) async fn db_conn_execute_impl(
253253
c: &DatabaseConnection,
254254
stmt: &str,
255-
params: &[&'a dyn QueryParameter],
255+
params: &[&'_ dyn QueryParameter],
256256
) -> Result<u64, Box<dyn Error + Send + Sync>> {
257257
match c {
258258
#[cfg(feature = "postgres")]

0 commit comments

Comments
 (0)