Skip to content

chore: changes to adapt to leanprover/lean4#2644#7606

Closed
kim-em wants to merge 499 commits intomasterfrom
lean-pr-testing-2644
Closed

chore: changes to adapt to leanprover/lean4#2644#7606
kim-em wants to merge 499 commits intomasterfrom
lean-pr-testing-2644

Conversation

@kim-em
Copy link
Copy Markdown
Contributor

@kim-em kim-em commented Oct 10, 2023

Comment on lines +78 to 80
-- This lemma has always been bad, but lean4#2644 made `simp` start noticing
@[simp, nolint simpNF]
theorem ε_apply (r : R) : ε R r = Finsupp.single PUnit.unit r :=
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

If ε is an implementation detail, then presumably we can use local simp here?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

Feel free to make such changes yourself, but otherwise I'm going to leave these for "later".

Comment on lines -118 to -128
namespace NameSet

/-- The union of two `NameSet`s. -/
def append (s t : NameSet) : NameSet :=
s.mergeBy (fun _ _ _ => .unit) t

instance : Append NameSet where
append := NameSet.append

end NameSet

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

You can ignore the changes to this file. They are needed here to get Mathlib to compile against this toolchain, but do not need to be reviewed.

kim-em and others added 2 commits October 16, 2023 13:13
Co-authored-by: Eric Wieser <wieser.eric@gmail.com>
@kim-em
Copy link
Copy Markdown
Contributor Author

kim-em commented Oct 16, 2023

Closing in favour of the actual bump PR, #7703

bors bot pushed a commit that referenced this pull request Oct 16, 2023
This includes all the changes from #7606.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
@ghost ghost added the merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot) label Oct 16, 2023
@kim-em kim-em closed this Oct 16, 2023
@PatrickMassot PatrickMassot deleted the lean-pr-testing-2644 branch January 12, 2024 14:08
@PatrickMassot PatrickMassot restored the lean-pr-testing-2644 branch January 12, 2024 14:08
@PatrickMassot PatrickMassot deleted the lean-pr-testing-2644 branch January 15, 2024 15:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

blocked-by-core-release Not relevant for the current Lean release candidate, but will be needed for the next. merge-conflict The PR has a merge conflict with master, and needs manual merging. (this label is managed by a bot)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants