Skip to content

Update Cargo.lock in remove, fix versions in tests #780

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epage merged 10 commits into from
Sep 8, 2022
Merged

Update Cargo.lock in remove, fix versions in tests #780

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d5586c2
test(remove): make invalid_section like other tests
cassaundra Sep 2, 2022
5bebce3
test(remove): add file newlines
cassaundra Sep 2, 2022
9ca2539
test(remove): add remove-basic.in symlink
cassaundra Sep 2, 2022
33783aa
test(remove): add remove-package.in symlink
cassaundra Sep 2, 2022
115e83f
test(remove): add remove-target.in symlink
cassaundra Sep 2, 2022
5858c88
test(remove): mock correct package versions
cassaundra Sep 2, 2022
e664472
feat(remove): update lockfile after removing
cassaundra Sep 2, 2022
c718f41
fixup! feat(remove): update lockfile after removing
cassaundra Sep 2, 2022
599854a
test(remove): update lock file test
cassaundra Sep 2, 2022
078968b
test(remove): add offline test
cassaundra Sep 8, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion crates/cargo-remove/src/bin/cargo/commands/remove.rs
View file
Open in desktop
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
Open in desktop
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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop

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
Open in desktop
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://github.com/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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop

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
Open in desktop

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
Open in desktop
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
Open in desktop

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
Open in desktop
Empty file.
7 changes: 2 additions & 5 deletions ...-remove/tests/testsuite/cargo_remove/invalid_remove_package_multiple/out/dep-a/Cargo.toml
View file
Open in desktop
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://github.com/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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop

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
Open in desktop
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://github.com/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
Open in desktop
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
Open in desktop

This file was deleted.

Empty file removed crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/in/src/lib.rs
View file
Open in desktop
Empty file.
2 changes: 1 addition & 1 deletion crates/cargo-remove/tests/testsuite/cargo_remove/invalid_section/mod.rs
View file
Open in desktop
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