Merge pull request #2774 from ehuss/update-toml

Update toml to 0.9.2

Author: ehuss

Cargo.lock

@@ -59,7 +59,7 @@ shlex = "1.3.0"
 snapbox = "0.6.21"
 tempfile = "3.20.0"
 tokio = "1.46.1"
-toml = "0.5.11" # Do not update, see https://github.com/rust-lang/mdBook/issues/2037
+toml = "0.9.2"
 topological-sort = "0.2.2"
 tower-http = "0.6.6"
 walkdir = "2.5.0"

Cargo.toml

@@ -62,12 +62,11 @@ fn split(key: &str) -> Option<(&str, &str)> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::str::FromStr;
 
     #[test]
     fn read_simple_table() {
         let src = "[table]";
-        let value = Value::from_str(src).unwrap();
+        let value: Value = toml::from_str(src).unwrap();
 
         let got = value.read("table").unwrap();
 
@@ -77,7 +76,7 @@ mod tests {
     #[test]
     fn read_nested_item() {
         let src = "[table]\nnested=true";
-        let value = Value::from_str(src).unwrap();
+        let value: Value = toml::from_str(src).unwrap();
 
         let got = value.read("table.nested").unwrap();
 
@@ -108,7 +107,7 @@ mod tests {
     #[test]
     fn delete_a_top_level_item() {
         let src = "top = true";
-        let mut value = Value::from_str(src).unwrap();
+        let mut value: Value = toml::from_str(src).unwrap();
 
         let got = value.delete("top").unwrap();
 
@@ -118,7 +117,7 @@ mod tests {
     #[test]
     fn delete_a_nested_item() {
         let src = "[table]\n nested = true";
-        let mut value = Value::from_str(src).unwrap();
+        let mut value: Value = toml::from_str(src).unwrap();
 
         let got = value.delete("table.nested").unwrap();
 

crates/mdbook-core/src/utils/toml_ext.rs

@@ -101,12 +101,11 @@ impl BookBuilder {
     fn write_book_toml(&self) -> Result<()> {
         debug!("Writing book.toml");
         let book_toml = self.root.join("book.toml");
-        let cfg = toml::to_vec(&self.config).with_context(|| "Unable to serialize the config")?;
+        let cfg =
+            toml::to_string(&self.config).with_context(|| "Unable to serialize the config")?;
 
-        File::create(book_toml)
-            .with_context(|| "Couldn't create book.toml")?
-            .write_all(&cfg)
-            .with_context(|| "Unable to write config to book.toml")?;
+        std::fs::write(&book_toml, cfg)
+            .with_context(|| format!("Unable to write config to {book_toml:?}"))?;
         Ok(())
     }