Skip to content

[Merged by Bors] - fix: re-port Init/Algebra/Order#4000

Closed
eric-wieser wants to merge 20 commits intomasterfrom
report-init/algebra/order
Closed

[Merged by Bors] - fix: re-port Init/Algebra/Order#4000
eric-wieser wants to merge 20 commits intomasterfrom
report-init/algebra/order

Conversation

@eric-wieser
Copy link
Copy Markdown
Member

@eric-wieser eric-wieser commented May 15, 2023

The ad-hoc port was added in #18, but the #aligns were all missing and two defs were incorrectly promoted to an instance.

The absense of these instances reveals some missing instances that need to be added (and were found via unfolding in Lean 3).


Open in Gitpod

This is needed to faithfully forward-port leanprover-community/mathlib3#18848.

I've removed @denayd from the author list, since the original code was discarded in favor of the mathport output.

@eric-wieser eric-wieser added awaiting-author A reviewer has asked the author a question or requested changes. mathlib-port This is a port of a theory file from mathlib. awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. labels May 15, 2023
@eric-wieser eric-wieser force-pushed the report-init/algebra/order branch from cfbb1a6 to d563d3d Compare May 15, 2023 13:37
@eric-wieser eric-wieser force-pushed the report-init/algebra/order branch from d563d3d to c9b21a3 Compare May 15, 2023 13:43
Comment on lines +136 to +172
instance decidableLT_of_decidableLE [DecidableRel (. ≤ . : α → α → Prop)] :
DecidableRel (. < . : α → α → Prop)
| a, b =>
if hab : a ≤ b then
if hba : b ≤ a then
isFalse $ λ hab' => not_le_of_gt hab' hba
else
isTrue $ lt_of_le_not_le hab hba
else
isFalse $ λ hab' => hab (le_of_lt hab')
/-- `<` is decidable if `≤` is. -/
def decidableLTOfDecidableLE [@DecidableRel α (· ≤ ·)] : @DecidableRel α (· < ·)
| a, b =>
if hab : a ≤ b then
if hba : b ≤ a then isFalse fun hab' => not_le_of_gt hab' hba
else isTrue <| lt_of_le_not_le hab hba
else isFalse fun hab' => hab (le_of_lt hab')
#align decidable_lt_of_decidable_le decidableLTOfDecidableLE
Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

This should not have been an instance

@eric-wieser eric-wieser added awaiting-review and removed awaiting-author A reviewer has asked the author a question or requested changes. labels May 15, 2023
This renames
* `decidable_eq` to `deciableEq`
* `decidable_lt` to `deciableLT`
* `decidable_le` to `deciableLE`
* `decidableLT_of_decidableLE` to `decidableLTOfDecidableLE`
* `decidableEq_of_decidableLE` to `decidableEqOfDecidableLE`
@kim-em kim-em added the blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) label May 15, 2023
@kim-em kim-em removed the blocked-by-other-PR This PR depends on another PR (this label is automatically managed by a bot) label May 15, 2023
@kim-em
Copy link
Copy Markdown
Contributor

kim-em commented May 15, 2023

This PR/issue depends on:

@github-actions github-actions bot removed the awaiting-CI This PR does not pass CI yet. This label is automatically removed once it does. label May 16, 2023
@kim-em
Copy link
Copy Markdown
Contributor

kim-em commented May 16, 2023

bors merge

@github-actions github-actions bot added ready-to-merge This PR has been sent to bors. and removed awaiting-review labels May 16, 2023
bors bot pushed a commit that referenced this pull request May 16, 2023
The ad-hoc port was added in #18, but the `#align`s were all missing and two defs were incorrectly promoted to an instance.

The absense of these instances reveals some missing instances that need to be added (and were found via unfolding in Lean 3).
bors bot pushed a commit that referenced this pull request May 16, 2023
The ad-hoc port was added in #18, but the `#align`s were all missing and two defs were incorrectly promoted to an instance.

The absense of these instances reveals some missing instances that need to be added (and were found via unfolding in Lean 3).
@bors
Copy link
Copy Markdown

bors bot commented May 16, 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 fix: re-port Init/Algebra/Order [Merged by Bors] - fix: re-port Init/Algebra/Order May 16, 2023
@bors bors bot closed this May 16, 2023
@bors bors bot deleted the report-init/algebra/order branch May 16, 2023 15:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

mathlib-port This is a port of a theory file from mathlib. ready-to-merge This PR has been sent to bors.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants