From cda97c3a0184a3533e226296312c8a0a951f7be1 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 26 Jun 2023 11:45:44 +0200 Subject: [PATCH 1/5] Update indexmap to version 2 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index b11981d2..4df37a73 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -51,7 +51,7 @@ http = "0.2" tracing = { version = "0.1.32", default-features = false, features = ["std"] } fnv = "1.0.5" slab = "0.4.2" -indexmap = { version = "1.5.2", features = ["std"] } +indexmap = { version = "2", features = ["std"] } [dev-dependencies] From 3e69db66d65a78ca03e2a60c994400e7f5c87fa2 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 9 Oct 2023 12:12:18 +0200 Subject: [PATCH 2/5] Update webpki-roots dev-dep to 0.25 --- Cargo.toml | 2 +- examples/akamai.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 4df37a73..7ed59e86 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -69,7 +69,7 @@ serde_json = "1.0.0" tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "net"] } env_logger = { version = "0.9", default-features = false } tokio-rustls = "0.23.2" -webpki-roots = "0.22.2" +webpki-roots = "0.25" [package.metadata.docs.rs] features = ["stream"] diff --git a/examples/akamai.rs b/examples/akamai.rs index 1d0b17ba..bc07399d 100644 --- a/examples/akamai.rs +++ b/examples/akamai.rs @@ -17,7 +17,7 @@ pub async fn main() -> Result<(), Box> { let tls_client_config = std::sync::Arc::new({ let mut root_store = RootCertStore::empty(); - root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.0.iter().map(|ta| { + root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| { OwnedTrustAnchor::from_subject_spki_name_constraints( ta.subject, ta.spki, From 16a3a19b10ff3ea4383bf3a63fd21ff581c898ca Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 9 Oct 2023 12:12:48 +0200 Subject: [PATCH 3/5] Update tokio-rustls dev-dep to 0.24 --- Cargo.toml | 2 +- examples/akamai.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7ed59e86..d0f9c2ce 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -68,7 +68,7 @@ serde_json = "1.0.0" # Examples tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "net"] } env_logger = { version = "0.9", default-features = false } -tokio-rustls = "0.23.2" +tokio-rustls = "0.24" webpki-roots = "0.25" [package.metadata.docs.rs] diff --git a/examples/akamai.rs b/examples/akamai.rs index bc07399d..788bf300 100644 --- a/examples/akamai.rs +++ b/examples/akamai.rs @@ -17,7 +17,7 @@ pub async fn main() -> Result<(), Box> { let tls_client_config = std::sync::Arc::new({ let mut root_store = RootCertStore::empty(); - root_store.add_server_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| { + root_store.add_trust_anchors(webpki_roots::TLS_SERVER_ROOTS.iter().map(|ta| { OwnedTrustAnchor::from_subject_spki_name_constraints( ta.subject, ta.spki, From 7386ff5e40bd740db0acc1d5edced3216bd9e33d Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 9 Oct 2023 12:13:06 +0200 Subject: [PATCH 4/5] Update env_logger dev-dep to 0.10 --- Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index d0f9c2ce..70156498 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -67,7 +67,7 @@ serde_json = "1.0.0" # Examples tokio = { version = "1", features = ["rt-multi-thread", "macros", "sync", "net"] } -env_logger = { version = "0.9", default-features = false } +env_logger = { version = "0.10", default-features = false } tokio-rustls = "0.24" webpki-roots = "0.25" From ce0f84ac0f477ae07d28767328292e3c7b5f7c50 Mon Sep 17 00:00:00 2001 From: Dirkjan Ochtman Date: Mon, 9 Oct 2023 12:47:56 +0200 Subject: [PATCH 5/5] Remove combined minimal-versions + MSRV check for now --- .github/workflows/CI.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index ee920442..4c199067 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -93,5 +93,3 @@ jobs: - uses: dtolnay/rust-toolchain@nightly - uses: taiki-e/install-action@cargo-hack - uses: taiki-e/install-action@cargo-minimal-versions - - - run: cargo +${{ steps.msrv-toolchain.outputs.name }} minimal-versions check