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

Add an option to include crate versions to the generated docs #7903

Merged
merged 2 commits into from
Feb 21, 2020

Conversation

aleksator
Copy link
Contributor

Fixes #1681

@rust-highfive
Copy link

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon.

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 19, 2020
@ehuss ehuss mentioned this pull request Feb 19, 2020
2 tasks
@ehuss
Copy link
Contributor

ehuss commented Feb 19, 2020

Looks great!

Can you add a section to the bottom of unstable.md briefly describing the feature? I created a tracking issue you can link to: https://github.com/rust-lang/cargo/issues/7907

@aleksator aleksator force-pushed the 1681_doc_crate_version branch from 8f9ec0f to ad53938 Compare February 20, 2020 17:18
@aleksator
Copy link
Contributor Author

Looks great!

Can you add a section to the bottom of unstable.md briefly describing the feature? I created a tracking issue you can link to: https://github.com/rust-lang/cargo/issues/7907

Thank you! I have added it as a separate commit (please indicate if you would prefer it squashed), linked to the issue and rebased the branch on master.

@bors
Copy link
Contributor

bors commented Feb 20, 2020

☔ The latest upstream changes (presumably #7820) made this pull request unmergeable. Please resolve the merge conflicts.

@aleksator aleksator force-pushed the 1681_doc_crate_version branch from ad53938 to fc5e17a Compare February 20, 2020 21:35
@ehuss
Copy link
Contributor

ehuss commented Feb 20, 2020

Thanks! A separate commit is probably fine, I normally only squash if there are a bunch of commits, or commits are changing previous ones in the same PR.

@rust-lang/cargo FYI, this is a really minor new nightly-only feature, so I'm not going to bother with FCP. If there are changes (or if we think we should never do this), feel free to leave comments on the tracking issue.

@bors r+

@bors
Copy link
Contributor

bors commented Feb 20, 2020

📌 Commit fc5e17a has been approved by ehuss

@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 20, 2020
@bors
Copy link
Contributor

bors commented Feb 20, 2020

⌛ Testing commit fc5e17a with merge bcc82b10c8097f51d56b95063c77a9646130fed7...

@bors
Copy link
Contributor

bors commented Feb 21, 2020

💔 Test failed - checks-azure

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

ehuss commented Feb 21, 2020

@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 21, 2020
@bors
Copy link
Contributor

bors commented Feb 21, 2020

⌛ Testing commit fc5e17a with merge f0a7bf7...

@bors
Copy link
Contributor

bors commented Feb 21, 2020

☀️ Test successful - checks-azure
Approved by: ehuss
Pushing f0a7bf7 to master...

@bors bors merged commit f0a7bf7 into rust-lang:master Feb 21, 2020
@aleksator aleksator deleted the 1681_doc_crate_version branch February 21, 2020 08:34
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)
@ehuss ehuss added this to the 1.43.0 milestone Feb 6, 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.

Insert package name/version in API docs
5 participants