Skip to content

[beta] backports #90151

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.

Sign up for GitHub

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

Jump to bottom
Merged
merged 13 commits into from
Oct 22, 2021
Merged

[beta] backports #90151

merged 13 commits into from
Oct 22, 2021

Conversation

@Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Oct 22, 2021 •
edited
Loading

r? @Mark-Simulacrum

ehuss and others added 12 commits October 21, 2021 22:37
@ehuss @Mark-Simulacrum
Don't emit a warning for empty rmeta files.
59f11bb
@michaelwoerister @Mark-Simulacrum
Erase late-bound regions before computing vtable debuginfo name.
13704da
@wesleywiser @Mark-Simulacrum
Update src/test/codegen/debug-vtable.rs
06221e1 
Co-authored-by: r00ster <[email protected]>
@nbdd0121 @Mark-Simulacrum
Fix issue 90038
b68ede6
@JohnTitor @Mark-Simulacrum
Revert "Rollup merge of rust-lang#86011 - tlyu:correct-sized-bound-sp…
e89b532 
…ans, r=estebank"

This reverts commit 36a1076, reversing
changes made to e1e9319.
@JohnTitor @Mark-Simulacrum
Add a regression test for rust-lang#89935
012c77b
@Urgau @Mark-Simulacrum
Deduplicate macro_rules! from module_exports when documenting them
5e20539 
This can append if within the same module a `#[macro_export] macro_rules!`
is declared but also a reexport of itself producing two export of the same
macro in the same module. In that case we only want to document it once.
@Urgau @Mark-Simulacrum
Add regression test for rust-lang#89852
1ed389d
@Urgau @Mark-Simulacrum
Oops, inverted condition, fix that
d46c106
@Urgau @GuillaumeGomez @Mark-Simulacrum
Apply documentation suggestions from code review
d0dfc22 
Co-authored-by: Guillaume Gomez <[email protected]>
@Urgau @Mark-Simulacrum
Add equivalent test in src/test/rustdoc
caa27dd
@Urgau @Mark-Simulacrum
Rework the equivalent test to work with sidebar-items.js
245acae
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 22, 2021
@Mark-Simulacrum Mark-Simulacrum changed the base branch from master to beta October 22, 2021 02:41
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

📌 Commit 245acae 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 Oct 22, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

💡 This pull request was already approved, no need to approve it again.

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

📌 Commit 245acae has been approved by Mark-Simulacrum

@Mark-Simulacrum
Bump cargo
88e4e0e 
Includes rust-lang/cargo#9979: Fix fetching git repos after a force push.
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=1

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

📌 Commit 88e4e0e has been approved by Mark-Simulacrum

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

⌛ Testing commit 88e4e0e with merge 7e4c9ee...

@bors
Copy link
Collaborator

bors commented Oct 22, 2021

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 22, 2021
@bors bors merged commit 7e4c9ee into rust-lang:beta Oct 22, 2021
@rustbot rustbot added this to the 1.57.0 milestone Oct 22, 2021
@m-ou-se m-ou-se mentioned this pull request Oct 26, 2021
Closed
@pnkfelix pnkfelix mentioned this pull request Oct 28, 2021
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

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

Milestone

1.57.0

Development

Successfully merging this pull request may close these issues.