Skip to content

Rollup of 2 pull requests #93695

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

Merged
merged 6 commits into from
Feb 7, 2022
Merged

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

Amanieu and others added 6 commits January 29, 2022 11:54
This was supposed to be the case previously, but a missed method call
meant that trait impls were not checked.
…oli-obk

Require const stability attribute on all stable functions that are `const`

This PR requires all stable functions (of all kinds) that are `const fn` to have a `#[rustc_const_stable]` or `#[rustc_const_unstable]` attribute. Stability was previously implied if omitted; a follow-up PR is planned to change the fallback to be unstable.
Mark the panic_no_unwind lang item as nounwind

This has 2 effects:
- It helps LLVM when inlining since it doesn't need to generate landing pads for `panic_no_unwind`.
- It makes it sound for a panic handler to unwind even if `PanicInfo::can_unwind` returns true. This will simply cause another panic once the unwind tries to go past the `panic_no_unwind` lang item. Eventually this will cause a stack overflow, which is safe.
@rustbot rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Feb 6, 2022
@matthiaskrgr
Copy link
Member Author

@bors r+ rollup=never p=2

@bors
Copy link
Collaborator

bors commented Feb 6, 2022

📌 Commit 4695c21 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 Feb 6, 2022
@bors
Copy link
Collaborator

bors commented Feb 6, 2022

⌛ Testing commit 4695c21 with merge 1b6ca9b200f0373e83a966d3840ce5376ca90ea6...

@bors
Copy link
Collaborator

bors commented Feb 6, 2022

💥 Test timed out

@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 Feb 6, 2022
@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)

@klensy
Copy link
Contributor

klensy commented Feb 6, 2022

boom Test timed out

Sun, 06 Feb 2022 13:35:44 GMT [RUSTC-TIMING] synstructure test:false 2.697
Sun, 06 Feb 2022 13:35:44 GMT [RUSTC-TIMING] rustc_macros test:false 5.547
Sun, 06 Feb 2022 13:35:44 GMT Compiling rustc_macros v0.1.0 (D:\a\rust\rust\compiler\rustc_macros)
Sun, 06 Feb 2022 16:51:11 GMT Error: The operation was canceled.
one more #93329

@matthiaskrgr
Copy link
Member Author

@bors retry #93329

@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 Feb 6, 2022
@bors
Copy link
Collaborator

bors commented Feb 6, 2022

⌛ Testing commit 4695c21 with merge 7b43cfc...

@bors
Copy link
Collaborator

bors commented Feb 7, 2022

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 7b43cfc to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Feb 7, 2022
@bors bors merged commit 7b43cfc into rust-lang:master Feb 7, 2022
@rustbot rustbot added this to the 1.60.0 milestone Feb 7, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (7b43cfc): comparison url.

Summary: This benchmark run did not return any relevant results. 1 results were found to be statistically significant but too small to be relevant.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@matthiaskrgr matthiaskrgr deleted the rollup-zslgooo branch February 13, 2022 00:53
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants