From 3cf8ecdc70cb295a2b9606080a1c7b5fa8eb16f4 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 14 May 2015 10:55:03 -0500 Subject: Revert multiple commits This reverts multiple commits from Simon: - 04a484eafc9eb9f8774b4bdd41a5dc6c9f640daf Test Trac #10359 - a9ccd37add8315e061c02e5bf26c08f05fad9ac9 Test Trac #10403 - c0aae6f699cbd222d826d0b8d78d6cb3f682079e Test Trac #10248 - eb6ca851f553262efe0824b8dcbe64952de4963d Make the "matchable-given" check happen first - ca173aa30467a0b1023682d573fcd94244d85c50 Add a case to checkValidTyCon - 51cbad15f86fca1d1b0e777199eb1079a1b64d74 Update haddock submodule - 6e1174da5b8e0b296f5bfc8b39904300d04eb5b7 Separate transCloVarSet from fixVarSet - a8493e03b89f3b3bfcdb6005795de050501f5c29 Fix imports in HscMain (stage2) - a154944bf07b2e13175519bafebd5a03926bf105 Two wibbles to fix the build - 5910a1bc8142b4e56a19abea104263d7bb5c5d3f Change in capitalisation of error msg - 130e93aab220bdf14d08028771f83df210da340b Refactor tuple constraints - 8da785d59f5989b9a9df06386d5bd13f65435bc0 Delete commented-out line These break the build by causing Haddock to fail mysteriously when trying to examine GHC.Prim it seems. --- testsuite/tests/partial-sigs/should_compile/T10403.hs | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100644 testsuite/tests/partial-sigs/should_compile/T10403.hs (limited to 'testsuite/tests/partial-sigs/should_compile/T10403.hs') diff --git a/testsuite/tests/partial-sigs/should_compile/T10403.hs b/testsuite/tests/partial-sigs/should_compile/T10403.hs deleted file mode 100644 index a33646da5d..0000000000 --- a/testsuite/tests/partial-sigs/should_compile/T10403.hs +++ /dev/null @@ -1,19 +0,0 @@ -{-# LANGUAGE PartialTypeSignatures #-} -module T10403 where - -data I a = I a -instance Functor I where - fmap f (I a) = I (f a) - -newtype B t a = B a -instance Functor (B t) where - fmap f (B a) = B (f a) - -newtype H f = H (f ()) - -app :: H (B t) -app = h (H . I) (B ()) - -h :: _ => _ ---h :: Functor m => (a -> b) -> m a -> H m -h f b = (H . fmap (const ())) (fmap f b) -- cgit v1.2.1