Skip to content

rename 'try' intrinsic to 'catch_unwind' #121598

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 2 commits into from
Feb 27, 2024
Merged

Conversation

RalfJung
Copy link
Member

The intrinsic has nothing to do with try blocks, and corresponds to the stable catch_unwind function, so this makes a lot more sense IMO.

Also rename Miri's special function while we are at it, to reflect the level of abstraction it works on: it's an unwinding mechanism, on which Rust implements panics.

@rustbot
Copy link
Collaborator

rustbot commented Feb 25, 2024

r? @cuviper

rustbot has assigned @cuviper.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

@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. labels Feb 25, 2024
@rustbot
Copy link
Collaborator

rustbot commented Feb 25, 2024

Some changes occurred in compiler/rustc_codegen_gcc

cc @antoyo, @GuillaumeGomez

The Miri subtree was changed

cc @rust-lang/miri

Some changes occurred in compiler/rustc_codegen_cranelift

cc @bjorn3

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Feb 26, 2024

r? @oli-obk

@rustbot rustbot assigned oli-obk and unassigned cuviper Feb 26, 2024
@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Feb 26, 2024

📌 Commit a3c0f3a has been approved by oli-obk

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 Feb 26, 2024
bors added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#121598 (rename 'try' intrinsic to 'catch_unwind')
 - rust-lang#121639 (Update books)
 - rust-lang#121648 (Update Vec and String `{from,into}_raw_parts`-family docs)
 - rust-lang#121651 (Properly emit `expected ;` on `#[attr] expr`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit d95c321 into rust-lang:master Feb 27, 2024
@rustbot rustbot added this to the 1.78.0 milestone Feb 27, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Feb 27, 2024
Rollup merge of rust-lang#121598 - RalfJung:catch_unwind, r=oli-obk

rename 'try' intrinsic to 'catch_unwind'

The intrinsic has nothing to do with `try` blocks, and corresponds to the stable `catch_unwind` function, so this makes a lot more sense IMO.

Also rename Miri's special function while we are at it, to reflect the level of abstraction it works on: it's an unwinding mechanism, on which Rust implements panics.
@bors
Copy link
Collaborator

bors commented Feb 27, 2024

⌛ Testing commit a3c0f3a with merge 71ffdf7...

@RalfJung RalfJung deleted the catch_unwind branch February 28, 2024 06:30
taiki-e added a commit to taiki-e/unwinding that referenced this pull request Feb 28, 2024
nbdd0121 pushed a commit to nbdd0121/unwinding that referenced this pull request Feb 28, 2024
adpaco-aws added a commit to model-checking/kani that referenced this pull request Mar 4, 2024
Upgrades the Rust toolchain to `nightly-2024-03-01`. The Rust compiler
PRs that triggered changes in this upgrades are:
 * rust-lang/rust#121516
 * rust-lang/rust#121598
 * rust-lang/rust#121489
 * rust-lang/rust#121783
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Mar 8, 2024
rename 'try' intrinsic to 'catch_unwind'

The intrinsic has nothing to do with `try` blocks, and corresponds to the stable `catch_unwind` function, so this makes a lot more sense IMO.

Also rename Miri's special function while we are at it, to reflect the level of abstraction it works on: it's an unwinding mechanism, on which Rust implements panics.
bjorn3 pushed a commit to bjorn3/rust that referenced this pull request Mar 8, 2024
…iaskrgr

Rollup of 4 pull requests

Successful merges:

 - rust-lang#121598 (rename 'try' intrinsic to 'catch_unwind')
 - rust-lang#121639 (Update books)
 - rust-lang#121648 (Update Vec and String `{from,into}_raw_parts`-family docs)
 - rust-lang#121651 (Properly emit `expected ;` on `#[attr] expr`)

r? `@ghost`
`@rustbot` modify labels: rollup
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants