Skip to content

Commit 015897a

Browse files
borsbors
committed
Auto merge of #4031 - torkleyy:exclude, r=alexcrichton
Add --exclude flag Allows to exclude packages in conjunction with --all. Addresses #2878
2 parents 9693a6c + dee3c2e commit 015897a

File tree

9 files changed

+184
-20
lines changed

9 files changed

+184
-20
lines changed

‎src/bin/bench.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@ pub struct Options {
3030
flag_locked: bool,
3131
arg_args: Vec<String>,
3232
flag_all: bool,
33+
flag_exclude: Vec<String>,
3334
}
3435

3536
pub const USAGE: &'static str = "
@@ -52,6 +53,7 @@ Options:
5253
--no-run Compile, but don't run benchmarks
5354
-p SPEC, --package SPEC ... Package to run benchmarks for
5455
--all Benchmark all packages in the workspace
56+
--exclude SPEC ... Exclude packages from the benchmark
5557
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
5658
--features FEATURES Space-separated list of features to also build
5759
--all-features Build all available features
@@ -86,11 +88,9 @@ Compilation can be customized with the `bench` profile in the manifest.
8688
pub fn execute(options: Options, config: &Config) -> CliResult {
8789
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
8890

89-
let spec = if options.flag_all {
90-
Packages::All
91-
} else {
92-
Packages::Packages(&options.flag_package)
93-
};
91+
let spec = Packages::from_flags(options.flag_all,
92+
&options.flag_exclude,
93+
&options.flag_package)?;
9494

9595
config.configure(options.flag_verbose,
9696
options.flag_quiet,

‎src/bin/build.rs

+6-5
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ pub struct Options {
3131
flag_locked: bool,
3232
flag_frozen: bool,
3333
flag_all: bool,
34+
flag_exclude: Vec<String>,
3435
}
3536

3637
pub const USAGE: &'static str = "
@@ -43,6 +44,7 @@ Options:
4344
-h, --help Print this message
4445
-p SPEC, --package SPEC ... Package to build
4546
--all Build all packages in the workspace
47+
--exclude SPEC ... Exclude packages from the build
4648
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
4749
--lib Build only this package's library
4850
--bin NAME Build only the specified binary
@@ -73,6 +75,7 @@ current package is built. For more information on SPEC and its format, see the
7375
7476
All packages in the workspace are built if the `--all` flag is supplied. The
7577
`--all` flag may be supplied in the presence of a virtual manifest.
78+
Note that `--exclude` has to be specified in conjunction with the `--all` flag.
7679
7780
Compilation can be configured via the use of profiles which are configured in
7881
the manifest. The default profile for this command is `dev`, but passing
@@ -90,11 +93,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9093

9194
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
9295

93-
let spec = if options.flag_all {
94-
Packages::All
95-
} else {
96-
Packages::Packages(&options.flag_package)
97-
};
96+
let spec = Packages::from_flags(options.flag_all,
97+
&options.flag_exclude,
98+
&options.flag_package)?;
9899

99100
let opts = CompileOptions {
100101
config: config,

‎src/bin/check.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ Options:
1515
-h, --help Print this message
1616
-p SPEC, --package SPEC ... Package(s) to check
1717
--all Check all packages in the workspace
18+
--exclude SPEC ... Exclude packages from the check
1819
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
1920
--lib Check only this package's library
2021
--bin NAME Check only the specified binary
@@ -74,6 +75,7 @@ pub struct Options {
7475
flag_locked: bool,
7576
flag_frozen: bool,
7677
flag_all: bool,
78+
flag_exclude: Vec<String>,
7779
}
7880

7981
pub fn execute(options: Options, config: &Config) -> CliResult {
@@ -89,11 +91,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
8991
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
9092
let ws = Workspace::new(&root, config)?;
9193

92-
let spec = if options.flag_all {
93-
Packages::All
94-
} else {
95-
Packages::Packages(&options.flag_package)
96-
};
94+
let spec = Packages::from_flags(options.flag_all,
95+
&options.flag_exclude,
96+
&options.flag_package)?;
9797

9898
let opts = CompileOptions {
9999
config: config,

‎src/bin/test.rs

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ pub struct Options {
3333
flag_frozen: bool,
3434
flag_locked: bool,
3535
flag_all: bool,
36+
flag_exclude: Vec<String>,
3637
}
3738

3839
pub const USAGE: &'static str = "
@@ -56,6 +57,7 @@ Options:
5657
--no-run Compile, but don't run tests
5758
-p SPEC, --package SPEC ... Package to run tests for
5859
--all Test all packages in the workspace
60+
--exclude SPEC ... Exclude packages from the test
5961
-j N, --jobs N Number of parallel builds, see below for details
6062
--release Build artifacts in release mode, with optimizations
6163
--features FEATURES Space-separated list of features to also build
@@ -130,11 +132,9 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
130132
&options.flag_bench, options.flag_benches);
131133
}
132134

133-
let spec = if options.flag_all {
134-
Packages::All
135-
} else {
136-
Packages::Packages(&options.flag_package)
137-
};
135+
let spec = Packages::from_flags(options.flag_all,
136+
&options.flag_exclude,
137+
&options.flag_package)?;
138138

139139
let ops = ops::TestOptions {
140140
no_run: options.flag_no_run,

‎src/cargo/ops/cargo_compile.rs

+22
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,25 @@ pub enum MessageFormat {
105105
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
106106
pub enum Packages<'a> {
107107
All,
108+
OptOut(&'a [String]),
108109
Packages(&'a [String]),
109110
}
110111

111112
impl<'a> Packages<'a> {
113+
pub fn from_flags(all: bool, exclude: &'a Vec<String>, package: &'a Vec<String>)
114+
-> CargoResult<Self>
115+
{
116+
let packages = match (all, &exclude) {
117+
(true, exclude) if exclude.is_empty() => Packages::All,
118+
(true, exclude) => Packages::OptOut(exclude),
119+
(false, exclude) if !exclude.is_empty() => bail!("--exclude can only be used together \
120+
with --all"),
121+
_ => Packages::Packages(package),
122+
};
123+
124+
Ok(packages)
125+
}
126+
112127
pub fn into_package_id_specs(self, ws: &Workspace) -> CargoResult<Vec<PackageIdSpec>> {
113128
let specs = match self {
114129
Packages::All => {
@@ -117,6 +132,13 @@ impl<'a> Packages<'a> {
117132
.map(PackageIdSpec::from_package_id)
118133
.collect()
119134
}
135+
Packages::OptOut(opt_out) => {
136+
ws.members()
137+
.map(Package::package_id)
138+
.map(PackageIdSpec::from_package_id)
139+
.filter(|p| opt_out.iter().position(|x| *x == p.name()).is_none())
140+
.collect()
141+
}
120142
Packages::Packages(packages) => {
121143
packages.iter().map(|p| PackageIdSpec::parse(&p)).collect::<CargoResult<Vec<_>>>()?
122144
}

‎src/cargo/ops/cargo_run.rs

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ pub fn run(ws: &Workspace,
1111

1212
let pkg = match options.spec {
1313
Packages::All => unreachable!("cargo run supports single package only"),
14+
Packages::OptOut(_) => unreachable!("cargo run supports single package only"),
1415
Packages::Packages(xs) => match xs.len() {
1516
0 => ws.current()?,
1617
1 => ws.members()

‎tests/bench.rs

+53
Original file line numberDiff line numberDiff line change
@@ -1011,6 +1011,59 @@ fn bench_all_workspace() {
10111011
.with_stdout_contains("test bench_foo ... bench: [..]"));
10121012
}
10131013

1014+
#[test]
1015+
fn bench_all_exclude() {
1016+
if !is_nightly() { return }
1017+
1018+
let p = project("foo")
1019+
.file("Cargo.toml", r#"
1020+
[project]
1021+
name = "foo"
1022+
version = "0.1.0"
1023+
1024+
[workspace]
1025+
members = ["bar", "baz"]
1026+
"#)
1027+
.file("src/main.rs", r#"
1028+
fn main() {}
1029+
"#)
1030+
.file("bar/Cargo.toml", r#"
1031+
[project]
1032+
name = "bar"
1033+
version = "0.1.0"
1034+
"#)
1035+
.file("bar/src/lib.rs", r#"
1036+
#![feature(test)]
1037+
1038+
extern crate test;
1039+
1040+
#[bench]
1041+
pub fn bar(b: &mut test::Bencher) {
1042+
b.iter(|| {});
1043+
}
1044+
"#)
1045+
.file("baz/Cargo.toml", r#"
1046+
[project]
1047+
name = "baz"
1048+
version = "0.1.0"
1049+
"#)
1050+
.file("baz/src/lib.rs", r#"
1051+
#[test]
1052+
pub fn baz() {
1053+
break_the_build();
1054+
}
1055+
"#);
1056+
1057+
assert_that(p.cargo_process("bench")
1058+
.arg("--all")
1059+
.arg("--exclude")
1060+
.arg("baz"),
1061+
execs().with_status(0)
1062+
.with_stdout_contains("\
1063+
running 1 test
1064+
test bar ... bench: 0 ns/iter (+/- 0)"));
1065+
}
1066+
10141067
#[test]
10151068
fn bench_all_virtual_manifest() {
10161069
if !is_nightly() { return }

‎tests/build.rs

+43
Original file line numberDiff line numberDiff line change
@@ -2803,6 +2803,49 @@ fn build_all_workspace() {
28032803
[..] Finished dev [unoptimized + debuginfo] target(s) in [..]\n"));
28042804
}
28052805

2806+
#[test]
2807+
fn build_all_exclude() {
2808+
let p = project("foo")
2809+
.file("Cargo.toml", r#"
2810+
[project]
2811+
name = "foo"
2812+
version = "0.1.0"
2813+
2814+
[workspace]
2815+
members = ["bar", "baz"]
2816+
"#)
2817+
.file("src/main.rs", r#"
2818+
fn main() {}
2819+
"#)
2820+
.file("bar/Cargo.toml", r#"
2821+
[project]
2822+
name = "bar"
2823+
version = "0.1.0"
2824+
"#)
2825+
.file("bar/src/lib.rs", r#"
2826+
pub fn bar() {}
2827+
"#)
2828+
.file("baz/Cargo.toml", r#"
2829+
[project]
2830+
name = "baz"
2831+
version = "0.1.0"
2832+
"#)
2833+
.file("baz/src/lib.rs", r#"
2834+
pub fn baz() {
2835+
break_the_build();
2836+
}
2837+
"#);
2838+
2839+
assert_that(p.cargo_process("build")
2840+
.arg("--all")
2841+
.arg("--exclude")
2842+
.arg("baz"),
2843+
execs().with_status(0)
2844+
.with_stderr_contains("[..]Compiling foo v0.1.0 [..]")
2845+
.with_stderr_contains("[..]Compiling bar v0.1.0 [..]")
2846+
.with_stderr_does_not_contain("[..]Compiling baz v0.1.0 [..]"));
2847+
}
2848+
28062849
#[test]
28072850
fn build_all_workspace_implicit_examples() {
28082851
let p = project("foo")

‎tests/test.rs

+44
Original file line numberDiff line numberDiff line change
@@ -2377,6 +2377,50 @@ fn test_all_workspace() {
23772377
.with_stdout_contains("test bar_test ... ok"));
23782378
}
23792379

2380+
#[test]
2381+
fn test_all_exclude() {
2382+
let p = project("foo")
2383+
.file("Cargo.toml", r#"
2384+
[project]
2385+
name = "foo"
2386+
version = "0.1.0"
2387+
2388+
[workspace]
2389+
members = ["bar", "baz"]
2390+
"#)
2391+
.file("src/main.rs", r#"
2392+
fn main() {}
2393+
"#)
2394+
.file("bar/Cargo.toml", r#"
2395+
[project]
2396+
name = "bar"
2397+
version = "0.1.0"
2398+
"#)
2399+
.file("bar/src/lib.rs", r#"
2400+
#[test]
2401+
pub fn bar() {}
2402+
"#)
2403+
.file("baz/Cargo.toml", r#"
2404+
[project]
2405+
name = "baz"
2406+
version = "0.1.0"
2407+
"#)
2408+
.file("baz/src/lib.rs", r#"
2409+
#[test]
2410+
pub fn baz() {
2411+
assert!(false);
2412+
}
2413+
"#);
2414+
2415+
assert_that(p.cargo_process("test")
2416+
.arg("--all")
2417+
.arg("--exclude")
2418+
.arg("baz"),
2419+
execs().with_status(0)
2420+
.with_stdout_contains("running 1 test
2421+
test bar ... ok"));
2422+
}
2423+
23802424
#[test]
23812425
fn test_all_virtual_manifest() {
23822426
let p = project("workspace")

0 commit comments

Comments
 (0)