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

[beta] backports #82996

Merged
merged 9 commits into from
Mar 11, 2021
Merged

[beta] backports #82996

merged 9 commits into from
Mar 11, 2021

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Mar 11, 2021

This backports some beta-accepted PRs and one additional LLVM fix for s390x.

r? @Mark-Simulacrum

ehuss and others added 9 commits March 10, 2021 15:41
It is possible for different tests to collide to the same TestDesc
when macros are involved.  That is a bug, but it didn’t cause a panic
until rust-lang#81367.  For now, change the code to ignore this problem.

Fixes rust-lang#81852.

Signed-off-by: Anders Kaseorg <[email protected]>
(cherry picked from commit 1605af0)
…ss crates

It should be never break another crate to re-export a public item.

Note that this doesn't check the feature gate at
*all* for other crates:

- Feature-gates aren't currently serialized, so the only way to check
  the gate is with ad-hoc attribute checking.
- Checking the feature gate twice (once when documenting the original
  crate and one when documenting the current crate) seems not great.

This should still catch using the feature most of the time though, since
people tend to document their own crates.

(cherry picked from commit fdb32e9)
(cherry picked from commit 3be69b1)
(cherry picked from commit d3f75eb)
This submodule update reverts <https://reviews.llvm.org/D81803>.

While that change is meant to fix a real bug, [LLVM PR42623], it caused
new permission errors on Windows 7 that make it unable to build any
archives. This is probably the same root cause as [LLVM PR48378].

Fixes rust-lang#81051. We'll file a new Rust issue to track the LLVM resolution.

[LLVM PR42623]: https://bugs.llvm.org/show_bug.cgi?id=42623
[LLVM PR48378]: https://bugs.llvm.org/show_bug.cgi?id=48378

(cherry picked from commit 31814c4)
@rust-highfive
Copy link
Collaborator

Some changes occurred in intra-doc-links.

cc @jyn514

@rust-highfive
Copy link
Collaborator

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!
  • These commits modify submodules.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 11, 2021
@Mark-Simulacrum
Copy link
Member

Thanks! If you could drop the beta-accepted label from each PR and update the milestone to 1.51 either once this lands or now (either is fine) that'd be great.

@bors r+ rollup=never p=1

@bors
Copy link
Contributor

bors commented Mar 11, 2021

📌 Commit ee71761 has been approved by Mark-Simulacrum

@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 Mar 11, 2021
@cuviper
Copy link
Member Author

cuviper commented Mar 11, 2021

If you could drop the beta-accepted label from each PR

I thought we kept accepted and dropped nominated?

@Mark-Simulacrum
Copy link
Member

Er, yes, that's correct, sorry.

@cuviper
Copy link
Member Author

cuviper commented Mar 11, 2021

OK, they're updated now!

@bors
Copy link
Contributor

bors commented Mar 11, 2021

⌛ Testing commit ee71761 with merge 50b9553...

@bors
Copy link
Contributor

bors commented Mar 11, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing 50b9553 to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 11, 2021
@bors bors merged commit 50b9553 into rust-lang:beta Mar 11, 2021
@rustbot rustbot added this to the 1.51.0 milestone Mar 11, 2021
@cuviper cuviper deleted the beta-next branch March 11, 2021 04:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. 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.