Skip to content

Retroactively feature gate ConstArgKind::Path - #129246

Merged
bors merged 1 commit into
rust-lang:masterfrom
BoxyUwU:feature_gate_const_arg_path
Aug 25, 2024
Merged

Retroactively feature gate ConstArgKind::Path#129246
bors merged 1 commit into
rust-lang:masterfrom
BoxyUwU:feature_gate_const_arg_path

Conversation

@BoxyUwU

@BoxyUwUBoxyUwU commented Aug 18, 2024•
edited
Loading

Copy link
Copy Markdown
Member

This puts the lowering introduced by #125915 under a feature gate until we fix the regressions introduced by it. Alternative to whole sale reverting the PR since it didn't seem like a very clean revert and I think this is generally a step in the right direction and don't want to get stuck landing and reverting the PR over and over :)

cc #129137@camelid, tests taken from there. beta is branching soon so I think it makes sense to not try and rush that fix through since it wont have much time to bake and if it has issues we can't simply revert it on beta.

Fixes#128016

@rustbot

rustbot commented Aug 18, 2024

Copy link
Copy Markdown
Collaborator

r? @cjgillot

rustbot has assigned @cjgillot.
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

@rustbotrustbot 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. labels Aug 18, 2024
BoxyUwU
BoxyUwU commented Aug 18, 2024
View reviewed changes
Comment threadcompiler/rustc_feature/src/unstable.rs
/// Allows identifying the `compiler_builtins` crate.
(internal, compiler_builtins, "1.13.0", None),
/// Gating for a new desugaring of const arguments of usages of const parameters
(internal, const_arg_path, "1.81.0", None),

@BoxyUwUBoxyUwUAug 18, 2024

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just put this as internal since it's only really being added to avoid a beta regression and is not really intended to be a "real" feature since it has no user impact whatsoever

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@BoxyUwU
BoxyUwUforce-pushed the feature_gate_const_arg_path branch from fff5845 to 7e42a2aCompareAugust 18, 2024 21:50
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@BoxyUwU
BoxyUwUforce-pushed the feature_gate_const_arg_path branch from 7e42a2a to b8eedfaCompareAugust 19, 2024 00:14
@petrochenkovpetrochenkov self-assigned this Aug 19, 2024
@petrochenkov

petrochenkov commented Aug 20, 2024

Copy link
Copy Markdown
Contributor

I would prefer to revert #125915 since that's where the problems started.
It would be easier to re-land the non-controversial parts of #125915 than partially revert things from the current state.
cc #129137 (comment)

@petrochenkovpetrochenkov 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-review Status: Awaiting review from the assignee but also interested parties. labels Aug 20, 2024
@petrochenkovpetrochenkov mentioned this pull request Aug 20, 2024
Merged
@petrochenkovpetrochenkov removed their assignment Aug 24, 2024
@cjgillot

cjgillot commented Aug 24, 2024

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Aug 24, 2024

Copy link
Copy Markdown
Collaborator

📌 Commit b8eedfa has been approved by cjgillot

It is now in the queue for this repository.

@borsbors 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 Aug 24, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Aug 24, 2024
@matthiaskrgr
Rollup merge ofrust-lang#129246- BoxyUwU:feature_gate_const_arg_pat…
5a24dd4
…h, r=cjgillot
Retroactively feature gate `ConstArgKind::Path`
This puts the lowering introduced by rust-lang#125915 under a feature gate until we fix the regressions introduced by it. Alternative to whole sale reverting the PR since it didn't seem like a very clean revert and I think this is generally a step in the right direction and don't want to get stuck landing and reverting the PR over and over :)
cc rust-lang#129137 `@camelid,` tests taken from there. beta is branching soon so I think it makes sense to not try and rush that fix through since it wont have much time to bake and if it has issues we can't simply revert it on beta.
Fixesrust-lang#128016
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 24, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 24, 2024
@bors
Auto merge ofrust-lang#129516- matthiaskrgr:rollup-u13wr8q, r=matth…
dd51090
…iaskrgr
Rollup of 10 pull requests
Successful merges:
- rust-lang#128596 (stabilize const_fn_floating_point_arithmetic)
- rust-lang#129199 (make writes_through_immutable_pointer a hard error)
- rust-lang#129246 (Retroactively feature gate `ConstArgKind::Path`)
- rust-lang#129290 (Pin `cc` to 1.0.105)
- rust-lang#129323 (Implement `ptr::fn_addr_eq`)
- rust-lang#129500 (remove invalid `TyCompat` relation for effects)
- rust-lang#129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior)
- rust-lang#129505 (interpret: ImmTy: tighten sanity checks in offset logic)
- rust-lang#129509 (Add a hack to workaround MSVC CI issues)
- rust-lang#129510 (Fix `elided_named_lifetimes` in code)
r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgrmatthiaskrgr mentioned this pull request Aug 24, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 24, 2024
@bors
Auto merge ofrust-lang#129521- matthiaskrgr:rollup-uigv77m, r=matth…
313db53
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#128596 (stabilize const_fn_floating_point_arithmetic)
- rust-lang#129199 (make writes_through_immutable_pointer a hard error)
- rust-lang#129246 (Retroactively feature gate `ConstArgKind::Path`)
- rust-lang#129290 (Pin `cc` to 1.0.105)
- rust-lang#129323 (Implement `ptr::fn_addr_eq`)
- rust-lang#129500 (remove invalid `TyCompat` relation for effects)
- rust-lang#129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior)
- rust-lang#129505 (interpret: ImmTy: tighten sanity checks in offset logic)
- rust-lang#129510 (Fix `elided_named_lifetimes` in code)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge ofrust-lang#129521- matthiaskrgr:rollup-uigv77m, r=matth…
3557abf
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#128596 (stabilize const_fn_floating_point_arithmetic)
- rust-lang#129199 (make writes_through_immutable_pointer a hard error)
- rust-lang#129246 (Retroactively feature gate `ConstArgKind::Path`)
- rust-lang#129290 (Pin `cc` to 1.0.105)
- rust-lang#129323 (Implement `ptr::fn_addr_eq`)
- rust-lang#129500 (remove invalid `TyCompat` relation for effects)
- rust-lang#129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior)
- rust-lang#129505 (interpret: ImmTy: tighten sanity checks in offset logic)
- rust-lang#129510 (Fix `elided_named_lifetimes` in code)
r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@bors
Auto merge ofrust-lang#129521- matthiaskrgr:rollup-uigv77m, r=matth…
717aec0
…iaskrgr
Rollup of 9 pull requests
Successful merges:
- rust-lang#128596 (stabilize const_fn_floating_point_arithmetic)
- rust-lang#129199 (make writes_through_immutable_pointer a hard error)
- rust-lang#129246 (Retroactively feature gate `ConstArgKind::Path`)
- rust-lang#129290 (Pin `cc` to 1.0.105)
- rust-lang#129323 (Implement `ptr::fn_addr_eq`)
- rust-lang#129500 (remove invalid `TyCompat` relation for effects)
- rust-lang#129501 (panicking: improve hint for Miri's RUST_BACKTRACE behavior)
- rust-lang#129505 (interpret: ImmTy: tighten sanity checks in offset logic)
- rust-lang#129510 (Fix `elided_named_lifetimes` in code)
r? `@ghost`
`@rustbot` modify labels: rollup
@bors
bors merged commit c0bedb9 into rust-lang:masterAug 25, 2024
@rustbotrustbot added this to the 1.82.0 milestone Aug 25, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Aug 25, 2024
@rust-timer
Unrolled build forrust-lang#129246
e8cb34b
Rollup merge of rust-lang#129246 - BoxyUwU:feature_gate_const_arg_path, r=cjgillot
Retroactively feature gate `ConstArgKind::Path`
This puts the lowering introduced by rust-lang#125915 under a feature gate until we fix the regressions introduced by it. Alternative to whole sale reverting the PR since it didn't seem like a very clean revert and I think this is generally a step in the right direction and don't want to get stuck landing and reverting the PR over and over :)
cc rust-lang#129137 ``@camelid,`` tests taken from there. beta is branching soon so I think it makes sense to not try and rush that fix through since it wont have much time to bake and if it has issues we can't simply revert it on beta.
Fixesrust-lang#128016
@apiraino

apiraino commented Aug 26, 2024

Copy link
Copy Markdown
Contributor

As per comment on Zulip, #129137 should be the way to fix #128016 (so my understanding).

In any case nominating this one for beta backport since it fixes a beta regression that seems quite important.

@rustbot label +beta-nominated

@rustbotrustbot added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 26, 2024
@BoxyUwUBoxyUwU removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Aug 26, 2024
@BoxyUwU

BoxyUwU commented Aug 26, 2024

Copy link
Copy Markdown
MemberAuthor

Something was already backported onto the current beta and this has landed in nightly so will be in the next beta. no backport should be necessary

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@cjgillotcjgillot

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.T-compilerRelevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.82.0

Development

Successfully merging this pull request may close these issues.

ICE: adding a def'n for node-id NodeId(18) and def kind AnonConst but a previous def'n exists

7 participants

@BoxyUwU@rustbot@rust-log-analyzer@petrochenkov@cjgillot@bors@apiraino