itsscb/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo.git synced 2025-09-28 11:20:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Moved checks into compile_options(), changed tests

Browse Source
This commit is contained in:
Damian 2019-01-03 23:00:45 +01:00
parent f1d6a94994
commit a51759c5e8
12 changed files with 119 additions and 190 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/cargo/commands/bench.rs
View File

@ -72,9 +72,7 @@ Compilation can be customized with the `bench` profile in the manifest.
pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let ws = args.workspace(config)?;
let mut compile_opts = args.compile_options(config, CompileMode::Bench)?;
args.check_optional_opts_all(&ws, &compile_opts)?;
let mut compile_opts = args.compile_options(config, CompileMode::Bench, Some(&ws))?;
compile_opts.build_config.release = true;

4
src/bin/cargo/commands/build.rs
View File

@ -48,9 +48,7 @@ the --release flag will use the `release` profile instead.
pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let ws = args.workspace(config)?;
let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
args.check_optional_opts_all(&ws, &compile_opts)?;
let mut compile_opts = args.compile_options(config, CompileMode::Build, Some(&ws))?;
compile_opts.export_dir = args.value_of_path("out-dir", config);
if compile_opts.export_dir.is_some() && !config.cli_unstable().unstable_options {

4
src/bin/cargo/commands/check.rs
View File

@ -68,9 +68,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
}
};
let mode = CompileMode::Check { test };
let compile_opts = args.compile_options(config, mode)?;
args.check_optional_opts_all(&ws, &compile_opts)?;
let compile_opts = args.compile_options(config, mode, Some(&ws))?;
ops::compile(&ws, &compile_opts)?;
Ok(())

2
src/bin/cargo/commands/doc.rs
View File

@ -50,7 +50,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let mode = CompileMode::Doc {
deps: !args.is_present("no-deps"),
};
let mut compile_opts = args.compile_options(config, mode)?;
let mut compile_opts = args.compile_options(config, mode, Some(&ws))?;
compile_opts.local_rustdoc_args = if args.is_present("document-private-items") {
Some(vec!["--document-private-items".to_string()])
} else {

4
src/bin/cargo/commands/fix.rs
View File

@ -122,9 +122,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
// Unlike other commands default `cargo fix` to all targets to fix as much
// code as we can.
let mut opts = args.compile_options(config, mode)?;
args.check_optional_opts_all(&ws, &opts)?;
let mut opts = args.compile_options(config, mode, Some(&ws))?;
if let CompileFilter::Default { .. } = opts.filter {
opts.filter = CompileFilter::Only {

8
src/bin/cargo/commands/install.rs
View File

@ -78,11 +78,9 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let registry = args.registry(config)?;
config.reload_rooted_at_cargo_home()?;
let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
if let Ok(ws) = args.workspace(config) {
args.check_optional_opts_example_and_bin(&ws, &compile_opts)?;
}
let workspace = args.workspace(config).ok();
let mut compile_opts = args.compile_options(config, CompileMode::Build, workspace.as_ref())?;
compile_opts.build_config.release = !args.is_present("debug");

4
src/bin/cargo/commands/run.rs
View File

@ -39,9 +39,7 @@ run. If you're passing arguments to both Cargo and the binary, the ones after
pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let ws = args.workspace(config)?;
let mut compile_opts = args.compile_options(config, CompileMode::Build)?;
args.check_optional_opts_example_and_bin(&ws, &compile_opts)?;
let mut compile_opts = args.compile_options(config, CompileMode::Build, Some(&ws))?;
if !args.is_present("example") && !args.is_present("bin") {
let default_runs: Vec<_> = compile_opts

2
src/bin/cargo/commands/rustc.rs
View File

@ -62,7 +62,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
return Err(CliError::new(err, 101));
}
};
let mut compile_opts = args.compile_options_for_single_package(config, mode)?;
let mut compile_opts = args.compile_options_for_single_package(config, mode, Some(&ws))?;
let target_args = values(args, "args");
compile_opts.target_rustc_args = if target_args.is_empty() {
None

2
src/bin/cargo/commands/rustdoc.rs
View File

@ -51,7 +51,7 @@ the `cargo help pkgid` command.
pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let ws = args.workspace(config)?;
let mut compile_opts =
args.compile_options_for_single_package(config, CompileMode::Doc { deps: false })?;
args.compile_options_for_single_package(config, CompileMode::Doc { deps: false }, Some(&ws))?;
let target_args = values(args, "args");
compile_opts.target_rustdoc_args = if target_args.is_empty() {
None

4
src/bin/cargo/commands/test.rs
View File

@ -92,9 +92,7 @@ To get the list of all options available for the test binaries use this:
pub fn exec(config: &mut Config, args: &ArgMatches<'_>) -> CliResult {
let ws = args.workspace(config)?;
let mut compile_opts = args.compile_options(config, CompileMode::Test)?;
args.check_optional_opts_all(&ws, &compile_opts)?;
let mut compile_opts = args.compile_options(config, CompileMode::Test, Some(&ws))?;
let doc = args.is_present("doc");
if doc {

29
src/cargo/util/command_prelude.rs
View File

@ -288,6 +288,7 @@ pub trait ArgMatchesExt {
&self,
config: &'a Config,
mode: CompileMode,
workspace: Option<&Workspace<'a>>,
) -> CargoResult<CompileOptions<'a>> {
let spec = Packages::from_flags(
self._is_present("all"),
@ -344,6 +345,11 @@ pub trait ArgMatchesExt {
local_rustdoc_args: None,
export_dir: None,
};
if let Some(ws) = workspace {
self.check_optional_opts(ws, &opts)?;
}
Ok(opts)
}
@ -351,8 +357,9 @@ pub trait ArgMatchesExt {
&self,
config: &'a Config,
mode: CompileMode,
workspace: Option<&Workspace<'a>>,
) -> CargoResult<CompileOptions<'a>> {
let mut compile_opts = self.compile_options(config, mode)?;
let mut compile_opts = self.compile_options(config, mode, workspace)?;
compile_opts.spec = Packages::Packages(self._values_of("package"));
Ok(compile_opts)
}
@ -429,27 +436,11 @@ about this warning.";
Ok(index)
}
fn check_optional_opts_example_and_bin(
fn check_optional_opts(
&self,
workspace: &Workspace<'_>,
compile_opts: &CompileOptions<'_>,
) -> CliResult {
if self.is_present_with_zero_values("example") {
print_available_examples(&workspace, &compile_opts)?;
}
if self.is_present_with_zero_values("bin") {
print_available_binaries(&workspace, &compile_opts)?;
}
Ok(())
}
fn check_optional_opts_all(
&self,
workspace: &Workspace<'_>,
compile_opts: &CompileOptions<'_>,
) -> CliResult {
) -> CargoResult<()> {
if self.is_present_with_zero_values("example") {
print_available_examples(&workspace, &compile_opts)?;
}

242
tests/testsuite/list_targets.rs
View File

@ -1,69 +1,12 @@
use crate::support::project;
// cargo {run,install} only support --example and --bin
// cargo {build,check,fix,test} support --example, --bin, --bench and --test
const EXAMPLE: u8 = 0x1;
const BIN: u8 = 0x2;
const TEST: u8 = 0x4;
const BENCH: u8 = 0x8;
fn test_list_targets_example_and_bin_only(command: &str) {
let p = project()
.file("examples/a.rs", "fn main() { }")
.file("examples/b.rs", "fn main() { }")
.file("src/main.rs", "fn main() { }")
.build();
p.cargo(&format!("{} --example", command))
.with_stderr(
"\
error: \"--example\" takes one argument.
Available examples:
a
b
",
)
.with_status(101)
.run();
p.cargo(&format!("{} --bin", command))
.with_stderr(
"\
error: \"--bin\" takes one argument.
Available binaries:
foo
",
)
.with_status(101)
.run();
}
fn test_empty_list_targets_example_and_bin_only(command: &str) {
let p = project().file("src/lib.rs", "").build();
p.cargo(&format!("{} --example", command))
.with_stderr(
"\
error: \"--example\" takes one argument.
No examples available.
",
)
.with_status(101)
.run();
p.cargo(&format!("{} --bin", command))
.with_stderr(
"\
error: \"--bin\" takes one argument.
No binaries available.
",
)
.with_status(101)
.run();
}
fn test_list_targets_full(command: &str) {
let p = project()
fn list_targets_test(command: &str, targets: u8) {
let full_project = project()
.file("examples/a.rs", "fn main() { }")
.file("examples/b.rs", "fn main() { }")
.file("benches/bench1.rs", "")
@ -73,165 +16,174 @@ fn test_list_targets_full(command: &str) {
.file("src/main.rs", "fn main() { }")
.build();
p.cargo(&format!("{} --example", command))
.with_stderr(
"\
if targets & EXAMPLE != 0 {
full_project
.cargo(&format!("{} --example", command))
.with_stderr(
"\
error: \"--example\" takes one argument.
Available examples:
a
b
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --bin", command))
.with_stderr(
"\
if targets & BIN != 0 {
full_project
.cargo(&format!("{} --bin", command))
.with_stderr(
"\
error: \"--bin\" takes one argument.
Available binaries:
foo
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --bench", command))
.with_stderr(
"\
if targets & BENCH != 0 {
full_project
.cargo(&format!("{} --bench", command))
.with_stderr(
"\
error: \"--bench\" takes one argument.
Available benches:
bench1
bench2
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --test", command))
.with_stderr(
"\
if targets & TEST != 0 {
full_project
.cargo(&format!("{} --test", command))
.with_stderr(
"\
error: \"--test\" takes one argument.
Available tests:
test1
test2
",
)
.with_status(101)
.run();
}
)
.with_status(101)
.run();
}
fn test_empty_list_targets_full(command: &str) {
let p = project().file("src/lib.rs", "").build();
let empty_project = project().file("src/lib.rs", "").build();
p.cargo(&format!("{} --example", command))
.with_stderr(
"\
if targets & EXAMPLE != 0 {
empty_project
.cargo(&format!("{} --example", command))
.with_stderr(
"\
error: \"--example\" takes one argument.
No examples available.
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --bin", command))
.with_stderr(
"\
if targets & BIN != 0 {
empty_project
.cargo(&format!("{} --bin", command))
.with_stderr(
"\
error: \"--bin\" takes one argument.
No binaries available.
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --bench", command))
.with_stderr(
"\
if targets & BENCH != 0 {
empty_project
.cargo(&format!("{} --bench", command))
.with_stderr(
"\
error: \"--bench\" takes one argument.
No benches available.
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
p.cargo(&format!("{} --test", command))
.with_stderr(
"\
if targets & TEST != 0 {
empty_project
.cargo(&format!("{} --test", command))
.with_stderr(
"\
error: \"--test\" takes one argument.
No tests available.
",
)
.with_status(101)
.run();
)
.with_status(101)
.run();
}
}
#[test]
fn build_list_targets() {
test_list_targets_full("build");
}
#[test]
fn build_list_targets_empty() {
test_empty_list_targets_full("build");
list_targets_test("build", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn check_list_targets() {
test_list_targets_full("check");
list_targets_test("check", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn check_list_targets_empty() {
test_empty_list_targets_full("check");
fn doc_list_targets() {
list_targets_test("doc", BIN);
}
#[test]
fn fix_list_targets() {
test_list_targets_full("fix");
}
#[test]
fn fix_list_targets_empty() {
test_empty_list_targets_full("fix");
list_targets_test("fix", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn run_list_targets() {
test_list_targets_example_and_bin_only("run");
}
#[test]
fn run_list_targets_empty() {
test_empty_list_targets_example_and_bin_only("run");
list_targets_test("run", EXAMPLE | BIN);
}
#[test]
fn test_list_targets() {
test_list_targets_full("test");
}
#[test]
fn test_list_targets_empty() {
test_empty_list_targets_full("test");
list_targets_test("test", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn bench_list_targets() {
test_list_targets_full("bench");
}
#[test]
fn bench_list_targets_empty() {
test_empty_list_targets_full("bench");
list_targets_test("bench", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn install_list_targets() {
test_list_targets_example_and_bin_only("install");
list_targets_test("install", EXAMPLE | BIN);
}
#[test]
fn install_list_targets_empty() {
test_empty_list_targets_example_and_bin_only("install");
fn rustdoc_list_targets() {
list_targets_test("rustdoc", EXAMPLE | BIN | TEST | BENCH);
}
#[test]
fn rustc_list_targets() {
list_targets_test("rustc", EXAMPLE | BIN | TEST | BENCH);
}