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] - feat: port CategoryTheory.Monoidal.Free.Coherence #3769

Closed
wants to merge 30 commits into from

Conversation

@joelriou joelriou added WIP Work in progress mathlib-port This is a port of a theory file from mathlib. labels May 2, 2023
…e.Basic' into port/CategoryTheory.Monoidal.Free.Coherence
@semorrison semorrison added the blocked-by-other-PR This PR depends on another PR to Mathlib label May 2, 2023
@joelriou joelriou removed the WIP Work in progress label May 3, 2023
@semorrison semorrison removed the blocked-by-other-PR This PR depends on another PR to Mathlib label May 3, 2023
@semorrison
Copy link
Contributor

This PR/issue depends on:

@semorrison semorrison added the merge-conflict The PR has a merge conflict with master, and needs manual merging. label May 3, 2023
@semorrison semorrison removed the merge-conflict The PR has a merge conflict with master, and needs manual merging. label May 3, 2023
@joelriou joelriou added the help-wanted The author needs attention to resolve issues label May 3, 2023
@joelriou joelriou added awaiting-review and removed help-wanted The author needs attention to resolve issues labels May 18, 2023
Copy link
Member

@jcommelin jcommelin left a comment

Choose a reason for hiding this comment

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

bors d+

Mathlib/CategoryTheory/Monoidal/Free/Coherence.lean Outdated Show resolved Hide resolved
@bors
Copy link

bors bot commented May 18, 2023

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


end

set_option maxHeartbeats 400000 in
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is this still necessary with #3414?

-- porting note: triggers a PANIC "invalid LCNF substitution of free variable
-- with expression CategoryTheory.FreeMonoidalCategory.NormalMonoidalObject.{u}"
-- prevented with dsimp [normalizeObj]
-- the @[simp] attribute is removed because it also triggers a PANIC
Copy link
Collaborator

Choose a reason for hiding this comment

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

Can this be restored now?


-- porting note: triggers a PANIC "invalid LCNF substitution of free variable
-- with expression CategoryTheory.FreeMonoidalCategory.NormalMonoidalObject.{u}"
-- prevented with dsimp [normalizeObj]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Is dsimp enough to prevent the panics?

@mattrobball
Copy link
Collaborator

Yes dsimp does suffice. No you cannot restore the @[simp] :(

@mattrobball
Copy link
Collaborator

And the bump to max heartbeats can indeed be removed after #3414

@joelriou
Copy link
Collaborator Author

bors r+

bors bot pushed a commit that referenced this pull request May 19, 2023
Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
Co-authored-by: Joël Riou <joel.riou@universite-paris-saclay.fr>
Co-authored-by: Matthew Ballard <matt@mrb.email>
Co-authored-by: Joël Riou <37772949+joelriou@users.noreply.github.com>
@bors
Copy link

bors bot commented May 19, 2023

Pull request successfully merged into master.

Build succeeded!

The publicly hosted instance of bors-ng is deprecated and will go away soon.

If you want to self-host your own instance, instructions are here.
For more help, visit the forum.

If you want to switch to GitHub's built-in merge queue, visit their help page.

@bors bors bot changed the title feat: port CategoryTheory.Monoidal.Free.Coherence [Merged by Bors] - feat: port CategoryTheory.Monoidal.Free.Coherence May 19, 2023
@bors bors bot closed this May 19, 2023
@bors bors bot deleted the port/CategoryTheory.Monoidal.Free.Coherence branch May 19, 2023 07:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
delegated mathlib-port This is a port of a theory file from mathlib.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants