feat: fix fail and comment removal

Author: JoE11-y

forc-pkg/src/manifest/dep_modifier.rs

@@ -7,7 +7,6 @@ use anyhow::{anyhow, bail, Result};
 use pkg::manifest::ManifestFile;
 use std::collections::BTreeMap;
 use std::fmt;
-use std::fs;
 use std::path::Path;
 use std::path::PathBuf;
 use std::str::FromStr;
@@ -116,30 +115,21 @@ pub fn modify_dependencies(opts: ModifyOpts) -> Result<()> {
         &opts.ipfs_node.clone().unwrap_or_default(),
     );
 
-    let new_plan = new_plan.or_else(|e| {
+    new_plan.or_else(|e| {
         std::fs::write(&package_manifest_dir, backup_doc.to_string())
             .map_err(|write_err| anyhow!("failed to write toml file: {}", write_err))?;
         Err(e)
     })?;
 
-    let new_lock = Lock::from_graph(new_plan.graph());
-
-    new_lock.diff(&old_lock);
-
     if opts.dry_run {
         info!("Dry run enabled. toml file not modified.");
         std::fs::write(&package_manifest_dir, backup_doc.to_string())?;
-        return Ok(());
-    }
 
-    let string = toml::ser::to_string_pretty(&new_lock)
-        .map_err(|e| anyhow!("failed to serialize lock file: {}", e))?;
+        let string = toml::ser::to_string_pretty(&old_lock)?;
+        std::fs::write(&lock_path, string)?;
 
-    if let Err(e) = fs::write(&lock_path, string) {
-        std::fs::write(&package_manifest_dir, backup_doc.to_string())
-            .map_err(|e| anyhow!("failed to write toml file: {}", e))?;
-        bail!("failed to write lock file: {}", e);
-    };
+        return Ok(());
+    }
 
     Ok(())
 }
@@ -309,7 +299,13 @@ impl Section {
         dep_data: Dependency,
         salt: Option<String>,
     ) -> Result<()> {
-        let mut table = Table::new();
+        let section_name = self.to_string();
+
+        if !doc.as_table().contains_key(&section_name) {
+            doc[&section_name] = Item::Table(Table::new());
+        }
+
+        let table = doc[section_name.as_str()].as_table_mut().unwrap();
 
         match self {
             Section::Deps => {
@@ -352,8 +348,6 @@ impl Section {
             }
         };
 
-        doc[&self.to_string()] = Item::Table(table);
-
         Ok(())
     }
 
@@ -430,6 +424,7 @@ fn generate_table(details: &DependencyDetails) -> InlineTable {
 mod tests {
     use super::*;
     use crate::WorkspaceManifestFile;
+    use std::fs;
     use std::str::FromStr;
     use tempfile::{tempdir, TempDir};
 

forc/src/cli/commands/add.rs

@@ -19,7 +19,7 @@ forc_util::cli_examples! {
 #[clap(bin_name = "forc add", version, after_help = help())]
 pub struct Command {
     /// List of dependencies to add in the format "name[@version]"
-    #[clap(value_enum, value_name = "DEP_SPEC")]
+    #[clap(value_enum, value_name = "DEP_SPEC", required = true)]
     pub dependencies: Vec<String>,
 
     /// Print the changes that would be made without actually making them

forc/src/cli/commands/remove.rs

@@ -19,7 +19,7 @@ crate::cli::Opt {
 #[clap(bin_name = "forc remove", version, after_help = help())]
 pub struct Command {
     /// List of dependencies to remove in the format "name[@version]"
-    #[clap(value_enum, value_name = "DEP_SPEC")]
+    #[clap(value_enum, value_name = "DEP_SPEC", required = true)]
     pub dependencies: Vec<String>,
 
     /// Print the changes that would be made without actually making them