Skip to content
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.

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

rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect #133142

Merged
merged 1 commit into from
Nov 18, 2024

Conversation

RalfJung
Copy link
Member

In #120370 this name caused confusion as the author thought the intrinsic was stable. So let's try a different name...

If we can land this before the beta cutoff we can avoid needing cfg(bootstrap) for this. ;)
Cc @compiler-errors @saethlin

@rustbot
Copy link
Collaborator

rustbot commented Nov 17, 2024

r? @joboet

rustbot has assigned @joboet.
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
Copy link
Collaborator

rustbot commented Nov 17, 2024

Some changes occurred to the intrinsics. Make sure the CTFE / Miri interpreter
gets adapted for the changes, if necessary.

cc @rust-lang/miri, @rust-lang/wg-const-eval

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

@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 Nov 17, 2024
@saethlin
Copy link
Member

I think this is clearer, but I'll give errs some time to chime in.

@compiler-errors
Copy link
Member

Ya this is fine.

r? compiler-errors @bors r+ rollup

@bors
Copy link
Contributor

bors commented Nov 17, 2024

📌 Commit e6c0268 has been approved by compiler-errors

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 17, 2024
@bors
Copy link
Contributor

bors commented Nov 18, 2024

☔ The latest upstream changes (presumably #120370) made this pull request unmergeable. Please resolve the merge conflicts.

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Nov 18, 2024
@compiler-errors
Copy link
Member

r=me when rebased

@RalfJung
Copy link
Member Author

@bors r=compiler-errors

@bors
Copy link
Contributor

bors commented Nov 18, 2024

📌 Commit 9d4b1b2 has been approved by compiler-errors

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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Nov 18, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Nov 18, 2024
…r-errors

rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect

In rust-lang#120370 this name caused confusion as the author thought the intrinsic was stable. So let's try a different name...

If we can land this before the beta cutoff we can avoid needing `cfg(bootstrap)` for this. ;)
Cc ``@compiler-errors`` ``@saethlin``
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2024
Rollup of 4 pull requests

Successful merges:

 - rust-lang#132934 (Overhaul the `-l` option parser (for linking to native libs))
 - rust-lang#133142 (rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect)
 - rust-lang#133145 (Document alternatives to `static mut`)
 - rust-lang#133158 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2024
Rollup of 4 pull requests

Successful merges:

 - rust-lang#132934 (Overhaul the `-l` option parser (for linking to native libs))
 - rust-lang#133142 (rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect)
 - rust-lang#133145 (Document alternatives to `static mut`)
 - rust-lang#133158 (Subtree update of `rust-analyzer`)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 72a8d53 into rust-lang:master Nov 18, 2024
6 checks passed
@rustbot rustbot added this to the 1.84.0 milestone Nov 18, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Nov 18, 2024
Rollup merge of rust-lang#133142 - RalfJung:naming-is-hard, r=compiler-errors

rename rustc_const_stable_intrinsic -> rustc_intrinsic_const_stable_indirect

In rust-lang#120370 this name caused confusion as the author thought the intrinsic was stable. So let's try a different name...

If we can land this before the beta cutoff we can avoid needing `cfg(bootstrap)` for this. ;)
Cc `@compiler-errors` `@saethlin`
@RalfJung RalfJung deleted the naming-is-hard branch November 18, 2024 17:15
RalfJung added a commit to rust-lang/rustc-dev-guide that referenced this pull request Nov 18, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in 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