Use toml instead of toml_edit

Author: taiki-e

Cargo.toml

@@ -3,7 +3,7 @@ name = "macrotest"
 version = "1.1.0"
 authors = ["eupn <[email protected]>"]
 edition = "2018"
-rust-version = "1.65"
+rust-version = "1.66"
 license = "MIT OR Apache-2.0"
 readme = "README.md"
 repository = "https://github.com/eupn/macrotest"
@@ -18,4 +18,4 @@ serde = "1.0.105"
 serde_derive = "1.0.105"
 serde_json = "1.0"
 syn = { version = "2", features = ["full"] }
-toml_edit = { version = "0.22", features = ["serde"] }
+toml = "0.9"

README.md

@@ -9,7 +9,7 @@
 
 Similar to [trybuild], but allows you to test how declarative or procedural macros are expanded.
 
-*Minimal Supported Rust Version: 1.65*
+*Minimal Supported Rust Version: 1.66*
 
 ----
 

src/dependencies.rs

@@ -18,7 +18,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_edit::de::from_str(&manifest_str)?;
+    let mut manifest: Manifest = toml::de::from_str(&manifest_str)?;
 
     fix_dependencies(&mut manifest.dependencies, manifest_dir);
     fix_dependencies(&mut manifest.dev_dependencies, manifest_dir);
@@ -33,7 +33,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_edit::de::from_str(&manifest_str)?;
+    let mut manifest: WorkspaceManifest = toml::de::from_str(&manifest_str)?;
 
     fix_dependencies(&mut manifest.workspace.dependencies, manifest_dir);
     fix_patches(&mut manifest.patch, manifest_dir);

src/error.rs

@@ -5,8 +5,8 @@ pub(crate) enum Error {
     CargoFail,
     CargoMetadata(serde_json::error::Error),
     Io(std::io::Error),
-    TomlSer(toml_edit::ser::Error),
-    TomlDe(toml_edit::de::Error),
+    TomlSer(toml::ser::Error),
+    TomlDe(toml::de::Error),
     Glob(glob::GlobError),
     GlobPattern(glob::PatternError),
     ManifestDir,
@@ -47,14 +47,14 @@ impl From<std::io::Error> for Error {
     }
 }
 
-impl From<toml_edit::ser::Error> for Error {
-    fn from(e: toml_edit::ser::Error) -> Self {
+impl From<toml::ser::Error> for Error {
+    fn from(e: toml::ser::Error) -> Self {
         Error::TomlSer(e)
     }
 }
 
-impl From<toml_edit::de::Error> for Error {
-    fn from(e: toml_edit::de::Error) -> Self {
+impl From<toml::de::Error> for Error {
+    fn from(e: toml::de::Error) -> Self {
         Error::TomlDe(e)
     }
 }

src/expand.rs

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

src/lib.rs

@@ -4,7 +4,7 @@
 //!
 //! Similar to [trybuild], but allows you to write tests on how macros are expanded.
 //!
-//! *Minimal Supported Rust Version: 1.65*
+//! *Minimal Supported Rust Version: 1.66*
 //!
 //! <br>
 //!