Better support for license-file.#7905
Merged
bors merged 2 commits intorust-lang:masterfrom Feb 20, 2020
Merged
Conversation
|
r? @Eh2406 (rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
ehuss
force-pushed
the
license-file-updates
branch
from
942f4c7 to
efed107
Compare
Member
|
@bors: r+ Nice! |
Contributor
|
📌 Commit efed107648156d6c6f76bc89c58062bddbe30c62 has been approved by |
bors
added
S-waiting-on-bors
Contributor
|
⌛ Testing commit efed107648156d6c6f76bc89c58062bddbe30c62 with merge df18fa62b808db4f492d4a1665e91c6334d1215c... |
Contributor
|
💔 Test failed - checks-azure |
bors
added
S-waiting-on-review
Contributor
|
☔ The latest upstream changes (presumably #7820) made this pull request unmergeable. Please resolve the merge conflicts. |
ehuss
force-pushed
the
license-file-updates
branch
from
efed107 to
9088770
Compare
Contributor
Author
|
@bors retry |
bors
added
S-waiting-on-bors
Contributor
Author
|
@bors retry |
Contributor
Author
|
@bors r=alexcrichton |
Contributor
|
📌 Commit 9088770 has been approved by |
Contributor
Contributor
|
☀️ Test successful - checks-azure |
bors
added a commit
to rust-lang/rust
that referenced
this pull request
Feb 22, 2020
Update cargo 11 commits in e02974078a692d7484f510eaec0e88d1b6cc0203..e57bd02999c9f40d52116e0beca7d1dccb0643de 2020-02-18 15:24:43 +0000 to 2020-02-21 20:20:10 +0000 - fix most remaining clippy findings (mostly redundant imports) (rust-lang/cargo#7912) - Add -Zfeatures tracking issues. (rust-lang/cargo#7917) - Use rust-lang/rust linkchecker on CI. (rust-lang/cargo#7913) - Clean up code mostly based on clippy suggestions (rust-lang/cargo#7911) - Add an option to include crate versions to the generated docs (rust-lang/cargo#7903) - Better support for license-file. (rust-lang/cargo#7905) - Add new feature resolver. (rust-lang/cargo#7820) - Switch azure to macOS 10.15. (rust-lang/cargo#7906) - Modified the help information of cargo-rustc (rust-lang/cargo#7892) - Update for nightly rustfmt. (rust-lang/cargo#7904) - Support `--config path_to_config.toml` cli syntax. (rust-lang/cargo#7901)
This was referenced Feb 26, 2020
Closed
This was referenced Apr 24, 2020
bors
added a commit
that referenced
this pull request
Apr 28, 2020
Allow `cargo package --list` even for things that don't package. `cargo package --list` was changed in #7905 to generate `Cargo.lock` earlier. If there is a problem, then it would fail where previously it would succeed. This changes it so that file generation is deferred until after `--list`. This also changes it so that the "dependencies must have a version" check is deferred until after `--list` as well. Closes #8151
ehuss
pushed a commit
to ehuss/cargo
that referenced
this pull request
May 6, 2020
Allow `cargo package --list` even for things that don't package. `cargo package --list` was changed in rust-lang#7905 to generate `Cargo.lock` earlier. If there is a problem, then it would fail where previously it would succeed. This changes it so that file generation is deferred until after `--list`. This also changes it so that the "dependencies must have a version" check is deferred until after `--list` as well. Closes rust-lang#8151
This was referenced Jul 23, 2020
12 tasks
13 tasks
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
This adds some changes to how
cargo packageandcargo publishhandle thelicense-filefield. This also incorporates some refactoring which hopefully makes the code a little clearer and straightforward, but which also resulted in some minor behavior changes.package.includelist (similar to how Cargo.toml/lock are automatically included).Archiving: Cargo.toml.origis explicitly printed where before it did not report that.cargo package --listnow showsCargo.toml.origwhere before it was not reported.Closes #3537
Closes #7830