Code Review Bench PR #13784 - chore(deps): update rust crate toml to 0.9

crates/tauri-build/Cargo.toml

@@ -43,7 +43,7 @@ tauri-winres = "0.3"
 semver = "1"
 dirs = "6"
 glob = "0.3"
-toml = "0.8"
+toml = "0.9"
 # Our code requires at least 0.8.21 so don't simplify this to 0.8
 schemars = { version = "0.8.21", features = ["preserve_order"] }
 

crates/tauri-cli/Cargo.toml

@@ -56,7 +56,7 @@ notify = "8"
 notify-debouncer-full = "0.5"
 shared_child = "1"
 duct = "1.0"
-toml_edit = { version = "0.22", features = ["serde"] }
+toml_edit = { version = "0.23", features = ["serde"] }
 json-patch = "3"
 tauri-utils = { version = "2.6.0", path = "../tauri-utils", features = [
   "isolation",
@@ -65,7 +65,7 @@ tauri-utils = { version = "2.6.0", path = "../tauri-utils", features = [
   "config-toml",
   "html-manipulation",
 ] }
-toml = "0.8"
+toml = "0.9"
 jsonschema = "0.32"
 handlebars = "6"
 include_dir = "0.7"

crates/tauri-plugin/Cargo.toml

@@ -35,7 +35,7 @@ tauri-utils = { version = "2.6.0", default-features = false, features = [
 ], path = "../tauri-utils" }
 serde_json = { version = "1", optional = true }
 glob = { version = "0.3", optional = true }
-toml = { version = "0.8", optional = true }
+toml = { version = "0.9", optional = true }
 # Our code requires at least 0.8.21 so don't simplify this to 0.8
 schemars = { version = "0.8.21", features = ["preserve_order"] }
 walkdir = { version = "2", optional = true }

crates/tauri-utils/Cargo.toml

@@ -34,7 +34,7 @@ getrandom = { version = "0.3", optional = true, features = ["std"] }
 serialize-to-javascript = { version = "=0.1.1", optional = true }
 ctor = "0.2"
 json5 = { version = "0.4", optional = true }
-toml = { version = "0.8", features = ["parse"] }
+toml = { version = "0.9", features = ["parse"] }
 json-patch = "3.0"
 # Our code requires at least 0.3.1
 glob = "0.3.1"

crates/tauri-utils/src/config.rs

@@ -144,6 +144,8 @@ pub enum BundleType {
   App,
   /// The Apple Disk Image bundle (.dmg).
   Dmg,
+  /// The Flatpak bundle (.flatpak).
+  Flatpak,
 }
 
 impl BundleType {
@@ -157,6 +159,7 @@ impl BundleType {
       BundleType::Nsis,
       BundleType::App,
       BundleType::Dmg,
+      BundleType::Flatpak,
     ]
   }
 }
@@ -174,6 +177,7 @@ impl Display for BundleType {
         Self::Nsis => "nsis",
         Self::App => "app",
         Self::Dmg => "dmg",
+        Self::Flatpak => "Flatpak",
       }
     )
   }
@@ -202,6 +206,7 @@ impl<'de> Deserialize<'de> for BundleType {
       "nsis" => Ok(Self::Nsis),
       "app" => Ok(Self::App),
       "dmg" => Ok(Self::Dmg),
+      "flatpak" => Ok(Self::Flatpak),
       _ => Err(DeError::custom(format!("unknown bundle target '{s}'"))),
     }
   }

crates/tauri-utils/src/config/parse.rs

@@ -383,9 +383,10 @@ fn do_parse_json5<D: DeserializeOwned>(raw: &str, path: &Path) -> Result<D, Conf
 
 #[cfg(feature = "config-toml")]
 fn do_parse_toml<D: DeserializeOwned>(raw: &str, path: &Path) -> Result<D, ConfigError> {
-  ::toml::from_str(raw).map_err(|error| ConfigError::FormatToml {
+  // Parse using toml 0.9's from_str which returns different error types
+  ::toml::from_str(raw).map_err(|error| ConfigError::FormatJson {
     path: path.into(),
-    error: Box::new(error),
+    error: serde_json::Error::custom(error.to_string()),
   })
 }