Skip to content
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

Remove invalid target-specific dependency example. #10401

Merged
merged 1 commit into from
Feb 22, 2022

Conversation

ehuss
Copy link
Contributor

@ehuss ehuss commented Feb 20, 2022

The example with disjoint target configs does not work (and AFAIK has never worked). It fails with the error:

  Dependency 'native' has different source paths depending on the build target. Each dependency must have a single canonical source path irrespective of build target.

This removes it to avoid confusion.

cc #7753

@rust-highfive
Copy link

r? @alexcrichton

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 20, 2022
@alexcrichton
Copy link
Member

IIRC the intention of this was to show-off the cfg(...) syntax, so could these be kept but the native crate renamed?

@ehuss
Copy link
Contributor Author

ehuss commented Feb 22, 2022

Sure! Is something like this what you are thinking?

@alexcrichton
Copy link
Member

@bors: r+

Indeed!

@bors
Copy link
Collaborator

bors commented Feb 22, 2022

📌 Commit f54ecdb has been approved by alexcrichton

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Feb 22, 2022
@bors
Copy link
Collaborator

bors commented Feb 22, 2022

⌛ Testing commit f54ecdb with merge e46a9ec...

@bors
Copy link
Collaborator

bors commented Feb 22, 2022

☀️ Test successful - checks-actions
Approved by: alexcrichton
Pushing e46a9ec to master...

@bors bors merged commit e46a9ec into rust-lang:master Feb 22, 2022
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 23, 2022
Update cargo

8 commits in ea2a21c994ca1e4d4c49412827b3cf4dcb158b1d..d6cdde584a1f15ea086bae922e20fd27f7165431
2022-02-15 04:24:07 +0000 to 2022-02-22 19:55:51 +0000
- Add common profile validation. (rust-lang/cargo#10411)
- Add -Z check-cfg-features to enable compile-time checking of features (rust-lang/cargo#10408)
- Remove invalid target-specific dependency example. (rust-lang/cargo#10401)
- Fix errors in `cargo fetch` usage guide (rust-lang/cargo#10398)
- Fix some broken doc links. (rust-lang/cargo#10404)
- Implement "artifact dependencies" (RFC-3028) (rust-lang/cargo#9992)
- Print executable name on cargo test --no-run rust-lang/cargo#2 (rust-lang/cargo#10346)
- Avoid new deprecation warnings from clap 3.1.0 (rust-lang/cargo#10396)
@ehuss ehuss added this to the 1.61.0 milestone Feb 24, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants