aboutsummaryrefslogtreecommitdiff
path: root/theories/Sorting
diff options
context:
space:
mode:
authorHugo Herbelin2020-03-26 08:45:43 +0100
committerHugo Herbelin2020-03-26 08:45:43 +0100
commit84f6394f78baea5b1f261765164ae23cd245a357 (patch)
treed7a0b4da8708f5f261f66c8ccd6ed1c48cafd988 /theories/Sorting
parent1217583de0c7ac0d17c8917f21c30c247176d83f (diff)
parent528dd28a48dd7b1898212e2aae9b43bb19fb91cc (diff)
Merge PR #11891: Fix levels of `<=?` and `<?` in the stdlib
Reviewed-by: herbelin
Diffstat (limited to 'theories/Sorting')
-rw-r--r--theories/Sorting/Mergesort.v3
1 files changed, 1 insertions, 2 deletions
diff --git a/theories/Sorting/Mergesort.v b/theories/Sorting/Mergesort.v
index a761dba62d..e9171cfdb3 100644
--- a/theories/Sorting/Mergesort.v
+++ b/theories/Sorting/Mergesort.v
@@ -259,7 +259,7 @@ Module NatOrder <: TotalLeBool.
| _, 0 => false
| S x', S y' => leb x' y'
end.
- Infix "<=?" := leb (at level 35).
+ Infix "<=?" := leb (at level 70, no associativity).
Theorem leb_total : forall a1 a2, a1 <=? a2 \/ a2 <=? a1.
Proof.
induction a1; destruct a2; simpl; auto.
@@ -269,4 +269,3 @@ End NatOrder.
Module Import NatSort := Sort NatOrder.
Example SimpleMergeExample := Eval compute in sort [5;3;6;1;8;6;0].
-