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: add #align statements for to_additive decls #1816

Closed
wants to merge 11 commits into from

Conversation

jcommelin
Copy link
Member


Open in Gitpod

@jcommelin jcommelin added the awaiting-review The author would like community review of the PR label Jan 24, 2023
@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 24, 2023
@jcommelin jcommelin removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 24, 2023
Copy link
Member

@fpvandoorn fpvandoorn left a comment

Choose a reason for hiding this comment

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

This is clearly good, and should be merged quickly once it compiles.

bors d+

@@ -91,11 +91,10 @@ theorem image2_smul : image2 SMul.smul s t = s • t :=
#align set.image2_smul Set.image2_smul
#align set.image2_vadd Set.image2_vadd

@[to_additive add_image_prod]
-- @[to_additive add_image_prod] -- Porting note: bug in mathlib3
Copy link
Member

Choose a reason for hiding this comment

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

This inserts a translation to an existing but unrelated declaration? We should probably make this @[to_additive vadd_image_prod] if that works

@@ -95,7 +95,7 @@ theorem le_map_add_map_div [Group α] [AddCommSemigroup β] [LE β] [MulLEAddHom
(a b : α) : f a ≤ f b + f (a / b) := by
simpa only [add_comm, div_mul_cancel'] using map_mul_le_add f (a / b) b
#align le_map_add_map_div le_map_add_map_div
#align le_map_add_map_sub le_map_add_map_sub
-- #align le_map_add_map_sub le_map_add_map_sub -- Porting note: TODO: `to_additive` clashes
Copy link
Member

Choose a reason for hiding this comment

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

Oh, these are two declarations with the same additive version? Yeah, that happens sometimes.

@bors
Copy link

bors bot commented Jan 24, 2023

✌️ jcommelin can now approve this pull request. To approve and merge a pull request, simply reply with bors r+. More detailed instructions are available here.

@semorrison semorrison added delegated merge-conflict The PR has a merge conflict with master, and needs manual merging. and removed awaiting-review The author would like community review of the PR labels Jan 24, 2023
@semorrison semorrison removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label Jan 24, 2023
@fpvandoorn
Copy link
Member

bors merge

@github-actions github-actions bot added the ready-to-merge This PR has been sent to bors. label Jan 24, 2023
bors bot pushed a commit that referenced this pull request Jan 24, 2023
Co-authored-by: Floris van Doorn <fpvdoorn@gmail.com>
@bors
Copy link

bors bot commented Jan 24, 2023

Pull request successfully merged into master.

Build succeeded:

@bors bors bot changed the title chore: add #align statements for to_additive decls [Merged by Bors] - chore: add #align statements for to_additive decls Jan 24, 2023
@bors bors bot closed this Jan 24, 2023
@bors bors bot deleted the additive-aligns branch January 24, 2023 18:57
alexkeizer pushed a commit that referenced this pull request Jan 25, 2023
Co-authored-by: Floris van Doorn <fpvdoorn@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated 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

3 participants