Revert "improvements: if workspace, pass the workspace flag in cargo …

…update" This reverts commit ccfcfd4.
openSUSE-Rust · Nov 17, 2024 · b386b88 · b386b88
1 parent ccfcfd4
commit b386b88
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 18 deletions.
diff --git a/cargo/src/cargo_commands.rs b/cargo/src/cargo_commands.rs
@@ -135,7 +135,6 @@ pub fn cargo_vendor(
 
     if is_manifest_workspace {
         info!("ℹ️ This manifest is in WORKSPACE configuration.");
-        default_options.push("--workspace".to_string());
         let workspace_has_deps = workspace_has_dependencies(custom_root, &first_manifest)?;
         if !workspace_has_deps {
             warn!("⚠️ This WORKSPACE MANIFEST does not seem to contain workspace dependencies and dev-dependencies. Please check member dependencies.");
@@ -211,7 +210,6 @@ pub fn cargo_vendor(
 
     cargo_update(
         update,
-        is_manifest_workspace,
         crates,
         &first_manifest_parent,
         &first_manifest.to_string_lossy(),
@@ -306,17 +304,13 @@ pub fn cargo_generate_lockfile(curdir: &Path, manifest: &str) -> io::Result<Stri
 
 pub fn cargo_update(
     global_update: bool,
-    is_workspace: bool,
     crates: &[String],
     curdir: &Path,
     manifest: &str,
     respect_lockfile: bool,
 ) -> io::Result<String> {
     let mut default_options = vec![];
     if global_update {
-        if is_workspace {
-            default_options.push("--workspace".to_string());
-        }
         info!("⏫ Updating dependencies...");
         let manifest_path = PathBuf::from(&manifest).canonicalize()?;
         let manifest_path_parent = manifest_path.parent().unwrap_or(curdir);
@@ -341,10 +335,6 @@ pub fn cargo_update(
     if !crates.is_empty() {
         for crate_ in crates.iter() {
             let mut new_cur_dir = curdir.to_path_buf();
-            default_options = Vec::new();
-            if is_workspace {
-                default_options.push("--workspace".to_string());
-            }
             if let Some((crate_name, string_tail)) = crate_.split_once("@") {
                 info!(
                     "🦀 Applying update for specified crate dependency {}.",
@@ -527,12 +517,6 @@ pub fn cargo_update(
                         }
                     }
                 }
-            } else {
-                info!(
-                    "🥺 Doing best effort update for specified crate dependency {}",
-                    crate_
-                );
-                default_options.push(crate_.to_string());
             }
             cargo_command("update", &default_options, new_cur_dir)
                 .inspect(|_| {

diff --git a/cargo/src/registry.rs b/cargo/src/registry.rs
@@ -60,7 +60,6 @@ pub fn run_cargo_vendor_home_registry(
                     .canonicalize()?;
                 cargo_update(
                     registry.update,
-                    is_workspace,
                     &registry.update_crate,
                     &possible_root_manifest_parent,
                     &possible_root_manifest.to_string_lossy(),
@@ -113,7 +112,6 @@ pub fn run_cargo_vendor_home_registry(
                 }
                 cargo_update(
                     registry.update,
-                    is_workspace,
                     &registry.update_crate,
                     full_manifest_path_parent,
                     &full_manifest_path.to_string_lossy(),