Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - chore: forward port leanprover-community/mathlib#18575 #2899

Closed
wants to merge 9 commits into from

Conversation

eric-wieser
Copy link
Member

@eric-wieser eric-wieser commented Mar 15, 2023

This somewhat re-ports the file from scratch (by manually cleaning up the mathport output to remove all the meta comments), as lots of workarounds were added in #2570 to deal with coercion issues.

All proof changes are restoring the mathport proofs, except for small modifications to use simp [(foo)] instead of simp [foo] or simp (where foo was already a simp lemma).

leanprover-community/mathlib#18575


Open in Gitpod

@eric-wieser eric-wieser added the WIP Work in progress label Mar 15, 2023
Copy link
Member

@mcdoll mcdoll left a comment

Choose a reason for hiding this comment

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

a few regressions

Mathlib/LinearAlgebra/AffineSpace/AffineMap.lean Outdated Show resolved Hide resolved
Mathlib/LinearAlgebra/AffineSpace/AffineMap.lean Outdated Show resolved Hide resolved
Mathlib/LinearAlgebra/AffineSpace/AffineMap.lean Outdated Show resolved Hide resolved
eric-wieser and others added 2 commits March 15, 2023 11:38
Co-authored-by: Moritz Doll <moritz.doll@googlemail.com>
@@ -469,14 +456,13 @@ theorem coe_mul (f g : P1 →ᵃ[k] P1) : ⇑(f * g) = f ∘ g :=
#align affine_map.coe_mul AffineMap.coe_mul

@[simp]
theorem coe_one : ⇑(1 : P1 →ᵃ[k] P1) = id k P1 :=
Copy link
Member Author

Choose a reason for hiding this comment

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

This was a mis-port

@eric-wieser eric-wieser added awaiting-review awaiting-CI mathlib3-pair This PR is a forward-port of a mathlib3 PR or part of one, either under review or recently merged and removed WIP Work in progress labels Mar 15, 2023
@@ -853,7 +831,7 @@ theorem homothety_apply_same (c : P1) (r : k) : homothety c r c = c :=

theorem homothety_mul_apply (c : P1) (r₁ r₂ : k) (p : P1) :
homothety c (r₁ * r₂) p = homothety c r₁ (homothety c r₂ p) := by
simp [homothety_apply, mul_smul]
simp only [homothety_apply, mul_smul, vadd_vsub]
Copy link
Member Author

@eric-wieser eric-wieser Mar 15, 2023

Choose a reason for hiding this comment

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

This proof was ported without modification the first time, but for whatever reason needs more help after this re-port

Comment on lines 502 to 503
-- porting note: `simp` needs a placeholder for the `β` argument to `Set.mem_vsub`
simp only [Set.mem_vsub (β := _), Set.mem_image,
Copy link
Member Author

Choose a reason for hiding this comment

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

This is deeply weird

Copy link
Member Author

Choose a reason for hiding this comment

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

@mcdoll
Copy link
Member

mcdoll commented Mar 16, 2023

maintainer merge

1 similar comment
@eric-wieser
Copy link
Member Author

maintainer merge

@Parcly-Taxel
Copy link
Collaborator

maintainer merge

isn't it bors merge?

@eric-wieser
Copy link
Member Author

I don't want to merge my own PR without the eyes of another maintainer. I posted again to try and wake up the bot, but it seems to be having github API issues, which we're working on resolving)

@ocfnash
Copy link
Contributor

ocfnash commented Mar 17, 2023

Thanks!

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review labels Mar 17, 2023
bors bot pushed a commit that referenced this pull request Mar 17, 2023
This somewhat re-ports the file from scratch (by manually cleaning up the mathport output to remove all the meta comments), as lots of workarounds were added in #2570 to deal with coercion issues.

All proof changes are restoring the mathport proofs, except for small modifications to use `simp [(foo)]` instead of `simp [foo]` or `simp` (where `foo` was already a `simp` lemma).

leanprover-community/mathlib#18575
@bors
Copy link

bors bot commented Mar 17, 2023

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title chore: forward port leanprover-community/mathlib#18575 [Merged by Bors] - chore: forward port leanprover-community/mathlib#18575 Mar 17, 2023
@bors bors bot closed this Mar 17, 2023
@bors bors bot deleted the forward-port-18575 branch March 17, 2023 14:45
bors bot pushed a commit that referenced this pull request Mar 23, 2023
This ran into many of the problems that #2899 did, where `simp` would fail but `simp [(foo)]` or `simp [foo _]` would succeed.



Co-authored-by: Moritz Doll <moritz.doll@googlemail.com>
Co-authored-by: Parcly Taxel <reddeloostw@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
mathlib3-pair This PR is a forward-port of a mathlib3 PR or part of one, either under review or recently merged ready-to-merge This PR has been sent to bors.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants