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

Rollup of 6 pull requests #92624

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

lcnr and others added 24 commits November 19, 2021 22:18
Upstream LLVM change 9290ccc migrated attribute removal to use
AttributeMask instead of AttrBuilder, so we need to follow suit here.
A missing break statement lead to an infinite loop in bootstrap.py.
Avoids some extra conversions. Spotted by nikic during review.
Rename `CStore::item_attrs` -> `CStore::item_attrs_untracked` top follow conventions
By avoiding formatting and allocations in the no-ident case, and by making the span mandatory if the ident exists.

Use the optimized `opt_item_ident` to cleanup `fn each_child_of_item`
I think it makes the code easier to understand.
This is the next step in computing more "semantic" information during
intra-doc link collection and then doing rendering all at the end.
This coalesces the checks into one place.
I had the epiphany that now that fragments are "semantic" -- rather than
just strings -- they fill the role that used to be handled by the side
channel. I think I may be able to get rid of the other uses of the side
channel using this technique too.
Hooray! It was no longer used, so it can just be deleted.
This allows eliminating branches in the code where a user-written
fragment is impossible.
return the correct type for closures in `type_of`

A bit unhappy about the way `typeck::check_crate` works rn. Would have preferred to not change `CollectItemTypesVisitor` in this way.

r? `@nikomatsakis`
RustWrapper: adapt to new AttributeMask API

Upstream LLVM change 9290ccc migrated attribute removal to use
AttributeMask instead of AttrBuilder, so we need to follow suit here.

r? `@nagisa` cc `@nikic`
…lacrum

Break the loop

A missing break statement lead to an infinite loop in bootstrap.py.

I also added a short sleep so it's not constantly running at 100%. But I can remove that if it's not wanted.

Fixes rust-lang#76661
…anishearth

rustdoc: Remove the intra-doc links side channel

The side channel made the code much more complex and harder to
understand. It was added as a temporary workaround in
0c99d80, but it's no longer necessary.

The addition of `UrlFragment` in rust-lang#92088 was the key to getting rid of
the side channel. The semantic information (rather than the strings that
used to be used for fragments) that is now captured by `UrlFragment` is
enough to obviate the side channel. An additional change had to be made
to `UrlFragment` in this PR to make this possible: it now records
`DefId`s rather than item names.

This PR also consolidates the checks for anchor conflicts into one place.

r? `@Manishearth`
rustc_metadata: Some minor cleanups and optimizations

Mostly extracted from rust-lang#88679 (which is otherwise a rustdoc PR).
r? `@cjgillot`
…t_struct, r=Mark-Simulacrum

Remove unused `ExtendDefault` struct

As noted in rust-lang#77850 (comment), this struct is no longer used.
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Jan 6, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=6

@bors
Copy link
Contributor

bors commented Jan 6, 2022

📌 Commit db056e9 has been approved by matthiaskrgr

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 6, 2022
@camelid
Copy link
Member

camelid commented Jan 6, 2022

Oops, #92601 shouldn't be rolled up.

@bors r-

@camelid camelid closed this Jan 6, 2022
@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jan 6, 2022
@matthiaskrgr matthiaskrgr deleted the rollup-q9426gi branch February 13, 2022 00:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
rollup A PR which is a rollup S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

9 participants