diff --git a/src/main.rs b/src/main.rs index e1b010d..00b86ae 100644 --- a/src/main.rs +++ b/src/main.rs @@ -164,12 +164,12 @@ async fn main() { info!("[✅] Rate limit check passed"); } Err(e) => { - let mut message = format!("Rate limit check failed: {}", e); + let mut message = format!("Rate limit check failed: {e}"); message += "\nThis may cause issues with the rate limit."; message += "\nPlease report this error with the above information."; message += "\nhttps://github.com/redlib-org/redlib/issues/new?assignees=sigaloid&labels=bug&title=%F0%9F%90%9B+Bug+Report%3A+Rate+limit+mismatch"; warn!("{}", message); - eprintln!("{}", message); + eprintln!("{message}"); } } @@ -181,9 +181,9 @@ async fn main() { let ipv6_only = std::env::var("IPV6_ONLY").is_ok() || matches.get_flag("ipv6-only"); let listener = if ipv4_only { - format!("0.0.0.0:{}", port) + format!("0.0.0.0:{port}") } else if ipv6_only { - format!("[::]:{}", port) + format!("[::]:{port}") } else { [address, ":", port].concat() }; diff --git a/src/oauth.rs b/src/oauth.rs index f5659da..9654e0c 100644 --- a/src/oauth.rs +++ b/src/oauth.rs @@ -224,7 +224,7 @@ impl Device { let qos = fastrand::u32(1000..=100_000); let qos: f32 = qos as f32 / 1000.0; - let qos = format!("{:.3}", qos); + let qos = format!("{qos:.3}"); let codecs = TextGenerator::new().generate("available-codecs=video/avc, video/hevc{, video/x-vnd.on2.vp9|}"); diff --git a/src/server.rs b/src/server.rs index cda2803..32b0bd4 100644 --- a/src/server.rs +++ b/src/server.rs @@ -855,7 +855,7 @@ mod tests { CompressionType::Brotli => Box::new(BrotliDecompressor::new(body_cursor, expected_lorem_ipsum.len())), - _ => panic!("no decompressor for {}", expected_encoding), + _ => panic!("no decompressor for {expected_encoding}"), }; let mut decompressed = Vec::::new(); diff --git a/src/settings.rs b/src/settings.rs index 2efbbba..bb9bb99 100644 --- a/src/settings.rs +++ b/src/settings.rs @@ -163,7 +163,7 @@ fn set_cookies_method(req: Request, remove_cookies: bool) -> Response, remove_cookies: bool) -> Response) -> Result, String> { pub async fn encoded_restore(req: Request) -> Result, String> { let body = hyper::body::to_bytes(req.into_body()) .await - .map_err(|e| format!("Failed to get bytes from request body: {}", e))?; + .map_err(|e| format!("Failed to get bytes from request body: {e}"))?; if body.len() > 1024 * 1024 { return Err("Request body too large".to_string()); @@ -283,12 +283,12 @@ pub async fn encoded_restore(req: Request) -> Result, Strin let out = timeout(std::time::Duration::from_secs(1), async { deflate_decompress(bytes) }) .await - .map_err(|e| format!("Failed to decompress bytes: {}", e))??; + .map_err(|e| format!("Failed to decompress bytes: {e}"))??; let mut prefs: Preferences = timeout(std::time::Duration::from_secs(1), async { bincode::deserialize(&out) }) .await - .map_err(|e| format!("Failed to deserialize preferences: {}", e))? - .map_err(|e| format!("Failed to deserialize bytes into Preferences struct: {}", e))?; + .map_err(|e| format!("Failed to deserialize preferences: {e}"))? + .map_err(|e| format!("Failed to deserialize bytes into Preferences struct: {e}"))?; prefs.available_themes = vec![]; diff --git a/src/subreddit.rs b/src/subreddit.rs index f84cca3..d631e31 100644 --- a/src/subreddit.rs +++ b/src/subreddit.rs @@ -366,9 +366,9 @@ pub async fn subscriptions_filters(req: Request) -> Result, let mut subscriptions_number = 1; // While whatever subscriptionsNUMBER cookie we're looking at has a value - while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() { + while req.cookie(&format!("subscriptions{subscriptions_number}")).is_some() { // Remove that subscriptions cookie - response.remove_cookie(format!("subscriptions{}", subscriptions_number)); + response.remove_cookie(format!("subscriptions{subscriptions_number}")); // Increment subscriptions cookie number subscriptions_number += 1; @@ -382,7 +382,7 @@ pub async fn subscriptions_filters(req: Request) -> Result, let subscriptions_cookie = if subscriptions_number == 0 { "subscriptions".to_string() } else { - format!("subscriptions{}", subscriptions_number) + format!("subscriptions{subscriptions_number}") }; response.insert_cookie( @@ -397,9 +397,9 @@ pub async fn subscriptions_filters(req: Request) -> Result, } // While whatever subscriptionsNUMBER cookie we're looking at has a value - while req.cookie(&format!("subscriptions{}", subscriptions_number_to_delete_from)).is_some() { + while req.cookie(&format!("subscriptions{subscriptions_number_to_delete_from}")).is_some() { // Remove that subscriptions cookie - response.remove_cookie(format!("subscriptions{}", subscriptions_number_to_delete_from)); + response.remove_cookie(format!("subscriptions{subscriptions_number_to_delete_from}")); // Increment subscriptions cookie number subscriptions_number_to_delete_from += 1; @@ -415,9 +415,9 @@ pub async fn subscriptions_filters(req: Request) -> Result, let mut filters_number = 1; // While whatever filtersNUMBER cookie we're looking at has a value - while req.cookie(&format!("filters{}", filters_number)).is_some() { + while req.cookie(&format!("filters{filters_number}")).is_some() { // Remove that filters cookie - response.remove_cookie(format!("filters{}", filters_number)); + response.remove_cookie(format!("filters{filters_number}")); // Increment filters cookie number filters_number += 1; @@ -430,7 +430,7 @@ pub async fn subscriptions_filters(req: Request) -> Result, let filters_cookie = if filters_number == 0 { "filters".to_string() } else { - format!("filters{}", filters_number) + format!("filters{filters_number}") }; response.insert_cookie( @@ -445,9 +445,9 @@ pub async fn subscriptions_filters(req: Request) -> Result, } // While whatever filtersNUMBER cookie we're looking at has a value - while req.cookie(&format!("filters{}", filters_number_to_delete_from)).is_some() { + while req.cookie(&format!("filters{filters_number_to_delete_from}")).is_some() { // Remove that filters cookie - response.remove_cookie(format!("filters{}", filters_number_to_delete_from)); + response.remove_cookie(format!("filters{filters_number_to_delete_from}")); // Increment filters cookie number filters_number_to_delete_from += 1; diff --git a/src/utils.rs b/src/utils.rs index f5046cb..c3f0f25 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -755,7 +755,7 @@ pub fn deflate_compress(i: Vec) -> Result, String> { pub fn deflate_decompress(i: Vec) -> Result, String> { let mut decoder = Decoder::new(&i[..]); let mut out = Vec::new(); - decoder.read_to_end(&mut out).map_err(|e| format!("Failed to read from gzip decoder: {}", e))?; + decoder.read_to_end(&mut out).map_err(|e| format!("Failed to read from gzip decoder: {e}"))?; Ok(out) } @@ -926,9 +926,9 @@ pub fn setting(req: &Request, name: &str) -> String { let mut subscriptions_number = 1; // While whatever subscriptionsNUMBER cookie we're looking at has a value - while req.cookie(&format!("subscriptions{}", subscriptions_number)).is_some() { + while req.cookie(&format!("subscriptions{subscriptions_number}")).is_some() { // Push whatever subscriptionsNUMBER cookie we're looking at into the subscriptions string - subscriptions.push_str(req.cookie(&format!("subscriptions{}", subscriptions_number)).unwrap().value()); + subscriptions.push_str(req.cookie(&format!("subscriptions{subscriptions_number}")).unwrap().value()); // Increment subscription cookie number subscriptions_number += 1; @@ -951,9 +951,9 @@ pub fn setting(req: &Request, name: &str) -> String { let mut filters_number = 1; // While whatever filtersNUMBER cookie we're looking at has a value - while req.cookie(&format!("filters{}", filters_number)).is_some() { + while req.cookie(&format!("filters{filters_number}")).is_some() { // Push whatever filtersNUMBER cookie we're looking at into the filters string - filters.push_str(req.cookie(&format!("filters{}", filters_number)).unwrap().value()); + filters.push_str(req.cookie(&format!("filters{filters_number}")).unwrap().value()); // Increment filters cookie number filters_number += 1;