[commit: ghc] wip/tdammers/D4394: Fix rebasing mistake (29f2710)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/tdammers/D4394
Link       : http://ghc.haskell.org/trac/ghc/changeset/29f2710c45fd33c5d09a3a09bfdc4ec9c237fa35/ghc

>---------------------------------------------------------------

commit 29f2710c45fd33c5d09a3a09bfdc4ec9c237fa35
Author: Tobias Dammers <tdammers at gmail.com>
Date:   Tue Mar 20 17:08:01 2018 +0100

    Fix rebasing mistake


>---------------------------------------------------------------

29f2710c45fd33c5d09a3a09bfdc4ec9c237fa35
 compiler/types/TyCoRep.hs | 4 ----
 libraries/array           | 2 +-
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index dccde49..e924e04 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -825,10 +825,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
index 1d0435f..9d63218 160000
--- a/libraries/array
+++ b/libraries/array
@@ -1 +1 @@
-Subproject commit 1d0435f4937f03901e32304e279f46ce19b0f089
+Subproject commit 9d63218fd067ff4885c0efa43b388238421a5c89