Merge pull request rust-lang#2151 from ehuss/revert-toml

Revert toml update
ehuss · Aug 2, 2023 · a8fd603 · a8fd603
2 parents ab2cb71 + fbfe887
commit a8fd603
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 74 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -33,7 +33,7 @@ serde = { version = "1.0.163", features = ["derive"] }
 serde_json = "1.0.96"
 shlex = "1.1.0"
 tempfile = "3.4.0"
-toml = "0.7.6"
+toml = "0.5.11" # Do not update, see https://github.com/rust-lang/mdBook/issues/2037
 topological-sort = "0.2.2"
 
 # Watch feature

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