Skip to content

[CONFLICT] Sync upstream mathlib4 (2026-05-12)#6

Merged
winstonyin-ax merged 6 commits into
masterfrom
sync/upstream
May 12, 2026
Merged

[CONFLICT] Sync upstream mathlib4 (2026-05-12)#6
winstonyin-ax merged 6 commits into
masterfrom
sync/upstream

Conversation

@winstonyin-ax
Copy link
Copy Markdown
Collaborator

@winstonyin-ax winstonyin-ax commented May 12, 2026

Automated daily sync from leanprover-community/mathlib4@master.

⚠️ Merge conflicts

The merge commit on this branch contains conflict markers, so CI will fail
and auto-merge will not run. Resolve manually:

git fetch origin && git checkout sync/upstream
# edit conflicted files to remove markers, then:
git commit --amend --no-edit
git push --force-with-lease

Files with conflict markers



Note

High Risk
High risk because .github/actions/get-mathlib-ci/action.yml still 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 mathlib4 by moving Northcott into Mathlib.Order.Northcott and updating imports accordingly (including the Mathlib.lean umbrella 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 in Alternating.lean.

Refactors category-theory attribute infrastructure: consolidates reassoc into a generating attribute implementation and updates translation insertion to avoid duplicating existing translations, alongside minor to_additive/reassoc attribute annotation cleanups.

Notably, the PR currently introduces an unresolved merge conflict in .github/actions/get-mathlib-ci/action.yml (conflict markers in the pinned ref), and updates upstream_sha.

Reviewed by Cursor Bugbot for commit 0e5f506. Bugbot is set up for automated code reviews on this repo. Configure here.

MichaelStollBayreuth and others added 6 commits May 11, 2026 18:55
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.
@winstonyin-ax winstonyin-ax merged commit abf1490 into master May 12, 2026
4 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants