Replace toml with basic-toml (eupn#93)

Author: taiki-e

Cargo.toml

@@ -10,10 +10,10 @@ repository = "https://github.com/eupn/macrotest"
 description = "Test harness for macro expansion"
 
 [dependencies]
+basic-toml = "0.1"
 diff = "0.1"
 glob = "0.3"
 prettyplease = "0.2"
 serde = { version = "1.0.105", features = ["derive"] }
 serde_json = "1.0"
 syn = { version = "2", features = ["full"] }
-toml = "0.5"

src/dependencies.rs

@@ -3,12 +3,12 @@ use crate::manifest::Edition;
 use serde::de::value::MapAccessDeserializer;
 use serde::de::{self, Visitor};
 use serde::{Deserialize, Deserializer, Serialize, Serializer};
+use serde_json::Value;
 use std::collections::BTreeMap as Map;
 use std::fmt;
 use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
-use toml::Value;
 
 pub(crate) fn get_manifest(manifest_dir: &Path) -> Manifest {
     try_get_manifest(manifest_dir).unwrap_or_default()
@@ -17,7 +17,7 @@ pub(crate) fn get_manifest(manifest_dir: &Path) -> Manifest {
 fn try_get_manifest(manifest_dir: &Path) -> Result<Manifest, Error> {
     let cargo_toml_path = manifest_dir.join("Cargo.toml");
     let manifest_str = fs::read_to_string(cargo_toml_path)?;
-    let mut manifest: Manifest = toml::from_str(&manifest_str)?;
+    let mut manifest: Manifest = basic_toml::from_str(&manifest_str)?;
 
     fix_dependencies(&mut manifest.dependencies, manifest_dir);
     fix_dependencies(&mut manifest.dev_dependencies, manifest_dir);
@@ -32,7 +32,7 @@ pub(crate) fn get_workspace_manifest(manifest_dir: &Path) -> WorkspaceManifest {
 pub(crate) fn try_get_workspace_manifest(manifest_dir: &Path) -> 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_patches(&mut manifest.patch, manifest_dir);
     fix_replacements(&mut manifest.replace, manifest_dir);

src/error.rs

@@ -7,8 +7,7 @@ pub(crate) enum Error {
     CargoFail,
     CargoMetadata(serde_json::error::Error),
     IoError(std::io::Error),
-    TomlSerError(toml::ser::Error),
-    TomlDeError(toml::de::Error),
+    TomlError(basic_toml::Error),
     GlobError(glob::GlobError),
     GlobPatternError(glob::PatternError),
     ManifestDirError,
@@ -28,8 +27,7 @@ impl std::fmt::Display for Error {
             CargoFail => write!(f, "cargo reported an error"),
             CargoMetadata(e) => write!(f, "{}", e),
             IoError(e) => write!(f, "{}", e),
-            TomlSerError(e) => write!(f, "{}", e),
-            TomlDeError(e) => write!(f, "{}", e),
+            TomlError(e) => write!(f, "{}", e),
             GlobError(e) => write!(f, "{}", e),
             GlobPatternError(e) => write!(f, "{}", e),
             ManifestDirError => write!(f, "could not find CARGO_MANIFEST_DIR env var"),
@@ -49,15 +47,9 @@ impl From<std::io::Error> for Error {
     }
 }
 
-impl From<toml::ser::Error> for Error {
-    fn from(e: toml::ser::Error) -> Self {
-        Error::TomlSerError(e)
-    }
-}
-
-impl From<toml::de::Error> for Error {
-    fn from(e: toml::de::Error) -> Self {
-        Error::TomlDeError(e)
+impl From<basic_toml::Error> for Error {
+    fn from(e: basic_toml::Error) -> Self {
+        Error::TomlError(e)
     }
 }
 

src/expand.rs

@@ -216,10 +216,10 @@ fn prepare(tests: &[ExpandedTest]) -> Result<Project> {
     };
 
     let manifest = make_manifest(crate_name, &project, tests)?;
-    let manifest_toml = toml::to_string(&manifest)?;
+    let manifest_toml = basic_toml::to_string(&manifest)?;
 
     let config = make_config();
-    let config_toml = toml::to_string(&config)?;
+    let config_toml = basic_toml::to_string(&config)?;
 
     if let Some(enabled_features) = &mut project.features {
         enabled_features.retain(|feature| manifest.features.contains_key(feature));