Skip to content

[beta] backports#140592

Merged
bors merged 10 commits intorust-lang:betafrom
cuviper:beta-next
May 3, 2025
Merged

[beta] backports#140592
bors merged 10 commits intorust-lang:betafrom
cuviper:beta-next

Conversation

@cuviper
Copy link
Member

@cuviper cuviper commented May 2, 2025 •
edited
Loading

r? cuviper

m-ou-se and others added 9 commits May 2, 2025 09:29
@m-ou-se @cuviper
Don't allow flattened format_args in const.
0980622 
(cherry picked from commit cc791eb)
@m-ou-se @cuviper
Add test for format_args!("{}", 0) in const.
4ad0f1e 
(cherry picked from commit 56426db)
@usamoi @cuviper
set subsections_via_symbols for ld64 helper sections
8ec60ca 
(cherry picked from commit b1a3831)
@GuillaumeGomez @cuviper
Fix detection of main function if there are expressions around it
0457f2e 
(cherry picked from commit 3536324)
@GuillaumeGomez @cuviper
Add regression ui test for rust-lang#140162 and for rust-lang#139651
745d54e 
(cherry picked from commit 81438c0)
@GuillaumeGomez @cuviper
Improve code
6924908 
(cherry picked from commit 3ededc1)
@GuillaumeGomez @cuviper
If there is a ; alone, we consider that the doctest needs to be put…
c44a1d7 
… inside a function

(cherry picked from commit 3ef98a5)
@GuillaumeGomez @cuviper
Fix bad handling of macros if there is already a main function
1f6a6b1 
(cherry picked from commit aa69e3a)
@fmease @cuviper
rustdoc: Fix doctest heuristic for main fn wrapping
8a4c472 
(cherry picked from commit 714ea10)
@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 May 2, 2025
@cuviper
Copy link
Member Author

cuviper commented May 2, 2025

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented May 2, 2025

📌 Commit 8a4c472 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 May 2, 2025
@onur-ozkan @cuviper
extend the list of registered dylibs on test::prepare_cargo_test
260fcc6 
Signed-off-by: onur-ozkan <work@onurozkan.dev>
(cherry picked from commit 7b25d4a)
@rustbot rustbot added A-testsuite Area: The testsuite used to check the correctness of rustc T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels May 3, 2025
@cuviper
Copy link
Member Author

cuviper commented May 3, 2025

@bors r+

@bors
Copy link
Collaborator

bors commented May 3, 2025

📌 Commit 260fcc6 has been approved by cuviper

It is now in the queue for this repository.

@cuviper
Copy link
Member Author

cuviper commented May 3, 2025

@bors p=1

@bors
Copy link
Collaborator

bors commented May 3, 2025

⌛ Testing commit 260fcc6 with merge 973ec11...

@bors
Copy link
Collaborator

bors commented May 3, 2025

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label May 3, 2025
@bors bors merged commit 973ec11 into rust-lang:beta May 3, 2025
7 checks passed
@rustbot rustbot added this to the 1.87.0 milestone May 3, 2025
@cuviper cuviper deleted the beta-next branch May 22, 2025 22:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cuviper cuviper

Labels

A-testsuite Area: The testsuite used to check the correctness of rustc 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-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) 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.87.0

Development

Successfully merging this pull request may close these issues.

8 participants

@cuviper @bors @rustbot @m-ou-se @usamoi @GuillaumeGomez @fmease @onur-ozkan