diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index faefc68260..ad5ed2bb06 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -22,10 +22,10 @@ jobs: run: cargo build --verbose continue-on-error: ${{ matrix.toolchain != 'stable' }} - name: Run tests - run: cargo test --verbose + run: cargo test --all --verbose continue-on-error: ${{ matrix.toolchain != 'stable' }} - name: Run tests (vendored-openssl) - run: cargo test --features vendored-openssl --verbose + run: cargo test --all --features vendored-openssl --verbose continue-on-error: ${{ matrix.toolchain != 'stable' }} clippy: @@ -42,7 +42,7 @@ jobs: uses: actions/checkout@v2 - uses: Swatinem/rust-cache@v1 - name: Cargo Clippy - run: cargo clippy -- -D warnings -A deprecated + run: cargo clippy --all -- -D warnings -A deprecated fmt: name: fmt (ubuntu-latest, stable) diff --git a/crates/cargo-remove/src/bin/cargo/commands/remove.rs b/crates/cargo-remove/src/bin/cargo/commands/remove.rs index a6e177f9b5..9dbd5e8589 100644 --- a/crates/cargo-remove/src/bin/cargo/commands/remove.rs +++ b/crates/cargo-remove/src/bin/cargo/commands/remove.rs @@ -52,7 +52,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { let spec = match packages.len() { 0 => { return Err(CliError::new( - anyhow::format_err!("no packages selected. Please specify one with `-p `"), + anyhow::format_err!("no packages selected. Please specify one with `-p `"), 101, )); } @@ -60,7 +60,7 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult { len => { return Err(CliError::new( anyhow::format_err!( - "{len} packages selected. Please specify one with `-p `", + "{len} packages selected. Please specify one with `-p `", ), 101, )); diff --git a/crates/cargo-remove/src/cargo/ops/cargo_remove/dependency.rs b/crates/cargo-remove/src/cargo/ops/cargo_remove/dependency.rs index e150465e5d..e137663f46 100644 --- a/crates/cargo-remove/src/cargo/ops/cargo_remove/dependency.rs +++ b/crates/cargo-remove/src/cargo/ops/cargo_remove/dependency.rs @@ -1,3 +1,7 @@ +#![allow(clippy::all)] +#![allow(missing_docs)] +#![allow(warnings)] + use std::collections::BTreeMap; use std::fmt::{Display, Formatter}; use std::path::{Path, PathBuf}; diff --git a/crates/cargo-remove/src/cargo/ops/cargo_remove/manifest.rs b/crates/cargo-remove/src/cargo/ops/cargo_remove/manifest.rs index 62f94df576..f568f23740 100644 --- a/crates/cargo-remove/src/cargo/ops/cargo_remove/manifest.rs +++ b/crates/cargo-remove/src/cargo/ops/cargo_remove/manifest.rs @@ -1,3 +1,7 @@ +#![allow(clippy::all)] +#![allow(missing_docs)] +#![allow(warnings)] + use std::ops::{Deref, DerefMut}; use std::path::{Path, PathBuf}; use std::str; diff --git a/crates/cargo-remove/src/cargo/ops/cargo_remove/metadata.rs b/crates/cargo-remove/src/cargo/ops/cargo_remove/metadata.rs index 22b8f026cb..03a2960428 100644 --- a/crates/cargo-remove/src/cargo/ops/cargo_remove/metadata.rs +++ b/crates/cargo-remove/src/cargo/ops/cargo_remove/metadata.rs @@ -1,3 +1,7 @@ +#![allow(clippy::all)] +#![allow(missing_docs)] +#![allow(warnings)] + use std::convert::TryInto; use std::path::Path; diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/Cargo.toml new file mode 100644 index 0000000000..e108cfecd5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/mod.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/mod.rs new file mode 100644 index 0000000000..c40b535e4c --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/mod.rs @@ -0,0 +1,25 @@ +use cargo_test_support::compare::assert_ui; +use cargo_test_support::Project; + +use crate::cargo_remove::init_registry; +use crate::cargo_remove::CargoCommand; +use crate::curr_dir; + +#[cargo_test] +fn case() { + init_registry(); + let project = Project::from_template(curr_dir!().join("in")); + let project_root = project.root(); + let cwd = &project_root; + + snapbox::cmd::Command::cargo_ui() + .arg("remove") + .args(["docopt", "--package", "dep-c"]) + .current_dir(cwd) + .assert() + .code(101) + .stdout_matches_path(curr_dir!().join("stdout.log")) + .stderr_matches_path(curr_dir!().join("stderr.log")); + + assert_ui().subset_matches(curr_dir!().join("out"), &project_root); +} diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/Cargo.toml new file mode 100644 index 0000000000..e108cfecd5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stderr.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stderr.log new file mode 100644 index 0000000000..683512ca00 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stderr.log @@ -0,0 +1 @@ +error: package(s) `dep-c` not found in workspace `[ROOT]/case` diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stdout.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/stdout.log new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/Cargo.toml new file mode 100644 index 0000000000..e108cfecd5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/mod.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/mod.rs new file mode 100644 index 0000000000..b9b30453b5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/mod.rs @@ -0,0 +1,25 @@ +use cargo_test_support::compare::assert_ui; +use cargo_test_support::Project; + +use crate::cargo_remove::init_registry; +use crate::cargo_remove::CargoCommand; +use crate::curr_dir; + +#[cargo_test] +fn case() { + init_registry(); + let project = Project::from_template(curr_dir!().join("in")); + let project_root = project.root(); + let cwd = &project_root; + + snapbox::cmd::Command::cargo_ui() + .arg("remove") + .args(["docopt"]) + .current_dir(cwd) + .assert() + .code(101) + .stdout_matches_path(curr_dir!().join("stdout.log")) + .stderr_matches_path(curr_dir!().join("stderr.log")); + + assert_ui().subset_matches(curr_dir!().join("out"), &project_root); +} diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml new file mode 100644 index 0000000000..e108cfecd5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stderr.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stderr.log new file mode 100644 index 0000000000..b18ca3b8b0 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stderr.log @@ -0,0 +1 @@ +error: 2 packages selected. Please specify one with `-p ` diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stdout.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/stdout.log new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/stderr.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/stderr.log index 901b6cff4a..0114c21659 100644 --- a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/stderr.log +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/stderr.log @@ -1,2 +1,2 @@ Removing dbus from dependencies for target `powerpc-unknown-linux-gnu` -error: The table `powerpc-unknown-linux-gnu` could not be found. +error: The dependency `dbus` could not be found in `target.powerpc-unknown-linux-gnu.dependencies`. diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/stderr.log b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/stderr.log index 6aebc1f974..99a1633e64 100644 --- a/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/stderr.log +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/stderr.log @@ -1,2 +1,2 @@ Removing semver from build-dependencies -error: The table `build-dependencies` could not be found. +error: The dependency `semver` could not be found in `build-dependencies`. diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/mod.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/mod.rs index 9820c3a0ec..1cd4f9e14a 100644 --- a/crates/cargo-remove/tests/testsuite/cargo_remove/mod.rs +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/mod.rs @@ -5,6 +5,8 @@ mod dry_run; mod invalid_arg; mod invalid_dep; +mod invalid_remove_package; +mod invalid_remove_package_multiple; mod invalid_remove_target; mod invalid_remove_target_dep; mod invalid_section; @@ -18,6 +20,7 @@ mod remove_multiple_deps; mod remove_multiple_dev; mod remove_optional_dep_feature; mod remove_optional_feature; +mod remove_package; mod remove_target; mod remove_target_build; mod remove_target_dev; diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-a/Cargo.toml new file mode 100644 index 0000000000..e108cfecd5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-a/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/in/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/mod.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/mod.rs new file mode 100644 index 0000000000..75baed0e1f --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/mod.rs @@ -0,0 +1,25 @@ +use cargo_test_support::compare::assert_ui; +use cargo_test_support::Project; + +use crate::cargo_remove::init_registry; +use crate::cargo_remove::CargoCommand; +use crate::curr_dir; + +#[cargo_test] +fn case() { + init_registry(); + let project = Project::from_template(curr_dir!().join("in")); + let project_root = project.root(); + let cwd = &project_root; + + snapbox::cmd::Command::cargo_ui() + .arg("remove") + .args(["docopt", "--package", "dep-a"]) + .current_dir(cwd) + .assert() + .success() + .stdout_matches_path(curr_dir!().join("stdout.log")) + .stderr_matches_path(curr_dir!().join("stderr.log")); + + assert_ui().subset_matches(curr_dir!().join("out"), &project_root); +} diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/Cargo.toml new file mode 100644 index 0000000000..7338571133 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/Cargo.toml @@ -0,0 +1,5 @@ +[workspace] +members = [ + "dep-a", + "dep-b" +] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-a/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-a/Cargo.toml new file mode 100644 index 0000000000..7d25a0bfc5 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-a/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "dep-a" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-a/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-a/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-b/Cargo.toml b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-b/Cargo.toml new file mode 100644 index 0000000000..83c57750af --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-b/Cargo.toml @@ -0,0 +1,26 @@ +[package] +name = "dep-b" +version = "0.1.0" + +[[bin]] +name = "main" +path = "src/main.rs" + +[build-dependencies] +semver = "0.1.0" + +[dependencies] +docopt = "0.6" +pad = "0.1" +rustc-serialize = "0.3" +semver = "0.1" +toml = "0.1" +clippy = {git = "https://github.com/Manishearth/rust-clippy.git", optional = true} + +[dev-dependencies] +regex = "0.1.41" +serde = "1.0.90" + +[features] +std = ["serde/std", "semver/std"] +annoy = ["clippy"] diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-b/src/lib.rs b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/out/dep-b/src/lib.rs new file mode 100644 index 0000000000..e69de29bb2 diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/stderr.log b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/stderr.log new file mode 100644 index 0000000000..7083976b17 --- /dev/null +++ b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/stderr.log @@ -0,0 +1 @@ + Removing docopt from dependencies diff --git a/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/stdout.log b/crates/cargo-remove/tests/testsuite/cargo_remove/remove_package/stdout.log new file mode 100644 index 0000000000..e69de29bb2