Skip to content

Commit b987ce4

Browse files
borsbors
committed
Auto merge of #3901 - BenWiederhake:all-kinds, r=alexcrichton
Implementation and CLI-support for `--all-$KIND` flags This implements #3112. This means all of the following commands are now possible and meaningful: ``` cargo build --all-bins cargo build --all-tests cargo test --all-tests cargo test --all-bins cargo check --all-bins --all-examples --all-tests --all-benches ``` The commits try to represent the incremental "propagation" of the new feature: - core functionality (`cargo check --lib` passes) - CLI suport (`cargo build` passes) - additional tests (`cargo test` covers new functionality) Note that `--all` is already reserved to mean "all packages of the workspace", so it can't be used to mean `--all-bins --all-examples --all-tests --all-benches`. I intend to follow this up by some other PRs, so please do tell me where I could improve.
2 parents 03efb7f + 01782fe commit b987ce4

18 files changed

+868
-198
lines changed

‎src/bin/bench.rs

+12-4
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,13 @@ pub struct Options {
1919
flag_message_format: MessageFormat,
2020
flag_lib: bool,
2121
flag_bin: Vec<String>,
22+
flag_bins: bool,
2223
flag_example: Vec<String>,
24+
flag_examples: bool,
2325
flag_test: Vec<String>,
26+
flag_tests: bool,
2427
flag_bench: Vec<String>,
28+
flag_benches: bool,
2529
flag_frozen: bool,
2630
flag_locked: bool,
2731
arg_args: Vec<String>,
@@ -37,9 +41,13 @@ Options:
3741
-h, --help Print this message
3842
--lib Benchmark only this package's library
3943
--bin NAME Benchmark only the specified binary
44+
--bins Benchmark all binaries
4045
--example NAME Benchmark only the specified example
46+
--examples Benchmark all examples
4147
--test NAME Benchmark only the specified test target
48+
--tests Benchmark all tests
4249
--bench NAME Benchmark only the specified bench target
50+
--benches Benchmark all benches
4351
--no-run Compile, but don't run benchmarks
4452
-p SPEC, --package SPEC ... Package to run benchmarks for
4553
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
@@ -92,10 +100,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
92100
release: true,
93101
mode: ops::CompileMode::Bench,
94102
filter: ops::CompileFilter::new(options.flag_lib,
95-
&options.flag_bin,
96-
&options.flag_test,
97-
&options.flag_example,
98-
&options.flag_bench),
103+
&options.flag_bin, options.flag_bins,
104+
&options.flag_test, options.flag_tests,
105+
&options.flag_example, options.flag_examples,
106+
&options.flag_bench, options.flag_benches,),
99107
message_format: options.flag_message_format,
100108
target_rustdoc_args: None,
101109
target_rustc_args: None,

‎src/bin/build.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ pub struct Options {
2121
flag_release: bool,
2222
flag_lib: bool,
2323
flag_bin: Vec<String>,
24+
flag_bins: bool,
2425
flag_example: Vec<String>,
26+
flag_examples: bool,
2527
flag_test: Vec<String>,
28+
flag_tests: bool,
2629
flag_bench: Vec<String>,
30+
flag_benches: bool,
2731
flag_locked: bool,
2832
flag_frozen: bool,
2933
flag_all: bool,
@@ -42,9 +46,13 @@ Options:
4246
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
4347
--lib Build only this package's library
4448
--bin NAME Build only the specified binary
49+
--bins Build all binaries
4550
--example NAME Build only the specified example
51+
--examples Build all examples
4652
--test NAME Build only the specified test target
47-
--bench NAME Build only the specified benchmark target
53+
--tests Build all tests
54+
--bench NAME Build only the specified bench target
55+
--benches Build all benches
4856
--release Build artifacts in release mode, with optimizations
4957
--features FEATURES Space-separated list of features to also build
5058
--all-features Build all available features
@@ -99,10 +107,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
99107
mode: ops::CompileMode::Build,
100108
release: options.flag_release,
101109
filter: ops::CompileFilter::new(options.flag_lib,
102-
&options.flag_bin,
103-
&options.flag_test,
104-
&options.flag_example,
105-
&options.flag_bench),
110+
&options.flag_bin, options.flag_bins,
111+
&options.flag_test, options.flag_tests,
112+
&options.flag_example, options.flag_examples,
113+
&options.flag_bench, options.flag_benches,),
106114
message_format: options.flag_message_format,
107115
target_rustdoc_args: None,
108116
target_rustc_args: None,

‎src/bin/check.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,13 @@ Options:
1818
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
1919
--lib Check only this package's library
2020
--bin NAME Check only the specified binary
21+
--bins Check all binaries
2122
--example NAME Check only the specified example
23+
--examples Check all examples
2224
--test NAME Check only the specified test target
23-
--bench NAME Check only the specified benchmark target
25+
--tests Check all tests
26+
--bench NAME Check only the specified bench target
27+
--benches Check all benches
2428
--release Check artifacts in release mode, with optimizations
2529
--features FEATURES Space-separated list of features to also check
2630
--all-features Check all available features
@@ -60,9 +64,13 @@ pub struct Options {
6064
flag_release: bool,
6165
flag_lib: bool,
6266
flag_bin: Vec<String>,
67+
flag_bins: bool,
6368
flag_example: Vec<String>,
69+
flag_examples: bool,
6470
flag_test: Vec<String>,
71+
flag_tests: bool,
6572
flag_bench: Vec<String>,
73+
flag_benches: bool,
6674
flag_locked: bool,
6775
flag_frozen: bool,
6876
flag_all: bool,
@@ -98,10 +106,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
98106
mode: ops::CompileMode::Check,
99107
release: options.flag_release,
100108
filter: ops::CompileFilter::new(options.flag_lib,
101-
&options.flag_bin,
102-
&options.flag_test,
103-
&options.flag_example,
104-
&options.flag_bench),
109+
&options.flag_bin, options.flag_bins,
110+
&options.flag_test, options.flag_tests,
111+
&options.flag_example, options.flag_examples,
112+
&options.flag_bench, options.flag_benches,),
105113
message_format: options.flag_message_format,
106114
target_rustdoc_args: None,
107115
target_rustc_args: None,

‎src/bin/doc.rs

+6-4
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ pub struct Options {
2121
flag_package: Vec<String>,
2222
flag_lib: bool,
2323
flag_bin: Vec<String>,
24+
flag_bins: bool,
2425
flag_frozen: bool,
2526
flag_locked: bool,
2627
flag_all: bool,
@@ -41,6 +42,7 @@ Options:
4142
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
4243
--lib Document only this package's library
4344
--bin NAME Document only the specified binary
45+
--bins Document all binaries
4446
--release Build artifacts in release mode, with optimizations
4547
--features FEATURES Space-separated list of features to also build
4648
--all-features Build all available features
@@ -93,10 +95,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9395
no_default_features: options.flag_no_default_features,
9496
spec: spec,
9597
filter: ops::CompileFilter::new(options.flag_lib,
96-
&options.flag_bin,
97-
&empty,
98-
&empty,
99-
&empty),
98+
&options.flag_bin, options.flag_bins,
99+
&empty, false,
100+
&empty, false,
101+
&empty, false),
100102
message_format: options.flag_message_format,
101103
release: options.flag_release,
102104
mode: ops::CompileMode::Doc {

‎src/bin/install.rs

+11-4
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ pub struct Options {
1010
flag_no_default_features: bool,
1111
flag_debug: bool,
1212
flag_bin: Vec<String>,
13+
flag_bins: bool,
1314
flag_example: Vec<String>,
15+
flag_examples: bool,
1416
flag_verbose: u32,
1517
flag_quiet: Option<bool>,
1618
flag_color: Option<String>,
@@ -54,8 +56,10 @@ Build and install options:
5456
--all-features Build all available features
5557
--no-default-features Do not build the `default` feature
5658
--debug Build in debug mode instead of release mode
57-
--bin NAME Only install the binary NAME
58-
--example EXAMPLE Install the example EXAMPLE instead of binaries
59+
--bin NAME Install only the specified binary
60+
--bins Install all binaries
61+
--example NAME Install only the specified example
62+
--examples Install all examples
5963
--root DIR Directory to install packages into
6064
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
6165
-q, --quiet Less output printed to stdout
@@ -111,8 +115,11 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
111115
spec: ops::Packages::Packages(&[]),
112116
mode: ops::CompileMode::Build,
113117
release: !options.flag_debug,
114-
filter: ops::CompileFilter::new(false, &options.flag_bin, &[],
115-
&options.flag_example, &[]),
118+
filter: ops::CompileFilter::new(false,
119+
&options.flag_bin, options.flag_bins,
120+
&[], false,
121+
&options.flag_example, options.flag_examples,
122+
&[], false),
116123
message_format: ops::MessageFormat::Human,
117124
target_rustc_args: None,
118125
target_rustdoc_args: None,

‎src/bin/run.rs

+5-4
Original file line numberDiff line numberDiff line change
@@ -94,10 +94,11 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9494
filter: if examples.is_empty() && bins.is_empty() {
9595
ops::CompileFilter::Everything { required_features_filterable: false, }
9696
} else {
97-
ops::CompileFilter::Only {
98-
lib: false, tests: &[], benches: &[],
99-
bins: &bins, examples: &examples,
100-
}
97+
ops::CompileFilter::new(false,
98+
&bins, false,
99+
&[], false,
100+
&examples, false,
101+
&[], false)
101102
},
102103
message_format: options.flag_message_format,
103104
target_rustdoc_args: None,

‎src/bin/rustc.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,13 @@ pub struct Options {
2222
flag_release: bool,
2323
flag_lib: bool,
2424
flag_bin: Vec<String>,
25+
flag_bins: bool,
2526
flag_example: Vec<String>,
27+
flag_examples: bool,
2628
flag_test: Vec<String>,
29+
flag_tests: bool,
2730
flag_bench: Vec<String>,
31+
flag_benches: bool,
2832
flag_profile: Option<String>,
2933
flag_frozen: bool,
3034
flag_locked: bool,
@@ -42,9 +46,13 @@ Options:
4246
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
4347
--lib Build only this package's library
4448
--bin NAME Build only the specified binary
49+
--bins Build all binaries
4550
--example NAME Build only the specified example
51+
--examples Build all examples
4652
--test NAME Build only the specified test target
47-
--bench NAME Build only the specified benchmark target
53+
--tests Build all tests
54+
--bench NAME Build only the specified bench target
55+
--benches Build all benches
4856
--release Build artifacts in release mode, with optimizations
4957
--profile PROFILE Profile to build the selected target for
5058
--features FEATURES Features to compile for the package
@@ -109,10 +117,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
109117
mode: mode,
110118
release: options.flag_release,
111119
filter: ops::CompileFilter::new(options.flag_lib,
112-
&options.flag_bin,
113-
&options.flag_test,
114-
&options.flag_example,
115-
&options.flag_bench),
120+
&options.flag_bin, options.flag_bins,
121+
&options.flag_test, options.flag_tests,
122+
&options.flag_example, options.flag_examples,
123+
&options.flag_bench, options.flag_benches,),
116124
message_format: options.flag_message_format,
117125
target_rustdoc_args: None,
118126
target_rustc_args: options.arg_opts.as_ref().map(|a| &a[..]),

‎src/bin/rustdoc.rs

+13-5
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,13 @@ pub struct Options {
2121
flag_package: Option<String>,
2222
flag_lib: bool,
2323
flag_bin: Vec<String>,
24+
flag_bins: bool,
2425
flag_example: Vec<String>,
26+
flag_examples: bool,
2527
flag_test: Vec<String>,
28+
flag_tests: bool,
2629
flag_bench: Vec<String>,
30+
flag_benches: bool,
2731
flag_frozen: bool,
2832
flag_locked: bool,
2933
}
@@ -41,9 +45,13 @@ Options:
4145
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
4246
--lib Build only this package's library
4347
--bin NAME Build only the specified binary
48+
--bins Build all binaries
4449
--example NAME Build only the specified example
50+
--examples Build all examples
4551
--test NAME Build only the specified test target
46-
--bench NAME Build only the specified benchmark target
52+
--tests Build all tests
53+
--bench NAME Build only the specified bench target
54+
--benches Build all benches
4755
--release Build artifacts in release mode, with optimizations
4856
--features FEATURES Space-separated list of features to also build
4957
--all-features Build all available features
@@ -94,10 +102,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
94102
spec: Packages::Packages(&spec),
95103
release: options.flag_release,
96104
filter: ops::CompileFilter::new(options.flag_lib,
97-
&options.flag_bin,
98-
&options.flag_test,
99-
&options.flag_example,
100-
&options.flag_bench),
105+
&options.flag_bin, options.flag_bins,
106+
&options.flag_test, options.flag_tests,
107+
&options.flag_example, options.flag_examples,
108+
&options.flag_bench, options.flag_benches,),
101109
message_format: options.flag_message_format,
102110
mode: ops::CompileMode::Doc { deps: false },
103111
target_rustdoc_args: Some(&options.arg_opts),

‎src/bin/test.rs

+17-8
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,13 @@ pub struct Options {
1717
flag_lib: bool,
1818
flag_doc: bool,
1919
flag_bin: Vec<String>,
20+
flag_bins: bool,
2021
flag_example: Vec<String>,
22+
flag_examples: bool,
2123
flag_test: Vec<String>,
24+
flag_tests: bool,
2225
flag_bench: Vec<String>,
26+
flag_benches: bool,
2327
flag_verbose: u32,
2428
flag_quiet: Option<bool>,
2529
flag_color: Option<String>,
@@ -41,10 +45,14 @@ Options:
4145
-h, --help Print this message
4246
--lib Test only this package's library
4347
--doc Test only this library's documentation
44-
--bin NAME ... Test only the specified binaries
48+
--bin NAME ... Test only the specified binary
49+
--bins Test all binaries
4550
--example NAME ... Check that the specified examples compile
46-
--test NAME ... Test only the specified integration test targets
47-
--bench NAME ... Test only the specified benchmark targets
51+
--examples Check that all examples compile
52+
--test NAME ... Test only the specified test target
53+
--tests Test all tests
54+
--bench NAME ... Test only the specified bench target
55+
--benches Test all benches
4856
--no-run Compile, but don't run tests
4957
-p SPEC, --package SPEC ... Package to run tests for
5058
--all Test all packages in the workspace
@@ -106,14 +114,15 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
106114
let (mode, filter);
107115
if options.flag_doc {
108116
mode = ops::CompileMode::Doctest;
109-
filter = ops::CompileFilter::new(true, &empty, &empty, &empty, &empty);
117+
filter = ops::CompileFilter::new(true, &empty, false, &empty, false,
118+
&empty, false, &empty, false);
110119
} else {
111120
mode = ops::CompileMode::Test;
112121
filter = ops::CompileFilter::new(options.flag_lib,
113-
&options.flag_bin,
114-
&options.flag_test,
115-
&options.flag_example,
116-
&options.flag_bench);
122+
&options.flag_bin, options.flag_bins,
123+
&options.flag_test, options.flag_tests,
124+
&options.flag_example, options.flag_examples,
125+
&options.flag_bench, options.flag_benches);
117126
}
118127

119128
let spec = if options.flag_all {

‎src/cargo/core/manifest.rs

+8
Original file line numberDiff line numberDiff line change
@@ -454,6 +454,14 @@ impl Target {
454454
}
455455
}
456456

457+
pub fn is_bin_example(&self) -> bool {
458+
// Needed for --all-examples in contexts where only runnable examples make sense
459+
match self.kind {
460+
TargetKind::ExampleBin => true,
461+
_ => false
462+
}
463+
}
464+
457465
pub fn is_test(&self) -> bool { self.kind == TargetKind::Test }
458466
pub fn is_bench(&self) -> bool { self.kind == TargetKind::Bench }
459467
pub fn is_custom_build(&self) -> bool { self.kind == TargetKind::CustomBuild }

0 commit comments

Comments
 (0)