From 5edbf9e3dc86d9efc4d106891ce257151113b3a7 Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 12 May 2024 18:24:37 +0100
Subject: [PATCH 1/3] chore: switch to rustversion-msrv
---
actix-macros/Cargo.toml | 3 +--
actix-macros/tests/trybuild.rs | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/actix-macros/Cargo.toml b/actix-macros/Cargo.toml
index b96daeb9..2f112ed4 100644
--- a/actix-macros/Cargo.toml
+++ b/actix-macros/Cargo.toml
@@ -31,7 +31,6 @@ proc-macro2 = "1.0.60"
[dev-dependencies]
actix-rt = "2"
-
futures-util = { version = "0.3.17", default-features = false }
-rustversion = "1"
+rustversion-msrv = "0.99"
trybuild = "1"
diff --git a/actix-macros/tests/trybuild.rs b/actix-macros/tests/trybuild.rs
index ab425d6d..5cfb1b6e 100644
--- a/actix-macros/tests/trybuild.rs
+++ b/actix-macros/tests/trybuild.rs
@@ -1,4 +1,4 @@
-#[rustversion::stable(1.70)] // MSRV
+#[rustversion_msrv::msrv]
#[test]
fn compile_macros() {
let t = trybuild::TestCases::new();
From 9e7d612121987c8eb750b905307c069bb33c771f Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 12 May 2024 18:25:02 +0100
Subject: [PATCH 2/3] ci: remove 32-bit windows support
---
.github/workflows/ci-post-merge.yml | 1 -
.github/workflows/ci.yml | 1 -
2 files changed, 2 deletions(-)
diff --git a/.github/workflows/ci-post-merge.yml b/.github/workflows/ci-post-merge.yml
index 1ce0fef6..27de0429 100644
--- a/.github/workflows/ci-post-merge.yml
+++ b/.github/workflows/ci-post-merge.yml
@@ -22,7 +22,6 @@ jobs:
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
- { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
- - { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
version:
- nightly
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 412ed481..32893ee7 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -23,7 +23,6 @@ jobs:
- { name: macOS, os: macos-latest, triple: x86_64-apple-darwin }
- { name: Windows, os: windows-latest, triple: x86_64-pc-windows-msvc }
- { name: Windows (MinGW), os: windows-latest, triple: x86_64-pc-windows-gnu }
- - { name: Windows (32-bit), os: windows-latest, triple: i686-pc-windows-msvc }
version:
- { name: msrv, version: 1.70.0 }
- { name: stable, version: stable }
From 1db640f62ea54420c10f70932cbeccf00c097dfd Mon Sep 17 00:00:00 2001
From: Rob Ede <robjtede@icloud.com>
Date: Sun, 12 May 2024 19:10:27 +0100
Subject: [PATCH 3/3] chore: update env logger
---
actix-server/Cargo.toml | 2 +-
actix-server/examples/file-reader.rs | 3 ++-
actix-server/examples/tcp-echo.rs | 3 ++-
actix-tls/Cargo.toml | 2 +-
actix-tls/examples/accept-rustls.rs | 3 ++-
justfile | 8 +-------
6 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/actix-server/Cargo.toml b/actix-server/Cargo.toml
index bd801caf..118b86b0 100755
--- a/actix-server/Cargo.toml
+++ b/actix-server/Cargo.toml
@@ -45,6 +45,6 @@ actix-codec = "0.5"
actix-rt = "2.8"
bytes = "1"
-env_logger = "0.10"
+pretty_env_logger = "0.5"
futures-util = { version = "0.3.17", default-features = false, features = ["sink", "async-await-macro"] }
tokio = { version = "1.23.1", features = ["io-util", "rt-multi-thread", "macros", "fs"] }
diff --git a/actix-server/examples/file-reader.rs b/actix-server/examples/file-reader.rs
index f84cb510..4e446807 100644
--- a/actix-server/examples/file-reader.rs
+++ b/actix-server/examples/file-reader.rs
@@ -18,7 +18,8 @@ use futures_util::{SinkExt as _, StreamExt as _};
use tokio::{fs::File, io::AsyncReadExt as _};
async fn run() -> io::Result<()> {
- env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
+ pretty_env_logger::formatted_timed_builder()
+ .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
let addr = ("127.0.0.1", 8080);
tracing::info!("starting server on port: {}", &addr.0);
diff --git a/actix-server/examples/tcp-echo.rs b/actix-server/examples/tcp-echo.rs
index eda24f83..df85a1d0 100644
--- a/actix-server/examples/tcp-echo.rs
+++ b/actix-server/examples/tcp-echo.rs
@@ -25,7 +25,8 @@ use futures_util::future::ok;
use tokio::io::{AsyncReadExt as _, AsyncWriteExt as _};
async fn run() -> io::Result<()> {
- env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
+ pretty_env_logger::formatted_timed_builder()
+ .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
let count = Arc::new(AtomicUsize::new(0));
diff --git a/actix-tls/Cargo.toml b/actix-tls/Cargo.toml
index 7078efeb..80f19ed8 100755
--- a/actix-tls/Cargo.toml
+++ b/actix-tls/Cargo.toml
@@ -114,7 +114,7 @@ actix-codec = "0.5"
actix-rt = "2.2"
actix-server = "2"
bytes = "1"
-env_logger = "0.10"
+pretty_env_logger = "0.5"
futures-util = { version = "0.3.17", default-features = false, features = ["sink"] }
itertools = "0.12"
rcgen = "0.12"
diff --git a/actix-tls/examples/accept-rustls.rs b/actix-tls/examples/accept-rustls.rs
index 6e1e267a..200ab149 100644
--- a/actix-tls/examples/accept-rustls.rs
+++ b/actix-tls/examples/accept-rustls.rs
@@ -41,7 +41,8 @@ use tracing::info;
#[actix_rt::main]
async fn main() -> io::Result<()> {
- env_logger::init_from_env(env_logger::Env::default().default_filter_or("info"));
+ pretty_env_logger::formatted_timed_builder()
+ .parse_env(pretty_env_logger::env_logger::Env::default().default_filter_or("info"));
let root_path = env!("CARGO_MANIFEST_DIR")
.parse::<PathBuf>()
diff --git a/justfile b/justfile
index c970a73c..188ab13d 100644
--- a/justfile
+++ b/justfile
@@ -4,13 +4,7 @@ _list:
# Downgrade dev-dependencies necessary to run MSRV checks/tests.
[private]
downgrade-for-msrv:
- cargo update -p=ciborium --precise=0.2.1
- cargo update -p=ciborium-ll --precise=0.2.1
- cargo update -p=time --precise=0.3.16
- cargo update -p=clap --precise=4.3.24
- cargo update -p=clap_lex --precise=0.5.0
- cargo update -p=anstyle --precise=1.0.2
- cargo update -p=trybuild --precise=1.0.89
+ cargo update -p=clap --precise=4.4.18
msrv := ```
cargo metadata --format-version=1 \