Skip to content

[beta] backports #132733

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 4 commits into from
Nov 8, 2024
Merged

[beta] backports #132733

merged 4 commits into from
Nov 8, 2024

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Nov 7, 2024

r? cuviper

Lukas Markeffsky and others added 4 commits November 5, 2024 14:04
@cuviper
rustdoc: skip stability inheritance for some item kinds
12ed4c6 
(cherry picked from commit 728315d)
@youknowone @cuviper
Avoid use imports in thread_local_inner! in statik
a160d9e 
Fixes rust-lang#131863 for wasm targets

All other macros were done in rust-lang#131866, but this sub module is missed.

(cherry picked from commit 5368b12)
@Urgau @cuviper
Also treat impl definition parent as transparent regarding modules
c77b19b 
(cherry picked from commit 37db365)
@nnethercote @cuviper
Revert "Avoid nested replacement ranges" from rust-lang#129346.
25ab47d 
It caused a test regression in the `cfg_eval.rs` crate. (The bugfix
in rust-lang#129346 was in a different commit; this commit was just a code
simplification.)

(cherry picked from commit 981dc02)
@rustbot
Copy link
Collaborator

rustbot commented Nov 7, 2024

⚠️ 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!

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library 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. labels Nov 7, 2024
@cuviper
Copy link
Member Author

cuviper commented Nov 7, 2024

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Nov 7, 2024

📌 Commit 25ab47d has been approved by cuviper

It is now in the queue for this repository.

@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 Nov 7, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 8, 2024
@bors
Auto merge of rust-lang#132733 - cuviper:beta-next, r=cuviper
aa7626b 
[beta] backports

- rustdoc: skip stability inheritance for some item kinds rust-lang#132481
- Avoid use imports in thread_local_inner! in static rust-lang#132101
- Also treat `impl` definition parent as transparent regarding modules rust-lang#132453
- Revert "Avoid nested replacement ranges" from rust-lang#129346. rust-lang#132587

r? cuviper
@bors
Copy link
Collaborator

bors commented Nov 8, 2024

⌛ Testing commit 25ab47d with merge aa7626b...

@bors
Copy link
Collaborator

bors commented Nov 8, 2024

💔 Test failed - checks-actions

@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 Nov 8, 2024
@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@cuviper
Copy link
Member Author

cuviper commented Nov 8, 2024 

xcode-select: error: invalid developer directory '/Applications/Xcode_14.3.1.app'

Possibly spurious?

@bors retry

@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 Nov 8, 2024
@bors
Copy link
Collaborator

bors commented Nov 8, 2024

⌛ Testing commit 25ab47d with merge eb6e3fa...

@bors
Copy link
Collaborator

bors commented Nov 8, 2024

☀️ Test successful - checks-actions
Approved by: cuviper
Pushing eb6e3fa to beta...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Nov 8, 2024
@bors bors merged commit eb6e3fa into rust-lang:beta Nov 8, 2024
7 checks passed
@rustbot rustbot added this to the 1.83.0 milestone Nov 8, 2024
@cuviper cuviper deleted the beta-next branch November 8, 2024 17:36
@zachs18 zachs18 mentioned this pull request Nov 11, 2024
Closed
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers
No reviews
Assignees

@cuviper cuviper

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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-libs Relevant to the library 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
Milestone
1.83.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cuviper @rustbot @bors @rust-log-analyzer @youknowone @Urgau @nnethercote