diff --git a/Cargo.lock b/Cargo.lock index e914dd6..77897e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -182,6 +182,12 @@ version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567" +[[package]] +name = "base64" +version = "0.22.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6" + [[package]] name = "bitflags" version = "1.3.2" @@ -476,7 +482,7 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "322106e6bd0cba2d5ead589ddb8150a13d7c4217cf80d7c4f682ca994ccc6aa9" dependencies = [ - "base64", + "base64 0.21.7", "bytes", "headers-core", "http", @@ -967,11 +973,11 @@ checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" [[package]] name = "registry-conformance" -version = "0.5.2" +version = "0.5.3" source = "sparse+https://integer32llc.github.io/registry-conformance/" -checksum = "7bf0349976913b09e95602e5dcab7f99a6792c389404e972582a6bf387656b7a" +checksum = "381a1dbfe46b6eb694d046f752b372662192b194ef2546ed2f9c4d62c5a76926" dependencies = [ - "base64", + "base64 0.22.1", "futures", "regex", "serde", diff --git a/Cargo.toml b/Cargo.toml index eee2eb9..6a0415b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -29,7 +29,7 @@ lint_groups_priority = { level = "allow", priority = 1 } # Remove after 1.80. ht [workspace.dependencies] argh = { version = "0.1.12", default-features = false } -registry-conformance = { version = "0.5.2", registry = "registry-conformance" } +registry-conformance = { version = "0.5.3", registry = "registry-conformance" } snafu = { version = "0.8.2", default-features = false, features = ["rust_1_65", "std"] } tokio = { version = "1.37.0", default-features = false, features = ["macros", "process", "rt-multi-thread"] } diff --git a/conformance/src/main.rs b/conformance/src/main.rs index 3512198..e3272a6 100644 --- a/conformance/src/main.rs +++ b/conformance/src/main.rs @@ -116,9 +116,9 @@ async fn auth( next: Next, ) -> Result { if let Some((username, password)) = webserver_basic_auth { - let creds_match = auth_header.as_ref().map_or(false, |auth| { - auth.username() == username && auth.password() == password - }); + let creds_match = auth_header + .as_ref() + .is_some_and(|auth| auth.username() == username && auth.password() == password); if !creds_match { return Err(StatusCode::UNAUTHORIZED); diff --git a/src/main.rs b/src/main.rs index e8fab05..471b74b 100644 --- a/src/main.rs +++ b/src/main.rs @@ -1357,9 +1357,9 @@ mod index_entry { /// The current values are: // /// * 1: The schema as documented here, not including newer additions. - /// This is honored in Rust version 1.51 and newer. + /// This is honored in Rust version 1.51 and newer. /// * 2: The addition of the `features2` field. - /// This is honored in Rust version 1.60 and newer. + /// This is honored in Rust version 1.60 and newer. pub v: u32, /// Features with new, extended syntax, such as namespaced