From 77b3cceffafb3760ba9ceb955030a80a79c76191 Mon Sep 17 00:00:00 2001 From: Rob Ede Date: Sat, 1 Jul 2023 23:52:37 +0100 Subject: [PATCH] update env_logger to 0.10 --- .github/workflows/ci.yml | 17 +++++++---------- actix-http/Cargo.toml | 2 +- actix-web-actors/Cargo.toml | 5 ++--- actix-web/Cargo.toml | 2 +- awc/Cargo.toml | 2 +- 5 files changed, 12 insertions(+), 16 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a380f0777..57ff02c76 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -49,17 +49,14 @@ jobs: - name: Install cargo-hack uses: taiki-e/install-action@cargo-hack - - name: workaround MSRV issues - if: matrix.version != 'stable' - run: | - cargo install cargo-edit --version=0.8.0 - cargo add const-str@0.3 --dev -p=actix-web - cargo add const-str@0.3 --dev -p=awc + # - name: workaround MSRV issues + # if: matrix.version != 'stable' + # run: | - - name: workaround MSRV issues - if: matrix.version != 'stable' - run: | - cargo update -p=zstd-sys --precise=2.0.1+zstd.1.5.2 + # - name: workaround MSRV issues + # if: matrix.version != 'stable' + # run: | + # cargo update -p=zstd-sys --precise=2.0.1+zstd.1.5.2 - name: check minimal run: cargo ci-check-min diff --git a/actix-http/Cargo.toml b/actix-http/Cargo.toml index 222a04c8f..4e907cb8e 100644 --- a/actix-http/Cargo.toml +++ b/actix-http/Cargo.toml @@ -106,7 +106,7 @@ actix-web = "4" async-stream = "0.3" criterion = { version = "0.4", features = ["html_reports"] } -env_logger = "0.9" +env_logger = "0.10" futures-util = { version = "0.3.17", default-features = false, features = ["alloc"] } memchr = "2.4" once_cell = "1.9" diff --git a/actix-web-actors/Cargo.toml b/actix-web-actors/Cargo.toml index e89baed96..47d9b0004 100644 --- a/actix-web-actors/Cargo.toml +++ b/actix-web-actors/Cargo.toml @@ -32,7 +32,6 @@ actix-test = "0.1" awc = { version = "3", default-features = false } actix-web = { version = "4", features = ["macros"] } +env_logger = "0.10" +futures-util = { version = "0.3.17", default-features = false, features = ["std"] } mime = "0.3" - -env_logger = "0.9" -futures-util = { version = "0.3.17", default-features = false } diff --git a/actix-web/Cargo.toml b/actix-web/Cargo.toml index c7314422d..1d677c620 100644 --- a/actix-web/Cargo.toml +++ b/actix-web/Cargo.toml @@ -104,7 +104,7 @@ awc = { version = "3", features = ["openssl"] } brotli = "3.3.3" const-str = "0.3" criterion = { version = "0.4", features = ["html_reports"] } -env_logger = "0.9" +env_logger = "0.10" flate2 = "1.0.13" futures-util = { version = "0.3.17", default-features = false, features = ["std"] } rand = "0.8" diff --git a/awc/Cargo.toml b/awc/Cargo.toml index 8edc90fd1..5f81f6a4f 100644 --- a/awc/Cargo.toml +++ b/awc/Cargo.toml @@ -99,7 +99,7 @@ actix-web = { version = "4", features = ["openssl"] } brotli = "3.3.3" const-str = "0.3" -env_logger = "0.9" +env_logger = "0.10" flate2 = "1.0.13" futures-util = { version = "0.3.17", default-features = false } static_assertions = "1.1"