Skip to content

Commit 628fbf8

Browse files
sigaloidsigaloid
committed
chore(clippy)
1 parent 11e68ea commit 628fbf8

6 files changed

Lines changed: 27 additions & 27 deletions

File tree

‎src/main.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -164,12 +164,12 @@ async fn main() {
164164
info!("[✅] Rate limit check passed");
165165
}
166166
Err(e) => {
167-
let mut message = format!("Rate limit check failed: {}", e);
167+
let mut message = format!("Rate limit check failed: {e}");
168168
message += "\nThis may cause issues with the rate limit.";
169169
message += "\nPlease report this error with the above information.";
170170
message += "\nhttps://github.com/redlib-org/redlib/issues/new?assignees=sigaloid&labels=bug&title=%F0%9F%90%9B+Bug+Report%3A+Rate+limit+mismatch";
171171
warn!("{}", message);
172-
eprintln!("{}", message);
172+
eprintln!("{message}");
173173
}
174174
}
175175

@@ -181,9 +181,9 @@ async fn main() {
181181
let ipv6_only = std::env::var("IPV6_ONLY").is_ok() || matches.get_flag("ipv6-only");
182182

183183
let listener = if ipv4_only {
184-
format!("0.0.0.0:{}", port)
184+
format!("0.0.0.0:{port}")
185185
} else if ipv6_only {
186-
format!("[::]:{}", port)
186+
format!("[::]:{port}")
187187
} else {
188188
[address, ":", port].concat()
189189
};

‎src/oauth.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -224,7 +224,7 @@ impl Device {
224224

225225
let qos = fastrand::u32(1000..=100_000);
226226
let qos: f32 = qos as f32 / 1000.0;
227-
let qos = format!("{:.3}", qos);
227+
let qos = format!("{qos:.3}");
228228

229229
let codecs = TextGenerator::new().generate("available-codecs=video/avc, video/hevc{, video/x-vnd.on2.vp9|}");
230230

‎src/server.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -855,7 +855,7 @@ mod tests {
855855

856856
CompressionType::Brotli => Box::new(BrotliDecompressor::new(body_cursor, expected_lorem_ipsum.len())),
857857

858-
_ => panic!("no decompressor for {}", expected_encoding),
858+
_ => panic!("no decompressor for {expected_encoding}"),
859859
};
860860

861861
let mut decompressed = Vec::<u8>::new();

‎src/settings.rs‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
163163
let subscriptions_cookie = if subscriptions_number == 0 {
164164
"subscriptions".to_string()
165165
} else {
166-
format!("subscriptions{}", subscriptions_number)
166+
format!("subscriptions{subscriptions_number}")
167167
};
168168

169169
response.insert_cookie(
@@ -214,7 +214,7 @@ fn set_cookies_method(req: Request<Body>, remove_cookies: bool) -> Response<Body
214214
let filters_cookie = if filters_number == 0 {
215215
"filters".to_string()
216216
} else {
217-
format!("filters{}", filters_number)
217+
format!("filters{filters_number}")
218218
};
219219

220220
response.insert_cookie(
@@ -268,7 +268,7 @@ pub async fn update(req: Request<Body>) -> Result<Response<Body>, String> {
268268
pub async fn encoded_restore(req: Request<Body>) -> Result<Response<Body>, String> {
269269
let body = hyper::body::to_bytes(req.into_body())
270270
.await
271-
.map_err(|e| format!("Failed to get bytes from request body: {}", e))?;
271+
.map_err(|e| format!("Failed to get bytes from request body: {e}"))?;
272272

273273
if body.len() > 1024 * 1024 {
274274
return Err("Request body too large".to_string());
@@ -283,12 +283,12 @@ pub async fn encoded_restore(req: Request<Body>) -> Result<Response<Body>, Strin
283283

284284
let out = timeout(std::time::Duration::from_secs(1), async { deflate_decompress(bytes) })
285285
.await
286-
.map_err(|e| format!("Failed to decompress bytes: {}", e))??;
286+
.map_err(|e| format!("Failed to decompress bytes: {e}"))??;
287287

288288
let mut prefs: Preferences = timeout(std::time::Duration::from_secs(1), async { bincode::deserialize(&out) })
289289
.await
290-
.map_err(|e| format!("Failed to deserialize preferences: {}", e))?
291-
.map_err(|e| format!("Failed to deserialize bytes into Preferences struct: {}", e))?;
290+
.map_err(|e| format!("Failed to deserialize preferences: {e}"))?
291+
.map_err(|e| format!("Failed to deserialize bytes into Preferences struct: {e}"))?;
292292

293293
prefs.available_themes = vec![];
294294

‎src/subreddit.rs‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -366,9 +366,9 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
366366
let mut subscriptions_number = 1;
367367

368368
// While whatever subscriptionsNUMBER cookie we're looking at has a value
369-
while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() {
369+
while req.cookie(&format!("subscriptions{subscriptions_number}")).is_some() {
370370
// Remove that subscriptions cookie
371-
response.remove_cookie(format!("subscriptions{}", subscriptions_number));
371+
response.remove_cookie(format!("subscriptions{subscriptions_number}"));
372372

373373
// Increment subscriptions cookie number
374374
subscriptions_number += 1;
@@ -382,7 +382,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
382382
let subscriptions_cookie = if subscriptions_number == 0 {
383383
"subscriptions".to_string()
384384
} else {
385-
format!("subscriptions{}", subscriptions_number)
385+
format!("subscriptions{subscriptions_number}")
386386
};
387387

388388
response.insert_cookie(
@@ -397,9 +397,9 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
397397
}
398398

399399
// While whatever subscriptionsNUMBER cookie we're looking at has a value
400-
while req.cookie(&format!("subscriptions{}", subscriptions_number_to_delete_from)).is_some() {
400+
while req.cookie(&format!("subscriptions{subscriptions_number_to_delete_from}")).is_some() {
401401
// Remove that subscriptions cookie
402-
response.remove_cookie(format!("subscriptions{}", subscriptions_number_to_delete_from));
402+
response.remove_cookie(format!("subscriptions{subscriptions_number_to_delete_from}"));
403403

404404
// Increment subscriptions cookie number
405405
subscriptions_number_to_delete_from += 1;
@@ -415,9 +415,9 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
415415
let mut filters_number = 1;
416416

417417
// While whatever filtersNUMBER cookie we're looking at has a value
418-
while req.cookie(&format!("filters{}", filters_number)).is_some() {
418+
while req.cookie(&format!("filters{filters_number}")).is_some() {
419419
// Remove that filters cookie
420-
response.remove_cookie(format!("filters{}", filters_number));
420+
response.remove_cookie(format!("filters{filters_number}"));
421421

422422
// Increment filters cookie number
423423
filters_number += 1;
@@ -430,7 +430,7 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
430430
let filters_cookie = if filters_number == 0 {
431431
"filters".to_string()
432432
} else {
433-
format!("filters{}", filters_number)
433+
format!("filters{filters_number}")
434434
};
435435

436436
response.insert_cookie(
@@ -445,9 +445,9 @@ pub async fn subscriptions_filters(req: Request<Body>) -> Result<Response<Body>,
445445
}
446446

447447
// While whatever filtersNUMBER cookie we're looking at has a value
448-
while req.cookie(&format!("filters{}", filters_number_to_delete_from)).is_some() {
448+
while req.cookie(&format!("filters{filters_number_to_delete_from}")).is_some() {
449449
// Remove that filters cookie
450-
response.remove_cookie(format!("filters{}", filters_number_to_delete_from));
450+
response.remove_cookie(format!("filters{filters_number_to_delete_from}"));
451451

452452
// Increment filters cookie number
453453
filters_number_to_delete_from += 1;

‎src/utils.rs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -755,7 +755,7 @@ pub fn deflate_compress(i: Vec<u8>) -> Result<Vec<u8>, String> {
755755
pub fn deflate_decompress(i: Vec<u8>) -> Result<Vec<u8>, String> {
756756
let mut decoder = Decoder::new(&i[..]);
757757
let mut out = Vec::new();
758-
decoder.read_to_end(&mut out).map_err(|e| format!("Failed to read from gzip decoder: {}", e))?;
758+
decoder.read_to_end(&mut out).map_err(|e| format!("Failed to read from gzip decoder: {e}"))?;
759759
Ok(out)
760760
}
761761

@@ -926,9 +926,9 @@ pub fn setting(req: &Request<Body>, name: &str) -> String {
926926
let mut subscriptions_number = 1;
927927

928928
// While whatever subscriptionsNUMBER cookie we're looking at has a value
929-
while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() {
929+
while req.cookie(&format!("subscriptions{subscriptions_number}")).is_some() {
930930
// Push whatever subscriptionsNUMBER cookie we're looking at into the subscriptions string
931-
subscriptions.push_str(req.cookie(&format!("subscriptions{}", subscriptions_number)).unwrap().value());
931+
subscriptions.push_str(req.cookie(&format!("subscriptions{subscriptions_number}")).unwrap().value());
932932

933933
// Increment subscription cookie number
934934
subscriptions_number += 1;
@@ -951,9 +951,9 @@ pub fn setting(req: &Request<Body>, name: &str) -> String {
951951
let mut filters_number = 1;
952952

953953
// While whatever filtersNUMBER cookie we're looking at has a value
954-
while req.cookie(&format!("filters{}", filters_number)).is_some() {
954+
while req.cookie(&format!("filters{filters_number}")).is_some() {
955955
// Push whatever filtersNUMBER cookie we're looking at into the filters string
956-
filters.push_str(req.cookie(&format!("filters{}", filters_number)).unwrap().value());
956+
filters.push_str(req.cookie(&format!("filters{filters_number}")).unwrap().value());
957957

958958
// Increment filters cookie number
959959
filters_number += 1;

0 commit comments

Comments
 (0)