diff --git a/src/bin/cargo/commands/bench.rs b/src/bin/cargo/commands/bench.rs index bb2c193b0..9c36422c4 100644 --- a/src/bin/cargo/commands/bench.rs +++ b/src/bin/cargo/commands/bench.rs @@ -42,7 +42,7 @@ pub fn cli() -> Command { "Benchmark all targets", ) .arg_features() - .arg_jobs_without_keep_going() + .arg_jobs() .arg(flag("keep-going", "Use `--no-fail-fast` instead").hide(true)) // See rust-lang/cargo#11702 .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Build for the target triple") diff --git a/src/bin/cargo/commands/build.rs b/src/bin/cargo/commands/build.rs index e25638aa0..19076d328 100644 --- a/src/bin/cargo/commands/build.rs +++ b/src/bin/cargo/commands/build.rs @@ -31,7 +31,7 @@ pub fn cli() -> Command { .arg_features() .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") - .arg_jobs() + .arg_parallel() .arg_target_triple("Build for the target triple") .arg_target_dir() .arg( diff --git a/src/bin/cargo/commands/check.rs b/src/bin/cargo/commands/check.rs index ab6f99048..62df0c106 100644 --- a/src/bin/cargo/commands/check.rs +++ b/src/bin/cargo/commands/check.rs @@ -29,7 +29,7 @@ pub fn cli() -> Command { "Check all targets", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg_release("Check artifacts in release mode, with optimizations") .arg_profile("Check artifacts with the specified profile") .arg_target_triple("Check for the target triple") diff --git a/src/bin/cargo/commands/doc.rs b/src/bin/cargo/commands/doc.rs index c3dfe426d..e209eb7db 100644 --- a/src/bin/cargo/commands/doc.rs +++ b/src/bin/cargo/commands/doc.rs @@ -32,7 +32,7 @@ pub fn cli() -> Command { "Document only the specified example", "Document all examples", ) - .arg_jobs() + .arg_parallel() .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Build for the target triple") diff --git a/src/bin/cargo/commands/fix.rs b/src/bin/cargo/commands/fix.rs index 1f98dd67e..96afbbdcc 100644 --- a/src/bin/cargo/commands/fix.rs +++ b/src/bin/cargo/commands/fix.rs @@ -47,7 +47,7 @@ pub fn cli() -> Command { "Fix all targets (default)", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg_release("Fix artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Fix for the target triple") diff --git a/src/bin/cargo/commands/install.rs b/src/bin/cargo/commands/install.rs index 8abb00190..05d348323 100644 --- a/src/bin/cargo/commands/install.rs +++ b/src/bin/cargo/commands/install.rs @@ -75,7 +75,7 @@ pub fn cli() -> Command { "Install all examples", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg(flag( "debug", "Build in debug mode (with the 'dev' profile) instead of release mode", diff --git a/src/bin/cargo/commands/package.rs b/src/bin/cargo/commands/package.rs index cf4ac795c..e87fb3ef8 100644 --- a/src/bin/cargo/commands/package.rs +++ b/src/bin/cargo/commands/package.rs @@ -33,7 +33,7 @@ pub fn cli() -> Command { .arg_features() .arg_target_triple("Build for the target triple") .arg_target_dir() - .arg_jobs() + .arg_parallel() .arg_manifest_path() .after_help("Run `cargo help package` for more detailed information.\n") } diff --git a/src/bin/cargo/commands/publish.rs b/src/bin/cargo/commands/publish.rs index bda240c8c..f30633e3d 100644 --- a/src/bin/cargo/commands/publish.rs +++ b/src/bin/cargo/commands/publish.rs @@ -20,7 +20,7 @@ pub fn cli() -> Command { .arg_quiet() .arg_package("Package to publish") .arg_features() - .arg_jobs() + .arg_parallel() .arg_target_triple("Build for the target triple") .arg_target_dir() .arg_manifest_path() diff --git a/src/bin/cargo/commands/run.rs b/src/bin/cargo/commands/run.rs index 1649f72ac..ce2099b0e 100644 --- a/src/bin/cargo/commands/run.rs +++ b/src/bin/cargo/commands/run.rs @@ -30,7 +30,7 @@ pub fn cli() -> Command { "Name of the example target to run", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Build for the target triple") diff --git a/src/bin/cargo/commands/rustc.rs b/src/bin/cargo/commands/rustc.rs index 0a0364e37..d318b6194 100644 --- a/src/bin/cargo/commands/rustc.rs +++ b/src/bin/cargo/commands/rustc.rs @@ -44,7 +44,7 @@ pub fn cli() -> Command { "Build all targets", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Target triple which compiles will be for") diff --git a/src/bin/cargo/commands/rustdoc.rs b/src/bin/cargo/commands/rustdoc.rs index 488256ba7..25ca7dacf 100644 --- a/src/bin/cargo/commands/rustdoc.rs +++ b/src/bin/cargo/commands/rustdoc.rs @@ -32,7 +32,7 @@ pub fn cli() -> Command { "Build all targets", ) .arg_features() - .arg_jobs() + .arg_parallel() .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") .arg_target_triple("Build for the target triple") diff --git a/src/bin/cargo/commands/test.rs b/src/bin/cargo/commands/test.rs index 80c935d62..8313851f3 100644 --- a/src/bin/cargo/commands/test.rs +++ b/src/bin/cargo/commands/test.rs @@ -48,7 +48,7 @@ pub fn cli() -> Command { "Test all targets (does not include doctests)", ) .arg_features() - .arg_jobs_without_keep_going() + .arg_jobs() .arg(flag("keep-going", "Use `--no-fail-fast` instead").hide(true)) // See rust-lang/cargo#11702 .arg_release("Build artifacts in release mode, with optimizations") .arg_profile("Build artifacts with the specified profile") diff --git a/src/cargo/util/command_prelude.rs b/src/cargo/util/command_prelude.rs index bc707ef6f..332ac415b 100644 --- a/src/cargo/util/command_prelude.rs +++ b/src/cargo/util/command_prelude.rs @@ -82,8 +82,8 @@ pub trait CommandExt: Sized { ) } - fn arg_jobs(self) -> Self { - self.arg_jobs_without_keep_going()._arg( + fn arg_parallel(self) -> Self { + self.arg_jobs()._arg( flag( "keep-going", "Do not abort the build as soon as there is an error (unstable)", @@ -92,7 +92,7 @@ pub trait CommandExt: Sized { ) } - fn arg_jobs_without_keep_going(self) -> Self { + fn arg_jobs(self) -> Self { self._arg( opt("jobs", "Number of parallel jobs, defaults to # of CPUs.") .short('j')