summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Dammers <tdammers@gmail.com>2018-03-20 17:08:01 +0100
committerTobias Dammers <tdammers@gmail.com>2018-03-27 16:27:22 +0200
commit89b87640de8887af9421d88353896551d89bd5ee (patch)
tree6f3bf6539ba5f2f5394e8b7a8e41727a3d1c9b1c
parentcf5cec3619ae52d2cd825a6f291deba251fbbfe6 (diff)
downloadhaskell-89b87640de8887af9421d88353896551d89bd5ee.tar.gz
Fix rebasing mistake
-rw-r--r--compiler/types/TyCoRep.hs4
m---------libraries/array0
2 files changed, 0 insertions, 4 deletions
diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index 48b51510c1..abc932ce73 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -904,10 +904,6 @@ data Coercion
| SymCo Coercion -- :: e -> e
| TransCo Coercion Coercion -- :: e -> e -> e
- -- The number coercions should match exactly the expectations
- -- of the CoAxiomRule (i.e., the rule is fully saturated).
- | AxiomRuleCo CoAxiomRule [Coercion]
-
| NthCo Role Int Coercion -- Zero-indexed; decomposes (T t0 ... tn)
-- :: "e" -> _ -> e0 -> e (inverse of TyConAppCo, see Note [TyConAppCo roles])
-- Using NthCo on a ForAllCo gives an N coercion always
diff --git a/libraries/array b/libraries/array
-Subproject 1d0435f4937f03901e32304e279f46ce19b0f08
+Subproject 9d63218fd067ff4885c0efa43b388238421a5c8