Skip to content

Conversation

@AprilNEA
Copy link
Contributor

@AprilNEA AprilNEA commented Jan 3, 2026

Tracking Issues: #132980 #92827

Merge associated_const_equality(ACE) feature gate into min_generic_const_args(MGCA).

  • Replaces features().associated_const_equality() checks with features().min_generic_const_args()
  • Updates the parser to gate associated const equality under min_generic_const_args
  • Moves associated_const_equality to the removed features list
  • Removes the associated_const_equality method from the Features trait
  • Updates all affected tests and tools (rust-analyzer, clippy)

Closes #150617

r? @BoxyUwU

@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 2026

HIR ty lowering was modified

cc @fmease

Some changes occurred in src/tools/clippy

cc @rust-lang/clippy

rust-analyzer is developed in its own repository. If possible, consider making this change to rust-lang/rust-analyzer instead.

cc @rust-lang/rust-analyzer

This PR changes a file inside tests/crashes. If a crash was fixed, please move into the corresponding ui subdir and add 'Fixes #' to the PR description to autoclose the issue upon merge.

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver) labels Jan 3, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 3, 2026

BoxyUwU is currently at their maximum review capacity.
They may take a while to respond.

Copy link
Member

@fmease fmease left a comment

Choose a reason for hiding this comment

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

Thanks for working on this!

Could you additionally replace all occurrences of FIXME(associated_const_equality) with FIXME(mgca)? Thanks in advance!

View changes since this review

@rust-log-analyzer

This comment has been minimized.

@AprilNEA
Copy link
Contributor Author

AprilNEA commented Jan 3, 2026

Could you additionally replace all occurrences of FIXME(associated_const_equality) with FIXME(mgca)? Thanks in advance!

Sure.

@rust-log-analyzer

This comment has been minimized.

@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 4, 2026

@rustbot author

@rustbot rustbot 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 Jan 4, 2026
@rustbot
Copy link
Collaborator

rustbot commented Jan 4, 2026

Reminder, once the PR becomes ready for a review, use @rustbot ready.

@rust-log-analyzer

This comment has been minimized.

@AprilNEA AprilNEA force-pushed the mgca-merge-associated-const-equality branch from a7752be to 9885ffb Compare January 4, 2026 03:48
@AprilNEA
Copy link
Contributor Author

AprilNEA commented Jan 4, 2026

@rustbot ready

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 4, 2026
Copy link
Member

@BoxyUwU BoxyUwU left a comment

Choose a reason for hiding this comment

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

Thanks this all looks good to me. I think this PR will merge conflict with #150650 so we'll wait for that to land before merging this. Once it lands you'll need to rebase this PR

It'd also be good if you could squash all of your commits into one

View changes since this review

@AprilNEA AprilNEA force-pushed the mgca-merge-associated-const-equality branch 2 times, most recently from 4db26df to 62b56b7 Compare January 4, 2026 06:05
@fmease fmease added the F-associated_const_equality `#![feature(associated_const_equality)]` label Jan 4, 2026
@fmease fmease moved this to In Progress in Associated Const Equality (ACE) Jan 4, 2026
@rust-bors
Copy link
Contributor

rust-bors bot commented Jan 4, 2026

☔ The latest upstream changes made this pull request unmergeable. Please resolve the merge conflicts.

@bors
Copy link
Collaborator

bors commented Jan 4, 2026

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

@rustbot
Copy link
Collaborator

rustbot commented Jan 5, 2026

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

@rustbot

This comment has been minimized.

@rustbot rustbot added has-merge-commits PR has merge commits, merge with caution. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jan 5, 2026
This removes `associated_const_equality` as a separate feature gate and makes it part of `min_generic_const_args` (mgca).

Key changes:
  - Remove `associated_const_equality` from unstable features, add to removed
  - Update all test files to use `min_generic_const_args` instead
  - Preserve the original "associated const equality is incomplete" error message by specially handling `sym::associated_const_equality` spans in `feature_gate.rs`
  - Rename FIXME(associated_const_equality) to FIXME(mgca)
@AprilNEA AprilNEA force-pushed the mgca-merge-associated-const-equality branch from 88b620e to 4421270 Compare January 5, 2026 04:35
@rustbot rustbot removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. has-merge-commits PR has merge commits, merge with caution. labels Jan 5, 2026
@AprilNEA
Copy link
Contributor Author

AprilNEA commented Jan 5, 2026

@rustbot ready

@BoxyUwU
Copy link
Member

BoxyUwU commented Jan 5, 2026

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Jan 5, 2026

📌 Commit 4421270 has been approved by BoxyUwU

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 Jan 5, 2026
@bors
Copy link
Collaborator

bors commented Jan 6, 2026

⌛ Testing commit 4421270 with merge da476f1...

@bors
Copy link
Collaborator

bors commented Jan 6, 2026

☀️ Test successful - checks-actions
Approved by: BoxyUwU
Pushing da476f1 to main...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 6, 2026
@bors bors merged commit da476f1 into rust-lang:main Jan 6, 2026
12 checks passed
@github-project-automation github-project-automation bot moved this from In Progress to Done in Associated Const Equality (ACE) Jan 6, 2026
@rustbot rustbot added this to the 1.94.0 milestone Jan 6, 2026
@github-actions
Copy link
Contributor

github-actions bot commented Jan 6, 2026

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 7c04f5d (parent) -> da476f1 (this PR)

Test differences

Show 2 test diffs

2 doctest diffs were found. These are ignored, as they are noisy.

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard da476f1942868cdf94ed88b01ea31170cfe95047 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. aarch64-apple: 8059.4s -> 11247.2s (+39.6%)
  2. pr-check-1: 1509.4s -> 2004.3s (+32.8%)
  3. x86_64-gnu-tools: 3000.8s -> 3614.8s (+20.5%)
  4. x86_64-gnu-gcc: 3244.6s -> 3766.3s (+16.1%)
  5. x86_64-gnu-debug: 6265.8s -> 7271.0s (+16.0%)
  6. x86_64-rust-for-linux: 2822.1s -> 3167.0s (+12.2%)
  7. pr-check-2: 2326.7s -> 2597.9s (+11.7%)
  8. arm-android: 5755.7s -> 6405.1s (+11.3%)
  9. dist-aarch64-apple: 6989.5s -> 7763.7s (+11.1%)
  10. test-various: 6724.8s -> 7413.1s (+10.2%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Collaborator

Finished benchmarking commit (da476f1): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results (secondary 2.9%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)
- - 0
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) - - 0

Cycles

This benchmark run did not return any relevant results for this metric.

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 475.09s -> 473.133s (-0.41%)
Artifact size: 390.73 MiB -> 390.77 MiB (0.01%)

flip1995 pushed a commit to flip1995/rust that referenced this pull request Jan 8, 2026
…-equality, r=BoxyUwU

Merge `associated_const_equality` feature gate into MGCA

Tracking Issues: rust-lang#132980 rust-lang#92827

Merge `associated_const_equality`(ACE) feature gate into `min_generic_const_args`(MGCA).

- Replaces `features().associated_const_equality()` checks with `features().min_generic_const_args()`
- Updates the parser to gate associated const equality under `min_generic_const_args`
- Moves `associated_const_equality` to the removed features list
- Removes the `associated_const_equality` method from the `Features` trait
- Updates all affected tests and tools (rust-analyzer, clippy)

Closes rust-lang#150617

r? `@BoxyUwU`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

F-associated_const_equality `#![feature(associated_const_equality)]` merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-clippy Relevant to the Clippy team. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. T-rust-analyzer Relevant to the rust-analyzer team, which will review and decide on the PR/issue. T-rustdoc Relevant to the rustdoc team, which will review and decide on the PR/issue. T-rustdoc-frontend Relevant to the rustdoc-frontend team, which will review and decide on the web UI/UX output. WG-trait-system-refactor The Rustc Trait System Refactor Initiative (-Znext-solver)

Projects

Development

Successfully merging this pull request may close these issues.

MGCA: merge associated_const_equality feature gate into MGCA

7 participants