Skip to content

Commit 76148e9

Browse files
borsbors
committed
Auto merge of #4335 - debris:rebased_4021, r=matklad
Rebased and fixed 4025: Apply --all if workspace is virtual - fixes #4021 - rebased #4025 - fixed issue issue described by @matklad in #4025 (review) - added test `build_virtual_manifest_one_project` which covers the fix
2 parents ddfdfbd + f1f3b15 commit 76148e9

14 files changed

+260
-21
lines changed

‎.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,5 @@ src/registry/Cargo.lock
1010
rustc
1111
__pycache__
1212
.idea/
13-
*.iml
13+
*.iml
14+
*.swp

‎src/bin/bench.rs

+13-6
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::env;
2+
13
use cargo::core::Workspace;
24
use cargo::ops::{self, MessageFormat, Packages};
35
use cargo::util::{CliResult, CliError, Config, CargoErrorKind};
@@ -88,17 +90,23 @@ Compilation can be customized with the `bench` profile in the manifest.
8890
";
8991

9092
pub fn execute(options: Options, config: &Config) -> CliResult {
91-
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
92-
93-
let spec = Packages::from_flags(options.flag_all,
94-
&options.flag_exclude,
95-
&options.flag_package)?;
93+
debug!("executing; cmd=cargo-bench; args={:?}",
94+
env::args().collect::<Vec<_>>());
9695

9796
config.configure(options.flag_verbose,
9897
options.flag_quiet,
9998
&options.flag_color,
10099
options.flag_frozen,
101100
options.flag_locked)?;
101+
102+
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
103+
let ws = Workspace::new(&root, config)?;
104+
105+
let spec = Packages::from_flags(ws.is_virtual(),
106+
options.flag_all,
107+
&options.flag_exclude,
108+
&options.flag_package)?;
109+
102110
let ops = ops::TestOptions {
103111
no_run: options.flag_no_run,
104112
no_fail_fast: options.flag_no_fail_fast,
@@ -124,7 +132,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
124132
},
125133
};
126134

127-
let ws = Workspace::new(&root, config)?;
128135
let err = ops::run_benches(&ws, &ops, &options.arg_args)?;
129136
match err {
130137
None => Ok(()),

‎src/bin/build.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,10 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9292
options.flag_locked)?;
9393

9494
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
95+
let ws = Workspace::new(&root, config)?;
9596

96-
let spec = Packages::from_flags(options.flag_all,
97+
let spec = Packages::from_flags(ws.is_virtual(),
98+
options.flag_all,
9799
&options.flag_exclude,
98100
&options.flag_package)?;
99101

@@ -117,7 +119,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
117119
target_rustc_args: None,
118120
};
119121

120-
let ws = Workspace::new(&root, config)?;
121122
ops::compile(&ws, &opts)?;
122123
Ok(())
123124
}

‎src/bin/check.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,8 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
9191
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
9292
let ws = Workspace::new(&root, config)?;
9393

94-
let spec = Packages::from_flags(options.flag_all,
94+
let spec = Packages::from_flags(ws.is_virtual(),
95+
options.flag_all,
9596
&options.flag_exclude,
9697
&options.flag_package)?;
9798

‎src/bin/doc.rs

+7-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::env;
2+
13
use cargo::core::Workspace;
24
use cargo::ops::{self, MessageFormat, Packages};
35
use cargo::util::{CliResult, Config};
@@ -69,15 +71,19 @@ the `cargo help pkgid` command.
6971
";
7072

7173
pub fn execute(options: Options, config: &Config) -> CliResult {
74+
debug!("executing; cmd=cargo-check; args={:?}",
75+
env::args().collect::<Vec<_>>());
76+
7277
config.configure(options.flag_verbose,
7378
options.flag_quiet,
7479
&options.flag_color,
7580
options.flag_frozen,
7681
options.flag_locked)?;
7782

7883
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
84+
let ws = Workspace::new(&root, config)?;
7985

80-
let spec = if options.flag_all {
86+
let spec = if options.flag_all || (ws.is_virtual() && options.flag_package.is_empty()) {
8187
Packages::All
8288
} else {
8389
Packages::Packages(&options.flag_package)
@@ -109,7 +115,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
109115
},
110116
};
111117

112-
let ws = Workspace::new(&root, config)?;
113118
ops::doc(&ws, &doc_opts)?;
114119
Ok(())
115120
}

‎src/bin/test.rs

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::env;
2+
13
use cargo::core::Workspace;
24
use cargo::ops::{self, MessageFormat, Packages};
35
use cargo::util::{CliResult, CliError, Config, CargoErrorKind};
@@ -109,13 +111,17 @@ To get the list of all options available for the test binaries use this:
109111
";
110112

111113
pub fn execute(options: Options, config: &Config) -> CliResult {
114+
debug!("executing; cmd=cargo-test; args={:?}",
115+
env::args().collect::<Vec<_>>());
116+
112117
config.configure(options.flag_verbose,
113118
options.flag_quiet,
114119
&options.flag_color,
115120
options.flag_frozen,
116121
options.flag_locked)?;
117122

118123
let root = find_root_manifest_for_wd(options.flag_manifest_path, config.cwd())?;
124+
let ws = Workspace::new(&root, config)?;
119125

120126
let empty = Vec::new();
121127
let (mode, filter);
@@ -132,7 +138,8 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
132138
&options.flag_bench, options.flag_benches);
133139
}
134140

135-
let spec = Packages::from_flags(options.flag_all,
141+
let spec = Packages::from_flags(ws.is_virtual(),
142+
options.flag_all,
136143
&options.flag_exclude,
137144
&options.flag_package)?;
138145

@@ -157,7 +164,6 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
157164
},
158165
};
159166

160-
let ws = Workspace::new(&root, config)?;
161167
let err = ops::run_tests(&ws, &ops, &options.arg_args)?;
162168
match err {
163169
None => Ok(()),

‎src/cargo/core/workspace.rs

+7
Original file line numberDiff line numberDiff line change
@@ -179,6 +179,13 @@ impl<'cfg> Workspace<'cfg> {
179179
}
180180
}
181181

182+
pub fn is_virtual(&self) -> bool {
183+
match *self.packages.get(&self.current_manifest) {
184+
MaybePackage::Package(..) => false,
185+
MaybePackage::Virtual(..) => true
186+
}
187+
}
188+
182189
/// Returns the `Config` this workspace is associated with.
183190
pub fn config(&self) -> &'cfg Config {
184191
self.config

‎src/cargo/ops/cargo_compile.rs

+3-1
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,11 @@ pub enum Packages<'a> {
110110
}
111111

112112
impl<'a> Packages<'a> {
113-
pub fn from_flags(all: bool, exclude: &'a Vec<String>, package: &'a Vec<String>)
113+
pub fn from_flags(virtual_ws: bool, all: bool, exclude: &'a Vec<String>, package: &'a Vec<String>)
114114
-> CargoResult<Self>
115115
{
116+
let all = all || (virtual_ws && package.is_empty());
117+
116118
let packages = match (all, &exclude) {
117119
(true, exclude) if exclude.is_empty() => Packages::All,
118120
(true, exclude) => Packages::OptOut(exclude),

‎tests/bench.rs

+52
Original file line numberDiff line numberDiff line change
@@ -1189,3 +1189,55 @@ fn legacy_bench_name() {
11891189
[WARNING] path `[..]src[/]bench.rs` was erroneously implicitly accepted for benchmark `bench`,
11901190
please set bench.path in Cargo.toml"));
11911191
}
1192+
1193+
#[test]
1194+
fn bench_virtual_manifest_all_implied() {
1195+
if !is_nightly() { return }
1196+
1197+
let p = project("workspace")
1198+
.file("Cargo.toml", r#"
1199+
[workspace]
1200+
members = ["foo", "bar"]
1201+
"#)
1202+
.file("foo/Cargo.toml", r#"
1203+
[project]
1204+
name = "foo"
1205+
version = "0.1.0"
1206+
"#)
1207+
.file("foo/src/lib.rs", r#"
1208+
pub fn foo() {}
1209+
"#)
1210+
.file("foo/benches/foo.rs", r#"
1211+
#![feature(test)]
1212+
extern crate test;
1213+
use test::Bencher;
1214+
#[bench]
1215+
fn bench_foo(_: &mut Bencher) -> () { () }
1216+
"#)
1217+
.file("bar/Cargo.toml", r#"
1218+
[project]
1219+
name = "bar"
1220+
version = "0.1.0"
1221+
"#)
1222+
.file("bar/src/lib.rs", r#"
1223+
pub fn bar() {}
1224+
"#)
1225+
.file("bar/benches/bar.rs", r#"
1226+
#![feature(test)]
1227+
extern crate test;
1228+
use test::Bencher;
1229+
#[bench]
1230+
fn bench_bar(_: &mut Bencher) -> () { () }
1231+
"#);
1232+
1233+
// The order in which foo and bar are built is not guaranteed
1234+
1235+
assert_that(p.cargo_process("bench"),
1236+
execs().with_status(0)
1237+
.with_stderr_contains("\
1238+
[RUNNING] target[/]release[/]deps[/]bar-[..][EXE]")
1239+
.with_stdout_contains("test bench_bar ... bench: [..]")
1240+
.with_stderr_contains("\
1241+
[RUNNING] target[/]release[/]deps[/]foo-[..][EXE]")
1242+
.with_stdout_contains("test bench_foo ... bench: [..]"));
1243+
}

‎tests/build.rs

+67
Original file line numberDiff line numberDiff line change
@@ -3038,6 +3038,73 @@ fn build_all_virtual_manifest() {
30383038
[..] Finished dev [unoptimized + debuginfo] target(s) in [..]\n"));
30393039
}
30403040

3041+
#[test]
3042+
fn build_virtual_manifest_all_implied() {
3043+
let p = project("workspace")
3044+
.file("Cargo.toml", r#"
3045+
[workspace]
3046+
members = ["foo", "bar"]
3047+
"#)
3048+
.file("foo/Cargo.toml", r#"
3049+
[project]
3050+
name = "foo"
3051+
version = "0.1.0"
3052+
"#)
3053+
.file("foo/src/lib.rs", r#"
3054+
pub fn foo() {}
3055+
"#)
3056+
.file("bar/Cargo.toml", r#"
3057+
[project]
3058+
name = "bar"
3059+
version = "0.1.0"
3060+
"#)
3061+
.file("bar/src/lib.rs", r#"
3062+
pub fn bar() {}
3063+
"#);
3064+
3065+
// The order in which foo and bar are built is not guaranteed
3066+
assert_that(p.cargo_process("build"),
3067+
execs().with_status(0)
3068+
.with_stderr_contains("[..] Compiling bar v0.1.0 ([..])")
3069+
.with_stderr_contains("[..] Compiling foo v0.1.0 ([..])")
3070+
.with_stderr("[..] Compiling [..] v0.1.0 ([..])\n\
3071+
[..] Compiling [..] v0.1.0 ([..])\n\
3072+
[..] Finished dev [unoptimized + debuginfo] target(s) in [..]\n"));
3073+
}
3074+
3075+
#[test]
3076+
fn build_virtual_manifest_one_project() {
3077+
let p = project("workspace")
3078+
.file("Cargo.toml", r#"
3079+
[workspace]
3080+
members = ["foo", "bar"]
3081+
"#)
3082+
.file("foo/Cargo.toml", r#"
3083+
[project]
3084+
name = "foo"
3085+
version = "0.1.0"
3086+
"#)
3087+
.file("foo/src/lib.rs", r#"
3088+
pub fn foo() {}
3089+
"#)
3090+
.file("bar/Cargo.toml", r#"
3091+
[project]
3092+
name = "bar"
3093+
version = "0.1.0"
3094+
"#)
3095+
.file("bar/src/lib.rs", r#"
3096+
pub fn bar() {}
3097+
"#);
3098+
3099+
assert_that(p.cargo_process("build")
3100+
.arg("-p").arg("foo"),
3101+
execs().with_status(0)
3102+
.with_stderr_does_not_contain("bar")
3103+
.with_stderr_contains("[..] Compiling foo v0.1.0 ([..])")
3104+
.with_stderr("[..] Compiling [..] v0.1.0 ([..])\n\
3105+
[..] Finished dev [unoptimized + debuginfo] target(s) in [..]\n"));
3106+
}
3107+
30413108
#[test]
30423109
fn build_all_virtual_manifest_implicit_examples() {
30433110
let p = project("foo")

‎tests/check.rs

+31
Original file line numberDiff line numberDiff line change
@@ -393,3 +393,34 @@ fn check_all() {
393393
.with_stderr_contains("[..] --crate-name b b[/]src[/]main.rs [..]")
394394
);
395395
}
396+
397+
#[test]
398+
fn check_virtual_all_implied() {
399+
let p = project("workspace")
400+
.file("Cargo.toml", r#"
401+
[workspace]
402+
members = ["foo", "bar"]
403+
"#)
404+
.file("foo/Cargo.toml", r#"
405+
[project]
406+
name = "foo"
407+
version = "0.1.0"
408+
"#)
409+
.file("foo/src/lib.rs", r#"
410+
pub fn foo() {}
411+
"#)
412+
.file("bar/Cargo.toml", r#"
413+
[project]
414+
name = "bar"
415+
version = "0.1.0"
416+
"#)
417+
.file("bar/src/lib.rs", r#"
418+
pub fn bar() {}
419+
"#);
420+
421+
assert_that(p.cargo_process("check").arg("-v"),
422+
execs().with_status(0)
423+
.with_stderr_contains("[..] --crate-name foo foo[/]src[/]lib.rs [..]")
424+
.with_stderr_contains("[..] --crate-name bar bar[/]src[/]lib.rs [..]")
425+
);
426+
}

‎tests/doc.rs

+31
Original file line numberDiff line numberDiff line change
@@ -692,6 +692,37 @@ fn doc_all_virtual_manifest() {
692692
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])"));
693693
}
694694

695+
#[test]
696+
fn doc_virtual_manifest_all_implied() {
697+
let p = project("workspace")
698+
.file("Cargo.toml", r#"
699+
[workspace]
700+
members = ["foo", "bar"]
701+
"#)
702+
.file("foo/Cargo.toml", r#"
703+
[project]
704+
name = "foo"
705+
version = "0.1.0"
706+
"#)
707+
.file("foo/src/lib.rs", r#"
708+
pub fn foo() {}
709+
"#)
710+
.file("bar/Cargo.toml", r#"
711+
[project]
712+
name = "bar"
713+
version = "0.1.0"
714+
"#)
715+
.file("bar/src/lib.rs", r#"
716+
pub fn bar() {}
717+
"#);
718+
719+
// The order in which foo and bar are documented is not guaranteed
720+
assert_that(p.cargo_process("doc"),
721+
execs().with_status(0)
722+
.with_stderr_contains("[..] Documenting bar v0.1.0 ([..])")
723+
.with_stderr_contains("[..] Documenting foo v0.1.0 ([..])"));
724+
}
725+
695726
#[test]
696727
fn doc_all_member_dependency_same_name() {
697728
let p = project("workspace")

0 commit comments

Comments
 (0)