diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 0722e6d8..236ffc3b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -195,7 +195,7 @@ jobs: - name: Install toolchain uses: dtolnay/rust-toolchain@master with: - toolchain: "1.71" + toolchain: "1.83" - run: cargo check --locked --lib --all-features cross: diff --git a/Cargo.lock b/Cargo.lock index 90ebfa17..3919b0c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "aho-corasick" @@ -492,7 +492,7 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.103.7" +version = "0.104.0" dependencies = [ "aws-lc-rs", "base64", diff --git a/Cargo.toml b/Cargo.toml index 4864394c..d2c8af3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -16,12 +16,12 @@ categories = ["cryptography", "no-std"] description = "Web PKI X.509 Certificate Verification." edition = "2021" -rust-version = "1.71" +rust-version = "1.83" license = "ISC" name = "rustls-webpki" readme = "README.md" repository = "https://github.com/rustls/webpki" -version = "0.103.7" +version = "0.104.0" include = [ "Cargo.toml", diff --git a/src/alg_tests.rs b/src/alg_tests.rs index 23a673ec..ac2ce586 100644 --- a/src/alg_tests.rs +++ b/src/alg_tests.rs @@ -620,7 +620,7 @@ fn parse_test_signed_data(file_contents: &[u8]) -> TestSignedData { } } -use alloc::str::Lines; +use core::str::Lines; fn read_pem_section(lines: &mut Lines<'_>, section_name: &str) -> Vec { // Skip comments and header diff --git a/src/crl/types.rs b/src/crl/types.rs index e881980b..73b8e867 100644 --- a/src/crl/types.rs +++ b/src/crl/types.rs @@ -921,7 +921,7 @@ impl TryFrom for RevocationReason { #[cfg(feature = "alloc")] #[cfg(test)] mod tests { - use std::time::Duration; + use core::time::Duration; use pki_types::CertificateDer; use std::prelude::v1::*; diff --git a/src/error.rs b/src/error.rs index c104d50d..13fd9336 100644 --- a/src/error.rs +++ b/src/error.rs @@ -381,8 +381,7 @@ impl fmt::Display for Error { } } -#[cfg(feature = "std")] -impl ::std::error::Error for Error {} +impl core::error::Error for Error {} /// Additional context for the `CertNotValidForName` error variant. /// diff --git a/src/lib.rs b/src/lib.rs index 922365f6..36451766 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -31,7 +31,9 @@ elided_lifetimes_in_paths, unnameable_types, unreachable_pub, - clippy::use_self + clippy::alloc_instead_of_core, + clippy::use_self, + clippy::std_instead_of_core )] #![deny(missing_docs, clippy::as_conversions)] #![allow( diff --git a/src/subject_name/ip_address.rs b/src/subject_name/ip_address.rs index 0c60ac02..420160b8 100644 --- a/src/subject_name/ip_address.rs +++ b/src/subject_name/ip_address.rs @@ -674,8 +674,8 @@ mod alloc_tests { #[test] fn presented_matches_constraint_test() { + use core::net::IpAddr; use std::boxed::Box; - use std::net::IpAddr; for (presented, constraint_address, constraint_mask, expected_result) in PRESENTED_MATCHES_CONSTRAINT