Skip to content

chore: simproc PR changes#496

Merged
joehendrix merged 5 commits intobump/v4.6.0from
simproc
Jan 11, 2024
Merged

chore: simproc PR changes#496
joehendrix merged 5 commits intobump/v4.6.0from
simproc

Conversation

@leodemoura
Copy link
Copy Markdown
Contributor

@leodemoura leodemoura commented Jan 2, 2024

PR for fixing Std after we merge leanprover/lean4#3124


cc: @semorrison @joehendrix

leodemoura and others added 2 commits January 2, 2024 15:13
See leanprover/lean4#3124

Remark: toolchain for PR 3124 is still being built. I tested this PR with my only local lean4.
@kim-em kim-em changed the base branch from main to bump/v4.6.0 January 6, 2024 05:24
@fgdorais fgdorais added depends on core changes This PR need only be reviewed after changes land in Lean core. v4.6.0 This PR needs to wait until we move to `v4.6.0`. It will be merged to `nightly-testing` first. labels Jan 8, 2024
@ghost ghost added the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Jan 10, 2024
@kim-em kim-em added awaiting-review This PR is ready for review; the author thinks it is ready to be merged. and removed depends on core changes This PR need only be reviewed after changes land in Lean core. merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. labels Jan 10, 2024
let argsStx := if args.isEmpty then #[] else #[mkAtom "[", (mkAtom ",").mkSep args, mkAtom "]"]
pure <| stx.setArg 4 (mkNullNode argsStx)
let stx := stx.unsetTrailing
mkSimpOnly stx usedSimps
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.

I think we could just inline/remove this function at this point

@joehendrix joehendrix added will-merge-soon PR will be merged soon. Any concerns should be raised quickly. and removed awaiting-review This PR is ready for review; the author thinks it is ready to be merged. labels Jan 10, 2024
@joehendrix joehendrix merged commit 5ce1202 into bump/v4.6.0 Jan 11, 2024
@joehendrix joehendrix deleted the simproc branch January 11, 2024 05:20
mathlib-bors bot pushed a commit to leanprover-community/mathlib4 that referenced this pull request Jan 12, 2024
These are adaptations required for Leo's implementation of simprocs from leanprover/lean4#3124. 

This is a PR to `bump/v4.6.0`. Before it can be merged we need to merge 
- [x] leanprover-community/batteries#496
- [x] leanprover-community/aesop#93
and then to update the lakefile so both dependencies point at the `bump/v4.6.0` branches.

I've updated a number of Mathlib tactics to adjust to the new type signatures in the simplifier, and these changes need to be reviewed carefully.



Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
kim-em added a commit that referenced this pull request Feb 1, 2024
* feat: hover info for `rcases h : ...` (#486)

* feat: hover info for `rcases h : ...`

* fix

* chore: adaptations for leanprover/lean4#3123 (#502)

* chore: adaptations for leanprover/lean4#3123

* update toolchain

* chore: remove unnecessary `have` (#516)

After leanprover/lean4#3132 the linter will complain about this.

* chore: simproc PR changes (#496)

See leanprover/lean4#3124

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

* chore: adaptions for nightly-2023-01-11 (#524)

* advance toolchain to nightly-2024-01-12, no updates required

* chore: updates to DiscrTree for changes in nightly (#536)

* doc: extend docstrings for `ext` and `ext1` (#525)

Makes sure to mention that the patterns are processed using `rintro`, and makes sure `ext` mentions `ext1`.

* docs(Data/List): typo (#529)

* feat: Eq.rec lemma (#385)

* chore: Add empty collection instance to BinomialHeap (#532)

* Incremental Library Search (#421)

This ports library_search from Mathlib to Std.  It preserves the ability to do caching, but is designed to support a cacheless mode.  The exact and apply tactics are named `std_exact?` and `std_apply?`, but will eventually be renamed.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

* fix termination_by clauses in LazyDiscrTree

fix LibrarySearch

* bump toolchain

---------

Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: Martin Dvořák <martin.dvorak@matfyz.cz>
Co-authored-by: François G. Dorais <fgdorais@gmail.com>
Co-authored-by: Joe Hendrix <joe@lean-fro.org>

* feat: adaptations for leanprover/lean4#3159 (#557)

* merge origin/main

* chore: fixes for `simp` refactor (#571)

* move to v4.6.0-rc1

* fix proofs

---------

Co-authored-by: Mario Carneiro <di.gama@gmail.com>
Co-authored-by: Leonardo de Moura <leonardo@microsoft.com>
Co-authored-by: Joachim Breitner <mail@joachim-breitner.de>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: Martin Dvořák <martin.dvorak@matfyz.cz>
Co-authored-by: François G. Dorais <fgdorais@gmail.com>
Co-authored-by: Joe Hendrix <joe@lean-fro.org>
joehendrix pushed a commit that referenced this pull request Feb 5, 2024
See leanprover/lean4#3124

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>
joehendrix pushed a commit that referenced this pull request Feb 5, 2024
fgdorais pushed a commit to fgdorais/batteries that referenced this pull request Feb 16, 2024
fgdorais pushed a commit to fgdorais/batteries that referenced this pull request Feb 16, 2024
joehendrix pushed a commit that referenced this pull request Feb 16, 2024
fgdorais added a commit to fgdorais/batteries that referenced this pull request Feb 18, 2024
)

* feat: hover info for `rcases h : ...` (leanprover-community#486)

* feat: hover info for `rcases h : ...`

* fix

* chore: adaptations for leanprover/lean4#3123 (leanprover-community#502)

* chore: adaptations for leanprover/lean4#3123

* update toolchain

* chore: remove unnecessary `have` (leanprover-community#516)

After leanprover/lean4#3132 the linter will complain about this.

* chore: simproc PR changes (leanprover-community#496)

See leanprover/lean4#3124

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

* chore: adaptions for nightly-2023-01-11 (leanprover-community#524)

* advance toolchain to nightly-2024-01-12, no updates required

* chore: updates to DiscrTree for changes in nightly (leanprover-community#536)

* doc: extend docstrings for `ext` and `ext1` (leanprover-community#525)

Makes sure to mention that the patterns are processed using `rintro`, and makes sure `ext` mentions `ext1`.

* docs(Data/List): typo (leanprover-community#529)

* feat: Eq.rec lemma (leanprover-community#385)

* chore: Add empty collection instance to BinomialHeap (leanprover-community#532)

* Incremental Library Search (leanprover-community#421)

This ports library_search from Mathlib to Std.  It preserves the ability to do caching, but is designed to support a cacheless mode.  The exact and apply tactics are named `std_exact?` and `std_apply?`, but will eventually be renamed.

Co-authored-by: Scott Morrison <scott.morrison@gmail.com>

* fix termination_by clauses in LazyDiscrTree

fix LibrarySearch

* bump toolchain

---------

Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: Martin Dvořák <martin.dvorak@matfyz.cz>
Co-authored-by: François G. Dorais <fgdorais@gmail.com>
Co-authored-by: Joe Hendrix <joe@lean-fro.org>

* feat: adaptations for leanprover/lean4#3159 (leanprover-community#557)

* merge origin/main

* chore: fixes for `simp` refactor (leanprover-community#571)

* move to v4.6.0-rc1

* fix proofs

---------

Co-authored-by: Mario Carneiro <di.gama@gmail.com>
Co-authored-by: Leonardo de Moura <leonardo@microsoft.com>
Co-authored-by: Joachim Breitner <mail@joachim-breitner.de>
Co-authored-by: Kyle Miller <kmill31415@gmail.com>
Co-authored-by: Martin Dvořák <martin.dvorak@matfyz.cz>
Co-authored-by: François G. Dorais <fgdorais@gmail.com>
Co-authored-by: Joe Hendrix <joe@lean-fro.org>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

v4.6.0 This PR needs to wait until we move to `v4.6.0`. It will be merged to `nightly-testing` first. will-merge-soon PR will be merged soon. Any concerns should be raised quickly.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants