bump version and address new clippy lints

Author: elrido

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Change Log
 
+# 0.18.6
+- bump libraries
+
 # 0.18.5
 - changes for maxminddb 0.27.0
 - bump libraries

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "directory"
-version = "0.18.5"
+version = "0.18.6"
 authors = ["El RIDO <elrido@gmx.net>"]
 edition = "2021"
 license = "AGPL-3.0"

Cargo.toml

@@ -19,7 +19,7 @@ This document lists the licenses of the projects used in the instance directory.
 
 #### Used by
 
-- [directory](https://crates.io/crates/directory) 0.18.5
+- [directory](https://crates.io/crates/directory) 0.18.6
 
 ```
 GNU AFFERO GENERAL PUBLIC LICENSE
@@ -3197,15 +3197,15 @@ END OF TERMS AND CONDITIONS
 
 #### Used by
 
-- [futures-channel](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-core](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-executor](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-io](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-macro](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-sink](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-task](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures-util](https://github.com/rust-lang/futures-rs) 0.3.31
-- [futures](https://github.com/rust-lang/futures-rs) 0.3.31
+- [futures-channel](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-core](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-executor](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-io](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-macro](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-sink](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-task](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures-util](https://github.com/rust-lang/futures-rs) 0.3.32
+- [futures](https://github.com/rust-lang/futures-rs) 0.3.32
 
 ```
                               Apache License
@@ -5573,7 +5573,7 @@ limitations under the License.
 - [pkg-config](https://github.com/rust-lang/pkg-config-rs) 0.3.32
 - [regex-automata](https://github.com/rust-lang/regex) 0.4.12
 - [regex-syntax](https://github.com/rust-lang/regex/tree/master/regex-syntax) 0.8.5
-- [regex](https://github.com/rust-lang/regex) 1.12.2
+- [regex](https://github.com/rust-lang/regex) 1.12.3
 - [ring](https://github.com/briansmith/ring) 0.17.14
 - [rustix](https://github.com/bytecodealliance/rustix) 1.0.7
 - [rustls](https://github.com/rustls/rustls) 0.23.30
@@ -5590,7 +5590,7 @@ limitations under the License.
 - [thread_local](https://github.com/Amanieu/thread_local-rs) 1.1.9
 - [ucd-trie](https://github.com/BurntSushi/ucd-generate) 0.1.7
 - [unicode-xid](https://github.com/unicode-rs/unicode-xid) 0.2.6
-- [url](https://github.com/servo/rust-url) 2.5.7
+- [url](https://github.com/servo/rust-url) 2.5.8
 - [version_check](https://github.com/SergioBenitez/version_check) 0.9.5
 - [wasi](https://github.com/bytecodealliance/wasi) 0.11.1+wasi-snapshot-preview1
 - [wasi](https://github.com/bytecodealliance/wasi-rs) 0.14.2+wasi-0.2.4
@@ -8212,7 +8212,7 @@ third-party/chromium/LICENSE.
 
 #### Used by
 
-- [maxminddb](https://github.com/oschwald/maxminddb-rust) 0.27.0
+- [maxminddb](https://github.com/oschwald/maxminddb-rust) 0.27.3
 
 ```
 ISC License
@@ -8471,7 +8471,7 @@ DEALINGS IN THE SOFTWARE.
 
 #### Used by
 
-- [bytes](https://github.com/tokio-rs/bytes) 1.10.1
+- [bytes](https://github.com/tokio-rs/bytes) 1.11.1
 
 ```
 Copyright (c) 2018 Carl Lerche
@@ -8829,7 +8829,7 @@ DEALINGS IN THE SOFTWARE.
 
 #### Used by
 
-- [hyper-util](https://github.com/hyperium/hyper-util) 0.1.18
+- [hyper-util](https://github.com/hyperium/hyper-util) 0.1.20
 
 ```
 Copyright (c) 2023-2025 Sean McArthur
@@ -9049,7 +9049,7 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRES
 
 - [tokio-stream](https://github.com/tokio-rs/tokio) 0.1.17
 - [tokio-util](https://github.com/tokio-rs/tokio) 0.7.15
-- [tokio](https://github.com/tokio-rs/tokio) 1.48.0
+- [tokio](https://github.com/tokio-rs/tokio) 1.50.0
 
 ```
 MIT License

LICENSE.md

@@ -450,6 +450,7 @@ fn favicon() -> Redirect {
     Redirect::permanent("/img/favicon.ico")
 }
 
+#[allow(clippy::result_large_err)]
 #[rocket::main]
 async fn main() -> Result<(), Error> {
     let rocket = rocket();

src/main.rs

@@ -413,6 +413,11 @@ impl PrivateBin {
             reader: body.aggregate().reader(),
             line_count: 0,
         };
+        let template_expression =
+            TEMPLATE_EXP.get_or_init(|| Regex::new(r"css/bootstrap(\d*)/").unwrap());
+        let version_expression = VERSION_EXP.get_or_init(|| {
+            Regex::new(r"js/(privatebin|zerobin).js\?(Alpha%20)?(\d+\.\d+\.*\d*)").unwrap()
+        });
         for line in reader {
             let line_str = match line {
                 Ok(string) => string,
@@ -427,10 +432,7 @@ impl PrivateBin {
                 }
             }
             if template == PrivateBinTemplate::Unknown {
-                if let Some(matches) = TEMPLATE_EXP
-                    .get_or_init(|| Regex::new(r"css/bootstrap(\d*)/").unwrap())
-                    .captures(&line_str)
-                {
+                if let Some(matches) = template_expression.captures(&line_str) {
                     template = if matches[1].is_empty() {
                         PrivateBinTemplate::Bootstrap3
                     } else {
@@ -439,13 +441,7 @@ impl PrivateBin {
                 }
             }
             if version.is_empty() {
-                if let Some(matches) = VERSION_EXP
-                    .get_or_init(|| {
-                        Regex::new(r"js/(privatebin|zerobin).js\?(Alpha%20)?(\d+\.\d+\.*\d*)")
-                            .unwrap()
-                    })
-                    .captures(&line_str)
-                {
+                if let Some(matches) = version_expression.captures(&line_str) {
                     matches[3].clone_into(&mut version);
                 }
             }

src/models.rs

@@ -162,7 +162,7 @@ pub async fn check_full(rocket: Rocket<Build>) {
 }
 
 #[allow(clippy::too_many_lines)]
-async fn check_instance(instance: &Instance) -> InstanceCheckResult {
+async fn check_instance(instance: &Instance) -> InstanceCheckResult<'_> {
     let timer = Instant::now();
     let mut message = String::new();
     let mut instance_options = [

src/tasks.rs

@@ -12,17 +12,15 @@ fn index() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Welcome!")));
+        .is_some_and(|s| s.contains("Welcome!")));
 }
 
 #[test]
 fn about() {
     let client = Client::untracked(rocket()).expect("valid rocket instance");
     let response = client.get("/about").dispatch();
     assert_eq!(response.status(), Status::Ok);
-    assert!(response
-        .into_string()
-        .map_or(false, |s| s.contains("About")));
+    assert!(response.into_string().is_some_and(|s| s.contains("About")));
 }
 
 #[test]
@@ -32,7 +30,7 @@ fn add_get() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Add instance")));
+        .is_some_and(|s| s.contains("Add instance")));
 }
 
 #[test]
@@ -46,15 +44,15 @@ fn add_post_error() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Not a valid URL: privatebin.info")));
+        .is_some_and(|s| s.contains("Not a valid URL: privatebin.info")));
 
     let response = client
         .post("/add")
         .body("url=privatebin.info")
         .header(ContentType::Form)
         .dispatch();
     assert_eq!(response.status(), Status::Ok);
-    assert!(response.into_string().map_or(false, |s| s.contains(
+    assert!(response.into_string().is_some_and(|s| s.contains(
         "Error adding URL privatebin.info, due to a failed scan within the last 5 minutes."
     )));
 
@@ -67,7 +65,7 @@ fn add_post_error() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Not a valid URL: privatebin.info")));
+        .is_some_and(|s| s.contains("Not a valid URL: privatebin.info")));
 }
 
 #[test]
@@ -79,8 +77,9 @@ fn add_post_success() {
         .header(ContentType::Form)
         .dispatch();
     assert_eq!(response.status(), Status::Ok);
-    assert!(response.into_string().map_or(false, |s| s
-        .contains("Successfully added URL: https://privatebin.net")));
+    assert!(response
+        .into_string()
+        .is_some_and(|s| s.contains("Successfully added URL: https://privatebin.net")));
 }
 
 #[test]
@@ -90,7 +89,7 @@ fn check_get() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Check instance")));
+        .is_some_and(|s| s.contains("Check instance")));
 }
 
 #[test]
@@ -104,15 +103,15 @@ fn check_post_error() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Not a valid URL: privatebin.info")));
+        .is_some_and(|s| s.contains("Not a valid URL: privatebin.info")));
 
     let response = client
         .post("/check")
         .body("url=privatebin.info")
         .header(ContentType::Form)
         .dispatch();
     assert_eq!(response.status(), Status::Ok);
-    assert!(response.into_string().map_or(false, |s| s.contains(
+    assert!(response.into_string().is_some_and(|s| s.contains(
         "Error scanning URL privatebin.info, due to a failed scan within the last 5 minutes."
     )));
 
@@ -125,7 +124,7 @@ fn check_post_error() {
     assert_eq!(response.status(), Status::Ok);
     assert!(response
         .into_string()
-        .map_or(false, |s| s.contains("Not a valid URL: privatebin.info")));
+        .is_some_and(|s| s.contains("Not a valid URL: privatebin.info")));
 }
 
 #[test]
@@ -137,8 +136,9 @@ fn check_post_success() {
         .header(ContentType::Form)
         .dispatch();
     assert_eq!(response.status(), Status::Ok);
-    assert!(response.into_string().map_or(false, |s| s
-        .contains("Results of checking https://privatebin.net")));
+    assert!(response
+        .into_string()
+        .is_some_and(|s| s.contains("Results of checking https://privatebin.net")));
 }
 
 #[test]