fix(cli): migrate to stable features of log crate (#9119)

* fix(cli): migrate to stable features of `log` crate * to_cow_str
tauri-apps · Mar 7, 2024 · 97a0514 · 97a0514
1 parent b15948b
commit 97a0514
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 42 deletions.
diff --git a/.changes/log-stable-features.md b/.changes/log-stable-features.md
@@ -0,0 +1,6 @@
+---
+'tauri-cli': 'patch:bug'
+'tauri-bundler': 'patch:bug'
+---
+
+Fix compilation error due to dependency on unstable features of `log` crate.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/tooling/bundler/Cargo.toml b/tooling/bundler/Cargo.toml
@@ -31,7 +31,7 @@ tar = "0.4.40"
 walkdir = "2"
 handlebars = "4.5"
 tempfile = "3.8.1"
-log = { version = "0.4.20", features = ["kv_unstable"] }
+log = { version = "0.4.21", features = ["kv"] }
 dirs-next = "2.0"
 os_pipe = "1"
 ureq = { version = "2.9.1", default-features = false, features = [

diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock
diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml
@@ -76,7 +76,7 @@ url = { version = "2.4", features = ["serde"] }
 os_pipe = "1"
 ignore = "0.4"
 ctrlc = "3.4"
-log = { version = "0.4.20", features = ["kv_unstable", "kv_unstable_std"] }
+log = { version = "0.4.21", features = ["kv", "kv_std"] }
 env_logger = "0.10.0"
 icns = { package = "tauri-icns", version = "0.1" }
 image = { version = "0.24", default-features = false, features = ["ico"] }

diff --git a/tooling/cli/src/lib.rs b/tooling/cli/src/lib.rs
@@ -129,7 +129,7 @@ where
     .format(|f, record| {
       let mut is_command_output = false;
       if let Some(action) = record.key_values().get("action".into()) {
-        let action = action.to_str().unwrap();
+        let action = action.to_cow_str().unwrap();
         is_command_output = action == "stdout" || action == "stderr";
         if !is_command_output {
           let mut action_style = f.style();