Skip to content

Commit 6affa5f

Browse files
ffreddowffreddow
committed
backend: fix clippy
1 parent 07c11b8 commit 6affa5f

24 files changed

+99
-132
lines changed

‎backend/src/lib.rs‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ pub fn clean_verification_tokens(
129129
Ok(v) => v.into_iter().map(|v| v.user).collect(),
130130
Err(NotFound) => Vec::new(),
131131
Err(err) => {
132-
log::error!("Failed to get Verification-Token from Database: {}", err);
132+
log::error!("Failed to get Verification-Token from Database: {err}");
133133
return;
134134
}
135135
}
@@ -149,7 +149,7 @@ pub fn clean_verification_tokens(
149149
Ok(u) => u,
150150
Err(NotFound) => Vec::new(),
151151
Err(err) => {
152-
log::error!("Failed to get users for cleanup: {}", err);
152+
log::error!("Failed to get users for cleanup: {err}");
153153
return;
154154
}
155155
};
@@ -164,7 +164,7 @@ pub fn clean_verification_tokens(
164164
))
165165
.execute(conn)
166166
.or_else(|e| {
167-
log::error!("Failed to update user: {}", e);
167+
log::error!("Failed to update user: {e}");
168168
Ok::<usize, diesel::result::Error>(0)
169169
});
170170
}
@@ -186,7 +186,7 @@ pub fn clean_verification_tokens(
186186
)
187187
.execute(conn)
188188
.or_else(|e| {
189-
log::error!("Failed to delete unverified users: {}", e);
189+
log::error!("Failed to delete unverified users: {e}");
190190
Ok::<usize, diesel::result::Error>(0)
191191
});
192192
}
@@ -201,7 +201,7 @@ pub fn clean_chargers(conn: &mut PooledConnection<diesel::r2d2::ConnectionManage
201201
match chargers.select(Charger::as_select()).load(conn) {
202202
Ok(c) => c,
203203
Err(err) => {
204-
log::error!("Failed to get chargers for cleanup: {}", err);
204+
log::error!("Failed to get chargers for cleanup: {err}");
205205
return;
206206
}
207207
}
@@ -220,13 +220,13 @@ pub fn clean_chargers(conn: &mut PooledConnection<diesel::r2d2::ConnectionManage
220220
let _ = diesel::delete(chargers.find(&charger.id))
221221
.execute(conn)
222222
.or_else(|e| {
223-
log::error!("Failed to remove unreferenced charger: {}", e);
223+
log::error!("Failed to remove unreferenced charger: {e}");
224224
Ok::<usize, diesel::result::Error>(0)
225225
});
226226
}
227227
}
228228
Err(err) => {
229-
log::error!("Failed to get allowed user for charger cleanup: {}", err);
229+
log::error!("Failed to get allowed user for charger cleanup: {err}");
230230
}
231231
};
232232
}
@@ -444,7 +444,7 @@ pub(crate) mod tests {
444444
#[actix_web::test]
445445
async fn test_clean_verification_tokens() {
446446
let user_id = uuid::Uuid::new_v4();
447-
let email = format!("{}@invalid", user_id);
447+
let email = format!("{user_id}@invalid");
448448
let user = User {
449449
id: user_id,
450450
name: user_id.to_string(),
@@ -464,7 +464,7 @@ pub(crate) mod tests {
464464
let user2 = User {
465465
id: user2_id,
466466
name: user2_id.to_string(),
467-
email: format!("{}@invalid", user2_id),
467+
email: format!("{user2_id}@invalid"),
468468
login_key: String::new(),
469469
email_verified: false,
470470
secret: Vec::new(),
@@ -480,7 +480,7 @@ pub(crate) mod tests {
480480
let user3 = User {
481481
id: user3_id,
482482
name: user3_id.to_string(),
483-
email: format!("{}@invalid", user3_id),
483+
email: format!("{user3_id}@invalid"),
484484
login_key: String::new(),
485485
email_verified: true,
486486
secret: Vec::new(),
@@ -496,7 +496,7 @@ pub(crate) mod tests {
496496
let user4 = User {
497497
id: user4_id,
498498
name: user4_id.to_string(),
499-
email: format!("{}@invalid", user4_id),
499+
email: format!("{user4_id}@invalid"),
500500
login_key: String::new(),
501501
email_verified: false,
502502
secret: Vec::new(),

‎backend/src/monitoring.rs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,26 +65,24 @@ pub fn start_monitoring(state: web::Data<AppState>) {
6565
let (num_users, num_chargers) = match get_numbers(conn) {
6666
Ok(v) => v,
6767
Err(err) => {
68-
log::error!("Failed to get monitoring statistics from database: {}", err);
68+
log::error!("Failed to get monitoring statistics from database: {err}");
6969
std::thread::sleep(Duration::from_secs(60 * 60 * 24));
7070
continue;
7171
}
7272
};
7373
match send_mail(&state, num_users, num_chargers) {
7474
Ok(()) => {
7575
log::info!(
76-
"Monitoring email sent successfully. Users: {}, Chargers: {}",
77-
num_users,
78-
num_chargers
76+
"Monitoring email sent successfully. Users: {num_users}, Chargers: {num_chargers}"
7977
);
8078
}
8179
Err(err) => {
82-
log::error!("Failed to send monitoring mail: {}", err);
80+
log::error!("Failed to send monitoring mail: {err}");
8381
}
8482
}
8583
}
8684
Err(e) => {
87-
log::error!("Failed to get database connection for monitoring: {:?}", e);
85+
log::error!("Failed to get database connection for monitoring: {e:?}");
8886
}
8987
}
9088

‎backend/src/rate_limit.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ impl LoginRateLimiter {
8484

8585
let key = LoginRateLimitKey { user: email, ip };
8686
if let Err(err) = self.0.check_key(&key) {
87-
log::warn!("RateLimiter triggered for {:?}", key);
87+
log::warn!("RateLimiter triggered for {key:?}");
8888
let now = self.0.clock().now();
8989

9090
Err(RateLimitError::new(err, now).into())
@@ -129,7 +129,7 @@ impl ChargerRateLimiter {
129129

130130
let key = ChargerRateLimitKey { charger_id, ip };
131131
if let Err(err) = self.0.check_key(&key) {
132-
log::warn!("RateLimiter triggered for {:?}", key);
132+
log::warn!("RateLimiter triggered for {key:?}");
133133
let now = self.0.clock().now();
134134

135135
Err(RateLimitError::new(err, now).into())
@@ -199,7 +199,7 @@ impl IPRateLimiter {
199199
let ip = ip_from_req(req)?;
200200

201201
if let Err(err) = self.0.check_key(&ip) {
202-
log::warn!("RateLimiter triggered for {}", ip);
202+
log::warn!("RateLimiter triggered for {ip}");
203203
let now = self.0.clock().now();
204204

205205
Err(RateLimitError::new(err, now).into())

‎backend/src/routes/auth/get_login_salt.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ pub mod tests {
8282
let app = test::init_service(app).await;
8383

8484
let req = TestRequest::get()
85-
.uri(&format!("/get_login_salt?email={}", mail))
85+
.uri(&format!("/get_login_salt?email={mail}"))
8686
.append_header(("X-Forwarded-For", "123.123.123.2"))
8787
.to_request();
8888
let resp = test::call_and_read_body_json(&app, req).await;
@@ -101,7 +101,7 @@ pub mod tests {
101101
let app = test::init_service(app).await;
102102

103103
let req = test::TestRequest::get()
104-
.uri(&format!("/get_login_salt?email={}", mail))
104+
.uri(&format!("/get_login_salt?email={mail}"))
105105
.append_header(("X-Forwarded-For", "123.123.123.2"))
106106
.to_request();
107107
let resp = test::call_service(&app, req).await;
@@ -129,7 +129,7 @@ pub mod tests {
129129
let mail = format!("{}@example.invalid", uuid::Uuid::new_v4());
130130

131131
let req = test::TestRequest::get()
132-
.uri(&format!("/get_login_salt?email={}", mail))
132+
.uri(&format!("/get_login_salt?email={mail}"))
133133
.append_header(("X-Forwarded-For", "123.123.123.2"))
134134
.to_request();
135135
let resp = test::call_service(&app, req).await;
@@ -139,7 +139,7 @@ pub mod tests {
139139
assert_eq!(first_salt.len(), 24);
140140

141141
let req = test::TestRequest::get()
142-
.uri(&format!("/get_login_salt?email={}", mail))
142+
.uri(&format!("/get_login_salt?email={mail}"))
143143
.append_header(("X-Forwarded-For", "123.123.123.2"))
144144
.to_request();
145145
let resp = test::call_service(&app, req).await;
@@ -149,7 +149,7 @@ pub mod tests {
149149

150150
let mail = format!("{}@example.invalid", uuid::Uuid::new_v4());
151151
let req = test::TestRequest::get()
152-
.uri(&format!("/get_login_salt?email={}", mail))
152+
.uri(&format!("/get_login_salt?email={mail}"))
153153
.append_header(("X-Forwarded-For", "123.123.123.2"))
154154
.to_request();
155155
let resp = test::call_service(&app, req).await;

‎backend/src/routes/auth/jwt_refresh.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ pub async fn jwt_refresh(
130130
.http_only(true)
131131
.finish();
132132

133-
log::error!("JWT-Refresh failed: {}", err);
133+
log::error!("JWT-Refresh failed: {err}");
134134
let mut err = err.error_response();
135135
err.add_removal_cookie(&access_token)?;
136136
err.add_removal_cookie(&refresh_token)?;
@@ -173,7 +173,7 @@ pub async fn jwt_refresh(
173173
.secure(true)
174174
.finish();
175175

176-
let cookie_string = format!("{}; Partitioned;", cookie);
176+
let cookie_string = format!("{cookie}; Partitioned;");
177177

178178
let refresh_cookie = create_refresh_token(&state, user.id).await?;
179179

‎backend/src/routes/auth/login.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ pub async fn login(
160160
.secure(true)
161161
.finish();
162162

163-
let cookie_string = format!("{}; Partitioned;", cookie);
163+
let cookie_string = format!("{cookie}; Partitioned;");
164164
let refresh_cookie = create_refresh_token(&state, uuid).await?;
165165

166166
Ok(HttpResponse::Ok()
@@ -226,7 +226,7 @@ pub async fn create_refresh_token(
226226
.secure(true)
227227
.finish();
228228

229-
Ok(format!("{}; Partitioned;", cookie))
229+
Ok(format!("{cookie}; Partitioned;"))
230230
}
231231

232232
#[cfg(test)]

‎backend/src/routes/auth/register.rs‎

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,7 @@ fn send_verification_mail(
101101
Ok(body) => (body, "Email verifizieren"),
102102
Err(e) => {
103103
log::error!(
104-
"Failed to render German verification email template for user '{}': {}",
105-
name,
106-
e
104+
"Failed to render German verification email template for user '{name}': {e}"
107105
);
108106
return Err(Error::InternalError.into());
109107
}
@@ -118,9 +116,7 @@ fn send_verification_mail(
118116
Ok(body) => (body, "Verify email"),
119117
Err(e) => {
120118
log::error!(
121-
"Failed to render English verification email template for user '{}': {}",
122-
name,
123-
e
119+
"Failed to render English verification email template for user '{name}': {e}"
124120
);
125121
return Err(Error::InternalError.into());
126122
}
@@ -363,7 +359,7 @@ pub(crate) mod tests {
363359
{
364360
Ok(_) => true,
365361
Err(NotFound) => false,
366-
Err(err) => panic!("Something went wrong: {}", err),
362+
Err(err) => panic!("Something went wrong: {err}"),
367363
}
368364
}
369365

‎backend/src/routes/auth/start_recovery.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ fn send_email(
5454
match template.render() {
5555
Ok(b) => (b, "Passwort Wiederherstellung"),
5656
Err(e) => {
57-
log::error!("Failed to render German password recovery email template for user '{}': {}", name, e);
57+
log::error!("Failed to render German password recovery email template for user '{name}': {e}");
5858
return Err(Error::InternalError.into());
5959
}
6060
}
@@ -67,7 +67,7 @@ fn send_email(
6767
match template.render() {
6868
Ok(b) => (b, "Password Recovery"),
6969
Err(e) => {
70-
log::error!("Failed to render English password recovery email template for user '{}': {}", name, e);
70+
log::error!("Failed to render English password recovery email template for user '{name}': {e}");
7171
return Err(Error::InternalError.into());
7272
}
7373
}
@@ -195,7 +195,7 @@ pub mod tests {
195195
let app = test::init_service(app).await;
196196

197197
let req = TestRequest::get()
198-
.uri(&format!("/start_recovery?email={}", mail))
198+
.uri(&format!("/start_recovery?email={mail}"))
199199
.to_request();
200200
let resp = test::call_service(&app, req).await;
201201
assert_eq!(resp.status(), 200);
@@ -222,7 +222,7 @@ pub mod tests {
222222
let app = test::init_service(app).await;
223223

224224
let req = TestRequest::get()
225-
.uri(&format!("/start_recovery?email={}", mail))
225+
.uri(&format!("/start_recovery?email={mail}"))
226226
.to_request();
227227
let resp = test::call_service(&app, req).await;
228228
assert_eq!(resp.status(), 200);

‎backend/src/routes/auth/verify.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ pub(crate) mod tests {
157157
use db_connector::schema::users::dsl::{email, users};
158158
use db_connector::schema::verification::dsl::*;
159159

160-
println!("mail: {}", mail);
160+
println!("mail: {mail}");
161161

162162
let u: User = users
163163
.filter(email.eq(mail))
@@ -186,7 +186,7 @@ pub(crate) mod tests {
186186
{
187187
Ok(_) => true,
188188
Err(NotFound) => false,
189-
Err(err) => panic!("Something went wrong: {}", err),
189+
Err(err) => panic!("Something went wrong: {err}"),
190190
}
191191
}
192192

@@ -204,7 +204,7 @@ pub(crate) mod tests {
204204
let app = test::init_service(app).await;
205205

206206
let req = test::TestRequest::get()
207-
.uri(&format!("/verify?id={}", verify_id))
207+
.uri(&format!("/verify?id={verify_id}"))
208208
.to_request();
209209

210210
let resp = test::call_service(&app, req).await;
@@ -251,7 +251,7 @@ pub(crate) mod tests {
251251
let app = test::init_service(app).await;
252252

253253
let req = test::TestRequest::get()
254-
.uri(&format!("/verify?i={}", verify_id))
254+
.uri(&format!("/verify?i={verify_id}"))
255255
.to_request();
256256

257257
let resp = test::call_service(&app, req).await;
@@ -272,7 +272,7 @@ pub(crate) mod tests {
272272
let (mut user, mail) = TestUser::random().await;
273273
user.login().await.to_string();
274274

275-
let changed_mail = format!("changed_{}", mail);
275+
let changed_mail = format!("changed_{mail}");
276276
let changed_mail_cpy = changed_mail.clone();
277277
defer!(delete_user(&changed_mail_cpy));
278278
let pool = db_connector::test_connection_pool();

0 commit comments

Comments
 (0)