Merge pull request #239 from dtolnay/toml

Drop basic-toml in favor of more widely used toml crate

.github/workflows/ci.yml

@@ -24,7 +24,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.56.0]
+        rust: [nightly, beta, stable, 1.70.0]
     timeout-minutes: 45
     steps:
       - uses: actions/checkout@v4

Cargo.toml

@@ -19,14 +19,14 @@ rust-version = "1.56"
 diff = ["dissimilar"]
 
 [dependencies]
-basic-toml = "0.1.8"
 dissimilar = { version = "1.0", optional = true }
 glob = "0.3"
 once_cell = "1.9"
 serde = "1.0.194"
 serde_derive = "1.0.194"
 serde_json = "1.0.110"
 termcolor = "1.0.4"
+toml = "0.8"
 
 [dev-dependencies]
 automod = "1.0.10"

src/dependencies.rs

@@ -17,7 +17,7 @@ pub(crate) 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 = basic_toml::from_str(&manifest_str)?;
+        let manifest: Manifest = toml::from_str(&manifest_str)?;
         Ok(manifest)
     })()
     .map_err(|err| Error::GetManifest(cargo_toml_path, Box::new(err)))?;
@@ -41,7 +41,7 @@ pub(crate) fn try_get_workspace_manifest(
 ) -> 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 = basic_toml::from_str(&manifest_str)?;
+    let mut manifest: WorkspaceManifest = toml::from_str(&manifest_str)?;
 
     fix_dependencies(&mut manifest.workspace.dependencies, manifest_dir);
     fix_patches(&mut manifest.patch, manifest_dir);

src/error.rs

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

src/run.rs

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