[commit: ghc] master: Fix the name of the Word16ElemRep wired-in datacon (d12166a)

git at git.haskell.org git at git.haskell.org
Mon Mar 14 12:23:28 UTC 2016


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d12166ad905ad8b014d672b9fc3b9a0e10ba80df/ghc

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

commit d12166ad905ad8b014d672b9fc3b9a0e10ba80df
Author: mniip <mniip at mniip.com>
Date:   Sun Mar 13 18:12:55 2016 +0100

    Fix the name of the Word16ElemRep wired-in datacon
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1999


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

d12166ad905ad8b014d672b9fc3b9a0e10ba80df
 compiler/prelude/TysWiredIn.hs   | 2 +-
 testsuite/tests/th/T11145.stderr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index c58bf32..98a5665 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -323,7 +323,7 @@ vecElemTyConName = mkWiredInTyConName UserSyntax gHC_TYPES (fsLit "VecElem") vec
 vecElemDataConNames :: [Name]
 vecElemDataConNames = zipWith3Lazy mk_special_dc_name
                         [ fsLit "Int8ElemRep", fsLit "Int16ElemRep", fsLit "Int32ElemRep"
-                        , fsLit "Int64ElemRep", fsLit "Word8ElemRep", fsLit "Word16elemRep"
+                        , fsLit "Int64ElemRep", fsLit "Word8ElemRep", fsLit "Word16ElemRep"
                         , fsLit "Word32ElemRep", fsLit "Word64ElemRep"
                         , fsLit "FloatElemRep", fsLit "DoubleElemRep" ]
                         vecElemDataConKeys
diff --git a/testsuite/tests/th/T11145.stderr b/testsuite/tests/th/T11145.stderr
index 98e518c..d198739 100644
--- a/testsuite/tests/th/T11145.stderr
+++ b/testsuite/tests/th/T11145.stderr
@@ -3,6 +3,6 @@ T11145.hs:8:1: error:
     • Data constructor ‘MkFuggle’ returns type ‘Fuggle
                                                   Int (Maybe Bool)’
         instead of an instance of its parent type ‘Fuggle
-                                                     Int (Maybe (a_a4MU, b_a4MV))’
+                                                     Int (Maybe (a_a4MT, b_a4MU))’
     • In the definition of data constructor ‘MkFuggle’
       In the data instance declaration for ‘Fuggle’



More information about the ghc-commits mailing list