Unify titles in rustdoc book doc attributes chapter#90374
Merged
bors merged 1 commit intorust-lang:masterfrom Oct 30, 2021
Merged
Unify titles in rustdoc book doc attributes chapter#90374bors merged 1 commit intorust-lang:masterfrom
bors merged 1 commit intorust-lang:masterfrom
Conversation
Collaborator
|
☔ The latest upstream changes (presumably #90339) made this pull request unmergeable. Please resolve the merge conflicts. |
9979e70 to
54c2f9d
Compare
Member
CI won't catch all uses. You'll have to update at least this spot: $ rg docno_inlinedocinline compiler/
compiler/rustc_passes/src/check_attr.rs
771: err.note("read https://doc.rust-lang.org/nightly/rustdoc/the-doc-attribute.html#docno_inlinedocinline for more information") |
camelid
reviewed
Oct 28, 2021
Member
camelid
left a comment
There was a problem hiding this comment.
r=me with the following comments addressed and the error message I mentioned above updated (you'll have to bless tests as well)
Please make sure to use r=camelid rather than r+ :)
54c2f9d to
a2ff29f
Compare
Member
Author
|
Instead of creating |
Member
Author
|
@bors: r=camelid rollup |
Collaborator
|
📌 Commit a2ff29f17cdafec9d485efc7b4b34f04fb5bdc3e has been approved by |
Member
|
@bors r- |
Member
This might mess up the mdBook styling, and it means the new IDs won't exist. Please use span or similar instead. |
Member
|
Also, please update the error message I mentioned above. |
a2ff29f to
9829811
Compare
Member
Author
|
Updated! I'll let you handle the r+ this time. ;) |
camelid
reviewed
Oct 29, 2021
This comment has been minimized.
This comment has been minimized.
9829811 to
0c70831
Compare
Member
|
Thanks! @bors r+ rollup |
Collaborator
|
📌 Commit 0c70831 has been approved by |
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Oct 30, 2021
…itles, r=camelid Unify titles in rustdoc book doc attributes chapter As discussed in rust-lang#90339. I wasn't able to find out where the link to the titles was used so let's see if the CI fails. :) r? `@camelid`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Oct 30, 2021
…askrgr Rollup of 8 pull requests Successful merges: - rust-lang#89876 (Make most std::ops traits const on numeric types) - rust-lang#90371 (Fix incorrect doc link) - rust-lang#90374 (Unify titles in rustdoc book doc attributes chapter) - rust-lang#90377 (Make `core::slice::from_raw_parts[_mut]` const) - rust-lang#90395 (Restrict liveness of mutable borrow of inner infcx in ConstInferUnifier::consts) - rust-lang#90396 (Prevent type flags assertions being thrown in default_anon_const_substs if errors occurred) - rust-lang#90402 (Add a few query descriptions) - rust-lang#90412 (Remove unnecessary `macro_use`s in rustdoc) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
6 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.
As discussed in #90339.
I wasn't able to find out where the link to the titles was used so let's see if the CI fails. :)
r? @camelid