Merge #22

22: Use own parser for removing dev-dependencies r=taiki-e a=taiki-e

This reduces compile time to less than half.

Co-authored-by: Taiki Endo <te316e89@gmail.com>

Cargo.toml

@@ -26,7 +26,6 @@ serde_derive = "1.0.102"
 serde_json = "1.0.41"
 termcolor = "1.0.5"
 toml = "0.5.5"
-toml_edit = "0.1.5"
 
 [dev-dependencies]
 easy-ext = "0.1.6"

src/main.rs

@@ -9,6 +9,7 @@ mod cli;
 mod manifest;
 mod metadata;
 mod process;
+mod remove_dev_deps;
 mod restore;
 
 use std::{env, ffi::OsString, fs, path::Path};
@@ -132,7 +133,7 @@ fn no_dev_deps(
     restore: &Restore,
 ) -> Result<()> {
     if args.no_dev_deps || args.remove_dev_deps {
-        let new = manifest.remove_dev_deps()?;
+        let new = manifest.remove_dev_deps();
         let mut handle = restore.set_manifest(&manifest);
 
         fs::write(&package.manifest_path, new).with_context(|| {

src/manifest.rs

@@ -40,22 +40,8 @@ impl Manifest {
         self.package.as_ref().unwrap().publish == false
     }
 
-    pub(crate) fn remove_dev_deps(&self) -> Result<String> {
-        let mut doc: toml_edit::Document = self.raw.parse()?;
-        remove_key_and_target_key(doc.as_table_mut(), "dev-dependencies");
-        Ok(doc.to_string_in_original_order())
-    }
-}
-
-fn remove_key_and_target_key(table: &mut toml_edit::Table, key: &str) {
-    table.remove(key);
-    if let Some(table) = table.entry("target").as_table_mut() {
-        // `toml_edit::Table` does not have `.iter_mut()`, so collect keys.
-        for k in table.iter().map(|(key, _)| key.to_string()).collect::<Vec<_>>() {
-            if let Some(table) = table.entry(&k).as_table_mut() {
-                table.remove(key);
-            }
-        }
+    pub(crate) fn remove_dev_deps(&self) -> String {
+        super::remove_dev_deps::remove_dev_deps(&self.raw)
     }
 }