From aa82f8080bace30f1e846853ec24ee4378f82d5f Mon Sep 17 00:00:00 2001 From: Gurinder Singh Date: Tue, 23 Dec 2025 18:52:55 +0530 Subject: [PATCH 1/3] fix: warn when WDK env vars are non-UTF8 --- crates/wdk-build/src/cargo_make.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/crates/wdk-build/src/cargo_make.rs b/crates/wdk-build/src/cargo_make.rs index 2b25f3fd7..bfa4c5e29 100644 --- a/crates/wdk-build/src/cargo_make.rs +++ b/crates/wdk-build/src/cargo_make.rs @@ -22,7 +22,7 @@ use std::{ use anyhow::Context; use cargo_metadata::{Metadata, MetadataCommand, camino::Utf8Path}; use clap::{Args, ColorChoice, CommandFactory, FromArgMatches, Parser}; -use tracing::{instrument, trace}; +use tracing::{instrument, trace, warn}; use crate::{ ConfigError, @@ -618,10 +618,15 @@ fn get_path_from_env( ) -> PathBuf { env::var(env_var).map_or_else( |e| { - trace!( - "Could not read env var '{env_var}': {e:?}. Constructing path from WDK content \ - root" - ); + const COMMON_MSG: &str = "Constructing path from WDK content root instead"; + match e { + env::VarError::NotPresent => trace!("Env var '{env_var}' not found. {COMMON_MSG}"), + env::VarError::NotUnicode(val) => { + warn!( + "Env var '{env_var}' contains non-UTF8 charactersa: {val:?}. {COMMON_MSG}" + ); + } + } wdk_content_root.join(sub_folder).join(sdk_version) }, PathBuf::from, From 75601a1406d33da89982b8884db8f53406f7614f Mon Sep 17 00:00:00 2001 From: Gurinder Singh Date: Thu, 25 Dec 2025 11:11:09 +0530 Subject: [PATCH 2/3] Renamed COMMON_MSG to FALLBACK_MSG --- crates/wdk-build/src/cargo_make.rs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/crates/wdk-build/src/cargo_make.rs b/crates/wdk-build/src/cargo_make.rs index bfa4c5e29..5ba7849ae 100644 --- a/crates/wdk-build/src/cargo_make.rs +++ b/crates/wdk-build/src/cargo_make.rs @@ -618,12 +618,14 @@ fn get_path_from_env( ) -> PathBuf { env::var(env_var).map_or_else( |e| { - const COMMON_MSG: &str = "Constructing path from WDK content root instead"; + const FALLBACK_MSG: &str = "Constructing path from WDK content root instead"; match e { - env::VarError::NotPresent => trace!("Env var '{env_var}' not found. {COMMON_MSG}"), + env::VarError::NotPresent => { + trace!("Env var '{env_var}' not found. {FALLBACK_MSG}") + } env::VarError::NotUnicode(val) => { warn!( - "Env var '{env_var}' contains non-UTF8 charactersa: {val:?}. {COMMON_MSG}" + "Env var '{env_var}' contains non-UTF8 characters: {val:?}. {FALLBACK_MSG}" ); } } From 1a3cb7713b247b0194a8113ad5d0b113107b4dab Mon Sep 17 00:00:00 2001 From: Gurinder Singh Date: Sat, 27 Dec 2025 12:20:45 +0530 Subject: [PATCH 3/3] Fixed a clippy lint --- crates/wdk-build/src/cargo_make.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/wdk-build/src/cargo_make.rs b/crates/wdk-build/src/cargo_make.rs index 5ba7849ae..4033b63f4 100644 --- a/crates/wdk-build/src/cargo_make.rs +++ b/crates/wdk-build/src/cargo_make.rs @@ -621,7 +621,7 @@ fn get_path_from_env( const FALLBACK_MSG: &str = "Constructing path from WDK content root instead"; match e { env::VarError::NotPresent => { - trace!("Env var '{env_var}' not found. {FALLBACK_MSG}") + trace!("Env var '{env_var}' not found. {FALLBACK_MSG}"); } env::VarError::NotUnicode(val) => { warn!(