Commit a154944b authored by Simon Peyton Jones's avatar Simon Peyton Jones

Two wibbles to fix the build

...following the constraint-tuple patch.

* There was interaction with the recent Safe Haskell change
* Haddock comoplained about constraint tuples defined but not used
parent 5910a1bc
......@@ -2026,7 +2026,8 @@ matchClassInst _ clas [ ty ] _
matchClassInst _ clas ts _
| isCTupleClass clas
, let data_con = tyConSingleDataCon (classTyCon clas)
= return (GenInst ts (EvDFunApp (dataConWrapId data_con) ts))
tuple_ev = EvDFunApp (dataConWrapId data_con) ts
= return (GenInst ts tuple_ev True)
-- The dfun is the data constructor!
matchClassInst _ clas [k,t] _
......
......@@ -6,7 +6,12 @@
-- ip :: IP x a => a is strictly speaking ambiguous, but IP is magic
{-# OPTIONS_GHC -fno-warn-unused-imports #-}
-- XXX -fno-warn-unused-imports needed for the GHC.Tuple import below. Sigh.
-- -fno-warn-unused-imports needed for the GHC.Tuple import below. Sigh.
{-# OPTIONS_GHC -fno-warn-unused-top-binds #-}
-- -fno-warn-unused-top-binds is there (I hope) to stop Haddock complaining
-- about the constraint tuples being defined but not used
{-# OPTIONS_HADDOCK hide #-}
-----------------------------------------------------------------------------
-- |
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment