Bump bitflags dependency, work around toml v1 breaking change

toml v1 breaks error handling. Catered for in Cargo.toml, but amend 2 demo scripts to maintain compatibility with current thag release.

Author: durbanlegend

Cargo.lock

@@ -233,7 +233,7 @@ anyhow = { version = "1.0", optional = true }
 arboard = { version = "3.4", optional = true }
 atty = { version = "0.2", optional = true }
 backtrace = "0.3"
-bitflags = { version = "2.10", optional = true }
+bitflags = { version = "2", optional = true }
 cargo-lookup = { version = "0.1", optional = true }
 cargo_toml = { version = "0.22", optional = true }
 chrono = "0.4"

Cargo.toml

@@ -7,7 +7,6 @@ simplelog = { version = "0.12", optional = true }
 # - Git: Set THAG_GIT_REF=main to use git repository instead of crates.io
 # Note: Run with 'thag script.rs' not 'cargo build' to enable thag-auto processing
 thag_rs = { version = "0.2, thag-auto", default-features = false, features = ["config", "simplelog"] }
-toml = "0.9"
 
 [features]
 default = ["simplelog"]
@@ -309,9 +308,9 @@ pub fn load(context: &dyn Context) -> ThagResult<Option<Config>> {
     eprintln!("config_path={config_path:?}");
 
     if config_path.exists() {
-        let config_str = fs::read_to_string(config_path)?;
+        let config_str = fs::read_to_string(config_path).map_err(|e| e.to_string())?;
         debug_log!("config_str={config_str:?}");
-        let config: Config = toml::from_str(&config_str)?;
+        let config: Config = toml::from_str(&config_str).map_err(|e| e.to_string())å;
         debug_log!("config={config:?}");
         Ok(Some(config))
     } else {
@@ -370,7 +369,7 @@ fn main() -> ThagResult<()> {
         Ok(maybe_config) => {
             if let Some(config) = maybe_config {
                 svprtln!(Role::EMPH, V::QQ, "Loaded config:");
-                let toml = &toml::to_string_pretty(&config)?;
+                let toml = &toml::to_string_pretty(&config).map_err(|e| e.to_string())?;
                 for line in toml.lines() {
                     svprtln!(Role::SUCC, V::QQ, "{line}");
                 }

demo/config.rs

@@ -140,7 +140,7 @@ impl Config {
     // This function will bubble up any errors encountered.
     pub fn load(path: &Path) -> Result<Self, ThagError> {
         let content = std::fs::read_to_string(path)?;
-        let config: Self = toml::from_str(&content)?;
+        let config: Self = toml::from_str(&content).map_err(|e| e.to_string())?;
         config.validate()?;
         validate_config_format(&content)?;
         Ok(config)