-
Notifications
You must be signed in to change notification settings - Fork 2.6k
cargo add
- fix for adding features from repository with multiple packages.
#13213
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.
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
bors
merged 2 commits into
rust-lang:master
from
stupendoussuperpowers:mulpack-features-git
Dec 29, 2023
Merged
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
../add-basic.in |
63 changes: 63 additions & 0 deletions
63
tests/testsuite/cargo_add/git_multiple_packages_features/mod.rs
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,63 @@ | ||
use cargo_test_support::compare::assert_ui; | ||
use cargo_test_support::prelude::*; | ||
use cargo_test_support::Project; | ||
|
||
use cargo_test_support::curr_dir; | ||
|
||
#[cargo_test] | ||
fn case() { | ||
cargo_test_support::registry::init(); | ||
|
||
let main_manifest = r#" | ||
[package] | ||
name = "main-package" | ||
version = "0.1.1+main-package" | ||
authors = [] | ||
|
||
[workspace] | ||
members = ["package-wo-feature", "package-with-feature"] | ||
"#; | ||
|
||
let manifest_feature = r#" | ||
[package] | ||
name = "package-with-feature" | ||
version = "0.1.3+package-with-feature" | ||
[features] | ||
target_feature = [] | ||
"#; | ||
|
||
let project = Project::from_template(curr_dir!().join("in")); | ||
let project_root = project.root(); | ||
let cwd = &project_root; | ||
let git_dep = cargo_test_support::git::new("git-package", |project| { | ||
project | ||
.file("Cargo.toml", &main_manifest) | ||
.file( | ||
"package-wo-feature/Cargo.toml", | ||
&cargo_test_support::basic_manifest( | ||
"package-wo-feature", | ||
"0.1.1+package-wo-feature", | ||
), | ||
) | ||
.file("package-wo-feature/src/lib.rs", "") | ||
.file("package-with-feature/Cargo.toml", &manifest_feature) | ||
.file("package-with-feature/src/lib.rs", "") | ||
}); | ||
let git_url = git_dep.url().to_string(); | ||
|
||
snapbox::cmd::Command::cargo_ui() | ||
.arg("add") | ||
.args([ | ||
"--git", | ||
&git_url, | ||
"package-with-feature", | ||
"--features=target_feature", | ||
]) | ||
.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); | ||
} |
8 changes: 8 additions & 0 deletions
8
tests/testsuite/cargo_add/git_multiple_packages_features/out/Cargo.toml
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,8 @@ | ||
[workspace] | ||
|
||
[package] | ||
name = "cargo-list-test-fixture" | ||
version = "0.0.0" | ||
|
||
[dependencies] | ||
package-with-feature = { git = "[ROOTURL]/git-package", version = "0.1.3", features = ["target_feature"] } |
5 changes: 5 additions & 0 deletions
5
tests/testsuite/cargo_add/git_multiple_packages_features/stderr.log
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
Updating git repository `[ROOTURL]/git-package` | ||
Adding package-with-feature (git) to dependencies. | ||
Features: | ||
+ target_feature | ||
Updating git repository `[ROOTURL]/git-package` |
Empty file.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.