Merge branch 'master' into rustls-0.23

.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
 

.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 }

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"

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();

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"] }

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);

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));
 

actix-tls/Cargo.toml

@@ -122,7 +122,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"

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>()

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 \