Skip to content

Commit d7afd60

Browse files
committed
workaround env-logger msrv
1 parent 7e47bf4 commit d7afd60

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

.github/workflows/ci.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,13 @@ jobs:
7676
if: matrix.version == '1.59.0'
7777
run: cargo install cargo-hack --version=0.5.21
7878

79+
- name: workaround MSRV issues
80+
if: matrix.version == 'stable'
81+
run: |
82+
cargo install cargo-edit --version=0.8.0
83+
cargo add [email protected] --dev -p=actix-tls
84+
cargo add [email protected] --dev -p=actix-server
85+
7986
- name: Generate Cargo.lock
8087
uses: actions-rs/cargo@v1
8188
with: { command: generate-lockfile }

actix-server/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,6 @@ actix-codec = "0.5"
4444
actix-rt = "2.8"
4545

4646
bytes = "1"
47-
env_logger = "0.9"
47+
env_logger = "0.10"
4848
futures-util = { version = "0.3.17", default-features = false, features = ["sink", "async-await-macro"] }
4949
tokio = { version = "1.13.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }

actix-tls/examples/accept-rustls.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,7 @@ use tracing::info;
4141

4242
#[actix_rt::main]
4343
async fn main() -> io::Result<()> {
44-
env::set_var("RUST_LOG", "info");
45-
env_logger::init();
44+
env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
4645

4746
// Load TLS key and cert files
4847
let cert_file = &mut BufReader::new(File::open("./examples/cert.pem").unwrap());

0 commit comments

Comments
 (0)