Merge pull request #220 from dtolnay/toml

Replace toml 0.5 -> basic-toml

.github/workflows/ci.yml

@@ -81,7 +81,7 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - uses: dtolnay/install@cargo-outdated
-      - run: cargo outdated --workspace --ignore toml --exit-code 1
+      - run: cargo outdated --workspace --exit-code 1
       - run: cargo outdated --manifest-path fuzz/Cargo.toml --exit-code 1
 
   fuzz:

Cargo.toml

@@ -26,7 +26,7 @@ serde = "1.0.139"
 serde_derive = "1.0.139"
 serde_json = "1.0"
 termcolor = "1.0.4"
-toml = "0.5.2"
+basic-toml = "0.1"
 
 [lib]
 doc-scrape-examples = false

src/dependencies.rs

@@ -7,17 +7,17 @@ use serde::de::value::StrDeserializer;
 use serde::de::{self, Deserialize, Deserializer, Visitor};
 use serde::ser::{Serialize, Serializer};
 use serde_derive::{Deserialize, Serialize};
+use serde_json::Value;
 use std::collections::BTreeMap as Map;
 use std::fmt;
 use std::fs;
 use std::path::PathBuf;
-use toml::Value;
 
 pub fn get_manifest(manifest_dir: &Directory) -> Result<Manifest, Error> {
     let cargo_toml_path = manifest_dir.join("Cargo.toml");
     let mut manifest = (|| {
         let manifest_str = fs::read_to_string(&cargo_toml_path)?;
-        let manifest: Manifest = toml::from_str(&manifest_str)?;
+        let manifest: Manifest = basic_toml::from_str(&manifest_str)?;
         Ok(manifest)
     })()
     .map_err(|err| Error::GetManifest(cargo_toml_path, Box::new(err)))?;
@@ -39,7 +39,7 @@ pub fn get_workspace_manifest(manifest_dir: &Directory) -> WorkspaceManifest {
 pub fn try_get_workspace_manifest(manifest_dir: &Directory) -> Result<WorkspaceManifest, Error> {
     let cargo_toml_path = manifest_dir.join("Cargo.toml");
     let manifest_str = fs::read_to_string(cargo_toml_path)?;
-    let mut manifest: WorkspaceManifest = toml::from_str(&manifest_str)?;
+    let mut manifest: WorkspaceManifest = basic_toml::from_str(&manifest_str)?;
 
     fix_dependencies(&mut manifest.workspace.dependencies, manifest_dir);
     fix_patches(&mut manifest.patch, manifest_dir);

src/error.rs

@@ -20,8 +20,7 @@ pub enum Error {
     ReadStderr(io::Error),
     RunFailed,
     ShouldNotHaveCompiled,
-    TomlDe(toml::de::Error),
-    TomlSer(toml::ser::Error),
+    Toml(basic_toml::Error),
     UpdateVar(OsString),
     WriteStderr(io::Error),
 }
@@ -49,8 +48,7 @@ impl Display for Error {
             ShouldNotHaveCompiled => {
                 write!(f, "expected test case to fail to compile, but it succeeded")
             }
-            TomlDe(e) => write!(f, "{}", e),
-            TomlSer(e) => write!(f, "{}", e),
+            Toml(e) => write!(f, "{}", e),
             UpdateVar(var) => write!(
                 f,
                 "unrecognized value of TRYBUILD: {:?}",
@@ -90,14 +88,8 @@ impl From<io::Error> for Error {
     }
 }
 
-impl From<toml::de::Error> for Error {
-    fn from(err: toml::de::Error) -> Self {
-        Error::TomlDe(err)
-    }
-}
-
-impl From<toml::ser::Error> for Error {
-    fn from(err: toml::ser::Error) -> Self {
-        Error::TomlSer(err)
+impl From<basic_toml::Error> for Error {
+    fn from(err: basic_toml::Error) -> Self {
+        Error::Toml(err)
     }
 }

src/run.rs

@@ -181,10 +181,10 @@ impl Runner {
     }
 
     fn write(&self, project: &mut Project) -> Result<()> {
-        let manifest_toml = toml::to_string(&project.manifest)?;
+        let manifest_toml = basic_toml::to_string(&project.manifest)?;
 
         let config = self.make_config();
-        let config_toml = toml::to_string(&config)?;
+        let config_toml = basic_toml::to_string(&config)?;
 
         fs::create_dir_all(path!(project.dir / ".cargo"))?;
         fs::write(path!(project.dir / ".cargo" / "config"), config_toml)?;