[CONFLICT] Sync upstream mathlib4 (2026-05-12)#6
Merged
Conversation
Since the current module Mathlib.NumberTheory.Height.Northcott contains material that is not specific to heights (or number theory). we move it to Mathlib.Order.Northcott. This allows us to re-use the old module location to add a height-specific Northcott instance in a follow-up PR.
This is for simp. From MeanFourier
This PR uses `registerGeneratingAttr`, so that `to_additive (attr := reassoc)` also tags the `_assoc` lemma with `to_additive`. This interacts awkwarly with `to_dual (attr := reassoc)`, because in that case, the `reassoc` attribute is responsible for handling the `to_dual` attribute. This is solved by adding a check so that we only insert a new translation if it doesn't already exist (e.g. because `reassoc` could have added it).
This PR updates the Mathlib dependencies.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated daily sync from
leanprover-community/mathlib4@master.1b6d4054371387401ef58e4593a47b0317e8862bThe merge commit on this branch contains conflict markers, so CI will fail
and auto-merge will not run. Resolve manually:
Files with conflict markers
Note
High Risk
High risk because
.github/actions/get-mathlib-ci/action.ymlstill contains unresolved conflict markers that will break CI, and the changes touch core tactic/attribute generation (reassoc, translation insertion) which can cause widespread downstream breakage.Overview
Syncs upstream
mathlib4by movingNorthcottintoMathlib.Order.Northcottand updating imports accordingly (including theMathlib.leanumbrella import list).Adds/normalizes a handful of inner product space simp lemmas (e.g.
adjoint_id,adjoint_one,id_mem_unitary,IsSymmetric.one) and adjusts permutation sign results (sign_finRotate) with corresponding simplification inAlternating.lean.Refactors category-theory attribute infrastructure: consolidates
reassocinto a generating attribute implementation and updates translation insertion to avoid duplicating existing translations, alongside minorto_additive/reassocattribute annotation cleanups.Notably, the PR currently introduces an unresolved merge conflict in
.github/actions/get-mathlib-ci/action.yml(conflict markers in the pinnedref), and updatesupstream_sha.Reviewed by Cursor Bugbot for commit 0e5f506. Bugbot is set up for automated code reviews on this repo. Configure here.