chore: update env logger

actix · May 12, 2024 · 1db640f · 1db640f
1 parent 9e7d612
commit 1db640f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 12 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \