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.

rustbot · 2024-11-13T03:23:56Z

Some changes occurred to the CTFE machinery

cc @rust-lang/wg-const-eval

BoxyUwU · 2024-11-13T23:36:28Z

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs

@@ -2025,23 +2040,138 @@ impl<'tcx> dyn HirTyLowerer<'tcx> + '_ {
    ///
    /// Early-bound const parameters get lowered to [`ty::ConstKind::Param`]
    /// and late-bound ones to [`ty::ConstKind::Bound`].
-    pub(crate) fn lower_const_param(&self, hir_id: HirId) -> Const<'tcx> {


how come this was changed. I think it would be nicer to keep it the same as it was since lower_ty_param also doesn't take a DefId

tests/ui/stable-mir-print/operands.stdout

tests/crashes/auxiliary/aux132985.rs

compiler/rustc_trait_selection/src/traits/mod.rs

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.

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

…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

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

This comment has been minimized.

Sign in to view

camelid force-pushed the const-path-it-all branch from c43d981 to 883a4ba Compare October 6, 2024 22:41

This comment has been minimized.

Sign in to view

camelid force-pushed the const-path-it-all branch from 23076d2 to 507ada1 Compare October 20, 2024 06:22

This comment has been minimized.

Sign in to view

camelid force-pushed the const-path-it-all branch 2 times, most recently from 4494a71 to 034661e Compare October 21, 2024 16:29

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Oct 28, 2024

View reviewed changes

compiler/rustc_ast_lowering/src/lib.rs Outdated Show resolved Hide resolved

compiler/rustc_ast_lowering/src/lib.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

camelid changed the title ~~Begin to use ConstArgKind::Path for all paths, not just params~~ Use ConstArgKind::Path for all single-segment paths, not just params Oct 28, 2024

camelid marked this pull request as ready for review October 28, 2024 18:50

fmease reviewed Oct 28, 2024

View reviewed changes

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs Outdated Show resolved Hide resolved

This comment has been minimized.

Sign in to view

BoxyUwU reviewed Oct 29, 2024

View reviewed changes

compiler/rustc_hir_analysis/src/hir_ty_lowering/mod.rs Outdated Show resolved Hide resolved

camelid force-pushed the const-path-it-all branch from bf17503 to 8b260ba Compare October 31, 2024 23:44

This comment has been minimized.

Sign in to view

camelid force-pushed the const-path-it-all branch from 283bd54 to 2fe91f2 Compare November 13, 2024 03:23

This comment has been minimized.

Sign in to view

camelid mentioned this pull request Nov 13, 2024

Tracking Issue for Generic Constant Arguments MVP #132980

Open

8 tasks

camelid force-pushed the const-path-it-all branch from 87790f1 to 317465c Compare November 13, 2024 05:47

This was referenced Nov 13, 2024

Support ConstArgKind::Paths for const struct/variant constructors #132985

Open

Support ConstArgKind::Path for uses of static paths #132986

Open

This comment has been minimized.

Sign in to view

BoxyUwU mentioned this pull request Nov 13, 2024

aux-build tests/crashes tests don't seem to work #133009

Closed

BoxyUwU reviewed Nov 13, 2024

View reviewed changes

BoxyUwU reviewed Nov 14, 2024

View reviewed changes

tests/ui/stable-mir-print/operands.stdout Outdated Show resolved Hide resolved

tests/crashes/auxiliary/aux132985.rs Show resolved Hide resolved

BoxyUwU reviewed Nov 14, 2024

View reviewed changes

compiler/rustc_trait_selection/src/traits/mod.rs Outdated Show resolved Hide resolved

BoxyUwU 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 Nov 15, 2024

Introduce min_generic_const_args and directly represent paths

59e339f

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

BoxyUwU force-pushed the const-path-it-all branch from bf37eb4 to 59e339f Compare November 19, 2024 05:23

BoxyUwU changed the title ~~Use ConstArgKind::Path for all single-segment paths, not just params~~ Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_params Nov 19, 2024

BoxyUwU changed the title ~~Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_params~~ Use ConstArgKind::Path for all single-segment paths, not just params under min_generic_const_args Nov 19, 2024

This comment has been minimized.

Sign in to view

Fix broken intra-doc link

473b5d5

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 19, 2024

matthiaskrgr mentioned this pull request Nov 19, 2024

Rollup of 4 pull requests #133205

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

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

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

camelid commented Oct 1, 2024 •

edited by BoxyUwU

Loading

This comment has been minimized.

This comment has been minimized.

bors commented Oct 13, 2024

This comment has been minimized.

bors commented Oct 21, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Oct 28, 2024

This comment has been minimized.

BoxyUwU left a comment

bors commented Oct 31, 2024

This comment has been minimized.

rustbot commented Nov 13, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

BoxyUwU Nov 13, 2024

BoxyUwU commented Nov 14, 2024

This comment has been minimized.

BoxyUwU commented Nov 19, 2024

bors commented Nov 19, 2024

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

Are you sure you want to change the base?

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

Conversation

camelid commented Oct 1, 2024 • edited by BoxyUwU Loading

This comment has been minimized.

This comment has been minimized.

bors commented Oct 13, 2024

This comment has been minimized.

bors commented Oct 21, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

rustbot commented Oct 28, 2024

This comment has been minimized.

BoxyUwU left a comment

Choose a reason for hiding this comment

bors commented Oct 31, 2024

This comment has been minimized.

rustbot commented Nov 13, 2024

This comment has been minimized.

This comment has been minimized.

This comment has been minimized.

BoxyUwU Nov 13, 2024

Choose a reason for hiding this comment

BoxyUwU commented Nov 14, 2024

This comment has been minimized.

BoxyUwU commented Nov 19, 2024

bors commented Nov 19, 2024

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

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

camelid commented Oct 1, 2024 •

edited by BoxyUwU

Loading