Skip to content

Commit

Permalink
Merge pull request #780 from cassaundra/merge-rm-lock
Browse files Browse the repository at this point in the history 
Update `Cargo.lock` in remove, fix versions in tests
  • Loading branch information
@epage
epage authored Sep 8, 2022
2 parents 73d57be + 078968b commit bda1be9
Show file tree
Hide file tree
Showing 120 changed files with 349 additions and 685 deletions.
8 changes: 7 additions & 1 deletion crates/cargo-remove/src/bin/cargo/commands/remove.rs
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
use cargo::core::dependency::DepKind;
use cargo::ops::resolve_ws;
use cargo::util::command_prelude::*;

use cargo_remove::ops::cargo_remove::remove;
Expand Down Expand Up @@ -82,9 +83,14 @@ pub fn exec(config: &mut Config, args: &ArgMatches) -> CliResult {
section,
dry_run,
};

remove(&options)?;

if !dry_run {
// Reload the workspace since we've changed dependencies
let ws = args.workspace(config)?;
resolve_ws(&ws)?;
}

Ok(())
}

Expand Down
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/dry_run/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-basic.in/
8 changes: 3 additions & 5 deletions crates/cargo-remove/tests/testsuite/cargo_remove/dry_run/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
clippy = "0.4"

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_arg/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-basic.in/
8 changes: 3 additions & 5 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_arg/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
clippy = "0.4"

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_dep/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-basic.in/
8 changes: 3 additions & 5 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_dep/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,14 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
clippy = "0.4"

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-package.in/
26 changes: 0 additions & 26 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/in/dep-a/Cargo.toml
View file

This file was deleted.

7 changes: 2 additions & 5 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-a/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
7 changes: 2 additions & 5 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package/out/dep-b/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-package.in/
5 changes: 0 additions & 5 deletions ...s/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/Cargo.toml
View file

This file was deleted.

26 changes: 0 additions & 26 deletions ...o-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/Cargo.toml
View file

This file was deleted.

Empty file removed ...o-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-a/src/lib.rs
View file
Empty file.
26 changes: 0 additions & 26 deletions ...o-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/Cargo.toml
View file

This file was deleted.

Empty file removed ...o-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/in/dep-b/src/lib.rs
View file
Empty file.
7 changes: 2 additions & 5 deletions ...-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
7 changes: 2 additions & 5 deletions ...-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-b/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,13 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-target.in/
12 changes: 5 additions & 7 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,20 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
clippy = "0.4"

[target.x86_64-unknown-linux-gnu.dependencies]
dbus = "0.9.5"
dbus = "0.6.2"

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[target.x86_64-unknown-linux-gnu.dev-dependencies]
ncurses = "5.101"
ncurses = "20.0"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target_dep/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-target.in/
35 changes: 0 additions & 35 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target_dep/in/Cargo.toml
View file

This file was deleted.

12 changes: 5 additions & 7 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_remove_target_dep/out/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,22 +14,20 @@ semver = "0.1.0"

[dependencies]
docopt = "0.6"
pad = "0.1"
rustc-serialize = "0.3"
rustc-serialize = "0.4"
semver = "0.1"
toml = "0.1"
clippy = {git = "https:/Manishearth/rust-clippy.git", optional = true}
clippy = "0.4"

[target.x86_64-unknown-linux-gnu.dependencies]
dbus = "0.9.5"
dbus = "0.6.2"

[dev-dependencies]
regex = "0.1.41"
regex = "0.1.1"
serde = "1.0.90"

[target.x86_64-unknown-linux-gnu.dev-dependencies]
ncurses = "5.101"
ncurses = "20.0"

[features]
std = ["serde/std", "semver/std"]
annoy = ["clippy"]
1 change: 1 addition & 0 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/in
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
../remove-basic.in/
23 changes: 0 additions & 23 deletions crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/in/Cargo.toml
View file

This file was deleted.

Empty file removed crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/in/src/lib.rs
View file
Empty file.
2 changes: 1 addition & 1 deletion crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ fn case() {

snapbox::cmd::Command::cargo_ui()
.arg("remove")
.args(["--build", "semver"])
.args(["--build", "docopt"])
.current_dir(cwd)
.assert()
.code(101)
Expand Down
Loading

0 comments on commit bda1be9

Please sign in to comment.