fix: change to update -w per feedback

Author: chaaz

src/bin/cargo/commands/mod.rs

@@ -8,7 +8,6 @@ pub fn builtin() -> Vec<App> {
         clean::cli(),
         doc::cli(),
         fetch::cli(),
-        sync_lockfile::cli(),
         fix::cli(),
         generate_lockfile::cli(),
         git_checkout::cli(),
@@ -46,7 +45,6 @@ pub fn builtin_exec(cmd: &str) -> Option<fn(&mut Config, &ArgMatches<'_>) -> Cli
         "clean" => clean::exec,
         "doc" => doc::exec,
         "fetch" => fetch::exec,
-        "sync-lockfile" => sync_lockfile::exec,
         "fix" => fix::exec,
         "generate-lockfile" => generate_lockfile::exec,
         "git-checkout" => git_checkout::exec,
@@ -103,7 +101,6 @@ pub mod run;
 pub mod rustc;
 pub mod rustdoc;
 pub mod search;
-pub mod sync_lockfile;
 pub mod test;
 pub mod tree;
 pub mod uninstall;

src/bin/cargo/commands/sync_lockfile.rs

@@ -7,6 +7,7 @@ pub fn cli() -> App {
     subcommand("update")
         .about("Update dependencies as recorded in the local lock file")
         .arg(opt("quiet", "No output printed to stdout").short("q"))
+        .arg(opt("workspace", "Only update the workspace pakcages").short("w"))
         .arg_package_spec_simple("Package to update")
         .arg(opt(
             "aggressive",
@@ -30,6 +31,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
         precise: args.value_of("precise"),
         to_update: values(args, "package"),
         dry_run: args.is_present("dry-run"),
+        workspace: args.is_present("workspace"),
         config,
     };
     ops::update_lockfile(&ws, &update_opts)?;

src/bin/cargo/commands/update.rs

@@ -17,6 +17,7 @@ pub struct UpdateOptions<'a> {
     pub precise: Option<&'a str>,
     pub aggressive: bool,
     pub dry_run: bool,
+    pub workspace: bool,
 }
 
 pub fn generate_lockfile(ws: &Workspace<'_>) -> CargoResult<()> {
@@ -35,6 +36,19 @@ pub fn generate_lockfile(ws: &Workspace<'_>) -> CargoResult<()> {
 }
 
 pub fn update_lockfile(ws: &Workspace<'_>, opts: &UpdateOptions<'_>) -> CargoResult<()> {
+    if opts.workspace {
+      if opts.aggressive {
+        anyhow::bail!("cannot specify aggressive for workspace updates");
+      }
+      if opts.precise.is_some() {
+        anyhow::bail!("cannot specify precise for workspace updates");
+      }
+
+      ws.emit_warnings()?;
+      let (_packages, _resolve) = ops::resolve_ws(ws)?;
+      return Ok(())
+    }
+
     if opts.aggressive && opts.precise.is_some() {
         anyhow::bail!("cannot specify both aggressive and precise simultaneously")
     }

src/cargo/ops/cargo_generate_lockfile.rs

@@ -15,7 +15,6 @@ pub use self::cargo_package::{package, PackageOpts};
 pub use self::cargo_pkgid::pkgid;
 pub use self::cargo_read_manifest::{read_package, read_packages};
 pub use self::cargo_run::run;
-pub use self::cargo_sync_lockfile::{sync_lockfile, SyncLockfileOptions};
 pub use self::cargo_test::{run_benches, run_tests, TestOptions};
 pub use self::cargo_uninstall::uninstall;
 pub use self::fix::{fix, fix_maybe_exec_rustc, FixOptions};
@@ -42,7 +41,6 @@ mod cargo_package;
 mod cargo_pkgid;
 mod cargo_read_manifest;
 mod cargo_run;
-mod cargo_sync_lockfile;
 mod cargo_test;
 mod cargo_uninstall;
 mod common_for_install_and_uninstall;

src/cargo/ops/mod.rs

@@ -44,6 +44,14 @@ the package to. If the package comes from a git repository, this can be a git
 revision (such as a SHA hash or tag).
 {{/option}}
 
+{{#option "`-w`" "`--workspace`" }}
+Attempt to update only packages defined in the workspace. Other packages
+are updated only if they don't already exist in the lockfile. This
+option is useful for updating `Cargo.lock` after you've changed version
+numbers in `Cargo.toml`.
+Cannot be used with `--precise` or `--aggressive`.
+{{/option}}
+
 {{#option "`--dry-run`" }}
 Displays what would be updated, but doesn't actually write the lockfile.
 {{/option}}

src/doc/man/cargo-update.md

@@ -35,6 +35,13 @@ OPTIONS
            to set the package to. If the package comes from a git repository,
            this can be a git revision (such as a SHA hash or tag).
 
+       -w, --workspace
+           Attempt to update only packages defined in the workspace. Other
+           packages are updated only if they don't already exist in the
+           lockfile. This option is useful for updating Cargo.lock after you've
+           changed version numbers in Cargo.toml. Cannot be used with --precise
+           or --aggressive.
+
        --dry-run
            Displays what would be updated, but doesn't actually write the
            lockfile.

src/doc/man/generated_txt/cargo-update.txt

@@ -43,6 +43,15 @@ the package to. If the package comes from a git repository, this can be a git
 revision (such as a SHA hash or tag).</dd>
 
 
+<dt class="option-term" id="option-cargo-update--w"><a class="option-anchor" href="#option-cargo-update--w"></a><code>-w</code></dt>
+<dt class="option-term" id="option-cargo-update---workspace"><a class="option-anchor" href="#option-cargo-update---workspace"></a><code>--workspace</code></dt>
+<dd class="option-desc">Attempt to update only packages defined in the workspace. Other packages
+are updated only if they don't already exist in the lockfile. This
+option is useful for updating <code>Cargo.lock</code> after you've changed version
+numbers in <code>Cargo.toml</code>.
+Cannot be used with <code>--precise</code> or <code>--aggressive</code>.</dd>
+
+
 <dt class="option-term" id="option-cargo-update---dry-run"><a class="option-anchor" href="#option-cargo-update---dry-run"></a><code>--dry-run</code></dt>
 <dd class="option-desc">Displays what would be updated, but doesn't actually write the lockfile.</dd>
 

src/doc/src/commands/cargo-update.md

@@ -42,6 +42,16 @@ the package to. If the package comes from a git repository, this can be a git
 revision (such as a SHA hash or tag).
 .RE
 .sp
+\fB\-w\fR, 
+\fB\-\-workspace\fR
+.RS 4
+Attempt to update only packages defined in the workspace. Other packages
+are updated only if they don't already exist in the lockfile. This
+option is useful for updating \fBCargo.lock\fR after you've changed version
+numbers in \fBCargo.toml\fR\&.
+Cannot be used with \fB\-\-precise\fR or \fB\-\-aggressive\fR\&.
+.RE
+.sp
 \fB\-\-dry\-run\fR
 .RS 4
 Displays what would be updated, but doesn't actually write the lockfile.

src/etc/man/cargo-update.1

@@ -109,7 +109,6 @@ mod rustflags;
 mod search;
 mod shell_quoting;
 mod standard_lib;
-mod sync_lockfile;
 mod test;
 mod timings;
 mod tool_paths;