Skip to content

Commit 6a93970

Browse files
borsbors
committed
Auto merge of #3691 - matklad:run-pkg, r=alexcrichton
cargo run supports --package argument closes #3529
2 parents de2aa26 + 261ae46 commit 6a93970

File tree

4 files changed

+121
-24
lines changed

4 files changed

+121
-24
lines changed

‎src/bin/run.rs

+24-17
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
use std::iter::FromIterator;
2+
13
use cargo::core::Workspace;
24
use cargo::ops::{self, MessageFormat, Packages};
35
use cargo::util::{CliResult, CliError, Config, Human};
@@ -7,6 +9,7 @@ use cargo::util::important_paths::{find_root_manifest_for_wd};
79
pub struct Options {
810
flag_bin: Option<String>,
911
flag_example: Option<String>,
12+
flag_package: Option<String>,
1013
flag_jobs: Option<u32>,
1114
flag_features: Vec<String>,
1215
flag_all_features: bool,
@@ -30,22 +33,23 @@ Usage:
3033
cargo run [options] [--] [<args>...]
3134
3235
Options:
33-
-h, --help Print this message
34-
--bin NAME Name of the bin target to run
35-
--example NAME Name of the example target to run
36-
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
37-
--release Build artifacts in release mode, with optimizations
38-
--features FEATURES Space-separated list of features to also build
39-
--all-features Build all available features
40-
--no-default-features Do not build the `default` feature
41-
--target TRIPLE Build for the target triple
42-
--manifest-path PATH Path to the manifest to execute
43-
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
44-
-q, --quiet No output printed to stdout
45-
--color WHEN Coloring: auto, always, never
46-
--message-format FMT Error format: human, json [default: human]
47-
--frozen Require Cargo.lock and cache are up to date
48-
--locked Require Cargo.lock is up to date
36+
-h, --help Print this message
37+
--bin NAME Name of the bin target to run
38+
--example NAME Name of the example target to run
39+
-p SPEC, --package SPEC Package with the target to run
40+
-j N, --jobs N Number of parallel jobs, defaults to # of CPUs
41+
--release Build artifacts in release mode, with optimizations
42+
--features FEATURES Space-separated list of features to also build
43+
--all-features Build all available features
44+
--no-default-features Do not build the `default` feature
45+
--target TRIPLE Build for the target triple
46+
--manifest-path PATH Path to the manifest to execute
47+
-v, --verbose ... Use verbose output (-vv very verbose/build.rs output)
48+
-q, --quiet No output printed to stdout
49+
--color WHEN Coloring: auto, always, never
50+
--message-format FMT Error format: human, json [default: human]
51+
--frozen Require Cargo.lock and cache are up to date
52+
--locked Require Cargo.lock is up to date
4953
5054
If neither `--bin` nor `--example` are given, then if the project only has one
5155
bin target it will be run. Otherwise `--bin` specifies the bin target to run,
@@ -74,14 +78,17 @@ pub fn execute(options: Options, config: &Config) -> CliResult {
7478
examples.push(s);
7579
}
7680

81+
let packages = Vec::from_iter(options.flag_package.iter().cloned());
82+
let spec = Packages::Packages(&packages);
83+
7784
let compile_opts = ops::CompileOptions {
7885
config: config,
7986
jobs: options.flag_jobs,
8087
target: options.flag_target.as_ref().map(|t| &t[..]),
8188
features: &options.flag_features,
8289
all_features: options.flag_all_features,
8390
no_default_features: options.flag_no_default_features,
84-
spec: Packages::Packages(&[]),
91+
spec: spec,
8592
release: options.flag_release,
8693
mode: ops::CompileMode::Build,
8794
filter: if examples.is_empty() && bins.is_empty() {

‎src/cargo/ops/cargo_compile.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ pub enum MessageFormat {
101101
Json
102102
}
103103

104-
#[derive(Clone, Copy, PartialEq, Eq)]
104+
#[derive(Clone, Copy, PartialEq, Eq, Debug)]
105105
pub enum Packages<'a> {
106106
All,
107107
Packages(&'a [String]),
@@ -141,7 +141,7 @@ pub fn compile<'a>(ws: &Workspace<'a>, options: &CompileOptions<'a>)
141141
}
142142

143143
pub fn compile_with_exec<'a>(ws: &Workspace<'a>,
144-
options: &CompileOptions<'a>,
144+
options: &CompileOptions<'a>,
145145
exec: Arc<Executor>)
146146
-> CargoResult<ops::Compilation<'a>> {
147147
for member in ws.members() {

‎src/cargo/ops/cargo_run.rs

+18-5
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,28 @@
11
use std::path::Path;
22

3-
use ops::{self, CompileFilter};
4-
use util::{self, CargoResult, ProcessError};
3+
use ops::{self, CompileFilter, Packages};
4+
use util::{self, human, CargoResult, ProcessError};
55
use core::Workspace;
66

77
pub fn run(ws: &Workspace,
88
options: &ops::CompileOptions,
99
args: &[String]) -> CargoResult<Option<ProcessError>> {
1010
let config = ws.config();
11-
let root = ws.current()?;
1211

13-
let mut bins = root.manifest().targets().iter().filter(|a| {
12+
let pkg = match options.spec {
13+
Packages::All => unreachable!("cargo run supports single package only"),
14+
Packages::Packages(xs) => match xs.len() {
15+
0 => ws.current()?,
16+
1 => ws.members()
17+
.find(|pkg| pkg.name() == xs[0])
18+
.ok_or_else(|| human(
19+
format!("package `{}` is not a member of the workspace", xs[0])
20+
))?,
21+
_ => unreachable!("cargo run supports single package only"),
22+
}
23+
};
24+
25+
let mut bins = pkg.manifest().targets().iter().filter(|a| {
1426
!a.is_lib() && !a.is_custom_build() && match options.filter {
1527
CompileFilter::Everything => a.is_bin(),
1628
CompileFilter::Only { .. } => options.filter.matches(a),
@@ -41,14 +53,15 @@ pub fn run(ws: &Workspace,
4153
}
4254

4355
let compile = ops::compile(ws, options)?;
56+
assert_eq!(compile.binaries.len(), 1);
4457
let exe = &compile.binaries[0];
4558
let exe = match util::without_prefix(&exe, config.cwd()) {
4659
Some(path) if path.file_name() == Some(path.as_os_str())
4760
=> Path::new(".").join(path).to_path_buf(),
4861
Some(path) => path.to_path_buf(),
4962
None => exe.to_path_buf(),
5063
};
51-
let mut process = compile.target_process(exe, &root)?;
64+
let mut process = compile.target_process(exe, &pkg)?;
5265
process.args(args).cwd(config.cwd());
5366

5467
config.shell().status("Running", process.to_string())?;

‎tests/run.rs

+77
Original file line numberDiff line numberDiff line change
@@ -652,3 +652,80 @@ fn fail_no_extra_verbose() {
652652
.with_stdout("")
653653
.with_stderr(""));
654654
}
655+
656+
#[test]
657+
fn run_multiple_packages() {
658+
let p = project("foo")
659+
.file("foo/Cargo.toml", r#"
660+
[package]
661+
name = "foo"
662+
version = "0.0.1"
663+
authors = []
664+
665+
[workspace]
666+
667+
[dependencies]
668+
d1 = { path = "d1" }
669+
d2 = { path = "d2" }
670+
d3 = { path = "../d3" } # outside of the workspace
671+
672+
[[bin]]
673+
name = "foo"
674+
"#)
675+
.file("foo/src/foo.rs", "fn main() { println!(\"foo\"); }")
676+
.file("foo/d1/Cargo.toml", r#"
677+
[package]
678+
name = "d1"
679+
version = "0.0.1"
680+
authors = []
681+
682+
[[bin]]
683+
name = "d1"
684+
"#)
685+
.file("foo/d1/src/lib.rs", "")
686+
.file("foo/d1/src/main.rs", "fn main() { println!(\"d1\"); }")
687+
.file("foo/d2/Cargo.toml", r#"
688+
[package]
689+
name = "d2"
690+
version = "0.0.1"
691+
authors = []
692+
693+
[[bin]]
694+
name = "d2"
695+
"#)
696+
.file("foo/d2/src/main.rs", "fn main() { println!(\"d2\"); }")
697+
.file("d3/Cargo.toml", r#"
698+
[package]
699+
name = "d3"
700+
version = "0.0.1"
701+
authors = []
702+
"#)
703+
.file("d3/src/main.rs", "fn main() { println!(\"d2\"); }");
704+
705+
let p = p.build();
706+
707+
let cargo = || {
708+
let mut process_builder = p.cargo("run");
709+
process_builder.cwd(p.root().join("foo"));
710+
process_builder
711+
};
712+
713+
assert_that(cargo().arg("-p").arg("d1"),
714+
execs().with_status(0).with_stdout("d1"));
715+
716+
assert_that(cargo().arg("-p").arg("d2").arg("--bin").arg("d2"),
717+
execs().with_status(0).with_stdout("d2"));
718+
719+
assert_that(cargo(),
720+
execs().with_status(0).with_stdout("foo"));
721+
722+
assert_that(cargo().arg("-p").arg("d1").arg("-p").arg("d2"),
723+
execs()
724+
.with_status(1)
725+
.with_stderr_contains("[ERROR] Invalid arguments."));
726+
727+
assert_that(cargo().arg("-p").arg("d3"),
728+
execs()
729+
.with_status(101)
730+
.with_stderr_contains("[ERROR] package `d3` is not a member of the workspace"));
731+
}

0 commit comments

Comments
 (0)