Skip to content

chore: upstream Nat.binaryRec #799

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from

Conversation

FR-vdash-bot
Copy link
Contributor

@FR-vdash-bot FR-vdash-bot commented May 16, 2024

Since upstreaming to core (leanprover/lean4#3756) is still controversial, I'd like it to be upstreamed to Batteries first.

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label May 16, 2024
@fgdorais fgdorais added the WIP work in progress label May 22, 2024
@FR-vdash-bot FR-vdash-bot changed the base branch from nightly-testing to main June 9, 2024 00:56
@FR-vdash-bot FR-vdash-bot marked this pull request as ready for review June 9, 2024 01:02
@FR-vdash-bot
Copy link
Contributor Author

awaiting-review

@github-actions github-actions bot added awaiting-review This PR is ready for review; the author thinks it is ready to be merged. and removed WIP work in progress labels Jun 9, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Jun 9, 2024
@FR-vdash-bot FR-vdash-bot mentioned this pull request Aug 6, 2024
2 tasks
@fgdorais fgdorais added the depends on another PR This is stacked on top of another Batteries PR. label Oct 1, 2024
@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot added the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Oct 14, 2024
leanprover-community-mathlib4-bot added a commit to leanprover-community/mathlib4 that referenced this pull request Dec 1, 2024
@leanprover-community-bot
Copy link
Collaborator

Mathlib CI status (docs):

@leanprover-community-mathlib4-bot leanprover-community-mathlib4-bot removed the merge-conflict This PR has merge conflicts with the `main` branch which must be resolved by the author. label Dec 1, 2024
commit c2e5939
Author: Yuyang Zhao 赵雨扬 <[email protected]>
Date:   Mon Apr 7 19:04:43 2025 +0800

    Update BinaryRec.lean

commit a54cb48
Merge: 45680ee 978f30b
Author: Yuyang Zhao 赵雨扬 <[email protected]>
Date:   Mon Apr 7 19:02:15 2025 +0800

    Merge remote-tracking branch 'upstream/main' into binaryRec

commit 45680ee
Author: Yuyang Zhao 赵雨扬 <[email protected]>
Date:   Mon Apr 7 19:00:30 2025 +0800

    Revert "Merge branch 'main' into binaryRec"

    This reverts commit 2469752, reversing
    changes made to 0d1047b.

commit 2469752
Merge: 0d1047b 1a4afaf
Author: Yuyang Zhao 赵雨扬 <[email protected]>
Date:   Mon Apr 7 18:59:45 2025 +0800

    Merge branch 'main' into binaryRec

commit 0d1047b
Author: Yuyang Zhao 赵雨扬 <[email protected]>
Date:   Wed Apr 2 19:59:16 2025 +0800

    Update BinaryRec.lean

commit 0c1b7da
Author: FR-vdash-bot <[email protected]>
Date:   Mon Dec 2 03:25:00 2024 +0800

    Update BinaryRec.lean

commit c78364c
Merge: c50c429 f46c044
Author: FR-vdash-bot <[email protected]>
Date:   Mon Dec 2 03:24:40 2024 +0800

    Merge branch 'main' into binaryRec

commit c50c429
Author: negiizhao <[email protected]>
Date:   Sun Jun 9 08:58:48 2024 +0800

    Squashed commit of the following:

commit 1a4afaf
Author: negiizhao <[email protected]>
Date:   Sat Dec 3 12:38:15 2022 +0800

    fix names of theorems

commit 96818f2
Author: negiizhao <[email protected]>
Date:   Sat Dec 3 10:26:36 2022 +0800

    change the naming

commit a2742a9
Author: negiizhao <[email protected]>
Date:   Sat Dec 3 10:09:57 2022 +0800

    forgot to edit copyright info

commit 1ee4d5f
Author: negiizhao <[email protected]>
Date:   Fri Dec 2 14:18:08 2022 +0800

    Update Std.lean

commit 758d2fd
Author: negiizhao <[email protected]>
Date:   Fri Dec 2 14:14:19 2022 +0800

    golf

commit a164def
Merge: bae939f e58f162
Author: negiizhao <[email protected]>
Date:   Fri Dec 2 13:20:28 2022 +0800

    Merge branch 'main' of https://github.com/negiizhao/std4

commit bae939f
Author: negiizhao <[email protected]>
Date:   Fri Dec 2 13:18:12 2022 +0800

    feat: pairing heaps
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
awaiting-review This PR is ready for review; the author thinks it is ready to be merged. breaks-mathlib depends on another PR This is stacked on top of another Batteries PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants