Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args` #131081

camelid · 2024-10-01T04:49:38Z

This PR introduces a min_generic_const_args feature gate and implements some preliminary work for it, representing all const arguments that are single segment paths as ConstArg::Path instead of only those that resolve to a const generic parameter. There are a few bits of follow up work after this lands:

Figure out how to represent Foo<{ STATIC }>
Figure out how to evaluate Foo<{ EnumVariantConstructor }>
Make param env normalization handle non-anon-consts
Move try_from_lit and from_anon_const to hir ty lowering too

bors · 2024-10-13T01:26:19Z

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

bors · 2024-10-21T06:55:52Z

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

compiler/rustc_ast_lowering/src/lib.rs

rustbot · 2024-10-28T18:50:18Z

HIR ty lowering was modified

cc @fmease

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

BoxyUwU

✨ thanks for working on this, excited to be able to add the min_generic_const_args feature gate soon after all of these refactorings 😅

compiler/rustc_ast_lowering/src/lib.rs

compiler/rustc_const_eval/src/const_eval/eval_queries.rs

compiler/rustc_hir_analysis/src/collect.rs

compiler/rustc_hir_analysis/src/lib.rs

compiler/rustc_middle/src/ty/consts.rs

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

bors · 2024-10-31T01:27:03Z

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

BoxyUwU · 2024-11-14T02:01:47Z

also you'll need to squash all these commits before merging

Co-authored-by: Boxy UwU <[email protected]> Co-authored-by: León Orell Valerian Liehr <[email protected]>

BoxyUwU · 2024-11-19T08:01:20Z

rebased and squashed commits for you as well as blessing the stable mir test now that those changes have been reverted. we can follow up on everything else later. Having the feature gate will be super nice thanks :3

@bors r+

bors · 2024-11-19T08:01:23Z

📌 Commit 473b5d5 has been approved by BoxyUwU

It is now in the queue for this repository.

…iaskrgr Rollup of 4 pull requests Successful merges: - rust-lang#131081 (Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args`) - rust-lang#132577 (Report the `unexpected_cfgs` lint in external macros) - rust-lang#133023 (Merge `-Zhir-stats` into `-Zinput-stats`) - rust-lang#133200 (ignore an occasionally-failing test in Miri) r? `@ghost` `@rustbot` modify labels: rollup

Rollup merge of rust-lang#131081 - camelid:const-path-it-all, r=BoxyUwU Use `ConstArgKind::Path` for all single-segment paths, not just params under `min_generic_const_args` r? `@BoxyUwU` edit by `@BoxyUwU:` This PR introduces a `min_generic_const_args` feature gate and implements some preliminary work for it, representing all const arguments that are single segment paths as `ConstArg::Path` instead of only those that resolve to a const generic parameter. There are a few bits of follow up work after this lands: - Figure out how to represent `Foo<{ STATIC }>` - Figure out how to evaluate `Foo<{ EnumVariantConstructor }>` - Make param env normalization handle non-anon-consts - Move `try_from_lit` and `from_anon_const` to hir ty lowering too

These operations are much more about lowering the HIR than about `Const`s themselves. They fit better in hir_ty_lowering with `lower_const_arg` (formerly `Const::from_const_arg`) and the rest. To accomplish this, `const_evaluatable_predicates_of` had to be changed to not use `from_anon_const` anymore. Instead of visiting the HIR and lowering anon consts on the fly, it now visits the `rustc_middle::ty` data structures instead and directly looks for `UnevaluatedConst`s. This approach was proposed in: rust-lang#131081 (comment)

Move `Const::{from_anon_const,try_from_lit}` to hir_ty_lowering Fixes rust-lang#128176. This accomplishes one of the followup items from rust-lang#131081. These operations are much more about lowering the HIR than about `Const`s themselves. They fit better in hir_ty_lowering with `lower_const_arg` (formerly `Const::from_const_arg`) and the rest. To accomplish this, `const_evaluatable_predicates_of` had to be changed to not use `from_anon_const` anymore. Instead of visiting the HIR and lowering anon consts on the fly, it now visits the `rustc_middle::ty` data structures instead and directly looks for `UnevaluatedConst`s. This approach was proposed in: rust-lang#131081 (comment) r? `@BoxyUwU`

These operations are much more about lowering the HIR than about `Const`s themselves. They fit better in hir_ty_lowering with `lower_const_arg` (formerly `Const::from_const_arg`) and the rest. To accomplish this, `const_evaluatable_predicates_of` had to be changed to not use `from_anon_const` anymore. Instead of visiting the HIR and lowering anon consts on the fly, it now visits the `rustc_middle::ty` data structures instead and directly looks for `UnevaluatedConst`s. This approach was proposed in: rust-lang#131081 (comment)

…xyUwU Move `Const::{from_anon_const,try_from_lit}` to hir_ty_lowering Fixes rust-lang#128176. This accomplishes one of the followup items from rust-lang#131081. These operations are much more about lowering the HIR than about `Const`s themselves. They fit better in hir_ty_lowering with `lower_const_arg` (formerly `Const::from_const_arg`) and the rest. To accomplish this, `const_evaluatable_predicates_of` had to be changed to not use `from_anon_const` anymore. Instead of visiting the HIR and lowering anon consts on the fly, it now visits the `rustc_middle::ty` data structures instead and directly looks for `UnevaluatedConst`s. This approach was proposed in: rust-lang#131081 (comment) r? `@BoxyUwU`

Rollup merge of rust-lang#133610 - camelid:move-from_anon_const, r=BoxyUwU Move `Const::{from_anon_const,try_from_lit}` to hir_ty_lowering Fixes rust-lang#128176. This accomplishes one of the followup items from rust-lang#131081. These operations are much more about lowering the HIR than about `Const`s themselves. They fit better in hir_ty_lowering with `lower_const_arg` (formerly `Const::from_const_arg`) and the rest. To accomplish this, `const_evaluatable_predicates_of` had to be changed to not use `from_anon_const` anymore. Instead of visiting the HIR and lowering anon consts on the fly, it now visits the `rustc_middle::ty` data structures instead and directly looks for `UnevaluatedConst`s. This approach was proposed in: rust-lang#131081 (comment) r? `@BoxyUwU`

rustbot assigned BoxyUwU Oct 1, 2024

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. labels Oct 1, 2024

camelid force-pushed the const-path-it-all branch from 2b73426 to 87b1f29 Compare October 1, 2024 04:51