From git at git.haskell.org  Tue Dec  1 02:07:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 02:07:51 +0000 (UTC)
Subject: [commit: ghc] master: MkId: Typos in comments (afb7213)
Message-ID: <20151201020751.1FB643A300@ghc.haskell.org>

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

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

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

commit afb721390cd506f09ce9f04aa3fb19324c2ae5a0
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Mon Nov 30 21:07:24 2015 -0500

    MkId: Typos in comments


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

afb721390cd506f09ce9f04aa3fb19324c2ae5a0
 compiler/basicTypes/MkId.hs | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/compiler/basicTypes/MkId.hs b/compiler/basicTypes/MkId.hs
index 989d797..8223f33 100644
--- a/compiler/basicTypes/MkId.hs
+++ b/compiler/basicTypes/MkId.hs
@@ -106,7 +106,7 @@ There are several reasons why an Id might appear in the wiredInIds:
     result type. -- sof 1/99]
 
 (3) Other error functions (rUNTIME_ERROR_ID) are wired in (a) because
-    the desugarer generates code that mentiones them directly, and
+    the desugarer generates code that mentions them directly, and
     (b) for the same reason as eRROR_ID
 
 (4) lazyId is wired in because the wired-in version overrides the
@@ -390,7 +390,7 @@ mkDataConWorkId wkr_name data_con
         -- even if the data constructor is declared strict
         --      e.g.    data T = MkT !(Int,Int)
         -- Why?  Because the *wrapper* is strict (and its unfolding has case
-        -- expresssions that do the evals) but the *worker* itself is not.
+        -- expressions that do the evals) but the *worker* itself is not.
         -- If we pretend it is strict then when we see
         --      case x of y -> $wMkT y
         -- the simplifier thinks that y is "sure to be evaluated" (because
@@ -655,7 +655,7 @@ dataConSrcToImplBang dflags fam_envs arg_ty
   = HsStrict
 
 
--- | Wrappers/Workser and representation following Unpack/Strictness
+-- | Wrappers/Workers and representation following Unpack/Strictness
 -- decisions
 dataConArgRep
   :: Type
@@ -820,7 +820,7 @@ Because then we'd get an infinite number of arguments.
 Here is a more complicated case:
         data S = MkS {-# UNPACK #-} !T Int
         data T = MkT {-# UNPACK #-} !S Int
-Each of S and T must decide independendently whether to unpack
+Each of S and T must decide independently whether to unpack
 and they had better not both say yes. So they must both say no.
 
 Also behave conservatively when there is no UNPACK pragma
@@ -835,7 +835,7 @@ because Int is non-recursive.
 
 Note [Unpack equality predicates]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-If we have a GADT with a contructor C :: (a~[b]) => b -> T a
+If we have a GADT with a constructor C :: (a~[b]) => b -> T a
 we definitely want that equality predicate *unboxed* so that it
 takes no space at all.  This is easily done: just give it
 an UNPACK pragma. The rest of the unpack/repack code does the
@@ -993,7 +993,7 @@ mkFCallId dflags uniq fcall ty
 
     strict_sig      = mkClosedStrictSig (replicate arity topDmd) topRes
     -- the call does not claim to be strict in its arguments, since they
-    -- may be lifted (foreign import prim) and the called code doen't
+    -- may be lifted (foreign import prim) and the called code doesn't
     -- necessarily force them. See Trac #11076.
 {-
 ************************************************************************


From git at git.haskell.org  Tue Dec  1 09:51:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 09:51:53 +0000 (UTC)
Subject: [commit: ghc] master: Build system: Add stage specific
 SRC_HC_(WARNING_)OPTS (14d0f7f)
Message-ID: <20151201095153.92C523A300@ghc.haskell.org>

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

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

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

commit 14d0f7f1221db758cd06a69f53803d9d0150164a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Nov 30 12:35:58 2015 +0100

    Build system: Add stage specific SRC_HC_(WARNING_)OPTS
    
    * Add stage specific versions of SRC_HC_OPTS. These are currently only
      used for -Werror. The previous combination of GhcStage2HcOpts and
      GhcLibHcOpts didn't apply to utils/*.
    
    * Add stage specific versions of SRC_HC_WARNING_OPTS. These will later be
      used for new warning supression flags that should not be passed to the
      bootstrap compiler.
    
    * Move -Wall (and -Werror) related code back to mk/warnings.mk, where it
      was before 987d54274. Now all warning related code is nicely together.
      Include mk/warnings.mk after mk/custom-settings.mk to make this work.
    
    Reviewed By: bgamari, hvr
    
    Differential Revision: https://phabricator.haskell.org/D1536


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

14d0f7f1221db758cd06a69f53803d9d0150164a
 ghc.mk                        | 17 +++++----------
 mk/config.mk.in               | 49 +++++++++++++++++++++++++++++++++++--------
 mk/warnings.mk                | 44 ++++++++++++++++++++++++++++++--------
 rules/distdir-way-opts.mk     | 19 ++++++++++++++++-
 utils/mkUserGuidePart/Main.hs |  5 -----
 5 files changed, 98 insertions(+), 36 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 14d0f7f1221db758cd06a69f53803d9d0150164a

From git at git.haskell.org  Tue Dec  1 11:15:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 11:15:47 +0000 (UTC)
Subject: [commit: ghc] master: Fix grammar and typo in TcTyDecls (6dce643)
Message-ID: <20151201111547.AAFC73A300@ghc.haskell.org>

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

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

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

commit 6dce643d1981f1ecba2b38f5932720385999244b
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Mon Nov 30 08:44:27 2015 -0800

    Fix grammar and typo in TcTyDecls
    
    Summary: It's just a docufix.
    
    Test Plan: just a docufix
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1550


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

6dce643d1981f1ecba2b38f5932720385999244b
 compiler/typecheck/TcTyDecls.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/typecheck/TcTyDecls.hs b/compiler/typecheck/TcTyDecls.hs
index 88b0df9..73b3a0b 100644
--- a/compiler/typecheck/TcTyDecls.hs
+++ b/compiler/typecheck/TcTyDecls.hs
@@ -996,9 +996,9 @@ like     sel :: T [a] -> a
 
 For naughty selectors we make a dummy binding
    sel = ()
-for naughty selectors, so that the later type-check will add them to the
-environment, and they'll be exported.  The function is never called, because
-the tyepchecker spots the sel_naughty field.
+so that the later type-check will add them to the environment, and they'll be
+exported.  The function is never called, because the typechecker spots the
+sel_naughty field.
 
 Note [GADT record selectors]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~


From git at git.haskell.org  Tue Dec  1 12:59:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 12:59:12 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Comment cleanups (7b96954)
Message-ID: <20151201125912.EB4C93A300@ghc.haskell.org>

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

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/7b9695427d4acfe31ef58d4ed4b8b0d63f908597/ghc

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

commit 7b9695427d4acfe31ef58d4ed4b8b0d63f908597
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Tue Dec 1 14:59:27 2015 +0200

    Comment cleanups


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

7b9695427d4acfe31ef58d4ed4b8b0d63f908597
 compiler/deSugar/DsMeta.hs         |  1 -
 compiler/parser/Parser.y           |  1 -
 compiler/parser/RdrHsSyn.hs        | 43 +++++---------------------------------
 compiler/rename/RnSource.hs        | 23 --------------------
 compiler/typecheck/TcTyClsDecls.hs | 18 +---------------
 5 files changed, 6 insertions(+), 80 deletions(-)

diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index faac397..48c4126 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -662,7 +662,6 @@ repC tvs (L _ (ConDeclGADT { con_names = cons
          addTyVarBinds ex_tvs $ \ ex_bndrs ->   -- Binds the remaining con_tvs
     do { cons1 <- mapM lookupLOcc cons -- See Note [Binders and occurrences]
        ; let (details,res_ty',_,_) = gadtDeclDetails res_ty
-       -- AZ: Is this doc context appropriate?
        ; let doc = ptext (sLit "In the constructor for ") <+> ppr (head cons)
        ; (hs_details,_res_ty) <- update_con_result doc details res_ty'
        ; c'        <- mapM (\c -> repConstr c hs_details) cons1
diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index b95c415..bbde989 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -2670,7 +2670,6 @@ stmtlist :: { Located ([AddAnn],[LStmt RdrName (LHsExpr RdrName)]) }
 -- here, because we need too much lookahead if we see do { e ; }
 -- So we use BodyStmts throughout, and switch the last one over
 -- in ParseUtils.checkDo instead
--- AZ: TODO check that we can retrieve multiple semis.
 
 stmts :: { Located ([AddAnn],[LStmt RdrName (LHsExpr RdrName)]) }
         : stmts ';' stmt  {% if null (snd $ unLoc $1)
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index b3175dd..70be8e5 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -508,39 +508,6 @@ mkGadtDecl names ty = ConDeclGADT { con_names = names
                                   , con_type  = ty
                                   , con_doc   = Nothing }
 
-{-
-mkGadtDecl' :: [Located RdrName]
-            -> LHsSigType RdrName
-            -> ConDecl RdrName
--- We allow C,D :: ty
--- and expand it as if it had been
---    C :: ty; D :: ty
--- (Just like type signatures in general.)
-
-mkGadtDecl' names lbody_ty@(L loc body_ty)
-  = mk_gadt_con names
-  where
-    (tvs, cxt, tau) = splitLHsSigmaTy lbody_ty
-    (details, res_ty)           -- See Note [Sorting out the result type]
-      = case tau of
-          L _ (HsFunTy (L l (HsRecTy flds)) res_ty)
-                  -> (RecCon (L l flds), res_ty)
-          _other  -> (PrefixCon [], tau)
-
-    explicit = case body_ty of
-                 HsForAllTy {} -> True
-                 _             -> False
-
-    mk_gadt_con names
-       = ConDecl { con_names    = names
-                 , con_explicit = explicit
-                 , con_qvars    = mkHsQTvs tvs
-                 , con_cxt      = cxt
-                 , con_details  = details
-                 , con_res      = ResTyGADT loc res_ty
-                 , con_doc      = Nothing }
--}
-
 -- AZ:TODO: this probably belongs in a different module
 gadtDeclDetails :: LHsSigType name
                 -> (HsConDeclDetails name,LHsType name,LHsContext name,[LHsTyVarBndr name])
@@ -652,19 +619,19 @@ really doesn't matter!
 
 -- | Note [Sorting out the result type]
 -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- In a GADT declaration which is not a record, we put the whole constr
--- type into the ResTyGADT for now; the renamer will unravel it once it
--- has sorted out operator fixities. Consider for example
+-- In a GADT declaration which is not a record, we put the whole constr type
+-- into the res_ty for a ConDeclGADT for now; the renamer will unravel it once
+-- it has sorted out operator fixities. Consider for example
 --      C :: a :*: b -> a :*: b -> a :+: b
 -- Initially this type will parse as
 --       a :*: (b -> (a :*: (b -> (a :+: b))))
-
+--
 -- so it's hard to split up the arguments until we've done the precedence
 -- resolution (in the renamer) On the other hand, for a record
 --         { x,y :: Int } -> a :*: b
 -- there is no doubt.  AND we need to sort records out so that
 -- we can bring x,y into scope.  So:
---    * For PrefixCon we keep all the args in the ResTyGADT
+--    * For PrefixCon we keep all the args in the res_ty
 --    * For RecCon we do not
 
 checkTyVarsP :: SDoc -> SDoc -> Located RdrName -> [LHsType RdrName] -> P (LHsQTyVars RdrName)
diff --git a/compiler/rename/RnSource.hs b/compiler/rename/RnSource.hs
index d1de338..fb6ab27 100644
--- a/compiler/rename/RnSource.hs
+++ b/compiler/rename/RnSource.hs
@@ -1506,29 +1506,6 @@ modules), we get better error messages, too.
 \subsection{Support code for type/data declarations}
 *                                                      *
 *********************************************************
-
-Note [Quantification in data constructor declarations]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Four cases, afer renaming
-  * ResTyH98
-     - data T a = forall b. MkT { x :: b -> a }
-       The 'b' is explicitly declared;
-       con_qvars = [b]
-
-     - data T a = MkT { x :: a -> b }
-       Do *not* implicitly quantify over 'b'; it is
-       simply out of scope.  con_qvars = []
-
-  * ResTyGADT
-     - data T a where { MkT :: forall b. (b -> a) -> T a }
-       con_qvars = [a,b]
-
-     - data T a where { MkT :: (b -> a) -> T a }
-       con_qvars = [a,b], by implicit quantification
-                          of the type signature
-       It is uncomfortable that we add implicitly-bound
-       type variables to the HsQTyVars, which usually
-       only has explicitly-bound type variables
 -}
 
 ---------------
diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 489b94c..57960d7 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -1274,12 +1274,6 @@ tcConDecl new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
                  ; return (ctxt, arg_tys, field_lbls, stricts)
                  }
 
-             -- Generalise the kind variables (returning quantified TcKindVars)
-             -- and quantify the type variables (substituting their kinds)
-             -- REMEMBER: 'tkvs' are:
-             --    ResTyH98:  the *existential* type variables only
-             --    ResTyGADT: *all* the quantified type variables
-             -- c.f. the comment on con_qvars in HsDecls
        ; tkvs <- quantifyTyVars (mkVarSet tmpl_tvs) (tyVarsOfTypes (ctxt++arg_tys))
 
              -- Zonk to Types
@@ -1321,16 +1315,6 @@ tcConDecl _new_or_data is_prom rep_tycon tmpl_tvs res_tmpl
                        , con_type = ty@(HsIB { hsib_kvs = _kvs, hsib_tvs = _tvs, hsib_body = _bty}) })
   = addErrCtxt (dataConCtxtName names) $
     do { traceTc "tcConDecl 1" (ppr names)
-       {-
-        AZ:TODO:not sure where this comment now belongs:
-
-             -- Generalise the kind variables (returning quantified TcKindVars)
-             -- and quantify the type variables (substituting their kinds)
-             -- REMEMBER: 'tkvs' are:
-             --    ResTyH98:  the *existential* type variables only
-             --    ResTyGADT: *all* the quantified type variables
-             -- c.f. the comment on con_qvars in HsDecls
-       -}
        ; (ctxt, stricts, field_lbls, arg_tys, res_ty,hs_details)
            <- tcGadtSigType (ppr names) (unLoc $ head names) ty
        ; tkvs <- quantifyTyVars emptyVarSet (tyVarsOfTypes (res_ty:ctxt++arg_tys))
@@ -1583,7 +1567,7 @@ data SList s as where
 We call tcResultType with
   tmpl_tvs = [(k :: BOX), (s :: k -> *), (as :: List k)]
   res_tmpl = SList k s as
-  res_ty = ResTyGADT (SList k1 (s1 :: k1 -> *) (Nil k1))
+  res_ty = (SList k1 (s1 :: k1 -> *) (Nil k1))
 
 We get subst:
   k -> k1


From git at git.haskell.org  Tue Dec  1 12:59:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 12:59:35 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (d5d2338)
Message-ID: <20151201125935.BA6C53A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/d5d233848a527b93f1acf386666da0d2b545a307/ghc

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

commit d5d233848a527b93f1acf386666da0d2b545a307
Merge: 0c60c0e 290def7
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Nov 30 14:10:58 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
    
    Conflicts:
    	compiler/hsSyn/HsTypes.hs
    	compiler/rename/RnSplice.hs
    	testsuite/tests/ghci/scripts/T10248.stderr
    	testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
    	testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr



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

d5d233848a527b93f1acf386666da0d2b545a307
 compiler/hsSyn/HsTypes.hs                          |  16 ++
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs            |  10 ++
 compiler/main/DynFlags.hs                          |  33 +++-
 compiler/main/Packages.hs                          |  16 ++
 compiler/parser/Lexer.x                            |  26 +--
 compiler/prelude/PrelNames.hs                      |  29 ++-
 compiler/rename/RnSplice.hs                        |  28 +--
 compiler/simplCore/CoreMonad.hs                    |   2 +-
 compiler/simplCore/SimplCore.hs                    |   9 +-
 compiler/typecheck/TcErrors.hs                     |   9 +
 compiler/typecheck/TcRnDriver.hs                   | 196 ++++++++++++++++++++-
 compiler/typecheck/TcTyClsDecls.hs                 |  23 ++-
 compiler/utils/OrdList.hs                          |   9 +
 compiler/utils/UniqFM.hs                           |   9 +
 docs/users_guide/7.12.1-notes.rst                  |  16 +-
 docs/users_guide/glasgow_exts.rst                  |  13 +-
 docs/users_guide/using-warnings.rst                |  18 +-
 ghc/GhciMonad.hs                                   |  14 +-
 ghc/InteractiveUI.hs                               | 167 +++++++++++-------
 libraries/base/GHC/ExecutionStack.hs               |   5 +-
 libraries/base/GHC/ExecutionStack/Internal.hsc     |  14 +-
 libraries/base/Text/ParserCombinators/ReadP.hs     |   7 -
 libraries/base/Text/ParserCombinators/ReadPrec.hs  |   5 -
 rts/LibdwPool.c                                    |  19 +-
 rts/Pool.c                                         |  41 +++--
 rts/Pool.h                                         |  10 +-
 testsuite/tests/cabal/cabal07/cabal07.stderr       |   2 +-
 testsuite/tests/driver/T10970.stdout               |   2 +-
 testsuite/tests/driver/T4437.hs                    |   1 +
 testsuite/tests/ghci/scripts/T10248.stderr         |   0
 .../tests/indexed-types/should_fail/T11136.hs      |   7 +
 .../tests/indexed-types/should_fail/T11136.stderr  |   5 +
 testsuite/tests/indexed-types/should_fail/all.T    |   1 +
 testsuite/tests/package/package01e.stderr          |   4 +-
 testsuite/tests/quasiquotation/qq008/Test.hs       |   2 +-
 testsuite/tests/quasiquotation/qq008/qq008.stderr  |   4 -
 testsuite/tests/quotes/T10384.hs                   |   2 +-
 testsuite/tests/quotes/all.T                       |   2 +-
 .../safeHaskell/safeLanguage/SafeLang12.stderr     |  11 +-
 testsuite/tests/{ado => semigroup}/Makefile        |   0
 testsuite/tests/semigroup/SemigroupWarnings.hs     |  34 ++++
 testsuite/tests/semigroup/SemigroupWarnings.stderr |   8 +
 testsuite/tests/semigroup/all.T                    |   1 +
 .../should_fail/CustomTypeErrors02.stderr          |   4 +-
 .../tests/wcompat-warnings/WCompatWarningsNotOn.hs |   2 +
 .../tests/wcompat-warnings/WCompatWarningsOff.hs   |   2 +
 .../tests/wcompat-warnings/WCompatWarningsOn.hs    |   2 +
 .../wcompat-warnings/WCompatWarningsOn.stderr      |   6 +-
 .../tests/wcompat-warnings/WCompatWarningsOnOff.hs |   2 +
 utils/ghc-pkg/Main.hs                              |   2 +
 utils/mkUserGuidePart/Options/Language.hs          |   7 +
 utils/mkUserGuidePart/Options/Warnings.hs          |  11 +-
 52 files changed, 681 insertions(+), 187 deletions(-)

diff --cc compiler/hsSyn/HsTypes.hs
index 9134f39,eda643c..228df71
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@@ -87,6 -86,13 +87,13 @@@ import Maybes( isJust 
  
  import Data.Data hiding ( Fixity )
  import Data.Maybe ( fromMaybe )
+ #if __GLASGOW_HASKELL__ < 709
 -import Data.Monoid hiding ((<>))
++import Data.Monoid hiding((<>))
+ #endif
 -#if __GLASGOW_HASKELL__ > 710
++#if __GLASGOW_HASKELL > 710
+ import Data.Semigroup   ( Semigroup )
+ import qualified Data.Semigroup as Semigroup
+ #endif
  
  {-
  ************************************************************************
@@@ -205,17 -164,34 +212,26 @@@ data LHsQTyVars name   -- See Note [HsT
               -- See Note [HsForAllTy tyvar binders]
      }
    deriving( Typeable )
 -deriving instance (DataId name) => Data (LHsTyVarBndrs name)
  
 -mkHsQTvs :: [LHsTyVarBndr RdrName] -> LHsTyVarBndrs RdrName
 --- Just at RdrName because in the Name variant we should know just
 --- what the kind-variable binders are; and we don't
 --- We put an empty list (rather than a panic) for the kind vars so
 --- that the pretty printer works ok on them.
 -mkHsQTvs tvs = HsQTvs { hsq_kvs = [], hsq_tvs = tvs }
 +deriving instance (DataId name) => Data (LHsQTyVars name)
  
 -emptyHsQTvs :: LHsTyVarBndrs name   -- Use only when you know there are no kind binders
 -emptyHsQTvs =  HsQTvs { hsq_kvs = [], hsq_tvs = [] }
 +mkHsQTvs :: [LHsTyVarBndr RdrName] -> LHsQTyVars RdrName
 +mkHsQTvs tvs = HsQTvs { hsq_kvs = PlaceHolder, hsq_tvs = tvs }
  
 -hsQTvBndrs :: LHsTyVarBndrs name -> [LHsTyVarBndr name]
 +hsQTvBndrs :: LHsQTyVars name -> [LHsTyVarBndr name]
  hsQTvBndrs = hsq_tvs
  
 -#if __GLASGOW_HASKELL__ > 710
+ instance Semigroup (LHsTyVarBndrs name) where
+   HsQTvs kvs1 tvs1 <> HsQTvs kvs2 tvs2
+     = HsQTvs (kvs1 ++ kvs2) (tvs1 ++ tvs2)
 -#endif
+ 
+ instance Monoid (LHsTyVarBndrs name) where
+   mempty = emptyHsQTvs
+   mappend (HsQTvs kvs1 tvs1) (HsQTvs kvs2 tvs2)
+     = HsQTvs (kvs1 ++ kvs2) (tvs1 ++ tvs2)
+ 
  ------------------------------------------------
 ---            HsWithBndrs
 +--            HsImplicitBndrs
  -- Used to quantify the binders of a type in cases
  -- when a HsForAll isn't appropriate:
  --    * Patterns in a type/data family instance (HsTyPats)
diff --cc compiler/rename/RnSplice.hs
index 8c84e3d,2093312..3c7695b
--- a/compiler/rename/RnSplice.hs
+++ b/compiler/rename/RnSplice.hs
@@@ -44,7 -45,7 +44,6 @@@ import Hook
  import Var              ( Id )
  import THNames          ( quoteExpName, quotePatName, quoteDecName, quoteTypeName
                          , decsQTyConName, expQTyConName, patQTyConName, typeQTyConName, )
- import Util
 -import RnTypes          ( collectWildCards )
  
  import {-# SOURCE #-} TcExpr   ( tcMonoExpr )
  import {-# SOURCE #-} TcSplice ( runMetaD, runMetaE, runMetaP, runMetaT, tcTopSpliceExpr )


From git at git.haskell.org  Tue Dec  1 12:59:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 12:59:38 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Wibbles (57b995b)
Message-ID: <20151201125938.6018C3A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/57b995b83bc6f3483c0322fc13043e73e7f7e4ee/ghc

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

commit 57b995b83bc6f3483c0322fc13043e73e7f7e4ee
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 1 12:47:13 2015 +0000

    Wibbles


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

57b995b83bc6f3483c0322fc13043e73e7f7e4ee
 compiler/hsSyn/HsTypes.hs                          | 32 +++++++++++++++-------
 compiler/rename/RnTypes.hs                         | 22 ---------------
 testsuite/tests/ghci/scripts/T10248.stderr         | 30 +++++++++-----------
 .../should_fail/CustomTypeErrors02.stderr          |  2 +-
 .../wcompat-warnings/WCompatWarningsOn.stderr      |  2 +-
 5 files changed, 37 insertions(+), 51 deletions(-)

diff --git a/compiler/hsSyn/HsTypes.hs b/compiler/hsSyn/HsTypes.hs
index 228df71..f7883f2 100644
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@ -88,7 +88,8 @@ import Maybes( isJust )
 import Data.Data hiding ( Fixity )
 import Data.Maybe ( fromMaybe )
 #if __GLASGOW_HASKELL__ < 709
-import Data.Monoid hiding((<>))
+-- SPJ temp
+-- import Data.Monoid hiding((<>))
 #endif
 #if __GLASGOW_HASKELL > 710
 import Data.Semigroup   ( Semigroup )
@@ -202,7 +203,7 @@ type LHsKind name = Located (HsKind name)
 --------------------------------------------------
 --             LHsQTyVars
 --  The explicitly-quantified binders in a data/type declaration
-
+SQua
 type LHsTyVarBndr name = Located (HsTyVarBndr name)
                          -- See Note [HsType binders]
 
@@ -221,14 +222,18 @@ mkHsQTvs tvs = HsQTvs { hsq_kvs = PlaceHolder, hsq_tvs = tvs }
 hsQTvBndrs :: LHsQTyVars name -> [LHsTyVarBndr name]
 hsQTvBndrs = hsq_tvs
 
+{-
+#if __GLASGOW_HASKELL__ > 710
 instance Semigroup (LHsTyVarBndrs name) where
   HsQTvs kvs1 tvs1 <> HsQTvs kvs2 tvs2
     = HsQTvs (kvs1 ++ kvs2) (tvs1 ++ tvs2)
+#endif
 
-instance Monoid (LHsTyVarBndrs name) where
-  mempty = emptyHsQTvs
+instance Monoid (LHsQTyVars name) where
+  mempty = mkHsQTvs []
   mappend (HsQTvs kvs1 tvs1) (HsQTvs kvs2 tvs2)
     = HsQTvs (kvs1 ++ kvs2) (tvs1 ++ tvs2)
+-}
 
 ------------------------------------------------
 --            HsImplicitBndrs
@@ -247,12 +252,19 @@ data HsImplicitBndrs name thing   -- See Note [HsType binders]
   deriving (Typeable)
 
 data HsWildCardBndrs name thing   -- See Note [HsType binders]
-  = HsWC { hswc_wcs :: PostRn name [Name] -- Wild cards
-         , hswc_ctx :: Maybe SrcSpan     -- Indicates whether hswc_body has an
-                                         -- extra-constraint wildcard, and if so where
-                                         --    e.g.  (Eq a, _) => a -> a
-                                         -- NB: the wildcard stays in the type
-         , hswc_body :: thing }  -- Main payload (type or list of types)
+  = HsWC { hswc_wcs :: PostRn name [Name]
+                -- Wild cards, both named and anonymous
+
+         , hswc_ctx :: Maybe SrcSpan
+                -- Indicates whether hswc_body has an
+                -- extra-constraint wildcard, and if so where
+                --    e.g.  (Eq a, _) => a -> a
+                -- NB: the wildcard stays in HsQualTy inside the type!
+                -- So for pretty printing purposes you can ignore
+                -- hswc_ctx
+
+         , hswc_body :: thing  -- Main payload (type or list of types)
+    }
   deriving( Typeable )
 
 deriving instance (Data name, Data thing, Data (PostRn name [Name]))
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index 90aa942..49b707c 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -178,28 +178,6 @@ rnWcSigContext ctxt (L loc hs_ctxt)
                       , hswc_ctx = Nothing
                       , hswc_body = L loc hs_ctxt' }, fvs) }
 
-{- Note [Error checkingp for wildcards]
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Here is how various wildcard-related errors are reported
-
-* Named extra-constraints wild cards aren't allowed,
-  e.g. invalid: @(Show a, _x) => a -> String at .
-
-* There is only one extra-constraints wild card in the context and it must
-  come last, e.g. invalid: @(_, Show a) => a -> String@
-  or @(_, Show a, _) => a -> String at .
-
-* There should be no unnamed wild cards in the context.
-
-* An extra-constraints wild card can only occur in the top-level context.
-  This would be invalid: @(Eq a, _) => a -> (Num a, _) => a -> Bool at .
-
-* Named wild cards occurring in the context must also occur in the monotype.
-
-When an invalid wild card is found, we fail with an error.
-
-????? What about f :: (forall a. (Eq _) => a -> a -> Bool) -> Int
--}
 
 {- ******************************************************
 *                                                       *
diff --git a/testsuite/tests/ghci/scripts/T10248.stderr b/testsuite/tests/ghci/scripts/T10248.stderr
index 9235aec..c9df22b 100644
--- a/testsuite/tests/ghci/scripts/T10248.stderr
+++ b/testsuite/tests/ghci/scripts/T10248.stderr
@@ -1,18 +1,14 @@
 
-<interactive>:2:10: warning:
-    Found hole: _ :: IO ()
-    In the second argument of ?(<$>)?, namely ?_?
-    In the first argument of ?ghciStepIO ::
-                                forall a. IO a -> IO a?, namely
-      ?Just <$> _?
-    In a stmt of an interactive GHCi command:
-      it <- ghciStepIO :: forall a. IO a -> IO a (Just <$> _)
-*** Exception: <interactive>:2:10: error:
-    Found hole: _ :: IO ()
-    In the second argument of ?(<$>)?, namely ?_?
-    In the first argument of ?ghciStepIO ::
-                                forall a. IO a -> IO a?, namely
-      ?Just <$> _?
-    In a stmt of an interactive GHCi command:
-      it <- ghciStepIO :: forall a. IO a -> IO a (Just <$> _)
-(deferred type error)
+<interactive>:2:10: error:
+    ? Found hole: _ :: f a
+      Where: ?f? is a rigid type variable bound by
+               the inferred type of it :: Functor f => f (Maybe a)
+               at <interactive>:2:1
+             ?a? is a rigid type variable bound by
+               the inferred type of it :: Functor f => f (Maybe a)
+               at <interactive>:2:1
+    ? In the second argument of ?(<$>)?, namely ?_?
+      In the expression: Just <$> _
+      In an equation for ?it?: it = Just <$> _
+    ? Relevant bindings include
+        it :: f (Maybe a) (bound at <interactive>:2:1)
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
index 02ae259..464c62d 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -1,7 +1,7 @@
 
 CustomTypeErrors02.hs:17:1: error:
     ? The type 'a_aEN -> a_aEN' cannot be represented as an integer.
-    ? When checking that ?err? has the inferred type
+    ? When checking the inferred type
         err :: (TypeError ...)
 
 CustomTypeErrors02.hs:17:7: error:
diff --git a/testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr b/testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr
index 23d1a28..7b6b501 100644
--- a/testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr
+++ b/testsuite/tests/wcompat-warnings/WCompatWarningsOn.stderr
@@ -6,7 +6,7 @@ WCompatWarningsOn.hs:11:5: warning:
       from the context: Monad m
         bound by the type signature for:
                    monadFail :: Monad m => m a
-        at WCompatWarningsOn.hs:9:14-27
+        at WCompatWarningsOn.hs:9:1-27
       Possible fix:
         add (MonadFail m) to the context of
           the type signature for:


From git at git.haskell.org  Tue Dec  1 12:59:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 12:59:41 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor: Merge remote-tracking branch
 'origin/master' into wip/spj-wildcard-refactor (744d4b0)
Message-ID: <20151201125941.C093E3A300@ghc.haskell.org>

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

On branch  : wip/spj-wildcard-refactor
Link       : http://ghc.haskell.org/trac/ghc/changeset/744d4b0086f9aac866b98227158a41125153e1e4/ghc

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

commit 744d4b0086f9aac866b98227158a41125153e1e4
Merge: 57b995b 6dce643
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 1 12:48:32 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor



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

744d4b0086f9aac866b98227158a41125153e1e4
 compiler/basicTypes/MkId.hs     | 12 +++++-----
 compiler/hsSyn/HsTypes.hs       |  2 +-
 compiler/typecheck/TcTyDecls.hs |  6 ++---
 ghc.mk                          | 17 +++++---------
 mk/config.mk.in                 | 49 +++++++++++++++++++++++++++++++++--------
 mk/warnings.mk                  | 44 ++++++++++++++++++++++++++++--------
 rules/distdir-way-opts.mk       | 19 +++++++++++++++-
 utils/mkUserGuidePart/Main.hs   |  5 -----
 8 files changed, 108 insertions(+), 46 deletions(-)

diff --cc compiler/hsSyn/HsTypes.hs
index f7883f2,eda643c..ed4c3be
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@@ -201,14 -153,13 +201,14 @@@ type LHsKind name = Located (HsKind nam
        -- For details on above see note [Api annotations] in ApiAnnotation
  
  --------------------------------------------------
 ---             LHsTyVarBndrs
 ---  The quantified binders in a HsForallTy
 +--             LHsQTyVars
 +--  The explicitly-quantified binders in a data/type declaration
- SQua
+ 
  type LHsTyVarBndr name = Located (HsTyVarBndr name)
 +                         -- See Note [HsType binders]
  
 -data LHsTyVarBndrs name
 -  = HsQTvs { hsq_kvs :: [Name]                  -- Kind variables
 +data LHsQTyVars name   -- See Note [HsType binders]
 +  = HsQTvs { hsq_kvs :: PostRn name [Name]      -- Kind variables
             , hsq_tvs :: [LHsTyVarBndr name]     -- Type variables
               -- See Note [HsForAllTy tyvar binders]
      }


From git at git.haskell.org  Tue Dec  1 12:59:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 12:59:44 +0000 (UTC)
Subject: [commit: ghc] wip/spj-wildcard-refactor's head updated: Merge
 remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
 (744d4b0)
Message-ID: <20151201125944.168BE3A300@ghc.haskell.org>

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

Branch 'wip/spj-wildcard-refactor' now includes:

     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     d5d2338 Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     57b995b Wibbles
     744d4b0 Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor

From git at git.haskell.org  Tue Dec  1 14:22:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 14:22:43 +0000 (UTC)
Subject: [commit: ghc] wip/T11028: Refactor ConDecl (410b647)
Message-ID: <20151201142243.B30E33A300@ghc.haskell.org>

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

On branch  : wip/T11028
Link       : http://ghc.haskell.org/trac/ghc/changeset/410b6477ce9396555900b46f740515a432171524/ghc

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

commit 410b6477ce9396555900b46f740515a432171524
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Refactor ConDecl
    
    The ConDecl type in HsDecls is an uneasy compromise. For the most part,
    HsSyn directly reflects the syntax written by the programmer; and that
    gives just the right "pegs" on which to hang Alan's API annotations. But
    ConDecl doesn't properly reflect the syntax of Haskell-98 and GADT-style
    data type declarations.
    
    To be concrete, here's a draft new data type
    
    data ConDecl name
      | ConDeclGADT
          { con_names   :: [Located name]
          , con_type    :: LHsSigType name  -- The type after the ?::?
          , con_doc     :: Maybe LHsDocString }
    
      | ConDeclH98
          { con_name    :: Located name
    
          , con_qvars     :: Maybe (LHsQTyVars name)
            -- User-written forall (if any), and its implicit
            -- kind variables
            -- Non-Nothing needs -XExistentialQuantification
    
          , con_cxt       :: Maybe (LHsContext name)
            -- ^ User-written context (if any)
    
          , con_details   :: HsConDeclDetails name
              -- ^ Arguments
    
          , con_doc       :: Maybe LHsDocString
              -- ^ A possible Haddock comment.
          } deriving (Typeable)
    
    Note that
    
        For GADTs, just keep a type. That's what the user writes.
        NB:HsType can represent records on the LHS of an arrow:
    
          { x:Int,y:Bool} -> T
    
        con_qvars and con_cxt are both Maybe because they are both
        optional (the forall and the context of an existential data type
    
        For ConDeclGADT the type variables of the data type do not scope
        over the con_type; whereas for ConDeclH98 they do scope over con_cxt
        and con_details.
    
    Trac issue: #11028


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

410b6477ce9396555900b46f740515a432171524
 compiler/deSugar/DsMeta.hs                         |  89 ++++++++--
 compiler/hsSyn/Convert.hs                          |  17 +-
 compiler/hsSyn/HsDecls.hs                          | 133 +++++---------
 compiler/hsSyn/HsTypes.hs                          |   4 +-
 compiler/hsSyn/HsUtils.hs                          |  19 +-
 compiler/parser/Parser.y                           |  12 +-
 compiler/parser/RdrHsSyn.hs                        |  72 +++-----
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         |  11 +-
 compiler/rename/RnSource.hs                        | 120 +++++--------
 compiler/rename/RnTypes.hs                         |  22 ++-
 compiler/typecheck/TcHsType.hs                     |   9 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 191 +++++++++++++++------
 testsuite/tests/ghc-api/annotations/T10399.stdout  |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   2 +-
 testsuite/tests/rename/should_fail/T7943.stderr    |   6 +-
 utils/haddock                                      |   2 +-
 20 files changed, 391 insertions(+), 330 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 410b6477ce9396555900b46f740515a432171524

From git at git.haskell.org  Tue Dec  1 14:22:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 14:22:46 +0000 (UTC)
Subject: [commit: ghc] wip/T11028's head updated: Refactor ConDecl (410b647)
Message-ID: <20151201142246.2E72A3A300@ghc.haskell.org>

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

Branch 'wip/T11028' now includes:

     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     d5d2338 Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     57b995b Wibbles
     744d4b0 Merge remote-tracking branch 'origin/master' into wip/spj-wildcard-refactor
     410b647 Refactor ConDecl

From git at git.haskell.org  Tue Dec  1 15:59:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 15:59:36 +0000 (UTC)
Subject: [commit: ghc] master: Fix warning about unused pattern variable
 (44c3e37)
Message-ID: <20151201155936.345F13A301@ghc.haskell.org>

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

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

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

commit 44c3e3768e28199468d2ffff0b25db055d22c310
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Dec 1 16:59:39 2015 +0100

    Fix warning about unused pattern variable


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

44c3e3768e28199468d2ffff0b25db055d22c310
 utils/deriveConstants/Main.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/deriveConstants/Main.hs b/utils/deriveConstants/Main.hs
index 09c94ab..6a88ac2 100644
--- a/utils/deriveConstants/Main.hs
+++ b/utils/deriveConstants/Main.hs
@@ -786,7 +786,7 @@ getWanted verbose os tmpdir gccProgram gccFlags nmProgram mobjdumpProgram
                   , Just sym <- stripPrefix prefix sym0 = Just (sym, read n)
                   | otherwise = Nothing
                 where
-                  [sym0, adr] = take 2 (reverse $ words l1)
+                  [sym0, _] = take 2 (reverse $ words l1)
 
           -- If an Int value is larger than 2^28 or smaller
           -- than -2^28, then fail.


From git at git.haskell.org  Tue Dec  1 15:59:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 15:59:33 +0000 (UTC)
Subject: [commit: ghc] master: Remove duplicated line (36c1247)
Message-ID: <20151201155933.900CF3A300@ghc.haskell.org>

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

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

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

commit 36c1247846bbbc1af939c098660ce27ddaa36a0d
Author: Gabor Greif <ggreif at gmail.com>
Date:   Wed Oct 28 08:27:58 2015 +0100

    Remove duplicated line


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

36c1247846bbbc1af939c098660ce27ddaa36a0d
 compiler/ghc.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index b75fdc2..74cbd29 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -457,7 +457,6 @@ compiler_stage1_MUNGED_VERSION = $(subst .$(ProjectPatchLevel),,$(ProjectVersion
 define compiler_PACKAGE_MAGIC
 compiler_stage1_VERSION = $(compiler_stage1_MUNGED_VERSION)
 compiler_stage1_COMPONENT_ID = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_COMPONENT_ID))
-compiler_stage1_COMPONENT_ID = $(subst .$(ProjectPatchLevel),,$(compiler_stage1_COMPONENT_ID))
 endef
 
 # NB: the COMPONENT_ID munging has no effect for new-style unit ids


From git at git.haskell.org  Tue Dec  1 16:58:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 16:58:29 +0000 (UTC)
Subject: [commit: ghc] master: Make the determinism tests more robust (b432e2f)
Message-ID: <20151201165829.1368A3A300@ghc.haskell.org>

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

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

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

commit b432e2f39c095d8acbb0cfcc63bd08436c7a3e49
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Tue Dec 1 07:42:35 2015 -0800

    Make the determinism tests more robust
    
    The tests weren't explicit enough about comparing under different
    unique allocation strategies. This led to some confusion on my part when
    I started overriding flags in `testsuite/mk/test.mk`.
    Includes a `.gitignore` rule.
    
    Test Plan: harbormaster
    
    Reviewers: austin, simonmar, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1555


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

b432e2f39c095d8acbb0cfcc63bd08436c7a3e49
 testsuite/.gitignore                           | 3 ++-
 testsuite/tests/determinism/determ003/Makefile | 2 +-
 testsuite/tests/determinism/typecheck/Makefile | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/testsuite/.gitignore b/testsuite/.gitignore
index b8493f5..dee9012 100644
--- a/testsuite/.gitignore
+++ b/testsuite/.gitignore
@@ -471,6 +471,7 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/deriving/should_run/drvrun019
 /tests/deriving/should_run/drvrun020
 /tests/deriving/should_run/drvrun021
+/tests/determinism/determinism001
 /tests/dph/classes/dph-classes-copy-fast
 /tests/dph/classes/dph-classes-fast
 /tests/dph/classes/dph-classes-vseg-fast
@@ -1175,6 +1176,7 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/perf/should_run/InlineCloneArrayAlloc
 /tests/perf/should_run/MethSharing
 /tests/perf/should_run/MethSharing.stats
+/tests/perf/should_run/T10359
 /tests/perf/should_run/T149_A
 /tests/perf/should_run/T149_B
 /tests/perf/should_run/T2902_A
@@ -1221,7 +1223,6 @@ mk/ghcconfig*_test___spaces_ghc*.exe.mk
 /tests/perf/should_run/T876
 /tests/perf/should_run/T9203
 /tests/perf/should_run/T9339
-/tests/perf/should_run/T10359
 /tests/perf/should_run/lazy-bs-alloc
 /tests/perf/should_run/lazy-bs-alloc.stats
 /tests/perf/should_run/speed.f32
diff --git a/testsuite/tests/determinism/determ003/Makefile b/testsuite/tests/determinism/determ003/Makefile
index 73231a0..bab18e8 100644
--- a/testsuite/tests/determinism/determ003/Makefile
+++ b/testsuite/tests/determinism/determ003/Makefile
@@ -6,7 +6,7 @@ TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
 determ003:
 	$(RM) A.hi A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=0 -dunique-increment=1 A.hs
 	$(CP) A.hi A.normal.hi
 	$(RM) A.hi A.o
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O -dinitial-unique=16777215 -dunique-increment=-1 A.hs
diff --git a/testsuite/tests/determinism/typecheck/Makefile b/testsuite/tests/determinism/typecheck/Makefile
index f95bfc5..ac98ea1 100644
--- a/testsuite/tests/determinism/typecheck/Makefile
+++ b/testsuite/tests/determinism/typecheck/Makefile
@@ -6,7 +6,7 @@ TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
 determ005:
 	$(RM) A.hi A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -O A.hs
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs
 	$(CP) A.hi A.old.hi
 	$(RM) A.o
 	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs


From git at git.haskell.org  Tue Dec  1 17:15:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 17:15:39 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Overloaded literals (f62b371)
Message-ID: <20151201171539.399C33A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/f62b371a1f6e94323cf56ecaa8ce832da97bb5d2/ghc

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

commit f62b371a1f6e94323cf56ecaa8ce832da97bb5d2
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Nov 30 16:49:03 2015 +0100

    Overloaded literals


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

f62b371a1f6e94323cf56ecaa8ce832da97bb5d2
 compiler/deSugar/Check.hs                       | 57 ++++++++++++++----
 compiler/deSugar/TmOracle.hs                    | 79 ++++++++++++++++++++++++-
 testsuite/tests/deSugar/should_compile/ds022.hs |  2 +
 3 files changed, 123 insertions(+), 15 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f62b371a1f6e94323cf56ecaa8ce832da97bb5d2

From git at git.haskell.org  Tue Dec  1 17:15:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 17:15:41 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: documented the **HACK** (0cdbf4d)
Message-ID: <20151201171541.D9F223A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/0cdbf4d08fdc9728d28e0a954763a51250a463c8/ghc

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

commit 0cdbf4d08fdc9728d28e0a954763a51250a463c8
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 1 12:40:14 2015 +0100

    documented the **HACK**


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

0cdbf4d08fdc9728d28e0a954763a51250a463c8
 compiler/deSugar/Check.hs    |  35 ++++++-----
 compiler/deSugar/TmOracle.hs | 139 +++++++++++++++++++++++++++++++++++++++----
 2 files changed, 147 insertions(+), 27 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0cdbf4d08fdc9728d28e0a954763a51250a463c8

From git at git.haskell.org  Tue Dec  1 17:15:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 17:15:44 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: fixed ds022 stderr (0ae502d)
Message-ID: <20151201171544.823833A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/0ae502dafffe64a6f664875657ff36153700422e/ghc

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

commit 0ae502dafffe64a6f664875657ff36153700422e
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 1 12:48:05 2015 +0100

    fixed ds022 stderr


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

0ae502dafffe64a6f664875657ff36153700422e
 testsuite/tests/deSugar/should_compile/ds022.stderr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/deSugar/should_compile/ds022.stderr b/testsuite/tests/deSugar/should_compile/ds022.stderr
index 45fe3d8..17b62fe 100644
--- a/testsuite/tests/deSugar/should_compile/ds022.stderr
+++ b/testsuite/tests/deSugar/should_compile/ds022.stderr
@@ -1,6 +1,6 @@
 
-ds022.hs:20:1: Warning:
-    Pattern match(es) are overlapped
+ds022.hs:22:1: Warning:
+    Pattern match(es) are redundant
     In an equation for ?i?:
         i 1 0.011e2 = ...
         i 2 2.20000 = ...


From git at git.haskell.org  Tue Dec  1 17:15:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 17:15:47 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: more documentation on guard approximation
 (e7d0a00)
Message-ID: <20151201171547.35DF13A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7d0a0080fa3781fc24c13d47c0f7612a9c5ccad/ghc

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

commit e7d0a0080fa3781fc24c13d47c0f7612a9c5ccad
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 1 18:08:57 2015 +0100

    more documentation on guard approximation


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

e7d0a0080fa3781fc24c13d47c0f7612a9c5ccad
 compiler/deSugar/Check.hs | 138 +++++++++++++++++++++++++++++++++++++++-------
 1 file changed, 117 insertions(+), 21 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e7d0a0080fa3781fc24c13d47c0f7612a9c5ccad

From git at git.haskell.org  Tue Dec  1 17:45:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  1 Dec 2015 17:45:08 +0000 (UTC)
Subject: [commit: ghc] master: Refactor treatment of wildcards (1e041b7)
Message-ID: <20151201174508.D478C3A300@ghc.haskell.org>

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

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

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

commit 1e041b7382b6aa329e4ad9625439f811e0f27232
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 1 17:38:23 2015 +0100

    Refactor treatment of wildcards
    
    This patch began as a modest refactoring of HsType and friends, to
    clarify and tidy up exactly where quantification takes place in types.
    Although initially driven by making the implementation of wildcards more
    tidy (and fixing a number of bugs), I gradually got drawn into a pretty
    big process, which I've been doing on and off for quite a long time.
    
    There is one compiler performance regression as a result of all
    this, in perf/compiler/T3064.  I still need to look into that.
    
    * The principal driving change is described in Note [HsType binders]
      in HsType.  Well worth reading!
    
    * Those data type changes drive almost everything else.  In particular
      we now statically know where
    
           (a) implicit quantification only (LHsSigType),
               e.g. in instance declaratios and SPECIALISE signatures
    
           (b) implicit quantification and wildcards (LHsSigWcType)
               can appear, e.g. in function type signatures
    
    * As part of this change, HsForAllTy is (a) simplified (no wildcards)
      and (b) split into HsForAllTy and HsQualTy.  The two contructors
      appear when and only when the correponding user-level construct
      appears.  Again see Note [HsType binders].
    
      HsExplicitFlag disappears altogether.
    
    * Other simplifications
    
         - ExprWithTySig no longer needs an ExprWithTySigOut variant
    
         - TypeSig no longer needs a PostRn name [name] field
           for wildcards
    
         - PatSynSig records a LHsSigType rather than the decomposed
           pieces
    
         - The mysterious 'GenericSig' is now 'ClassOpSig'
    
    * Renamed LHsTyVarBndrs to LHsQTyVars
    
    * There are some uninteresting knock-on changes in Haddock,
      because of the HsSyn changes
    
    I also did a bunch of loosely-related changes:
    
    * We already had type synonyms CoercionN/CoercionR for nominal and
      representational coercions.  I've added similar treatment for
    
          TcCoercionN/TcCoercionR
    
          mkWpCastN/mkWpCastN
    
      All just type synonyms but jolly useful.
    
    * I record-ised ForeignImport and ForeignExport
    
    * I improved the (poor) fix to Trac #10896, by making
      TcTyClsDecls.checkValidTyCl recover from errors, but adding a
      harmless, abstract TyCon to the envt if so.
    
    * I did some significant refactoring in RnEnv.lookupSubBndrOcc,
      for reasons that I have (embarrassingly) now totally forgotten.
      It had to do with something to do with import and export
    
    Updates haddock submodule.


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

1e041b7382b6aa329e4ad9625439f811e0f27232
 compiler/basicTypes/RdrName.hs                     |   3 +-
 compiler/deSugar/Coverage.hs                       |  13 +-
 compiler/deSugar/DsArrows.hs                       |   2 +-
 compiler/deSugar/DsBinds.hs                        |   8 +-
 compiler/deSugar/DsExpr.hs                         |   2 +-
 compiler/deSugar/DsForeign.hs                      |   6 +-
 compiler/deSugar/DsMeta.hs                         | 184 ++--
 compiler/ghc.mk                                    |   2 -
 compiler/hsSyn/Convert.hs                          |  78 +-
 compiler/hsSyn/HsBinds.hs                          |  73 +-
 compiler/hsSyn/HsDecls.hs                          | 140 +--
 compiler/hsSyn/HsExpr.hs                           |  48 +-
 compiler/hsSyn/HsPat.hs                            |   8 +-
 compiler/hsSyn/HsSyn.hs                            |   2 +-
 compiler/hsSyn/HsTypes.hs                          | 502 ++++++-----
 compiler/hsSyn/HsUtils.hs                          | 112 +--
 compiler/iface/IfaceSyn.hs                         |  29 +-
 compiler/main/HscStats.hs                          |  16 +-
 compiler/main/HscTypes.hs                          |   2 +
 compiler/parser/Lexer.x                            |  14 +-
 compiler/parser/Parser.y                           | 230 ++---
 compiler/parser/RdrHsSyn.hs                        | 156 ++--
 compiler/prelude/PrelNames.hs                      |   4 +-
 compiler/rename/RnBinds.hs                         | 131 ++-
 compiler/rename/RnEnv.hs                           | 261 +++---
 compiler/rename/RnExpr.hs                          |  49 +-
 compiler/rename/RnNames.hs                         |   8 +-
 compiler/rename/RnPat.hs                           |  10 +-
 compiler/rename/RnSource.hs                        | 234 ++---
 compiler/rename/RnSplice.hs                        |  33 +-
 compiler/rename/RnTypes.hs                         | 976 +++++++++++----------
 compiler/typecheck/TcArrows.hs                     |   2 +-
 compiler/typecheck/TcBinds.hs                      | 462 ++++++----
 compiler/typecheck/TcClassDcl.hs                   |  20 +-
 compiler/typecheck/TcDefaults.hs                   |   2 +-
 compiler/typecheck/TcDeriv.hs                      |  21 +-
 compiler/typecheck/TcEnv.hs                        |  25 +-
 compiler/typecheck/TcErrors.hs                     |  63 +-
 compiler/typecheck/TcEvidence.hs                   |  29 +-
 compiler/typecheck/TcExpr.hs                       | 194 ++--
 compiler/typecheck/TcForeign.hs                    |  24 +-
 compiler/typecheck/TcGenDeriv.hs                   |  29 +-
 compiler/typecheck/TcHsSyn.hs                      |   8 +-
 compiler/typecheck/TcHsType.hs                     | 379 ++++----
 compiler/typecheck/TcInstDcls.hs                   |  42 +-
 compiler/typecheck/TcMType.hs                      |  40 +-
 compiler/typecheck/TcMatches.hs                    |   2 +-
 compiler/typecheck/TcPat.hs                        | 222 +----
 compiler/typecheck/TcPatSyn.hs                     |   5 +-
 compiler/typecheck/TcPatSyn.hs-boot                |   3 +-
 compiler/typecheck/TcRnDriver.hs                   |  42 +-
 compiler/typecheck/TcRnMonad.hs                    |  30 +-
 compiler/typecheck/TcRnTypes.hs                    | 248 +++++-
 compiler/typecheck/TcRules.hs                      |  33 +-
 compiler/typecheck/TcSMonad.hs                     |  16 +-
 compiler/typecheck/TcSimplify.hs                   |  67 +-
 compiler/typecheck/TcSplice.hs                     |   6 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  45 +-
 compiler/typecheck/TcTyDecls.hs                    |  25 +-
 compiler/typecheck/TcType.hs                       |  30 +-
 compiler/typecheck/TcTypeable.hs                   |   8 +-
 compiler/typecheck/TcUnify.hs                      |  54 +-
 compiler/typecheck/TcValidity.hs                   |  52 +-
 compiler/types/Coercion.hs                         |   6 +-
 compiler/types/InstEnv.hs                          |   3 +-
 compiler/utils/Util.hs                             |  27 +-
 ghc/InteractiveUI.hs                               |   8 +-
 libraries/base/Data/Monoid.hs                      |   2 +-
 testsuite/tests/ado/ado005.stderr                  |   8 +-
 testsuite/tests/arrows/should_fail/T5380.stderr    |  48 +-
 testsuite/tests/deriving/should_fail/T5287.stderr  |   8 +-
 testsuite/tests/gadt/T3169.stderr                  |  28 +-
 testsuite/tests/gadt/T7558.stderr                  |   8 +-
 testsuite/tests/gadt/rw.stderr                     |  48 +-
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        | 267 +++---
 testsuite/tests/ghci/scripts/T10248.stderr         |  16 +-
 testsuite/tests/ghci/scripts/T7873.stdout          |   3 +-
 testsuite/tests/ghci/scripts/ghci050.stderr        |   1 +
 .../should_compile/PushedInAsGivens.stderr         |  51 +-
 .../tests/indexed-types/should_compile/Records.hs  |   0
 .../indexed-types/should_compile/Simple14.stderr   |  17 +-
 .../indexed-types/should_compile/T3208b.stderr     |  44 +-
 .../tests/indexed-types/should_fail/BadSock.hs     |   0
 .../indexed-types/should_fail/GADTwrong1.stderr    |  24 +-
 .../indexed-types/should_fail/NoMatchErr.stderr    |   7 +-
 .../indexed-types/should_fail/Overlap6.stderr      |  23 +-
 .../indexed-types/should_fail/SimpleFail15.stderr  |   5 +-
 .../indexed-types/should_fail/SimpleFail16.stderr  |   2 +-
 .../indexed-types/should_fail/SimpleFail5a.stderr  |  21 +-
 .../tests/indexed-types/should_fail/T1897b.stderr  |   7 +-
 .../tests/indexed-types/should_fail/T1900.stderr   |   5 +-
 .../tests/indexed-types/should_fail/T2693.stderr   |  66 +-
 .../tests/indexed-types/should_fail/T3330a.stderr  |  84 +-
 .../tests/indexed-types/should_fail/T3440.stderr   |  39 +-
 .../tests/indexed-types/should_fail/T4093a.stderr  |  24 +-
 .../tests/indexed-types/should_fail/T4093b.stderr  |  75 +-
 .../tests/indexed-types/should_fail/T4174.stderr   |  52 +-
 .../tests/indexed-types/should_fail/T4272.stderr   |  29 +-
 .../tests/indexed-types/should_fail/T7194.stderr   |  25 +-
 .../tests/indexed-types/should_fail/T9036.stderr   |   8 +-
 .../tests/indexed-types/should_fail/T9171.stderr   |  15 +-
 .../tests/indexed-types/should_fail/T9433.stderr   |   2 +-
 .../tests/indexed-types/should_fail/T9662.stderr   | 144 +--
 testsuite/tests/module/mod98.stderr                |   4 +-
 testsuite/tests/monadfail/MonadFailErrors.stderr   |   2 +-
 testsuite/tests/monadfail/MonadFailWarnings.stderr | 104 +--
 .../should_fail/overloadedlabelsfail01.stderr      |   2 +-
 .../parser/should_fail/NoPatternSynonyms.stderr    |   2 +-
 testsuite/tests/parser/should_fail/T3811.stderr    |   4 +-
 testsuite/tests/parser/should_fail/T7848.stderr    |  78 +-
 .../tests/parser/should_fail/readFail031.stderr    |   4 +-
 .../should_compile/Defaulting2MROn.stderr          |   2 +-
 .../partial-sigs/should_compile/ExprSigLocal.hs    |  12 +
 .../should_compile/ExprSigLocal.stderr             |  19 +
 .../should_compile/ExtraConstraints3.stderr        |  14 +-
 .../should_compile/SomethingShowable.hs            |   2 +-
 .../should_compile/SomethingShowable.stderr        |   3 +-
 .../partial-sigs/should_compile/SplicesUsed.stderr | 108 ++-
 .../tests/partial-sigs/should_compile/T10403.hs    |   1 +
 .../partial-sigs/should_compile/T10403.stderr      |  91 +-
 .../partial-sigs/should_compile/T10438.stderr      |  51 +-
 .../partial-sigs/should_compile/T10519.stderr      |   4 +-
 .../WarningWildcardInstantiations.stderr           |  65 +-
 testsuite/tests/partial-sigs/should_compile/all.T  |   1 +
 .../partial-sigs/should_fail/Defaulting1MROff.hs   |   2 +
 .../should_fail/Defaulting1MROff.stderr            |  11 +-
 ...ConstraintsWildcardInExpressionSignature.stderr |   6 +-
 ...traConstraintsWildcardInPatternSignature.stderr |   6 +-
 .../ExtraConstraintsWildcardInTypeSplice2.hs       |   2 +-
 .../ExtraConstraintsWildcardInTypeSplice2.stderr   |   5 +-
 ...ExtraConstraintsWildcardInTypeSpliceUsed.stderr |  12 +-
 .../ExtraConstraintsWildcardNotEnabled.stderr      |   4 +-
 .../ExtraConstraintsWildcardNotLast.stderr         |  10 +-
 .../ExtraConstraintsWildcardNotPresent.stderr      |  12 +-
 .../ExtraConstraintsWildcardTwice.stderr           |   9 +-
 .../InstantiatedNamedWildcardsInConstraints.stderr |  17 +-
 .../NamedExtraConstraintsWildcard.stderr           |   8 +-
 .../NamedWildcardInDataFamilyInstanceLHS.stderr    |   4 +-
 .../NamedWildcardInTypeFamilyInstanceLHS.stderr    |   4 +-
 .../should_fail/NamedWildcardInTypeSplice.stderr   |   9 +-
 .../should_fail/NamedWildcardsEnabled.stderr       |  20 +-
 .../should_fail/NamedWildcardsNotEnabled.stderr    |  36 +-
 .../should_fail/NamedWildcardsNotInMonotype.hs     |   2 +-
 .../should_fail/NamedWildcardsNotInMonotype.stderr |  16 +-
 .../NestedExtraConstraintsWildcard.stderr          |  10 +-
 .../NestedNamedExtraConstraintsWildcard.stderr     |   7 +-
 .../should_fail/PartialClassMethodSignature.stderr |   7 +-
 .../PartialClassMethodSignature2.stderr            |   7 +-
 .../PartialTypeSignaturesDisabled.stderr           |  20 +-
 .../tests/partial-sigs/should_fail/T10045.stderr   |  43 +-
 .../tests/partial-sigs/should_fail/T10615.stderr   |  52 +-
 testsuite/tests/partial-sigs/should_fail/T10999.hs |   2 +-
 .../tests/partial-sigs/should_fail/T10999.stderr   |  24 +-
 .../partial-sigs/should_fail/TidyClash.stderr      |  26 +-
 .../tests/partial-sigs/should_fail/Trac10045.hs    |   8 -
 .../partial-sigs/should_fail/Trac10045.stderr      |  46 -
 .../should_fail/UnnamedConstraintWildcard1.stderr  |   9 +-
 .../should_fail/UnnamedConstraintWildcard2.stderr  |   9 +-
 .../partial-sigs/should_fail/WildcardInADT1.stderr |   8 +-
 .../partial-sigs/should_fail/WildcardInADT2.stderr |   8 +-
 .../partial-sigs/should_fail/WildcardInADT3.stderr |   8 +-
 .../should_fail/WildcardInADTContext1.stderr       |   8 +-
 .../should_fail/WildcardInADTContext2.stderr       |   8 +-
 .../should_fail/WildcardInDefault.stderr           |   7 +-
 .../should_fail/WildcardInDefaultSignature.stderr  |   7 +-
 .../should_fail/WildcardInDeriving.stderr          |   6 +-
 .../should_fail/WildcardInForeignExport.stderr     |   8 +-
 .../should_fail/WildcardInForeignImport.stderr     |   8 +-
 .../should_fail/WildcardInGADT1.stderr             |   8 +-
 .../should_fail/WildcardInGADT2.stderr             |   7 +-
 .../should_fail/WildcardInInstanceHead.stderr      |   6 +-
 .../should_fail/WildcardInInstanceSig.stderr       |   5 +-
 .../should_fail/WildcardInNewtype.stderr           |   8 +-
 .../should_fail/WildcardInPatSynSig.stderr         |   5 +-
 .../WildcardInStandaloneDeriving.stderr            |   6 +-
 .../WildcardInTypeFamilyInstanceRHS.stderr         |   8 +-
 .../should_fail/WildcardInTypeSynonymRHS.stderr    |   7 +-
 .../should_fail/WildcardInstantiations.stderr      |  75 +-
 testsuite/tests/partial-sigs/should_fail/all.T     |   5 +-
 testsuite/tests/patsyn/should_fail/T9161-1.stderr  |   5 +-
 testsuite/tests/patsyn/should_fail/T9161-2.stderr  |   4 +-
 testsuite/tests/perf/compiler/T5837.stderr         |   8 +-
 testsuite/tests/perf/compiler/all.T                |   4 +-
 testsuite/tests/polykinds/PolyKinds02.stderr       |   4 +-
 testsuite/tests/polykinds/T10503.stderr            |  13 +-
 testsuite/tests/polykinds/T10516.stderr            |   2 +-
 testsuite/tests/polykinds/T6021.stderr             |   7 +-
 testsuite/tests/polykinds/T6068.hs                 |   4 +-
 testsuite/tests/polykinds/T7224.stderr             |   5 +-
 testsuite/tests/polykinds/T7230.stderr             |  54 +-
 testsuite/tests/polykinds/T7278.stderr             |   4 +-
 testsuite/tests/polykinds/T7328.stderr             |   5 +-
 testsuite/tests/polykinds/T7438.stderr             |   1 +
 testsuite/tests/polykinds/T9222.stderr             |  15 +-
 testsuite/tests/rename/should_compile/T4426.hs     |   8 +-
 testsuite/tests/rename/should_compile/T4426.stderr |  51 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   7 +-
 testsuite/tests/rename/should_compile/all.T        |   2 +-
 testsuite/tests/rename/should_fail/T2901.stderr    |   3 +-
 testsuite/tests/rename/should_fail/T5372.hs        |   0
 testsuite/tests/rename/should_fail/T5372.stderr    |   6 +-
 .../tests/rename/should_fail/rnfail026.stderr      |   6 +-
 .../tests/roles/should_fail/RolesIArray.stderr     |   8 +-
 .../tests/simplCore/should_compile/T8848.stderr    |   4 +-
 .../tests/simplCore/should_compile/T8848a.stderr   |   2 +-
 .../tests/simplCore/should_compile/rule2.stderr    |   2 +-
 testsuite/tests/th/T10267.stderr                   |  68 +-
 testsuite/tests/th/T3177a.stderr                   |  10 +-
 testsuite/tests/th/T8625.stdout                    |   2 +-
 testsuite/tests/th/TH_pragma.stderr                |   0
 .../tests/typecheck/should_compile/FD1.stderr      |  15 +-
 .../tests/typecheck/should_compile/FD2.stderr      |  32 +-
 .../tests/typecheck/should_compile/FD3.stderr      |  23 +-
 .../tests/typecheck/should_compile/T10632.stderr   |   5 +-
 .../tests/typecheck/should_compile/T7220a.stderr   |  14 +-
 .../tests/typecheck/should_compile/T9834.stderr    |  46 +-
 .../tests/typecheck/should_compile/T9939.stderr    |  18 +-
 .../tests/typecheck/should_compile/tc141.stderr    |  86 +-
 testsuite/tests/typecheck/should_compile/tc166.hs  |   0
 .../tests/typecheck/should_compile/tc168.stderr    |  10 +-
 testsuite/tests/typecheck/should_compile/tc182.hs  |   2 -
 testsuite/tests/typecheck/should_compile/tc244.hs  |   2 +
 .../typecheck/should_fail/ContextStack2.stderr     |   7 +-
 .../should_fail/CustomTypeErrors02.stderr          |   2 +-
 .../should_fail/CustomTypeErrors03.stderr          |   2 +-
 .../typecheck/should_fail/FDsFromGivens.stderr     |  27 +-
 .../should_fail/FailDueToGivenOverlapping.stderr   |   7 +-
 .../tests/typecheck/should_fail/IPFail.stderr      |   5 +-
 .../tests/typecheck/should_fail/T10285.stderr      |  34 +-
 .../tests/typecheck/should_fail/T10351.stderr      |   2 +-
 .../tests/typecheck/should_fail/T10534.stderr      |  28 +-
 .../tests/typecheck/should_fail/T10715.stderr      |  11 +-
 .../tests/typecheck/should_fail/T11112.stderr      |   5 +-
 .../tests/typecheck/should_fail/T1897a.stderr      |  10 +-
 testsuite/tests/typecheck/should_fail/T1899.stderr |  21 +-
 testsuite/tests/typecheck/should_fail/T2538.stderr |   6 +-
 testsuite/tests/typecheck/should_fail/T2714.stderr |  18 +-
 testsuite/tests/typecheck/should_fail/T3102.stderr |   8 +-
 testsuite/tests/typecheck/should_fail/T3540.stderr |  25 +-
 testsuite/tests/typecheck/should_fail/T4875.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T5236.stderr |  19 +-
 testsuite/tests/typecheck/should_fail/T5300.stderr |  14 +-
 testsuite/tests/typecheck/should_fail/T5957.stderr |   5 +-
 testsuite/tests/typecheck/should_fail/T6022.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T7279.stderr |   5 +-
 testsuite/tests/typecheck/should_fail/T7410.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T7453.stderr |  81 +-
 testsuite/tests/typecheck/should_fail/T7609.stderr |   8 +-
 testsuite/tests/typecheck/should_fail/T7645.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T7696.stderr |  14 +-
 testsuite/tests/typecheck/should_fail/T7697.stderr |   4 +-
 .../tests/typecheck/should_fail/T7748a.stderr      |  34 +-
 testsuite/tests/typecheck/should_fail/T7778.stderr |   4 +-
 testsuite/tests/typecheck/should_fail/T7809.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T7869.stderr |   1 +
 testsuite/tests/typecheck/should_fail/T8030.stderr |   6 +-
 testsuite/tests/typecheck/should_fail/T8034.stderr |   3 +-
 testsuite/tests/typecheck/should_fail/T8142.stderr |   5 +-
 .../tests/typecheck/should_fail/T8392a.stderr      |  10 +-
 testsuite/tests/typecheck/should_fail/T8450.stderr |  16 +-
 testsuite/tests/typecheck/should_fail/T8603.stderr |  43 +-
 testsuite/tests/typecheck/should_fail/T8806.stderr |  10 +-
 testsuite/tests/typecheck/should_fail/T8883.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T9196.stderr |  10 +-
 testsuite/tests/typecheck/should_fail/T9201.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/mc19.stderr  |   8 +-
 testsuite/tests/typecheck/should_fail/mc21.stderr  |   8 +-
 testsuite/tests/typecheck/should_fail/mc22.stderr  |  13 +-
 .../tests/typecheck/should_fail/tcfail032.stderr   |   1 +
 .../tests/typecheck/should_fail/tcfail034.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail057.stderr   |   5 +-
 .../tests/typecheck/should_fail/tcfail058.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail063.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail065.stderr   |  21 +-
 .../tests/typecheck/should_fail/tcfail067.stderr   |  37 +-
 .../tests/typecheck/should_fail/tcfail068.stderr   | 159 ++--
 .../tests/typecheck/should_fail/tcfail072.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail076.stderr   |  28 +-
 .../tests/typecheck/should_fail/tcfail078.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail080.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail097.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail098.stderr   |   5 +-
 .../tests/typecheck/should_fail/tcfail101.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail102.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail103.stderr   |  14 +-
 .../tests/typecheck/should_fail/tcfail107.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail110.stderr   |   5 +-
 .../tests/typecheck/should_fail/tcfail113.stderr   |  12 +-
 .../tests/typecheck/should_fail/tcfail116.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail127.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail131.stderr   |  18 +-
 .../tests/typecheck/should_fail/tcfail134.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail135.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail142.stderr   |  11 +-
 .../tests/typecheck/should_fail/tcfail153.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail158.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail160.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail161.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail174.stderr   |  17 +-
 .../tests/typecheck/should_fail/tcfail175.stderr   |  18 +-
 .../tests/typecheck/should_fail/tcfail179.stderr   |  30 +-
 .../tests/typecheck/should_fail/tcfail181.stderr   |   1 -
 .../tests/typecheck/should_fail/tcfail191.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail193.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail196.stderr   |   5 +-
 .../tests/typecheck/should_fail/tcfail197.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail201.stderr   |  23 +-
 .../tests/typecheck/should_fail/tcfail206.stderr   |  26 +-
 .../tests/typecheck/should_fail/tcfail208.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail209a.stderr  |   5 +-
 .../tests/typecheck/should_fail/tcfail212.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail215.stderr   |   4 +-
 testsuite/tests/typecheck/should_run/Defer01.hs    |   1 -
 testsuite/tests/typecheck/should_run/T7861.stderr  |   6 +-
 testsuite/tests/typecheck/should_run/tcrun008.hs   |  11 +-
 .../wcompat-warnings/WCompatWarningsOn.stderr      |   2 +-
 utils/haddock                                      |   2 +-
 319 files changed, 5296 insertions(+), 4495 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1e041b7382b6aa329e4ad9625439f811e0f27232

From git at git.haskell.org  Wed Dec  2 13:18:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 13:18:29 +0000 (UTC)
Subject: [commit: ghc] master: Make the order of fixities in the iface file
 deterministic (218fdf9)
Message-ID: <20151202131829.32DAB3A300@ghc.haskell.org>

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

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

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

commit 218fdf92370021b900af1e78323764cceb7ac609
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Wed Dec 2 03:28:13 2015 -0800

    Make the order of fixities in the iface file deterministic
    
    This normalizes the order of written fixities by sorting by
    `OccName` making it independent of `Unique` order.
    
    Test Plan: I've added a new testcase
    
    Reviewers: austin, bgamari, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1557
    
    GHC Trac Issues: #4012


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

218fdf92370021b900af1e78323764cceb7ac609
 compiler/iface/MkIface.hs                                    |  6 +++++-
 .../should_compile/read002.hs => determinism/determ010/A.hs} |  5 +++--
 .../tests/determinism/{typecheck => determ010}/Makefile      | 12 ++++++------
 testsuite/tests/determinism/{determ003 => determ010}/all.T   |  4 ++--
 testsuite/tests/determinism/determ010/determ010.stdout       |  2 ++
 5 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/compiler/iface/MkIface.hs b/compiler/iface/MkIface.hs
index d955fa5..e428b58 100644
--- a/compiler/iface/MkIface.hs
+++ b/compiler/iface/MkIface.hs
@@ -222,7 +222,11 @@ mkIface_ hsc_env maybe_old_fingerprint
                    nameIsLocalOrFrom this_mod name  ]
                       -- Sigh: see Note [Root-main Id] in TcRnDriver
 
-        fixities    = [(occ,fix) | FixItem occ fix <- nameEnvElts fix_env]
+        fixities    = sortBy (comparing fst)
+          [(occ,fix) | FixItem occ fix <- nameEnvElts fix_env]
+          -- The order of fixities returned from nameEnvElts is not
+          -- deterministic, so we sort by OccName to canonicalize it.
+          -- See Note [Deterministic UniqFM] in UniqDFM for more details.
         warns       = src_warns
         iface_rules = map coreRuleToIfaceRule rules
         iface_insts = map instanceToIfaceInst $ fixSafeInstances safe_mode insts
diff --git a/testsuite/tests/parser/should_compile/read002.hs b/testsuite/tests/determinism/determ010/A.hs
similarity index 75%
copy from testsuite/tests/parser/should_compile/read002.hs
copy to testsuite/tests/determinism/determ010/A.hs
index 8d9ea5e..b60f90a 100644
--- a/testsuite/tests/parser/should_compile/read002.hs
+++ b/testsuite/tests/determinism/determ010/A.hs
@@ -1,8 +1,8 @@
 {-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
-
--- !!! tests fixity reading and printing
 module ShouldCompile where
 
+-- tests deterministic order of fixities in the interface file
+
 infixl 1 `f`
 infixr 2 \\\
 infix  3 :==>
@@ -10,6 +10,7 @@ infix  4 `MkFoo`
 
 data Foo = MkFoo Int | Float :==> Double
 
+f :: a -> b -> a
 x `f` y = x
 
 (\\\) :: (Eq a) => [a] -> [a] -> [a]
diff --git a/testsuite/tests/determinism/typecheck/Makefile b/testsuite/tests/determinism/determ010/Makefile
similarity index 54%
copy from testsuite/tests/determinism/typecheck/Makefile
copy to testsuite/tests/determinism/determ010/Makefile
index ac98ea1..1f12622 100644
--- a/testsuite/tests/determinism/typecheck/Makefile
+++ b/testsuite/tests/determinism/determ010/Makefile
@@ -4,10 +4,10 @@ include $(TOP)/mk/test.mk
 
 TEST_HC_OPTS_NO_RECOMP = $(filter-out -fforce-recomp,$(TEST_HC_OPTS))
 
-determ005:
+determ010:
 	$(RM) A.hi A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 -O A.hs
-	$(CP) A.hi A.old.hi
-	$(RM) A.o
-	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777206 -dunique-increment=-1 -O A.hs
-	diff A.hi A.old.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=0 -dunique-increment=1 A.hs
+	$(CP) A.hi A.normal.hi
+	$(RM) A.hi A.o
+	'$(TEST_HC)' $(TEST_HC_OPTS_NO_RECOMP) -dinitial-unique=16777215 -dunique-increment=-1 A.hs
+	diff A.hi A.normal.hi
diff --git a/testsuite/tests/determinism/determ003/all.T b/testsuite/tests/determinism/determ010/all.T
similarity index 50%
copy from testsuite/tests/determinism/determ003/all.T
copy to testsuite/tests/determinism/determ010/all.T
index c00544d..030868f 100644
--- a/testsuite/tests/determinism/determ003/all.T
+++ b/testsuite/tests/determinism/determ010/all.T
@@ -1,4 +1,4 @@
-test('determ003',
+test('determ010',
      extra_clean(['A.o', 'A.hi', 'A.normal.hi']),
      run_command,
-     ['$MAKE -s --no-print-directory determ003'])
+     ['$MAKE -s --no-print-directory determ010'])
diff --git a/testsuite/tests/determinism/determ010/determ010.stdout b/testsuite/tests/determinism/determ010/determ010.stdout
new file mode 100644
index 0000000..9a2bb82
--- /dev/null
+++ b/testsuite/tests/determinism/determ010/determ010.stdout
@@ -0,0 +1,2 @@
+[1 of 1] Compiling ShouldCompile    ( A.hs, A.o )
+[1 of 1] Compiling ShouldCompile    ( A.hs, A.o )


From git at git.haskell.org  Wed Dec  2 13:23:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 13:23:14 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Pattern Match Checking (Fixes #595)
 (8a0eb7e)
Message-ID: <20151202132314.31BBF3A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/8a0eb7e431d4a26b34c99110ad68cbcf6cf0af26/ghc

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

commit 8a0eb7e431d4a26b34c99110ad68cbcf6cf0af26
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 13:49:08 2015 +0100

    Pattern Match Checking (Fixes #595)


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

8a0eb7e431d4a26b34c99110ad68cbcf6cf0af26
 compiler/basicTypes/UniqSupply.hs   |   26 +-
 compiler/deSugar/Check.hs           | 1971 +++++++++++++++++++++++------------
 compiler/deSugar/DsBinds.hs         |   10 +-
 compiler/deSugar/DsExpr.hs          |   18 +-
 compiler/deSugar/DsGRHSs.hs         |    2 +-
 compiler/deSugar/DsMonad.hs         |   64 +-
 compiler/deSugar/Match.hs           |  174 +---
 compiler/deSugar/Match.hs-boot      |    1 +
 compiler/deSugar/PmExpr.hs          |  376 +++++++
 compiler/deSugar/TmOracle.hs        |  432 ++++++++
 compiler/ghc.cabal.in               |    2 +
 compiler/ghc.mk                     |    1 +
 compiler/hsSyn/HsLit.hs             |   22 +
 compiler/hsSyn/HsPat.hs             |   41 +-
 compiler/prelude/TysWiredIn.hs-boot |    2 +-
 compiler/typecheck/TcMType.hs       |   15 +
 compiler/typecheck/TcRnTypes.hs     |    5 +-
 compiler/typecheck/TcSMonad.hs      |    1 -
 compiler/typecheck/TcSimplify.hs    |   14 +
 compiler/typecheck/TcType.hs        |   42 +
 compiler/types/Type.hs              |   22 +-
 compiler/utils/Bag.hs               |   26 +-
 compiler/utils/MonadUtils.hs        |    6 +-
 23 files changed, 2420 insertions(+), 853 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8a0eb7e431d4a26b34c99110ad68cbcf6cf0af26

From git at git.haskell.org  Wed Dec  2 13:23:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 13:23:16 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Add & adjust tests for pattern match check
 (1c3542f)
Message-ID: <20151202132316.E57233A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/1c3542f72dd6b9d1fa64d854ecb1c748adb0333c/ghc

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

commit 1c3542f72dd6b9d1fa64d854ecb1c748adb0333c
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 13:59:07 2015 +0100

    Add & adjust tests for pattern match check


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

1c3542f72dd6b9d1fa64d854ecb1c748adb0333c
 .../tests/deSugar/should_compile/T2395.stderr      |  4 +-
 .../tests/deSugar/should_compile/T5117.stderr      |  2 +-
 testsuite/tests/deSugar/should_compile/all.T       |  1 -
 .../tests/deSugar/should_compile/ds002.stderr      |  4 +-
 .../tests/deSugar/should_compile/ds003.stderr      |  2 +-
 .../tests/deSugar/should_compile/ds019.stderr      |  2 +-
 .../tests/deSugar/should_compile/ds020.stderr      |  8 +--
 testsuite/tests/deSugar/should_compile/ds022.hs    |  2 +
 .../tests/deSugar/should_compile/ds022.stderr      |  4 +-
 .../tests/deSugar/should_compile/ds043.stderr      |  6 +-
 .../tests/deSugar/should_compile/ds051.stderr      |  6 +-
 .../tests/deSugar/should_compile/ds056.stderr      |  4 +-
 .../tests/deSugar/should_compile/ds058.stderr      |  6 +-
 testsuite/tests/deSugar/should_compile/ds060.hs    | 25 --------
 testsuite/tests/driver/werror.stderr               |  4 +-
 testsuite/tests/gadt/Gadt17_help.hs                |  1 -
 testsuite/tests/gadt/T7294.stderr                  |  4 ++
 testsuite/tests/ghci/scripts/Defer02.stderr        |  8 +++
 testsuite/tests/{ado => pmcheck}/Makefile          |  0
 .../should_compile/Makefile                        |  0
 testsuite/tests/pmcheck/should_compile/T2006.hs    | 13 ++++
 .../tests/pmcheck/should_compile/T2006.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T2204.hs    |  9 +++
 .../tests/pmcheck/should_compile/T2204.stderr      | 14 ++++
 testsuite/tests/pmcheck/should_compile/T3078.hs    | 12 ++++
 .../tests/pmcheck/should_compile/T3078.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T322.hs     | 29 +++++++++
 .../tests/pmcheck/should_compile/T322.stderr       |  0
 testsuite/tests/pmcheck/should_compile/T366.hs     | 10 +++
 .../tests/pmcheck/should_compile/T366.stderr       |  0
 testsuite/tests/pmcheck/should_compile/T3927.hs    | 13 ++++
 .../tests/pmcheck/should_compile/T3927.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T3927a.hs   | 15 +++++
 .../tests/pmcheck/should_compile/T3927a.stderr     |  0
 testsuite/tests/pmcheck/should_compile/T3927b.hs   | 75 ++++++++++++++++++++++
 .../tests/pmcheck/should_compile/T3927b.stderr     | 39 +++++++++++
 testsuite/tests/pmcheck/should_compile/T4139.hs    | 28 ++++++++
 .../tests/pmcheck/should_compile/T4139.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T6124.hs    | 14 ++++
 .../tests/pmcheck/should_compile/T6124.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T7669.hs    |  9 +++
 .../tests/pmcheck/should_compile/T7669.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T8970.hs    | 22 +++++++
 .../tests/pmcheck/should_compile/T8970.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T9951.hs    | 10 +++
 .../tests/pmcheck/should_compile/T9951.stderr      |  0
 testsuite/tests/pmcheck/should_compile/T9951b.hs   |  7 ++
 .../tests/pmcheck/should_compile/T9951b.stderr     |  9 +++
 testsuite/tests/pmcheck/should_compile/all.T       | 35 ++++++++++
 testsuite/tests/pmcheck/should_compile/pmc001.hs   | 22 +++++++
 .../tests/pmcheck/should_compile/pmc001.stderr     | 17 +++++
 testsuite/tests/pmcheck/should_compile/pmc002.hs   |  7 ++
 .../tests/pmcheck/should_compile/pmc002.stderr     |  0
 testsuite/tests/pmcheck/should_compile/pmc003.hs   |  9 +++
 .../tests/pmcheck/should_compile/pmc003.stderr     |  3 +
 testsuite/tests/pmcheck/should_compile/pmc004.hs   | 16 +++++
 .../tests/pmcheck/should_compile/pmc004.stderr     |  3 +
 testsuite/tests/pmcheck/should_compile/pmc005.hs   | 12 ++++
 .../tests/pmcheck/should_compile/pmc005.stderr     |  7 ++
 testsuite/tests/pmcheck/should_compile/pmc006.hs   | 22 +++++++
 .../tests/pmcheck/should_compile/pmc006.stderr     |  0
 testsuite/tests/pmcheck/should_compile/pmc007.hs   | 20 ++++++
 .../tests/pmcheck/should_compile/pmc007.stderr     | 24 +++++++
 .../tests/typecheck/should_compile/T5490.stderr    |  8 +++
 64 files changed, 573 insertions(+), 53 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1c3542f72dd6b9d1fa64d854ecb1c748adb0333c

From git at git.haskell.org  Wed Dec  2 13:23:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 13:23:19 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Add & adjust tests for
 pattern match check (1c3542f)
Message-ID: <20151202132319.3976A3A300@ghc.haskell.org>

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

Branch 'wip/gadtpm' now includes:

     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     36c1247 Remove duplicated line
     44c3e37 Fix warning about unused pattern variable
     b432e2f Make the determinism tests more robust
     1e041b7 Refactor treatment of wildcards
     8a0eb7e Pattern Match Checking (Fixes #595)
     1c3542f Add & adjust tests for pattern match check

From git at git.haskell.org  Wed Dec  2 14:09:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 14:09:48 +0000 (UTC)
Subject: [commit: ghc] master: Implement more deterministic operations and
 document them (741f837)
Message-ID: <20151202140948.92BE53A300@ghc.haskell.org>

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

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

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

commit 741f837d652fd00671614d52a6cb16fbc3758480
Author: Bartosz Nitka <niteria at gmail.com>
Date:   Wed Dec 2 05:30:22 2015 -0800

    Implement more deterministic operations and document them
    
    I will need them for the future determinism fixes.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, goldfire, bgamari, austin, hvr, simonmar
    
    Reviewed By: simonpj, simonmar
    
    Subscribers: osa1, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1537
    
    GHC Trac Issues: #4012


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

741f837d652fd00671614d52a6cb16fbc3758480
 compiler/basicTypes/VarSet.hs   |  68 ++++++++++++++++----
 compiler/coreSyn/CoreFVs.hs     |  94 ++++++++++++++++------------
 compiler/ghci/ByteCodeGen.hs    |   2 +-
 compiler/simplCore/SetLevels.hs |   8 +--
 compiler/specialise/Rules.hs    |   6 +-
 compiler/typecheck/Inst.hs      |  45 +++++++++++---
 compiler/typecheck/TcType.hs    |   5 +-
 compiler/types/TypeRep.hs       |  52 +++++++++++++---
 compiler/utils/FV.hs            | 135 ++++++++++++++++++++++++++++++++++++----
 compiler/utils/UniqDFM.hs       |  45 ++++++++++++++
 compiler/utils/UniqDSet.hs      |   8 +++
 11 files changed, 379 insertions(+), 89 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 741f837d652fd00671614d52a6cb16fbc3758480

From git at git.haskell.org  Wed Dec  2 14:42:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 14:42:32 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (isIrrefutablePat) (52b02e6)
Message-ID: <20151202144232.8CF003A300@ghc.haskell.org>

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

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

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

commit 52b02e66025f029ca1b99dfccedca909fdc86831
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 2 14:38:42 2015 +0000

    Comments only (isIrrefutablePat)


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

52b02e66025f029ca1b99dfccedca909fdc86831
 compiler/hsSyn/HsPat.hs   | 8 ++++++--
 compiler/rename/RnExpr.hs | 5 +++++
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/compiler/hsSyn/HsPat.hs b/compiler/hsSyn/HsPat.hs
index 24ef065..359990a 100644
--- a/compiler/hsSyn/HsPat.hs
+++ b/compiler/hsSyn/HsPat.hs
@@ -540,8 +540,12 @@ isIrrefutableHsPat :: OutputableBndr id => LPat id -> Bool
 --      (NB: this is not quite the same as the (silly) defn
 --      in 3.17.2 of the Haskell 98 report.)
 --
--- isIrrefutableHsPat returns False if it's in doubt; specifically
--- on a ConPatIn it doesn't know the size of the constructor family
+-- WARNING: isIrrefutableHsPat returns False if it's in doubt.
+-- Specifically on a ConPatIn, which is what it sees for a
+-- (LPat Name) in the renamer, it doesn't know the size of the
+-- constructor family, so it returns False.  Result: only
+-- tuple patterns are considered irrefuable at the renamer stage.
+--
 -- But if it returns True, the pattern is definitely irrefutable
 isIrrefutableHsPat pat
   = go pat
diff --git a/compiler/rename/RnExpr.hs b/compiler/rename/RnExpr.hs
index 035b4db..5df96cf 100644
--- a/compiler/rename/RnExpr.hs
+++ b/compiler/rename/RnExpr.hs
@@ -1437,6 +1437,11 @@ ado _ctxt []        tail _ = return (tail, emptyNameSet)
 -- the bind form, which would give rise to a Monad constraint.
 ado ctxt [(L _ (BindStmt pat rhs _ _),_)] tail _
   | isIrrefutableHsPat pat, (False,tail') <- needJoin tail
+    -- WARNING: isIrrefutableHsPat on (HsPat Name) doesn't have enough info
+    --          to know which types have only one constructor.  So only
+    --          tuples come out as irrefutable; other single-constructor
+    --          types, and newtypes, will not.  See the code for
+    --          isIrrefuatableHsPat
   = mkApplicativeStmt ctxt [ApplicativeArgOne pat rhs] False tail'
 
 ado _ctxt [(one,_)] tail _ = return (one:tail, emptyNameSet)


From git at git.haskell.org  Wed Dec  2 14:42:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 14:42:35 +0000 (UTC)
Subject: [commit: ghc] master: Comments (TcSMonad) (b564731)
Message-ID: <20151202144235.3547A3A300@ghc.haskell.org>

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

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

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

commit b5647315f778f3efd2be8a2f5b2aea7535179232
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 2 14:41:12 2015 +0000

    Comments (TcSMonad)


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

b5647315f778f3efd2be8a2f5b2aea7535179232
 compiler/typecheck/TcSMonad.hs | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index bf3f397..4a4d766 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -705,6 +705,9 @@ A generalised substitution S is "inert" iff
   (IG2) if (b -f-> t) in S, and f >= f, then S(f,t) = t
         that is, each individual binding is "self-stable"
 
+By (IG1) we define S*(f,t) to be the result of exahaustively
+applying S(f,_) to t.
+
 ----------------------------------------------------------------
 Our main invariant:
    the inert CTyEqCans should be an inert generalised substitution
@@ -737,7 +740,8 @@ This is the main theorem!
            or (K2c) not (fw >= fs)
            or (K2d) a not in s
 
-      (K3) If (b -fs-> s) is in S with (fw >= fs), then
+      (K3) See Note [K3: completeness of solving]
+           If (b -fs-> s) is in S with (fw >= fs), then
         (K3a) If the role of fs is nominal: s /= a
         (K3b) If the role of fs is representational: EITHER
                 a not in s, OR
@@ -818,9 +822,9 @@ Key lemma to make it watertight.
 
 Also, consider roles more carefully. See Note [Flavours with roles].
 
-Completeness
-~~~~~~~~~~~~~
-K3: completeness.  (K3) is not necessary for the extended substitution
+Note [K3: completeness of solving]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+(K3) is not necessary for the extended substitution
 to be inert.  In fact K1 could be made stronger by saying
    ... then (not (fw >= fs) or not (fs >= fs))
 But it's not enough for S to be inert; we also want completeness.


From git at git.haskell.org  Wed Dec  2 14:46:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 14:46:54 +0000 (UTC)
Subject: [commit: ghc] master: Revert "ghci: Add support for prompt functions"
 (d00cdf2)
Message-ID: <20151202144654.066E33A300@ghc.haskell.org>

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

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

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

commit d00cdf237f28d72df74157bfdf30e623786b68c3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 2 14:59:39 2015 +0100

    Revert "ghci: Add support for prompt functions"
    
    This reverts commit 72e362076e7ce823678797a162d0645e088cd594 which was
    accidentally merged.


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

d00cdf237f28d72df74157bfdf30e623786b68c3
 ghc/GhciMonad.hs     |  14 ++-----
 ghc/InteractiveUI.hs | 105 ++++++++++++++++++++++-----------------------------
 2 files changed, 48 insertions(+), 71 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d00cdf237f28d72df74157bfdf30e623786b68c3

From git at git.haskell.org  Wed Dec  2 15:30:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 15:30:04 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11028-2' created
Message-ID: <20151202153004.9461A3A300@ghc.haskell.org>

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

New branch : wip/T11028-2
Referencing: d9c274b4180616cdba64a68f7d5610117ca01e06

From git at git.haskell.org  Wed Dec  2 15:30:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 15:30:07 +0000 (UTC)
Subject: [commit: ghc] wip/T11028-2: Refactor ConDecl (d9c274b)
Message-ID: <20151202153007.4DD163A300@ghc.haskell.org>

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

On branch  : wip/T11028-2
Link       : http://ghc.haskell.org/trac/ghc/changeset/d9c274b4180616cdba64a68f7d5610117ca01e06/ghc

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

commit d9c274b4180616cdba64a68f7d5610117ca01e06
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Refactor ConDecl
    
    Summary:
    The ConDecl type in HsDecls is an uneasy compromise. For the most part,
    HsSyn directly reflects the syntax written by the programmer; and that
    gives just the right "pegs" on which to hang Alan's API annotations. But
    ConDecl doesn't properly reflect the syntax of Haskell-98 and GADT-style
    data type declarations.
    
    To be concrete, here's a draft new data type
    
    data ConDecl name
      | ConDeclGADT
          { con_names   :: [Located name]
          , con_type    :: LHsSigType name  -- The type after the ?::?
          , con_doc     :: Maybe LHsDocString }
    
      | ConDeclH98
          { con_name    :: Located name
    
          , con_qvars     :: Maybe (LHsQTyVars name)
            -- User-written forall (if any), and its implicit
            -- kind variables
            -- Non-Nothing needs -XExistentialQuantification
    
          , con_cxt       :: Maybe (LHsContext name)
            -- ^ User-written context (if any)
    
          , con_details   :: HsConDeclDetails name
              -- ^ Arguments
    
          , con_doc       :: Maybe LHsDocString
              -- ^ A possible Haddock comment.
          } deriving (Typeable)
    
    Note that
    
        For GADTs, just keep a type. That's what the user writes.
        NB:HsType can represent records on the LHS of an arrow:
    
          { x:Int,y:Bool} -> T
    
        con_qvars and con_cxt are both Maybe because they are both
        optional (the forall and the context of an existential data type
    
        For ConDeclGADT the type variables of the data type do not scope
        over the con_type; whereas for ConDeclH98 they do scope over con_cxt
        and con_details.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, austin, goldfire, bgamari
    
    Subscribers: goldfire, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1558
    
    GHC Trac Issues: #11028


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

d9c274b4180616cdba64a68f7d5610117ca01e06
 compiler/deSugar/DsMeta.hs                         |  99 ++++++++---
 compiler/hsSyn/Convert.hs                          |  22 ++-
 compiler/hsSyn/HsDecls.hs                          | 133 +++++---------
 compiler/hsSyn/HsTypes.hs                          |   4 +-
 compiler/hsSyn/HsUtils.hs                          |  26 ++-
 compiler/parser/Parser.y                           |  12 +-
 compiler/parser/RdrHsSyn.hs                        |  72 +++-----
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         |  13 +-
 compiler/rename/RnSource.hs                        | 120 +++++--------
 compiler/rename/RnTypes.hs                         |  22 ++-
 compiler/typecheck/TcHsType.hs                     |   9 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 194 +++++++++++++++------
 testsuite/tests/ghc-api/annotations/T10399.stdout  |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   2 +-
 testsuite/tests/rename/should_fail/T7943.stderr    |   6 +-
 utils/haddock                                      |   2 +-
 20 files changed, 416 insertions(+), 332 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d9c274b4180616cdba64a68f7d5610117ca01e06

From git at git.haskell.org  Wed Dec  2 17:07:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 17:07:21 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: made hlint a bit happier (afd5190)
Message-ID: <20151202170721.C056A3A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/afd5190443c32c7fd97a2e0d9c8256a2c098ba7b/ghc

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

commit afd5190443c32c7fd97a2e0d9c8256a2c098ba7b
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 16:33:35 2015 +0100

    made hlint a bit happier


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

afd5190443c32c7fd97a2e0d9c8256a2c098ba7b
 compiler/deSugar/Check.hs    | 113 +++++++++++++++++++++++++++----------------
 compiler/deSugar/PmExpr.hs   |  11 +++--
 compiler/deSugar/TmOracle.hs |  27 +++++------
 3 files changed, 89 insertions(+), 62 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc afd5190443c32c7fd97a2e0d9c8256a2c098ba7b

From git at git.haskell.org  Wed Dec  2 17:07:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 17:07:24 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: some more simplification & comments about
 overloaded literals (850905a)
Message-ID: <20151202170724.7E53C3A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/850905ab3f2e87d5d3def01dfd2ad63dd012937a/ghc

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

commit 850905ab3f2e87d5d3def01dfd2ad63dd012937a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 17:54:16 2015 +0100

    some more simplification & comments about overloaded literals


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

850905ab3f2e87d5d3def01dfd2ad63dd012937a
 compiler/deSugar/Check.hs    | 14 +++-------
 compiler/deSugar/TmOracle.hs | 61 ++++++++++++++++++++++++++++++--------------
 2 files changed, 45 insertions(+), 30 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 0287803..5b33167 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -876,14 +876,9 @@ pruneVSABound n v = pruneVSABound' n init_cs emptylist v
             -- Have another go at the term oracle state, for strange
             -- equalities between overloaded literals. See
             -- Note [Undecidable Equality on Overloaded Literals] in TmOracle
-            case tryLitEqs tm_env of
-              -- An equality (l1 ~ l2) is in the residual constraints. This
-              -- means that the whole subtree makes the assumption that
-              -- from l1 ~ from l2. We do not want to print such warnings.
-              Just True  -> return []
-              -- No strange constraints (l1 ~ l2) are present. Proceed with
-              -- the type oracle.
-              Just False -> do
+            if containsEqLits tm_env
+              then return [] -- not on the safe side
+              else do
                 -- TODO: Provide an incremental interface for the type oracle
                 sat <- tyOracle (listToBag ty_cs)
                 return $ case sat of
@@ -891,9 +886,6 @@ pruneVSABound n v = pruneVSABound' n init_cs emptylist v
                                vector = substInValVecAbs subst (toList vec)
                            in  [(vector, residual_eqs)]
                   False -> []
-              -- Literal constraints (l1 ~ l2) were present and exploiting them
-              -- detected an inconsistency.
-              Nothing    -> return []
 
           Constraint cs vsa -> case splitConstraints cs of
             (new_ty_cs, new_tm_cs, new_bot_ct) ->
diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index 39b61b6..d69ffdb 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -14,7 +14,7 @@ module TmOracle (
         pprPmExprWithParens, lhsExprToPmExpr, hsExprToPmExpr,
 
         -- the term oracle
-        tmOracle, TmState, initialTmState, tryLitEqs,
+        tmOracle, TmState, initialTmState, containsEqLits,
 
         -- misc.
         exprDeepLookup, pmLitType, flattenPmVarEnv
@@ -149,6 +149,7 @@ simplifyComplexEq (e1, e2) = (fst $ simplifyPmExpr e1, fst $ simplifyPmExpr e2)
 -- | Simplify an expression. The boolean indicates if there has been any
 -- simplification or if the operation was a no-op.
 simplifyPmExpr :: PmExpr -> (PmExpr, Bool)
+-- See Note [Deep equalities]
 simplifyPmExpr e = case e of
   PmExprCon c ts -> case mapAndUnzip simplifyPmExpr ts of
                       (ts', bs) -> (PmExprCon c ts', or bs)
@@ -157,6 +158,7 @@ simplifyPmExpr e = case e of
 
 -- | Simplify an equality expression. The equality is given in parts.
 simplifyEqExpr :: PmExpr -> PmExpr -> (PmExpr, Bool)
+-- See Note [Deep equalities]
 simplifyEqExpr e1 e2 = case (e1, e2) of
   -- Varables
   (PmExprVar x, PmExprVar y)
@@ -322,9 +324,9 @@ cannot detect that constraint:
 
     False ~ (l1 ~ l3), False ~ (l2 ~ l4), l1 ~ l3
 
-is inconsistent. That's what function @tryLitEqs@ tries to do: use the equality
-l1 ~ l3 to replace False ~ (l1 ~ l3) with False ~ (l1 ~ l1) and expose the
-inconsistency.
+is inconsistent. That's what function @tryLitEqs@ (in comments) tries to do:
+use the equality l1 ~ l3 to replace False ~ (l1 ~ l3) with False ~ (l1 ~ l1)
+and expose the inconsistency.
 
 PROBLEM 2:
 ~~~~~~~~~~
@@ -354,16 +356,33 @@ issue a warning like:
     In an equation for f:
         Patterns not matched:
           ...
-          l1 y   where y not one of {l2, l4} -- (*)
+          l1 y   where y not one of {l2, l4}
                  under the assumption that l1 ~ l3
 
 It may be more complex but I would prefer to play on the safe side and (safely)
 issue all warnings and leave it up to the user to decide whether the assumption
 holds or not.
 
--}
+At the moment, we use @containsEqLits@ and consider all constraints that
+include literal equalities inconsistent. We could achieve the same by replacing
+this clause of @eqPmLit@:
+
+  eqPmLit (PmOLit b1 l1) (PmOLit b2 l2)
+    | b1 == b2 && l1 == l2 = Just True
+    | otherwise            = Nothing
+
+with this:
 
+  eqPmLit (PmOLit b1 l1) (PmOLit b2 l2)
+    | b1 == b2 && l1 == l2 = Just True
+    | otherwise            = Just False
 
+which approximates on the unsafe side. Hopefully, literals always need a
+catch-all case to be considered exhaustive so in practice it makes small
+difference. I hate this but it gives the warnings the users are used to.
+-}
+
+{- Not Enabled at the moment
 
 -- | Check whether overloaded literal constraints exist in the state and if
 -- they can be used to detect further inconsistencies.
@@ -402,19 +421,6 @@ exploitLitEqs tm_state = case tm_state of
     replaceLitSimplifyComplexEq l1 l2 (e1,e2) =
       simplifyComplexEq (replaceLit l1 l2 e1, replaceLit l1 l2 e2)
 
-exists :: (a -> Maybe b) -> [a] -> Maybe (b, [a])
-exists _ []     = Nothing
-exists p (x:xs) = case p x of
-  Just y  -> Just (y, xs)
-  Nothing -> do
-    (y, ys) <- exists p xs
-    return (y, x:ys)
-
--- | Check whether a complex equality refers to literals only
-isLitEq_mb :: ComplexEq -> Maybe (PmLit, PmLit)
-isLitEq_mb (PmExprLit l1, PmExprLit l2) = Just (l1, l2)
-isLitEq_mb _other_eq                    = Nothing
-
 -- | Replace a literal with another in an expression
 -- See Note [Undecidable Equality on Overloaded Literals]
 replaceLit :: PmLit -> PmLit -> PmExpr -> PmExpr
@@ -427,5 +433,22 @@ replaceLit l1 l2 e = case e of
                       Nothing    -> e
   PmExprEq e1 e2 -> PmExprEq (replaceLit l1 l2 e1) (replaceLit l1 l2 e2)
   PmExprOther {} -> e -- do nothing
+-}
 
+-- | Check whether the term oracle state
+-- contains any equalities between literals.
+containsEqLits :: TmState -> Bool
+containsEqLits (stb, _) = isJust (exists isLitEq_mb stb)
+
+exists :: (a -> Maybe b) -> [a] -> Maybe (b, [a])
+exists _ []     = Nothing
+exists p (x:xs) = case p x of
+  Just y  -> Just (y, xs)
+  Nothing -> do
+    (y, ys) <- exists p xs
+    return (y, x:ys)
 
+-- | Check whether a complex equality refers to literals only
+isLitEq_mb :: ComplexEq -> Maybe (PmLit, PmLit)
+isLitEq_mb (PmExprLit l1, PmExprLit l2) = Just (l1, l2)
+isLitEq_mb _other_eq                    = Nothing


From git at git.haskell.org  Wed Dec  2 20:03:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:03:54 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: make hlint even happier: fit everything in
 80 columns (baff06d)
Message-ID: <20151202200354.2EF653A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/baff06dedb173113ec190b3697f7095fce481a4b/ghc

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

commit baff06dedb173113ec190b3697f7095fce481a4b
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 20:41:33 2015 +0100

    make hlint even happier: fit everything in 80 columns


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

baff06dedb173113ec190b3697f7095fce481a4b
 compiler/deSugar/Check.hs    | 137 +++++++++++++++++++++++--------------------
 compiler/deSugar/PmExpr.hs   |   8 +--
 compiler/deSugar/TmOracle.hs |   3 +-
 3 files changed, 81 insertions(+), 67 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc baff06dedb173113ec190b3697f7095fce481a4b

From git at git.haskell.org  Wed Dec  2 20:21:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:21:09 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Major Overhaul of Pattern Match Checking
 (Fixes #595) (60d7d28)
Message-ID: <20151202202109.9F4603A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/60d7d287b70e4b432307325a38577c6b2d17fe5a/ghc

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

commit 60d7d287b70e4b432307325a38577c6b2d17fe5a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 21:20:43 2015 +0100

    Major Overhaul of Pattern Match Checking (Fixes #595)
    
    This patch adresses several problems concerned with exhaustiveness and
    redundancy checking of pattern matching. The list of improvements includes:
    
    * Making the check type-aware (handles GADTs, Type Families, DataKinds, etc.).
      This fixes #4139, #3927, #8970 and other related tickets.
    
    * Making the check laziness-aware. Cases that are overlapped but affect
      evaluation are issued now with "Patterns have inaccessible right hand side".
      Additionally, "Patterns are overlapped" is now replaced by "Patterns are
      redundant".
    
    * Improved messages for literals. This addresses tickets #5724, #2204, etc.
    
    * Improved reasoning concerning cases where simple and overloaded
      patterns are matched (See #322).
    
    * Substantially improved reasoning for pattern guards. Addresses #3078.
    
    * OverloadedLists extension does not break exhaustiveness checking anymore
      (addresses #9951). Note that in general this cannot be handled but if we know
      that an argument has type '[a]', we treat it as a list since, the instance of
      'IsList' gives the identity for both 'fromList' and 'toList'. If the type is
      not clear or is not the list type, then the check cannot do much still. I am
      a bit concerned about OverlappingInstances though, since one may override the
      '[a]' instance with e.g. an '[Int]' instance that is not the identity.
    
    * Improved reasoning for nested pattern matching (partial solution). Now we
      propagate type and (some) term constraints deeper when checking, so we can
      detect more inconsistencies. For example, this is needed for #4139.
    
    I am still not satisfied with several things but I would like to address at
    least the following before the next release:
        Term constraints are too many and not printed for non-exhaustive matches
    (with the exception of literals). This sometimes results in two identical (in
    appearance) uncovered warnings. Unless we actually show their difference, I
    would like to have a single warning.


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

60d7d287b70e4b432307325a38577c6b2d17fe5a
 compiler/basicTypes/UniqSupply.hs                  |   26 +-
 compiler/deSugar/Check.hs                          | 2017 +++++++++++++-------
 compiler/deSugar/DsBinds.hs                        |   10 +-
 compiler/deSugar/DsExpr.hs                         |   18 +-
 compiler/deSugar/DsGRHSs.hs                        |    2 +-
 compiler/deSugar/DsMonad.hs                        |   64 +-
 compiler/deSugar/Match.hs                          |  174 +-
 compiler/deSugar/Match.hs-boot                     |    1 +
 compiler/deSugar/PmExpr.hs                         |  377 ++++
 compiler/deSugar/TmOracle.hs                       |  455 +++++
 compiler/ghc.cabal.in                              |    2 +
 compiler/ghc.mk                                    |    1 +
 compiler/hsSyn/HsLit.hs                            |   22 +
 compiler/hsSyn/HsPat.hs                            |   41 +-
 compiler/prelude/TysWiredIn.hs-boot                |    2 +-
 compiler/typecheck/TcMType.hs                      |   15 +
 compiler/typecheck/TcRnTypes.hs                    |    5 +-
 compiler/typecheck/TcSMonad.hs                     |    1 -
 compiler/typecheck/TcSimplify.hs                   |   14 +
 compiler/typecheck/TcType.hs                       |   42 +
 compiler/types/Type.hs                             |   22 +-
 compiler/utils/Bag.hs                              |   26 +-
 compiler/utils/MonadUtils.hs                       |    6 +-
 .../tests/deSugar/should_compile/T2395.stderr      |    4 +-
 .../tests/deSugar/should_compile/T5117.stderr      |    2 +-
 testsuite/tests/deSugar/should_compile/all.T       |    1 -
 .../tests/deSugar/should_compile/ds002.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds003.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds019.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds020.stderr      |    8 +-
 testsuite/tests/deSugar/should_compile/ds022.hs    |    2 +
 .../tests/deSugar/should_compile/ds022.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds043.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds051.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds056.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds058.stderr      |    6 +-
 testsuite/tests/deSugar/should_compile/ds060.hs    |   25 -
 testsuite/tests/driver/werror.stderr               |    4 +-
 testsuite/tests/gadt/Gadt17_help.hs                |    1 -
 testsuite/tests/gadt/T7294.stderr                  |    4 +
 testsuite/tests/ghci/scripts/Defer02.stderr        |    8 +
 testsuite/tests/{ado => pmcheck}/Makefile          |    0
 .../should_compile/Makefile                        |    0
 testsuite/tests/pmcheck/should_compile/T2006.hs    |   13 +
 .../tests/pmcheck/should_compile/T2006.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T2204.hs    |    9 +
 .../tests/pmcheck/should_compile/T2204.stderr      |   14 +
 testsuite/tests/pmcheck/should_compile/T3078.hs    |   12 +
 .../tests/pmcheck/should_compile/T3078.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T322.hs     |   29 +
 .../tests/pmcheck/should_compile/T322.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T366.hs     |   10 +
 .../tests/pmcheck/should_compile/T366.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T3927.hs    |   13 +
 .../tests/pmcheck/should_compile/T3927.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T3927a.hs   |   15 +
 .../tests/pmcheck/should_compile/T3927a.stderr     |    0
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   75 +
 .../tests/pmcheck/should_compile/T3927b.stderr     |   39 +
 testsuite/tests/pmcheck/should_compile/T4139.hs    |   28 +
 .../tests/pmcheck/should_compile/T4139.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T6124.hs    |   14 +
 .../tests/pmcheck/should_compile/T6124.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T7669.hs    |    9 +
 .../tests/pmcheck/should_compile/T7669.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T8970.hs    |   22 +
 .../tests/pmcheck/should_compile/T8970.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951.hs    |   10 +
 .../tests/pmcheck/should_compile/T9951.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951b.hs   |    7 +
 .../tests/pmcheck/should_compile/T9951b.stderr     |    9 +
 testsuite/tests/pmcheck/should_compile/all.T       |   35 +
 testsuite/tests/pmcheck/should_compile/pmc001.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc001.stderr     |   17 +
 testsuite/tests/pmcheck/should_compile/pmc002.hs   |    7 +
 .../tests/pmcheck/should_compile/pmc002.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc003.hs   |    9 +
 .../tests/pmcheck/should_compile/pmc003.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc004.hs   |   16 +
 .../tests/pmcheck/should_compile/pmc004.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc005.hs   |   12 +
 .../tests/pmcheck/should_compile/pmc005.stderr     |    7 +
 testsuite/tests/pmcheck/should_compile/pmc006.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc006.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc007.hs   |   20 +
 .../tests/pmcheck/should_compile/pmc007.stderr     |   24 +
 .../tests/typecheck/should_compile/T5490.stderr    |    8 +
 87 files changed, 3056 insertions(+), 913 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 60d7d287b70e4b432307325a38577c6b2d17fe5a

From git at git.haskell.org  Wed Dec  2 20:38:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:38:33 +0000 (UTC)
Subject: [commit: ghc] master: StgSyn: Remove unused SRT constructor (1caff20)
Message-ID: <20151202203833.A53403A300@ghc.haskell.org>

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

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

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

commit 1caff20fad1e533d7dfb4215e69ce8678def943b
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Wed Dec 2 14:35:27 2015 -0600

    StgSyn: Remove unused SRT constructor
    
    Reviewed By: bgamari, austin
    
    Differential Revision: https://phabricator.haskell.org/D1560


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

1caff20fad1e533d7dfb4215e69ce8678def943b
 compiler/simplStg/UnariseStg.hs | 1 -
 compiler/stgSyn/StgSyn.hs       | 5 -----
 2 files changed, 6 deletions(-)

diff --git a/compiler/simplStg/UnariseStg.hs b/compiler/simplStg/UnariseStg.hs
index a1533ba..81de31b 100644
--- a/compiler/simplStg/UnariseStg.hs
+++ b/compiler/simplStg/UnariseStg.hs
@@ -164,7 +164,6 @@ unariseAlt us rho (con, xs, uses, e)
 unariseSRT :: UnariseEnv -> SRT -> SRT
 unariseSRT _   NoSRT            = NoSRT
 unariseSRT rho (SRTEntries ids) = SRTEntries (concatMapVarSet (unariseId rho) ids)
-unariseSRT _   (SRT {})         = panic "unariseSRT"
 
 unariseLives :: UnariseEnv -> StgLiveVars -> StgLiveVars
 unariseLives rho ids = concatMapVarSet (unariseId rho) ids
diff --git a/compiler/stgSyn/StgSyn.hs b/compiler/stgSyn/StgSyn.hs
index 1c6a00f..f0eb2d5 100644
--- a/compiler/stgSyn/StgSyn.hs
+++ b/compiler/stgSyn/StgSyn.hs
@@ -46,7 +46,6 @@ module StgSyn (
 
 #include "HsVersions.h"
 
-import Bitmap
 import CoreSyn     ( AltCon, Tickish )
 import CostCentre  ( CostCentreStack )
 import Data.List   ( intersperse )
@@ -604,18 +603,14 @@ data SRT
   = NoSRT
   | SRTEntries IdSet
         -- generated by CoreToStg
-  | SRT !Int{-offset-} !Int{-length-} !Bitmap{-bitmap-}
-        -- generated by computeSRTs
 
 nonEmptySRT :: SRT -> Bool
 nonEmptySRT NoSRT           = False
 nonEmptySRT (SRTEntries vs) = not (isEmptyVarSet vs)
-nonEmptySRT _               = True
 
 pprSRT :: SRT -> SDoc
 pprSRT (NoSRT)          = ptext (sLit "_no_srt_")
 pprSRT (SRTEntries ids) = text "SRT:" <> ppr ids
-pprSRT (SRT off _ _)    = parens (ppr off <> comma <> text "*bitmap*")
 
 {-
 ************************************************************************


From git at git.haskell.org  Wed Dec  2 20:38:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:38:36 +0000 (UTC)
Subject: [commit: ghc] master: Move Stg-specific code from DynFlags to
 SimplStg (c75948b)
Message-ID: <20151202203836.4D0453A300@ghc.haskell.org>

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

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

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

commit c75948b9dcf5a2761223f4ef3777042982c33cc8
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Wed Dec 2 14:36:56 2015 -0600

    Move Stg-specific code from DynFlags to SimplStg
    
    Reviewed By: bgamari, austin
    
    Differential Revision: https://phabricator.haskell.org/D1552


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

c75948b9dcf5a2761223f4ef3777042982c33cc8
 compiler/main/DynFlags.hs     | 26 --------------------------
 compiler/simplStg/SimplStg.hs | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 98c61e7..7779732 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -113,10 +113,6 @@ module DynFlags (
         -- ** DynFlags C compiler options
         picCCOpts, picPOpts,
 
-        -- * Configuration of the stg-to-stg passes
-        StgToDo(..),
-        getStgToDo,
-
         -- * Compiler configuration suitable for display to the user
         compilerInfo,
 
@@ -2028,28 +2024,6 @@ updOptLevel n dfs
    extra_gopts  = [ f | (ns,f) <- optLevelFlags, final_n `elem` ns ]
    remove_gopts = [ f | (ns,f) <- optLevelFlags, final_n `notElem` ns ]
 
--- -----------------------------------------------------------------------------
--- StgToDo:  abstraction of stg-to-stg passes to run.
-
-data StgToDo
-  = StgDoMassageForProfiling  -- should be (next to) last
-  -- There's also setStgVarInfo, but its absolute "lastness"
-  -- is so critical that it is hardwired in (no flag).
-  | D_stg_stats
-
-getStgToDo :: DynFlags -> [StgToDo]
-getStgToDo dflags
-  = todo2
-  where
-        stg_stats = gopt Opt_StgStats dflags
-
-        todo1 = if stg_stats then [D_stg_stats] else []
-
-        todo2 | WayProf `elem` ways dflags
-              = StgDoMassageForProfiling : todo1
-              | otherwise
-              = todo1
-
 {- **********************************************************************
 %*                                                                      *
                 DynFlags parser
diff --git a/compiler/simplStg/SimplStg.hs b/compiler/simplStg/SimplStg.hs
index b8804a4..b8491fc 100644
--- a/compiler/simplStg/SimplStg.hs
+++ b/compiler/simplStg/SimplStg.hs
@@ -87,3 +87,25 @@ stg2stg dflags module_name binds
             --         UniqueSupply for the next guy to use
             --         cost-centres to be declared/registered (specialised)
             --         add to description of what's happened (reverse order)
+
+-- -----------------------------------------------------------------------------
+-- StgToDo:  abstraction of stg-to-stg passes to run.
+
+-- | Optional Stg-to-Stg passes.
+data StgToDo
+  = StgDoMassageForProfiling  -- should be (next to) last
+  | D_stg_stats
+
+-- | Which optional Stg-to-Stg passes to run. Depends on flags, ways etc.
+getStgToDo :: DynFlags -> [StgToDo]
+getStgToDo dflags
+  = todo2
+  where
+        stg_stats = gopt Opt_StgStats dflags
+
+        todo1 = if stg_stats then [D_stg_stats] else []
+
+        todo2 | WayProf `elem` ways dflags
+              = StgDoMassageForProfiling : todo1
+              | otherwise
+              = todo1


From git at git.haskell.org  Wed Dec  2 20:38:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:38:38 +0000 (UTC)
Subject: [commit: ghc] master: Remove *.xml from gitignore (d4d54b4)
Message-ID: <20151202203838.E6ADA3A300@ghc.haskell.org>

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

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

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

commit d4d54b463ef73a577054e9ed1dfce5044072bce7
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Wed Dec 2 14:37:07 2015 -0600

    Remove *.xml from gitignore
    
    With the move to RST-based documentation, there is no need to ignore XML files
    in the source tree anymore.
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1554


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

d4d54b463ef73a577054e9ed1dfce5044072bce7
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index a223f30..b61ba02 100644
--- a/.gitignore
+++ b/.gitignore
@@ -91,7 +91,6 @@ _darcs/
 /docs/index.html
 /docs/users_guide/users_guide
 /docs/users_guide/ghc.1
-/docs/users_guide/*.xml
 /docs/users_guide/*.gen.rst
 /docs/users_guide/ghc_config.py
 /docs/users_guide/ghc_config.pyc


From git at git.haskell.org  Wed Dec  2 20:38:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:38:41 +0000 (UTC)
Subject: [commit: ghc] master: Avoid panic due to partial ieName (a12e47b)
Message-ID: <20151202203841.EC73D3A300@ghc.haskell.org>

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

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

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

commit a12e47bed74e305b37e68014c52feba3dd075514
Author: Eric Seidel <gridaphobe at gmail.com>
Date:   Wed Dec 2 14:37:21 2015 -0600

    Avoid panic due to partial ieName
    
    HsImpExp.ieName is partial and fails when given e.g. `module X`
    
    solution: use ieNames instead which returns a list of names instead of a single name.
    
    Reviewed By: bgamari, austin
    
    Differential Revision: https://phabricator.haskell.org/D1551
    
    GHC Trac Issues: #11077


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

a12e47bed74e305b37e68014c52feba3dd075514
 compiler/typecheck/TcHsSyn.hs                         | 2 +-
 testsuite/tests/warnings/should_compile/T11077.hs     | 3 +++
 testsuite/tests/warnings/should_compile/T11077.stderr | 3 +++
 testsuite/tests/warnings/should_compile/all.T         | 1 +
 4 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/compiler/typecheck/TcHsSyn.hs b/compiler/typecheck/TcHsSyn.hs
index ae095e0..39e7f2d 100644
--- a/compiler/typecheck/TcHsSyn.hs
+++ b/compiler/typecheck/TcHsSyn.hs
@@ -317,7 +317,7 @@ zonkTopDecls ev_binds binds export_ies sig_ns rules vects imp_specs fords
         ; warn_missing_sigs <- woptM Opt_WarnMissingSigs
         ; warn_only_exported <- woptM Opt_WarnMissingExportedSigs
         ; let export_occs  = maybe emptyBag
-                                   (listToBag . map (rdrNameOcc . ieName . unLoc) . unLoc)
+                                   (listToBag . concatMap (map rdrNameOcc . ieNames . unLoc) . unLoc)
                                    export_ies
               sig_warn
                 | warn_only_exported = topSigWarnIfExported export_occs sig_ns
diff --git a/testsuite/tests/warnings/should_compile/T11077.hs b/testsuite/tests/warnings/should_compile/T11077.hs
new file mode 100644
index 0000000..76533cb
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/T11077.hs
@@ -0,0 +1,3 @@
+module T11077 (module X, foo) where
+import Data.List as X
+foo = undefined
diff --git a/testsuite/tests/warnings/should_compile/T11077.stderr b/testsuite/tests/warnings/should_compile/T11077.stderr
new file mode 100644
index 0000000..3cb2cba
--- /dev/null
+++ b/testsuite/tests/warnings/should_compile/T11077.stderr
@@ -0,0 +1,3 @@
+
+T11077.hs:3:1: warning:
+    Top-level binding with no type signature: foo :: forall t. t
diff --git a/testsuite/tests/warnings/should_compile/all.T b/testsuite/tests/warnings/should_compile/all.T
index 3954ba8..c2b8dd2 100644
--- a/testsuite/tests/warnings/should_compile/all.T
+++ b/testsuite/tests/warnings/should_compile/all.T
@@ -4,6 +4,7 @@ test('T9178', extra_clean(['T9178.o', 'T9178DataType.o',
 			   'T9178.hi', 'T9178DataType.hi']),
 	      multimod_compile, ['T9178', '-Wall'])
 test('T9230', normal, compile_without_flag('-fno-warn-tabs'), [''])
+test('T11077', normal, compile, ['-fwarn-missing-exported-sigs'])
 test('T11128', normal, compile, [''])
 
 test('DeprU',


From git at git.haskell.org  Wed Dec  2 20:56:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:56:03 +0000 (UTC)
Subject: [commit: ghc] master: Create empty dump files when there was nothing
 to dump (8cba907)
Message-ID: <20151202205603.64F1B3A300@ghc.haskell.org>

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

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

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

commit 8cba907ad404ba4005558b5a8966390159938172
Author: Vladimir Trubilov <vtrubiloff at gmail.com>
Date:   Wed Dec 2 20:47:23 2015 +0100

    Create empty dump files when there was nothing to dump
    
    This patch creates empty dump file when GHC was run with
    `-ddump-rule-firings` (or `-ddump-rule-rewrites`) and `-ddump-to-file`
    specified, and there were no rules applied. If dump already exists it
    will be overwritten by empty one.
    
    Test Plan: ./validate
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1514
    
    GHC Trac Issues: #10320


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

8cba907ad404ba4005558b5a8966390159938172
 compiler/main/DriverPipeline.hs                |  7 +-
 compiler/main/DynFlags.hs                      |  4 +-
 compiler/main/ErrUtils.hs                      | 93 ++++++++++++++++++--------
 testsuite/tests/driver/Makefile                | 39 +++++++++++
 testsuite/tests/driver/T10320-with-rule.hs     |  9 +++
 testsuite/tests/driver/T10320-without-rules.hs |  4 ++
 testsuite/tests/driver/all.T                   | 10 +++
 7 files changed, 135 insertions(+), 31 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8cba907ad404ba4005558b5a8966390159938172

From git at git.haskell.org  Wed Dec  2 20:56:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 20:56:06 +0000 (UTC)
Subject: [commit: ghc] master: ErrUtils: Spruce up Haddocks (0d1a2d2)
Message-ID: <20151202205606.08EED3A300@ghc.haskell.org>

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

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

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

commit 0d1a2d23be3c980d9710294fe52d010690a2e56e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 2 20:59:25 2015 +0100

    ErrUtils: Spruce up Haddocks
    
    This is a pretty commonly needed module; Haddocks are worth the effort.


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

0d1a2d23be3c980d9710294fe52d010690a2e56e
 compiler/main/ErrUtils.hs | 59 ++++++++++++++++++++++++++---------------------
 1 file changed, 33 insertions(+), 26 deletions(-)

diff --git a/compiler/main/ErrUtils.hs b/compiler/main/ErrUtils.hs
index 9fc9e49..5e585da 100644
--- a/compiler/main/ErrUtils.hs
+++ b/compiler/main/ErrUtils.hs
@@ -7,29 +7,35 @@
 {-# LANGUAGE CPP #-}
 
 module ErrUtils (
-        MsgDoc,
+        -- * Basic types
         Validity(..), andValid, allValid, isValid, getInvalids,
+        Severity(..),
 
-        ErrMsg, ErrDoc, errDoc, WarnMsg, Severity(..),
+        -- * Messages
+        MsgDoc, ErrMsg, ErrDoc, errDoc, WarnMsg,
         Messages, ErrorMessages, WarningMessages,
         errMsgSpan, errMsgContext,
-        mkLocMessage, pprMessageBag, pprErrMsgBagWithLoc,
-        pprLocErrMsg, makeIntoWarning,
+        errorsFound, isEmptyMessages,
 
-        errorsFound, emptyMessages, isEmptyMessages,
+        -- ** Formatting
+        pprMessageBag, pprErrMsgBagWithLoc,
+        pprLocErrMsg, printBagOfErrors,
+
+        -- ** Construction
+        emptyMessages, mkLocMessage, makeIntoWarning,
         mkErrMsg, mkPlainErrMsg, mkErrDoc, mkLongErrMsg, mkWarnMsg,
         mkPlainWarnMsg,
-        printBagOfErrors,
         warnIsErrorMsg, mkLongWarnMsg,
 
-        ghcExit,
+        -- * Utilities
         doIfSet, doIfSet_dyn,
+
+        -- * Dump files
         dumpIfSet, dumpIfSet_dyn, dumpIfSet_dyn_printer,
         mkDumpDoc, dumpSDoc,
-
         openDumpFiles, closeDumpFiles,
 
-        --  * Messages during compilation
+        -- * Issuing messages during compilation
         putMsg, printInfoForUser, printOutputForUser,
         logInfo, logOutput,
         errorMsg, warningMsg,
@@ -37,7 +43,7 @@ module ErrUtils (
         compilationProgressMsg,
         showPass,
         debugTraceMsg,
-
+        ghcExit,
         prettyPrintGhcErrors,
     ) where
 
@@ -69,8 +75,8 @@ type MsgDoc  = SDoc
 
 -------------------------
 data Validity
-  = IsValid            -- Everything is fine
-  | NotValid MsgDoc    -- A problem, and some indication of why
+  = IsValid            -- ^ Everything is fine
+  | NotValid MsgDoc    -- ^ A problem, and some indication of why
 
 isValid :: Validity -> Bool
 isValid IsValid       = True
@@ -80,7 +86,8 @@ andValid :: Validity -> Validity -> Validity
 andValid IsValid v = v
 andValid v _       = v
 
-allValid :: [Validity] -> Validity   -- If they aren't all valid, return the first
+-- | If they aren't all valid, return the first
+allValid :: [Validity] -> Validity
 allValid []       = IsValid
 allValid (v : vs) = v `andValid` allValid vs
 
@@ -127,16 +134,16 @@ data Severity
   | SevInteractive
 
   | SevDump
-    -- Log messagse intended for compiler developers
+    -- ^ Log messagse intended for compiler developers
     -- No file/line/column stuff
 
   | SevInfo
-    -- Log messages intended for end users.
+    -- ^ Log messages intended for end users.
     -- No file/line/column stuff.
 
   | SevWarning
   | SevError
-    -- SevWarning and SevError are used for warnings and errors
+    -- ^ SevWarning and SevError are used for warnings and errors
     --   o The message has a file/line/column heading,
     --     plus "warning:" or "error:",
     --     added by mkLocMessags
@@ -186,11 +193,11 @@ mkErrDoc :: DynFlags -> SrcSpan -> PrintUnqualified -> ErrDoc -> ErrMsg
 mkErrDoc dflags = mk_err_msg dflags SevError
 
 mkLongErrMsg, mkLongWarnMsg   :: DynFlags -> SrcSpan -> PrintUnqualified -> MsgDoc -> MsgDoc -> ErrMsg
--- A long (multi-line) error message
+-- ^ A long (multi-line) error message
 mkErrMsg, mkWarnMsg           :: DynFlags -> SrcSpan -> PrintUnqualified -> MsgDoc            -> ErrMsg
--- A short (one-line) error message
+-- ^ A short (one-line) error message
 mkPlainErrMsg, mkPlainWarnMsg :: DynFlags -> SrcSpan ->                     MsgDoc            -> ErrMsg
--- Variant that doesn't care about qualified/unqualified names
+-- ^ Variant that doesn't care about qualified/unqualified names
 
 mkLongErrMsg   dflags locn unqual msg extra = mk_err_msg dflags SevError   locn unqual        (ErrDoc [msg] [] [extra])
 mkErrMsg       dflags locn unqual msg       = mk_err_msg dflags SevError   locn unqual        (ErrDoc [msg] [] [])
@@ -330,14 +337,14 @@ closeDumpFiles dflags
        mapM_ hClose $ Map.elems gd
 
 -- | Write out a dump.
---      If --dump-to-file is set then this goes to a file.
---      otherwise emit to stdout.
+-- If --dump-to-file is set then this goes to a file.
+-- otherwise emit to stdout.
 --
--- When hdr is empty, we print in a more compact format (no separators and
+-- When @hdr@ is empty, we print in a more compact format (no separators and
 -- blank lines)
 --
--- The DumpFlag is used only to choose the filename to use if --dump-to-file is
--- used; it is not used to decide whether to dump the output
+-- The 'DumpFlag' is used only to choose the filename to use if @--dump-to-file@
+-- is used; it is not used to decide whether to dump the output
 dumpSDoc :: DynFlags -> PrintUnqualified -> DumpFlag -> String -> SDoc -> IO ()
 dumpSDoc dflags print_unqual flag hdr doc
  = do let mFile = chooseDumpFile dflags flag
@@ -361,7 +368,7 @@ dumpSDoc dflags print_unqual flag hdr doc
                     | otherwise = (mkDumpDoc hdr doc, SevDump)
               log_action dflags dflags severity noSrcSpan dump_style doc'
 
--- | Return a handle assigned to the 'fileName'
+-- | Return a handle assigned to the given filename.
 --
 -- If the requested file doesn't exist the new one will be created
 getDumpFileHandle :: DynFlags -> FilePath -> IO Handle
@@ -486,7 +493,7 @@ logInfo :: DynFlags -> PprStyle -> MsgDoc -> IO ()
 logInfo dflags sty msg = log_action dflags dflags SevInfo noSrcSpan sty msg
 
 logOutput :: DynFlags -> PprStyle -> MsgDoc -> IO ()
--- Like logInfo but with SevOutput rather then SevInfo
+-- ^ Like 'logInfo' but with 'SevOutput' rather then 'SevInfo'
 logOutput dflags sty msg = log_action dflags dflags SevOutput noSrcSpan sty msg
 
 prettyPrintGhcErrors :: ExceptionMonad m => DynFlags -> m a -> m a


From git at git.haskell.org  Wed Dec  2 21:10:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 21:10:37 +0000 (UTC)
Subject: [commit: ghc] master: Update bytestring submodule (e7929ba)
Message-ID: <20151202211037.D34E43A300@ghc.haskell.org>

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

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

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

commit e7929bac932da4951e8304f674896e6090aab905
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 2 15:20:10 2015 +0100

    Update bytestring submodule
    
    Differential Revision: https://phabricator.haskell.org/D1549


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

e7929bac932da4951e8304f674896e6090aab905
 libraries/bytestring                                         | 2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr     | 2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr | 2 +-
 testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr | 2 +-
 testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout     | 6 +++---
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/libraries/bytestring b/libraries/bytestring
index c2ddcf9..84d0416 160000
--- a/libraries/bytestring
+++ b/libraries/bytestring
@@ -1 +1 @@
-Subproject commit c2ddcf96cdc6bf83206457a781801f6ff45a1aa6
+Subproject commit 84d041649c39e7dc0fe8d348da10d6ed1679a8f9
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
index 74b08a9..d8c8d67 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafe03.stderr
@@ -1,4 +1,4 @@
 [2 of 2] Compiling Main             ( ImpSafe03.hs, ImpSafe03.o )
 
 <no location info>:
-    The package (bytestring-0.10.6.0) is required to be trusted but it isn't!
+    The package (bytestring-0.10.7.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
index 0e6877b..0758def 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly07.stderr
@@ -3,4 +3,4 @@
     The package (base-4.9.0.0) is required to be trusted but it isn't!
 
 <no location info>: error:
-    The package (bytestring-0.10.6.0) is required to be trusted but it isn't!
+    The package (bytestring-0.10.7.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
index 0e6877b..0758def 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
+++ b/testsuite/tests/safeHaskell/check/pkg01/ImpSafeOnly08.stderr
@@ -3,4 +3,4 @@
     The package (base-4.9.0.0) is required to be trusted but it isn't!
 
 <no location info>: error:
-    The package (bytestring-0.10.6.0) is required to be trusted but it isn't!
+    The package (bytestring-0.10.7.0) is required to be trusted but it isn't!
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index b5fa578..42e1778 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -29,17 +29,17 @@ trusted: safe
 require own pkg trusted: True
 
 M_SafePkg6
-package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg7
-package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg8
-package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.6.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 


From git at git.haskell.org  Wed Dec  2 22:55:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 22:55:32 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Major Overhaul of Pattern Match Checking
 (Fixes #595) (5d13d6b)
Message-ID: <20151202225532.84D4E3A300@ghc.haskell.org>

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

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d13d6b41fd00f2cb279416b8baa957b218e3ec5/ghc

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

commit 5d13d6b41fd00f2cb279416b8baa957b218e3ec5
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 2 23:43:28 2015 +0100

    Major Overhaul of Pattern Match Checking (Fixes #595)
    
    This patch adresses several problems concerned with exhaustiveness and
    redundancy checking of pattern matching. The list of improvements includes:
    
    * Making the check type-aware (handles GADTs, Type Families, DataKinds, etc.).
      This fixes #4139, #3927, #8970 and other related tickets.
    
    * Making the check laziness-aware. Cases that are overlapped but affect
      evaluation are issued now with "Patterns have inaccessible right hand side".
      Additionally, "Patterns are overlapped" is now replaced by "Patterns are
      redundant".
    
    * Improved messages for literals. This addresses tickets #5724, #2204, etc.
    
    * Improved reasoning concerning cases where simple and overloaded
      patterns are matched (See #322).
    
    * Substantially improved reasoning for pattern guards. Addresses #3078.
    
    * OverloadedLists extension does not break exhaustiveness checking anymore
      (addresses #9951). Note that in general this cannot be handled but if we know
      that an argument has type '[a]', we treat it as a list since, the instance of
      'IsList' gives the identity for both 'fromList' and 'toList'. If the type is
      not clear or is not the list type, then the check cannot do much still. I am
      a bit concerned about OverlappingInstances though, since one may override the
      '[a]' instance with e.g. an '[Int]' instance that is not the identity.
    
    * Improved reasoning for nested pattern matching (partial solution). Now we
      propagate type and (some) term constraints deeper when checking, so we can
      detect more inconsistencies. For example, this is needed for #4139.
    
    I am still not satisfied with several things but I would like to address at
    least the following before the next release:
        Term constraints are too many and not printed for non-exhaustive matches
    (with the exception of literals). This sometimes results in two identical (in
    appearance) uncovered warnings. Unless we actually show their difference, I
    would like to have a single warning.


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

5d13d6b41fd00f2cb279416b8baa957b218e3ec5
 compiler/basicTypes/UniqSupply.hs                  |   26 +-
 compiler/deSugar/Check.hs                          | 2017 +++++++++++++-------
 compiler/deSugar/DsBinds.hs                        |   10 +-
 compiler/deSugar/DsExpr.hs                         |   18 +-
 compiler/deSugar/DsGRHSs.hs                        |    2 +-
 compiler/deSugar/DsMonad.hs                        |   64 +-
 compiler/deSugar/Match.hs                          |  174 +-
 compiler/deSugar/Match.hs-boot                     |    1 +
 compiler/deSugar/PmExpr.hs                         |  377 ++++
 compiler/deSugar/TmOracle.hs                       |  455 +++++
 compiler/ghc.cabal.in                              |    2 +
 compiler/ghc.mk                                    |    1 +
 compiler/hsSyn/HsLit.hs                            |   22 +
 compiler/hsSyn/HsPat.hs                            |   41 +-
 compiler/prelude/TysWiredIn.hs-boot                |    2 +-
 compiler/typecheck/TcMType.hs                      |   15 +
 compiler/typecheck/TcRnTypes.hs                    |    5 +-
 compiler/typecheck/TcSMonad.hs                     |    1 -
 compiler/typecheck/TcSimplify.hs                   |   14 +
 compiler/typecheck/TcType.hs                       |   42 +
 compiler/types/Type.hs                             |   22 +-
 compiler/utils/Bag.hs                              |   26 +-
 compiler/utils/MonadUtils.hs                       |    6 +-
 .../tests/deSugar/should_compile/T2395.stderr      |    4 +-
 .../tests/deSugar/should_compile/T5117.stderr      |    2 +-
 testsuite/tests/deSugar/should_compile/all.T       |    1 -
 .../tests/deSugar/should_compile/ds002.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds003.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds019.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds020.stderr      |    8 +-
 testsuite/tests/deSugar/should_compile/ds022.hs    |    2 +
 .../tests/deSugar/should_compile/ds022.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds043.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds051.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds056.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds058.stderr      |    6 +-
 testsuite/tests/deSugar/should_compile/ds060.hs    |   25 -
 testsuite/tests/driver/werror.stderr               |    4 +-
 testsuite/tests/gadt/Gadt17_help.hs                |    1 -
 testsuite/tests/gadt/T7294.stderr                  |    4 +
 testsuite/tests/ghci/scripts/Defer02.stderr        |    8 +
 testsuite/tests/{ado => pmcheck}/Makefile          |    0
 .../should_compile/Makefile                        |    0
 testsuite/tests/pmcheck/should_compile/T2006.hs    |   13 +
 .../tests/pmcheck/should_compile/T2006.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T2204.hs    |    9 +
 .../tests/pmcheck/should_compile/T2204.stderr      |   14 +
 testsuite/tests/pmcheck/should_compile/T3078.hs    |   12 +
 .../tests/pmcheck/should_compile/T3078.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T322.hs     |   29 +
 .../tests/pmcheck/should_compile/T322.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T366.hs     |   10 +
 .../tests/pmcheck/should_compile/T366.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T3927.hs    |   13 +
 .../tests/pmcheck/should_compile/T3927.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T3927a.hs   |   15 +
 .../tests/pmcheck/should_compile/T3927a.stderr     |    0
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   75 +
 .../tests/pmcheck/should_compile/T3927b.stderr     |   39 +
 testsuite/tests/pmcheck/should_compile/T4139.hs    |   28 +
 .../tests/pmcheck/should_compile/T4139.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T6124.hs    |   14 +
 .../tests/pmcheck/should_compile/T6124.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T7669.hs    |    9 +
 .../tests/pmcheck/should_compile/T7669.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T8970.hs    |   22 +
 .../tests/pmcheck/should_compile/T8970.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951.hs    |   10 +
 .../tests/pmcheck/should_compile/T9951.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951b.hs   |    7 +
 .../tests/pmcheck/should_compile/T9951b.stderr     |    9 +
 testsuite/tests/pmcheck/should_compile/all.T       |   35 +
 testsuite/tests/pmcheck/should_compile/pmc001.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc001.stderr     |   17 +
 testsuite/tests/pmcheck/should_compile/pmc002.hs   |    7 +
 .../tests/pmcheck/should_compile/pmc002.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc003.hs   |    9 +
 .../tests/pmcheck/should_compile/pmc003.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc004.hs   |   16 +
 .../tests/pmcheck/should_compile/pmc004.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc005.hs   |   12 +
 .../tests/pmcheck/should_compile/pmc005.stderr     |    7 +
 testsuite/tests/pmcheck/should_compile/pmc006.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc006.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc007.hs   |   20 +
 .../tests/pmcheck/should_compile/pmc007.stderr     |   24 +
 .../tests/typecheck/should_compile/T5490.stderr    |    8 +
 87 files changed, 3056 insertions(+), 913 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5d13d6b41fd00f2cb279416b8baa957b218e3ec5

From git at git.haskell.org  Wed Dec  2 22:55:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  2 Dec 2015 22:55:34 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Major Overhaul of Pattern
 Match Checking (Fixes #595) (5d13d6b)
Message-ID: <20151202225534.C06473A300@ghc.haskell.org>

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

Branch 'wip/gadtpm' now includes:

     218fdf9 Make the order of fixities in the iface file deterministic
     741f837 Implement more deterministic operations and document them
     52b02e6 Comments only (isIrrefutablePat)
     b564731 Comments (TcSMonad)
     d00cdf2 Revert "ghci: Add support for prompt functions"
     1caff20 StgSyn: Remove unused SRT constructor
     c75948b Move Stg-specific code from DynFlags to SimplStg
     d4d54b4 Remove *.xml from gitignore
     a12e47b Avoid panic due to partial ieName
     8cba907 Create empty dump files when there was nothing to dump
     0d1a2d2 ErrUtils: Spruce up Haddocks
     e7929ba Update bytestring submodule
     5d13d6b Major Overhaul of Pattern Match Checking (Fixes #595)

From git at git.haskell.org  Thu Dec  3 09:37:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 09:37:22 +0000 (UTC)
Subject: [commit: ghc] master: users_guide/glasgow_exts.rst: fix link markup
 (d25f3c0)
Message-ID: <20151203093722.20D393A300@ghc.haskell.org>

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

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

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

commit d25f3c076e6c47bc7c8d0d27e724a3ad2b7d7399
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Thu Dec 3 09:31:44 2015 +0000

    users_guide/glasgow_exts.rst: fix link markup
    
    sphinx-1.3.1 found errors as:
      users_guide/glasgow_exts.rst:1799:
        WARNING: malformed hyperlink target.
      users_guide/glasgow_exts.rst:10638:
        WARNING: Inline interpreted text or phrase
        reference start-string without end-string.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

d25f3c076e6c47bc7c8d0d27e724a3ad2b7d7399
 docs/users_guide/glasgow_exts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 11cebb1..4513f74 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1796,7 +1796,7 @@ In the case of transform comprehensions, notice that the groups are
 parameterised over some arbitrary type ``n`` (provided it has an
 ``fmap``, as well as the comprehension being over an arbitrary monad.
 
-.. _monadfail-desugaring
+.. _monadfail-desugaring:
 
 New monadic failure desugaring mechanism
 ----------------------------------------
@@ -10642,7 +10642,7 @@ strict, regardless of the pattern. (We say "apparent" exception because
 the Right Way to think of it is that the bang at the top of a binding is
 not part of the *pattern*; rather it is part of the syntax of the
 *binding*, creating a "bang-pattern binding".) See :ref:`Strict recursive and
-polymorphic let bindings <recursive-and-polymorphic-let-bindings> for
+polymorphic let bindings <recursive-and-polymorphic-let-bindings>` for
 how bang-pattern bindings are compiled.
 
 However, *nested* bangs in a pattern binding behave uniformly with all


From git at git.haskell.org  Thu Dec  3 10:46:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 10:46:13 +0000 (UTC)
Subject: [commit: ghc] tag 'ghc-7.10.3-release' created
Message-ID: <20151203104613.0F0BD3A300@ghc.haskell.org>

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

New tag    : ghc-7.10.3-release
Referencing: 5c2495781f013a9adaab3bb96a8fdfc564f56f7b

From git at git.haskell.org  Thu Dec  3 10:46:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 10:46:15 +0000 (UTC)
Subject: [commit: ghc] : release notes: Cabal/haddock/Windows issue is now
 fixed (6b0795d)
Message-ID: <20151203104615.A90193A300@ghc.haskell.org>

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

On branch  : 
Link       : http://ghc.haskell.org/trac/ghc/changeset/6b0795d66047c457bed967997833e4d3ec71f61e/ghc

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

commit 6b0795d66047c457bed967997833e4d3ec71f61e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Nov 30 22:41:56 2015 +0100

    release notes: Cabal/haddock/Windows issue is now fixed


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

6b0795d66047c457bed967997833e4d3ec71f61e
 docs/users_guide/7.10.3-notes.xml | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/docs/users_guide/7.10.3-notes.xml b/docs/users_guide/7.10.3-notes.xml
index 358d9fc..120299a 100644
--- a/docs/users_guide/7.10.3-notes.xml
+++ b/docs/users_guide/7.10.3-notes.xml
@@ -156,13 +156,6 @@
     <itemizedlist>
       <listitem>
         <para>
-            The <literal>Cabal</literal> release shipped with this GHC release lacks
-            support for response files, a mechanism used on Windows to workaround the
-            low command-line length limit on that platform. For this reason you
-            may experience line length issues when building Haddock documentation with Cabal
-            on Windows.
-        </para>
-        <para>
           At the time of release there is a <ulink
           href="https://github.com/haskell/cabal/commit/1c1228a808b55331ac1db6d71fd2f8533f5fc57e">fix</ulink>
           in the <literal>Cabal</literal> upstream respository, although it is not yet


From git at git.haskell.org  Thu Dec  3 10:46:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 10:46:18 +0000 (UTC)
Subject: [commit: ghc] : configure.ac: Set RELEASE=YES,
 version 7.10.3 (97e7c29)
Message-ID: <20151203104618.4384A3A300@ghc.haskell.org>

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

On branch  : 
Link       : http://ghc.haskell.org/trac/ghc/changeset/97e7c293abbde5223d2bf0516f8969bdd1a9a7a2/ghc

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

commit 97e7c293abbde5223d2bf0516f8969bdd1a9a7a2
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 1 00:37:29 2015 +0100

    configure.ac: Set RELEASE=YES, version 7.10.3


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

97e7c293abbde5223d2bf0516f8969bdd1a9a7a2
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0af15e8..37601ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,10 +13,10 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.10.2], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.10.3], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
-: ${RELEASE=NO}
+: ${RELEASE=YES}
 
 # The primary version (e.g. 7.5, 7.4.1) is set in the AC_INIT line
 # above.  If this is not a released version, then we will append the


From git at git.haskell.org  Thu Dec  3 10:48:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 10:48:03 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10's head updated: configure.ac: Set RELEASE=YES,
 version 7.10.3 (97e7c29)
Message-ID: <20151203104803.2F86A3A300@ghc.haskell.org>

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

Branch 'ghc-7.10' now includes:

     6b0795d release notes: Cabal/haddock/Windows issue is now fixed
     97e7c29 configure.ac: Set RELEASE=YES, version 7.10.3

From git at git.haskell.org  Thu Dec  3 11:58:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 11:58:04 +0000 (UTC)
Subject: [commit: ghc] master: Major Overhaul of Pattern Match Checking (Fixes
 #595) (8a50610)
Message-ID: <20151203115804.18DB93A300@ghc.haskell.org>

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

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

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

commit 8a506104d5b5b71d5640afc69c992e0af40f2213
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Thu Dec 3 12:57:19 2015 +0100

    Major Overhaul of Pattern Match Checking (Fixes #595)
    
    This patch adresses several problems concerned with exhaustiveness and
    redundancy checking of pattern matching. The list of improvements includes:
    
    * Making the check type-aware (handles GADTs, Type Families, DataKinds, etc.).
      This fixes #4139, #3927, #8970 and other related tickets.
    
    * Making the check laziness-aware. Cases that are overlapped but affect
      evaluation are issued now with "Patterns have inaccessible right hand side".
      Additionally, "Patterns are overlapped" is now replaced by "Patterns are
      redundant".
    
    * Improved messages for literals. This addresses tickets #5724, #2204, etc.
    
    * Improved reasoning concerning cases where simple and overloaded
      patterns are matched (See #322).
    
    * Substantially improved reasoning for pattern guards. Addresses #3078.
    
    * OverloadedLists extension does not break exhaustiveness checking anymore
      (addresses #9951). Note that in general this cannot be handled but if we know
      that an argument has type '[a]', we treat it as a list since, the instance of
      'IsList' gives the identity for both 'fromList' and 'toList'. If the type is
      not clear or is not the list type, then the check cannot do much still. I am
      a bit concerned about OverlappingInstances though, since one may override the
      '[a]' instance with e.g. an '[Int]' instance that is not the identity.
    
    * Improved reasoning for nested pattern matching (partial solution). Now we
      propagate type and (some) term constraints deeper when checking, so we can
      detect more inconsistencies. For example, this is needed for #4139.
    
    I am still not satisfied with several things but I would like to address at
    least the following before the next release:
        Term constraints are too many and not printed for non-exhaustive matches
    (with the exception of literals). This sometimes results in two identical (in
    appearance) uncovered warnings. Unless we actually show their difference, I
    would like to have a single warning.


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

8a506104d5b5b71d5640afc69c992e0af40f2213
 compiler/basicTypes/UniqSupply.hs                  |   26 +-
 compiler/deSugar/Check.hs                          | 2017 +++++++++++++-------
 compiler/deSugar/DsBinds.hs                        |   10 +-
 compiler/deSugar/DsExpr.hs                         |   18 +-
 compiler/deSugar/DsGRHSs.hs                        |    2 +-
 compiler/deSugar/DsMonad.hs                        |   64 +-
 compiler/deSugar/Match.hs                          |  174 +-
 compiler/deSugar/Match.hs-boot                     |    1 +
 compiler/deSugar/PmExpr.hs                         |  377 ++++
 compiler/deSugar/TmOracle.hs                       |  455 +++++
 compiler/ghc.cabal.in                              |    2 +
 compiler/ghc.mk                                    |    1 +
 compiler/hsSyn/HsLit.hs                            |   22 +
 compiler/hsSyn/HsPat.hs                            |   41 +-
 compiler/prelude/TysWiredIn.hs-boot                |    2 +-
 compiler/typecheck/TcMType.hs                      |   15 +
 compiler/typecheck/TcRnTypes.hs                    |    5 +-
 compiler/typecheck/TcSMonad.hs                     |    1 -
 compiler/typecheck/TcSimplify.hs                   |   14 +
 compiler/typecheck/TcType.hs                       |   42 +
 compiler/types/Type.hs                             |   22 +-
 compiler/utils/Bag.hs                              |   26 +-
 compiler/utils/MonadUtils.hs                       |    6 +-
 .../tests/deSugar/should_compile/T2395.stderr      |    4 +-
 .../tests/deSugar/should_compile/T5117.stderr      |    2 +-
 testsuite/tests/deSugar/should_compile/all.T       |    1 -
 .../tests/deSugar/should_compile/ds002.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds003.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds019.stderr      |    2 +-
 .../tests/deSugar/should_compile/ds020.stderr      |    8 +-
 testsuite/tests/deSugar/should_compile/ds022.hs    |    2 +
 .../tests/deSugar/should_compile/ds022.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds043.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds051.stderr      |    6 +-
 .../tests/deSugar/should_compile/ds056.stderr      |    4 +-
 .../tests/deSugar/should_compile/ds058.stderr      |    6 +-
 testsuite/tests/deSugar/should_compile/ds060.hs    |   25 -
 testsuite/tests/driver/werror.stderr               |    4 +-
 testsuite/tests/gadt/Gadt17_help.hs                |    1 -
 testsuite/tests/gadt/T7294.stderr                  |    4 +
 testsuite/tests/ghci/scripts/Defer02.stderr        |    8 +
 testsuite/tests/{ado => pmcheck}/Makefile          |    0
 .../should_compile/Makefile                        |    0
 testsuite/tests/pmcheck/should_compile/T2006.hs    |   13 +
 .../tests/pmcheck/should_compile/T2006.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T2204.hs    |    9 +
 .../tests/pmcheck/should_compile/T2204.stderr      |   14 +
 testsuite/tests/pmcheck/should_compile/T3078.hs    |   12 +
 .../tests/pmcheck/should_compile/T3078.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T322.hs     |   29 +
 .../tests/pmcheck/should_compile/T322.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T366.hs     |   10 +
 .../tests/pmcheck/should_compile/T366.stderr       |    0
 testsuite/tests/pmcheck/should_compile/T3927.hs    |   13 +
 .../tests/pmcheck/should_compile/T3927.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T3927a.hs   |   15 +
 .../tests/pmcheck/should_compile/T3927a.stderr     |    0
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   75 +
 .../tests/pmcheck/should_compile/T3927b.stderr     |   39 +
 testsuite/tests/pmcheck/should_compile/T4139.hs    |   28 +
 .../tests/pmcheck/should_compile/T4139.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T6124.hs    |   14 +
 .../tests/pmcheck/should_compile/T6124.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T7669.hs    |    9 +
 .../tests/pmcheck/should_compile/T7669.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T8970.hs    |   22 +
 .../tests/pmcheck/should_compile/T8970.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951.hs    |   10 +
 .../tests/pmcheck/should_compile/T9951.stderr      |    0
 testsuite/tests/pmcheck/should_compile/T9951b.hs   |    7 +
 .../tests/pmcheck/should_compile/T9951b.stderr     |    9 +
 testsuite/tests/pmcheck/should_compile/all.T       |   35 +
 testsuite/tests/pmcheck/should_compile/pmc001.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc001.stderr     |   17 +
 testsuite/tests/pmcheck/should_compile/pmc002.hs   |    7 +
 .../tests/pmcheck/should_compile/pmc002.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc003.hs   |    9 +
 .../tests/pmcheck/should_compile/pmc003.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc004.hs   |   16 +
 .../tests/pmcheck/should_compile/pmc004.stderr     |    3 +
 testsuite/tests/pmcheck/should_compile/pmc005.hs   |   12 +
 .../tests/pmcheck/should_compile/pmc005.stderr     |    7 +
 testsuite/tests/pmcheck/should_compile/pmc006.hs   |   22 +
 .../tests/pmcheck/should_compile/pmc006.stderr     |    0
 testsuite/tests/pmcheck/should_compile/pmc007.hs   |   20 +
 .../tests/pmcheck/should_compile/pmc007.stderr     |   24 +
 .../tests/typecheck/should_compile/T5490.stderr    |    8 +
 87 files changed, 3056 insertions(+), 913 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8a506104d5b5b71d5640afc69c992e0af40f2213

From git at git.haskell.org  Thu Dec  3 13:44:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 13:44:32 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: haddock.compiler: Bump expected
 allocations (43a31fe)
Message-ID: <20151203134432.68B723A300@ghc.haskell.org>

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

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

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

commit 43a31fe4c0cc0f72dfe9e0c96e1576f5cfba6e19
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 14:44:24 2015 +0100

    testsuite: haddock.compiler: Bump expected allocations


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

43a31fe4c0cc0f72dfe9e0c96e1576f5cfba6e19
 testsuite/tests/perf/haddock/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index c7a60e3..22107a9 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -89,7 +89,7 @@ test('haddock.Cabal',
 test('haddock.compiler',
      [unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 40624322224, 10)
+          [(wordsize(64), 44721228752, 10)
             # 2012P-08-14: 26070600504 (amd64/Linux)
             # 2012-08-29: 26353100288 (amd64/Linux, new CG)
             # 2012-09-18: 26882813032 (amd64/Linux)
@@ -100,6 +100,7 @@ test('haddock.compiler',
             # 2014-11-22: 33562468736 (amd64/Linux)
             # 2015-06-02: 36740649320 (amd64/Linux) unknown cause
             # 2015-06-29: 40624322224 (amd64/Linux) due to #10482, not yet investigated
+            # 2015-12-03: 44721228752 (amd64/Linux) slow creep upwards
 
           ,(platform('i386-unknown-mingw32'),   902576468, 10)
             # 2012-10-30:                     13773051312 (x86/Windows)


From git at git.haskell.org  Thu Dec  3 21:11:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 21:11:47 +0000 (UTC)
Subject: [commit: ghc] master: extending_ghc.rst: fix broken link (Trac
 #10950) (a034031)
Message-ID: <20151203211147.6DF063A300@ghc.haskell.org>

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

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

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

commit a034031a102bc08c76a6cdb104b72922ae22c96b
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Thu Dec 3 21:07:19 2015 +0000

    extending_ghc.rst: fix broken link (Trac #10950)
    
    The error exibits as build failures
    of two types:
    
      1. extending_ghc.rst:: ERROR:
          Anonymous hyperlink mismatch:
            1 references but 0 targets.
          See "backrefs" attribute for IDs.
    
      2. reading sources... [ 33%] glasgow_exts
           Exception occurred:
              pickle.dump(doctree, f, pickle.HIGHEST_PROTOCOL)
           RecursionError: maximum recursion depth exceeded
           while pickling an object
    
    Broken link created circular reference and failed to
    serialize the result.
    
    Fixed the problem by pointing to relevant section.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

a034031a102bc08c76a6cdb104b72922ae22c96b
 docs/users_guide/extending_ghc.rst | 2 +-
 docs/users_guide/glasgow_exts.rst  | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/users_guide/extending_ghc.rst b/docs/users_guide/extending_ghc.rst
index efe18b0..a0c3bd1 100644
--- a/docs/users_guide/extending_ghc.rst
+++ b/docs/users_guide/extending_ghc.rst
@@ -58,7 +58,7 @@ A number of restrictions apply to use of annotations:
 -  The expression you are annotating with must have a type with
    ``Typeable`` and ``Data`` instances
 
--  The `Template Haskell staging restrictions <>`__ apply to the
+-  The :ref:`Template Haskell staging restrictions <th-usage>` apply to the
    expression being annotated with, so for example you cannot run a
    function from the module being compiled.
 
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 4513f74..93261a2 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -9772,6 +9772,8 @@ The syntax for a declaration splice uses "``$``" not "``splice``". The type of
 the enclosed expression must be ``Q [Dec]``, not ``[Q Dec]``. Typed expression
 splices and quotations are supported.)
 
+.. _th-usage:
+
 Using Template Haskell
 ----------------------
 


From git at git.haskell.org  Thu Dec  3 22:00:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 22:00:42 +0000 (UTC)
Subject: [commit: ghc] master: Update test output (934b3a0)
Message-ID: <20151203220042.CEDA93A300@ghc.haskell.org>

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

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

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

commit 934b3a06af6e716e20f4d9aa1c22c9d9300568dd
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 15:20:01 2015 -0500

    Update test output


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

934b3a06af6e716e20f4d9aa1c22c9d9300568dd
 testsuite/tests/th/TH_repUnboxedTuples.stderr | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testsuite/tests/th/TH_repUnboxedTuples.stderr b/testsuite/tests/th/TH_repUnboxedTuples.stderr
index d5bfa68..4ae798c 100644
--- a/testsuite/tests/th/TH_repUnboxedTuples.stderr
+++ b/testsuite/tests/th/TH_repUnboxedTuples.stderr
@@ -3,3 +3,7 @@ case (# 'b', GHC.Types.False #) of
     (# 'a', GHC.Types.True #) -> (# "One", 1 #)
     (# 'b', GHC.Types.False #) -> (# "Two", 2 #)
     (# _, _ #) -> (# "Three", 3 #)
+
+TH_repUnboxedTuples.hs:18:13: warning:
+    Pattern match(es) are redundant
+    In a case alternative: (# 'a', True #) -> ...


From git at git.haskell.org  Thu Dec  3 22:00:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 22:00:45 +0000 (UTC)
Subject: [commit: ghc] master: Kill redundant patterns (0dd61fe)
Message-ID: <20151203220045.76E7B3A300@ghc.haskell.org>

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

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

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

commit 0dd61fe72144a829a9e5bb87a1094244e53cdebb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 13:43:39 2015 -0500

    Kill redundant patterns
    
    George's new exhaustiveness checker now realizes these are impossible.
    Yay!


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

0dd61fe72144a829a9e5bb87a1094244e53cdebb
 compiler/cmm/Hoopl/Dataflow.hs            | 5 -----
 compiler/nativeGen/RegAlloc/Graph/Main.hs | 3 ---
 compiler/nativeGen/RegAlloc/Liveness.hs   | 2 --
 3 files changed, 10 deletions(-)

diff --git a/compiler/cmm/Hoopl/Dataflow.hs b/compiler/cmm/Hoopl/Dataflow.hs
index 29c7afe..beaf6bc 100644
--- a/compiler/cmm/Hoopl/Dataflow.hs
+++ b/compiler/cmm/Hoopl/Dataflow.hs
@@ -163,7 +163,6 @@ arfGraph pass at FwdPass { fp_lattice = lattice,
                 -> Fact e f -> UniqSM (DG f n e C, Fact C f)
              c NothingC (JustO entry)   f = (block entry `cat` body (successors entry) bdy) f
              c (JustC entries) NothingO f = body entries bdy f
-             c _ _ _ = error "bogus GADT pattern match failure"
 
     -- Lift from nodes to blocks
     block BNil            f = return (dgnil, f)
@@ -253,7 +252,6 @@ analyzeFwd FwdPass { fp_lattice = lattice,
       = case (entries, entry) of
          (NothingC, JustO entry)   -> block entry `cat` body (successors entry)
          (JustC entries, NothingO) -> body entries
-         _ -> error "bogus GADT pattern match failure"
      where
        body  :: [Label] -> Fact C f -> Fact C f
        body entries f
@@ -296,7 +294,6 @@ analyzeFwdBlocks FwdPass { fp_lattice = lattice,
       = case (entries, entry) of
          (NothingC, JustO entry)   -> block entry `cat` body (successors entry)
          (JustC entries, NothingO) -> body entries
-         _ -> error "bogus GADT pattern match failure"
      where
        body  :: [Label] -> Fact C f -> Fact C f
        body entries f
@@ -339,7 +336,6 @@ analyzeBwd BwdPass { bp_lattice = lattice,
       = case (entries, entry) of
          (NothingC, JustO entry)   -> body (successors entry)
          (JustC entries, NothingO) -> body entries
-         _ -> error "bogus GADT pattern match failure"
      where
        body  :: [Label] -> Fact C f -> Fact C f
        body entries f
@@ -429,7 +425,6 @@ arbGraph pass at BwdPass { bp_lattice  = lattice,
                 -> Fact C f -> UniqSM (DG f n e C, Fact e f)
              c NothingC (JustO entry)   f = (block entry `cat` body (successors entry) bdy) f
              c (JustC entries) NothingO f = body entries bdy f
-             c _ _ _ = error "bogus GADT pattern match failure"
 
     -- Lift from nodes to blocks
     block BNil            f = return (dgnil, f)
diff --git a/compiler/nativeGen/RegAlloc/Graph/Main.hs b/compiler/nativeGen/RegAlloc/Graph/Main.hs
index 05db68d..8d5a4db 100644
--- a/compiler/nativeGen/RegAlloc/Graph/Main.hs
+++ b/compiler/nativeGen/RegAlloc/Graph/Main.hs
@@ -355,9 +355,6 @@ graphAddCoalesce (r1, r2) graph
         , RegReal _             <- r2
         = graph
 
-graphAddCoalesce _ _
-        = panic "graphAddCoalesce: bogus"
-
 
 -- | Patch registers in code using the reg -> reg mapping in this graph.
 patchRegsFromGraph
diff --git a/compiler/nativeGen/RegAlloc/Liveness.hs b/compiler/nativeGen/RegAlloc/Liveness.hs
index 167197d..c1c2e3c 100644
--- a/compiler/nativeGen/RegAlloc/Liveness.hs
+++ b/compiler/nativeGen/RegAlloc/Liveness.hs
@@ -909,8 +909,6 @@ livenessForward platform rsLiveEntry (li@(LiveInstr instr mLive) : lis)
         in LiveInstr instr (Just live { liveBorn = rsBorn })
                 : livenessForward platform rsLiveNext lis
 
-livenessForward _ _ _             = panic "RegLiveness.livenessForward: no match"
-
 
 -- | Calculate liveness going backwards,
 --   filling in when regs die, and what regs are live across each instruction


From git at git.haskell.org  Thu Dec  3 22:00:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 22:00:48 +0000 (UTC)
Subject: [commit: ghc] master: Fix haddock syntax (7b29b0b)
Message-ID: <20151203220048.53E593A300@ghc.haskell.org>

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

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

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

commit 7b29b0b1e8efac68fd4151cb5a44c4290a3e9d57
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 13:43:16 2015 -0500

    Fix haddock syntax
    
    Sadly we can't annotate the elements of a tuple


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

7b29b0b1e8efac68fd4151cb5a44c4290a3e9d57
 compiler/deSugar/Check.hs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 8ca0b54..382112c 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -117,9 +117,14 @@ data ValSetAbs   -- Reprsents a set of value vector abstractions
   | Constraint [PmConstraint] ValSetAbs -- ^ Extend Delta
   | Cons ValAbs ValSetAbs               -- ^ map (ucon u) vs
 
-type PmResult = ( [[LPat Id]] -- ^ redundant clauses
-                , [[LPat Id]] -- ^ clauses with inaccessible rhs
-                , [([PmExpr], [ComplexEq])] ) -- ^ missing
+-- | Pattern check result
+--
+-- * redundant clauses
+-- * clauses with inaccessible RHS
+-- * missing
+type PmResult = ( [[LPat Id]]
+                , [[LPat Id]]
+                , [([PmExpr], [ComplexEq])] )
 
 {-
 %************************************************************************


From git at git.haskell.org  Thu Dec  3 22:00:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 22:00:50 +0000 (UTC)
Subject: [commit: ghc] master: Revert "Create empty dump files when there was
 nothing to dump" (c5597bb)
Message-ID: <20151203220050.F3A433A300@ghc.haskell.org>

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

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

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

commit c5597bb6da612e0578290c3bccdac089d6519e19
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 14:59:18 2015 +0100

    Revert "Create empty dump files when there was nothing to dump"
    
    This reverts commit 8cba907ad404ba4005558b5a8966390159938172 which
    broke `-ddump-to-file`.


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

c5597bb6da612e0578290c3bccdac089d6519e19
 compiler/main/DriverPipeline.hs                |  7 +-
 compiler/main/DynFlags.hs                      |  4 +-
 compiler/main/ErrUtils.hs                      | 90 ++++++++------------------
 testsuite/tests/driver/Makefile                | 39 -----------
 testsuite/tests/driver/T10320-with-rule.hs     |  9 ---
 testsuite/tests/driver/T10320-without-rules.hs |  4 --
 testsuite/tests/driver/all.T                   | 10 ---
 7 files changed, 30 insertions(+), 133 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c5597bb6da612e0578290c3bccdac089d6519e19

From git at git.haskell.org  Thu Dec  3 22:00:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu,  3 Dec 2015 22:00:53 +0000 (UTC)
Subject: [commit: ghc] master: Bump hoopl submodule (40fc353)
Message-ID: <20151203220053.993EA3A300@ghc.haskell.org>

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

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

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

commit 40fc353650d44472203153b04302a3614a0552eb
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 15:20:18 2015 -0500

    Bump hoopl submodule
    
    To fix redundant patterns.


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

40fc353650d44472203153b04302a3614a0552eb
 libraries/hoopl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/hoopl b/libraries/hoopl
index 84255f0..5405469 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit 84255f0fe07f3fd1f5bc96e60b64c582394edcf1
+Subproject commit 5405469b2357580a653ceb41c15c33091b2d1a06


From git at git.haskell.org  Fri Dec  4 06:51:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 06:51:59 +0000 (UTC)
Subject: [commit: ghc] master: Improve performance for PM check on literals
 (Fixes #11160 and #11161) (ae4398d)
Message-ID: <20151204065159.7AE233A300@ghc.haskell.org>

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

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

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

commit ae4398d64655b43606386dddb01637bbfcf0171e
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Dec 4 07:11:55 2015 +0100

    Improve performance for PM check on literals (Fixes #11160 and #11161)
    
    Two changes:
    
    1. Instead of generating constraints of the form (x ~ e) (as we do in
    the paper), generate constraints of the form (e ~ e). The term oracle
    (`tmOracle` in deSugar/TmOracle.hs) is not really efficient and in the
    presence of many (x ~ e) constraints behaves quadratically. For
    literals, constraints of the form (False ~ (x ~ lit)) are pretty common,
    so if we start with { y ~ False, y ~ (x ~ lit) } we end up givng to the
    solver (a) twice as many constraints as we need and (b) half of them
    trigger the solver's weakness. This fixes #11160.
    
    2. Treat two overloaded literals that look different as different. This
    is not entirely correct but it is what both the previous and the current
    check did. I had the ambitious plan to do the *right thing* (equality
    between overloaded literals is undecidable in the general case) and just
    use this assumption when issuing the warnings. It seems to generate much
    more constraints than I expected (breaks #11161) so I just do it
    immediately now instead of generating everything and filtering
    afterwards.
    
    Even if it is not (strictly speaking) correct, we have the following:
      * Gives the "expected" warnings (the ones Ocaml or the previous
        algorithm would give) and,
      * Most importantly, it is safe. Unless a catch-all clause exists, a
        match against literals is always non-exhaustive. So, effectively
        this affects only what is shown to the user (and, evidently,
        performance!).


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

ae4398d64655b43606386dddb01637bbfcf0171e
 compiler/deSugar/Check.hs    | 128 ++++++++--------------
 compiler/deSugar/PmExpr.hs   |  24 ++---
 compiler/deSugar/TmOracle.hs | 247 +++----------------------------------------
 3 files changed, 70 insertions(+), 329 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ae4398d64655b43606386dddb01637bbfcf0171e

From git at git.haskell.org  Fri Dec  4 07:29:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 07:29:15 +0000 (UTC)
Subject: [commit: ghc] master: Remove unused import in deSugar/TmOracle.hs
 (99d01e1)
Message-ID: <20151204072915.486A03A300@ghc.haskell.org>

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

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

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

commit 99d01e1d82505e168224043d10e7ce116f5617ae
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Dec 4 08:28:00 2015 +0100

    Remove unused import in deSugar/TmOracle.hs


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

99d01e1d82505e168224043d10e7ce116f5617ae
 compiler/deSugar/TmOracle.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index 3731f80..c0c1480 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -32,7 +32,6 @@ import TcHsSyn
 import MonadUtils
 import Util
 
-import Data.Maybe (isJust)
 import qualified Data.Map as Map
 
 {-


From git at git.haskell.org  Fri Dec  4 09:12:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 09:12:06 +0000 (UTC)
Subject: [commit: ghc] master: Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
 (7af29da)
Message-ID: <20151204091206.A022B3A300@ghc.haskell.org>

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

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

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

commit 7af29da05d2e5a5e311a5f73f20d0f232035973b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 4 09:15:29 2015 +0100

    Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
    
    This takes care of setting feature test macros (i.e. let Autoconf decide when
    those can be set safely) to allow subsequent Autoconf tests to better detect
    available OS features.
    
    This also includes a submodule update of unix which enables the use of
    `AC_USE_SYSTEM_EXTENSIONS` in there as well.
    
    Specifically, this takes care of setting `_GNU_SOURCE` (which allows to remove
    two occurences where it's set manually) and `_ALL_SOURCE` (which fixes issues
    on AIX).
    
    See also
    
      https://www.gnu.org/software/autoconf/manual/autoconf-2.69/html_node/Posix-Variants.html
    
    for details.
    
    At some point we may want to reconsider the purpose of "rts/PosixSource.h" and
    rely more on Autoconf instead.


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

7af29da05d2e5a5e311a5f73f20d0f232035973b
 configure.ac                | 3 +++
 libraries/base/configure.ac | 5 +++++
 libraries/unix              | 2 +-
 rts/Linker.c                | 7 -------
 rts/posix/OSThreads.c       | 6 ------
 5 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3889cea..57d877a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,6 +58,9 @@ dnl  #define SIZEOF_CHAR 0
 dnl recently.
 AC_PREREQ([2.60])
 
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
+
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 85b2f2e..99474a6 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -3,6 +3,11 @@ AC_INIT([Haskell base package], [1.0], [libraries at haskell.org], [base])
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsBase.h])
 
+AC_PREREQ([2.60])
+
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
+
 AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
 
 AC_CANONICAL_BUILD
diff --git a/libraries/unix b/libraries/unix
index 137fa1b..5740003 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 137fa1b06a79a9baa0d5fcf2ec11f964c3423f6a
+Subproject commit 5740003e06f0c585460501514f3352f5e105c98c
diff --git a/rts/Linker.c b/rts/Linker.c
index 51142c5..f728f0e 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -10,13 +10,6 @@
 #include "PosixSource.h"
 #endif
 
-/* Linux needs _GNU_SOURCE to get RTLD_DEFAULT from <dlfcn.h> and
-   MREMAP_MAYMOVE from <sys/mman.h>.
- */
-#if defined(__linux__)  || defined(__GLIBC__)
-#define _GNU_SOURCE 1
-#endif
-
 #include "Rts.h"
 #include "HsFFI.h"
 
diff --git a/rts/posix/OSThreads.c b/rts/posix/OSThreads.c
index 8c1beda..91f9523 100644
--- a/rts/posix/OSThreads.c
+++ b/rts/posix/OSThreads.c
@@ -7,12 +7,6 @@
  *
  * --------------------------------------------------------------------------*/
 
-#if defined(__linux__) || defined(__GLIBC__)
-/* We want GNU extensions in DEBUG mode for mutex error checking */
-/* We also want the affinity API, which requires _GNU_SOURCE */
-#define _GNU_SOURCE
-#endif
-
 #include "PosixSource.h"
 
 #if defined(freebsd_HOST_OS)


From git at git.haskell.org  Fri Dec  4 09:12:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 09:12:09 +0000 (UTC)
Subject: [commit: ghc] master: RTS: Rename InCall.stat struct field to .rstat
 (cd9f3bf)
Message-ID: <20151204091209.46D733A300@ghc.haskell.org>

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

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

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

commit cd9f3bf9b8068fc52bb61bc3badcc1c753fbd14b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 4 10:10:55 2015 +0100

    RTS: Rename InCall.stat struct field to .rstat
    
    On AIX, C system headers can redirect the token `stat` via
    
        #define stat stat64
    
    to provide large-file support. Simply avoiding the use of `stat` as an
    identifier eschews macro-replacement.
    
    Differential Revision: https://phabricator.haskell.org/D1566


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

cd9f3bf9b8068fc52bb61bc3badcc1c753fbd14b
 rts/RtsAPI.c   |  4 ++--
 rts/Schedule.c | 12 ++++++------
 rts/Task.c     |  2 +-
 rts/Task.h     |  2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/rts/RtsAPI.c b/rts/RtsAPI.c
index 2b3ad74..c64d8af 100644
--- a/rts/RtsAPI.c
+++ b/rts/RtsAPI.c
@@ -516,7 +516,7 @@ void rts_evalLazyIO_ (/* inout */ Capability **cap,
 void
 rts_checkSchedStatus (char* site, Capability *cap)
 {
-    SchedulerStatus rc = cap->running_task->incall->stat;
+    SchedulerStatus rc = cap->running_task->incall->rstat;
     switch (rc) {
     case Success:
         return;
@@ -544,7 +544,7 @@ rts_checkSchedStatus (char* site, Capability *cap)
 SchedulerStatus
 rts_getSchedStatus (Capability *cap)
 {
-    return cap->running_task->incall->stat;
+    return cap->running_task->incall->rstat;
 }
 
 Capability *
diff --git a/rts/Schedule.c b/rts/Schedule.c
index abbc363..e3dd881 100644
--- a/rts/Schedule.c
+++ b/rts/Schedule.c
@@ -1293,19 +1293,19 @@ scheduleHandleThreadFinished (Capability *cap STG_UNUSED, Task *task, StgTSO *t)
                   // NOTE: return val is stack->sp[1] (see StgStartup.hc)
                   *(task->incall->ret) = (StgClosure *)task->incall->tso->stackobj->sp[1];
               }
-              task->incall->stat = Success;
+              task->incall->rstat = Success;
           } else {
               if (task->incall->ret) {
                   *(task->incall->ret) = NULL;
               }
               if (sched_state >= SCHED_INTERRUPTING) {
                   if (heap_overflow) {
-                      task->incall->stat = HeapExhausted;
+                      task->incall->rstat = HeapExhausted;
                   } else {
-                      task->incall->stat = Interrupted;
+                      task->incall->rstat = Interrupted;
                   }
               } else {
-                  task->incall->stat = Killed;
+                  task->incall->rstat = Killed;
               }
           }
 #ifdef DEBUG
@@ -2351,7 +2351,7 @@ scheduleWaitThread (StgTSO* tso, /*[out]*/HaskellObj* ret, Capability **pcap)
 
     task->incall->tso = tso;
     task->incall->ret = ret;
-    task->incall->stat = NoStatus;
+    task->incall->rstat = NoStatus;
 
     appendToRunQueue(cap,tso);
 
@@ -2360,7 +2360,7 @@ scheduleWaitThread (StgTSO* tso, /*[out]*/HaskellObj* ret, Capability **pcap)
 
     cap = schedule(cap,task);
 
-    ASSERT(task->incall->stat != NoStatus);
+    ASSERT(task->incall->rstat != NoStatus);
     ASSERT_FULL_CAPABILITY_INVARIANTS(cap,task);
 
     debugTrace(DEBUG_sched, "bound thread (%lu) finished", (unsigned long)id);
diff --git a/rts/Task.c b/rts/Task.c
index be72c1b..82f7780 100644
--- a/rts/Task.c
+++ b/rts/Task.c
@@ -264,7 +264,7 @@ newInCall (Task *task)
     incall->task = task;
     incall->suspended_tso = NULL;
     incall->suspended_cap = NULL;
-    incall->stat          = NoStatus;
+    incall->rstat         = NoStatus;
     incall->ret           = NULL;
     incall->next = NULL;
     incall->prev = NULL;
diff --git a/rts/Task.h b/rts/Task.h
index 58798bd..817a99a 100644
--- a/rts/Task.h
+++ b/rts/Task.h
@@ -94,7 +94,7 @@ typedef struct InCall_ {
                                 // without owning a Capability in the
                                 // first place.
 
-    SchedulerStatus  stat;      // return status
+    SchedulerStatus  rstat;     // return status
     StgClosure **    ret;       // return value
 
     struct Task_ *task;


From git at git.haskell.org  Fri Dec  4 09:43:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 09:43:34 +0000 (UTC)
Subject: [commit: ghc] master: On AIX we need -D_BSD defined in <Stg.h>
 (6ef351d)
Message-ID: <20151204094334.C6ED23A300@ghc.haskell.org>

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

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

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

commit 6ef351df6172f0795e77323fa2ca45b3ae670502
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 4 10:40:42 2015 +0100

    On AIX we need -D_BSD defined in <Stg.h>
    
    As otherwise <math.h> includes <stdlib.h> which breaks compilation
    of .hc files


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

6ef351df6172f0795e77323fa2ca45b3ae670502
 includes/Stg.h | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/includes/Stg.h b/includes/Stg.h
index f09fc00..899e685 100644
--- a/includes/Stg.h
+++ b/includes/Stg.h
@@ -48,6 +48,11 @@
 // on Linux
 # define _BSD_SOURCE
 
+// On AIX we need _BSD defined, otherwise <math.h> includes <stdlib.h>
+# if defined(_AIX)
+#  define _BSD 1
+# endif
+
 // '_BSD_SOURCE' is deprecated since glibc-2.20
 // in favour of '_DEFAULT_SOURCE'
 # define _DEFAULT_SOURCE


From git at git.haskell.org  Fri Dec  4 10:08:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 10:08:35 +0000 (UTC)
Subject: [commit: ghc] master: PmExpr: Fix CPP unacceptable too clang's CPP
 (d40f5b7)
Message-ID: <20151204100835.819B63A300@ghc.haskell.org>

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

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

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

commit d40f5b78708273255b3d433ed6a225f674c7238e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 05:05:06 2015 -0500

    PmExpr: Fix CPP unacceptable too clang's CPP


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

d40f5b78708273255b3d433ed6a225f674c7238e
 compiler/deSugar/PmExpr.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/deSugar/PmExpr.hs b/compiler/deSugar/PmExpr.hs
index f426bb4..78a51e6 100644
--- a/compiler/deSugar/PmExpr.hs
+++ b/compiler/deSugar/PmExpr.hs
@@ -357,7 +357,7 @@ pprPmExprCon con args
     list = list_elements args
 
     list_elements [x,y]
-      | PmExprCon c es <- y,  nilDataCon == c = ASSERT (null es) [x,y]
+      | PmExprCon c es <- y,  nilDataCon == c = ASSERT(null es) [x,y]
       | PmExprCon c es <- y, consDataCon == c = x : list_elements es
       | otherwise = [x,y]
     list_elements list  = pprPanic "list_elements:" (ppr list)


From git at git.haskell.org  Fri Dec  4 11:48:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 11:48:52 +0000 (UTC)
Subject: [commit: ghc] master: Use builtin ISO 8859-1 decoder in
 mkTextEncoding (36a208f)
Message-ID: <20151204114852.09E4E3A300@ghc.haskell.org>

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

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

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

commit 36a208f44df4b3c1480e4b873efca75f6adae3b4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 4 12:15:23 2015 +0100

    Use builtin ISO 8859-1 decoder in mkTextEncoding
    
    We already do this for UTF8/16/32, so it seems obvious do the same
    for the closely related popular ISO 8859-1 encoding, and avoid iconv
    issues on some platforms (such as AIX which which bundles a broken
    `libiconv` by default)
    
    This fixes #11096


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

36a208f44df4b3c1480e4b873efca75f6adae3b4
 libraries/base/GHC/IO/Encoding.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/libraries/base/GHC/IO/Encoding.hs b/libraries/base/GHC/IO/Encoding.hs
index a690717..18b5432 100644
--- a/libraries/base/GHC/IO/Encoding.hs
+++ b/libraries/base/GHC/IO/Encoding.hs
@@ -245,6 +245,8 @@ mkTextEncoding' cfm enc =
     "UTF32"   -> return $ UTF32.mkUTF32 cfm
     "UTF32LE" -> return $ UTF32.mkUTF32le cfm
     "UTF32BE" -> return $ UTF32.mkUTF32be cfm
+  -- ISO8859-1 we can handle ourselves as well
+    "ISO88591" -> return $ Latin1.mkLatin1 cfm
 #if defined(mingw32_HOST_OS)
     'C':'P':n | [(cp,"")] <- reads n -> return $ CodePage.mkCodePageEncoding cfm cp
     _ -> unknownEncodingErr (enc ++ codingFailureModeSuffix cfm)


From git at git.haskell.org  Fri Dec  4 12:07:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 12:07:26 +0000 (UTC)
Subject: [commit: ghc] master: Check: More Clang/CPP wibbles (befc4e4)
Message-ID: <20151204120726.0C2403A300@ghc.haskell.org>

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

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

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

commit befc4e4c4c76fd89a092240935d9f508de2ee664
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 13:07:16 2015 +0100

    Check: More Clang/CPP wibbles


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

befc4e4c4c76fd89a092240935d9f508de2ee664
 compiler/deSugar/Check.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 55dcfc2..dcf3b23 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -370,12 +370,12 @@ translateConPatVec  univ_tys  ex_tvs c (RecCon (HsRecFields fs _))
     -- The data constructor was not defined using record syntax. For the
     -- pattern to be in record syntax it should be empty (e.g. Just {}).
     -- So just like the previous case.
-  | null orig_lbls = ASSERT (null matched_lbls) mkPatternVarsSM arg_tys
+  | null orig_lbls = ASSERT(null matched_lbls) mkPatternVarsSM arg_tys
     -- Some of the fields appear, in the original order (there may be holes).
     -- Generate a simple constructor pattern and make up fresh variables for
     -- the rest of the fields
   | matched_lbls `subsetOf` orig_lbls
-  = ASSERT (length orig_lbls == length arg_tys)
+  = ASSERT(length orig_lbls == length arg_tys)
       let translateOne (lbl, ty) = case lookup lbl matched_pats of
             Just p  -> translatePat p
             Nothing -> mkPatternVarsSM [ty]
@@ -616,7 +616,7 @@ process_guards us  gs
 -- * Basic utilities
 
 patternType :: Pattern -> Type
-patternType (PmGuard pv _) = ASSERT (patVecArity pv == 1) (patternType p)
+patternType (PmGuard pv _) = ASSERT(patVecArity pv == 1) (patternType p)
   where Just p = find ((==1) . patternArity) pv
 patternType (NonGuard pat) = pmPatType pat
 
@@ -826,8 +826,8 @@ splitConstraints (c : rest)
   = case c of
       TyConstraint cs    -> (cs ++ ty_cs, tm_cs, bot_cs)
       TmConstraint e1 e2 -> (ty_cs, (e1,e2):tm_cs, bot_cs)
-      BtConstraint cs    -> ASSERT (isNothing bot_cs) -- NB: Only one x ~ _|_
-                                   (ty_cs, tm_cs, Just cs)
+      BtConstraint cs    -> ASSERT(isNothing bot_cs) -- NB: Only one x ~ _|_
+                                  (ty_cs, tm_cs, Just cs)
   where
     (ty_cs, tm_cs, bot_cs) = splitConstraints rest
 


From git at git.haskell.org  Fri Dec  4 12:57:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 12:57:54 +0000 (UTC)
Subject: [commit: ghc] master: Bump allocations for T783 (e9220da)
Message-ID: <20151204125754.B3BE53A300@ghc.haskell.org>

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

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

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

commit e9220daf7dbbd1ee084296a0d486a62aca7f1dcf
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 05:30:39 2015 -0500

    Bump allocations for T783
    
    The new pattern match checker increased allocations by over 100%.
    Tracking in #11162.


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

e9220daf7dbbd1ee084296a0d486a62aca7f1dcf
 testsuite/tests/perf/compiler/all.T | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index bbcb631..27a0b7b 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -424,7 +424,7 @@ test('T783',
             # 2014-09-03: 223377364 (Windows) better specialisation, raft of core-to-core optimisations
             # 2014-12-22: 235002220 (Windows) not sure why
 
-           (wordsize(64), 526230456, 10)]),
+           (wordsize(64), 1134085384, 10)]),
             # prev:       349263216 (amd64/Linux)
             # 07/08/2012: 384479856 (amd64/Linux)
             # 29/08/2012: 436927840 (amd64/Linux)
@@ -449,6 +449,8 @@ test('T783',
             #   (simplifying the switch plan code path for simple checks, #10677)
             # 2015-08-28: 526230456 (amd64/Linux)
             #    (D757: Emit Typeable instances at site of type definition)
+            # 2015-12-04: 1134085384 (amd64/Linux)
+            #    (D1535: Major overhaul of pattern match checker, #11162)
       extra_hc_opts('-static')
       ],
       compile,[''])


From git at git.haskell.org  Fri Dec  4 12:57:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 12:57:57 +0000 (UTC)
Subject: [commit: ghc] master: T5642 is broken (dc33e4c)
Message-ID: <20151204125757.57FD53A300@ghc.haskell.org>

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

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

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

commit dc33e4c65dc1587c265c698473f35f9843673cba
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 07:56:33 2015 -0500

    T5642 is broken
    
    This appears to be due to the new exhaustiveness checker. See #11163.


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

dc33e4c65dc1587c265c698473f35f9843673cba
 testsuite/tests/perf/compiler/all.T | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 27a0b7b..ede30b6 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -513,6 +513,7 @@ test('T5321FD',
 
 test('T5642',
      [ only_ways(['normal']),
+       expect_broken(11163),
        compiler_stats_num_field('bytes allocated',
            [(wordsize(32), 641085256, 10),
                      # sample from x86/Linux


From git at git.haskell.org  Fri Dec  4 13:30:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 13:30:26 +0000 (UTC)
Subject: [commit: ghc] master: T5642: Skip it entirely (96e67c0)
Message-ID: <20151204133026.349B53A300@ghc.haskell.org>

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

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

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

commit 96e67c014e9b8022599bbe19f67d1635f4955ce0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 14:30:09 2015 +0100

    T5642: Skip it entirely
    
    It uses so much memory that it would be unsafe to even allow it to run
    as it may jeopardize the stability of the build-bots.


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

96e67c014e9b8022599bbe19f67d1635f4955ce0
 testsuite/tests/perf/compiler/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index ede30b6..3303a35 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -513,7 +513,7 @@ test('T5321FD',
 
 test('T5642',
      [ only_ways(['normal']),
-       expect_broken(11163),
+       skip(), # See Trac #11163
        compiler_stats_num_field('bytes allocated',
            [(wordsize(32), 641085256, 10),
                      # sample from x86/Linux


From git at git.haskell.org  Fri Dec  4 14:06:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:06:15 +0000 (UTC)
Subject: [commit: ghc] master: Make callToPats deterministic in SpecConstr
 (5b2b7e3)
Message-ID: <20151204140615.CD4023A300@ghc.haskell.org>

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

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

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

commit 5b2b7e338c822c34f86e8bd3ff442a979711d1fe
Author: Bartosz Nitka <bnitka at fb.com>
Date:   Wed Dec 2 06:20:55 2015 -0800

    Make callToPats deterministic in SpecConstr
    
    This fixes a non-determinism bug where where depending on the
    order of uniques allocated, the specialized workers would have different
    order of arguments.
    
    Compare:
    
    ```
      $s$wgo_s1CN :: Int# -> Int -> Int#
      [LclId, Arity=2, Str=DmdType <L,U><L,U>]
      $s$wgo_s1CN =
        \ (sc_s1CI :: Int#) (sc_s1CJ :: Int) ->
          case tagToEnum# @ Bool (<=# sc_s1CI 0#) of _ [Occ=Dead] {
            False ->
              $wgo_s1BU (Just @ Int (I# (-# sc_s1CI 1#))) (Just @ Int sc_s1CJ);
            True -> 0#
          }
    ```
    
    vs
    
    ```
      $s$wgo_s18mTj :: Int -> Int# -> Int#
      [LclId, Arity=2, Str=DmdType <L,U><L,U>]
      $s$wgo_s18mTj =
        \ (sc_s18mTn :: Int) (sc_s18mTo :: Int#) ->
          case tagToEnum# @ Bool (<=# sc_s18mTo 0#) of _ [Occ=Dead] {
            False ->
              $wgo_s18mUc
                (Just @ Int (I# (-# sc_s18mTo 1#))) (Just @ Int sc_s18mTn);
            True -> 0#
          }
    ```
    
    Test Plan:
    I've added a new testcase
    ./validate
    
    Reviewers: simonmar, simonpj, austin, goldfire, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1508
    
    GHC Trac Issues: #4012


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

5b2b7e338c822c34f86e8bd3ff442a979711d1fe
 compiler/specialise/SpecConstr.hs                  | 10 ++++--
 .../determinism/simplCore/should_compile/Makefile  | 13 +++++++
 .../determinism/simplCore/should_compile/all.T     |  4 +++
 .../simplCore/should_compile/determ006.stdout      |  2 ++
 .../simplCore/should_compile/spec-inline-determ.hs | 40 ++++++++++++++++++++++
 .../tests/simplCore/should_compile/T4908.stderr    | 18 +++++-----
 .../tests/simplCore/should_compile/T7865.stdout    |  2 +-
 .../simplCore/should_compile/spec-inline.stderr    | 26 +++++++-------
 8 files changed, 90 insertions(+), 25 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5b2b7e338c822c34f86e8bd3ff442a979711d1fe

From git at git.haskell.org  Fri Dec  4 14:21:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:09 +0000 (UTC)
Subject: [commit: ghc] master: Case-of-empty-alts is trivial (Trac #11155)
 (1c9fd3f)
Message-ID: <20151204142109.49E293A300@ghc.haskell.org>

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

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

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

commit 1c9fd3f1c5522372fcaf250c805b959e8090a62c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 3 12:57:54 2015 +0000

    Case-of-empty-alts is trivial (Trac #11155)
    
    As you'll see from Trac #11155, the code generator was confused
    by a binding let x = y in ....   Why did that happen? Because of
    a (case y of {}) expression on the RHS.
    
    The right thing is just to expand what a "trivial" expression is.
    
    See Note [Empty case is trivial] in CoreUtils.


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

1c9fd3f1c5522372fcaf250c805b959e8090a62c
 compiler/coreSyn/CorePrep.hs                       | 20 +++++++++++---------
 compiler/coreSyn/CoreUtils.hs                      | 20 +++++++++++++++++++-
 testsuite/tests/simplCore/should_compile/Makefile  |  6 ++++++
 testsuite/tests/simplCore/should_compile/T11155.hs | 11 +++++++++++
 testsuite/tests/simplCore/should_compile/all.T     |  5 ++++-
 5 files changed, 51 insertions(+), 11 deletions(-)

diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs
index fdf25d6..999ca54 100644
--- a/compiler/coreSyn/CorePrep.hs
+++ b/compiler/coreSyn/CorePrep.hs
@@ -847,15 +847,17 @@ of the scope of a `seq`, or dropped the `seq` altogether.
 
 cpe_ExprIsTrivial :: CoreExpr -> Bool
 -- Version that doesn't consider an scc annotation to be trivial.
-cpe_ExprIsTrivial (Var _)        = True
-cpe_ExprIsTrivial (Type _)       = True
-cpe_ExprIsTrivial (Coercion _)   = True
-cpe_ExprIsTrivial (Lit _)        = True
-cpe_ExprIsTrivial (App e arg)    = isTypeArg arg && cpe_ExprIsTrivial e
-cpe_ExprIsTrivial (Tick t e)     = not (tickishIsCode t) && cpe_ExprIsTrivial e
-cpe_ExprIsTrivial (Cast e _)     = cpe_ExprIsTrivial e
-cpe_ExprIsTrivial (Lam b body) | isTyVar b = cpe_ExprIsTrivial body
-cpe_ExprIsTrivial _              = False
+cpe_ExprIsTrivial (Var _)         = True
+cpe_ExprIsTrivial (Type _)        = True
+cpe_ExprIsTrivial (Coercion _)    = True
+cpe_ExprIsTrivial (Lit _)         = True
+cpe_ExprIsTrivial (App e arg)     = not (isRuntimeArg arg) && cpe_ExprIsTrivial e
+cpe_ExprIsTrivial (Lam b e)       = not (isRuntimeVar b) && cpe_ExprIsTrivial e
+cpe_ExprIsTrivial (Tick t e)      = not (tickishIsCode t) && cpe_ExprIsTrivial e
+cpe_ExprIsTrivial (Cast e _)      = cpe_ExprIsTrivial e
+cpe_ExprIsTrivial (Case e _ _ []) = cpe_ExprIsTrivial e
+                                    -- See Note [Empty case is trivial] in CoreUtils
+cpe_ExprIsTrivial _               = False
 
 {-
 -- -----------------------------------------------------------------------------
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 889e239..5c1c986 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -733,11 +733,28 @@ saturating them.
 
 Note [Tick trivial]
 ~~~~~~~~~~~~~~~~~~~
-
 Ticks are only trivial if they are pure annotations. If we treat
 "tick<n> x" as trivial, it will be inlined inside lambdas and the
 entry count will be skewed, for example.  Furthermore "scc<n> x" will
 turn into just "x" in mkTick.
+
+Note [Empty case is trivial]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+The expression (case (x::Int) Bool of {}) is just a type-changing
+case used when we are sure that 'x' will not return.  See
+Note [Empty case alternatives] in CoreSyn.
+
+If the scrutinee is trivial, then so is the whole expression; and the
+CoreToSTG pass in fact drops the case expression leaving only the
+scrutinee.
+
+Having more trivial expressions is good.  Moreover, if we don't treat
+it as trivial we may land up with let-bindings like
+   let v = case x of {} in ...
+and after CoreToSTG that gives
+   let v = x in ...
+and that confuses the code generator (Trac #11155). So best to kill
+it off at source.
 -}
 
 exprIsTrivial :: CoreExpr -> Bool
@@ -750,6 +767,7 @@ exprIsTrivial (Tick t e)       = not (tickishIsCode t) && exprIsTrivial e
                                  -- See Note [Tick trivial]
 exprIsTrivial (Cast e _)       = exprIsTrivial e
 exprIsTrivial (Lam b body)     = not (isRuntimeVar b) && exprIsTrivial body
+exprIsTrivial (Case e _ _ [])  = exprIsTrivial e  -- See Note [Empty case is trivial]
 exprIsTrivial _                = False
 
 {-
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index 8c6ec45..eb6d742 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -6,6 +6,12 @@ T8832:
 	$(RM) -f T8832.o T8832.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(T8832_WORDSIZE_OPTS) -O -c -ddump-simpl T8832.hs | grep '^[a-zA-Z0-9]\+ ='
 
+T11155:
+	$(RM) -f T11155.o T11155.hi
+	'$(TEST_HC)' $(TEST_HC_OPTS) -c T11155.hs
+	-nm T11155.o  | grep 'stg_ap_0_upd'
+	# Expecting no output from the grep
+
 T8274:
 	$(RM) -f T8274.o T8274.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl T8274.hs | grep '#'
diff --git a/testsuite/tests/simplCore/should_compile/T11155.hs b/testsuite/tests/simplCore/should_compile/T11155.hs
new file mode 100644
index 0000000..b57bbe9
--- /dev/null
+++ b/testsuite/tests/simplCore/should_compile/T11155.hs
@@ -0,0 +1,11 @@
+{-# OPTIONS_GHC -O -fno-full-laziness #-}
+module T11155 where
+
+foo :: Bool
+{-# NOINLINE foo #-}
+foo = error "rk"
+
+bar x = let t :: Char
+            t = case foo of { True -> 'v'; False -> 'y' }
+        in [t]
+
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index c99b8f2..f9388c9 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -224,4 +224,7 @@ test('T10083',
      run_command,
      ['$MAKE -s --no-print-directory T10083'])
 test('T10689', normal, compile, [''])
-test('T10689a', normal, compile, [''])
+test('T11155',
+     normal,
+     run_command,
+     ['$MAKE -s --no-print-directory T11155'])


From git at git.haskell.org  Fri Dec  4 14:21:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:12 +0000 (UTC)
Subject: [commit: ghc] master: Add derived constraints for wildcard signatures
 (28035c0)
Message-ID: <20151204142112.C55443A300@ghc.haskell.org>

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

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

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

commit 28035c0900f8d535e0b03d4c2aa0c79ba728436d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 3 13:03:07 2015 +0000

    Add derived constraints for wildcard signatures
    
    This fixes Trac #11016
    
    See Note [Add deriveds for signature contexts] in TcSimplify]


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

28035c0900f8d535e0b03d4c2aa0c79ba728436d
 compiler/typecheck/TcSimplify.hs                   | 90 +++++++++++++---------
 .../tests/partial-sigs/should_compile/T11016.hs    |  9 +++
 .../partial-sigs/should_compile/T11016.stderr      | 11 +++
 testsuite/tests/partial-sigs/should_compile/all.T  |  1 +
 4 files changed, 76 insertions(+), 35 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 28035c0900f8d535e0b03d4c2aa0c79ba728436d

From git at git.haskell.org  Fri Dec  4 14:21:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:15 +0000 (UTC)
Subject: [commit: ghc] master: Wibbles only (1cb3c8c)
Message-ID: <20151204142115.706F03A300@ghc.haskell.org>

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

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

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

commit 1cb3c8c2e8bc7d5dd8123f6473ae9b1a6060408b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 11:58:05 2015 +0000

    Wibbles only


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

1cb3c8c2e8bc7d5dd8123f6473ae9b1a6060408b
 compiler/typecheck/TcBinds.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index d171b0c..bf6c833 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -757,11 +757,11 @@ mkInferredPolyId qtvs inferred_theta poly_name mb_sig mono_ty
                                 inferred_theta (tyVarsOfType mono_ty') mb_sig
 
        ; let qtvs' = filter (`elemVarSet` my_tvs) qtvs   -- Maintain original order
-       ; let inferred_poly_ty = mkSigmaTy qtvs' theta' mono_ty'
-             msg = mk_inf_msg poly_name inferred_poly_ty
+             inferred_poly_ty = mkSigmaTy qtvs' theta' mono_ty'
 
-       ; traceTc "mkInferredPolyId" (vcat [ppr poly_name, ppr qtvs, ppr my_tvs, ppr theta', ppr inferred_poly_ty])
-       ; addErrCtxtM msg $
+       ; traceTc "mkInferredPolyId" (vcat [ppr poly_name, ppr qtvs, ppr my_tvs, ppr theta'
+                                          , ppr inferred_poly_ty])
+       ; addErrCtxtM (mk_inf_msg poly_name inferred_poly_ty) $
          checkValidType (InfSigCtxt poly_name) inferred_poly_ty
 
        ; return (mkLocalId poly_name inferred_poly_ty) }


From git at git.haskell.org  Fri Dec  4 14:21:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:18 +0000 (UTC)
Subject: [commit: ghc] master: Make -dppr-debug show contents of (TypeError
 ...) (822141b)
Message-ID: <20151204142118.10AB33A300@ghc.haskell.org>

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

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

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

commit 822141b95174f068872fd4e491da764139ce626f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 11:59:08 2015 +0000

    Make -dppr-debug show contents of (TypeError ...)
    
    Just for debugging


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

822141b95174f068872fd4e491da764139ce626f
 compiler/types/TypeRep.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/compiler/types/TypeRep.hs b/compiler/types/TypeRep.hs
index 384f1ef..f13ca8a 100644
--- a/compiler/types/TypeRep.hs
+++ b/compiler/types/TypeRep.hs
@@ -790,7 +790,9 @@ pprTyTcApp p tc tys
     if gopt Opt_PrintExplicitKinds dflags then pprTcApp  p ppr_type tc tys
                                    else pprTyList p ty1 ty2
 
-  | tc `hasKey` errorMessageTypeErrorFamKey = text "(TypeError ...)"
+  | not opt_PprStyle_Debug
+  , tc `hasKey` errorMessageTypeErrorFamKey
+  = text "(TypeError ...)"   -- Suppress detail unles you _really_ want to see it
 
   | otherwise
   = pprTcApp p ppr_type tc tys


From git at git.haskell.org  Fri Dec  4 14:21:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:21 +0000 (UTC)
Subject: [commit: ghc] master: Fix egregious error in eta-reduction of data
 families (1160dc5)
Message-ID: <20151204142121.55AED3A300@ghc.haskell.org>

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

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

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

commit 1160dc516f8b27249d819665883409ee270a743f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 12:08:37 2015 +0000

    Fix egregious error in eta-reduction of data families
    
    This terrible and long-standing bug was shown up by Trac #11148.
    We are trying to eta-reduce a data family instance, so that we
    can then derive Functor or Generic.  But we were assuming, for
    absolutely not reason whatsoever, that the type variables were
    lined up in a convenient order.  The fact that it ever worked
    was a fluke.
    
    This patch fixes it properly.  Main change is in eta_reduce
    in TcInstDcls.tcDataFamInstDecl


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

1160dc516f8b27249d819665883409ee270a743f
 compiler/typecheck/TcInstDcls.hs                  | 92 +++++++++--------------
 compiler/types/FamInstEnv.hs                      | 60 ++++++++++++---
 testsuite/tests/deriving/should_compile/Makefile  | 10 ++-
 testsuite/tests/deriving/should_compile/T11148.hs | 11 +++
 testsuite/tests/deriving/should_compile/all.T     |  2 +
 5 files changed, 109 insertions(+), 66 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1160dc516f8b27249d819665883409ee270a743f

From git at git.haskell.org  Fri Dec  4 14:21:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:23 +0000 (UTC)
Subject: [commit: ghc] master: Minor refactoring of user type errors (31b482b)
Message-ID: <20151204142123.EFDBC3A300@ghc.haskell.org>

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

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

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

commit 31b482bfa68ec8524c4039a33ba55f0aaf02dc0b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 12:11:43 2015 +0000

    Minor refactoring of user type errors
    
    * Remove unused Kind result of getUserTypeErrorMsg
    * Rename isUserErrorTy  -->   userTypeError_maybe


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

31b482bfa68ec8524c4039a33ba55f0aaf02dc0b
 compiler/typecheck/TcErrors.hs  |  4 ++--
 compiler/typecheck/TcRnTypes.hs |  6 +++---
 compiler/types/Type.hs          | 11 ++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/compiler/typecheck/TcErrors.hs b/compiler/typecheck/TcErrors.hs
index 156b1ff..ad389b2 100644
--- a/compiler/typecheck/TcErrors.hs
+++ b/compiler/typecheck/TcErrors.hs
@@ -499,8 +499,8 @@ mkUserTypeError ctxt ct = mkErrorMsgFromCt ctxt ct
                         $ important
                         $ pprUserTypeErrorTy
                         $ case getUserTypeErrorMsg ct of
-                            Just (_,msg) -> msg
-                            Nothing      -> pprPanic "mkUserTypeError" (ppr ct)
+                            Just msg -> msg
+                            Nothing  -> pprPanic "mkUserTypeError" (ppr ct)
 
 
 mkGroupReporter :: (ReportErrCtxt -> [Ct] -> TcM ErrMsg)
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index f66399d..0e8f682 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -1661,14 +1661,14 @@ isTypeHoleCt _ = False
 --    1. TypeError msg
 --    2. TypeError msg ~ Something  (and the other way around)
 --    3. C (TypeError msg)          (for any parameter of class constraint)
-getUserTypeErrorMsg :: Ct -> Maybe (Kind, Type)
+getUserTypeErrorMsg :: Ct -> Maybe Type
 getUserTypeErrorMsg ct
   | Just (_,t1,t2) <- getEqPredTys_maybe ctT    = oneOf [t1,t2]
   | Just (_,ts)    <- getClassPredTys_maybe ctT = oneOf ts
-  | otherwise                                   = isUserErrorTy ctT
+  | otherwise                                   = userTypeError_maybe ctT
   where
   ctT       = ctPred ct
-  oneOf xs  = msum (map isUserErrorTy xs)
+  oneOf xs  = msum (map userTypeError_maybe xs)
 
 isUserTypeErrorCt :: Ct -> Bool
 isUserTypeErrorCt ct = case getUserTypeErrorMsg ct of
diff --git a/compiler/types/Type.hs b/compiler/types/Type.hs
index 13ac503..f7493f3 100644
--- a/compiler/types/Type.hs
+++ b/compiler/types/Type.hs
@@ -39,7 +39,7 @@ module Type (
         mkNumLitTy, isNumLitTy,
         mkStrLitTy, isStrLitTy,
 
-        isUserErrorTy, pprUserTypeErrorTy,
+        userTypeError_maybe, pprUserTypeErrorTy,
 
         coAxNthLHS,
 
@@ -460,10 +460,11 @@ isStrLitTy _                    = Nothing
 
 -- | Is this type a custom user error?
 -- If so, give us the kind and the error message.
-isUserErrorTy :: Type -> Maybe (Kind,Type)
-isUserErrorTy t = do (tc,[k,msg]) <- splitTyConApp_maybe t
-                     guard (tyConName tc == errorMessageTypeErrorFamName)
-                     return (k,msg)
+userTypeError_maybe :: Type -> Maybe Type
+userTypeError_maybe t
+  = do { (tc, [_kind, msg]) <- splitTyConApp_maybe t
+       ; guard (tyConName tc == errorMessageTypeErrorFamName)
+       ; return msg }
 
 -- | Render a type corresponding to a user type error into a SDoc.
 pprUserTypeErrorTy :: Type -> SDoc


From git at git.haskell.org  Fri Dec  4 14:21:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:26 +0000 (UTC)
Subject: [commit: ghc] master: Tidy user type errors in checkValidType
 (67565a7)
Message-ID: <20151204142126.AC0543A300@ghc.haskell.org>

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

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

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

commit 67565a72f5bcd2edcb5775dc3879708f9d302fa8
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 12:23:33 2015 +0000

    Tidy user type errors in checkValidType
    
    Trac #11144 showed that we need to tidy the type in the error message
    generated in TcValidity.checkUserTypeError.
    
    This is still unsatisfactory.  checkValidType was originally supposed
    to be called only on types gotten directly from user-written HsTypes.
    So its error messages do no tidying.  But TcBinds calls it checkValidType
    on an /inferred/ type, which may need tidying.
    
    Still this at least fixes the bad error message in CustomTypeErrors02,
    which was the original ticket.
    
    Some other small refactorings:
    
    * Remove unused Kind result of getUserTypeErrorMsg
    * Rename isUserErrorTy  -->   userTypeError_maybe


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

67565a72f5bcd2edcb5775dc3879708f9d302fa8
 compiler/typecheck/TcBinds.hs                         | 16 ++++++----------
 compiler/typecheck/TcValidity.hs                      | 19 ++++++++++++++++---
 .../typecheck/should_fail/CustomTypeErrors02.stderr   |  2 +-
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index bf6c833..6575082 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -707,7 +707,7 @@ mkExport prag_fn qtvs theta mono_info@(poly_name, mb_sig, mono_id)
               _other   -> checkNoErrs $
                           mkInferredPolyId qtvs theta
                                            poly_name mb_sig mono_ty
-              -- The checkNoErrors ensures that if the type is ambiguous
+              -- The checkNoErrs ensures that if the type is ambiguous
               -- we don't carry on to the impedence matching, and generate
               -- a duplicate ambiguity error.  There is a similar
               -- checkNoErrs for complete type signatures too.
@@ -718,9 +718,8 @@ mkExport prag_fn qtvs theta mono_info@(poly_name, mb_sig, mono_id)
                 -- tcPrags requires a zonked poly_id
 
         -- See Note [Impedence matching]
-        -- NB: we have already done checkValidType on the type
-        --     for a complete sig, when we checked the sig;
-        --     otherwise in mkInferredPolyIe
+        -- NB: we have already done checkValidType, including an ambiguity check,
+        --     on the type; either when we checked the sig or in mkInferredPolyId
         ; let sel_poly_ty = mkSigmaTy qtvs theta mono_ty
               poly_ty     = idType poly_id
         ; wrap <- if sel_poly_ty `eqType` poly_ty
@@ -763,6 +762,7 @@ mkInferredPolyId qtvs inferred_theta poly_name mb_sig mono_ty
                                           , ppr inferred_poly_ty])
        ; addErrCtxtM (mk_inf_msg poly_name inferred_poly_ty) $
          checkValidType (InfSigCtxt poly_name) inferred_poly_ty
+         -- See Note [Validity of inferred types]
 
        ; return (mkLocalId poly_name inferred_poly_ty) }
 
@@ -884,16 +884,12 @@ simply adds the inferred type to the program source, it'll compile fine.
 See #8883.
 
 Examples that might fail:
+ - the type might be ambiguous
+
  - an inferred theta that requires type equalities e.g. (F a ~ G b)
                                 or multi-parameter type classes
  - an inferred type that includes unboxed tuples
 
-However we don't do the ambiguity check (checkValidType omits it for
-InfSigCtxt) because the impedance-matching stage, which follows
-immediately, will do it and we don't want two error messages.
-Moreover, because of the impedance matching stage, the ambiguity-check
-suggestion of -XAllowAmbiguiousTypes will not work.
-
 
 Note [Impedence matching]
 ~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/compiler/typecheck/TcValidity.hs b/compiler/typecheck/TcValidity.hs
index 04bbd46..8422ba4 100644
--- a/compiler/typecheck/TcValidity.hs
+++ b/compiler/typecheck/TcValidity.hs
@@ -231,19 +231,32 @@ wantAmbiguityCheck ctxt
                          -- E.g.   type family T a :: *  -- T :: forall k. k -> *
                          -- Then :k T should work in GHCi, not complain that
                          -- (T k) is ambiguous!
---      InfSigCtxt {} -> False   -- See Note [Validity of inferred types] in TcBinds
       _ -> True
 
 
 checkUserTypeError :: Type -> TcM ()
+-- Check to see if the type signature mentions "TypeError blah"
+-- anywhere in it, and fail if so.
+--
+-- Very unsatisfactorily (Trac #11144) we need to tidy the type
+-- because it may have come from an /inferred/ signature, not a
+-- user-supplied one.  This is really only a half-baked fix;
+-- the other errors in checkValidType don't do tidying, and so
+-- may give bad error messages when given an inferred type.
 checkUserTypeError = check
   where
   check ty
-    | Just (_,msg) <- isUserErrorTy ty = failWithTc (pprUserTypeErrorTy msg)
+    | Just msg     <- userTypeError_maybe ty  = fail_with msg
     | Just (_,ts)  <- splitTyConApp_maybe ty  = mapM_ check ts
     | Just (t1,t2) <- splitAppTy_maybe ty     = check t1 >> check t2
+    | Just (_,t1)  <- splitForAllTy_maybe ty  = check t1
     | otherwise                               = return ()
 
+  fail_with msg = do { env0 <- tcInitTidyEnv
+                     ; let (env1, tidy_msg) = tidyOpenType env0 msg
+                     ; failWithTcM (env1, pprUserTypeErrorTy tidy_msg) }
+
+
 {-
 ************************************************************************
 *                                                                      *
@@ -280,7 +293,7 @@ This might not necessarily show up in kind checking.
 -}
 
 checkValidType :: UserTypeCtxt -> Type -> TcM ()
--- Checks that the type is valid for the given context
+-- Checks that a user-written type is valid for the given context
 -- Assumes arguemt is fully zonked
 -- Not used for instance decls; checkValidInstance instead
 checkValidType ctxt ty
diff --git a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
index 464c62d..0b8be13 100644
--- a/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
+++ b/testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
@@ -1,6 +1,6 @@
 
 CustomTypeErrors02.hs:17:1: error:
-    ? The type 'a_aEN -> a_aEN' cannot be represented as an integer.
+    ? The type 'a0 -> a0' cannot be represented as an integer.
     ? When checking the inferred type
         err :: (TypeError ...)
 


From git at git.haskell.org  Fri Dec  4 14:21:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 14:21:29 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (43a5970)
Message-ID: <20151204142129.54C2E3A300@ghc.haskell.org>

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

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

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

commit 43a5970a4f721138145f55e90bd910f3723abc3c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 4 12:24:49 2015 +0000

    Comments only


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

43a5970a4f721138145f55e90bd910f3723abc3c
 compiler/typecheck/TcSMonad.hs | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/compiler/typecheck/TcSMonad.hs b/compiler/typecheck/TcSMonad.hs
index 8ddb488..0c5564b 100644
--- a/compiler/typecheck/TcSMonad.hs
+++ b/compiler/typecheck/TcSMonad.hs
@@ -662,8 +662,8 @@ Definition [Can-rewrite relation]
 A "can-rewrite" relation between flavours, written f1 >= f2, is a
 binary relation with the following properties
 
-  R1.  >= is transitive
-  R2.  If f1 >= f, and f2 >= f,
+  (R1) >= is transitive
+  (R2) If f1 >= f, and f2 >= f,
        then either f1 >= f2 or f2 >= f1
 
 Lemma.  If f1 >= f then f1 >= f1
@@ -690,7 +690,7 @@ See Note [Flavours with roles].
 Theorem: S(f,a) is well defined as a function.
 Proof: Suppose (a -f1-> t1) and (a -f2-> t2) are both in S,
                and  f1 >= f and f2 >= f
-       Then by (R2) f1 >= f2 or f2 >= f1, which contradicts (WF)
+       Then by (R2) f1 >= f2 or f2 >= f1, which contradicts (WF1)
 
 Notation: repeated application.
   S^0(f,t)     = t
@@ -702,9 +702,6 @@ A generalised substitution S is "inert" iff
   (IG1) there is an n such that
         for every f,t, S^n(f,t) = S^(n+1)(f,t)
 
-  (IG2) if (b -f-> t) in S, and f >= f, then S(f,t) = t
-        that is, each individual binding is "self-stable"
-
 By (IG1) we define S*(f,t) to be the result of exahaustively
 applying S(f,_) to t.
 
@@ -719,8 +716,8 @@ guarantee that this recursive use will terminate.
 
 Note [Extending the inert equalities]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-This is the main theorem!
-
+Theorem [Stability under extension]
+   This is the main theorem!
    Suppose we have a "work item"
        a -fw-> t
    and an inert generalised substitution S,


From git at git.haskell.org  Fri Dec  4 15:12:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 15:12:39 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: Rename pmcheck/T7669 to
 pmcheck/T7669a (caa6851)
Message-ID: <20151204151239.A698F3A300@ghc.haskell.org>

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

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

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

commit caa68516449c205ba4affe1d31b9bffbded09b57
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 09:31:53 2015 -0500

    testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
    
    This was a duplicate.


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

caa68516449c205ba4affe1d31b9bffbded09b57
 testsuite/tests/pmcheck/should_compile/T7669.stderr                     | 0
 testsuite/tests/pmcheck/should_compile/{T7669.hs => T7669a.hs}          | 0
 .../tests/pmcheck/should_compile/T7669a.stderr                          | 0
 testsuite/tests/pmcheck/should_compile/all.T                            | 2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/pmcheck/should_compile/T7669.stderr b/testsuite/tests/pmcheck/should_compile/T7669.stderr
deleted file mode 100644
index e69de29..0000000
diff --git a/testsuite/tests/pmcheck/should_compile/T7669.hs b/testsuite/tests/pmcheck/should_compile/T7669a.hs
similarity index 100%
rename from testsuite/tests/pmcheck/should_compile/T7669.hs
rename to testsuite/tests/pmcheck/should_compile/T7669a.hs
diff --git a/libraries/base/tests/IO/misc001.stdout b/testsuite/tests/pmcheck/should_compile/T7669a.stderr
similarity index 100%
copy from libraries/base/tests/IO/misc001.stdout
copy to testsuite/tests/pmcheck/should_compile/T7669a.stderr
diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index 3aac879..8ff797a 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -18,7 +18,7 @@ test('T3927b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-pattern
 test('T3927', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T4139', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T6124', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
-test('T7669', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T7669a', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T8970', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])


From git at git.haskell.org  Fri Dec  4 15:12:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 15:12:42 +0000 (UTC)
Subject: [commit: ghc] master: T5642: Fix skip usage (16aae60)
Message-ID: <20151204151242.45F9F3A300@ghc.haskell.org>

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

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

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

commit 16aae6083c44856a03b25df0a6d9cc8d647963dc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 09:29:59 2015 -0500

    T5642: Fix skip usage


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

16aae6083c44856a03b25df0a6d9cc8d647963dc
 testsuite/tests/perf/compiler/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 3303a35..57b8810 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -513,7 +513,7 @@ test('T5321FD',
 
 test('T5642',
      [ only_ways(['normal']),
-       skip(), # See Trac #11163
+       skip, # See Trac #11163
        compiler_stats_num_field('bytes allocated',
            [(wordsize(32), 641085256, 10),
                      # sample from x86/Linux


From git at git.haskell.org  Fri Dec  4 15:12:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 15:12:44 +0000 (UTC)
Subject: [commit: ghc] master: Update peak_megabytes_allocated for T9675
 (d4bf863)
Message-ID: <20151204151244.DDE7E3A300@ghc.haskell.org>

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

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

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

commit d4bf86322a50d5fee550040d15e376fe53ff629b
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 09:55:58 2015 -0500

    Update peak_megabytes_allocated for T9675
    
    Interestingly enough this decreased with the new pattern checker. I'm
    not entirely sure why at the moment as the test is merely a large
    record with a bunch of selectors. I wouldn't have thought this would tax
    the pattern checker particularly much but oh well.


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

d4bf86322a50d5fee550040d15e376fe53ff629b
 testsuite/tests/perf/compiler/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index 57b8810..1ebc134 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -617,13 +617,14 @@ test('T9675',
  	  # 2015-07-11    15341228   (x86/Linux, 64-bit machine) use +RTS -G1
           ]),
        compiler_stats_num_field('peak_megabytes_allocated', # Note [residency]
-          [(wordsize(64), 105, 15),
+          [(wordsize(64), 88, 15),
           # 2014-10-13    66
           # 2014-10-13    58         seq the DmdEnv in seqDmdType as well
           # 2014-10-13    49         different machines giving different results...
           # 2014-10-13    53         use the mean
           # 2015-06-15    44         reduced for some reason
           # 2015-06-21    105        switch to `+RTS -G1`
+          # 2015-12-04    88         new pattern checker (D1535)
             (wordsize(32), 56, 15)
  	  # 2015-07-11    56         (x86/Linux, 64-bit machine) use +RTS -G1
           ]),


From git at git.haskell.org  Fri Dec  4 16:31:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 16:31:27 +0000 (UTC)
Subject: [commit: ghc] master: Add linter to check for binaries accidentally
 added to repository (020375d)
Message-ID: <20151204163127.280EF3A300@ghc.haskell.org>

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

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

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

commit 020375d1e723339a95b86d0d3b8a8214b1cc144a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 4 13:14:27 2015 +0100

    Add linter to check for binaries accidentally added to repository
    
    This should catch mistakes like
    a703fbce20969e6f02e74fee76c0a9e22b513426.
    
    Adds an arcanist-external-json-linter submodule, which should eventually
    be mirrored on haskell.org resources.
    
    Test Plan: Validate
    
    Reviewers: thomie, hvr, austin
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1515


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

020375d1e723339a95b86d0d3b8a8214b1cc144a
 .arc-linters/arcanist-external-json-linter |  1 +
 .arc-linters/check-binaries.py             | 20 ++++++++++++++++++++
 .arcconfig                                 |  6 +++++-
 .arclint                                   |  4 ++++
 .gitmodules                                |  3 +++
 5 files changed, 33 insertions(+), 1 deletion(-)

diff --git a/.arc-linters/arcanist-external-json-linter b/.arc-linters/arcanist-external-json-linter
new file mode 160000
index 0000000..85ece0f
--- /dev/null
+++ b/.arc-linters/arcanist-external-json-linter
@@ -0,0 +1 @@
+Subproject commit 85ece0f8653e7b1e7de6024d372cfeaf36ab5fa9
diff --git a/.arc-linters/check-binaries.py b/.arc-linters/check-binaries.py
new file mode 100755
index 0000000..ae00756
--- /dev/null
+++ b/.arc-linters/check-binaries.py
@@ -0,0 +1,20 @@
+#!/usr/bin/env python
+
+# A linter to warn when binary files are added to the repository
+
+import sys
+import os
+import json
+
+path = sys.argv[1]
+warnings = []
+if os.path.isfile(path):
+    with open(path) as f:
+        if '\0' in f.read(8000):
+            warning = {
+                'severity': 'warning',
+                'message': 'This file appears to be a binary file; does it really belong in the repository?'
+            }
+            warnings.append(warning)
+
+print json.dumps(warnings)
diff --git a/.arcconfig b/.arcconfig
index b9c3932..c886789 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,5 +1,9 @@
 {
   "project.name"        : "ghc",
   "repository.callsign" : "GHC",
-  "phabricator.uri"     : "https://phabricator.haskell.org"
+  "phabricator.uri"     : "https://phabricator.haskell.org",
+
+  "load": [
+    ".arc-linters/arcanist-external-json-linter"
+  ]
 }
diff --git a/.arclint b/.arclint
index 8f83776..1b13507 100644
--- a/.arclint
+++ b/.arclint
@@ -52,6 +52,10 @@
       "severity": {
         "2": "disabled"
       }
+    },
+    "check-binaries": {
+      "type": "external-json",
+      "external-json.script": "python .arc-linters/check-binaries.py"
     }
   },
 
diff --git a/.gitmodules b/.gitmodules
index 662f6d6..0d88e01 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -115,3 +115,6 @@
 	path = libffi-tarballs
 	url = ../libffi-tarballs.git
 	ignore = none
+[submodule ".arc-linters/arcanist-external-json-linter"]
+	path = .arc-linters/arcanist-external-json-linter
+	url = https://github.com/bgamari/arcanist-external-json-linter.git


From git at git.haskell.org  Fri Dec  4 16:31:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 16:31:30 +0000 (UTC)
Subject: [commit: ghc] master: lint: Add linter to catch uses of ASSERT macro
 that Clang dislikes (901cab1)
Message-ID: <20151204163130.1E2073A300@ghc.haskell.org>

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

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

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

commit 901cab10609dc9795e57163834512373530fc4a5
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 4 13:25:26 2015 +0100

    lint: Add linter to catch uses of ASSERT macro that Clang dislikes
    
    In particular Clang rejects uses of CPP macros where the argument list
    is separated by a space from the macro name. Warn when we see ASSERT
    used in this way.


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

901cab10609dc9795e57163834512373530fc4a5
 .arc-linters/check-cpp.py | 37 +++++++++++++++++++++++++++++++++++++
 .arclint                  |  5 +++++
 2 files changed, 42 insertions(+)

diff --git a/.arc-linters/check-cpp.py b/.arc-linters/check-cpp.py
new file mode 100755
index 0000000..3794ca2
--- /dev/null
+++ b/.arc-linters/check-cpp.py
@@ -0,0 +1,37 @@
+#!/usr/bin/env python
+
+# A linter to warn for ASSERT macros which are separated from their argument
+# list by a space, which Clang's CPP barfs on
+
+import sys
+import logging
+import os
+import json
+import re
+
+
+def setup_logging():
+    logger = logging.getLogger()
+    hdlr = logging.FileHandler('linter.log', 'w')
+    logger.addHandler(hdlr)
+    logger.setLevel(logging.DEBUG)
+    return logger
+
+logger = setup_logging()
+#logger.debug(sys.argv)
+
+path = sys.argv[1]
+warnings = []
+if os.path.isfile(path):
+    with open(path) as f:
+        for lineno, line in enumerate(f):
+            if re.search('ASSERT \(', line) is not None:
+                warning = {
+                    'severity': 'warning',
+                    'message': 'CPP macros should not have a space between the macro name and their argument list',
+                    'line': lineno+1,
+                }
+                warnings.append(warning)
+
+logger.debug(warnings)
+print json.dumps(warnings)
diff --git a/.arclint b/.arclint
index 1b13507..ef43856 100644
--- a/.arclint
+++ b/.arclint
@@ -56,6 +56,11 @@
     "check-binaries": {
       "type": "external-json",
       "external-json.script": "python .arc-linters/check-binaries.py"
+    },
+    "bad-assert-clang-cpp": {
+      "type": "external-json",
+      "include": ["(\\.(l?hs|x|y\\.pp)(\\.in)?$)"],
+      "external-json.script": "python .arc-linters/check-cpp.py"
     }
   },
 


From git at git.haskell.org  Fri Dec  4 20:37:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 20:37:52 +0000 (UTC)
Subject: [commit: ghc] master: StgCmmMonad: Implement Outputable instance for
 Sequel for debugging (c865c42)
Message-ID: <20151204203752.99A553A300@ghc.haskell.org>

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

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

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

commit c865c425a37b0bc52f4dead9d70eb0ee2bc287d6
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Fri Dec 4 15:36:47 2015 -0500

    StgCmmMonad: Implement Outputable instance for Sequel for debugging
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1563


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

c865c425a37b0bc52f4dead9d70eb0ee2bc287d6
 compiler/codeGen/StgCmmMonad.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index 7ddbcd6..dd82b7f 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -227,6 +227,10 @@ data Sequel
                         -- may allocate (e.g. it's a foreign call or
                         -- allocating primOp)
 
+instance Outputable Sequel where
+    ppr (Return b) = ptext (sLit "Return") <+> ppr b
+    ppr (AssignTo regs b) = ptext (sLit "AssignTo") <+> ppr regs <+> ppr b
+
 -- See Note [sharing continuations] below
 data ReturnKind
   = AssignedDirectly


From git at git.haskell.org  Fri Dec  4 22:07:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri,  4 Dec 2015 22:07:21 +0000 (UTC)
Subject: [commit: ghc] master: libdw: enable support only on i386 and amd64
 (e2c518e)
Message-ID: <20151204220721.5F85D3A300@ghc.haskell.org>

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

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

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

commit e2c518e6a751b7a16c704198a14dcc688b020038
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Fri Dec 4 22:07:13 2015 +0000

    libdw: enable support only on i386 and amd64
    
    Summary:
    Currently libdw requires per-arch implementation of
    set_initial_registers() function.
    
    Otherwise build fails with linkage error
    (seen on sparc):
    
      rts/dist/build/libHSrts_thr-ghc7.11.20151129.so:
          undefined reference to `set_initial_registers'
      collect2: error: ld returned 1 exit status
      `gcc' failed in phase `Linker'. (Exit code: 1)
      make[1]: *** [ghc/stage2/build/tmp/ghc-stage2] Error 1
    
    Converted link-time error to compile-time error,
    added arch whitelist.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1567


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

e2c518e6a751b7a16c704198a14dcc688b020038
 mk/config.mk.in | 6 +++---
 rts/Libdw.c     | 5 +++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 967c751..d7cd05b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -371,9 +371,9 @@ UseSystemLibFFI=@UseSystemLibFFI@
 FFILibDir=@FFILibDir@
 FFIIncludeDir=@FFIIncludeDir@
 
-
-# Include support for DWARF unwinding
-GhcRtsWithLibdw = @HaveLibdw@
+# GHC needs arch-specific tweak at least in
+#     rts/Libdw.c:set_initial_registers()
+GhcRtsWithLibdw=$(strip $(if $(filter $(TargetArch_CPP),i386 x86_64), at HaveLibdw@,NO))
 
 ################################################################################
 #
diff --git a/rts/Libdw.c b/rts/Libdw.c
index 1ef51b2..8c3c581 100644
--- a/rts/Libdw.c
+++ b/rts/Libdw.c
@@ -299,8 +299,7 @@ static bool set_initial_registers(Dwfl_Thread *thread,
         );
     return dwfl_thread_state_registers(thread, 0, 17, regs);
 }
-#endif
-#ifdef i386_HOST_ARCH
+#elif defined(i386_HOST_ARCH)
 static bool set_initial_registers(Dwfl_Thread *thread,
                                   void *arg STG_UNUSED) {
     Dwarf_Word regs[9];
@@ -321,6 +320,8 @@ static bool set_initial_registers(Dwfl_Thread *thread,
         );
     return dwfl_thread_state_registers(thread, 0, 9, regs);
 }
+#else
+#    error "Please implement set_initial_registers() for your arch"
 #endif
 
 static const Dwfl_Thread_Callbacks thread_cbs = {


From git at git.haskell.org  Sat Dec  5 00:54:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 00:54:26 +0000 (UTC)
Subject: [commit: ghc] master: pmcheck: Comments about term equality
 representation (81cf200)
Message-ID: <20151205005426.DED153A300@ghc.haskell.org>

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

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

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

commit 81cf200902628a6539572774ecc66678e133daaf
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Dec 5 01:13:33 2015 +0100

    pmcheck: Comments about term equality representation


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

81cf200902628a6539572774ecc66678e133daaf
 compiler/deSugar/Check.hs    | 63 ++++++++++++++++++++++++++++++++++++++++++++
 compiler/deSugar/TmOracle.hs |  3 ++-
 2 files changed, 65 insertions(+), 1 deletion(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index dcf3b23..25b8480 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -72,6 +72,7 @@ The algorithm used is described in the paper:
 type PmM a = DsM a
 
 data PmConstraint = TmConstraint PmExpr PmExpr -- ^ Term equalities: e ~ e
+                    -- See Note [Representation of Term Equalities]
                   | TyConstraint [EvVar]   -- ^ Type equalities
                   | BtConstraint Id        -- ^ Strictness constraints: x ~ _|_
 
@@ -1122,6 +1123,7 @@ uMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
             (non_match_cs `mkConstraint` (VA (PmVar x) `mkCons` vsa))
   where
     match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
+   -- See Note [Representation of Term Equalities]
     non_match_cs = [ TmConstraint falsePmExpr
                                   (PmExprEq (PmExprVar x) (PmExprLit l)) ]
 
@@ -1362,3 +1364,64 @@ ppr_uncovered (expr_vec, complex)
   where
     sdoc_vec = mapM pprPmExprWithParens expr_vec
     (vec,cs) = runPmPprM sdoc_vec (filterComplex complex)
+
+{- Note [Representation of Term Equalities]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+In the paper, term constraints always take the form (x ~ e). Of course, a more
+general constraint of the form (e1 ~ e1) can always be transformed to an
+equivalent set of the former constraints, by introducing a fresh, intermediate
+variable: { y ~ e1, y ~ e1 }. Yet, implementing this representation gave rise
+to #11160 (incredibly bad performance for literal pattern matching). Two are
+the main sources of this problem (the actual problem is how these two interact
+with each other):
+
+1. Pattern matching on literals generates twice as many constraints as needed.
+   Consider the following (tests/ghci/should_run/ghcirun004):
+
+    foo :: Int -> Int
+    foo 1    = 0
+    ...
+    foo 5000 = 4999
+
+   The covered and uncovered set *should* look like:
+     U0 = { x |> {} }
+
+     C1  = { 1  |> { x ~ 1 } }
+     U1  = { x  |> { False ~ (x ~ 1) } }
+     ...
+     C10 = { 10 |> { False ~ (x ~ 1), .., False ~ (x ~ 9), x ~ 10 } }
+     U10 = { x  |> { False ~ (x ~ 1), .., False ~ (x ~ 9), False ~ (x ~ 10) } }
+     ...
+
+     If replace { False ~ (x ~ 1) }, with { y ~ False, y ~ (x ~ 1) }
+     we get twice as many constraints. Also note that half of them are just the
+     substitution [x |-> False].
+
+2. The term oracle (`tmOracle` in deSugar/TmOracle) uses equalities of the form
+   (x ~ e) as substitutions [x |-> e]. More specifically, function
+   `extendSubstAndSolve` applies such substitutions in the residual constraints
+   and partitions them in the affected and non-affected ones, which are the new
+   worklist. Essentially, this gives quadradic behaviour on the number of the
+   residual constraints. (This would not be the case if the term oracle used
+   mutable variables but, since we use it to handle disjunctions on value set
+   abstractions (`Union` case), we chose a pure, incremental interface).
+
+Now the problem becomes apparent (e.g. for clause 300):
+  * Set U300 contains 300 substituting constraints [y_i |-> False] and 300
+    constraints that we know that will not reduce (stay in the worklist).
+  * To check for consistency, we apply the substituting constraints ONE BY ONE
+    (since `tmOracle` is called incrementally, it does not have all of them
+    available at once). Hence, we go through the (non-progressing) constraints
+    over and over, achieving over-quadradic behaviour.
+
+If instead we allow constraints of the form (e ~ e),
+  * All uncovered sets Ui contain no substituting constraints and i
+    non-progressing constraints of the form (False ~ (x ~ lit)) so the oracle
+    behaves linearly.
+  * All covered sets Ci contain exactly (i-1) non-progressing constraints and
+    a single substituting constraint. So the term oracle goes through the
+    constraints only once.
+
+The performance improvement becomes even more important when more arguments are
+involved.
+-}
diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index c0c1480..9224336 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -136,7 +136,8 @@ extendSubstAndSolve x e (standby, (unhandled, env))
   where
     -- Apply the substitution to the worklist and partition them to the ones
     -- that had some progress and the rest. Then, recurse over the ones that
-    -- had some progress.
+    -- had some progress. Careful about performance:
+    -- See Note [Representation of Term Equalities] in deSugar/Check.hs
     (changed, unchanged) = partitionWith (substComplexEq x e) standby
     new_incr_state       = (unchanged, (unhandled, Map.insert x e env))
 


From git at git.haskell.org  Sat Dec  5 00:54:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 00:54:29 +0000 (UTC)
Subject: [commit: ghc] master: pmcheck: Comments about undecidability of
 literal equality (406444b)
Message-ID: <20151205005429.8006B3A300@ghc.haskell.org>

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

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

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

commit 406444b5f4173c20567abc3a3577a58a8ade10d4
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Dec 5 01:52:58 2015 +0100

    pmcheck: Comments about undecidability of literal equality


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

406444b5f4173c20567abc3a3577a58a8ade10d4
 compiler/deSugar/Check.hs    |  3 ++
 compiler/deSugar/PmExpr.hs   | 75 +++++++++++++++++++++++++++++++++++++++-----
 compiler/deSugar/TmOracle.hs |  2 ++
 3 files changed, 73 insertions(+), 7 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 25b8480..386652a 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -1048,6 +1048,7 @@ cMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
 
 -- CLitLit
 cMatcher us gvsa (PmLit l1) ps (va@(PmLit l2)) vsa = case eqPmLit l1 l2 of
+  -- See Note [Undecidable Equality for Overloaded Literals]
   True  -> VA va `mkCons` covered us gvsa ps vsa -- match
   False -> Empty                                 -- mismatch
 
@@ -1101,6 +1102,7 @@ uMatcher us gvsa ( p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
 
 -- ULitLit
 uMatcher us gvsa (PmLit l1) ps (va@(PmLit l2)) vsa = case eqPmLit l1 l2 of
+  -- See Note [Undecidable Equality for Overloaded Literals]
   True  -> VA va `mkCons` uncovered us gvsa ps vsa -- match
   False -> VA va `mkCons` vsa                      -- mismatch
 
@@ -1161,6 +1163,7 @@ dMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
 
 -- DLitLit
 dMatcher us gvsa (PmLit l1) ps (va@(PmLit l2)) vsa = case eqPmLit l1 l2 of
+  -- See Note [Undecidable Equality for Overloaded Literals]
   True  -> VA va `mkCons` divergent us gvsa ps vsa -- match
   False -> Empty                                   -- mismatch
 
diff --git a/compiler/deSugar/PmExpr.hs b/compiler/deSugar/PmExpr.hs
index 78a51e6..16528d4 100644
--- a/compiler/deSugar/PmExpr.hs
+++ b/compiler/deSugar/PmExpr.hs
@@ -62,18 +62,79 @@ data PmExpr = PmExprVar   Id
 data PmLit = PmSLit HsLit                                    -- simple
            | PmOLit Bool {- is it negated? -} (HsOverLit Id) -- overloaded
 
--- | PmLit equality. If both literals are overloaded, the equality check may be
--- inconclusive. Since an overloaded PmLit represents a function application
--- (e.g.  fromInteger 5), if two literals look the same they are the same but
--- if they don't, whether they are depends on the implementation of the
--- from-function. Yet, for the purposes of the check, we check syntactically
--- only (it is safe anyway, since literals always need a catch-all to be
--- considered to be exhaustive).
+-- | Equality between literals for pattern match checking.
 eqPmLit :: PmLit -> PmLit -> Bool
 eqPmLit (PmSLit    l1) (PmSLit    l2) = l1 == l2
 eqPmLit (PmOLit b1 l1) (PmOLit b2 l2) = b1 == b2 && l1 == l2
+  -- See Note [Undecidable Equality for Overloaded Literals]
 eqPmLit _              _              = False
 
+{- Note [Undecidable Equality for Overloaded Literals]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Equality on overloaded literals is undecidable in the general case. Consider
+the following example:
+
+  instance Num Bool where
+    ...
+    fromInteger 0 = False -- C-like representation of booleans
+    fromInteger _ = True
+
+    f :: Bool -> ()
+    f 1 = ()        -- Clause A
+    f 2 = ()        -- Clause B
+
+Clause B is redundant but to detect this, we should be able to solve the
+constraint: False ~ (fromInteger 2 ~ fromInteger 1) which means that we
+have to look through function `fromInteger`, whose implementation could
+be anything. This poses difficulties for:
+
+1. The expressive power of the check.
+   We cannot expect a reasonable implementation of pattern matching to detect
+   that fromInteger 2 ~ fromInteger 1 is True, unless we unfold function
+   fromInteger. This puts termination at risk and is undecidable in the
+   general case.
+
+2. Performance.
+   Having an unresolved constraint False ~ (fromInteger 2 ~ fromInteger 1)
+   lying around could become expensive really fast. Ticket #11161 illustrates
+   how heavy use of overloaded literals can generate plenty of those
+   constraints, effectively undermining the term oracle's performance.
+
+3. Error nessages/Warnings.
+   What should our message for `f` above be? A reasonable approach would be
+   to issue:
+
+     Pattern matches are (potentially) redundant:
+       f 2 = ...    under the assumption that 1 == 2
+
+   but seems to complex and confusing for the user.
+
+We choose to treat overloaded literals that look different as different. The
+impact of this is the following:
+
+  * Redundancy checking is rather conservative, since it cannot see that clause
+    B above is redundant.
+
+  * We have instant equality check for overloaded literals (we do not rely on
+    the term oracle which is rather expensive, both in terms of performance and
+    memory). This significantly improves the performance of functions `covered`
+    `uncovered` and `divergent` in deSugar/Check.hs and effectively addresses
+    #11161.
+
+  * The warnings issued are simpler.
+
+  * We do not play on the safe side, strictly speaking. The assumption that
+    1 /= 2 makes the redundancy check more conservative but at the same time
+    makes its dual (exhaustiveness check) unsafe. This we can live with, mainly
+    for two reasons:
+    1. At the moment we do not use the results of the check during compilation
+       where this would be a disaster (could result in runtime errors even if
+       our function was deemed exhaustive).
+    2. Pattern matcing on literals can never be considered exhaustive unless we
+       have a catch-all clause. Hence, this assumption affects mainly the
+       appearance of the warnings and is, in practice safe.
+-}
+
 nubPmLit :: [PmLit] -> [PmLit]
 nubPmLit = nubBy eqPmLit
 
diff --git a/compiler/deSugar/TmOracle.hs b/compiler/deSugar/TmOracle.hs
index 9224336..5d7a61a 100644
--- a/compiler/deSugar/TmOracle.hs
+++ b/compiler/deSugar/TmOracle.hs
@@ -105,6 +105,7 @@ solveComplexEq solver_state@(standby, (unhandled, env)) eq@(e1, e2) = case eq of
   (_,PmExprOther _)            -> Just (standby, (True, env))
 
   (PmExprLit l1, PmExprLit l2) -> case eqPmLit l1 l2 of
+    -- See Note [Undecidable Equality for Overloaded Literals]
     True  -> Just solver_state
     False -> Nothing
 
@@ -165,6 +166,7 @@ simplifyEqExpr e1 e2 = case (e1, e2) of
 
   -- Literals
   (PmExprLit l1, PmExprLit l2) -> case eqPmLit l1 l2 of
+    -- See Note [Undecidable Equality for Overloaded Literals]
     True  -> (truePmExpr,  True)
     False -> (falsePmExpr, True)
 


From git at git.haskell.org  Sat Dec  5 06:13:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 06:13:06 +0000 (UTC)
Subject: [commit: ghc] master: Fix broken linters when using python3 (8f28797)
Message-ID: <20151205061306.D87DE3A300@ghc.haskell.org>

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

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

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

commit 8f2879794a75aad64b5998227c81c2ef569be35f
Author: David Kraeutmann <kane at kane.cx>
Date:   Sat Dec 5 00:13:08 2015 -0600

    Fix broken linters when using python3
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1574


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

8f2879794a75aad64b5998227c81c2ef569be35f
 .arc-linters/check-binaries.py | 2 +-
 .arc-linters/check-cpp.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.arc-linters/check-binaries.py b/.arc-linters/check-binaries.py
index ae00756..9125985 100755
--- a/.arc-linters/check-binaries.py
+++ b/.arc-linters/check-binaries.py
@@ -17,4 +17,4 @@ if os.path.isfile(path):
             }
             warnings.append(warning)
 
-print json.dumps(warnings)
+print(json.dumps(warnings))
diff --git a/.arc-linters/check-cpp.py b/.arc-linters/check-cpp.py
index 3794ca2..c58da09 100755
--- a/.arc-linters/check-cpp.py
+++ b/.arc-linters/check-cpp.py
@@ -34,4 +34,4 @@ if os.path.isfile(path):
                 warnings.append(warning)
 
 logger.debug(warnings)
-print json.dumps(warnings)
+print(json.dumps(warnings))


From git at git.haskell.org  Sat Dec  5 08:21:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 08:21:40 +0000 (UTC)
Subject: [commit: ghc] master: Use git.h.o copy of
 arcanist-external-json-linter (c714f8f)
Message-ID: <20151205082140.DF0A33A300@ghc.haskell.org>

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

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

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

commit c714f8fd4288e86f2e0541512afef7e216c98699
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 5 09:15:57 2015 +0100

    Use git.h.o copy of arcanist-external-json-linter
    
    It shouldn't have been possible to reference an external
    Git submodule not hosted on git.haskell.org as we can't otherwise
    ensure gitlink integrity. But it turns out the
    validation hook scripts in place didn't reject
    020375d1e723339a95b86d0d3b8a8214b1cc144a, so here we are...
    
    This commit changes ghc.git to use our own fork/copy of
    https://github.com/bgamari/arcanist-external-json-linter
    hosted on git.haskell.org


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

c714f8fd4288e86f2e0541512afef7e216c98699
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 0d88e01..73ce0d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -117,4 +117,4 @@
 	ignore = none
 [submodule ".arc-linters/arcanist-external-json-linter"]
 	path = .arc-linters/arcanist-external-json-linter
-	url = https://github.com/bgamari/arcanist-external-json-linter.git
+	url = ../arcanist-external-json-linter.git


From git at git.haskell.org  Sat Dec  5 08:57:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 08:57:54 +0000 (UTC)
Subject: [commit: ghc] master: Temporarily disable external-json linters
 (a14296c)
Message-ID: <20151205085754.8B18A3A300@ghc.haskell.org>

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

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

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

commit a14296c2660521db8ba965065687e45cee4e3401
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 5 09:55:50 2015 +0100

    Temporarily disable external-json linters
    
    This temporarily disables the external json linters
    introduced via
    020375d1e723339a95b86d0d3b8a8214b1cc144a and
    901cab10609dc9795e57163834512373530fc4a5.
    
    The new linters break the differential validation in Harbormaster
    because the submodules are not cloned early enough (i.e. before `arc` is
    called by the script).


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

a14296c2660521db8ba965065687e45cee4e3401
 .arcconfig | 6 +-----
 .arclint   | 9 ---------
 2 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/.arcconfig b/.arcconfig
index c886789..b9c3932 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,9 +1,5 @@
 {
   "project.name"        : "ghc",
   "repository.callsign" : "GHC",
-  "phabricator.uri"     : "https://phabricator.haskell.org",
-
-  "load": [
-    ".arc-linters/arcanist-external-json-linter"
-  ]
+  "phabricator.uri"     : "https://phabricator.haskell.org"
 }
diff --git a/.arclint b/.arclint
index ef43856..8f83776 100644
--- a/.arclint
+++ b/.arclint
@@ -52,15 +52,6 @@
       "severity": {
         "2": "disabled"
       }
-    },
-    "check-binaries": {
-      "type": "external-json",
-      "external-json.script": "python .arc-linters/check-binaries.py"
-    },
-    "bad-assert-clang-cpp": {
-      "type": "external-json",
-      "include": ["(\\.(l?hs|x|y\\.pp)(\\.in)?$)"],
-      "external-json.script": "python .arc-linters/check-cpp.py"
     }
   },
 


From git at git.haskell.org  Sat Dec  5 10:13:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 10:13:52 +0000 (UTC)
Subject: [commit: ghc] master: Enable non-canonical Monad instance warnings
 for stage1/2 (51d08d8)
Message-ID: <20151205101352.6295D3A300@ghc.haskell.org>

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

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

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

commit 51d08d82b7681d23d89e6c240ec4dcfd8801edb1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 5 09:59:01 2015 +0100

    Enable non-canonical Monad instance warnings for stage1/2
    
    This makes use of the new facility introduced via
    14d0f7f1221db758cd06a69f53803d9d0150164a which allows
    to have certain flags passed only to the non-bootstrapping
    GHC. This is needed because sometimes we can't assume the
    existence of a certain flag in the bootstrapping compiler
    which was only added recently to GHC HEAD.
    
    This also updates the haddock submodule to fix a few
    remaining noncanonical instance definitions.
    
    Differential Revision: https://phabricator.haskell.org/D1571


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

51d08d82b7681d23d89e6c240ec4dcfd8801edb1
 mk/warnings.mk | 2 ++
 utils/haddock  | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/mk/warnings.mk b/mk/warnings.mk
index d604f9a..f8db8fd 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -32,6 +32,8 @@ SRC_CC_WARNING_OPTS += -Wno-unknown-pragmas
 
 endif
 
+SRC_HC_WARNING_OPTS_STAGE1 += -fwarn-noncanonical-monad-instances
+SRC_HC_WARNING_OPTS_STAGE2 += -fwarn-noncanonical-monad-instances
 
 
 ######################################################################
diff --git a/utils/haddock b/utils/haddock
index 42b2cfc..a6deefa 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 42b2cfc595f1ee62d1c1b8513c5df1d92709c06a
+Subproject commit a6deefad581cbeb62048826bc1d626c41a0dd56c


From git at git.haskell.org  Sat Dec  5 10:41:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 10:41:32 +0000 (UTC)
Subject: [commit: ghc] master: ghc.mk: cleanup: use tab consistently (314bc99)
Message-ID: <20151205104132.CC8C23A300@ghc.haskell.org>

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

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

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

commit 314bc99abfdf7dc6ece5813fdc2e4e1f1fdeb291
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Fri Dec 4 22:28:35 2015 +0000

    ghc.mk: cleanup: use tab consistently
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

314bc99abfdf7dc6ece5813fdc2e4e1f1fdeb291
 utils/mkUserGuidePart/ghc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk
index 87c9d65..86492e1 100644
--- a/utils/mkUserGuidePart/ghc.mk
+++ b/utils/mkUserGuidePart/ghc.mk
@@ -42,7 +42,7 @@ utils/mkUserGuidePart_GENERATED_FLAGS_SETS := \
 utils/mkUserGuidePart_GENERATED_RST_SOURCES := \
 		$(addprefix docs/users_guide/flags-,$(addsuffix .gen.rst,$(utils/mkUserGuidePart_GENERATED_FLAGS_SETS))) \
 		docs/users_guide/what_glasgow_exts_does.gen.rst \
-    docs/man/all-flags.gen.rst
+		docs/man/all-flags.gen.rst
 
 utils/mkUserGuidePart_USES_CABAL           = YES
 utils/mkUserGuidePart_PACKAGE              = mkUserGuidePart


From git at git.haskell.org  Sat Dec  5 10:41:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 10:41:35 +0000 (UTC)
Subject: [commit: ghc] master: ghc.mk: don't run mkUserGuidePart more than
 once (d6512c7)
Message-ID: <20151205104135.7278D3A300@ghc.haskell.org>

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

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

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

commit d6512c740c653d2a58a7fc73b777e50d02f786b1
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Sat Dec 5 00:03:05 2015 +0000

    ghc.mk: don't run mkUserGuidePart more than once
    
    When building 'html' and 'man' manuals
    build system reports mkUserGuide is ran
    more than once (up to 3 times in parallel).
    
    See Note [Blessed make target file] for
    more details.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

d6512c740c653d2a58a7fc73b777e50d02f786b1
 utils/mkUserGuidePart/ghc.mk | 42 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 39 insertions(+), 3 deletions(-)

diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk
index 86492e1..3a654da 100644
--- a/utils/mkUserGuidePart/ghc.mk
+++ b/utils/mkUserGuidePart/ghc.mk
@@ -39,11 +39,18 @@ utils/mkUserGuidePart_GENERATED_FLAGS_SETS := \
   verbosity                   \
   warnings
 
-utils/mkUserGuidePart_GENERATED_RST_SOURCES := \
+# See Note [Blessed make target file]
+utils/mkUserGuidePart_GENERATED_RST_SOURCES_BLESSED_FILE := \
+		docs/users_guide/what_glasgow_exts_does.gen.rst
+
+utils/mkUserGuidePart_GENERATED_RST_SOURCES_OTHER_FILES := \
 		$(addprefix docs/users_guide/flags-,$(addsuffix .gen.rst,$(utils/mkUserGuidePart_GENERATED_FLAGS_SETS))) \
-		docs/users_guide/what_glasgow_exts_does.gen.rst \
 		docs/man/all-flags.gen.rst
 
+utils/mkUserGuidePart_GENERATED_RST_SOURCES := \
+		$(utils/mkUserGuidePart_GENERATED_RST_SOURCES_BLESSED_FILE) \
+		$(utils/mkUserGuidePart_GENERATED_RST_SOURCES_OTHER_FILES)
+
 utils/mkUserGuidePart_USES_CABAL           = YES
 utils/mkUserGuidePart_PACKAGE              = mkUserGuidePart
 utils/mkUserGuidePart_dist_PROGNAME        = mkUserGuidePart
@@ -52,7 +59,36 @@ utils/mkUserGuidePart_dist_INSTALL_INPLACE = YES
 $(eval $(call build-prog,utils/mkUserGuidePart,dist,2))
 $(eval $(call clean-target,utils/mkUserGuidePart,gen,$(utils/mkUserGuidePart_GENERATED_RST_SOURCES)))
 
-$(utils/mkUserGuidePart_GENERATED_RST_SOURCES) : $(mkUserGuidePart_INPLACE)
+$(utils/mkUserGuidePart_GENERATED_RST_SOURCES_OTHER_FILES) :
+
+$(utils/mkUserGuidePart_GENERATED_RST_SOURCES_BLESSED_FILE) : $(utils/mkUserGuidePart_GENERATED_RST_SOURCES_OTHER_FILES) $(mkUserGuidePart_INPLACE)
 	$(mkUserGuidePart_INPLACE)
+	$(TOUCH_CMD) $@
 
 all_utils/mkUserGuidePart: $(mkUserGuidePart_INPLACE)
+
+# Note [Blessed make target file]
+#
+# make cannot express nicely a single build rule
+# with multiple targets:
+#
+#   > all: a b
+#   > a b:
+#   > 	touch a b
+#
+# This code will run 'touch' rule twice when parallel
+# make is used:
+#   > $ make -j
+#   > touch a b
+#   > touch a b
+#
+# But there is a workaround for it:
+# We pick a single file of a group and depend on it
+# as an ultimate target. We also need to make sure
+# that file has latest timestamp in the group:
+#
+#   > all: a b
+#   > b:
+#   > a: b
+#   > 	touch a b
+#   > 	touch $@


From git at git.haskell.org  Sat Dec  5 10:41:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 10:41:38 +0000 (UTC)
Subject: [commit: ghc] master: ghc.mk: fix docs re-rebuilding (13ab2c6)
Message-ID: <20151205104138.1F5143A300@ghc.haskell.org>

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

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

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

commit 13ab2c64a7e98bab391222dbd015ea3a4b91a9ed
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Sat Dec 5 10:05:54 2015 +0000

    ghc.mk: fix docs re-rebuilding
    
    The problem:
        $ make
        <watch sphinx rebuilds docs>
        # no changes in sources
        $ make
        <watch sphinx rebuilds docs again>
    
    The problem was due to wrong assumption about what
    files exactly are generated by mkUserGuidePart.
    
    Build system expected the following files to be created:
        docs/man/all-flags.gen.rst
        flags-recompilating-checking.gen.rst
    but mkUserGuidePart generated:
        docs/users_guide/all-flags.gen.rst
        flags-recompilation-checking.gen.rst
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

13ab2c64a7e98bab391222dbd015ea3a4b91a9ed
 utils/mkUserGuidePart/ghc.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/utils/mkUserGuidePart/ghc.mk b/utils/mkUserGuidePart/ghc.mk
index 3a654da..069634b 100644
--- a/utils/mkUserGuidePart/ghc.mk
+++ b/utils/mkUserGuidePart/ghc.mk
@@ -32,7 +32,6 @@ utils/mkUserGuidePart_GENERATED_FLAGS_SETS := \
   plugin                      \
   profiling                   \
   program-coverage            \
-  recompilating-checking      \
   recompilation-checking      \
   redirecting-output          \
   temporary-files             \
@@ -45,7 +44,7 @@ utils/mkUserGuidePart_GENERATED_RST_SOURCES_BLESSED_FILE := \
 
 utils/mkUserGuidePart_GENERATED_RST_SOURCES_OTHER_FILES := \
 		$(addprefix docs/users_guide/flags-,$(addsuffix .gen.rst,$(utils/mkUserGuidePart_GENERATED_FLAGS_SETS))) \
-		docs/man/all-flags.gen.rst
+		docs/users_guide/all-flags.gen.rst
 
 utils/mkUserGuidePart_GENERATED_RST_SOURCES := \
 		$(utils/mkUserGuidePart_GENERATED_RST_SOURCES_BLESSED_FILE) \


From git at git.haskell.org  Sat Dec  5 16:09:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 16:09:58 +0000 (UTC)
Subject: [commit: ghc] wip/T11028-2: Refactor ConDecl (b43b6b0)
Message-ID: <20151205160958.6459C3A300@ghc.haskell.org>

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

On branch  : wip/T11028-2
Link       : http://ghc.haskell.org/trac/ghc/changeset/b43b6b0c97e9f88331d04224e80b9a659606db4c/ghc

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

commit b43b6b0c97e9f88331d04224e80b9a659606db4c
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Nov 23 22:59:27 2015 +0200

    Refactor ConDecl
    
    Summary:
    The ConDecl type in HsDecls is an uneasy compromise. For the most part,
    HsSyn directly reflects the syntax written by the programmer; and that
    gives just the right "pegs" on which to hang Alan's API annotations. But
    ConDecl doesn't properly reflect the syntax of Haskell-98 and GADT-style
    data type declarations.
    
    To be concrete, here's a draft new data type
    
    data ConDecl name
      | ConDeclGADT
          { con_names   :: [Located name]
          , con_type    :: LHsSigType name  -- The type after the ?::?
          , con_doc     :: Maybe LHsDocString }
    
      | ConDeclH98
          { con_name    :: Located name
    
          , con_qvars     :: Maybe (LHsQTyVars name)
            -- User-written forall (if any), and its implicit
            -- kind variables
            -- Non-Nothing needs -XExistentialQuantification
    
          , con_cxt       :: Maybe (LHsContext name)
            -- ^ User-written context (if any)
    
          , con_details   :: HsConDeclDetails name
              -- ^ Arguments
    
          , con_doc       :: Maybe LHsDocString
              -- ^ A possible Haddock comment.
          } deriving (Typeable)
    
    Note that
    
        For GADTs, just keep a type. That's what the user writes.
        NB:HsType can represent records on the LHS of an arrow:
    
          { x:Int,y:Bool} -> T
    
        con_qvars and con_cxt are both Maybe because they are both
        optional (the forall and the context of an existential data type
    
        For ConDeclGADT the type variables of the data type do not scope
        over the con_type; whereas for ConDeclH98 they do scope over con_cxt
        and con_details.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, austin, goldfire, bgamari
    
    Subscribers: goldfire, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1558
    
    GHC Trac Issues: #11028


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

b43b6b0c97e9f88331d04224e80b9a659606db4c
 compiler/deSugar/DsMeta.hs                         |  98 ++++++++---
 compiler/hsSyn/Convert.hs                          |  22 ++-
 compiler/hsSyn/HsDecls.hs                          | 152 +++++++---------
 compiler/hsSyn/HsLit.hs                            |   1 -
 compiler/hsSyn/HsTypes.hs                          |   4 +-
 compiler/hsSyn/HsUtils.hs                          |  26 ++-
 compiler/parser/Parser.y                           |  12 +-
 compiler/parser/RdrHsSyn.hs                        |  73 +++-----
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         |  13 +-
 compiler/rename/RnSource.hs                        | 120 +++++--------
 compiler/rename/RnTypes.hs                         |  22 ++-
 compiler/typecheck/TcHsType.hs                     |   9 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 193 +++++++++++++++------
 testsuite/tests/ghc-api/annotations/T10399.stdout  |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   2 +-
 testsuite/tests/rename/should_fail/T7943.stderr    |   6 +-
 utils/haddock                                      |   2 +-
 21 files changed, 427 insertions(+), 340 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b43b6b0c97e9f88331d04224e80b9a659606db4c

From git at git.haskell.org  Sat Dec  5 16:10:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 16:10:00 +0000 (UTC)
Subject: [commit: ghc] wip/T11028-2's head updated: Refactor ConDecl (b43b6b0)
Message-ID: <20151205161000.D73503A300@ghc.haskell.org>

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

Branch 'wip/T11028-2' now includes:

     218fdf9 Make the order of fixities in the iface file deterministic
     741f837 Implement more deterministic operations and document them
     52b02e6 Comments only (isIrrefutablePat)
     b564731 Comments (TcSMonad)
     d00cdf2 Revert "ghci: Add support for prompt functions"
     1caff20 StgSyn: Remove unused SRT constructor
     c75948b Move Stg-specific code from DynFlags to SimplStg
     d4d54b4 Remove *.xml from gitignore
     a12e47b Avoid panic due to partial ieName
     8cba907 Create empty dump files when there was nothing to dump
     0d1a2d2 ErrUtils: Spruce up Haddocks
     e7929ba Update bytestring submodule
     d25f3c0 users_guide/glasgow_exts.rst: fix link markup
     8a50610 Major Overhaul of Pattern Match Checking (Fixes #595)
     43a31fe testsuite: haddock.compiler: Bump expected allocations
     a034031 extending_ghc.rst: fix broken link (Trac #10950)
     c5597bb Revert "Create empty dump files when there was nothing to dump"
     7b29b0b Fix haddock syntax
     0dd61fe Kill redundant patterns
     934b3a0 Update test output
     40fc353 Bump hoopl submodule
     ae4398d Improve performance for PM check on literals (Fixes #11160 and #11161)
     99d01e1 Remove unused import in deSugar/TmOracle.hs
     7af29da Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
     cd9f3bf RTS: Rename InCall.stat struct field to .rstat
     6ef351d On AIX we need -D_BSD defined in <Stg.h>
     d40f5b7 PmExpr: Fix CPP unacceptable too clang's CPP
     36a208f Use builtin ISO 8859-1 decoder in mkTextEncoding
     befc4e4 Check: More Clang/CPP wibbles
     e9220da Bump allocations for T783
     dc33e4c T5642 is broken
     96e67c0 T5642: Skip it entirely
     5b2b7e3 Make callToPats deterministic in SpecConstr
     1c9fd3f Case-of-empty-alts is trivial (Trac #11155)
     28035c0 Add derived constraints for wildcard signatures
     1cb3c8c Wibbles only
     822141b Make -dppr-debug show contents of (TypeError ...)
     1160dc5 Fix egregious error in eta-reduction of data families
     31b482b Minor refactoring of user type errors
     67565a7 Tidy user type errors in checkValidType
     43a5970 Comments only
     16aae60 T5642: Fix skip usage
     caa6851 testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
     d4bf863 Update peak_megabytes_allocated for T9675
     020375d Add linter to check for binaries accidentally added to repository
     901cab1 lint: Add linter to catch uses of ASSERT macro that Clang dislikes
     c865c42 StgCmmMonad: Implement Outputable instance for Sequel for debugging
     e2c518e libdw: enable support only on i386 and amd64
     81cf200 pmcheck: Comments about term equality representation
     406444b pmcheck: Comments about undecidability of literal equality
     8f28797 Fix broken linters when using python3
     c714f8f Use git.h.o copy of arcanist-external-json-linter
     a14296c Temporarily disable external-json linters
     51d08d8 Enable non-canonical Monad instance warnings for stage1/2
     314bc99 ghc.mk: cleanup: use tab consistently
     d6512c7 ghc.mk: don't run mkUserGuidePart more than once
     13ab2c6 ghc.mk: fix docs re-rebuilding
     b43b6b0 Refactor ConDecl

From git at git.haskell.org  Sat Dec  5 18:15:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat,  5 Dec 2015 18:15:41 +0000 (UTC)
Subject: [commit: ghc] master: Allow to compile OSMem.c when MEM_NORESERVE is
 not available (5f1e42f)
Message-ID: <20151205181541.DBE113A300@ghc.haskell.org>

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

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

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

commit 5f1e42f22cf29bc1b7150e06b2711fa7c43c6e5b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 5 19:15:19 2015 +0100

    Allow to compile OSMem.c when MEM_NORESERVE is not available
    
    On some OSes such as AIX `MEM_NORESERVE` is not available.
    
    Since this feature is only needed when the new two-step allocator (see #9706)
    is enabled we can simply turn this into a runtime error to avoid a larger
    refactoring of this already quite platform-sensitive code.
    
    Reviewed By: bgamari, ezyang
    
    Differential Revision: https://phabricator.haskell.org/D1568


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

5f1e42f22cf29bc1b7150e06b2711fa7c43c6e5b
 rts/posix/OSMem.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/rts/posix/OSMem.c b/rts/posix/OSMem.c
index 274d5ad..60e684f 100644
--- a/rts/posix/OSMem.c
+++ b/rts/posix/OSMem.c
@@ -151,7 +151,14 @@ my_mmap (void *addr, W_ size, int operation)
     else
         prot = PROT_NONE;
     if (operation == MEM_RESERVE)
+# if defined(MAP_NORESERVE)
         flags = MAP_NORESERVE;
+# else
+#  ifdef USE_LARGE_ADDRESS_SPACE
+#   error USE_LARGE_ADDRESS_SPACE needs MAP_NORESERVE
+#  endif
+        errorBelch("my_mmap(,,MEM_RESERVE) not supported on this platform");
+# endif
     else if (operation == MEM_COMMIT)
         flags = MAP_FIXED;
     else


From git at git.haskell.org  Sun Dec  6 10:55:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 10:55:55 +0000 (UTC)
Subject: [commit: ghc] master: Make ghc.mk compatible with pedantic /bin/sh
 impls (df67940)
Message-ID: <20151206105555.132263A300@ghc.haskell.org>

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

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

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

commit df6794035f1e4397d89896f329525e5368b7d1cc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 11:52:35 2015 +0100

    Make ghc.mk compatible with pedantic /bin/sh impls
    
    This fixes `for`-loops introduced via
    64761ce9a899954a12d8e3ae8b400c5ad9648137
    which can result in `for i in ;` which some
    `/bin/sh` implementations don't like.


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

df6794035f1e4397d89896f329525e5368b7d1cc
 ghc.mk | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 9dd1c91..4aea480 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -875,17 +875,17 @@ install_bins: $(INSTALL_BINS) $(INSTALL_SCRIPTS)
 	for i in $(INSTALL_BINS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(bindir)" ;  \
 	done
+ifneq "$(INSTALL_SCRIPTS)" ""
 	for i in $(INSTALL_SCRIPTS); do \
 		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(bindir)" ;  \
 	done
+endif
 
 install_libs: $(INSTALL_LIBS)
 	$(call installLibsTo, $(INSTALL_LIBS), "$(DESTDIR)$(ghclibdir)")
 
 install_libexecs:  $(INSTALL_LIBEXECS)
-ifeq "$(INSTALL_LIBEXECS)" ""
-	@:
-else
+ifneq "$(INSTALL_LIBEXECS)" ""
 	$(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)/bin"
 	for i in $(INSTALL_LIBEXECS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)/bin"; \
@@ -900,9 +900,11 @@ install_topdirs: $(INSTALL_TOPDIR_BINS) $(INSTALL_TOPDIR_SCRIPTS)
 	for i in $(INSTALL_TOPDIR_BINS); do \
 		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \
 	done
+ifneq "$(INSTALL_TOPDIR_SCRIPTS)" ""
 	for i in $(INSTALL_TOPDIR_SCRIPTS); do \
 		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \
 	done
+endif
 
 install_docs: $(INSTALL_DOCS)
 	$(INSTALL_DIR) "$(DESTDIR)$(docdir)"
@@ -922,7 +924,7 @@ ifneq "$(INSTALL_LIBRARY_DOCS)" ""
 	$(INSTALL_SCRIPT) $(INSTALL_OPTS) libraries/gen_contents_index "$(DESTDIR)$(docdir)/html/libraries/"
 endif
 ifneq "$(INSTALL_HTML_DOC_DIRS)" ""
-	# We need to filter out the directories so install doesn't choke on them
+# We need to filter out the directories so install doesn't choke on them
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
 		$(INSTALL_DIR) "$(DESTDIR)$(docdir)/html/`basename $$i`"; \
 		for f in $$i/*; do \


From git at git.haskell.org  Sun Dec  6 12:34:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 12:34:29 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11168' created
Message-ID: <20151206123429.123133A300@ghc.haskell.org>

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

New branch : wip/T11168
Referencing: ec70219fe3e996b032c7d7095fd4910746747c01

From git at git.haskell.org  Sun Dec  6 12:34:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 12:34:31 +0000 (UTC)
Subject: [commit: ghc] wip/T11168: Tweak use of AC_USE_SYSTEM_EXTENSIONS
 (ec70219)
Message-ID: <20151206123431.C60253A300@ghc.haskell.org>

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

On branch  : wip/T11168
Link       : http://ghc.haskell.org/trac/ghc/changeset/ec70219fe3e996b032c7d7095fd4910746747c01/ghc

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

commit ec70219fe3e996b032c7d7095fd4910746747c01
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 13:34:34 2015 +0100

    Tweak use of AC_USE_SYSTEM_EXTENSIONS
    
    This is a follow-up to
    7af29da05d2e5a5e311a5f73f20d0f232035973b


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

ec70219fe3e996b032c7d7095fd4910746747c01
 configure.ac                       | 6 +++---
 libraries/base/configure.ac        | 5 ++---
 libraries/integer-gmp/configure.ac | 2 ++
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57d877a..c8708ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,9 +58,6 @@ dnl  #define SIZEOF_CHAR 0
 dnl recently.
 AC_PREREQ([2.60])
 
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -462,6 +459,9 @@ export CC
 MAYBE_OVERRIDE_STAGE0([gcc],[CC_STAGE0])
 MAYBE_OVERRIDE_STAGE0([ar],[AR_STAGE0])
 
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`)
 AC_PROG_CPP
 
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 99474a6..5607213 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -5,9 +5,6 @@ AC_CONFIG_SRCDIR([include/HsBase.h])
 
 AC_PREREQ([2.60])
 
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
 
 AC_CANONICAL_BUILD
@@ -18,6 +15,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_MSG_CHECKING(for WINDOWS platform)
 case $host in
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac
index 0bd9188..067217e 100644
--- a/libraries/integer-gmp/configure.ac
+++ b/libraries/integer-gmp/configure.ac
@@ -10,6 +10,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 
 dnl--------------------------------------------------------------------


From git at git.haskell.org  Sun Dec  6 15:38:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 15:38:46 +0000 (UTC)
Subject: [commit: ghc] master: Implement new
 `-fwarn-noncanonical-monoid-instances` (986ceb1)
Message-ID: <20151206153846.3279E3A300@ghc.haskell.org>

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

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

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

commit 986ceb1679b501414b996c520b08ce929a40f94c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 16:08:21 2015 +0100

    Implement new `-fwarn-noncanonical-monoid-instances`
    
    This is similiar to the `-fwarn-noncanonical-monad-instances` warning
    implemented via #11128, but applies to `Semigroup`/`Monoid` instead
    and the `(<>)`/`mappend` methods (of which `mappend` is planned to move
    out of `Monoid` at some point in the future being redundant and thus
    error-prone).
    
    This warning is contained in `-Wcompat` but not in `-Wall`.
    
    This addresses #11150
    
    Reviewed By: quchen
    
    Differential Revision: https://phabricator.haskell.org/D1553


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

986ceb1679b501414b996c520b08ce929a40f94c
 compiler/main/DynFlags.hs                          |   6 +-
 compiler/rename/RnSource.hs                        | 148 +++++++++++++++------
 docs/users_guide/using-warnings.rst                |  26 +++-
 .../tests/wcompat-warnings/WCompatWarningsNotOn.hs |  12 ++
 .../tests/wcompat-warnings/WCompatWarningsOff.hs   |  12 ++
 .../tests/wcompat-warnings/WCompatWarningsOn.hs    |  12 ++
 .../wcompat-warnings/WCompatWarningsOn.stderr      |  16 ++-
 .../tests/wcompat-warnings/WCompatWarningsOnOff.hs |  12 ++
 utils/mkUserGuidePart/Options/Warnings.hs          |   8 ++
 9 files changed, 205 insertions(+), 47 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 986ceb1679b501414b996c520b08ce929a40f94c

From git at git.haskell.org  Sun Dec  6 16:37:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 16:37:25 +0000 (UTC)
Subject: [commit: ghc] wip/T11168: Tweak use of AC_USE_SYSTEM_EXTENSIONS
 (45c98da)
Message-ID: <20151206163725.379063A300@ghc.haskell.org>

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

On branch  : wip/T11168
Link       : http://ghc.haskell.org/trac/ghc/changeset/45c98daf98efecf0b28171f5d75c1182c5c12ee0/ghc

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

commit 45c98daf98efecf0b28171f5d75c1182c5c12ee0
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 13:34:34 2015 +0100

    Tweak use of AC_USE_SYSTEM_EXTENSIONS
    
    This is a follow-up to
    7af29da05d2e5a5e311a5f73f20d0f232035973b


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

45c98daf98efecf0b28171f5d75c1182c5c12ee0
 configure.ac                       | 6 +++---
 libraries/base/configure.ac        | 5 ++---
 libraries/integer-gmp/configure.ac | 2 ++
 libraries/unix                     | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57d877a..c8708ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,9 +58,6 @@ dnl  #define SIZEOF_CHAR 0
 dnl recently.
 AC_PREREQ([2.60])
 
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -462,6 +459,9 @@ export CC
 MAYBE_OVERRIDE_STAGE0([gcc],[CC_STAGE0])
 MAYBE_OVERRIDE_STAGE0([ar],[AR_STAGE0])
 
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`)
 AC_PROG_CPP
 
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 99474a6..5607213 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -5,9 +5,6 @@ AC_CONFIG_SRCDIR([include/HsBase.h])
 
 AC_PREREQ([2.60])
 
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
 
 AC_CANONICAL_BUILD
@@ -18,6 +15,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_MSG_CHECKING(for WINDOWS platform)
 case $host in
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac
index 0bd9188..067217e 100644
--- a/libraries/integer-gmp/configure.ac
+++ b/libraries/integer-gmp/configure.ac
@@ -10,6 +10,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 
 dnl--------------------------------------------------------------------
diff --git a/libraries/unix b/libraries/unix
index 5740003..147630c 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 5740003e06f0c585460501514f3352f5e105c98c
+Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e


From git at git.haskell.org  Sun Dec  6 20:11:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun,  6 Dec 2015 20:11:17 +0000 (UTC)
Subject: [commit: ghc] master: Tweak use of AC_USE_SYSTEM_EXTENSIONS (8b42214)
Message-ID: <20151206201117.341FE3A300@ghc.haskell.org>

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

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

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

commit 8b422142421c751d2c7fa7840afa61f923afdbe1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 6 13:34:34 2015 +0100

    Tweak use of AC_USE_SYSTEM_EXTENSIONS
    
    This makes sure that `AC_USE_SYSTEM_EXTENSIONS` (which
    implies `AC_PROG_CC`) is called after the
    `AC_ARG_WITH([cc],,)` invocation, so that the proper
    CC setting is in scope. Otherwise this can break cross-compilation.
    
    This also needs to pull in a submodule update for `unix`
    
    This is a follow-up commit to
    7af29da05d2e5a5e311a5f73f20d0f232035973b
    which hopefully fixes #11168


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

8b422142421c751d2c7fa7840afa61f923afdbe1
 configure.ac                       | 6 +++---
 libraries/base/configure.ac        | 8 +++-----
 libraries/integer-gmp/configure.ac | 4 +++-
 libraries/unix                     | 2 +-
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 57d877a..c8708ae 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,9 +58,6 @@ dnl  #define SIZEOF_CHAR 0
 dnl recently.
 AC_PREREQ([2.60])
 
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 # -------------------------------------------------------------------------
 # Prepare to generate the following header files
 #
@@ -462,6 +459,9 @@ export CC
 MAYBE_OVERRIDE_STAGE0([gcc],[CC_STAGE0])
 MAYBE_OVERRIDE_STAGE0([ar],[AR_STAGE0])
 
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
+
 dnl ** figure out how to invoke the C preprocessor (i.e. `gcc -E`)
 AC_PROG_CPP
 
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 99474a6..3d372d7 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -1,13 +1,9 @@
+AC_PREREQ([2.60])
 AC_INIT([Haskell base package], [1.0], [libraries at haskell.org], [base])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsBase.h])
 
-AC_PREREQ([2.60])
-
-dnl make extensions visible to allow feature-tests to detect them lateron
-AC_USE_SYSTEM_EXTENSIONS
-
 AC_CONFIG_HEADERS([include/HsBaseConfig.h include/EventConfig.h])
 
 AC_CANONICAL_BUILD
@@ -18,6 +14,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 AC_MSG_CHECKING(for WINDOWS platform)
 case $host in
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac
index 0bd9188..4e3df11 100644
--- a/libraries/integer-gmp/configure.ac
+++ b/libraries/integer-gmp/configure.ac
@@ -1,5 +1,5 @@
+AC_PREREQ(2.60)
 AC_INIT([Haskell integer (GMP)], [1.0], [libraries at haskell.org], [integer])
-AC_PREREQ(2.52)
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([cbits/wrappers.c])
@@ -10,6 +10,8 @@ AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
 AC_PROG_CC()
+dnl make extensions visible to allow feature-tests to detect them lateron
+AC_USE_SYSTEM_EXTENSIONS
 
 
 dnl--------------------------------------------------------------------
diff --git a/libraries/unix b/libraries/unix
index 5740003..147630c 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 5740003e06f0c585460501514f3352f5e105c98c
+Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e


From git at git.haskell.org  Mon Dec  7 07:10:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 07:10:29 +0000 (UTC)
Subject: [commit: ghc] master: Update hoopl submodule (be92c28)
Message-ID: <20151207071029.A5CF93A300@ghc.haskell.org>

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

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

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

commit be92c288839e0bfcf0b15e3bb4136d60f8ef2575
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Mon Dec 7 08:08:30 2015 +0100

    Update hoopl submodule
    
    Hoopl changes required to implement #10982


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

be92c288839e0bfcf0b15e3bb4136d60f8ef2575
 libraries/hoopl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/hoopl b/libraries/hoopl
index 5405469..b4f4761 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit 5405469b2357580a653ceb41c15c33091b2d1a06
+Subproject commit b4f47611084f9e22aeecb4d49659e900848e157e


From git at git.haskell.org  Mon Dec  7 11:14:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:38 +0000 (UTC)
Subject: [commit: ghc] master: linters/check-cpp: Don't produce debug log
 (f5127c8)
Message-ID: <20151207111438.2E14D3A300@ghc.haskell.org>

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

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

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

commit f5127c81ccb4d65f794b2b43fd3ad9b59c9a89d1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 7 10:53:44 2015 +0100

    linters/check-cpp: Don't produce debug log


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

f5127c81ccb4d65f794b2b43fd3ad9b59c9a89d1
 .arc-linters/check-cpp.py | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/.arc-linters/check-cpp.py b/.arc-linters/check-cpp.py
index c58da09..1d07b4e 100755
--- a/.arc-linters/check-cpp.py
+++ b/.arc-linters/check-cpp.py
@@ -9,16 +9,19 @@ import os
 import json
 import re
 
-
-def setup_logging():
-    logger = logging.getLogger()
+def setup_logging(logger):
+    """
+    ``arc lint`` makes it quite tricky to catch debug output from linters.
+    Log to a file to work around this.
+    """
     hdlr = logging.FileHandler('linter.log', 'w')
     logger.addHandler(hdlr)
     logger.setLevel(logging.DEBUG)
     return logger
 
-logger = setup_logging()
-#logger.debug(sys.argv)
+logger = logging.getLogger()
+#setup_logging(logger)
+logger.debug(sys.argv)
 
 path = sys.argv[1]
 warnings = []


From git at git.haskell.org  Mon Dec  7 11:14:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:40 +0000 (UTC)
Subject: [commit: ghc] master: Documentation: escape characters in
 template-haskell Haddocks (3ea4fb7)
Message-ID: <20151207111440.DF3FA3A300@ghc.haskell.org>

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

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

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

commit 3ea4fb746a4dbd9248586ed212c7afccb2df3338
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Mon Dec 7 11:06:23 2015 +0100

    Documentation: escape characters in template-haskell Haddocks
    
    Reviewers: hvr, austin, goldfire, bgamari
    
    Reviewed By: goldfire, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1578


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

3ea4fb746a4dbd9248586ed212c7afccb2df3338
 .../template-haskell/Language/Haskell/TH/Syntax.hs   | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
index 4d30a9d..ca6219e 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Syntax.hs
@@ -908,7 +908,7 @@ nameBase (Name occ _) = occString occ
 --
 -- ==== __Examples__
 --
--- >>> nameModule ''Data.Either.Either"
+-- >>> nameModule ''Data.Either.Either
 -- Just "Data.Either"
 -- >>> nameModule (mkName "foo")
 -- Nothing
@@ -923,7 +923,7 @@ nameModule _                      = Nothing
 --
 -- ==== __Examples__
 --
--- >>> namePackage ''Data.Either.Either"
+-- >>> namePackage ''Data.Either.Either
 -- Just "base"
 -- >>> namePackage (mkName "foo")
 -- Nothing
@@ -1343,10 +1343,10 @@ data Lit = CharL Char
 
 -- | Pattern in Haskell given in @{}@
 data Pat
-  = LitP Lit                      -- ^ @{ 5 or 'c' }@
+  = LitP Lit                      -- ^ @{ 5 or \'c\' }@
   | VarP Name                     -- ^ @{ x }@
   | TupP [Pat]                    -- ^ @{ (p1,p2) }@
-  | UnboxedTupP [Pat]             -- ^ @{ (# p1,p2 #) }@
+  | UnboxedTupP [Pat]             -- ^ @{ (\# p1,p2 \#) }@
   | ConP Name [Pat]               -- ^ @data T1 = C1 t1 t2; {C1 p1 p1} = e@
   | InfixP Pat Name Pat           -- ^ @foo ({x :+ y}) = e@
   | UInfixP Pat Name Pat          -- ^ @foo ({x :+ y}) = e@
@@ -1376,7 +1376,7 @@ data Clause = Clause [Pat] Body [Dec]
 data Exp
   = VarE Name                          -- ^ @{ x }@
   | ConE Name                          -- ^ @data T1 = C1 t1 t2; p = {C1} e1 e2  @
-  | LitE Lit                           -- ^ @{ 5 or 'c'}@
+  | LitE Lit                           -- ^ @{ 5 or \'c\'}@
   | AppE Exp Exp                       -- ^ @{ f x }@
 
   | InfixE (Maybe Exp) Exp (Maybe Exp) -- ^ @{x + y} or {(x+)} or {(+ x)} or {(+)}@
@@ -1393,10 +1393,10 @@ data Exp
   | ParensE Exp                        -- ^ @{ (e) }@
                                        --
                                        -- See "Language.Haskell.TH.Syntax#infix"
-  | LamE [Pat] Exp                     -- ^ @{ \ p1 p2 -> e }@
-  | LamCaseE [Match]                   -- ^ @{ \case m1; m2 }@
+  | LamE [Pat] Exp                     -- ^ @{ \\ p1 p2 -> e }@
+  | LamCaseE [Match]                   -- ^ @{ \\case m1; m2 }@
   | TupE [Exp]                         -- ^ @{ (e1,e2) }  @
-  | UnboxedTupE [Exp]                  -- ^ @{ (# e1,e2 #) }  @
+  | UnboxedTupE [Exp]                  -- ^ @{ (\# e1,e2 \#) }  @
   | CondE Exp Exp Exp                  -- ^ @{ if e1 then e2 else e3 }@
   | MultiIfE [(Guard, Exp)]            -- ^ @{ if | g1 -> e1 | g2 -> e2 }@
   | LetE [Dec] Exp                     -- ^ @{ let x=e1;   y=e2 in e3 }@
@@ -1470,7 +1470,7 @@ data Dec
   | InfixD Fixity Name            -- ^ @{ infix 3 foo }@
 
   -- | pragmas
-  | PragmaD Pragma                -- ^ @{ {\-# INLINE [1] foo #-\} }@
+  | PragmaD Pragma                -- ^ @{ {\-\# INLINE [1] foo \#-\} }@
 
   -- | data families (may also appear in [Dec] of 'ClassD' and 'InstanceD')
   | DataFamilyD Name [TyVarBndr]
@@ -1590,7 +1590,7 @@ data Type = ForallT [TyVarBndr] Cxt Type  -- ^ @forall \<vars\>. \<ctxt\> -> \<t
 
           -- See Note [Representing concrete syntax in types]
           | TupleT Int                    -- ^ @(,), (,,), etc.@
-          | UnboxedTupleT Int             -- ^ @(#,#), (#,,#), etc.@
+          | UnboxedTupleT Int             -- ^ @(\#,\#), (\#,,\#), etc.@
           | ArrowT                        -- ^ @->@
           | EqualityT                     -- ^ @~@
           | ListT                         -- ^ @[]@


From git at git.haskell.org  Mon Dec  7 11:14:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:43 +0000 (UTC)
Subject: [commit: ghc] master: Ignore generated linter.log (42a5469)
Message-ID: <20151207111443.882C73A300@ghc.haskell.org>

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

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

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

commit 42a5469e52d84a04df33f516fcb74ffa7ed70359
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Mon Dec 7 11:14:41 2015 +0100

    Ignore generated linter.log
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1577


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

42a5469e52d84a04df33f516fcb74ffa7ed70359
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index b61ba02..82c81c0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -133,6 +133,7 @@ _darcs/
 /libraries/plus.gif
 /libraries/synopsis.png
 /libraries/stamp/
+/linter.log
 /mk/are-validating.mk
 /mk/build.mk
 /mk/config.h


From git at git.haskell.org  Mon Dec  7 11:14:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:46 +0000 (UTC)
Subject: [commit: ghc] master: ghc-pkg: Restore old behavior in colored
 version; fixes 6119 (3d55e41)
Message-ID: <20151207111446.2A13B3A300@ghc.haskell.org>

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

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

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

commit 3d55e41e72dc32281744c52afea380c1db577ee1
Author: Sibi Prabakaran <sibi at psibi.in>
Date:   Mon Dec 7 11:16:15 2015 +0100

    ghc-pkg: Restore old behavior in colored version; fixes 6119
    
    The behavior is changed to this:
    ```
    ghc-pkg list blahblah
    /home/sibi/ghc/inplace/lib/package.conf.d
        (no packages)
    ```
    instead of:
    ```
    ghc-pkg list blahblah
    /home/sibi/ghc/inplace/lib/package.conf.d
    ```
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1575
    
    GHC Trac Issues: #6119


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

3d55e41e72dc32281744c52afea380c1db577ee1
 utils/ghc-pkg/Main.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 993aa12..b089e7b 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -1271,10 +1271,13 @@ listPackages verbosity my_flags mPackageName mModuleName = do
     mapM_ show_normal stack
 #else
     let
-       show_colour withF db =
-           mconcat $ map (<#> termText "\n") $
-               (termText (location db) :
-                  map (termText "   " <#>) (map pp_pkg (packages db)))
+       show_colour withF db at PackageDB{ packages = pkg_confs } =
+           if null pkg_confs
+           then termText (location db) <#> termText "\n    (no packages)\n"
+           else
+               mconcat $ map (<#> termText "\n") $
+                           (termText (location db) :
+                                     map (termText "   " <#>) (map pp_pkg pkg_confs))
           where
                    pp_pkg p
                      | installedComponentId p `elem` broken = withF Red  doc


From git at git.haskell.org  Mon Dec  7 11:14:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:49 +0000 (UTC)
Subject: [commit: ghc] master: Re-export data family when exporting a data
 instance without an export list (8cef8af)
Message-ID: <20151207111449.827553A300@ghc.haskell.org>

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

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

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

commit 8cef8af3286f3c98f2a02e65371b875d8791b687
Author: David Kraeutmann <kane at kane.cx>
Date:   Mon Dec 7 11:19:28 2015 +0100

    Re-export data family when exporting a data instance without an export list
    
    Whenever a data instance is exported, the corresponding data family
    is exported, too. This allows one to write
    
    ```
         -- Foo.hs
         module Foo where
    
         data family T a
    
         -- Bar.hs
         module Bar where
    
         import Foo
    
         data instance T Int = MkT
    
         -- Baz.hs
         module Baz where
    
         import Bar (T(MkT))
    ```
    
    In previous versions of GHC, this required a workaround
    explicit export list in `Bar`.
    
    Reviewers: bgamari, goldfire, austin
    
    Reviewed By: bgamari, goldfire
    
    Subscribers: goldfire, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1573
    
    GHC Trac Issues: #11164


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

8cef8af3286f3c98f2a02e65371b875d8791b687
 compiler/rename/RnNames.hs                         | 26 +++++++++++++++-------
 docs/users_guide/7.12.1-notes.rst                  | 23 +++++++++++++++++++
 docs/users_guide/glasgow_exts.rst                  |  8 +++----
 testsuite/tests/ghci/scripts/T5417.stdout          |  2 ++
 .../tests/indexed-types/should_fail/Over.stderr    |  8 +++----
 testsuite/tests/rename/should_compile/T11164.hs    |  3 +++
 testsuite/tests/rename/should_compile/T11164a.hs   |  4 ++++
 testsuite/tests/rename/should_compile/T11164b.hs   |  6 +++++
 testsuite/tests/rename/should_compile/all.T        |  4 ++++
 9 files changed, 68 insertions(+), 16 deletions(-)

diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index b0b79f5..3ee1e69 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -1200,14 +1200,24 @@ exports_from_avail :: Maybe (Located [LIE RdrName])
                    -> RnM (Maybe [LIE Name], [AvailInfo])
 
 exports_from_avail Nothing rdr_env _imports _this_mod
- = -- The same as (module M) where M is the current module name,
-   -- so that's how we handle it.
-   let
-       avails = [ availFromGRE gre
-                | gre <- globalRdrEnvElts rdr_env
-                , isLocalGRE gre ]
-   in
-    return (Nothing, avails)
+   -- The same as (module M) where M is the current module name,
+   -- so that's how we handle it, except we also export the data family
+   -- when a data instance is exported.
+  = let avails = [ fix_faminst $ availFromGRE gre
+                 | gre <- globalRdrEnvElts rdr_env
+                 , isLocalGRE gre ]
+    in return (Nothing, avails)
+  where
+    -- #11164: when we define a data instance
+    -- but not data family, re-export the family
+    -- Generally, whenever we export a part of a declaration,
+    -- export the declaration, too.
+    fix_faminst (AvailTC n ns flds)
+      | not (n `elem` ns)
+      = AvailTC n (n:ns) flds
+
+    fix_faminst avail = avail
+
 
 exports_from_avail (Just (L _ rdr_items)) rdr_env imports this_mod
   = do (ie_names, _, exports) <- foldlM do_litem emptyExportAccum rdr_items
diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 2e0ae6f..21ec1d3 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -109,6 +109,29 @@ Language
       -- P is imported
       import Foo (T(..))
 
+-  Whenever a data instance is exported, the corresponding data family
+   is exported, too. This allows one to write ::
+
+     -- Foo.hs
+     module Foo where
+     
+     data family T a
+
+     -- Bar.hs
+     module Bar where
+     
+     import Foo
+     
+     data instance T Int = MkT
+
+     -- Baz.hs
+     module Baz where
+     
+     import Bar (T(MkT))
+
+   In previous versions of GHC, this required a workaround via an
+   explicit export list in Bar. 
+
 
 
 Compiler
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 93261a2..7e448be 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -6702,10 +6702,10 @@ Two things to watch out for:
            data instance D Int = D1 | D2
 
    Module Y exports all the entities defined in Y, namely the data
-   constructors ``D1`` and ``D2``, *but not the data family* ``D``. That
-   (annoyingly) means that you cannot selectively import Y selectively,
-   thus "``import Y( D(D1,D2) )``", because Y does not export ``D``.
-   Instead you should list the exports explicitly, thus:
+   constructors ``D1`` and ``D2``, and *implicitly* the data family ``D``,
+   even though it's defined in X. 
+   This means you can write "``import Y( D(D1,D2) )``" *without* 
+   giving an explicit export list like this: 
 
    ::
 
diff --git a/testsuite/tests/ghci/scripts/T5417.stdout b/testsuite/tests/ghci/scripts/T5417.stdout
index 06329d9..30178a4 100644
--- a/testsuite/tests/ghci/scripts/T5417.stdout
+++ b/testsuite/tests/ghci/scripts/T5417.stdout
@@ -3,5 +3,7 @@ data instance C.F (B1 a) = B2 a
 data family D a
 class C.C1 a where
   data family C.F a
+class C.C1 a where
+  data family C.F a
   	-- Defined at T5417a.hs:5:5
 data instance C.F (B1 a) = B2 a 	-- Defined at T5417.hs:8:10
diff --git a/testsuite/tests/indexed-types/should_fail/Over.stderr b/testsuite/tests/indexed-types/should_fail/Over.stderr
index 180bb95..63b8b30 100644
--- a/testsuite/tests/indexed-types/should_fail/Over.stderr
+++ b/testsuite/tests/indexed-types/should_fail/Over.stderr
@@ -1,10 +1,10 @@
 
-OverB.hs:7:15:
+OverB.hs:7:15: error:
     Conflicting family instance declarations:
-      OverA.C [Int] [a] = CListList2 -- Defined at OverB.hs:7:15
-      OverA.C [a] [Int] = C9ListList -- Defined at OverC.hs:7:15
+      C [Int] [a] = CListList2 -- Defined at OverB.hs:7:15
+      C [a] [Int] = C9ListList -- Defined at OverC.hs:7:15
 
-OverB.hs:9:15:
+OverB.hs:9:15: error:
     Conflicting family instance declarations:
       OverA.D [Int] [a] = Int -- Defined at OverB.hs:9:15
       OverA.D [a] [Int] = Char -- Defined at OverC.hs:9:15
diff --git a/testsuite/tests/rename/should_compile/T11164.hs b/testsuite/tests/rename/should_compile/T11164.hs
new file mode 100644
index 0000000..b1d9a68
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/T11164.hs
@@ -0,0 +1,3 @@
+module T11164 where
+
+import T11164b (T)
diff --git a/testsuite/tests/rename/should_compile/T11164a.hs b/testsuite/tests/rename/should_compile/T11164a.hs
new file mode 100644
index 0000000..f14e96d
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/T11164a.hs
@@ -0,0 +1,4 @@
+{-# LANGUAGE TypeFamilies #-}
+module T11164a where
+
+data family T a
diff --git a/testsuite/tests/rename/should_compile/T11164b.hs b/testsuite/tests/rename/should_compile/T11164b.hs
new file mode 100644
index 0000000..abe65c4
--- /dev/null
+++ b/testsuite/tests/rename/should_compile/T11164b.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE TypeFamilies #-}
+module T11164b where
+
+import T11164a
+
+data instance T Int = MkT
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index c501ecc..05bc250 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -226,3 +226,7 @@ test('T7969',
 test('T9127', normal, compile, [''])
 test('T4426', normal, compile_fail, [''])
 test('T9778', normal, compile, ['-fwarn-unticked-promoted-constructors'])
+test('T11164',
+     extra_clean(['T11164a.hi', 'T11164a.o',
+                  'T11164b.hi', 'T11164b.o']),
+     multimod_compile, ['T11164', '-v0'])


From git at git.haskell.org  Mon Dec  7 11:14:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:52 +0000 (UTC)
Subject: [commit: ghc] master: Minor stylistic fixes in glasgow_exts.rst
 (91e985c)
Message-ID: <20151207111452.3585C3A300@ghc.haskell.org>

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

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

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

commit 91e985cd99e9f628e7cd01fc5dd0e6f596337446
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 7 11:23:50 2015 +0100

    Minor stylistic fixes in glasgow_exts.rst


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

91e985cd99e9f628e7cd01fc5dd0e6f596337446
 docs/users_guide/glasgow_exts.rst | 25 +++++++++++--------------
 1 file changed, 11 insertions(+), 14 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 7e448be..f86d716 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -1721,11 +1721,12 @@ comprehensions are explained in the previous chapters
 the type ``[a]`` with the type ``Monad m => m a`` for monad
 comprehensions.
 
-Note: Even though most of these examples are using the list monad, monad
-comprehensions work for any monad. The ``base`` package offers all
-necessary instances for lists, which make ``MonadComprehensions``
-backward compatible to built-in, transform and parallel list
-comprehensions.
+.. note::
+    Even though most of these examples are using the list monad, monad
+    comprehensions work for any monad. The ``base`` package offers all
+    necessary instances for lists, which make ``MonadComprehensions``
+    backward compatible to built-in, transform and parallel list
+    comprehensions.
 
 More formally, the desugaring is as follows. We write ``D[ e | Q]`` to
 mean the desugaring of the monad comprehension ``[ e | Q]``:
@@ -6690,9 +6691,7 @@ Two things to watch out for:
    specifications cannot be nested. To specify ``GMap``\ 's data
    constructors, you have to list it separately.
 
--  Consider this example:
-
-   ::
+-  Consider this example: ::
 
          module X where
            data family D
@@ -6701,13 +6700,11 @@ Two things to watch out for:
            import X
            data instance D Int = D1 | D2
 
-   Module Y exports all the entities defined in Y, namely the data
+   Module ``Y`` exports all the entities defined in ``Y``, namely the data
    constructors ``D1`` and ``D2``, and *implicitly* the data family ``D``,
-   even though it's defined in X. 
-   This means you can write "``import Y( D(D1,D2) )``" *without* 
-   giving an explicit export list like this: 
-
-   ::
+   even though it's defined in ``X``.
+   This means you can write ``import Y( D(D1,D2) )`` *without*
+   giving an explicit export list like this: ::
 
             module Y( D(..) ) where ...
        or   module Y( module Y, D ) where ...


From git at git.haskell.org  Mon Dec  7 11:14:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:55 +0000 (UTC)
Subject: [commit: ghc] master: Add isImport, isDecl,
 and isStmt functions to GHC API (2110037)
Message-ID: <20151207111455.69F683A300@ghc.haskell.org>

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

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

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

commit 2110037e270c5ea36de63e4d95a3175751338571
Author: Roman Shatsov <roshats at gmail.com>
Date:   Mon Dec 7 11:24:36 2015 +0100

    Add isImport, isDecl, and isStmt functions to GHC API
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: mpickering, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1518
    
    GHC Trac Issues: #9015


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

2110037e270c5ea36de63e4d95a3175751338571
 compiler/main/GHC.hs                 |  1 +
 compiler/main/InteractiveEval.hs     | 37 ++++++++++++++++
 docs/users_guide/7.12.1-notes.rst    |  2 +
 ghc/GhciMonad.hs                     | 19 +-------
 ghc/InteractiveUI.hs                 | 33 +++++---------
 testsuite/.gitignore                 |  1 +
 testsuite/tests/ghc-api/Makefile     |  7 ++-
 testsuite/tests/ghc-api/T9015.hs     | 59 +++++++++++++++++++++++++
 testsuite/tests/ghc-api/T9015.stdout | 86 ++++++++++++++++++++++++++++++++++++
 testsuite/tests/ghc-api/all.T        |  3 ++
 10 files changed, 207 insertions(+), 41 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2110037e270c5ea36de63e4d95a3175751338571

From git at git.haskell.org  Mon Dec  7 11:14:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 11:14:58 +0000 (UTC)
Subject: [commit: ghc] master: rts: Remove space before argument list in
 ASSERTs (d4bcd05)
Message-ID: <20151207111458.1F4ED3A300@ghc.haskell.org>

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

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

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

commit d4bcd05d7df3138429abdf43d3e3eb8f6da2dcdf
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Dec 7 11:33:06 2015 +0100

    rts: Remove space before argument list in ASSERTs
    
    Test Plan: Validate
    
    Reviewers: austin, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1569


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

d4bcd05d7df3138429abdf43d3e3eb8f6da2dcdf
 rts/Linker.c |  2 +-
 rts/STM.c    | 96 ++++++++++++++++++++++++++++++------------------------------
 2 files changed, 49 insertions(+), 49 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d4bcd05d7df3138429abdf43d3e3eb8f6da2dcdf

From git at git.haskell.org  Mon Dec  7 12:10:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 12:10:11 +0000 (UTC)
Subject: [commit: ghc] master: Use TypeLits in the meta-data encoding of
 GHC.Generics (700c42b)
Message-ID: <20151207121011.F25C23A300@ghc.haskell.org>

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

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

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

commit 700c42b5e0ffd27884e6bdfa9a940e55449cff6f
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Mon Dec 7 12:37:50 2015 +0100

    Use TypeLits in the meta-data encoding of GHC.Generics
    
    Test Plan: Validate.
    
    Reviewers: simonpj, goldfire, hvr, dreixel, kosmikus, austin, bgamari
    
    Reviewed By: kosmikus, austin, bgamari
    
    Subscribers: RyanGlScott, Fuuzetsu, bgamari, thomie, carter, dreixel
    
    Differential Revision: https://phabricator.haskell.org/D493
    
    GHC Trac Issues: #9766


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

700c42b5e0ffd27884e6bdfa9a940e55449cff6f
 compiler/prelude/PrelNames.hs                      |   59 +-
 compiler/typecheck/TcDeriv.hs                      |   76 +-
 compiler/typecheck/TcGenDeriv.hs                   |   18 +-
 compiler/typecheck/TcGenGenerics.hs                |  309 ++---
 docs/users_guide/glasgow_exts.rst                  |   31 +-
 libraries/base/GHC/Generics.hs                     |  364 +++---
 libraries/base/changelog.md                        |    3 +
 testsuite/tests/generics/GShow/GShow.hs            |    4 +-
 testsuite/tests/generics/GenDerivOutput.stderr     |  211 ++--
 testsuite/tests/generics/GenDerivOutput1_0.stderr  |   58 +-
 testsuite/tests/generics/GenDerivOutput1_1.stderr  |  290 ++---
 .../should_run/overloadedrecflds_generics.hs       |    7 +-
 testsuite/tests/perf/compiler/T5642.hs             | 1301 +++++++++-----------
 testsuite/tests/perf/compiler/all.T                |    3 +-
 14 files changed, 1198 insertions(+), 1536 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 700c42b5e0ffd27884e6bdfa9a940e55449cff6f

From git at git.haskell.org  Mon Dec  7 12:10:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 12:10:14 +0000 (UTC)
Subject: [commit: ghc] master: Refactor ConDecl (51a5e68)
Message-ID: <20151207121014.B9F353A300@ghc.haskell.org>

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

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

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

commit 51a5e68db887adb3565ff2f077267e2b513be562
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 7 12:40:38 2015 +0100

    Refactor ConDecl
    
    The ConDecl type in HsDecls is an uneasy compromise. For the most part,
    HsSyn directly reflects the syntax written by the programmer; and that
    gives just the right "pegs" on which to hang Alan's API annotations. But
    ConDecl doesn't properly reflect the syntax of Haskell-98 and GADT-style
    data type declarations.
    
    To be concrete, here's a draft new data type
    
    ```lang=hs
    data ConDecl name
      | ConDeclGADT
          { con_names   :: [Located name]
          , con_type    :: LHsSigType name  -- The type after the ?::?
          , con_doc     :: Maybe LHsDocString }
    
      | ConDeclH98
          { con_name    :: Located name
    
          , con_qvars     :: Maybe (LHsQTyVars name)
            -- User-written forall (if any), and its implicit
            -- kind variables
            -- Non-Nothing needs -XExistentialQuantification
    
          , con_cxt       :: Maybe (LHsContext name)
            -- ^ User-written context (if any)
    
          , con_details   :: HsConDeclDetails name
              -- ^ Arguments
    
          , con_doc       :: Maybe LHsDocString
              -- ^ A possible Haddock comment.
          } deriving (Typeable)
    ```
    
    Note that
    
        For GADTs, just keep a type. That's what the user writes.
        NB:HsType can represent records on the LHS of an arrow:
    
          { x:Int,y:Bool} -> T
    
        con_qvars and con_cxt are both Maybe because they are both
        optional (the forall and the context of an existential data type
    
        For ConDeclGADT the type variables of the data type do not scope
        over the con_type; whereas for ConDeclH98 they do scope over con_cxt
        and con_details.
    
    Updates haddock submodule.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, erikd, hvr, goldfire, austin, bgamari
    
    Subscribers: erikd, goldfire, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1558
    
    GHC Trac Issues: #11028


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

51a5e68db887adb3565ff2f077267e2b513be562
 compiler/deSugar/DsMeta.hs                         |  98 ++++++++---
 compiler/hsSyn/Convert.hs                          |  22 ++-
 compiler/hsSyn/HsDecls.hs                          | 152 +++++++---------
 compiler/hsSyn/HsLit.hs                            |   1 -
 compiler/hsSyn/HsTypes.hs                          |   4 +-
 compiler/hsSyn/HsUtils.hs                          |  26 ++-
 compiler/parser/Parser.y                           |  12 +-
 compiler/parser/RdrHsSyn.hs                        |  73 +++-----
 compiler/rename/RnEnv.hs                           |   4 +-
 compiler/rename/RnNames.hs                         |  13 +-
 compiler/rename/RnSource.hs                        | 120 +++++--------
 compiler/rename/RnTypes.hs                         |  22 ++-
 compiler/typecheck/TcHsType.hs                     |   9 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 193 +++++++++++++++------
 testsuite/tests/ghc-api/annotations/T10399.stdout  |   2 -
 testsuite/tests/ghc-api/annotations/all.T          |   2 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |   2 +-
 testsuite/tests/rename/should_compile/T5331.stderr |   2 +-
 testsuite/tests/rename/should_fail/T7943.stderr    |   6 +-
 utils/haddock                                      |   2 +-
 21 files changed, 427 insertions(+), 340 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 51a5e68db887adb3565ff2f077267e2b513be562

From git at git.haskell.org  Mon Dec  7 12:10:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 12:10:18 +0000 (UTC)
Subject: [commit: ghc] master: Move checking for missing signatures to
 RnNames.reportUnusedNames (1bd40c8)
Message-ID: <20151207121018.219B23A300@ghc.haskell.org>

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

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

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

commit 1bd40c860eb0e8da55b8eff536766a6c802347cc
Author: Eric Seidel <gridaphobe at gmail.com>
Date:   Mon Dec 7 12:42:38 2015 +0100

    Move checking for missing signatures to RnNames.reportUnusedNames
    
    Checking for missing signatures before renaming the export list is
    prone to errors, so we now perform the check in `reportUnusedNames` at
    which point everything has been renamed.
    
    Test Plan: validate, new test case is T10908
    
    Reviewers: goldfire, simonpj, austin, bgamari
    
    Subscribers: thomie
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1561
    
    GHC Trac Issues: #10908


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

1bd40c860eb0e8da55b8eff536766a6c802347cc
 compiler/rename/RnNames.hs                        |  63 +++++++++-
 compiler/typecheck/TcBinds.hs                     |  24 +++-
 compiler/typecheck/TcHsSyn.hs                     | 141 +++++-----------------
 compiler/typecheck/TcRnDriver.hs                  |  10 +-
 testsuite/tests/warnings/should_compile/T10908.hs |  10 ++
 testsuite/tests/warnings/should_compile/all.T     |   1 +
 6 files changed, 130 insertions(+), 119 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1bd40c860eb0e8da55b8eff536766a6c802347cc

From git at git.haskell.org  Mon Dec  7 13:07:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 13:07:30 +0000 (UTC)
Subject: [commit: ghc] master: ghc-pkg: don't sort packages unnecessarily
 (151c4b0)
Message-ID: <20151207130730.035D23A300@ghc.haskell.org>

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

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

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

commit 151c4b0b6caff2e1af764699c54302933c628861
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Dec 7 13:22:03 2015 +0100

    ghc-pkg: don't sort packages unnecessarily
    
    The packages in the package database are already sorted alphabetically
    by this point (see db_stack_sorted).
    
    This is a better fix for #8245, commit 021b1f8.
    
    Test Plan: look at output of './inplace/bin/ghc-pkg list
    [--simple-output]'
    
    Reviewers: austin, bgamari, psibi
    
    Reviewed By: psibi
    
    Differential Revision: https://phabricator.haskell.org/D1579
    
    GHC Trac Issues: #8245


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

151c4b0b6caff2e1af764699c54302933c628861
 utils/ghc-pkg/Main.hs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index b089e7b..2820f70 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -36,7 +36,6 @@ import qualified Control.Exception as Exception
 import Data.Maybe
 
 import Data.Char ( isSpace, toLower )
-import Data.Ord (comparing)
 #if __GLASGOW_HASKELL__ < 709
 import Control.Applicative (Applicative(..))
 #endif
@@ -1243,12 +1242,10 @@ listPackages verbosity my_flags mPackageName mModuleName = do
 
       show_normal PackageDB{ location = db_name, packages = pkg_confs } =
           do hPutStrLn stdout (db_name ++ ":")
-             if null pp_pkgs
+             if null pkg_confs
                  then hPutStrLn stdout "    (no packages)"
-                 else hPutStrLn stdout $ unlines (map ("    " ++) pp_pkgs)
+                 else hPutStrLn stdout $ unlines (map ("    " ++) (map pp_pkg pkg_confs))
            where
-                 -- Sort using instance Ord PackageId
-                 pp_pkgs = map pp_pkg . sortBy (comparing installedComponentId) $ pkg_confs
                  pp_pkg p
                    | installedComponentId p `elem` broken = printf "{%s}" doc
                    | exposed p = doc
@@ -1305,8 +1302,7 @@ simplePackageList :: [Flag] -> [InstalledPackageInfo] -> IO ()
 simplePackageList my_flags pkgs = do
    let showPkg = if FlagNamesOnly `elem` my_flags then display . pkgName
                                                   else display
-       -- Sort using instance Ord PackageId
-       strs = map showPkg $ sort $ map sourcePackageId pkgs
+       strs = map showPkg $ map sourcePackageId pkgs
    when (not (null pkgs)) $
       hPutStrLn stdout $ concat $ intersperse " " strs
 


From git at git.haskell.org  Mon Dec  7 13:08:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 13:08:12 +0000 (UTC)
Subject: [commit: ghc] master: rts: One more Clang-unfriendly CPP usage
 (04e1c27)
Message-ID: <20151207130812.20C853A300@ghc.haskell.org>

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

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

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

commit 04e1c27943503f2e12b009b91f7bef195766f6d0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 7 14:08:28 2015 +0100

    rts: One more Clang-unfriendly CPP usage


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

04e1c27943503f2e12b009b91f7bef195766f6d0
 rts/sm/BlockAlloc.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rts/sm/BlockAlloc.c b/rts/sm/BlockAlloc.c
index e721fb1..a633726 100644
--- a/rts/sm/BlockAlloc.c
+++ b/rts/sm/BlockAlloc.c
@@ -835,9 +835,9 @@ checkFreeListSanity(void)
         // make sure we're fully coalesced
         if (bd->link != NULL)
         {
-            ASSERT (MBLOCK_ROUND_DOWN(bd->link) !=
-                    (StgWord8*)MBLOCK_ROUND_DOWN(bd) +
-                    BLOCKS_TO_MBLOCKS(bd->blocks) * MBLOCK_SIZE);
+            ASSERT(MBLOCK_ROUND_DOWN(bd->link) !=
+                   (StgWord8*)MBLOCK_ROUND_DOWN(bd) +
+                   BLOCKS_TO_MBLOCKS(bd->blocks) * MBLOCK_SIZE);
         }
     }
 }


From git at git.haskell.org  Mon Dec  7 16:34:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 16:34:13 +0000 (UTC)
Subject: [commit: ghc] master: Re-use `transformers`'s `MaybeT` rather than
 our own (0933331)
Message-ID: <20151207163413.6CAA13A300@ghc.haskell.org>

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

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

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

commit 09333313f32be975faf9158fcd3648489d78ad82
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 7 17:32:23 2015 +0100

    Re-use `transformers`'s `MaybeT` rather than our own
    
    The now removed `MaybeT` type was originally added back in 2008
    via bc845b714132a897032502536fea8cd018ce325b
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1583


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

09333313f32be975faf9158fcd3648489d78ad82
 compiler/utils/Maybes.hs | 60 ++++--------------------------------------------
 1 file changed, 4 insertions(+), 56 deletions(-)

diff --git a/compiler/utils/Maybes.hs b/compiler/utils/Maybes.hs
index 656f40a..ac51070 100644
--- a/compiler/utils/Maybes.hs
+++ b/compiler/utils/Maybes.hs
@@ -3,7 +3,6 @@
 (c) The GRASP/AQUA Project, Glasgow University, 1992-1998
 -}
 
-{-# LANGUAGE CPP #-}
 module Maybes (
         module Data.Maybe,
 
@@ -18,11 +17,9 @@ module Maybes (
         MaybeT(..), liftMaybeT
     ) where
 
-import Control.Applicative
+import Control.Applicative as A
 import Control.Monad
-#if __GLASGOW_HASKELL__ > 710
-import Control.Monad.Fail
-#endif
+import Control.Monad.Trans.Maybe
 import Data.Maybe
 
 infixr 4 `orElse`
@@ -64,56 +61,7 @@ orElse = flip fromMaybe
 ************************************************************************
 -}
 
-newtype MaybeT m a = MaybeT {runMaybeT :: m (Maybe a)}
-
-instance Functor m => Functor (MaybeT m) where
-  fmap f x = MaybeT $ fmap (fmap f) $ runMaybeT x
-
-#if __GLASGOW_HASKELL__ < 710
--- Pre-AMP change
-instance (Monad m, Applicative m) => Applicative (MaybeT m) where
-#else
-instance (Monad m) => Applicative (MaybeT m) where
-#endif
-  pure = MaybeT . pure . Just
-  (<*>) = ap
-
-#if __GLASGOW_HASKELL__ < 710
--- Pre-AMP change
-instance (Monad m, Applicative m) => Monad (MaybeT m) where
-#else
-instance (Monad m) => Monad (MaybeT m) where
-#endif
-  return = pure
-  x >>= f = MaybeT $ runMaybeT x >>= maybe (pure Nothing) (runMaybeT . f)
-  fail _ = MaybeT $ pure Nothing
-
-
-#if __GLASGOW_HASKELL__ > 710
-instance Monad m => MonadFail (MaybeT m) where
-  fail _ = MaybeT $ return Nothing
-#endif
-
-#if __GLASGOW_HASKELL__ < 710
--- Pre-AMP change
-instance (Monad m, Applicative m) => Alternative (MaybeT m) where
-#else
-instance (Monad m) => Alternative (MaybeT m) where
-#endif
-  empty = mzero
-  (<|>) = mplus
-
-#if __GLASGOW_HASKELL__ < 710
--- Pre-AMP change
-instance (Monad m, Applicative m) => MonadPlus (MaybeT m) where
-#else
-instance Monad m => MonadPlus (MaybeT m) where
-#endif
-  mzero       = MaybeT $ pure Nothing
-  p `mplus` q = MaybeT $ do ma <- runMaybeT p
-                            case ma of
-                              Just a  -> pure (Just a)
-                              Nothing -> runMaybeT q
+-- We had our own MaybeT in the past. Now we reuse transformer's MaybeT
 
 liftMaybeT :: Monad m => m a -> MaybeT m a
 liftMaybeT act = MaybeT $ Just `liftM` act
@@ -136,7 +84,7 @@ instance Applicative (MaybeErr err) where
   (<*>) = ap
 
 instance Monad (MaybeErr err) where
-  return = pure
+  return = A.pure
   Succeeded v >>= k = k v
   Failed e    >>= _ = Failed e
 


From git at git.haskell.org  Mon Dec  7 21:52:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 21:52:31 +0000 (UTC)
Subject: [commit: ghc] master: Remove redundant CPP conditionals (b292720)
Message-ID: <20151207215231.623943A300@ghc.haskell.org>

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

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

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

commit b292720c0635fc934424efead8c8f77168e8eac3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 7 22:50:44 2015 +0100

    Remove redundant CPP conditionals
    
    It makes little sense to have __GLASGOW_HASKELL__ conditional
    code inside GHCi's source-code, as GHCi is only ever build
    by the current stage1 GHC, whose version is assumed to be the
    same as the GHCi version being built.


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

b292720c0635fc934424efead8c8f77168e8eac3
 ghc/GhciMonad.hs     | 4 ----
 ghc/InteractiveUI.hs | 5 -----
 2 files changed, 9 deletions(-)

diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index 7dd005b..28c5657 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GhciMonad.hs
@@ -55,10 +55,6 @@ import qualified System.Console.Haskeline as Haskeline
 import Control.Monad.Trans.Class
 import Control.Monad.IO.Class
 
-#if __GLASGOW_HASKELL__ < 709
-import Control.Applicative (Applicative(..))
-#endif
-
 -----------------------------------------------------------------------------
 -- GHCi monad
 
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index f7b3603..24e3c99 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -82,12 +82,7 @@ import Data.List ( find, group, intercalate, intersperse, isPrefixOf, nub,
 import Data.Maybe
 
 import Exception hiding (catch)
-
-#if __GLASGOW_HASKELL__ >= 709
 import Foreign
-#else
-import Foreign.Safe
-#endif
 
 import System.Directory
 import System.Environment


From git at git.haskell.org  Mon Dec  7 22:16:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon,  7 Dec 2015 22:16:26 +0000 (UTC)
Subject: [commit: ghc] master: Get rid of tcView altogether (834f9a4)
Message-ID: <20151207221626.BB0E53A300@ghc.haskell.org>

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

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

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

commit 834f9a46a7493e88c41ac01210bc3fcde7a2c0f9
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Mon Dec 7 11:41:51 2015 -0500

    Get rid of tcView altogether
    
    This is just a trivial renaming that implements a ToDo mentioned in a comment
    in Type.hs.
    
    Adding Simon as reviewer since he added the ToDo comment.
    
    Reviewers: simonpj, austin, goldfire, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1584


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

834f9a46a7493e88c41ac01210bc3fcde7a2c0f9
 compiler/typecheck/FamInst.hs     |  2 +-
 compiler/typecheck/TcCanonical.hs | 12 ++++-----
 compiler/typecheck/TcErrors.hs    | 12 ++++-----
 compiler/typecheck/TcType.hs      | 53 +++++++++++++++++++--------------------
 compiler/typecheck/TcUnify.hs     | 14 +++++------
 compiler/typecheck/TcValidity.hs  |  4 +--
 compiler/types/Type.hs            | 18 +++----------
 compiler/types/Unify.hs           | 12 ++++-----
 8 files changed, 58 insertions(+), 69 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 834f9a46a7493e88c41ac01210bc3fcde7a2c0f9

From git at git.haskell.org  Tue Dec  8 08:16:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 08:16:54 +0000 (UTC)
Subject: [commit: ghc] master: Introduce HasGhciState class and refactor
 use-sites (2f6e87a)
Message-ID: <20151208081654.089293A300@ghc.haskell.org>

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

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

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

commit 2f6e87a494330837c425dab67ba26ee36bd9eacf
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 08:48:21 2015 +0100

    Introduce HasGhciState class and refactor use-sites
    
    This allows to reach the GhciState without having to keep
    track how many Monad transformer layers sit on top of the
    GHCi monad.
    
    While at it, this also refactors code to make more use of the
    existing `modifyGHCiState` operation.
    
    This is a preparatory refactoring for #10874
    
    Differential Revision: https://phabricator.haskell.org/D1582


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

2f6e87a494330837c425dab67ba26ee36bd9eacf
 ghc/GhciMonad.hs     | 20 ++++++++++++-----
 ghc/InteractiveUI.hs | 63 +++++++++++++++++++++-------------------------------
 2 files changed, 39 insertions(+), 44 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2f6e87a494330837c425dab67ba26ee36bd9eacf

From git at git.haskell.org  Tue Dec  8 09:17:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 09:17:44 +0000 (UTC)
Subject: [commit: libffi-tarballs] branch 'libffi-3.1' created
Message-ID: <20151208091744.08BEA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/libffi-tarballs

New branch : libffi-3.1
Referencing: b6658e5d73eb0579b3054593de21f329ab491e77

From git at git.haskell.org  Tue Dec  8 09:25:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 09:25:11 +0000 (UTC)
Subject: [commit: libffi-tarballs] branch 'libffi-3.2.1' created
Message-ID: <20151208092511.B27553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/libffi-tarballs

New branch : libffi-3.2.1
Referencing: ec37a68838566cb830c33cb30bfade003a306cff

From git at git.haskell.org  Tue Dec  8 09:25:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 09:25:13 +0000 (UTC)
Subject: [commit: libffi-tarballs] libffi-3.2.1: libffi 3.2.1 was released on
 November 12, 2014. (ec37a68)
Message-ID: <20151208092513.B89FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/libffi-tarballs

On branch  : libffi-3.2.1
Link       : http://git.haskell.org/libffi-tarballs.git/commitdiff/ec37a68838566cb830c33cb30bfade003a306cff

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

commit ec37a68838566cb830c33cb30bfade003a306cff
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 10:23:14 2015 +0100

    libffi 3.2.1 was released on November 12, 2014.
    
    The libffi-3.2.1.tar.gz tarball was retrieved from
    
      ftp://sourceware.org/pub/libffi/libffi-3.2.1.tar.gz
    
    and has the following checksums
    
        md5sum     83b89587607e3eb65c70d361f13bab43
        sha1sum    280c265b789e041c02e5c97815793dfc283fb1e6
        sha256sum  d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37


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

ec37a68838566cb830c33cb30bfade003a306cff
 LICENSE             |  21 +++++++++++++++++++++
 README              |   4 ++++
 libffi-3.2.1.tar.gz | Bin 0 -> 940837 bytes
 3 files changed, 25 insertions(+)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..a66fab4
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+libffi - Copyright (c) 1996-2014  Anthony Green, Red Hat, Inc and others.
+See source files for details.
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+``Software''), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/README b/README
new file mode 100644
index 0000000..042415a
--- /dev/null
+++ b/README
@@ -0,0 +1,4 @@
+
+Tarballs come from:
+    http://sourceware.org/libffi/
+
diff --git a/libffi-3.2.1.tar.gz b/libffi-3.2.1.tar.gz
new file mode 100644
index 0000000..5c21bb0
Binary files /dev/null and b/libffi-3.2.1.tar.gz differ


From git at git.haskell.org  Tue Dec  8 10:10:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 10:10:00 +0000 (UTC)
Subject: [commit: ghc] master: Associate ErrorCall pattern with ErrorCall type
 (9f4ca5a)
Message-ID: <20151208101000.A87DB3A300@ghc.haskell.org>

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

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

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

commit 9f4ca5afaccc8a397d8ee91b5423a9c2fcd151ce
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 11:09:48 2015 +0100

    Associate ErrorCall pattern with ErrorCall type
    
    This way,
    
        import Control.Exception (ErrorCall(ErrorCall))
    
    or
    
        import Control.Exception (ErrorCall(..))
    
    work as expected, and import the `ErrorCall` compatibility pattern as well.
    
    When #5273 was implemented, it wasn't possible yet to associated
    patterns with their types (see #10653).
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1588


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

9f4ca5afaccc8a397d8ee91b5423a9c2fcd151ce
 libraries/base/Control/Exception.hs      | 3 +--
 libraries/base/Control/Exception/Base.hs | 3 +--
 libraries/base/GHC/Exception.hs          | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/base/Control/Exception.hs b/libraries/base/Control/Exception.hs
index 1383972..9c388f4 100644
--- a/libraries/base/Control/Exception.hs
+++ b/libraries/base/Control/Exception.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE NoImplicitPrelude, ExistentialQuantification, PatternSynonyms #-}
+{-# LANGUAGE NoImplicitPrelude, ExistentialQuantification #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -56,7 +56,6 @@ module Control.Exception (
         RecSelError(..),
         RecUpdError(..),
         ErrorCall(..),
-        pattern ErrorCall,
         TypeError(..),
 
         -- * Throwing exceptions
diff --git a/libraries/base/Control/Exception/Base.hs b/libraries/base/Control/Exception/Base.hs
index ba2502f..ece5c69 100644
--- a/libraries/base/Control/Exception/Base.hs
+++ b/libraries/base/Control/Exception/Base.hs
@@ -1,6 +1,5 @@
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude, MagicHash #-}
-{-# LANGUAGE PatternSynonyms #-}
 {-# LANGUAGE StandaloneDeriving #-}
 
 -----------------------------------------------------------------------------
@@ -39,7 +38,7 @@ module Control.Exception.Base (
         RecConError(..),
         RecSelError(..),
         RecUpdError(..),
-        ErrorCall(..), pattern ErrorCall,
+        ErrorCall(..),
         TypeError(..), -- #10284, custom error type for deferred type errors
 
         -- * Throwing exceptions
diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs
index c31a203..e4925c7 100644
--- a/libraries/base/GHC/Exception.hs
+++ b/libraries/base/GHC/Exception.hs
@@ -24,7 +24,7 @@
 module GHC.Exception
        ( Exception(..)    -- Class
        , throw
-       , SomeException(..), ErrorCall(..), pattern ErrorCall, ArithException(..)
+       , SomeException(..), ErrorCall(..,ErrorCall), ArithException(..)
        , divZeroException, overflowException, ratioZeroDenomException
        , errorCallException, errorCallWithCallStackException
        , showCallStack, popCallStack, showSrcLoc


From git at git.haskell.org  Tue Dec  8 10:16:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 10:16:23 +0000 (UTC)
Subject: [commit: ghc] master: Make HasDynFlags more transformers friendly
 (fd3b845)
Message-ID: <20151208101623.2C78B3A300@ghc.haskell.org>

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

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

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

commit fd3b845c01aa26b6e5cd12c00af59e5468e21b1b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 11:11:11 2015 +0100

    Make HasDynFlags more transformers friendly
    
    Ideally, we'd have the more general
    
        instance (MonadTrans t, Monad m, HasDynFlags m) => HasDynFlags (t m) where
            getDynFlags = lift getDynFlags
    
    definition. However, that one would overlap with the `HasDynFlags (GhcT m)`
    instance. Instead we define instances for a couple of common Monad
    transformers explicitly in order to avoid nasty overlapping instances.
    
    This is a preparatory refactoring for #10874
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1581


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

fd3b845c01aa26b6e5cd12c00af59e5468e21b1b
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs | 10 +++++-----
 compiler/main/DynFlags.hs               | 35 +++++++++++++++++++++++++++++++++
 compiler/main/GhcMonad.hs               | 10 +++-------
 ghc/InteractiveUI.hs                    |  2 +-
 4 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
index 539e222..0aec7ad 100644
--- a/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen/CodeGen.hs
@@ -275,7 +275,7 @@ genCall (PrimTarget (MO_AtomicWrite _width)) [] [addr, val] = runStmtsDecls $ do
 -- some extra parameters.
 genCall t@(PrimTarget op) [] args
  | Just align <- machOpMemcpyishAlign op = runStmtsDecls $ do
-    dflags <- lift $ getDynFlags
+    dflags <- getDynFlags
     let isVolTy = [i1]
         isVolVal = [mkIntLit i1 0]
         argTy | MO_Memset _ <- op = [i8Ptr, i8,    llvmWord dflags, i32] ++ isVolTy
@@ -377,7 +377,7 @@ genCall t@(PrimTarget (MO_SubWordC w)) [dstV, dstO] [lhs, rhs] =
 
 -- Handle all other foreign calls and prim ops.
 genCall target res args = runStmtsDecls $ do
-    dflags <- lift $ getDynFlags
+    dflags <- getDynFlags
 
     -- parameter types
     let arg_type (_, AddrHint) = i8Ptr
@@ -1378,7 +1378,7 @@ genMachOp_slow opt op [x, y] = case op of
 
                 else do
                     -- Error. Continue anyway so we can debug the generated ll file.
-                    dflags <- lift getDynFlags
+                    dflags <- getDynFlags
                     let style = mkCodeStyle CStyle
                         toString doc = renderWithStyle dflags doc style
                         cmmToStr = (lines . toString . PprCmm.pprExpr)
@@ -1422,7 +1422,7 @@ genMachOp_slow opt op [x, y] = case op of
             vx <- exprToVarW x
             vy <- exprToVarW y
 
-            dflags <- lift getDynFlags
+            dflags <- getDynFlags
             let word  = getVarType vx
             let word2 = LMInt $ 2 * (llvmWidthInBits dflags $ getVarType vx)
             let shift = llvmWidthInBits dflags word
@@ -1522,7 +1522,7 @@ genLoad_fast atomic e r n ty = do
 genLoad_slow :: Atomic -> CmmExpr -> CmmType -> [MetaAnnot] -> LlvmM ExprData
 genLoad_slow atomic e ty meta = runExprData $ do
     iptr <- exprToVarW e
-    dflags <- lift getDynFlags
+    dflags <- getDynFlags
     case getVarType iptr of
          LMPointer _ -> do
                     doExprW (cmmToLlvmType ty) (MExpr meta $ loadInstr iptr)
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 3d99a1a..c492a01 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE CPP #-}
+{-# LANGUAGE FlexibleInstances #-}
 
 -------------------------------------------------------------------------------
 --
@@ -176,6 +177,13 @@ import System.IO.Unsafe ( unsafePerformIO )
 import Data.IORef
 import Control.Arrow ((&&&))
 import Control.Monad
+import Control.Monad.Trans.Class
+import Control.Monad.Trans.Writer
+import Control.Monad.Trans.Reader
+import qualified Control.Monad.Trans.Maybe as CMT
+#if MIN_VERSION_transformers(4,0,0)
+import Control.Monad.Trans.Except
+#endif
 import Control.Exception (throwIO)
 
 import Data.Bits
@@ -186,6 +194,7 @@ import Data.Map (Map)
 import qualified Data.Map as Map
 import Data.Set (Set)
 import qualified Data.Set as Set
+import Data.Monoid (Monoid)
 import Data.Word
 import System.FilePath
 import System.Directory
@@ -912,6 +921,32 @@ data DynFlags = DynFlags {
 class HasDynFlags m where
     getDynFlags :: m DynFlags
 
+{- It would be desirable to have the more generalised
+
+  instance (MonadTrans t, Monad m, HasDynFlags m) => HasDynFlags (t m) where
+      getDynFlags = lift getDynFlags
+
+instance definition. However, that definition would overlap with the
+`HasDynFlags (GhcT m)` instance. Instead we define instances for a
+couple of common Monad transformers explicitly. -}
+
+instance (Monoid a, Monad m, HasDynFlags m) => HasDynFlags (WriterT a m) where
+    getDynFlags = lift getDynFlags
+
+instance (Monad m, HasDynFlags m) => HasDynFlags (ReaderT a m) where
+    getDynFlags = lift getDynFlags
+
+instance (Monad m, HasDynFlags m) => HasDynFlags (MaybeT m) where
+    getDynFlags = liftMaybeT getDynFlags
+
+instance (Monad m, HasDynFlags m) => HasDynFlags (CMT.MaybeT m) where
+    getDynFlags = lift getDynFlags
+
+#if MIN_VERSION_transformers(4,0,0)
+instance (Monad m, HasDynFlags m) => HasDynFlags (ExceptT e m) where
+    getDynFlags = lift getDynFlags
+#endif
+
 class ContainsDynFlags t where
     extractDynFlags :: t -> DynFlags
     replaceDynFlags :: t -> DynFlags -> t
diff --git a/compiler/main/GhcMonad.hs b/compiler/main/GhcMonad.hs
index 44f9eff..34d5bcf 100644
--- a/compiler/main/GhcMonad.hs
+++ b/compiler/main/GhcMonad.hs
@@ -29,6 +29,7 @@ import DynFlags
 import Exception
 import ErrUtils
 
+import Control.Monad
 import Data.IORef
 
 -- -----------------------------------------------------------------------------
@@ -184,13 +185,8 @@ instance ExceptionMonad m => ExceptionMonad (GhcT m) where
                            in
                               unGhcT (f g_restore) s
 
-#if __GLASGOW_HASKELL__ < 710
--- Pre-AMP change
-instance (ExceptionMonad m, Functor m) => HasDynFlags (GhcT m) where
-#else
-instance (ExceptionMonad m) => HasDynFlags (GhcT m) where
-#endif
-  getDynFlags = getSessionDynFlags
+instance MonadIO m => HasDynFlags (GhcT m) where
+  getDynFlags = GhcT $ \(Session r) -> liftM hsc_dflags (liftIO $ readIORef r)
 
 #if __GLASGOW_HASKELL__ < 710
 -- Pre-AMP change
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 02a8670..7fd9c8b 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -849,7 +849,7 @@ runOneCommand eh gCmd = do
 checkInputForLayout :: String -> InputT GHCi (Maybe String)
                     -> InputT GHCi (Maybe String)
 checkInputForLayout stmt getStmt = do
-   dflags' <- lift $ getDynFlags
+   dflags' <- getDynFlags
    let dflags = xopt_set dflags' Opt_AlternativeLayoutRule
    st0 <- getGHCiState
    let buf'   =  stringToStringBuffer stmt


From git at git.haskell.org  Tue Dec  8 10:32:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 10:32:51 +0000 (UTC)
Subject: [commit: ghc] master: Update libffi-tarballs submodule to libffi 3.1
 (re #10238) (7a40a6c)
Message-ID: <20151208103251.DCE2F3A300@ghc.haskell.org>

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

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

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

commit 7a40a6cde92896d7de09919499c66324a2d01771
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 10:46:04 2015 +0100

    Update libffi-tarballs submodule to libffi 3.1 (re #10238)
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1589
    
    GHC Trac Issues: #10238


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

7a40a6cde92896d7de09919499c66324a2d01771
 libffi-tarballs                   |  2 +-
 libffi/ghc.mk                     |  3 ---
 libffi/libffi.x86-execstack.patch | 24 ------------------------
 3 files changed, 1 insertion(+), 28 deletions(-)

diff --git a/libffi-tarballs b/libffi-tarballs
index b6658e5..ec37a68 160000
--- a/libffi-tarballs
+++ b/libffi-tarballs
@@ -1 +1 @@
-Subproject commit b6658e5d73eb0579b3054593de21f329ab491e77
+Subproject commit ec37a68838566cb830c33cb30bfade003a306cff
diff --git a/libffi/ghc.mk b/libffi/ghc.mk
index a25dbf0..404cce9 100644
--- a/libffi/ghc.mk
+++ b/libffi/ghc.mk
@@ -63,9 +63,6 @@ $(libffi_STAMP_CONFIGURE): $(TOUCH_DEP)
 # will use cygwin symbolic links which cannot be read by mingw gcc.
 	chmod +x libffi/ln
 
-	# don't report nonselinux systems as selinux
-	( cd libffi/build && "$(PATCH_CMD)" -p0 < ../libffi.x86-execstack.patch; )
-
 	# We need to use -MMD rather than -MD, as otherwise we get paths
 	# like c:/... in the dependency files on Windows, and the extra
 	# colons break make
diff --git a/libffi/libffi.x86-execstack.patch b/libffi/libffi.x86-execstack.patch
deleted file mode 100644
index baea18f..0000000
--- a/libffi/libffi.x86-execstack.patch
+++ /dev/null
@@ -1,24 +0,0 @@
- * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so.6.0.2
- * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so
- * RWX --- --- usr/lib/ghc-7.10.1/rts/libffi.so.6
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_p.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_l.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_debug.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_debug.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_l.a:win32.o
- * !WX --- --- usr/lib/ghc-7.10.1/rts/libCffi_thr_p.a:win32.o
-
-http://bugs.gentoo.org/511634
-http://sourceware.org/ml/libffi-discuss/2014/msg00058.html
-
---- src/x86/win32.S
-+++ src/x86/win32.S
-@@ -1304,3 +1304,6 @@
- 
- #endif /* !_MSC_VER */
- 
-+#if defined __ELF__ && defined __linux__
-+	.section        .note.GNU-stack,"", at progbits
-+#endif


From git at git.haskell.org  Tue Dec  8 10:32:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 10:32:54 +0000 (UTC)
Subject: [commit: ghc] master: Rename s/7.12.1/8.0.1/ two minor occurences
 (bb753c5)
Message-ID: <20151208103254.947423A300@ghc.haskell.org>

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

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

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

commit bb753c50a1ca5dbc5c8dc28aabd2b7d40c79e729
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 11:32:48 2015 +0100

    Rename s/7.12.1/8.0.1/ two minor occurences
    
    [skip ci]


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

bb753c50a1ca5dbc5c8dc28aabd2b7d40c79e729
 libraries/template-haskell/changelog.md   | 2 +-
 utils/mkUserGuidePart/Options/Language.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/template-haskell/changelog.md b/libraries/template-haskell/changelog.md
index e4edf63..8e09a75 100644
--- a/libraries/template-haskell/changelog.md
+++ b/libraries/template-haskell/changelog.md
@@ -2,7 +2,7 @@
 
 ## 2.11.0.0  *TBA*
 
-  * Bundled with GHC 7.12.1
+  * Bundled with GHC 8.0.1
 
   * The compiler can now resolve infix operator fixities in types on its own.
     The `UInfixT` constructor of `Type` is analoguous to `UInfixE` for expressions
diff --git a/utils/mkUserGuidePart/Options/Language.hs b/utils/mkUserGuidePart/Options/Language.hs
index ab3e20f..0fc3ea5 100644
--- a/utils/mkUserGuidePart/Options/Language.hs
+++ b/utils/mkUserGuidePart/Options/Language.hs
@@ -65,7 +65,7 @@ languageOptions =
            "Enable :ref:`Applicative do-notation desugaring <applicative-do>`"
          , flagType = DynamicFlag
          , flagReverse = "-XNoApplicativeDo"
-         , flagSince = "7.12.1"
+         , flagSince = "8.0.1"
          }
   , flag { flagName = "-XAutoDeriveTypeable"
          , flagDescription =


From git at git.haskell.org  Tue Dec  8 10:45:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 10:45:56 +0000 (UTC)
Subject: [commit: ghc] master: Fix double MaybeT instance (2cfa5db)
Message-ID: <20151208104556.965CA3A300@ghc.haskell.org>

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

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

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

commit 2cfa5db47dc16caf7cb7be5aed2fbe843cd784a8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 11:45:38 2015 +0100

    Fix double MaybeT instance
    
    This is a fixup to fd3b845c01aa26b6e5cd12c00af59e5468e21b1b
    which didn't take into account 09333313f32be975faf9158fcd3648489d78ad82
    having pushed as well.


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

2cfa5db47dc16caf7cb7be5aed2fbe843cd784a8
 compiler/main/DynFlags.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index c492a01..bceb51f 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -180,7 +180,6 @@ import Control.Monad
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.Writer
 import Control.Monad.Trans.Reader
-import qualified Control.Monad.Trans.Maybe as CMT
 #if MIN_VERSION_transformers(4,0,0)
 import Control.Monad.Trans.Except
 #endif
@@ -937,9 +936,6 @@ instance (Monad m, HasDynFlags m) => HasDynFlags (ReaderT a m) where
     getDynFlags = lift getDynFlags
 
 instance (Monad m, HasDynFlags m) => HasDynFlags (MaybeT m) where
-    getDynFlags = liftMaybeT getDynFlags
-
-instance (Monad m, HasDynFlags m) => HasDynFlags (CMT.MaybeT m) where
     getDynFlags = lift getDynFlags
 
 #if MIN_VERSION_transformers(4,0,0)


From git at git.haskell.org  Tue Dec  8 13:55:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 13:55:36 +0000 (UTC)
Subject: [commit: ghc] master: Fix typo sneaked in with fd3b845c01aa26b6e5
 (2106d86)
Message-ID: <20151208135536.12C8F3A300@ghc.haskell.org>

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

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

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

commit 2106d8641a4f26fa934e092ba88b535cdad5a6fe
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 14:54:14 2015 +0100

    Fix typo sneaked in with fd3b845c01aa26b6e5


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

2106d8641a4f26fa934e092ba88b535cdad5a6fe
 compiler/main/DynFlags.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index bceb51f..7818c6b 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -180,7 +180,7 @@ import Control.Monad
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.Writer
 import Control.Monad.Trans.Reader
-#if MIN_VERSION_transformers(4,0,0)
+#if MIN_VERSION_transformers(0,4,0)
 import Control.Monad.Trans.Except
 #endif
 import Control.Exception (throwIO)
@@ -938,7 +938,7 @@ instance (Monad m, HasDynFlags m) => HasDynFlags (ReaderT a m) where
 instance (Monad m, HasDynFlags m) => HasDynFlags (MaybeT m) where
     getDynFlags = lift getDynFlags
 
-#if MIN_VERSION_transformers(4,0,0)
+#if MIN_VERSION_transformers(0,4,0)
 instance (Monad m, HasDynFlags m) => HasDynFlags (ExceptT e m) where
     getDynFlags = lift getDynFlags
 #endif


From git at git.haskell.org  Tue Dec  8 13:59:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 13:59:28 +0000 (UTC)
Subject: [commit: ghc] master: docs/glasgow_exts: Use warning admonition
 (69c3964)
Message-ID: <20151208135928.82BE23A300@ghc.haskell.org>

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

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

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

commit 69c3964a93b2b8359452799c13ab551b67e4c5a5
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 8 13:14:14 2015 +0100

    docs/glasgow_exts: Use warning admonition


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

69c3964a93b2b8359452799c13ab551b67e4c5a5
 docs/users_guide/glasgow_exts.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 4fc02f6..d313556 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -11542,8 +11542,8 @@ You can add explicit phase control (:ref:`phase-control`) to
 do so, the same phase is used for the rewrite rule and the INLINE
 control of the specialised function.
 
-Warning: you can make GHC diverge by using ``SPECIALISE INLINE`` on an
-ordinarily-recursive function.
+.. warning:: You can make GHC diverge by using ``SPECIALISE INLINE`` on an
+             ordinarily-recursive function.
 
 ``SPECIALIZE`` for imported functions
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


From git at git.haskell.org  Tue Dec  8 15:00:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 15:00:26 +0000 (UTC)
Subject: [commit: ghc] master: users_guide: Show sub-sub-sections in ToC
 (e792711)
Message-ID: <20151208150026.964DC3A300@ghc.haskell.org>

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

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

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

commit e7927110bd1c1336bb4cb17eb52cf5b6adae3902
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 8 15:59:43 2015 +0100

    users_guide: Show sub-sub-sections in ToC


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

e7927110bd1c1336bb4cb17eb52cf5b6adae3902
 docs/users_guide/index.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/index.rst b/docs/users_guide/index.rst
index 1b618d4..3f1f381 100644
--- a/docs/users_guide/index.rst
+++ b/docs/users_guide/index.rst
@@ -7,7 +7,7 @@ Welcome to the GHC Users Guide
 Contents:
 
 .. toctree::
-   :maxdepth: 2
+   :maxdepth: 3
    :numbered:
 
    license


From git at git.haskell.org  Tue Dec  8 15:05:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 15:05:14 +0000 (UTC)
Subject: [commit: ghc] master: Comments about polymorphic recursion (6c794c3)
Message-ID: <20151208150514.A56763A300@ghc.haskell.org>

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

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

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

commit 6c794c311d5312ba3f92434ee6f35040d3b69353
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 8 13:11:42 2015 +0000

    Comments about polymorphic recursion
    
    See Trac #11176


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

6c794c311d5312ba3f92434ee6f35040d3b69353
 compiler/hsSyn/HsBinds.hs     | 54 ++++++++++++++++++++++++++++++++++++-------
 compiler/typecheck/TcBinds.hs |  5 ++--
 2 files changed, 49 insertions(+), 10 deletions(-)

diff --git a/compiler/hsSyn/HsBinds.hs b/compiler/hsSyn/HsBinds.hs
index 25ce654..79206d7 100644
--- a/compiler/hsSyn/HsBinds.hs
+++ b/compiler/hsSyn/HsBinds.hs
@@ -263,7 +263,7 @@ Note [AbsBinds]
 ~~~~~~~~~~~~~~~
 The AbsBinds constructor is used in the output of the type checker, to record
 *typechecked* and *generalised* bindings.  Consider a module M, with this
-top-level binding
+top-level binding, where there is no type signature for M.reverse,
     M.reverse []     = []
     M.reverse (x:xs) = M.reverse xs ++ [x]
 
@@ -282,8 +282,8 @@ Notice that 'M.reverse' is polymorphic as expected, but there is a local
 definition for plain 'reverse' which is *monomorphic*.  The type variable
 'a' scopes over the entire letrec.
 
-That's after desugaring.  What about after type checking but before desugaring?
-That's where AbsBinds comes in.  It looks like this:
+That's after desugaring.  What about after type checking but before
+desugaring?  That's where AbsBinds comes in.  It looks like this:
 
    AbsBinds { abs_tvs     = [a]
             , abs_exports = [ABE { abe_poly = M.reverse :: forall a. [a] -> [a],
@@ -305,11 +305,11 @@ you were defining) appears in the abe_poly field of the
 abs_exports. The bindings in abs_binds are for fresh, local, Ids with
 a *monomorphic* Id.
 
-If there is a group of mutually recursive functions without type
-signatures, we get one AbsBinds with the monomorphic versions of the
-bindings in abs_binds, and one element of abe_exports for each
-variable bound in the mutually recursive group.  This is true even for
-pattern bindings.  Example:
+If there is a group of mutually recursive (see Note [Polymoprhic
+recursion]) functions without type signatures, we get one AbsBinds
+with the monomorphic versions of the bindings in abs_binds, and one
+element of abe_exports for each variable bound in the mutually
+recursive group.  This is true even for pattern bindings.  Example:
         (f,g) = (\x -> x, f)
 After type checking we get
    AbsBinds { abs_tvs     = [a]
@@ -319,6 +319,44 @@ After type checking we get
                                   , abe_mono = g :: a -> a }]
             , abs_binds = { (f,g) = (\x -> x, f) }
 
+Note [Polymoprhic recursion]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Consider
+   Rec { f x = ...(g ef)...
+
+       ; g :: forall a. [a] -> [a]
+       ; g y = ...(f eg)...  }
+
+These bindings /are/ mutually recursive (f calls g, and g calls f).
+But we can use the type signature for g to break the recursion,
+like this:
+
+  1. Add g :: forall a. [a] -> [a] to the type environment
+
+  2. Typecheck the definition of f, all by itself,
+     including generalising it to find its most general
+     type, say f :: forall b. b -> b -> [b]
+
+  3. Extend the type environment with that type for f
+
+  4. Typecheck the definition of g, all by itself,
+     checking that it has the type claimed by its signature
+
+Steps 2 and 4 each generate a separate AbsBinds, so we end
+up with
+   Rec { AbsBinds { ...for f ... }
+       ; AbsBinds { ...for g ... } }
+
+This approach allows both f and to call each other
+polymoprhically, even though only g has a signature.
+
+We get an AbsBinds that encompasses multiple source-program
+bindings only when
+ * Each binding in the group has at least one binder that
+   lacks a user type signature
+ * The group forms a strongly connected component
+
+
 Note [AbsBinds wrappers]
 ~~~~~~~~~~~~~~~~~~~~~~~~
 Consider
diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index 5c6593a..96aec1e 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -442,6 +442,7 @@ tc_group top_lvl sig_fn prag_fn (Recursive, binds) thing_inside
         -- strongly-connected-component analysis, this time omitting
         -- any references to variables with type signatures.
         -- (This used to be optional, but isn't now.)
+        -- See Note [Polymorphic recursion] in HsBinds.
     do  { traceTc "tc_group rec" (pprLHsBinds binds)
         ; when hasPatSyn $ recursivePatSynErr binds
         ; (binds1, thing) <- go sccs
@@ -502,10 +503,10 @@ tc_single top_lvl sig_fn prag_fn lbind thing_inside
        ; return (binds1, thing) }
 
 ------------------------
-mkEdges :: TcSigFun -> LHsBinds Name -> [Node BKey (LHsBind Name)]
-
 type BKey = Int -- Just number off the bindings
 
+mkEdges :: TcSigFun -> LHsBinds Name -> [Node BKey (LHsBind Name)]
+-- See Note [Polymorphic recursion] in HsBinds.
 mkEdges sig_fn binds
   = [ (bind, key, [key | n <- nameSetElems (bind_fvs (unLoc bind)),
                          Just key <- [lookupNameEnv key_map n], no_sig n ])


From git at git.haskell.org  Tue Dec  8 15:05:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 15:05:17 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (aa6ae8a)
Message-ID: <20151208150517.52FEC3A300@ghc.haskell.org>

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

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

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

commit aa6ae8a45e7216106df3f7a9bf9fbebd1affc4ff
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 7 12:48:44 2015 +0000

    Comments only


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

aa6ae8a45e7216106df3f7a9bf9fbebd1affc4ff
 compiler/basicTypes/Var.hs | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/compiler/basicTypes/Var.hs b/compiler/basicTypes/Var.hs
index 7c4ccfc..dba00d3 100644
--- a/compiler/basicTypes/Var.hs
+++ b/compiler/basicTypes/Var.hs
@@ -181,11 +181,31 @@ data IdScope    -- See Note [GlobalId/LocalId]
   = GlobalId
   | LocalId ExportFlag
 
-data ExportFlag
-  = NotExported -- ^ Not exported: may be discarded as dead code.
-  | Exported    -- ^ Exported: kept alive
+data ExportFlag   -- See Note [ExportFlag on binders]
+  = NotExported   -- ^ Not exported: may be discarded as dead code.
+  | Exported      -- ^ Exported: kept alive
+
+{- Note [ExportFlag on binders]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+An ExportFlag of "Exported" on a top-level binder says "keep this
+binding alive; do not drop it as dead code".  This transitively
+keeps alive all the other top-level bindings that this binding refers
+to.  This property is persisted all the way down the pipeline, so that
+the binding will be compiled all the way to object code, and its
+symbols will appear in the linker symbol table.
+
+However, note that this use of "exported" is quite different to the
+export list on a Haskell module.  Setting the ExportFlag on an Id does
+/not/ mean that if you import the module (in Haskell source code you
+will see this Id.  Of course, things that appear in the export list
+of the source Haskell module do indeed have their ExportFlag set.
+But many other things, such as dictionary functions, are kept alive
+by having their ExportFlag set, even though they are not exported
+in the source-code sense.
+
+We should probably use a different term for ExportFlag, like
+KeepAlive.
 
-{-
 Note [GlobalId/LocalId]
 ~~~~~~~~~~~~~~~~~~~~~~~
 A GlobalId is


From git at git.haskell.org  Tue Dec  8 15:44:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 15:44:04 +0000 (UTC)
Subject: [commit: ghc] master: An assortment of typos (d7729c7)
Message-ID: <20151208154404.8B4D13A300@ghc.haskell.org>

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

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

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

commit d7729c75c666bfeff2a70869c0613ea429202f11
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Dec 8 16:43:34 2015 +0100

    An assortment of typos


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

d7729c75c666bfeff2a70869c0613ea429202f11
 compiler/basicTypes/Var.hs                        | 2 +-
 compiler/deSugar/DsBinds.hs                       | 2 +-
 compiler/hsSyn/HsBinds.hs                         | 6 +++---
 compiler/main/HscMain.hs                          | 2 +-
 compiler/typecheck/TcRnTypes.hs                   | 2 +-
 libraries/base/System/Environment.hs              | 2 +-
 testsuite/tests/typecheck/should_compile/tc191.hs | 2 +-
 7 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/basicTypes/Var.hs b/compiler/basicTypes/Var.hs
index dba00d3..87658b5 100644
--- a/compiler/basicTypes/Var.hs
+++ b/compiler/basicTypes/Var.hs
@@ -196,7 +196,7 @@ symbols will appear in the linker symbol table.
 
 However, note that this use of "exported" is quite different to the
 export list on a Haskell module.  Setting the ExportFlag on an Id does
-/not/ mean that if you import the module (in Haskell source code you
+/not/ mean that if you import the module (in Haskell source code) you
 will see this Id.  Of course, things that appear in the export list
 of the source Haskell module do indeed have their ExportFlag set.
 But many other things, such as dictionary functions, are kept alive
diff --git a/compiler/deSugar/DsBinds.hs b/compiler/deSugar/DsBinds.hs
index 0da90f0..724da24 100644
--- a/compiler/deSugar/DsBinds.hs
+++ b/compiler/deSugar/DsBinds.hs
@@ -521,7 +521,7 @@ Here `tm` is the monomorphic binding for `rhs`.
 With `Strict`, we want to force `tm`, but NOT `fm` or `gm`.
 Alas, `tm` isn't in scope in the `in <body>` part.
 
-The simplest thing is to return it in the polymoprhic
+The simplest thing is to return it in the polymorphic
 tuple `t`, thus:
 
   let t = /\a. letrec tm = rhs[fm,gm]
diff --git a/compiler/hsSyn/HsBinds.hs b/compiler/hsSyn/HsBinds.hs
index 79206d7..cbd45d8 100644
--- a/compiler/hsSyn/HsBinds.hs
+++ b/compiler/hsSyn/HsBinds.hs
@@ -305,7 +305,7 @@ you were defining) appears in the abe_poly field of the
 abs_exports. The bindings in abs_binds are for fresh, local, Ids with
 a *monomorphic* Id.
 
-If there is a group of mutually recursive (see Note [Polymoprhic
+If there is a group of mutually recursive (see Note [Polymorphic
 recursion]) functions without type signatures, we get one AbsBinds
 with the monomorphic versions of the bindings in abs_binds, and one
 element of abe_exports for each variable bound in the mutually
@@ -319,7 +319,7 @@ After type checking we get
                                   , abe_mono = g :: a -> a }]
             , abs_binds = { (f,g) = (\x -> x, f) }
 
-Note [Polymoprhic recursion]
+Note [Polymorphic recursion]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Consider
    Rec { f x = ...(g ef)...
@@ -348,7 +348,7 @@ up with
        ; AbsBinds { ...for g ... } }
 
 This approach allows both f and to call each other
-polymoprhically, even though only g has a signature.
+polymorphically, even though only g has a signature.
 
 We get an AbsBinds that encompasses multiple source-program
 bindings only when
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 401f049..bd0fa19 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -798,7 +798,7 @@ hscFileFrontEnd mod_summary = do
 -- Note [Safe Haskell Inference]
 -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 -- Safe Haskell does Safe inference on modules that don't have any specific
--- safe haskell mode flag. The basic aproach to this is:
+-- safe haskell mode flag. The basic approach to this is:
 --   * When deciding if we need to do a Safe language check, treat
 --     an unmarked module as having -XSafe mode specified.
 --   * For checks, don't throw errors but return them to the caller.
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index 0e8f682..b5748f4 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -1142,7 +1142,7 @@ data TcIdSigInfo
 data TcIdSigBndr   -- See Note [Complete and partial type signatures]
   = CompleteSig    -- A complete signature with no wildards,
                    -- so the complete polymorphic type is known.
-        TcId          -- The polymoprhic Id with that type
+        TcId          -- The polymorphic Id with that type
 
   | PartialSig     -- A partial type signature (i.e. includes one or more
                    -- wildcards). In this case it doesn't make sense to give
diff --git a/libraries/base/System/Environment.hs b/libraries/base/System/Environment.hs
index 066329c..b3fbaf8 100644
--- a/libraries/base/System/Environment.hs
+++ b/libraries/base/System/Environment.hs
@@ -299,7 +299,7 @@ putEnv keyvalue = do
   -- IMPORTANT: Do not free `s` after calling putenv!
   --
   -- According to SUSv2, the string passed to putenv becomes part of the
-  -- enviroment.
+  -- environment.
   throwErrnoIf_ (/= 0) "putenv" (c_putenv s)
 
 foreign import ccall unsafe "putenv" c_putenv :: CString -> IO CInt
diff --git a/testsuite/tests/typecheck/should_compile/tc191.hs b/testsuite/tests/typecheck/should_compile/tc191.hs
index cf77c05..403ec88 100644
--- a/testsuite/tests/typecheck/should_compile/tc191.hs
+++ b/testsuite/tests/typecheck/should_compile/tc191.hs
@@ -19,7 +19,7 @@ geq :: Data a => a -> a -> Bool
 geq x y = geq' x y
   where
 --    This type signature no longer works, because it is
---    insufficiently polymoprhic.
+--    insufficiently polymorphic.
 --    geq' :: forall a b. (Data a, Data b) => a -> b -> Bool
     geq' :: GenericQ (GenericQ Bool)
     geq' x y =     (toConstr x == toConstr y)


From git at git.haskell.org  Tue Dec  8 16:51:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:08 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Merge remote-tracking branch
 'origin/master' into wip/T11067 (8e021c4)
Message-ID: <20151208165108.B85DD3A301@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e021c43c0eea4ca36dbc2867cdc1475cae9a36c/ghc

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

commit 8e021c43c0eea4ca36dbc2867cdc1475cae9a36c
Merge: 96eac39 741f837
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 2 14:31:35 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T11067
    
    Conflicts:
    	testsuite/tests/indexed-types/should_fail/T1897b.stderr
    	testsuite/tests/partial-sigs/should_compile/ExtraConstraints3.stderr
    	testsuite/tests/partial-sigs/should_compile/WarningWildcardInstantiations.stderr
    	testsuite/tests/partial-sigs/should_fail/InstantiatedNamedWildcardsInConstraints.stderr
    	testsuite/tests/partial-sigs/should_fail/WildcardInstantiations.stderr
    	testsuite/tests/typecheck/should_compile/T9939.stderr
    	testsuite/tests/typecheck/should_fail/CustomTypeErrors02.stderr
    	testsuite/tests/typecheck/should_fail/T8883.stderr



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8e021c43c0eea4ca36dbc2867cdc1475cae9a36c

From git at git.haskell.org  Tue Dec  8 16:51:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:04 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Wibbles to type errors (96eac39)
Message-ID: <20151208165104.98A543A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/96eac39d7e7ea5099275a4df2319bd9a31de70c7/ghc

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

commit 96eac39d7e7ea5099275a4df2319bd9a31de70c7
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 2 14:23:52 2015 +0000

    Wibbles to type errors


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

96eac39d7e7ea5099275a4df2319bd9a31de70c7
 testsuite/tests/ado/ado004.stderr                  | 10 ++--
 testsuite/tests/driver/T4437.hs                    |  4 ++
 testsuite/tests/module/mod40.stderr                | 16 +++--
 .../should_compile/ExtraConstraints1.stderr        |  6 +-
 .../should_compile/ExtraConstraints3.stderr        | 38 ++++++------
 .../WarningWildcardInstantiations.stderr           | 60 +++++++++----------
 .../InstantiatedNamedWildcardsInConstraints.stderr | 14 ++---
 .../should_fail/WildcardInstantiations.stderr      | 70 +++++++++++-----------
 testsuite/tests/polykinds/T7332.hs                 | 33 +++++++---
 testsuite/tests/typecheck/should_fail/all.T        |  4 +-
 testsuite/tests/typecheck/should_fail/tcfail216.hs |  5 +-
 .../tests/typecheck/should_fail/tcfail216.stderr   |  5 --
 testsuite/tests/typecheck/should_fail/tcfail217.hs |  4 ++
 .../tests/typecheck/should_fail/tcfail217.stderr   |  5 --
 14 files changed, 148 insertions(+), 126 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 96eac39d7e7ea5099275a4df2319bd9a31de70c7

From git at git.haskell.org  Tue Dec  8 16:51:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:11 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Change the superclass story (recursive
 superclasses) (9acb570)
Message-ID: <20151208165111.692763A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/9acb5700850af349358b8083f77efc06521f743a/ghc

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

commit 9acb5700850af349358b8083f77efc06521f743a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 7 15:56:29 2015 +0000

    Change the superclass story (recursive superclasses)
    
    In-flight


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

9acb5700850af349358b8083f77efc06521f743a
 compiler/typecheck/TcCanonical.hs | 119 ++++++++++++++++++++++++++++++++------
 compiler/typecheck/TcErrors.hs    |   2 +-
 compiler/typecheck/TcInteract.hs  |  18 +-----
 compiler/typecheck/TcSimplify.hs  |  14 +++--
 compiler/typecheck/TcType.hs      |  33 ++++++-----
 5 files changed, 133 insertions(+), 53 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9acb5700850af349358b8083f77efc06521f743a

From git at git.haskell.org  Tue Dec  8 16:51:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:14 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Merge remote-tracking branch
 'origin/master' into wip/T11067 (821c043)
Message-ID: <20151208165114.A7CDD3A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/821c043a18c38a1b9229054471efa112c642c696/ghc

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

commit 821c043a18c38a1b9229054471efa112c642c696
Merge: 9acb570 04e1c27
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 7 16:10:43 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T11067
    
    Conflicts:
    	compiler/utils/Bag.hs
    	utils/haddock



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


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 821c043a18c38a1b9229054471efa112c642c696

From git at git.haskell.org  Tue Dec  8 16:51:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:17 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Wibbles (54f42f7)
Message-ID: <20151208165117.673C73A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/54f42f77a02f492976554a81dc922d86b5127de5/ghc

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

commit 54f42f77a02f492976554a81dc922d86b5127de5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 8 16:49:22 2015 +0000

    Wibbles


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

54f42f77a02f492976554a81dc922d86b5127de5
 compiler/typecheck/TcCanonical.hs | 12 +++++++-----
 compiler/typecheck/TcSimplify.hs  | 22 +++++++++++-----------
 compiler/utils/Bag.hs             |  2 +-
 3 files changed, 19 insertions(+), 17 deletions(-)

diff --git a/compiler/typecheck/TcCanonical.hs b/compiler/typecheck/TcCanonical.hs
index 427ecfe..10e29fb 100644
--- a/compiler/typecheck/TcCanonical.hs
+++ b/compiler/typecheck/TcCanonical.hs
@@ -3,7 +3,7 @@
 module TcCanonical(
      canonicalize,
      unifyDerived,
-     makeSuperClasses, addSuperClasses,
+     makeSuperClasses, mkGivenWithSuperClasses,
      StopOrContinue(..), stopWith, continueWith
   ) where
 
@@ -360,10 +360,12 @@ Mind you, now that Wanteds cannot rewrite Derived, I think this particular
 situation can't happen.
   -}
 
-addSuperClasses :: CtEvidence -> TcS [Ct]
--- Make a Ct from this CtEvidence, but add its superclasses
--- if it's a class constraint
-addSuperClasses ev = mk_superclasses emptyNameSet ev
+mkGivenWithSuperClasses :: CtLoc -> EvId -> TcS [Ct]
+-- From a given EvId, make its Ct, plus the Ct's of its superclasses
+mkGivenWithSuperClasses loc ev_id
+  = mk_superclasses emptyNameSet (CtGiven { ctev_evar = ev_id
+                                          , ctev_pred = evVarPred ev_id
+                                          , ctev_loc  = loc })
 
 makeSuperClasses :: Ct -> TcS [Ct]
 -- Returns superclasses, transitively, see Note [The superclasses story]
diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index 2eb26f8..e14589f 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -33,7 +33,7 @@ import PrelNames
 import TcErrors
 import TcEvidence
 import TcInteract
-import TcCanonical   ( makeSuperClasses, addSuperClasses )
+import TcCanonical   ( makeSuperClasses, mkGivenWithSuperClasses )
 import TcMType   as TcM
 import TcRnMonad as TcRn
 import TcSMonad  as TcS
@@ -368,10 +368,14 @@ tcCheckSatisfiability :: Bag EvVar -> TcM Bool
 tcCheckSatisfiability givens
   = do { lcl_env <- TcRn.getLclEnv
        ; let given_loc = mkGivenLoc topTcLevel UnkSkol lcl_env
+             given_cts = [ mkNonCanonical (CtGiven { ctev_evar = ev_id
+                                                   , ctev_pred = evVarPred ev_id
+                                                   , ctev_loc  = given_loc })
+                         | ev_id <- bagToList givens ]
        ; traceTc "checkSatisfiabilty {" (ppr givens)
        ; (res, _ev_binds) <- runTcS $
-             do { cts <- solveSimpleGivens given_loc (bagToList givens)
-                ; return (not (isEmptyBag cts)) }
+             do { insols <- solveSimpleGivens given_cts
+                ; return (not (isEmptyBag insols)) }
        ; traceTc "checkSatisfiabilty }" (ppr res)
        ; return (not res) }
 
@@ -1071,7 +1075,7 @@ solveImplication :: Implication    -- Wanted
 solveImplication imp@(Implic { ic_tclvl  = tclvl
                              , ic_binds  = ev_binds
                              , ic_skols  = skols
-                             , ic_given  = givens
+                             , ic_given  = given_ids
                              , ic_wanted = wanteds
                              , ic_info   = info
                              , ic_status = status
@@ -1088,8 +1092,9 @@ solveImplication imp@(Implic { ic_tclvl  = tclvl
 
          -- Solve the nested constraints
        ; (no_given_eqs, given_insols, residual_wanted)
-             <- nestImplicTcS ev_binds tclvl $
-               do { givens_w_scs <- concatMapM (addSuperClasses . mk_given_ev) givens
+            <- nestImplicTcS ev_binds tclvl $
+               do { let loc = mkGivenLoc tclvl info env
+                  ; givens_w_scs <- concatMapM (mkGivenWithSuperClasses loc) given_ids
                   ; given_insols <- solveSimpleGivens givens_w_scs
 
                   ; residual_wanted <- solveWanteds wanteds
@@ -1121,11 +1126,6 @@ solveImplication imp@(Implic { ic_tclvl  = tclvl
              , text "implication evbinds = " <+> ppr (evBindMapBinds evbinds) ]
 
        ; return (floated_eqs, res_implic) }
-  where
-    given_loc = mkGivenLoc tclvl info env
-    mk_given_ev ev_id = CtGiven { ctev_evar = ev_id
-                                , ctev_pred = evVarPred ev_id
-                                , ctev_loc  = given_loc }
 
 ----------------------
 setImplicationStatus :: Implication -> TcS (Maybe Implication)
diff --git a/compiler/utils/Bag.hs b/compiler/utils/Bag.hs
index 357399b..d959709 100644
--- a/compiler/utils/Bag.hs
+++ b/compiler/utils/Bag.hs
@@ -20,7 +20,7 @@ module Bag (
         listToBag, bagToList, mapAccumBagL,
         foldrBagM, foldlBagM, mapBagM, mapBagM_,
         flatMapBagM, flatMapBagPairM,
-        mapAndUnzipBagM, mapAccumBagL, mapAccumBagLM
+        mapAndUnzipBagM, mapAccumBagL, mapAccumBagLM,
         mapAndUnzipBagM, mapAccumBagLM,
         anyBagM, filterBagM
     ) where


From git at git.haskell.org  Tue Dec  8 16:51:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:20 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Manually update submodules to HEAD (807dc1f)
Message-ID: <20151208165120.145283A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/807dc1fc1774271c744ab3b6a56f5e97811e3821/ghc

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

commit 807dc1fc1774271c744ab3b6a56f5e97811e3821
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 8 16:50:32 2015 +0000

    Manually update submodules to HEAD


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

807dc1fc1774271c744ab3b6a56f5e97811e3821
 libraries/unix | 2 +-
 utils/haddock  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/unix b/libraries/unix
index 137fa1b..147630c 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 137fa1b06a79a9baa0d5fcf2ec11f964c3423f6a
+Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e
diff --git a/utils/haddock b/utils/haddock
index fcd1bb7..f4ef254 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit fcd1bb7177a800f6f56a623c2468fc46a59c527b
+Subproject commit f4ef2548954bedf26674adc7a06574e718898d19


From git at git.haskell.org  Tue Dec  8 16:51:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 16:51:22 +0000 (UTC)
Subject: [commit: ghc] wip/T11067's head updated: Manually update submodules
 to HEAD (807dc1f)
Message-ID: <20151208165122.BF7F53A300@ghc.haskell.org>

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

Branch 'wip/T11067' now includes:

     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     36c1247 Remove duplicated line
     44c3e37 Fix warning about unused pattern variable
     b432e2f Make the determinism tests more robust
     1e041b7 Refactor treatment of wildcards
     218fdf9 Make the order of fixities in the iface file deterministic
     741f837 Implement more deterministic operations and document them
     96eac39 Wibbles to type errors
     8e021c4 Merge remote-tracking branch 'origin/master' into wip/T11067
     52b02e6 Comments only (isIrrefutablePat)
     b564731 Comments (TcSMonad)
     d00cdf2 Revert "ghci: Add support for prompt functions"
     1caff20 StgSyn: Remove unused SRT constructor
     c75948b Move Stg-specific code from DynFlags to SimplStg
     d4d54b4 Remove *.xml from gitignore
     a12e47b Avoid panic due to partial ieName
     8cba907 Create empty dump files when there was nothing to dump
     0d1a2d2 ErrUtils: Spruce up Haddocks
     e7929ba Update bytestring submodule
     d25f3c0 users_guide/glasgow_exts.rst: fix link markup
     8a50610 Major Overhaul of Pattern Match Checking (Fixes #595)
     43a31fe testsuite: haddock.compiler: Bump expected allocations
     a034031 extending_ghc.rst: fix broken link (Trac #10950)
     c5597bb Revert "Create empty dump files when there was nothing to dump"
     7b29b0b Fix haddock syntax
     0dd61fe Kill redundant patterns
     934b3a0 Update test output
     40fc353 Bump hoopl submodule
     ae4398d Improve performance for PM check on literals (Fixes #11160 and #11161)
     99d01e1 Remove unused import in deSugar/TmOracle.hs
     7af29da Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
     cd9f3bf RTS: Rename InCall.stat struct field to .rstat
     6ef351d On AIX we need -D_BSD defined in <Stg.h>
     d40f5b7 PmExpr: Fix CPP unacceptable too clang's CPP
     36a208f Use builtin ISO 8859-1 decoder in mkTextEncoding
     befc4e4 Check: More Clang/CPP wibbles
     e9220da Bump allocations for T783
     dc33e4c T5642 is broken
     96e67c0 T5642: Skip it entirely
     5b2b7e3 Make callToPats deterministic in SpecConstr
     1c9fd3f Case-of-empty-alts is trivial (Trac #11155)
     28035c0 Add derived constraints for wildcard signatures
     1cb3c8c Wibbles only
     822141b Make -dppr-debug show contents of (TypeError ...)
     1160dc5 Fix egregious error in eta-reduction of data families
     31b482b Minor refactoring of user type errors
     67565a7 Tidy user type errors in checkValidType
     43a5970 Comments only
     16aae60 T5642: Fix skip usage
     caa6851 testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
     d4bf863 Update peak_megabytes_allocated for T9675
     020375d Add linter to check for binaries accidentally added to repository
     901cab1 lint: Add linter to catch uses of ASSERT macro that Clang dislikes
     c865c42 StgCmmMonad: Implement Outputable instance for Sequel for debugging
     e2c518e libdw: enable support only on i386 and amd64
     81cf200 pmcheck: Comments about term equality representation
     406444b pmcheck: Comments about undecidability of literal equality
     8f28797 Fix broken linters when using python3
     c714f8f Use git.h.o copy of arcanist-external-json-linter
     a14296c Temporarily disable external-json linters
     51d08d8 Enable non-canonical Monad instance warnings for stage1/2
     314bc99 ghc.mk: cleanup: use tab consistently
     d6512c7 ghc.mk: don't run mkUserGuidePart more than once
     13ab2c6 ghc.mk: fix docs re-rebuilding
     5f1e42f Allow to compile OSMem.c when MEM_NORESERVE is not available
     df67940 Make ghc.mk compatible with pedantic /bin/sh impls
     986ceb1 Implement new `-fwarn-noncanonical-monoid-instances`
     8b42214 Tweak use of AC_USE_SYSTEM_EXTENSIONS
     be92c28 Update hoopl submodule
     f5127c8 linters/check-cpp: Don't produce debug log
     3ea4fb7 Documentation: escape characters in template-haskell Haddocks
     42a5469 Ignore generated linter.log
     3d55e41 ghc-pkg: Restore old behavior in colored version; fixes 6119
     8cef8af Re-export data family when exporting a data instance without an export list
     91e985c Minor stylistic fixes in glasgow_exts.rst
     2110037 Add isImport, isDecl, and isStmt functions to GHC API
     d4bcd05 rts: Remove space before argument list in ASSERTs
     700c42b Use TypeLits in the meta-data encoding of GHC.Generics
     51a5e68 Refactor ConDecl
     1bd40c8 Move checking for missing signatures to RnNames.reportUnusedNames
     151c4b0 ghc-pkg: don't sort packages unnecessarily
     04e1c27 rts: One more Clang-unfriendly CPP usage
     9acb570 Change the superclass story (recursive superclasses)
     821c043 Merge remote-tracking branch 'origin/master' into wip/T11067
     54f42f7 Wibbles
     807dc1f Manually update submodules to HEAD

From git at git.haskell.org  Tue Dec  8 17:24:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 17:24:27 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/D1590' created
Message-ID: <20151208172427.3785A3A300@ghc.haskell.org>

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

New branch : wip/D1590
Referencing: 83bf7b68371fd9849a91e5b2f79325a35d669ed9

From git at git.haskell.org  Tue Dec  8 17:24:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 17:24:29 +0000 (UTC)
Subject: [commit: ghc] wip/D1590: Refactor GHCi Command type;
 allow "hidden" commands (83bf7b6)
Message-ID: <20151208172429.D7BCE3A300@ghc.haskell.org>

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

On branch  : wip/D1590
Link       : http://ghc.haskell.org/trac/ghc/changeset/83bf7b68371fd9849a91e5b2f79325a35d669ed9/ghc

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

commit 83bf7b68371fd9849a91e5b2f79325a35d669ed9
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 17:10:08 2015 +0100

    Refactor GHCi Command type; allow "hidden" commands
    
    Summary:
    This transforms the 'Command' tuple into a record which is
    easier to extend.
    
    While at it, this refactoring turns the IDE `:complete` into a hidden
    command excluded from completion.
    
    The next obvious step is to add a summary text field for constructing
    the `:help` output (as well as allowing to get `:help <CMD>` for single
    commands.
    
    This is a preparatory refactoring for D1240 / #10874
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1590


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

83bf7b68371fd9849a91e5b2f79325a35d669ed9
 ghc/GhciMonad.hs     | 20 ++++++++++++++++----
 ghc/InteractiveUI.hs | 47 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index c094b08..c1abe4f 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GhciMonad.hs
@@ -14,7 +14,7 @@ module GhciMonad (
         GHCi(..), startGHCi,
         GHCiState(..), setGHCiState, getGHCiState, modifyGHCiState,
         GHCiOption(..), isOptionSet, setOption, unsetOption,
-        Command,
+        Command(..),
         BreakLocation(..),
         TickArray,
         getDynFlags,
@@ -58,9 +58,6 @@ import Control.Monad.IO.Class
 -----------------------------------------------------------------------------
 -- GHCi monad
 
--- the Bool means: True = we should exit GHCi (:quit)
-type Command = (String, String -> InputT GHCi Bool, CompletionFunc GHCi)
-
 data GHCiState = GHCiState
      {
         progname       :: String,
@@ -111,6 +108,21 @@ data GHCiState = GHCiState
 
 type TickArray = Array Int [(BreakIndex,SrcSpan)]
 
+-- | A GHCi command
+data Command
+   = Command
+   { cmdName           :: String
+     -- ^ Name of GHCi command (e.g. "exit")
+   , cmdAction         :: String -> InputT GHCi Bool
+     -- ^ The 'Bool' value denotes whether to exit GHCi
+   , cmdHidden         :: Bool
+     -- ^ Commands which are excluded from default completion
+     -- and @:help@ summary. This is usually set for commands not
+     -- useful for interactive use but rather for IDEs.
+   , cmdCompletionFunc :: CompletionFunc GHCi
+     -- ^ 'CompletionFunc' for arguments
+   }
+
 data GHCiOption
         = ShowTiming            -- show time/allocs after evaluation
         | ShowType              -- show the type of expressions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 7fd9c8b..0727d6b 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -130,13 +130,10 @@ ghciWelcomeMsg :: String
 ghciWelcomeMsg = "GHCi, version " ++ cProjectVersion ++
                  ": http://www.haskell.org/ghc/  :? for help"
 
-cmdName :: Command -> String
-cmdName (n,_,_) = n
-
 GLOBAL_VAR(macros_ref, [], [Command])
 
 ghciCommands :: [Command]
-ghciCommands = [
+ghciCommands = map mkCmd [
   -- Hugs users are accustomed to :e, so make sure it doesn't overlap
   ("?",         keepGoing help,                 noCompletion),
   ("add",       keepGoingPaths addModule,       completeFilename),
@@ -148,7 +145,6 @@ ghciCommands = [
   ("cd",        keepGoing' changeDirectory,     completeFilename),
   ("check",     keepGoing' checkModule,         completeHomeModule),
   ("continue",  keepGoing continueCmd,          noCompletion),
-  ("complete",  keepGoing completeCmd,          noCompletion),
   ("cmd",       keepGoing cmdCmd,               completeExpression),
   ("ctags",     keepGoing createCTagsWithLineNumbersCmd, completeFilename),
   ("ctags!",    keepGoing createCTagsWithRegExesCmd, completeFilename),
@@ -189,8 +185,21 @@ ghciCommands = [
   ("trace",     keepGoing traceCmd,             completeExpression),
   ("undef",     keepGoing undefineMacro,        completeMacro),
   ("unset",     keepGoing unsetOptions,         completeSetOptions)
+  ] ++ map mkCmdHidden [ -- hidden commands
+  ("complete",  keepGoing completeCmd)
   ]
-
+ where
+  mkCmd (n,a,c) = Command { cmdName = n
+                          , cmdAction = a
+                          , cmdHidden = False
+                          , cmdCompletionFunc = c
+                          }
+
+  mkCmdHidden (n,a) = Command { cmdName = n
+                              , cmdAction = a
+                              , cmdHidden = True
+                              , cmdCompletionFunc = noCompletion
+                              }
 
 -- We initialize readline (in the interactiveUI function) to use
 -- word_break_chars as the default set of completion word break characters.
@@ -1019,7 +1028,7 @@ specialCommand str = do
   maybe_cmd <- lift $ lookupCommand cmd
   htxt <- short_help <$> getGHCiState
   case maybe_cmd of
-    GotCommand (_,f,_) -> f (dropWhile isSpace rest)
+    GotCommand cmd -> (cmdAction cmd) (dropWhile isSpace rest)
     BadCommand ->
       do liftIO $ hPutStr stdout ("unknown command ':" ++ cmd ++ "'\n"
                            ++ htxt)
@@ -1049,7 +1058,10 @@ lookupCommand' :: String -> GHCi (Maybe Command)
 lookupCommand' ":" = return Nothing
 lookupCommand' str' = do
   macros    <- liftIO $ readIORef macros_ref
-  ghci_cmds <- ghci_commands `fmap` getGHCiState
+  ghci_cmds <- ghci_commands <$> getGHCiState
+
+  let ghci_cmds_nohide = filter (not . cmdHidden) ghci_cmds
+
   let (str, xcmds) = case str' of
           ':' : rest -> (rest, [])     -- "::" selects a builtin command
           _          -> (str', macros) -- otherwise include macros in lookup
@@ -1057,7 +1069,8 @@ lookupCommand' str' = do
       lookupExact  s = find $ (s ==)           . cmdName
       lookupPrefix s = find $ (s `isPrefixOf`) . cmdName
 
-      builtinPfxMatch = lookupPrefix str ghci_cmds
+      -- hidden commands can only be matched exact
+      builtinPfxMatch = lookupPrefix str ghci_cmds_nohide
 
   -- first, look for exact match (while preferring macros); then, look
   -- for first prefix match (preferring builtins), *unless* a macro
@@ -1307,8 +1320,14 @@ defineMacro overwrite s = do
         new_expr = L (getLoc expr) $ ExprWithTySig body tySig
     hv <- GHC.compileParsedExpr new_expr
 
-    liftIO (writeIORef macros_ref -- later defined macros have precedence
-            ((macro_name, lift . runMacro hv, noCompletion) : filtered))
+    let newCmd = Command { cmdName = macro_name
+                         , cmdAction = lift . runMacro hv
+                         , cmdHidden = False
+                         , cmdCompletionFunc = noCompletion
+                         }
+
+    -- later defined macros have precedence
+    liftIO $ writeIORef macros_ref (newCmd : filtered)
 
 runMacro :: GHC.HValue{-String -> IO String-} -> String -> GHCi Bool
 runMacro fun s = do
@@ -2533,14 +2552,14 @@ ghciCompleteWord line@(left,_) = case firstWord of
     lookupCompletion c = do
         maybe_cmd <- lookupCommand' c
         case maybe_cmd of
-            Just (_,_,f) -> return f
-            Nothing -> return completeFilename
+            Just cmd -> return (cmdCompletionFunc cmd)
+            Nothing  -> return completeFilename
 
 completeGhciCommand = wrapCompleter " " $ \w -> do
   macros <- liftIO $ readIORef macros_ref
   cmds   <- ghci_commands `fmap` getGHCiState
   let macro_names = map (':':) . map cmdName $ macros
-  let command_names = map (':':) . map cmdName $ cmds
+  let command_names = map (':':) . map cmdName $ filter (not . cmdHidden) cmds
   let{ candidates = case w of
       ':' : ':' : _ -> map (':':) command_names
       _ -> nub $ macro_names ++ command_names }


From git at git.haskell.org  Tue Dec  8 21:59:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 21:59:34 +0000 (UTC)
Subject: [commit: ghc] master: Refactor GHCi Command type;
 allow "hidden" commands (7997d6c)
Message-ID: <20151208215934.D644B3A300@ghc.haskell.org>

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

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

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

commit 7997d6c0f0ba4560dab799cd87850917e0df5e2f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 22:59:41 2015 +0100

    Refactor GHCi Command type; allow "hidden" commands
    
    This transforms the 'Command' tuple into a record which is
    easier to extend.
    
    While at it, this refactoring turns the IDE `:complete` into a hidden
    command excluded from completion.
    
    The next obvious step is to add a summary text field for constructing
    the `:help` output (as well as allowing to get `:help <CMD>` for single
    commands.
    
    This is a preparatory refactoring for D1240 / #10874
    
    Reviewed By: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1590


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

7997d6c0f0ba4560dab799cd87850917e0df5e2f
 ghc/GhciMonad.hs     | 20 ++++++++++++++++----
 ghc/InteractiveUI.hs | 47 +++++++++++++++++++++++++++++++++--------------
 2 files changed, 49 insertions(+), 18 deletions(-)

diff --git a/ghc/GhciMonad.hs b/ghc/GhciMonad.hs
index c094b08..c1abe4f 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GhciMonad.hs
@@ -14,7 +14,7 @@ module GhciMonad (
         GHCi(..), startGHCi,
         GHCiState(..), setGHCiState, getGHCiState, modifyGHCiState,
         GHCiOption(..), isOptionSet, setOption, unsetOption,
-        Command,
+        Command(..),
         BreakLocation(..),
         TickArray,
         getDynFlags,
@@ -58,9 +58,6 @@ import Control.Monad.IO.Class
 -----------------------------------------------------------------------------
 -- GHCi monad
 
--- the Bool means: True = we should exit GHCi (:quit)
-type Command = (String, String -> InputT GHCi Bool, CompletionFunc GHCi)
-
 data GHCiState = GHCiState
      {
         progname       :: String,
@@ -111,6 +108,21 @@ data GHCiState = GHCiState
 
 type TickArray = Array Int [(BreakIndex,SrcSpan)]
 
+-- | A GHCi command
+data Command
+   = Command
+   { cmdName           :: String
+     -- ^ Name of GHCi command (e.g. "exit")
+   , cmdAction         :: String -> InputT GHCi Bool
+     -- ^ The 'Bool' value denotes whether to exit GHCi
+   , cmdHidden         :: Bool
+     -- ^ Commands which are excluded from default completion
+     -- and @:help@ summary. This is usually set for commands not
+     -- useful for interactive use but rather for IDEs.
+   , cmdCompletionFunc :: CompletionFunc GHCi
+     -- ^ 'CompletionFunc' for arguments
+   }
+
 data GHCiOption
         = ShowTiming            -- show time/allocs after evaluation
         | ShowType              -- show the type of expressions
diff --git a/ghc/InteractiveUI.hs b/ghc/InteractiveUI.hs
index 7fd9c8b..0727d6b 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/InteractiveUI.hs
@@ -130,13 +130,10 @@ ghciWelcomeMsg :: String
 ghciWelcomeMsg = "GHCi, version " ++ cProjectVersion ++
                  ": http://www.haskell.org/ghc/  :? for help"
 
-cmdName :: Command -> String
-cmdName (n,_,_) = n
-
 GLOBAL_VAR(macros_ref, [], [Command])
 
 ghciCommands :: [Command]
-ghciCommands = [
+ghciCommands = map mkCmd [
   -- Hugs users are accustomed to :e, so make sure it doesn't overlap
   ("?",         keepGoing help,                 noCompletion),
   ("add",       keepGoingPaths addModule,       completeFilename),
@@ -148,7 +145,6 @@ ghciCommands = [
   ("cd",        keepGoing' changeDirectory,     completeFilename),
   ("check",     keepGoing' checkModule,         completeHomeModule),
   ("continue",  keepGoing continueCmd,          noCompletion),
-  ("complete",  keepGoing completeCmd,          noCompletion),
   ("cmd",       keepGoing cmdCmd,               completeExpression),
   ("ctags",     keepGoing createCTagsWithLineNumbersCmd, completeFilename),
   ("ctags!",    keepGoing createCTagsWithRegExesCmd, completeFilename),
@@ -189,8 +185,21 @@ ghciCommands = [
   ("trace",     keepGoing traceCmd,             completeExpression),
   ("undef",     keepGoing undefineMacro,        completeMacro),
   ("unset",     keepGoing unsetOptions,         completeSetOptions)
+  ] ++ map mkCmdHidden [ -- hidden commands
+  ("complete",  keepGoing completeCmd)
   ]
-
+ where
+  mkCmd (n,a,c) = Command { cmdName = n
+                          , cmdAction = a
+                          , cmdHidden = False
+                          , cmdCompletionFunc = c
+                          }
+
+  mkCmdHidden (n,a) = Command { cmdName = n
+                              , cmdAction = a
+                              , cmdHidden = True
+                              , cmdCompletionFunc = noCompletion
+                              }
 
 -- We initialize readline (in the interactiveUI function) to use
 -- word_break_chars as the default set of completion word break characters.
@@ -1019,7 +1028,7 @@ specialCommand str = do
   maybe_cmd <- lift $ lookupCommand cmd
   htxt <- short_help <$> getGHCiState
   case maybe_cmd of
-    GotCommand (_,f,_) -> f (dropWhile isSpace rest)
+    GotCommand cmd -> (cmdAction cmd) (dropWhile isSpace rest)
     BadCommand ->
       do liftIO $ hPutStr stdout ("unknown command ':" ++ cmd ++ "'\n"
                            ++ htxt)
@@ -1049,7 +1058,10 @@ lookupCommand' :: String -> GHCi (Maybe Command)
 lookupCommand' ":" = return Nothing
 lookupCommand' str' = do
   macros    <- liftIO $ readIORef macros_ref
-  ghci_cmds <- ghci_commands `fmap` getGHCiState
+  ghci_cmds <- ghci_commands <$> getGHCiState
+
+  let ghci_cmds_nohide = filter (not . cmdHidden) ghci_cmds
+
   let (str, xcmds) = case str' of
           ':' : rest -> (rest, [])     -- "::" selects a builtin command
           _          -> (str', macros) -- otherwise include macros in lookup
@@ -1057,7 +1069,8 @@ lookupCommand' str' = do
       lookupExact  s = find $ (s ==)           . cmdName
       lookupPrefix s = find $ (s `isPrefixOf`) . cmdName
 
-      builtinPfxMatch = lookupPrefix str ghci_cmds
+      -- hidden commands can only be matched exact
+      builtinPfxMatch = lookupPrefix str ghci_cmds_nohide
 
   -- first, look for exact match (while preferring macros); then, look
   -- for first prefix match (preferring builtins), *unless* a macro
@@ -1307,8 +1320,14 @@ defineMacro overwrite s = do
         new_expr = L (getLoc expr) $ ExprWithTySig body tySig
     hv <- GHC.compileParsedExpr new_expr
 
-    liftIO (writeIORef macros_ref -- later defined macros have precedence
-            ((macro_name, lift . runMacro hv, noCompletion) : filtered))
+    let newCmd = Command { cmdName = macro_name
+                         , cmdAction = lift . runMacro hv
+                         , cmdHidden = False
+                         , cmdCompletionFunc = noCompletion
+                         }
+
+    -- later defined macros have precedence
+    liftIO $ writeIORef macros_ref (newCmd : filtered)
 
 runMacro :: GHC.HValue{-String -> IO String-} -> String -> GHCi Bool
 runMacro fun s = do
@@ -2533,14 +2552,14 @@ ghciCompleteWord line@(left,_) = case firstWord of
     lookupCompletion c = do
         maybe_cmd <- lookupCommand' c
         case maybe_cmd of
-            Just (_,_,f) -> return f
-            Nothing -> return completeFilename
+            Just cmd -> return (cmdCompletionFunc cmd)
+            Nothing  -> return completeFilename
 
 completeGhciCommand = wrapCompleter " " $ \w -> do
   macros <- liftIO $ readIORef macros_ref
   cmds   <- ghci_commands `fmap` getGHCiState
   let macro_names = map (':':) . map cmdName $ macros
-  let command_names = map (':':) . map cmdName $ cmds
+  let command_names = map (':':) . map cmdName $ filter (not . cmdHidden) cmds
   let{ candidates = case w of
       ':' : ':' : _ -> map (':':) command_names
       _ -> nub $ macro_names ++ command_names }


From git at git.haskell.org  Tue Dec  8 22:00:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 22:00:16 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/D1590' deleted
Message-ID: <20151208220016.5018F3A300@ghc.haskell.org>

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

Deleted branch: wip/D1590

From git at git.haskell.org  Tue Dec  8 22:01:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue,  8 Dec 2015 22:01:14 +0000 (UTC)
Subject: [commit: ghc] master: Add missing whitespace in toArgs' error msg
 (31bddc4)
Message-ID: <20151208220114.A46313A300@ghc.haskell.org>

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

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

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

commit 31bddc42c24726a82e221c68df043703caeb42f4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 8 23:01:35 2015 +0100

    Add missing whitespace in toArgs' error msg
    
    Differential Revision: https://phabricator.haskell.org/D1591


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

31bddc42c24726a82e221c68df043703caeb42f4
 compiler/utils/Util.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/utils/Util.hs b/compiler/utils/Util.hs
index 406ee9c..d3830c3 100644
--- a/compiler/utils/Util.hs
+++ b/compiler/utils/Util.hs
@@ -868,7 +868,7 @@ toArgs str
                     | all isSpace spaces ->
                        Right args
                    _ ->
-                       Left ("Couldn't read " ++ show str ++ "as [String]")
+                       Left ("Couldn't read " ++ show str ++ " as [String]")
       s -> toArgs' s
  where
   toArgs' :: String -> Either String [String]
@@ -899,7 +899,7 @@ toArgs str
                     | all isSpace (take 1 rest) ->
                     Right (arg, rest)
                 _ ->
-                    Left ("Couldn't read " ++ show s ++ "as String")
+                    Left ("Couldn't read " ++ show s ++ " as String")
 {-
 -- -----------------------------------------------------------------------------
 -- Floats


From git at git.haskell.org  Wed Dec  9 09:14:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 09:14:24 +0000 (UTC)
Subject: [commit: ghc] master: Fix DeriveAnyClass (Trac #9968) (af77089)
Message-ID: <20151209091424.AF2823A300@ghc.haskell.org>

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

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

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

commit af77089b08b60c00128f0e5a65d18211ea62dfee
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 9 09:07:46 2015 +0000

    Fix DeriveAnyClass (Trac #9968)
    
    The main issue concerned things like
    
       data T a = MkT a deriving( C Int )
    
    which is supposed to generate
    
       instance C Int (T a) where {}
    
    But the 'Int' argument (called cls_tys in the code) wasn't
    even being passed to inferConstraints and mk_data_eqn, so it
    really had no chance.   DeriveAnyClass came along after this
    code was written!
    
    Anyway I did quite a bit of tidying up in inferConstraints.
    
    Also I discovered that this case was not covered at all
    
       data T a b = MkT a b deriving( Bifunctor )
    
    What constraints should we generate for the instance context?
    We can deal with classes whose last arg has kind *, like Eq, Ord;
    or (* -> *), like Functor, Traversable.  But we really don't have
    a story for classes whose last arg has kind (* -> * -> *).
    
    So I augmented checkSideConditions to check for that and give
    a sensible error message.
    
    ToDo: update the user manual.


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

af77089b08b60c00128f0e5a65d18211ea62dfee
 compiler/typecheck/TcDeriv.hs                      | 350 ++++++++++++---------
 compiler/typecheck/TcGenDeriv.hs                   |  15 +-
 testsuite/tests/deriving/should_compile/T9968.hs   |   7 +
 testsuite/tests/deriving/should_compile/all.T      |   1 +
 testsuite/tests/deriving/should_fail/T9968a.hs     |   8 +
 testsuite/tests/deriving/should_fail/T9968a.stderr |   6 +
 testsuite/tests/deriving/should_fail/all.T         |   2 +
 7 files changed, 232 insertions(+), 157 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc af77089b08b60c00128f0e5a65d18211ea62dfee

From git at git.haskell.org  Wed Dec  9 09:14:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 09:14:27 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (e9ea020)
Message-ID: <20151209091427.5821C3A300@ghc.haskell.org>

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

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

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

commit e9ea02092a748a72f8481b10f29464fe26658fb5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 9 09:08:47 2015 +0000

    Comments only


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

e9ea02092a748a72f8481b10f29464fe26658fb5
 compiler/types/FamInstEnv.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/compiler/types/FamInstEnv.hs b/compiler/types/FamInstEnv.hs
index 8fde8c5..a60b1c2 100644
--- a/compiler/types/FamInstEnv.hs
+++ b/compiler/types/FamInstEnv.hs
@@ -345,9 +345,8 @@ Then we get a data type for each instance, and an axiom:
    axiom ax7   :: T Int ~ TInt   -- Eta-reduced
    axiom ax8 a :: T Bool [a] ~ TBoolList a
 
-These two axioms for T, one with one pattern, one with two.  The reason
-for this eta-reduction is decribed in TcInstDcls
-   Note [Eta reduction for data family axioms]
+These two axioms for T, one with one pattern, one with two;
+see Note [Eta reduction for data families]
 -}
 
 type FamInstEnv = UniqFM FamilyInstEnv  -- Maps a family to its instances
@@ -967,8 +966,8 @@ We handle data families and type families separately here:
 
  * For data family instances, though, we need to re-split for each
    instance, because the breakdown might be different for each
-   instance.  Why?  Because of eta reduction; see Note [Eta reduction
-   for data family axioms] in TcInstDcls.
+   instance.  Why?  Because of eta reduction; see
+   Note [Eta reduction for data families].
 -}
 
 -- checks if one LHS is dominated by a list of other branches


From git at git.haskell.org  Wed Dec  9 12:40:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 12:40:16 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: A few documentation fixes after 7.10.3 tag
 was cut (9b50b5a)
Message-ID: <20151209124016.E27DA3A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/9b50b5a5da4325e703210b2de2d816debe4c8a64/ghc

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

commit 9b50b5a5da4325e703210b2de2d816debe4c8a64
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 8 19:47:57 2015 +0100

    A few documentation fixes after 7.10.3 tag was cut
    
    Unfortunately there were a few issues with the documentation in the
    tagged 7.10.3 release. This fixes these. These changes will be in a
    7.10.3a release which will serve as the primary source release for
    7.10.3.


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

9b50b5a5da4325e703210b2de2d816debe4c8a64
 ANNOUNCE                       | 4 ++--
 docs/users_guide/intro.xml     | 1 +
 docs/users_guide/ug-ent.xml.in | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/ANNOUNCE b/ANNOUNCE
index 7812eba..0018b37 100644
--- a/ANNOUNCE
+++ b/ANNOUNCE
@@ -1,6 +1,6 @@
 
    ==============================================================
-    The (Interactive) Glasgow Haskell Compiler -- version 7.10.2
+    The (Interactive) Glasgow Haskell Compiler -- version 7.10.3
    ==============================================================
 
 The GHC Team is pleased to announce a new minor release of GHC. This is a
@@ -29,7 +29,7 @@ bug-fix release and contains a number of important fixes,
 A more thorough list of the changes in the release can be found in the release
 notes,
 
-  http://haskell.org/ghc/docs/7.10.2/html/users_guide/release-7-10-2.html
+  http://haskell.org/ghc/docs/7.10.3/html/users_guide/release-7-10-3.html
 
 
 How to get it
diff --git a/docs/users_guide/intro.xml b/docs/users_guide/intro.xml
index 3292334..fb7116e 100644
--- a/docs/users_guide/intro.xml
+++ b/docs/users_guide/intro.xml
@@ -309,6 +309,7 @@
 
 &relnotes1;
 &relnotes2;
+&relnotes3;
 
 </chapter>
 
diff --git a/docs/users_guide/ug-ent.xml.in b/docs/users_guide/ug-ent.xml.in
index b696aad..3629e93 100644
--- a/docs/users_guide/ug-ent.xml.in
+++ b/docs/users_guide/ug-ent.xml.in
@@ -5,6 +5,7 @@
 <!ENTITY intro          SYSTEM "intro.xml" >
 <!ENTITY relnotes1      SYSTEM "7.10.1-notes.xml" >
 <!ENTITY relnotes2      SYSTEM "7.10.2-notes.xml" >
+<!ENTITY relnotes3      SYSTEM "7.10.3-notes.xml" >
 <!ENTITY using          SYSTEM "using.xml" >
 <!ENTITY code-gens      SYSTEM "codegens.xml" >
 <!ENTITY runtime        SYSTEM "runtime_control.xml" >


From git at git.haskell.org  Wed Dec  9 12:40:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 12:40:19 +0000 (UTC)
Subject: [commit: ghc] ghc-7.10: Release notes: Fix more incorrectness
 (072c5c9)
Message-ID: <20151209124019.842BA3A300@ghc.haskell.org>

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/072c5c9648b9f48b26100b0e433611ebd12b3947/ghc

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

commit 072c5c9648b9f48b26100b0e433611ebd12b3947
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 9 13:40:12 2015 +0100

    Release notes: Fix more incorrectness
    
    Cabal fix was merged.


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

072c5c9648b9f48b26100b0e433611ebd12b3947
 docs/users_guide/7.10.3-notes.xml | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/docs/users_guide/7.10.3-notes.xml b/docs/users_guide/7.10.3-notes.xml
index 120299a..90464a3 100644
--- a/docs/users_guide/7.10.3-notes.xml
+++ b/docs/users_guide/7.10.3-notes.xml
@@ -117,7 +117,7 @@
 
       <listitem>
         <para>
-          The template Haskell <literal>getQ</literal> and
+          The Template Haskell <literal>getQ</literal> and
           <literal>putQ</literal> functions are fixed (having been broken since GHC
           7.10.1, (<ulink href="https://ghc.haskell.org/trac/ghc/ticket/10596">Trac
           #10596</ulink>).
@@ -156,14 +156,6 @@
     <itemizedlist>
       <listitem>
         <para>
-          At the time of release there is a <ulink
-          href="https://github.com/haskell/cabal/commit/1c1228a808b55331ac1db6d71fd2f8533f5fc57e">fix</ulink>
-          in the <literal>Cabal</literal> upstream respository, although it is not yet
-          present in a release.
-        </para>
-      </listitem>
-      <listitem>
-        <para>
           Unfortunately the fix for
           <ulink href="https://ghc.haskell.org/trac/ghc/ticket/10375">Trac #10375</ulink>
           required that support for the ARM Thumb instruction set be disabled.


From git at git.haskell.org  Wed Dec  9 13:42:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 13:42:46 +0000 (UTC)
Subject: [commit: ghc] master: Improve documentation for DeriveAnyClass
 (8317893)
Message-ID: <20151209134246.41A263A300@ghc.haskell.org>

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

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

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

commit 83178931aa7e244b7c37860d03e2ab4a29d6a34e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 9 13:42:58 2015 +0000

    Improve documentation for DeriveAnyClass
    
    c.f. Trac #9968


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

83178931aa7e244b7c37860d03e2ab4a29d6a34e
 docs/users_guide/glasgow_exts.rst | 60 +++++++++++++++++++++++++++++++++------
 1 file changed, 51 insertions(+), 9 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index d313556..51ac12a 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -4489,13 +4489,12 @@ Deriving any other class
 ------------------------
 
 With ``-XDeriveAnyClass`` you can derive any other class. The compiler
-will simply generate an empty instance. The instance context will be
-generated according to the same rules used when deriving ``Eq``. This is
+will simply generate an instance declaration with no explicitly-defined
+mathods.
+This is
 mostly useful in classes whose `minimal set <#minimal-pragma>`__ is
 empty, and especially when writing
-`generic functions <#generic-programming>`__. In case you try to derive some
-class on a newtype, and ``-XGeneralizedNewtypeDeriving`` is also on,
-``-XDeriveAnyClass`` takes precedence.
+`generic functions <#generic-programming>`__. 
 
 As an example, consider a simple pretty-printer class ``SPretty``, which outputs
 pretty strings: ::
@@ -4522,8 +4521,47 @@ That is, an ``SPretty Foo`` instance will be created with empty implementations
 for all methods. Since we are using ``-XDefaultSignatures`` in this example, a
 default implementation of ``sPpr`` is filled in automatically.
 
-Similarly, ``-XDeriveAnyClass`` can be used to fill in default instances for
-associated type families: ::
+Note the following details
+
+- In case you try to derive some
+  class on a newtype, and ``-XGeneralizedNewtypeDeriving`` is also on,
+  ``-XDeriveAnyClass`` takes precedence.
+
+- ``-XDeriveAnyClass`` is allowed only when the last argument of the class
+  has kind ``*`` or ``(* -> *)``.  So this is not allowed: ::
+
+    data T a b = MkT a b deriving( Bifunctor )
+
+  because the last argument of ``Bifunctor :: (* -> * -> *) -> Constraint``
+  has the wrong kind.
+
+- The instance context will be generated according to the same rules
+  used when deriving ``Eq`` (if the kind of the type is ``*``), or
+  the rules for ``Functor`` (if the kind of the type is ``(* -> *)``).
+  For example ::
+
+    instance C a => C (a,b) where ...
+
+    data T a b = MkT a (a,b) deriving( C )
+
+  The ``deriving`` clause will generate ::
+
+    instance C a => C (T a b) where {}
+
+  The constraints `C a` and `C (a,b)` are generated from the data
+  constructor arguments, but the latter simplifies to `C a`.
+
+- ``-XDeriveAnyClass`` can be used with partially applied classes,
+  such as ::
+
+    data T a = MKT a deriving( D Int )
+
+  which generates ::
+
+    instance D Int a => D Int (T a) where {}
+
+- ``-XDeriveAnyClass`` can be used to fill in default instances for
+  associated type families: ::
 
     {-# LANGUAGE DeriveAnyClass, TypeFamilies #-}
 
@@ -4536,8 +4574,12 @@ associated type families: ::
     doubleBarSize :: Size Bar -> Size Bar
     doubleBarSize s = 2*s
 
-Since ``-XDeriveAnyClass`` does not generate an instance definition for ``Size
-Bar``, it will default to ``Int``.
+  The ``deriving( Sizable )`` is equivalent to saying ::
+
+    instance Sizeable Bar where {}
+
+  and then the normal rules for filling in associated types from the
+  default will apply, making ``Size Bar`` equal to ``Int``.
 
 .. _type-class-extensions:
 


From git at git.haskell.org  Wed Dec  9 15:28:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 15:28:54 +0000 (UTC)
Subject: [commit: ghc] master: More typos in comments/docs (688069c)
Message-ID: <20151209152854.B91C63A300@ghc.haskell.org>

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

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

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

commit 688069ca83e949b9bde9883af7df26114e2f9bc0
Author: Gabor Greif <ggreif at gmail.com>
Date:   Wed Dec 9 16:15:07 2015 +0100

    More typos in comments/docs


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

688069ca83e949b9bde9883af7df26114e2f9bc0
 compiler/basicTypes/DataCon.hs                         | 2 +-
 compiler/hsSyn/HsExpr.hs                               | 2 +-
 compiler/main/GhcMake.hs                               | 2 +-
 compiler/typecheck/TcBinds.hs                          | 6 +++---
 compiler/typecheck/TcDeriv.hs                          | 2 +-
 compiler/typecheck/TcForeign.hs                        | 2 +-
 compiler/typecheck/TcSMonad.hs                         | 2 +-
 compiler/types/Type.hs                                 | 2 +-
 docs/users_guide/glasgow_exts.rst                      | 2 +-
 libraries/base/GHC/IO/Encoding/Types.hs                | 2 +-
 testsuite/tests/safeHaskell/check/all.T                | 4 ++--
 testsuite/tests/typecheck/should_compile/T9708.hs      | 2 +-
 testsuite/tests/typecheck/should_fail/ContextStack2.hs | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 688069ca83e949b9bde9883af7df26114e2f9bc0

From git at git.haskell.org  Wed Dec  9 16:14:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 16:14:00 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Manually update terminfo and containers to
 HEAD (7d755ad)
Message-ID: <20151209161400.3ABD43A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d755adaf1b7715d7f656d1effec73c75291f31a/ghc

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

commit 7d755adaf1b7715d7f656d1effec73c75291f31a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 8 17:09:56 2015 +0000

    Manually update terminfo and containers to HEAD
    
    ...and transformers


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

7d755adaf1b7715d7f656d1effec73c75291f31a
 libraries/containers   | 2 +-
 libraries/terminfo     | 2 +-
 libraries/transformers | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index 924fafe..6405653 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 924fafe1030301ee1d62d7acd576e86b50251157
+Subproject commit 6405653480afa675eec804616547b8625244bc7c
diff --git a/libraries/terminfo b/libraries/terminfo
index 68e88c4..15ca1cb 160000
--- a/libraries/terminfo
+++ b/libraries/terminfo
@@ -1 +1 @@
-Subproject commit 68e88c453237763084f5032d133ee7347980f8b2
+Subproject commit 15ca1cb3b1e1b0d410544abd69e7ffcf727fc970
diff --git a/libraries/transformers b/libraries/transformers
index 5ccb747..34fba39 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 5ccb747e67d579e3f212fd3526469c35282e532e
+Subproject commit 34fba39b1279936a739ca8857e9592cc9a44c34e


From git at git.haskell.org  Wed Dec  9 16:14:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 16:14:03 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Implement recursive superclasses (643397a)
Message-ID: <20151209161403.627123A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/643397a09f6e08a97dc104db3b1fd3cb8fa06770/ghc

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

commit 643397a09f6e08a97dc104db3b1fd3cb8fa06770
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 9 16:13:36 2015 +0000

    Implement recursive superclasses
    
    This finishes it up except for docs


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

643397a09f6e08a97dc104db3b1fd3cb8fa06770
 compiler/typecheck/TcCanonical.hs                  |  82 +++++++++-------
 compiler/typecheck/TcErrors.hs                     |  82 +++++++++++-----
 compiler/typecheck/TcRnTypes.hs                    |  10 +-
 compiler/typecheck/TcSimplify.hs                   |   5 +-
 compiler/typecheck/TcTyClsDecls.hs                 |  12 ---
 compiler/typecheck/TcTyDecls.hs                    |  24 +++--
 compiler/typecheck/TcType.hs                       |  29 +++++-
 compiler/utils/Bag.hs                              |   1 -
 testsuite/tests/driver/T4437.hs                    |   2 +-
 .../tests/indexed-types/should_compile/T11067.hs   |  35 +++++++
 .../indexed-types/should_compile/T3208b.stderr     |  10 --
 testsuite/tests/indexed-types/should_compile/all.T |   1 +
 .../tests/indexed-types/should_fail/T1897b.stderr  |  22 ++---
 .../tests/indexed-types/should_fail/T3330a.stderr  |  18 ----
 .../tests/indexed-types/should_fail/T4174.stderr   |  16 ----
 .../tests/indexed-types/should_fail/T8227.stderr   |  35 +++----
 .../tests/indexed-types/should_fail/T9662.stderr   |  80 +++-------------
 testsuite/tests/module/mod40.stderr                |   2 +
 .../should_compile/ExtraConstraints3.stderr        |  14 +--
 .../WarningWildcardInstantiations.stderr           |   3 +-
 .../InstantiatedNamedWildcardsInConstraints.stderr |   2 +-
 .../should_fail/WildcardInstantiations.stderr      |   3 +-
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   1 +
 .../tests/pmcheck/should_compile/T3927b.stderr     |   7 +-
 testsuite/tests/polykinds/T7332.hs                 |   3 +-
 .../tests/simplCore/should_compile/T4398.stderr    |  18 +++-
 testsuite/tests/typecheck/should_compile/T11067.hs |  33 +++++++
 .../tests/typecheck/should_compile/T9834.stderr    | 105 ++++++++-------------
 .../tests/typecheck/should_compile/T9939.stderr    |  13 ++-
 testsuite/tests/typecheck/should_fail/T2714.stderr |  35 +++----
 testsuite/tests/typecheck/should_fail/T7869.stderr |  43 +++------
 testsuite/tests/typecheck/should_fail/T8883.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T9415.stderr |   2 +
 testsuite/tests/typecheck/should_fail/T9739.stderr |   2 +
 .../tests/typecheck/should_fail/tcfail027.stderr   |   2 +
 35 files changed, 378 insertions(+), 376 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 643397a09f6e08a97dc104db3b1fd3cb8fa06770

From git at git.haskell.org  Wed Dec  9 17:40:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed,  9 Dec 2015 17:40:07 +0000 (UTC)
Subject: [commit: ghc] wip/T11067: Documentation (b6a71da)
Message-ID: <20151209174007.26F623A300@ghc.haskell.org>

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

On branch  : wip/T11067
Link       : http://ghc.haskell.org/trac/ghc/changeset/b6a71da37ad783bccee2739593b9692aa94a078d/ghc

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

commit b6a71da37ad783bccee2739593b9692aa94a078d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 9 17:38:41 2015 +0000

    Documentation


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

b6a71da37ad783bccee2739593b9692aa94a078d
 docs/users_guide/glasgow_exts.rst | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 4fc02f6..54f4c94 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -5873,6 +5873,43 @@ to subsume the ``OverloadedStrings`` extension (currently, as a special
 case, string literals benefit from statically allocated compact
 representation).
 
+Recursive superclasses
+----------------------
+
+A class cannot generally have itself as a superclass. So this is illegal ::
+
+    class C a => D a where ...
+    class D a => C a where ...
+
+GHC implements this test conservatively when type functions are involved.
+For example ::
+
+    type family F a :: Constraint
+    class F a => C a where ...
+
+GHC will complain about this, because you might later add ::
+
+    type instance F Int = C Int
+
+and now we'd be in a superclass loop.
+
+However recursive superclasses are sometimes useful. Here's a real-life
+example (Trac #10318) ::
+
+     class (Frac (Frac a) ~ Frac a,
+            Fractional (Frac a),
+            IntegralDomain (Frac a))
+         => IntegralDomain a where
+      type Frac a :: *
+
+Here the superclass cycle does terminate but it's not entirely straightforward
+to see that it does.
+
+With the language extension ``-XRecursiveSuperClasses`` GHC will allow these
+class declarations.  If there really *is* a loop, GHC will only
+expand it to finite depth.
+
+
 .. _type-families:
 
 Type families


From git at git.haskell.org  Thu Dec 10 10:16:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 10 Dec 2015 10:16:01 +0000 (UTC)
Subject: [commit: ghc] master: Test Trac #11192 (602889a)
Message-ID: <20151210101601.C69403A300@ghc.haskell.org>

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

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

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

commit 602889aa23daecc21caaecb99ae8b055bca191f6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 10 10:15:16 2015 +0000

    Test Trac #11192


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

602889aa23daecc21caaecb99ae8b055bca191f6
 .../tests/partial-sigs/should_compile/T11192.hs    | 15 ++++++++
 .../partial-sigs/should_compile/T11192.stderr      | 44 ++++++++++++++++++++++
 testsuite/tests/partial-sigs/should_compile/all.T  |  1 +
 3 files changed, 60 insertions(+)

diff --git a/testsuite/tests/partial-sigs/should_compile/T11192.hs b/testsuite/tests/partial-sigs/should_compile/T11192.hs
new file mode 100644
index 0000000..fb27a35
--- /dev/null
+++ b/testsuite/tests/partial-sigs/should_compile/T11192.hs
@@ -0,0 +1,15 @@
+{-# LANGUAGE PartialTypeSignatures #-}
+
+module T11192 where
+
+fails :: a
+fails =
+   let go :: _
+       go 0 a = a
+   in go (0 :: Int) undefined
+
+succeeds :: a
+succeeds =
+   let go :: _
+       go _ a = a
+   in go (0 :: Int) undefined
diff --git a/testsuite/tests/partial-sigs/should_compile/T11192.stderr b/testsuite/tests/partial-sigs/should_compile/T11192.stderr
new file mode 100644
index 0000000..2fac5eb
--- /dev/null
+++ b/testsuite/tests/partial-sigs/should_compile/T11192.stderr
@@ -0,0 +1,44 @@
+
+T11192.hs:7:14: warning:
+    ? Found type wildcard ?_? standing for ?Int -> t -> t?
+      Where: ?t? is a rigid type variable bound by
+               the inferred type of go :: Int -> t -> t at T11192.hs:8:8
+    ? In the type signature:
+        go :: _
+      In the expression:
+        let
+          go :: _
+          go 0 a = a
+        in go (0 :: Int) undefined
+      In an equation for ?fails?:
+          fails
+            = let
+                go :: _
+                go 0 a = a
+              in go (0 :: Int) undefined
+    ? Relevant bindings include
+        go :: Int -> t -> t (bound at T11192.hs:8:8)
+        fails :: a (bound at T11192.hs:6:1)
+
+T11192.hs:13:14: warning:
+    ? Found type wildcard ?_? standing for ?t -> t1 -> t1?
+      Where: ?t? is a rigid type variable bound by
+               the inferred type of go :: t -> t1 -> t1 at T11192.hs:14:8
+             ?t1? is a rigid type variable bound by
+               the inferred type of go :: t -> t1 -> t1 at T11192.hs:14:8
+    ? In the type signature:
+        go :: _
+      In the expression:
+        let
+          go :: _
+          go _ a = a
+        in go (0 :: Int) undefined
+      In an equation for ?succeeds?:
+          succeeds
+            = let
+                go :: _
+                go _ a = a
+              in go (0 :: Int) undefined
+    ? Relevant bindings include
+        go :: t -> t1 -> t1 (bound at T11192.hs:14:8)
+        succeeds :: a (bound at T11192.hs:12:1)
diff --git a/testsuite/tests/partial-sigs/should_compile/all.T b/testsuite/tests/partial-sigs/should_compile/all.T
index 5567ef1..caa8934 100644
--- a/testsuite/tests/partial-sigs/should_compile/all.T
+++ b/testsuite/tests/partial-sigs/should_compile/all.T
@@ -58,3 +58,4 @@ test('T10519', normal, compile, [''])
 test('T10463', normal, compile, [''])
 test('ExprSigLocal', normal, compile, [''])
 test('T11016', normal, compile, [''])
+test('T11192', normal, compile, [''])


From git at git.haskell.org  Thu Dec 10 10:54:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 10 Dec 2015 10:54:54 +0000 (UTC)
Subject: [commit: ghc] master: Test Trac #11187 (f4f00c0)
Message-ID: <20151210105454.35D7A3A300@ghc.haskell.org>

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

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

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

commit f4f00c0f28f3c21eb6f1396f48058c430c4e9b30
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 10 10:55:10 2015 +0000

    Test Trac #11187


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

f4f00c0f28f3c21eb6f1396f48058c430c4e9b30
 testsuite/tests/indexed-types/should_compile/T11187.hs | 18 ++++++++++++++++++
 testsuite/tests/indexed-types/should_compile/all.T     |  1 +
 2 files changed, 19 insertions(+)

diff --git a/testsuite/tests/indexed-types/should_compile/T11187.hs b/testsuite/tests/indexed-types/should_compile/T11187.hs
new file mode 100644
index 0000000..4f636a6
--- /dev/null
+++ b/testsuite/tests/indexed-types/should_compile/T11187.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE TypeFamilies #-}
+{-# OPTIONS_GHC -fno-warn-redundant-constraints #-}
+
+module T11187 where
+import Data.Type.Coercion
+
+type family X
+
+coercionXX :: Coercion X X
+coercionXX = Coercion
+
+coercionXX1 :: Coercion X X
+coercionXX1 = c where
+  c :: x ~ X => Coercion x x
+  c = Coercion
+
+coercionXX2 :: Coercion X X
+coercionXX2 = c where c = Coercion
diff --git a/testsuite/tests/indexed-types/should_compile/all.T b/testsuite/tests/indexed-types/should_compile/all.T
index 39b8a3a..5de25bf 100644
--- a/testsuite/tests/indexed-types/should_compile/all.T
+++ b/testsuite/tests/indexed-types/should_compile/all.T
@@ -265,3 +265,4 @@ test('T10753', normal, compile, [''])
 test('T10806', normal, compile_fail, [''])
 test('T10815', normal, compile, [''])
 test('T10931', normal, compile, [''])
+test('T11187', normal, compile, [''])


From git at git.haskell.org  Fri Dec 11 12:53:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 12:53:56 +0000 (UTC)
Subject: [commit: ghc] tag 'ghc-7.10.3a-release' created
Message-ID: <20151211125356.C4A753A300@ghc.haskell.org>

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

New tag    : ghc-7.10.3a-release
Referencing: 1d6bf410c1b8fdc831f2995d7527ae5bd26179f3

From git at git.haskell.org  Fri Dec 11 18:11:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 18:11:57 +0000 (UTC)
Subject: [commit: ghc] master: Make sure PatSyns only get added once to
 tcg_patsyns (41ef8f7)
Message-ID: <20151211181157.861833A300@ghc.haskell.org>

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

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

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

commit 41ef8f70819e9b99aacc6d81019e5a33a63dfeab
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Fri Dec 11 18:10:45 2015 +0000

    Make sure PatSyns only get added once to tcg_patsyns
    
    Summary: Before, `PatSyn`s were getting added twice to `tcg_patsyns` so
    when inspecting afterwards there were duplicates in the list.
    This makes sure that only they only get added once.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1597


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

41ef8f70819e9b99aacc6d81019e5a33a63dfeab
 compiler/typecheck/TcBinds.hs       |  8 +++-----
 compiler/typecheck/TcPatSyn.hs      | 10 +++++-----
 compiler/typecheck/TcPatSyn.hs-boot |  7 +++----
 3 files changed, 11 insertions(+), 14 deletions(-)

diff --git a/compiler/typecheck/TcBinds.hs b/compiler/typecheck/TcBinds.hs
index 673109b..1254b78 100644
--- a/compiler/typecheck/TcBinds.hs
+++ b/compiler/typecheck/TcBinds.hs
@@ -49,7 +49,6 @@ import NameSet
 import NameEnv
 import SrcLoc
 import Bag
-import PatSyn
 import ListSetOps
 import ErrUtils
 import Digraph
@@ -483,13 +482,12 @@ tc_single :: forall thing.
           -> LHsBind Name -> TcM thing
           -> TcM (LHsBinds TcId, thing)
 tc_single _top_lvl sig_fn _prag_fn (L _ (PatSynBind psb at PSB{ psb_id = L _ name })) thing_inside
-  = do { (pat_syn, aux_binds, tcg_env) <- tc_pat_syn_decl
-       ; let tything = AConLike (PatSynCon pat_syn)
-       ; thing <- setGblEnv tcg_env  $ tcExtendGlobalEnv [tything] thing_inside
+  = do { (aux_binds, tcg_env) <- tc_pat_syn_decl
+       ; thing <- setGblEnv tcg_env thing_inside
        ; return (aux_binds, thing)
        }
   where
-    tc_pat_syn_decl :: TcM (PatSyn, LHsBinds TcId, TcGblEnv)
+    tc_pat_syn_decl :: TcM (LHsBinds TcId, TcGblEnv)
     tc_pat_syn_decl = case sig_fn name of
         Nothing                 -> tcInferPatSynDecl psb
         Just (TcPatSynSig tpsi) -> tcCheckPatSynDecl psb tpsi
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index 30dcbf7..69eeef0 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -61,7 +61,7 @@ import Control.Monad (forM)
 -}
 
 tcInferPatSynDecl :: PatSynBind Name Name
-                  -> TcM (PatSyn, LHsBinds Id, TcGblEnv)
+                  -> TcM (LHsBinds Id, TcGblEnv)
 tcInferPatSynDecl PSB{ psb_id = lname@(L loc name), psb_args = details,
                        psb_def = lpat, psb_dir = dir }
   = setSrcSpan loc $
@@ -96,7 +96,7 @@ tcInferPatSynDecl PSB{ psb_id = lname@(L loc name), psb_args = details,
 
 tcCheckPatSynDecl :: PatSynBind Name Name
                   -> TcPatSynInfo
-                  -> TcM (PatSyn, LHsBinds Id, TcGblEnv)
+                  -> TcM (LHsBinds Id, TcGblEnv)
 tcCheckPatSynDecl PSB{ psb_id = lname@(L loc name), psb_args = details,
                        psb_def = lpat, psb_dir = dir }
                   TPSI{ patsig_tau = tau,
@@ -163,7 +163,7 @@ tcCheckPatSynDecl PSB{ psb_id = lname@(L loc name), psb_args = details,
                           (univ_tvs, req_theta, req_ev_binds, req_dicts)
                           (ex_tvs, ex_tys, prov_theta, prov_ev_binds, prov_dicts)
                           wrapped_args
-                          pat_ty rec_fields  }
+                          pat_ty rec_fields }
   where
     (arg_tys, pat_ty) = tcSplitFunTys tau
 
@@ -199,7 +199,7 @@ tc_patsyn_finish :: Located Name  -- ^ PatSyn Name
                  -> TcType              -- ^ Pattern type
                  -> [Name]              -- ^ Selector names
                  -- ^ Whether fields, empty if not record PatSyn
-                 -> TcM (PatSyn, LHsBinds Id, TcGblEnv)
+                 -> TcM (LHsBinds Id, TcGblEnv)
 tc_patsyn_finish lname dir is_infix lpat'
                  (univ_tvs, req_theta, req_ev_binds, req_dicts)
                  (ex_tvs, subst, prov_theta, prov_ev_binds, prov_dicts)
@@ -262,7 +262,7 @@ tc_patsyn_finish lname dir is_infix lpat'
             tcRecSelBinds
               (ValBindsOut (zip (repeat NonRecursive) selector_binds) sigs)
 
-       ; return (patSyn, matcher_bind, tcg_env) }
+       ; return (matcher_bind, tcg_env) }
 
   where
     zonk_wrapped_arg :: (Var, HsWrapper) -> TcM (Var, HsWrapper)
diff --git a/compiler/typecheck/TcPatSyn.hs-boot b/compiler/typecheck/TcPatSyn.hs-boot
index 61f7958..11c1bc1 100644
--- a/compiler/typecheck/TcPatSyn.hs-boot
+++ b/compiler/typecheck/TcPatSyn.hs-boot
@@ -4,16 +4,15 @@ import Name      ( Name )
 import Id        ( Id )
 import HsSyn     ( PatSynBind, LHsBinds )
 import TcRnTypes ( TcM, TcPatSynInfo )
-import PatSyn    ( PatSyn )
-import TcRnMonad ( TcGblEnv )
+import TcRnMonad ( TcGblEnv)
 import Outputable ( Outputable )
 
 tcInferPatSynDecl :: PatSynBind Name Name
-                  -> TcM (PatSyn, LHsBinds Id, TcGblEnv)
+                  -> TcM (LHsBinds Id, TcGblEnv)
 
 tcCheckPatSynDecl :: PatSynBind Name Name
                   -> TcPatSynInfo
-                  -> TcM (PatSyn, LHsBinds Id, TcGblEnv)
+                  -> TcM (LHsBinds Id, TcGblEnv)
 
 tcPatSynBuilderBind :: PatSynBind Name Name
                     -> TcM (LHsBinds Id)


From git at git.haskell.org  Fri Dec 11 20:49:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 20:49:39 +0000 (UTC)
Subject: [commit: ghc] master: T7478: Don't expect broken on Darwin (f7c17c8)
Message-ID: <20151211204939.2C7733A300@ghc.haskell.org>

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

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

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

commit f7c17c84f7dd8f2f1ddbfd7c5bdc3d918f25ea4d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 11 21:48:02 2015 +0100

    T7478: Don't expect broken on Darwin
    
    This appears to be fixed as noted by goldfire on #7478 and my own
    experience.


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

f7c17c84f7dd8f2f1ddbfd7c5bdc3d918f25ea4d
 testsuite/tests/ghc-api/T7478/all.T | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testsuite/tests/ghc-api/T7478/all.T b/testsuite/tests/ghc-api/T7478/all.T
index b3a69a8..01d2dc0 100644
--- a/testsuite/tests/ghc-api/T7478/all.T
+++ b/testsuite/tests/ghc-api/T7478/all.T
@@ -1,7 +1,6 @@
 test('T7478',
   [ unless(have_dynamic(),skip)
   , extra_clean(['A','A.exe','B.o','B.hi','C.o','C.hi'])
-  , when(opsys('darwin'), expect_broken(8294))
   ],
   run_command,
   ['$MAKE -s --no-print-directory T7478'])


From git at git.haskell.org  Fri Dec 11 21:11:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 21:11:25 +0000 (UTC)
Subject: [commit: ghc] master: Mark retc001 as broken on Darwin (5447c20)
Message-ID: <20151211211125.92A613A300@ghc.haskell.org>

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

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

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

commit 5447c20e5d9d4e968df91f538ca942807dc46a53
Author: Ben Gamari <ben at well-typed.com>
Date:   Fri Dec 11 23:09:43 2015 +0200

    Mark retc001 as broken on Darwin
    
    Due to #11204. A relatively easy fix would be to add a one second delay as
    described in the ticket, but this seems terrible.


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

5447c20e5d9d4e968df91f538ca942807dc46a53
 testsuite/tests/driver/retc001/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/driver/retc001/all.T b/testsuite/tests/driver/retc001/all.T
index 7e5fda5..7e7c59a 100644
--- a/testsuite/tests/driver/retc001/all.T
+++ b/testsuite/tests/driver/retc001/all.T
@@ -1,5 +1,6 @@
 test('retc001',
-     [clean_cmd('$MAKE -s clean')],
+     [clean_cmd('$MAKE -s clean'),
+      when(opsys('darwin'), expect_broken(11204))],
      run_command,
      ['$MAKE -s --no-print-directory retc001'])
 


From git at git.haskell.org  Fri Dec 11 21:19:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 21:19:27 +0000 (UTC)
Subject: [commit: ghc] master: T4801: Update expected allocations on Darwin
 (262954c)
Message-ID: <20151211211927.91D5F3A300@ghc.haskell.org>

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

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

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

commit 262954c2b2de95c06ae796522dbcda4d34f00531
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 11 22:19:44 2015 +0100

    T4801: Update expected allocations on Darwin


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

262954c2b2de95c06ae796522dbcda4d34f00531
 testsuite/tests/perf/compiler/all.T | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index fb52076..620a62c 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -212,8 +212,9 @@ test('T4801',
 #            # 2014-10-13: 48 stricter seqDmdType
 
       compiler_stats_num_field('bytes allocated',
-          [(platform('x86_64-apple-darwin'), 434058304, 5),
-                           # expected value: 510938976 (amd64/OS X):
+          [(platform('x86_64-apple-darwin'), 465653312, 10),
+           # prev:       510938976 (amd64/OS X):
+           # 2015-12-11: 465653312 (amd64/OS X) Update, bump tolerance to +/-10%
 
            (wordsize(32), 203962148, 10),
            # prev:        185669232 (x86/OSX)


From git at git.haskell.org  Fri Dec 11 22:17:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 22:17:21 +0000 (UTC)
Subject: [commit: ghc] master: Removed colon append operation (fixes #10785)
 (c205aeb)
Message-ID: <20151211221721.B60463A300@ghc.haskell.org>

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

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

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

commit c205aebda7005744a5bbe44c11f37e98242145fa
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 11 22:36:15 2015 +0100

    Removed colon append operation (fixes #10785)
    
    Reviewers: jgertm, austin, thomie
    
    Reviewed By: thomie
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1164
    
    GHC Trac Issues: #10785


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

c205aebda7005744a5bbe44c11f37e98242145fa
 testsuite/tests/cabal/T1750.stdout                       | 2 +-
 testsuite/tests/cabal/ghcpkg01.stdout                    | 6 +++---
 testsuite/tests/cabal/ghcpkg05.stdout                    | 4 ++--
 testsuite/tests/cabal/shadow.stdout                      | 8 ++++----
 testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout | 8 ++++----
 utils/ghc-pkg/Main.hs                                    | 6 +++---
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/testsuite/tests/cabal/T1750.stdout b/testsuite/tests/cabal/T1750.stdout
index 62d0323..72d1cf6 100644
--- a/testsuite/tests/cabal/T1750.stdout
+++ b/testsuite/tests/cabal/T1750.stdout
@@ -1,4 +1,4 @@
-localT1750.package.conf:
+localT1750.package.conf
     {T1750A-1}
     {T1750B-1}
 
diff --git a/testsuite/tests/cabal/ghcpkg01.stdout b/testsuite/tests/cabal/ghcpkg01.stdout
index c056cf9..d7b35b7 100644
--- a/testsuite/tests/cabal/ghcpkg01.stdout
+++ b/testsuite/tests/cabal/ghcpkg01.stdout
@@ -1,4 +1,4 @@
-local01.package.conf:
+local01.package.conf
     (no packages)
 Reading package info from "test.pkg" ... done.
 name: testpkg
@@ -55,7 +55,7 @@ pkgroot:
 
 import-dirs: /usr/local/lib/testpkg "c:/Program Files/testpkg"
 Reading package info from "test2.pkg" ... done.
-local01.package.conf:
+local01.package.conf
     testpkg-1.2.3.4
     (testpkg-2.0)
 
@@ -170,6 +170,6 @@ hs-libraries: testpkg-1.2.3.4-XXX
 include-dirs: /usr/local/include/testpkg "c:/Program Files/testpkg"
 pkgroot: 
 
-local01.package.conf:
+local01.package.conf
     (no packages)
 Reading package info from "test3.pkg" ... done.
diff --git a/testsuite/tests/cabal/ghcpkg05.stdout b/testsuite/tests/cabal/ghcpkg05.stdout
index f89d332..980139d 100644
--- a/testsuite/tests/cabal/ghcpkg05.stdout
+++ b/testsuite/tests/cabal/ghcpkg05.stdout
@@ -1,6 +1,6 @@
-local05a.package.conf:
+local05a.package.conf
     (testpkg-2.0)
 
-local05b.package.conf:
+local05b.package.conf
     (testpkg-3.0)
 
diff --git a/testsuite/tests/cabal/shadow.stdout b/testsuite/tests/cabal/shadow.stdout
index bdd2459..a47ce15 100644
--- a/testsuite/tests/cabal/shadow.stdout
+++ b/testsuite/tests/cabal/shadow.stdout
@@ -1,17 +1,17 @@
 databases 1 and 2:
-localshadow1.package.conf:
+localshadow1.package.conf
     (shadow-1)
     (shadowdep-1)
 
-localshadow2.package.conf:
+localshadow2.package.conf
     (shadow-1)
 
 databases 1 and 3:
-localshadow1.package.conf:
+localshadow1.package.conf
     (shadow-1)
     (shadowdep-1)
 
-localshadow3.package.conf:
+localshadow3.package.conf
     (shadow-1)
 
 should FAIL:
diff --git a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
index 42e1778..59886cd 100644
--- a/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
+++ b/testsuite/tests/safeHaskell/check/pkg01/safePkg01.stdout
@@ -1,4 +1,4 @@
-pdb.safePkg01/local.db:
+pdb.safePkg01/local.db
     safePkg01-1.0
 
 trusted: False
@@ -29,17 +29,17 @@ trusted: safe
 require own pkg trusted: True
 
 M_SafePkg6
-package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
 M_SafePkg7
-package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0* bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: safe
 require own pkg trusted: False
 
 M_SafePkg8
-package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.1.1 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
+package dependencies: array-0.5.1.0 base-4.9.0.0 bytestring-0.10.7.0* deepseq-1.4.2.0 ghc-prim-0.5.0.0 integer-gmp-1.0.0.0
 trusted: trustworthy
 require own pkg trusted: False
 
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 2820f70..b302810 100644
--- a/utils/ghc-pkg/Main.hs
+++ b/utils/ghc-pkg/Main.hs
@@ -1241,7 +1241,7 @@ listPackages verbosity my_flags mPackageName mModuleName = do
       broken = map installedComponentId (brokenPackages pkg_map)
 
       show_normal PackageDB{ location = db_name, packages = pkg_confs } =
-          do hPutStrLn stdout (db_name ++ ":")
+          do hPutStrLn stdout db_name
              if null pkg_confs
                  then hPutStrLn stdout "    (no packages)"
                  else hPutStrLn stdout $ unlines (map ("    " ++) (map pp_pkg pkg_confs))
@@ -1273,8 +1273,8 @@ listPackages verbosity my_flags mPackageName mModuleName = do
            then termText (location db) <#> termText "\n    (no packages)\n"
            else
                mconcat $ map (<#> termText "\n") $
-                           (termText (location db) :
-                                     map (termText "   " <#>) (map pp_pkg pkg_confs))
+                           (termText (location db)
+                            : map (termText "    " <#>) (map pp_pkg pkg_confs))
           where
                    pp_pkg p
                      | installedComponentId p `elem` broken = withF Red  doc


From git at git.haskell.org  Fri Dec 11 22:17:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 22:17:24 +0000 (UTC)
Subject: [commit: ghc] master: Improved data family export documentation
 (b138248)
Message-ID: <20151211221724.5E1073A300@ghc.haskell.org>

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

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

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

commit b1382481ac14a9f8999321581eaf88148bd44415
Author: David Kraeutmann <kane at kane.cx>
Date:   Fri Dec 11 22:36:55 2015 +0100

    Improved data family export documentation
    
    Reviewers: simonpj, austin, bgamari
    
    Reviewed By: simonpj
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1587
    
    GHC Trac Issues: #11164


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

b1382481ac14a9f8999321581eaf88148bd44415
 compiler/rename/RnNames.hs        | 5 +++--
 docs/users_guide/glasgow_exts.rst | 5 +++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/compiler/rename/RnNames.hs b/compiler/rename/RnNames.hs
index d61c299..0024304 100644
--- a/compiler/rename/RnNames.hs
+++ b/compiler/rename/RnNames.hs
@@ -1223,8 +1223,9 @@ exports_from_avail Nothing rdr_env _imports _this_mod
   where
     -- #11164: when we define a data instance
     -- but not data family, re-export the family
-    -- Generally, whenever we export a part of a declaration,
-    -- export the declaration, too.
+    -- Even though we don't check whether this is actually a data family
+    -- only data families can locally define subordinate things (`ns` here)
+    -- without locally defining (and instead importing) the parent (`n`)
     fix_faminst (AvailTC n ns flds)
       | not (n `elem` ns)
       = AvailTC n (n:ns) flds
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 0959337..9993618 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -6666,6 +6666,11 @@ adjustment for type families:
    associated types ``Tj``. The types need a keyword "``type``" to
    distinguish them from data constructors.
 
+-  Whenever there is no export list and a data instance is defined, the
+   corresponding data family type constructor is exported along with
+   the new data constructors, regardless of whether the data family
+   is defined locally or in another module.
+
 .. _data-family-impexp-examples:
 
 Examples


From git at git.haskell.org  Fri Dec 11 22:17:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 22:17:26 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: Only run recomp015 on ELF-based
 platforms (ceaf0f4)
Message-ID: <20151211221726.F3B4D3A300@ghc.haskell.org>

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

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

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

commit ceaf0f4683a3e0ba85ae420956cfc394824e9a38
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 11 22:41:23 2015 +0100

    testsuite: Only run recomp015 on ELF-based platforms
    
    It fails on OS X with hundreds of messages of the form,
    ```
    ManySections.s:196576:10: error:
         error: mach-o section specifier uses an unknown section type
    .section s65525,"", at progbits
             ^
    
    ManySections.s:196579:10: error:
         error: mach-o section specifier uses an unknown section type
    .section s65526,"", at progbits
    ```
    
    It fails on Windows with messages of the form,
    ```
    ManySections.s:196579:10: error:
         Error: junk at the end of line, first unrecognized character is ','
    ```
    
    Test Plan: Validate
    
    Reviewers: hsyl20, thomie, austin
    
    Reviewed By: thomie, austin
    
    Differential Revision: https://phabricator.haskell.org/D1601
    
    GHC Trac Issues: #11022


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

ceaf0f4683a3e0ba85ae420956cfc394824e9a38
 testsuite/tests/driver/recomp015/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/driver/recomp015/all.T b/testsuite/tests/driver/recomp015/all.T
index ff86caf..4ab3e88 100644
--- a/testsuite/tests/driver/recomp015/all.T
+++ b/testsuite/tests/driver/recomp015/all.T
@@ -1,7 +1,8 @@
 # Test for the ELF parser: more than 0xff00 sections (use different ELF fields)
 
 test('recomp015',
-     [ clean_cmd('$MAKE -s clean') ],
+     [ clean_cmd('$MAKE -s clean'),
+       unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip)],
      run_command,
      ['$MAKE -s --no-print-directory recomp015'])
 


From git at git.haskell.org  Fri Dec 11 22:17:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 22:17:30 +0000 (UTC)
Subject: [commit: ghc] master: Fix infix record field fixity (#11167 and
 #11173). (6e56ac5)
Message-ID: <20151211221730.DD6AB3A300@ghc.haskell.org>

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

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

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

commit 6e56ac58a6905197412d58e32792a04a63b94d7e
Author: Adam Gundry <adam at well-typed.com>
Date:   Fri Dec 11 22:43:26 2015 +0100

    Fix infix record field fixity (#11167 and #11173).
    
    This extends D1585 with proper support for infix duplicate record
    fields.  In particular, it is now possible to declare record fields as
    infix in a module for which `DuplicateRecordFields` is enabled, fixity
    is looked up correctly and a readable (although unpleasant) error
    message is generated if multiple fields with different fixities are in
    scope.
    
    As a bonus, `DEPRECATED` and `WARNING` pragmas now work for
    duplicate record fields. The pragma applies to all fields with the
    given label.
    
    In addition, a couple of minor `DuplicateRecordFields` bugs, which were
    pinpointed by the `T11167_ambig` test case, are fixed by this patch:
    
      - Ambiguous infix fields can now be disambiguated by putting a type
        signature on the first argument
    
      - Polymorphic type constructor signatures (such as `ContT () IO a` in
        `T11167_ambig`) now work for disambiguation
    
    Parts of this patch are from D1585 authored by @KaneTW.
    
    Test Plan: New tests added.
    
    Reviewers: KaneTW, bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: thomie, hvr
    
    Differential Revision: https://phabricator.haskell.org/D1600
    
    GHC Trac Issues: #11167, #11173


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

6e56ac58a6905197412d58e32792a04a63b94d7e
 compiler/hsSyn/HsExpr.hs                           |  1 +
 compiler/hsSyn/HsTypes.hs                          |  4 ++
 compiler/main/HscTypes.hs                          | 12 +++--
 compiler/rename/RnEnv.hs                           | 59 ++++++++++++++++++----
 compiler/rename/RnExpr.hs                          |  7 +--
 compiler/rename/RnNames.hs                         | 11 ++--
 compiler/rename/RnSource.hs                        |  4 +-
 compiler/typecheck/TcExpr.hs                       | 16 +++++-
 .../overloadedrecflds/should_compile/T11173.hs     |  6 +++
 .../overloadedrecflds/should_compile/T11173a.hs    | 10 ++++
 .../tests/overloadedrecflds/should_compile/all.T   |  1 +
 ...cfldsfail11.hs => OverloadedRecFldsFail11_A.hs} |  3 +-
 .../should_fail/T11167_ambiguous_fixity.hs         |  6 +++
 .../should_fail/T11167_ambiguous_fixity.stderr     | 16 ++++++
 .../should_fail/T11167_ambiguous_fixity_A.hs       |  5 ++
 .../should_fail/T11167_ambiguous_fixity_B.hs       |  3 ++
 .../tests/overloadedrecflds/should_fail/all.T      |  8 ++-
 .../should_fail/overloadedrecfldsfail11.hs         |  6 +--
 .../should_fail/overloadedrecfldsfail11.stderr     | 11 ++--
 testsuite/tests/rename/should_compile/T11167.hs    | 21 ++++++++
 .../tests/rename/should_compile/T11167_ambig.hs    | 23 +++++++++
 testsuite/tests/rename/should_compile/all.T        |  2 +
 22 files changed, 201 insertions(+), 34 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6e56ac58a6905197412d58e32792a04a63b94d7e

From git at git.haskell.org  Fri Dec 11 23:22:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 23:22:52 +0000 (UTC)
Subject: [commit: ghc] master: Add kind equalities to GHC. (6746549)
Message-ID: <20151211232252.914A13A300@ghc.haskell.org>

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

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

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

commit 6746549772c5cc0ac66c0fce562f297f4d4b80a2
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Dec 11 18:19:53 2015 -0500

    Add kind equalities to GHC.
    
    This implements the ideas originally put forward in
    "System FC with Explicit Kind Equality" (ICFP'13).
    
    There are several noteworthy changes with this patch:
     * We now have casts in types. These change the kind
       of a type. See new constructor `CastTy`.
    
     * All types and all constructors can be promoted.
       This includes GADT constructors. GADT pattern matches
       take place in type family equations. In Core,
       types can now be applied to coercions via the
       `CoercionTy` constructor.
    
     * Coercions can now be heterogeneous, relating types
       of different kinds. A coercion proving `t1 :: k1 ~ t2 :: k2`
       proves both that `t1` and `t2` are the same and also that
       `k1` and `k2` are the same.
    
     * The `Coercion` type has been significantly enhanced.
       The documentation in `docs/core-spec/core-spec.pdf` reflects
       the new reality.
    
     * The type of `*` is now `*`. No more `BOX`.
    
     * Users can write explicit kind variables in their code,
       anywhere they can write type variables. For backward compatibility,
       automatic inference of kind-variable binding is still permitted.
    
     * The new extension `TypeInType` turns on the new user-facing
       features.
    
     * Type families and synonyms are now promoted to kinds. This causes
       trouble with parsing `*`, leading to the somewhat awkward new
       `HsAppsTy` constructor for `HsType`. This is dispatched with in
       the renamer, where the kind `*` can be told apart from a
       type-level multiplication operator. Without `-XTypeInType` the
       old behavior persists. With `-XTypeInType`, you need to import
       `Data.Kind` to get `*`, also known as `Type`.
    
     * The kind-checking algorithms in TcHsType have been significantly
       rewritten to allow for enhanced kinds.
    
     * The new features are still quite experimental and may be in flux.
    
     * TODO: Several open tickets: #11195, #11196, #11197, #11198, #11203.
    
     * TODO: Update user manual.
    
    Tickets addressed: #9017, #9173, #7961, #10524, #8566, #11142.
    Updates Haddock submodule.


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

6746549772c5cc0ac66c0fce562f297f4d4b80a2
 .gitmodules                                        |   58 +-
 README.md                                          |   90 +-
 compiler/basicTypes/BasicTypes.hs                  |    4 +
 compiler/basicTypes/ConLike.hs                     |    4 +-
 compiler/basicTypes/DataCon.hs                     |  360 ++-
 compiler/basicTypes/DataCon.hs-boot                |    7 +-
 compiler/basicTypes/Id.hs                          |   90 +-
 compiler/basicTypes/IdInfo.hs                      |   20 +-
 compiler/basicTypes/IdInfo.hs-boot                 |    2 +
 compiler/basicTypes/Lexeme.hs                      |    1 -
 compiler/basicTypes/MkId.hs                        |  159 +-
 compiler/basicTypes/MkId.hs-boot                   |    3 +
 compiler/basicTypes/Name.hs                        |    8 +-
 compiler/basicTypes/NameEnv.hs                     |    5 +-
 compiler/basicTypes/OccName.hs                     |    7 +-
 compiler/basicTypes/PatSyn.hs                      |   12 +-
 compiler/basicTypes/PatSyn.hs-boot                 |    2 +-
 compiler/basicTypes/SrcLoc.hs                      |    8 +
 compiler/basicTypes/Unique.hs                      |    9 +-
 compiler/basicTypes/Var.hs                         |   75 +-
 compiler/basicTypes/VarEnv.hs                      |   63 +-
 compiler/basicTypes/VarSet.hs                      |   20 +-
 compiler/cmm/Cmm.hs                                |    0
 compiler/cmm/CmmExpr.hs                            |    0
 compiler/cmm/CmmLayoutStack.hs                     |    0
 compiler/cmm/Hoopl/Dataflow.hs                     |    0
 compiler/codeGen/StgCmmClosure.hs                  |   18 +-
 compiler/codeGen/StgCmmLayout.hs                   |    0
 compiler/coreSyn/CoreArity.hs                      |   49 +-
 compiler/coreSyn/CoreFVs.hs                        |  284 ++-
 compiler/coreSyn/CoreLint.hs                       |  680 +++---
 compiler/coreSyn/CorePrep.hs                       |    9 +-
 compiler/coreSyn/CoreSubst.hs                      |  244 +-
 compiler/coreSyn/CoreSyn.hs                        |   76 +-
 compiler/coreSyn/CoreTidy.hs                       |   11 +-
 compiler/coreSyn/CoreUnfold.hs                     |    1 -
 compiler/coreSyn/CoreUtils.hs                      |   72 +-
 compiler/coreSyn/MkCore.hs                         |   96 +-
 compiler/coreSyn/PprCore.hs                        |    8 +-
 compiler/coreSyn/TrieMap.hs                        |  432 ++--
 compiler/deSugar/Check.hs                          |    2 +-
 compiler/deSugar/Desugar.hs                        |   32 +-
 compiler/deSugar/DsArrows.hs                       |   20 +-
 compiler/deSugar/DsBinds.hs                        |  211 +-
 compiler/deSugar/DsCCall.hs                        |   32 +-
 compiler/deSugar/DsExpr.hs                         |   45 +-
 compiler/deSugar/DsForeign.hs                      |   52 +-
 compiler/deSugar/DsGRHSs.hs                        |    5 +-
 compiler/deSugar/DsListComp.hs                     |  118 +-
 compiler/deSugar/DsMeta.hs                         |   93 +-
 compiler/deSugar/DsMonad.hs                        |    6 +-
 compiler/deSugar/DsUtils.hs                        |   22 +-
 compiler/deSugar/Match.hs                          |   20 +-
 compiler/deSugar/MatchCon.hs                       |   64 +-
 compiler/deSugar/PmExpr.hs                         |    2 +
 compiler/ghc.cabal.in                              |    2 +-
 compiler/ghc.mk                                    |    2 +-
 compiler/ghci/ByteCodeGen.hs                       |   31 +-
 compiler/ghci/Debugger.hs                          |   10 +-
 compiler/ghci/DebuggerUtils.hs                     |    0
 compiler/ghci/RtClosureInspect.hs                  |   59 +-
 compiler/hsSyn/Convert.hs                          |   71 +-
 compiler/hsSyn/HsDecls.hs                          |   16 +-
 compiler/hsSyn/HsExpr.hs                           |    1 -
 compiler/hsSyn/HsPat.hs                            |    9 +-
 compiler/hsSyn/HsTypes.hs                          |  257 +-
 compiler/hsSyn/HsUtils.hs                          |  123 +-
 compiler/iface/BinIface.hs                         |   10 +-
 compiler/iface/BuildTyCl.hs                        |   92 +-
 compiler/iface/IfaceEnv.hs                         |   25 +-
 compiler/iface/IfaceSyn.hs                         |  203 +-
 compiler/iface/IfaceType.hs                        |  633 +++--
 compiler/iface/MkIface.hs                          |   56 +-
 compiler/iface/TcIface.hs                          |  346 ++-
 compiler/iface/TcIface.hs-boot                     |    2 +-
 compiler/main/Annotations.hs                       |    0
 compiler/main/DynFlags.hs                          |    9 +
 compiler/main/DynamicLoading.hs                    |    3 +-
 compiler/main/GHC.hs                               |    9 +-
 compiler/main/GhcMonad.hs                          |    0
 compiler/main/GhcPlugins.hs                        |    4 +-
 compiler/main/HscStats.hs                          |    0
 compiler/main/HscTypes.hs                          |   20 +-
 compiler/main/InteractiveEval.hs                   |   28 +-
 compiler/main/InteractiveEvalTypes.hs              |    2 +-
 compiler/main/PipelineMonad.hs                     |    0
 compiler/main/PprTyThing.hs                        |    4 +-
 compiler/nativeGen/PPC/Ppr.hs                      |    1 -
 compiler/nativeGen/RegAlloc/Graph/ArchBase.hs      |    0
 compiler/nativeGen/RegAlloc/Graph/ArchX86.hs       |    0
 compiler/nativeGen/RegAlloc/Graph/Coalesce.hs      |    0
 compiler/nativeGen/RegAlloc/Graph/Main.hs          |    0
 compiler/nativeGen/RegAlloc/Graph/Spill.hs         |    0
 compiler/nativeGen/RegAlloc/Graph/SpillClean.hs    |    0
 compiler/nativeGen/RegAlloc/Graph/SpillCost.hs     |    0
 compiler/nativeGen/RegAlloc/Graph/Stats.hs         |    0
 compiler/nativeGen/RegAlloc/Linear/Main.hs         |    0
 compiler/nativeGen/RegAlloc/Linear/PPC/FreeRegs.hs |    0
 .../nativeGen/RegAlloc/Linear/SPARC/FreeRegs.hs    |    0
 compiler/nativeGen/RegAlloc/Linear/StackMap.hs     |    0
 compiler/nativeGen/RegAlloc/Linear/Stats.hs        |    0
 compiler/nativeGen/SPARC/CodeGen/Gen64.hs          |    3 -
 compiler/parser/ApiAnnotation.hs                   |    4 -
 compiler/parser/Lexer.x                            |   10 -
 compiler/parser/Parser.y                           |  222 +-
 compiler/parser/RdrHsSyn.hs                        |   52 +-
 compiler/prelude/PrelInfo.hs                       |   72 +-
 compiler/prelude/PrelNames.hs                      |  147 +-
 compiler/prelude/PrelNames.hs-boot                 |    3 +-
 compiler/prelude/PrelRules.hs                      |   50 +-
 compiler/prelude/PrimOp.hs                         |    6 +-
 compiler/prelude/TysPrim.hs                        |  245 +-
 compiler/prelude/TysWiredIn.hs                     |  396 ++--
 compiler/prelude/TysWiredIn.hs-boot                |   10 +-
 compiler/rename/RnEnv.hs                           |   21 +-
 compiler/rename/RnNames.hs                         |    2 +-
 compiler/rename/RnPat.hs                           |    4 +-
 compiler/rename/RnSource.hs                        |   98 +-
 compiler/rename/RnTypes.hs                         |  832 ++++---
 compiler/simplCore/CSE.hs                          |    4 +-
 compiler/simplCore/CoreMonad.hs                    |    1 -
 compiler/simplCore/FloatIn.hs                      |  169 +-
 compiler/simplCore/OccurAnal.hs                    |    2 +-
 compiler/simplCore/SAT.hs                          |    2 +-
 compiler/simplCore/SetLevels.hs                    |   30 +-
 compiler/simplCore/SimplEnv.hs                     |   64 +-
 compiler/simplCore/SimplMonad.hs                   |    4 +-
 compiler/simplCore/SimplUtils.hs                   |   17 +-
 compiler/simplCore/Simplify.hs                     |   76 +-
 compiler/simplStg/UnariseStg.hs                    |    2 +-
 compiler/specialise/Rules.hs                       |   54 +-
 compiler/specialise/SpecConstr.hs                  |   10 +-
 compiler/specialise/Specialise.hs                  |   60 +-
 compiler/stgSyn/StgLint.hs                         |    1 -
 compiler/stranal/DmdAnal.hs                        |    4 +-
 compiler/stranal/WwLib.hs                          |   39 +-
 compiler/typecheck/FamInst.hs                      |  120 +-
 compiler/typecheck/FunDeps.hs                      |   60 +-
 compiler/typecheck/Inst.hs                         |  170 +-
 compiler/typecheck/TcArrows.hs                     |   18 +-
 compiler/typecheck/TcBinds.hs                      |  139 +-
 compiler/typecheck/TcCanonical.hs                  |  570 +++--
 compiler/typecheck/TcClassDcl.hs                   |   20 +-
 compiler/typecheck/TcDefaults.hs                   |    5 +-
 compiler/typecheck/TcDeriv.hs                      |  204 +-
 compiler/typecheck/TcEnv.hs                        |   37 +-
 compiler/typecheck/TcErrors.hs                     |  418 ++--
 compiler/typecheck/TcEvidence.hs                   |  663 ++----
 compiler/typecheck/TcExpr.hs                       |  130 +-
 compiler/typecheck/TcFlatten.hs                    |  263 ++-
 compiler/typecheck/TcForeign.hs                    |   55 +-
 compiler/typecheck/TcGenDeriv.hs                   |   31 +-
 compiler/typecheck/TcGenGenerics.hs                |   31 +-
 compiler/typecheck/TcHsSyn.hs                      |  309 ++-
 compiler/typecheck/TcHsType.hs                     | 2078 +++++++++-------
 compiler/typecheck/TcInstDcls.hs                   |   87 +-
 compiler/typecheck/TcInteract.hs                   |  291 ++-
 compiler/typecheck/TcMType.hs                      |  741 ++++--
 compiler/typecheck/TcMatches.hs                    |   20 +-
 compiler/typecheck/TcPat.hs                        |   72 +-
 compiler/typecheck/TcPatSyn.hs                     |   53 +-
 compiler/typecheck/TcPluginM.hs                    |   64 +-
 compiler/typecheck/TcRnDriver.hs                   |   41 +-
 compiler/typecheck/TcRnMonad.hs                    |   60 +-
 compiler/typecheck/TcRnTypes.hs                    |  335 ++-
 compiler/typecheck/TcRules.hs                      |  140 +-
 compiler/typecheck/TcSMonad.hs                     |  642 ++---
 compiler/typecheck/TcSimplify.hs                   |  599 +++--
 compiler/typecheck/TcSplice.hs                     |  178 +-
 compiler/typecheck/TcTyClsDecls.hs                 | 1099 ++++++---
 compiler/typecheck/TcTyDecls.hs                    |  229 +-
 compiler/typecheck/TcType.hs                       |  990 +++++---
 compiler/typecheck/TcType.hs-boot                  |    1 +
 compiler/typecheck/TcTypeNats.hs                   |  111 +-
 compiler/typecheck/TcTypeable.hs                   |    5 +-
 compiler/typecheck/TcUnify.hs                      |  724 +++---
 compiler/typecheck/TcUnify.hs-boot                 |    7 +-
 compiler/typecheck/TcValidity.hs                   |  702 ++++--
 compiler/types/Class.hs                            |   20 +-
 compiler/types/CoAxiom.hs                          |   34 +-
 compiler/types/Coercion.hs                         | 2495 +++++++++----------
 compiler/types/Coercion.hs-boot                    |   46 +
 compiler/types/FamInstEnv.hs                       |  511 +++-
 compiler/types/InstEnv.hs                          |   24 +-
 compiler/types/Kind.hs                             |  297 +--
 compiler/types/OptCoercion.hs                      |  568 +++--
 compiler/types/TyCoRep.hs                          | 2496 ++++++++++++++++++++
 .../types/{TypeRep.hs-boot => TyCoRep.hs-boot}     |    9 +-
 compiler/types/TyCon.hs                            |  211 +-
 compiler/types/Type.hs                             | 1895 +++++++++------
 compiler/types/Type.hs-boot                        |   15 +-
 compiler/types/TypeRep.hs                          | 1020 --------
 compiler/types/Unify.hs                            | 1237 ++++++----
 compiler/utils/Bag.hs                              |    2 +-
 compiler/utils/ListSetOps.hs                       |   15 +-
 compiler/utils/MonadUtils.hs                       |   24 +-
 compiler/utils/Outputable.hs                       |   17 +-
 compiler/utils/Pair.hs                             |   12 +-
 compiler/utils/Serialized.hs                       |    0
 compiler/utils/UniqDFM.hs                          |    4 +
 compiler/utils/UniqDSet.hs                         |   15 +-
 compiler/utils/UniqSet.hs                          |    2 +-
 compiler/utils/Util.hs                             |   49 +-
 compiler/vectorise/Vectorise.hs                    |    0
 compiler/vectorise/Vectorise/Builtins.hs           |    0
 compiler/vectorise/Vectorise/Builtins/Base.hs      |    0
 .../vectorise/Vectorise/Builtins/Initialise.hs     |    2 +-
 compiler/vectorise/Vectorise/Convert.hs            |   15 +-
 compiler/vectorise/Vectorise/Env.hs                |    6 +-
 compiler/vectorise/Vectorise/Exp.hs                |   60 +-
 .../vectorise/Vectorise/Generic/Description.hs     |    0
 compiler/vectorise/Vectorise/Generic/PADict.hs     |    2 +-
 compiler/vectorise/Vectorise/Generic/PAMethods.hs  |   18 +-
 compiler/vectorise/Vectorise/Generic/PData.hs      |   14 +-
 compiler/vectorise/Vectorise/Monad.hs              |    0
 compiler/vectorise/Vectorise/Monad/Base.hs         |    0
 compiler/vectorise/Vectorise/Monad/Global.hs       |    0
 compiler/vectorise/Vectorise/Monad/InstEnv.hs      |    0
 compiler/vectorise/Vectorise/Monad/Local.hs        |    6 +-
 compiler/vectorise/Vectorise/Monad/Naming.hs       |   11 +-
 compiler/vectorise/Vectorise/Type/Classify.hs      |   21 +-
 compiler/vectorise/Vectorise/Type/Env.hs           |    0
 compiler/vectorise/Vectorise/Type/TyConDecl.hs     |   12 +-
 compiler/vectorise/Vectorise/Type/Type.hs          |   15 +-
 compiler/vectorise/Vectorise/Utils.hs              |    0
 compiler/vectorise/Vectorise/Utils/Base.hs         |    0
 compiler/vectorise/Vectorise/Utils/Closure.hs      |    0
 compiler/vectorise/Vectorise/Utils/Hoisting.hs     |    0
 compiler/vectorise/Vectorise/Utils/PADict.hs       |   21 +-
 compiler/vectorise/Vectorise/Utils/Poly.hs         |    0
 compiler/vectorise/Vectorise/Var.hs                |    0
 compiler/vectorise/Vectorise/Vect.hs               |    0
 docs/core-spec/.gitignore                          |    1 +
 docs/core-spec/CoreLint.ott                        |  309 ++-
 docs/core-spec/CoreSyn.ott                         |  219 +-
 docs/core-spec/Makefile                            |    2 +-
 docs/core-spec/OpSem.ott                           |    6 +-
 docs/core-spec/core-spec.mng                       |   83 +-
 docs/core-spec/core-spec.pdf                       |  Bin 342464 -> 348408 bytes
 docs/users_guide/glasgow_exts.rst                  |    3 -
 docs/users_guide/using.rst                         |   19 +-
 libraries/base/Data/Coerce.hs                      |    3 +-
 libraries/base/Data/Kind.hs                        |   19 +
 libraries/base/Data/Monoid.hs                      |    1 -
 libraries/base/Data/Type/Coercion.hs               |   10 +-
 libraries/base/Data/Type/Equality.hs               |   40 +-
 libraries/base/Data/Typeable/Internal.hs           |   48 +-
 libraries/base/GHC/Base.hs                         |   19 +-
 libraries/base/GHC/Exts.hs                         |   11 +-
 libraries/base/GHC/TypeLits.hs                     |    2 -
 libraries/base/base.cabal                          |    1 +
 libraries/base/tests/CatEntail.hs                  |    2 +-
 libraries/ghc-prim/GHC/Classes.hs                  |    1 -
 libraries/ghc-prim/GHC/Types.hs                    |   62 +-
 rae.txt                                            |  319 +++
 testsuite/tests/ado/ado004.stderr                  |    4 +-
 .../tests/annotations/should_fail/annfail10.stderr |    2 +-
 .../tests/deSugar/should_compile/T2431.stderr      |   22 +-
 .../tests/deSugar/should_compile/T4488.stderr      |   32 +-
 testsuite/tests/{ado => dependent}/Makefile        |    0
 testsuite/tests/dependent/should_compile/Dep1.hs   |   13 +
 testsuite/tests/dependent/should_compile/Dep2.hs   |    7 +
 testsuite/tests/dependent/should_compile/Dep3.hs   |   26 +
 .../dependent/should_compile/KindEqualities.hs     |   25 +
 .../dependent/should_compile/KindEqualities2.hs    |   43 +
 .../tests/dependent/should_compile/KindLevels.hs   |    9 +
 .../should_compile/Makefile                        |    0
 .../tests/dependent/should_compile/RAE_T32b.hs     |   23 +
 testsuite/tests/dependent/should_compile/Rae31.hs  |   24 +
 .../tests/dependent/should_compile/RaeBlogPost.hs  |   63 +
 testsuite/tests/dependent/should_compile/all.T     |   10 +
 .../tests/dependent/should_compile/mkGADTVars.hs   |    9 +
 .../tests/dependent/should_fail/BadTelescope.hs    |    9 +
 .../dependent/should_fail/BadTelescope.stderr      |    9 +
 .../tests/dependent/should_fail/BadTelescope2.hs   |   14 +
 .../dependent/should_fail/BadTelescope2.stderr     |   16 +
 .../tests/dependent/should_fail/BadTelescope3.hs   |    9 +
 .../dependent/should_fail/BadTelescope3.stderr     |    6 +
 .../tests/dependent/should_fail/BadTelescope4.hs   |   13 +
 .../dependent/should_fail/BadTelescope4.stderr     |   15 +
 testsuite/tests/dependent/should_fail/DepFail1.hs  |   11 +
 .../tests/dependent/should_fail/DepFail1.stderr    |   12 +
 testsuite/tests/dependent/should_fail/Makefile     |    5 +
 .../tests/dependent/should_fail/PromotedClass.hs   |   11 +
 .../dependent/should_fail/PromotedClass.stderr     |    6 +
 testsuite/tests/dependent/should_fail/RAE_T32a.hs  |   35 +
 .../tests/dependent/should_fail/RAE_T32a.stderr    |   19 +
 testsuite/tests/dependent/should_fail/SelfDep.hs   |    3 +
 .../tests/dependent/should_fail/SelfDep.stderr     |    5 +
 .../tests/dependent/should_fail/TypeSkolEscape.hs  |    8 +
 .../dependent/should_fail/TypeSkolEscape.stderr    |    7 +
 testsuite/tests/dependent/should_fail/all.T        |    9 +
 .../{should_fail => should_compile}/T10524.hs      |    1 +
 testsuite/tests/deriving/should_compile/all.T      |    1 +
 testsuite/tests/deriving/should_fail/T1496.stderr  |    8 +-
 testsuite/tests/deriving/should_fail/T7959.stderr  |   12 +-
 testsuite/tests/deriving/should_fail/all.T         |    1 -
 .../tests/deriving/should_fail/drvfail005.stderr   |    9 +-
 testsuite/tests/driver/T4437.hs                    |    3 +-
 testsuite/tests/driver/werror.stderr               |    2 +-
 testsuite/tests/gadt/T3163.stderr                  |    2 +-
 testsuite/tests/gadt/gadt-escape1.stderr           |   32 +-
 testsuite/tests/gadt/gadt10.stderr                 |    4 +-
 testsuite/tests/gadt/gadt13.stderr                 |   30 +-
 testsuite/tests/gadt/gadt7.stderr                  |   34 +-
 testsuite/tests/ghc-api/annotations/T10307.stdout  |    1 -
 testsuite/tests/ghc-api/annotations/T10312.stderr  |    0
 testsuite/tests/ghc-api/annotations/T10312.stdout  |    2 -
 testsuite/tests/ghc-api/annotations/T10357.stderr  |   14 +-
 testsuite/tests/ghc-api/annotations/T10357.stdout  |    1 -
 testsuite/tests/ghc-api/annotations/T10358.stdout  |    5 -
 testsuite/tests/ghc-api/annotations/T11018.stderr  |    2 +-
 testsuite/tests/ghc-api/annotations/T11018.stdout  |    6 +-
 .../tests/ghc-api/annotations/exampleTest.stdout   |    3 +-
 .../tests/ghc-api/annotations/listcomps.stdout     |    2 -
 .../tests/ghc-api/annotations/parseTree.stdout     |    4 +-
 testsuite/tests/ghc-api/landmines/landmines.stdout |    4 +-
 .../tests/ghci.debugger/scripts/break001.stdout    |    4 +-
 .../tests/ghci.debugger/scripts/break003.stderr    |    2 +-
 .../tests/ghci.debugger/scripts/break003.stdout    |    8 +-
 .../tests/ghci.debugger/scripts/break006.stderr    |   16 +-
 .../tests/ghci.debugger/scripts/break006.stdout    |   12 +-
 .../tests/ghci.debugger/scripts/break012.stdout    |   10 +-
 .../tests/ghci.debugger/scripts/break018.stdout    |    4 +-
 .../ghci.debugger/scripts/break022/break022.stdout |    2 +-
 .../tests/ghci.debugger/scripts/break026.stdout    |   40 +-
 .../tests/ghci.debugger/scripts/break028.stdout    |    6 +-
 .../tests/ghci.debugger/scripts/hist001.stdout     |   22 +-
 .../tests/ghci.debugger/scripts/print018.stdout    |    6 +-
 .../tests/ghci.debugger/scripts/print022.stdout    |    6 +-
 .../tests/ghci.debugger/scripts/print025.stdout    |    2 +-
 .../tests/ghci.debugger/scripts/print031.stdout    |    2 +-
 .../tests/ghci.debugger/scripts/print036.stdout    |    1 -
 testsuite/tests/ghci/prog009/ghci.prog009.stdout   |    0
 testsuite/tests/ghci/scripts/Defer02.stderr        |    7 +-
 testsuite/tests/ghci/scripts/Defer02.stdout        |    2 +-
 testsuite/tests/ghci/scripts/T10122.stdout         |    2 +-
 testsuite/tests/ghci/scripts/T10508.stderr         |    6 +-
 testsuite/tests/ghci/scripts/T2182ghci.stderr      |   10 +-
 testsuite/tests/ghci/scripts/T4087.stdout          |    2 +-
 testsuite/tests/ghci/scripts/T4175.stdout          |   15 +-
 testsuite/tests/ghci/scripts/T6018ghcifail.stderr  |    6 +-
 testsuite/tests/ghci/scripts/T7627.stdout          |    6 +-
 testsuite/tests/ghci/scripts/T7730.stdout          |    2 +-
 testsuite/tests/ghci/scripts/T7873.script          |    5 +-
 testsuite/tests/ghci/scripts/T7873.stderr          |    7 +
 testsuite/tests/ghci/scripts/T7873.stdout          |    8 +-
 testsuite/tests/ghci/scripts/T7939.stdout          |   35 +-
 testsuite/tests/ghci/scripts/T9181.stdout          |   24 +-
 testsuite/tests/ghci/scripts/ghci001.stdout        |    0
 testsuite/tests/ghci/scripts/ghci013.stdout        |    2 +-
 testsuite/tests/ghci/scripts/ghci047.stderr        |   26 +-
 testsuite/tests/ghci/scripts/ghci051.stderr        |    4 +-
 testsuite/tests/ghci/scripts/ghci055.stdout        |    4 +-
 testsuite/tests/ghci/scripts/ghci059.script        |    2 +-
 testsuite/tests/ghci/scripts/ghci059.stdout        |    2 +-
 .../should_compile_flag_haddock/haddockA023.stderr |    2 +-
 .../should_compile_flag_haddock/haddockA026.stderr |    2 +-
 .../should_compile_flag_haddock/haddockA027.stderr |    4 +-
 .../should_compile_flag_haddock/haddockA028.stderr |    2 +-
 .../should_compile/PushedInAsGivens.stderr         |    3 +-
 .../tests/indexed-types/should_compile/Simple12.hs |    1 -
 .../indexed-types/should_compile/T3017.stderr      |    5 +-
 .../indexed-types/should_compile/T3208b.stderr     |    3 +-
 .../tests/indexed-types/should_compile/T9316.hs    |    1 -
 .../tests/indexed-types/should_compile/T9747.hs    |    2 +-
 .../indexed-types/should_fail/ClosedFam3.stderr    |   24 +-
 .../indexed-types/should_fail/Overlap4.stderr      |    1 +
 .../indexed-types/should_fail/SimpleFail12.stderr  |    2 +-
 .../indexed-types/should_fail/SimpleFail14.stderr  |    8 +-
 .../indexed-types/should_fail/SimpleFail1a.stderr  |    7 +-
 .../indexed-types/should_fail/SimpleFail1b.stderr  |    4 +-
 .../indexed-types/should_fail/SimpleFail6.stderr   |    4 +-
 .../tests/indexed-types/should_fail/T10141.stderr  |    5 +-
 .../tests/indexed-types/should_fail/T10899.stderr  |    2 +-
 .../tests/indexed-types/should_fail/T2627b.stderr  |   13 +-
 .../tests/indexed-types/should_fail/T2664.stderr   |   34 +-
 .../tests/indexed-types/should_fail/T3330a.stderr  |   16 +-
 .../tests/indexed-types/should_fail/T3330c.stderr  |   23 +-
 .../tests/indexed-types/should_fail/T4179.stderr   |   22 +-
 .../tests/indexed-types/should_fail/T5439.stderr   |   46 +-
 .../tests/indexed-types/should_fail/T6123.stderr   |   12 +-
 .../tests/indexed-types/should_fail/T7786.stderr   |   64 +-
 .../tests/indexed-types/should_fail/T7788.stderr   |    6 +-
 .../tests/indexed-types/should_fail/T9160.stderr   |    2 +-
 .../tests/indexed-types/should_fail/T9171.stderr   |   17 +-
 .../tests/indexed-types/should_fail/T9357.stderr   |    2 +-
 testsuite/tests/indexed-types/should_run/T5719.hs  |    2 +-
 testsuite/tests/mdo/should_compile/mdo006.hs       |    0
 testsuite/tests/module/mod71.stderr                |   20 +-
 testsuite/tests/module/mod72.stderr                |    2 +-
 .../tests/parser/should_compile/read014.stderr     |    2 +-
 testsuite/tests/parser/should_fail/T3811d.stderr   |    2 +-
 testsuite/tests/parser/should_fail/T7848.stderr    |    4 +-
 .../tests/parser/should_fail/readFail003.stderr    |   30 +-
 .../tests/partial-sigs/should_compile/ADT.stderr   |    2 +-
 .../should_compile/DataFamilyInstanceLHS.stderr    |    2 +-
 .../partial-sigs/should_compile/Meltdown.stderr    |    2 +-
 .../partial-sigs/should_compile/SkipMany.stderr    |    2 +-
 .../partial-sigs/should_compile/T10403.stderr      |   14 +-
 .../partial-sigs/should_compile/T10438.stderr      |   16 +-
 .../partial-sigs/should_compile/T11192.stderr      |    4 +-
 .../should_compile/TypeFamilyInstanceLHS.stderr    |    3 +-
 .../WarningWildcardInstantiations.stderr           |   26 +-
 .../tests/partial-sigs/should_fail/T10045.stderr   |    4 +-
 .../should_fail/WildcardInstantiations.stderr      |   24 +-
 testsuite/tests/patsyn/should_fail/T9161-2.stderr  |    7 +-
 testsuite/tests/perf/compiler/all.T                |   42 +-
 testsuite/tests/perf/haddock/all.T                 |    6 +-
 testsuite/tests/polykinds/PolyInstances.hs         |   22 +
 testsuite/tests/polykinds/PolyKinds02.stderr       |    7 +-
 testsuite/tests/polykinds/PolyKinds04.stderr       |    5 +-
 testsuite/tests/polykinds/PolyKinds07.stderr       |    2 +-
 testsuite/tests/polykinds/SigTvKinds.hs            |    7 +
 testsuite/tests/polykinds/SigTvKinds2.hs           |    7 +
 testsuite/tests/polykinds/SigTvKinds2.stderr       |    6 +
 testsuite/tests/polykinds/T10503.stderr            |   29 +-
 testsuite/tests/polykinds/T11142.hs                |   10 +
 testsuite/tests/polykinds/T11142.stderr            |    7 +
 testsuite/tests/polykinds/T5716.hs                 |    0
 testsuite/tests/polykinds/T5716.stderr             |    9 +-
 testsuite/tests/polykinds/T6021.hs                 |    2 +-
 testsuite/tests/polykinds/T6021.stderr             |    5 +-
 testsuite/tests/polykinds/T6039.stderr             |    4 -
 testsuite/tests/polykinds/T6129.stderr             |    2 +-
 testsuite/tests/polykinds/T7224.stderr             |    9 +-
 testsuite/tests/polykinds/T7230.stderr             |    6 +-
 testsuite/tests/polykinds/T7278.hs                 |    3 +-
 testsuite/tests/polykinds/T7278.stderr             |    9 +-
 testsuite/tests/polykinds/T7328.hs                 |    2 +-
 testsuite/tests/polykinds/T7328.stderr             |   11 +-
 testsuite/tests/polykinds/T7341.hs                 |    2 +-
 testsuite/tests/polykinds/T7341.stderr             |    4 +-
 testsuite/tests/polykinds/T7404.stderr             |    7 +-
 testsuite/tests/polykinds/T7438.stderr             |   35 +-
 testsuite/tests/polykinds/T7481.stderr             |    4 -
 testsuite/tests/polykinds/T7524.stderr             |    6 +-
 testsuite/tests/polykinds/T7594.hs                 |    4 +-
 testsuite/tests/polykinds/T7805.stderr             |    8 +-
 testsuite/tests/polykinds/T7939a.stderr            |    5 +-
 testsuite/tests/polykinds/T8566.stderr             |   35 +-
 testsuite/tests/polykinds/T8616.stderr             |   14 +-
 testsuite/tests/polykinds/T9200b.stderr            |    7 +-
 testsuite/tests/polykinds/T9222.stderr             |   32 +-
 testsuite/tests/polykinds/T9569.hs                 |    2 +-
 testsuite/tests/polykinds/all.T                    |   10 +-
 testsuite/tests/rename/should_fail/T2993.stderr    |    2 +-
 .../tests/rename/should_fail/rnfail026.stderr      |   15 +-
 .../tests/rename/should_fail/rnfail055.stderr      |    3 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |   84 +-
 .../tests/roles/should_compile/Roles13.stderr      |   34 +-
 .../tests/roles/should_compile/Roles14.stderr      |    9 +-
 testsuite/tests/roles/should_compile/Roles2.stderr |   18 +-
 testsuite/tests/roles/should_compile/Roles3.stderr |   38 +-
 testsuite/tests/roles/should_compile/Roles4.stderr |   16 +-
 testsuite/tests/roles/should_compile/T8958.stderr  |    6 +-
 testsuite/tests/roles/should_compile/all.T         |   10 +-
 testsuite/tests/rts/T9045.hs                       |    1 +
 testsuite/tests/simplCore/should_compile/Makefile  |    2 +-
 .../tests/simplCore/should_compile/T7360.stderr    |   58 +-
 .../tests/simplCore/should_compile/T8274.stdout    |   10 +-
 .../tests/simplCore/should_compile/T9400.stderr    |    6 +-
 .../tests/simplCore/should_compile/rule2.stderr    |    4 +-
 .../simplCore/should_compile/spec-inline.stderr    |    7 +-
 testsuite/tests/stranal/sigs/DmdAnalGADTs.stderr   |    2 +
 testsuite/tests/stranal/sigs/T8569.stderr          |    2 +
 testsuite/tests/th/T3177a.stderr                   |   14 +-
 testsuite/tests/th/T3920.hs                        |    0
 testsuite/tests/th/T7021a.hs                       |    2 +-
 testsuite/tests/th/T8953.stderr                    |    4 +-
 testsuite/tests/th/TH_RichKinds.hs                 |    2 +-
 testsuite/tests/th/TH_RichKinds.stderr             |    4 +-
 testsuite/tests/th/TH_Roles2.stderr                |    1 +
 testsuite/tests/typecheck/should_compile/T5581.hs  |    2 +-
 testsuite/tests/typecheck/should_compile/T5655.hs  |    2 +-
 .../tests/typecheck/should_compile/T9834.stderr    |  126 +-
 .../tests/typecheck/should_compile/T9939.stderr    |   24 +-
 .../tests/typecheck/should_compile/tc141.stderr    |   20 +-
 .../tests/typecheck/should_compile/tc167.stderr    |    1 +
 .../tests/typecheck/should_compile/tc211.stderr    |   20 +-
 .../tests/typecheck/should_compile/tc231.stderr    |    4 +-
 .../tests/typecheck/should_compile/tc243.stderr    |    2 +-
 testsuite/tests/typecheck/should_compile/tc255.hs  |    2 +-
 testsuite/tests/typecheck/should_compile/tc256.hs  |    2 +-
 testsuite/tests/typecheck/should_compile/tc257.hs  |    2 +-
 testsuite/tests/typecheck/should_compile/tc258.hs  |    2 +-
 .../typecheck/should_fail/AssocTyDef04.stderr      |    2 +-
 .../tests/typecheck/should_fail/AssocTyDef06.hs    |    2 +-
 .../typecheck/should_fail/AssocTyDef06.stderr      |    9 +-
 .../typecheck/should_fail/FrozenErrorTests.stderr  |   87 +-
 .../tests/typecheck/should_fail/T10285.stderr      |    2 +-
 .../tests/typecheck/should_fail/T11112.stderr      |    2 +-
 testsuite/tests/typecheck/should_fail/T1633.hs     |    2 +
 testsuite/tests/typecheck/should_fail/T1633.stderr |    6 +-
 testsuite/tests/typecheck/should_fail/T2994.stderr |   32 +-
 testsuite/tests/typecheck/should_fail/T3540.stderr |   22 +-
 testsuite/tests/typecheck/should_fail/T3950.stderr |   22 +-
 testsuite/tests/typecheck/should_fail/T4875.stderr |    8 +-
 testsuite/tests/typecheck/should_fail/T5570.stderr |   12 +-
 testsuite/tests/typecheck/should_fail/T5853.stderr |   35 +-
 .../tests/typecheck/should_fail/T6018fail.stderr   |    8 +-
 .../typecheck/should_fail/T6018failclosed.stderr   |   13 +-
 testsuite/tests/typecheck/should_fail/T7368.stderr |   12 +-
 .../tests/typecheck/should_fail/T7368a.stderr      |   20 +-
 testsuite/tests/typecheck/should_fail/T7410.stderr |    8 +-
 testsuite/tests/typecheck/should_fail/T7453.stderr |   64 +-
 testsuite/tests/typecheck/should_fail/T7609.stderr |   19 +-
 testsuite/tests/typecheck/should_fail/T7645.stderr |    8 +-
 testsuite/tests/typecheck/should_fail/T7696.stderr |    4 +-
 testsuite/tests/typecheck/should_fail/T7734.stderr |   28 +-
 testsuite/tests/typecheck/should_fail/T7778.stderr |   13 +-
 testsuite/tests/typecheck/should_fail/T7857.stderr |   30 +-
 testsuite/tests/typecheck/should_fail/T7892.stderr |    2 +-
 testsuite/tests/typecheck/should_fail/T8030.stderr |    6 +-
 testsuite/tests/typecheck/should_fail/T8262.stderr |   14 +-
 testsuite/tests/typecheck/should_fail/T8514.stderr |    3 +-
 testsuite/tests/typecheck/should_fail/T8603.stderr |   12 +-
 testsuite/tests/typecheck/should_fail/T8806.stderr |   20 +-
 testsuite/tests/typecheck/should_fail/T9109.stderr |   27 +-
 testsuite/tests/typecheck/should_fail/T9196.stderr |   15 +-
 testsuite/tests/typecheck/should_fail/T9201.stderr |    9 +-
 testsuite/tests/typecheck/should_fail/T9260.stderr |   10 +-
 testsuite/tests/typecheck/should_fail/T9999.stderr |   15 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |  100 +-
 .../typecheck/should_fail/TcCoercibleFail2.hs      |    2 +
 .../typecheck/should_fail/TcCoercibleFail2.stderr  |    4 +-
 .../tests/typecheck/should_fail/tcfail002.stderr   |   14 +-
 .../tests/typecheck/should_fail/tcfail004.stderr   |   16 +-
 .../tests/typecheck/should_fail/tcfail005.stderr   |   16 +-
 .../tests/typecheck/should_fail/tcfail010.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail013.stderr   |   11 +-
 .../tests/typecheck/should_fail/tcfail014.stderr   |   14 +-
 .../tests/typecheck/should_fail/tcfail018.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail032.stderr   |   24 +-
 testsuite/tests/typecheck/should_fail/tcfail036.hs |    2 +
 .../tests/typecheck/should_fail/tcfail036.stderr   |   10 +-
 .../tests/typecheck/should_fail/tcfail049.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail050.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail057.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail070.stderr   |    3 +-
 .../tests/typecheck/should_fail/tcfail078.stderr   |    6 +-
 .../tests/typecheck/should_fail/tcfail088.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail090.stderr   |   10 +-
 .../tests/typecheck/should_fail/tcfail099.stderr   |   26 +-
 .../tests/typecheck/should_fail/tcfail113.stderr   |   20 +-
 .../tests/typecheck/should_fail/tcfail122.stderr   |   29 +-
 .../tests/typecheck/should_fail/tcfail123.stderr   |    6 +-
 .../tests/typecheck/should_fail/tcfail132.stderr   |   13 +-
 .../tests/typecheck/should_fail/tcfail133.stderr   |    8 +-
 .../tests/typecheck/should_fail/tcfail140.stderr   |   58 +-
 .../tests/typecheck/should_fail/tcfail146.stderr   |    8 +-
 .../tests/typecheck/should_fail/tcfail147.stderr   |    4 +-
 .../tests/typecheck/should_fail/tcfail151.stderr   |    7 +
 .../tests/typecheck/should_fail/tcfail159.stderr   |    6 +-
 .../tests/typecheck/should_fail/tcfail160.stderr   |    7 +-
 .../tests/typecheck/should_fail/tcfail161.stderr   |    7 +-
 .../tests/typecheck/should_fail/tcfail181.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail184.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail195.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail196.stderr   |    5 +-
 .../tests/typecheck/should_fail/tcfail197.stderr   |    7 +-
 .../tests/typecheck/should_fail/tcfail200.stderr   |   14 +-
 .../tests/typecheck/should_fail/tcfail201.stderr   |    2 +-
 .../tests/typecheck/should_fail/tcfail212.stderr   |   24 +-
 testsuite/tests/typecheck/should_fail/tcfail213.hs |    2 +-
 testsuite/tests/typecheck/should_fail/tcfail214.hs |    2 +-
 .../tests/typecheck/should_fail/tcfail217.stderr   |    2 +-
 testsuite/tests/typecheck/should_run/T10284.hs     |   11 +-
 testsuite/tests/typecheck/should_run/T10284.stderr |    8 +-
 testsuite/tests/typecheck/should_run/T10284.stdout |    2 +-
 testsuite/tests/typecheck/should_run/T7861.stdout  |    1 -
 testsuite/tests/typecheck/should_run/tcrun043.hs   |    2 +-
 testsuite/tests/typecheck/should_run/tcrun044.hs   |    2 +-
 .../tests/warnings/should_compile/T11077.stderr    |    2 +-
 utils/genprimopcode/Main.hs                        |    2 +-
 utils/haddock                                      |    2 +-
 576 files changed, 21781 insertions(+), 15223 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6746549772c5cc0ac66c0fce562f297f4d4b80a2

From git at git.haskell.org  Fri Dec 11 23:30:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 23:30:46 +0000 (UTC)
Subject: [commit: ghc] master: Revert README.md changes from 6746549772c5
 (5183109)
Message-ID: <20151211233046.D81EF3A300@ghc.haskell.org>

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

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

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

commit 518310915fa2298f105a2ff5facd4c1ef796717d
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Dec 11 17:31:23 2015 -0600

    Revert README.md changes from 6746549772c5
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

518310915fa2298f105a2ff5facd4c1ef796717d
 README.md | 90 ++++++++++++++-------------------------------------------------
 1 file changed, 19 insertions(+), 71 deletions(-)

diff --git a/README.md b/README.md
index ac97f34..227657f 100644
--- a/README.md
+++ b/README.md
@@ -1,91 +1,39 @@
-Dependent Types Branch of GHC
-=============================
+The Glasgow Haskell Compiler
+============================
 
-This is a fork of GHC, with work toward supporting dependent types.
-Anyone is welcome to download and play with this implementation,
-and I am happy to receive feedback and issue reports on GitHub.
+[![Build Status](https://api.travis-ci.org/ghc/ghc.svg?branch=master)](http://travis-ci.org/ghc/ghc)
 
-There are two options of using this branch:  manual, and Nix-based.
+This is the source tree for [GHC][1], a compiler and interactive
+environment for the Haskell functional programming language.
 
-Manual
-------
-
-This code should build, but I have tested it only on `DEBUG` settings;
-I recommend using build style `devel2` in `build.mk`.
-
-Here is a minimal script you can follow to build this at home;
-see the [GHC Building Guide] [3] for more info.
-
-~~~
-git clone https://github.com/goldfirere/ghc.git
-cd ghc
-git checkout nokinds
-git remote set-url origin git://git.haskell.org/ghc.git   # so submodules work
-git submodule update --init
-cd mk
-cp build.mk.sample build.mk
-## edit build.mk to uncomment the line to choose the `devel2` configuration
-cd ..
-perl boot
-./configure
-make
-~~~
-
-Check out the `testsuite/tests/dependent/should_compile` directory for
-a few sample programs that should compile on this fork of GHC.
-
-For more information about GHC, visit [GHC's web site][1].
+For more information, visit [GHC's web site][1].
 
 Information for developers of GHC can be found on the [GHC Trac][2].
 
-Nix-based
----------
-
-Thanks to @deepfire, this branch is available in Nixpkgs, which means that with
-some effort it can be fairly automatically employed to build any package from
-Hackage.  This way, though, requires that one installs the Nix package manager in
-parallel with the system package manager -- and this option is currently
-unavailable on Windows.
-
-Here are the instructions:
-
-1. To install the Nix package manager, taking over /nix for package storage:
-
-        curl https://nixos.org/nix/install | sh
-
-2. Make Nix use the `master` repository of Nixpkgs package definitions:
 
-    	git clone https://github.com/NixOS/nixpkgs.git
-    	pushd ~/.nix-defexpr
-    	rm -rf channels
-    	ln -s ../nixpkgs
-    	popd
-    	echo 'export NIX_PATH=nixpkgs=/home/---<USERNAME>---/nixpkgs' >> ~/.bashrc
-    	export NIX_PATH=nixpkgs=/home/---<USERNAME>---/nixpkgs
+Getting the Source
+==================
 
-3. [OPTIONAL] To enable prebuilt binaries from Peter Simons/NixOS Hydra servers:
+There are two ways to get a source tree:
 
-    	sudo mkdir /etc/nix
-    	echo 'binary-caches = http://hydra.nixos.org/ http://hydra.cryp.to/' | sudo dd of=/etc/nix/nix.conf
+ 1. *Download source tarballs*
 
-    	# If you don't do that, everything will still work, just it'll have
-    	# to build everything from source.
+  Download the GHC source distribution:
 
-4. Enter a shell with `ghc-nokinds` available:
+        ghc-<version>-src.tar.bz2
 
-        nix-shell -p haskell.compiler.ghcNokinds
+  which contains GHC itself and the "boot" libraries.
 
-5. See it's indeed `nokinds`:
+ 2. *Check out the source code from git*
 
-    	wget https://raw.githubusercontent.com/goldfirere/ghc/nokinds/testsuite/tests/dependent/should_compile/KindEqualities2.hs
-    	runhaskell KindEqualities2.hs
+        $ git clone --recursive git://git.haskell.org/ghc.git
 
-To apply 'nokinds' to building packages from Hackage, the best option would be
-to follow instructions from the "Nix loves Haskell" talk by Peter Simons:
+  Note: cloning GHC from Github requires a special setup. See [Getting a GHC
+  repository from Github] [7].
 
-   http://cryp.to/nixos-meetup-3-slides.pdf
+  **DO NOT submit pull request directly to the github repo.**
+  *See the GHC team's working conventions re [how to contribute a patch to GHC](http://ghc.haskell.org/trac/ghc/wiki/WorkingConventions/FixingBugs "ghc.haskell.org/trac/ghc/wiki/WorkingConventions/FixingBug").*
 
-..where the relevant compiler name would be "ghcNokinds".
 
 Building & Installing
 =====================


From git at git.haskell.org  Fri Dec 11 23:35:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 23:35:56 +0000 (UTC)
Subject: [commit: ghc] master: haddock: Fix submodule commit to point to
 ghc-head (a6e0394)
Message-ID: <20151211233556.EA4173A300@ghc.haskell.org>

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

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

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

commit a6e03945a75fa541b84e433e40eae8dd081d4cbf
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Dec 11 17:34:26 2015 -0600

    haddock: Fix submodule commit to point to ghc-head
    
    6746549772c5 accidentally pointed it to a branch (wip/rae-nokinds), before
    rebasing it onto ghc-head.
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

a6e03945a75fa541b84e433e40eae8dd081d4cbf
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index bd61e8e..0fc8cfd 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit bd61e8e22b11d1c4f03dd6ddc45a794e3362d45c
+Subproject commit 0fc8cfd532f5dfd12b5504f44a2b3c9fb659cd87


From git at git.haskell.org  Fri Dec 11 23:35:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 23:35:59 +0000 (UTC)
Subject: [commit: ghc] master: Revert .gitmodules changes from 6746549772c5
 (b5d5d83)
Message-ID: <20151211233559.89D793A300@ghc.haskell.org>

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

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

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

commit b5d5d83122c93c2a25839127edfd6b2df7ed6928
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Dec 11 17:36:20 2015 -0600

    Revert .gitmodules changes from 6746549772c5
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

b5d5d83122c93c2a25839127edfd6b2df7ed6928
 .gitmodules | 58 +++++++++++++++++++++++++++++-----------------------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 26b4fa0..73ce0d1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,119 +1,119 @@
 [submodule "libraries/binary"]
 	path = libraries/binary
-	url = http://git.haskell.org/packages/binary.git
+	url = ../packages/binary.git
 	ignore = untracked
 [submodule "libraries/bytestring"]
 	path = libraries/bytestring
-	url = http://git.haskell.org/packages/bytestring.git
+	url = ../packages/bytestring.git
 	ignore = untracked
 [submodule "libraries/Cabal"]
 	path = libraries/Cabal
-	url = http://git.haskell.org/packages/Cabal.git
+	url = ../packages/Cabal.git
 	ignore = untracked
 [submodule "libraries/containers"]
 	path = libraries/containers
-	url = http://git.haskell.org/packages/containers.git
+	url = ../packages/containers.git
 	ignore = untracked
 [submodule "libraries/haskeline"]
 	path = libraries/haskeline
-	url = http://git.haskell.org/packages/haskeline.git
+	url = ../packages/haskeline.git
 	ignore = untracked
 [submodule "libraries/pretty"]
 	path = libraries/pretty
-	url = http://git.haskell.org/packages/pretty.git
+	url = ../packages/pretty.git
 	ignore = untracked
 [submodule "libraries/terminfo"]
 	path = libraries/terminfo
-	url = http://git.haskell.org/packages/terminfo.git
+	url = ../packages/terminfo.git
 	ignore = untracked
 [submodule "libraries/transformers"]
 	path = libraries/transformers
-	url = http://git.haskell.org/packages/transformers.git
+	url = ../packages/transformers.git
 	ignore = untracked
 [submodule "libraries/xhtml"]
 	path = libraries/xhtml
-	url = http://git.haskell.org/packages/xhtml.git
+	url = ../packages/xhtml.git
 	ignore = untracked
 [submodule "libraries/Win32"]
 	path = libraries/Win32
-	url = http://git.haskell.org/packages/Win32.git
+	url = ../packages/Win32.git
 	ignore = untracked
 [submodule "libraries/primitive"]
 	path = libraries/primitive
-	url = http://git.haskell.org/packages/primitive.git
+	url = ../packages/primitive.git
 	ignore = untracked
 [submodule "libraries/vector"]
 	path = libraries/vector
-	url = http://git.haskell.org/packages/vector.git
+	url = ../packages/vector.git
 	ignore = untracked
 [submodule "libraries/time"]
 	path = libraries/time
-	url = http://git.haskell.org/packages/time.git
+	url = ../packages/time.git
 	ignore = untracked
 [submodule "libraries/random"]
 	path = libraries/random
-	url = http://git.haskell.org/packages/random.git
+	url = ../packages/random.git
 	ignore = untracked
 [submodule "libraries/array"]
 	path = libraries/array
-	url = http://git.haskell.org/packages/array.git
+	url = ../packages/array.git
 	ignore = none
 [submodule "libraries/deepseq"]
 	path = libraries/deepseq
-	url = http://git.haskell.org/packages/deepseq.git
+	url = ../packages/deepseq.git
 	ignore = none
 [submodule "libraries/directory"]
 	path = libraries/directory
-	url = http://git.haskell.org/packages/directory.git
+	url = ../packages/directory.git
 	ignore = none
 [submodule "libraries/filepath"]
 	path = libraries/filepath
-	url = http://git.haskell.org/packages/filepath.git
+	url = ../packages/filepath.git
 	ignore = none
 [submodule "libraries/hoopl"]
 	path = libraries/hoopl
-	url = http://git.haskell.org/packages/hoopl.git
+	url = ../packages/hoopl.git
 	ignore = none
 [submodule "libraries/hpc"]
 	path = libraries/hpc
-	url = http://git.haskell.org/packages/hpc.git
+	url = ../packages/hpc.git
 	ignore = none
 [submodule "libraries/process"]
 	path = libraries/process
-	url = http://git.haskell.org/packages/process.git
+	url = ../packages/process.git
 	ignore = none
 [submodule "libraries/unix"]
 	path = libraries/unix
-	url = http://git.haskell.org/packages/unix.git
+	url = ../packages/unix.git
 	ignore = none
 [submodule "libraries/parallel"]
 	path = libraries/parallel
-	url = http://git.haskell.org/packages/parallel.git
+	url = ../packages/parallel.git
 	ignore = none
 [submodule "libraries/stm"]
 	path = libraries/stm
-	url = http://git.haskell.org/packages/stm.git
+	url = ../packages/stm.git
 	ignore = none
 [submodule "libraries/dph"]
 	path = libraries/dph
-	url = http://git.haskell.org/packages/dph.git
+	url = ../packages/dph.git
 	ignore = none
 [submodule "utils/haddock"]
 	path = utils/haddock
-	url = http://git.haskell.org/haddock.git
+	url = ../haddock.git
 	ignore = none
 	branch = ghc-head
 [submodule "nofib"]
 	path = nofib
-	url = http://git.haskell.org/nofib.git
+	url = ../nofib.git
 	ignore = none
 [submodule "utils/hsc2hs"]
 	path = utils/hsc2hs
-	url = http://git.haskell.org/hsc2hs.git
+	url = ../hsc2hs.git
 	ignore = none
 [submodule "libffi-tarballs"]
 	path = libffi-tarballs
-	url = http://git.haskell.org/libffi-tarballs.git
+	url = ../libffi-tarballs.git
 	ignore = none
 [submodule ".arc-linters/arcanist-external-json-linter"]
 	path = .arc-linters/arcanist-external-json-linter


From git at git.haskell.org  Fri Dec 11 23:51:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 11 Dec 2015 23:51:40 +0000 (UTC)
Subject: [commit: ghc] master: rm rae.txt (a459451)
Message-ID: <20151211235140.D02983A300@ghc.haskell.org>

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

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

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

commit a459451f6c1b292129994dbc13ef6eaaffa11864
Author: Austin Seipp <austin at well-typed.com>
Date:   Fri Dec 11 17:52:15 2015 -0600

    rm rae.txt
    
    Signed-off-by: Austin Seipp <austin at well-typed.com>


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

a459451f6c1b292129994dbc13ef6eaaffa11864
 rae.txt | 319 ----------------------------------------------------------------
 1 file changed, 319 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a459451f6c1b292129994dbc13ef6eaaffa11864

From git at git.haskell.org  Sat Dec 12 02:53:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 02:53:15 +0000 (UTC)
Subject: [commit: ghc] master: Test case for #7961. (68f198f)
Message-ID: <20151212025315.D7C973A300@ghc.haskell.org>

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

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

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

commit 68f198f50ca6439957a65a95ce6e087d43b56eed
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Dec 11 21:51:37 2015 -0500

    Test case for #7961.
    
    Test case: dependent/shoud_compile/TypeLevelVec


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

68f198f50ca6439957a65a95ce6e087d43b56eed
 .../tests/dependent/should_compile/TypeLevelVec.hs | 26 ++++++++++++++++++++++
 testsuite/tests/dependent/should_compile/all.T     |  1 +
 2 files changed, 27 insertions(+)

diff --git a/testsuite/tests/dependent/should_compile/TypeLevelVec.hs b/testsuite/tests/dependent/should_compile/TypeLevelVec.hs
new file mode 100644
index 0000000..19f605c
--- /dev/null
+++ b/testsuite/tests/dependent/should_compile/TypeLevelVec.hs
@@ -0,0 +1,26 @@
+{-# LANGUAGE TypeInType, UnicodeSyntax, GADTs, NoImplicitPrelude,
+             TypeOperators, TypeFamilies #-}
+{-# OPTIONS_GHC -fno-warn-unticked-promoted-constructors #-}
+
+module TypeLevelVec where
+
+import Data.Kind
+
+data ? ? Type where
+  O ? ?
+  S ? ? ? ?
+
+type family x + y where
+  O   + n = n
+  S m + n = S (m + n)
+infixl 5 +
+
+data Vec ? ? ? Type ? Type where
+  Nil  ? Vec O a
+  (:>) ? a ? Vec n a ? Vec (S n) a
+infixr 8 :>
+
+type family (x ? Vec n a) ++ (y ? Vec m a) ? Vec (n + m) a where
+  Nil       ++ y = y
+  (x :> xs) ++ y = x :> (xs ++ y)
+infixl 5 ++
diff --git a/testsuite/tests/dependent/should_compile/all.T b/testsuite/tests/dependent/should_compile/all.T
index 0f231db..1724ff6 100644
--- a/testsuite/tests/dependent/should_compile/all.T
+++ b/testsuite/tests/dependent/should_compile/all.T
@@ -8,3 +8,4 @@ test('RAE_T32b', only_ways('normal'), compile, [''])
 test('KindLevels', normal, compile, [''])
 test('RaeBlogPost', normal, compile, [''])
 test('mkGADTVars', normal, compile, [''])
+test('TypeLevelVec',normal,compile, [''])


From git at git.haskell.org  Sat Dec 12 03:07:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 03:07:00 +0000 (UTC)
Subject: [commit: ghc] master: Test #9017 in polykinds/T9017 (779dfea)
Message-ID: <20151212030700.5A5943A300@ghc.haskell.org>

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

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

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

commit 779dfea1d9cc713d9b1e26bb559e8da309b2aeec
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Dec 11 22:07:06 2015 -0500

    Test #9017 in polykinds/T9017


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

779dfea1d9cc713d9b1e26bb559e8da309b2aeec
 testsuite/tests/polykinds/T9017.hs     |  8 ++++++++
 testsuite/tests/polykinds/T9017.stderr | 26 ++++++++++++++++++++++++++
 testsuite/tests/polykinds/all.T        |  1 +
 3 files changed, 35 insertions(+)

diff --git a/testsuite/tests/polykinds/T9017.hs b/testsuite/tests/polykinds/T9017.hs
new file mode 100644
index 0000000..7f93f54
--- /dev/null
+++ b/testsuite/tests/polykinds/T9017.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE PolyKinds #-}
+
+module T9017 where
+
+import Control.Arrow
+
+foo :: a b (m b)
+foo = arr return
diff --git a/testsuite/tests/polykinds/T9017.stderr b/testsuite/tests/polykinds/T9017.stderr
new file mode 100644
index 0000000..857d11a
--- /dev/null
+++ b/testsuite/tests/polykinds/T9017.stderr
@@ -0,0 +1,26 @@
+
+T9017.hs:8:7: error:
+    ? Couldn't match kind ?k? with ?*?
+      ?k? is a rigid type variable bound by
+        the type signature for:
+          foo :: forall k k1 (a :: k1 -> k -> *) (b :: k1) (m :: k1 -> k).
+                 a b (m b)
+        at T9017.hs:7:8
+      When matching the kind of ?a?
+    ? In the expression: arr return
+      In an equation for ?foo?: foo = arr return
+    ? Relevant bindings include
+        foo :: a b (m b) (bound at T9017.hs:8:1)
+
+T9017.hs:8:7: error:
+    ? Couldn't match kind ?k1? with ?*?
+      ?k1? is a rigid type variable bound by
+        the type signature for:
+          foo :: forall k k1 (a :: k1 -> k -> *) (b :: k1) (m :: k1 -> k).
+                 a b (m b)
+        at T9017.hs:7:8
+      When matching the kind of ?a?
+    ? In the expression: arr return
+      In an equation for ?foo?: foo = arr return
+    ? Relevant bindings include
+        foo :: a b (m b) (bound at T9017.hs:8:1)
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index a93ad8b..0005abc 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -126,3 +126,4 @@ test('T10934', normal, compile, [''])
 test('T11142', normal, compile_fail, [''])
 test('SigTvKinds', expect_broken(11203), compile, [''])
 test('SigTvKinds2', expect_broken(11203), compile_fail, [''])
+test('T9017', normal, compile_fail, [''])


From git at git.haskell.org  Sat Dec 12 08:38:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 08:38:11 +0000 (UTC)
Subject: [commit: ghc] master: Frontend plugins. (a3c2a26)
Message-ID: <20151212083811.3C2073A300@ghc.haskell.org>

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

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

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

commit a3c2a26b3af034f09c960b2dad38f73be7e3a655
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Thu Dec 10 20:41:53 2015 -0800

    Frontend plugins.
    
    Summary:
    Frontend plugins enable users to write plugins to replace
    GHC major modes.  E.g. instead of saying
    
        ghc --make A B C
    
    a user can now say
    
        ghc --frontend GHC.Frontend.Shake A B C
    
    which might provide an alternative implementation of a multi-module
    build.  For more details, see the manual entry.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: simonmar, bgamari, austin, simonpj
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1598
    
    GHC Trac Issues: #11194


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

a3c2a26b3af034f09c960b2dad38f73be7e3a655
 compiler/main/DynFlags.hs                 |  6 ++++
 compiler/main/DynamicLoading.hs           | 19 +++++++----
 compiler/main/Plugins.hs                  | 10 ++++++
 compiler/prelude/PrelNames.hs             |  6 +++-
 docs/users_guide/extending_ghc.rst        | 50 +++++++++++++++++++++++++++++
 ghc/Main.hs                               | 27 ++++++++++++++++
 testsuite/.gitignore                      |  1 +
 testsuite/tests/plugins/FrontendPlugin.hs | 52 +++++++++++++++++++++++++++++++
 testsuite/tests/plugins/Makefile          |  7 +++++
 testsuite/tests/plugins/all.T             |  3 ++
 testsuite/tests/plugins/frontend01.hs     |  1 +
 testsuite/tests/plugins/frontend01.stdout |  4 +++
 12 files changed, 179 insertions(+), 7 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a3c2a26b3af034f09c960b2dad38f73be7e3a655

From git at git.haskell.org  Sat Dec 12 16:39:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 16:39:31 +0000 (UTC)
Subject: [commit: ghc] master: Implement -fwarn-missing-pat-syn-sigs (1883afb)
Message-ID: <20151212163931.8084B3A300@ghc.haskell.org>

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

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

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

commit 1883afb2eee88c828adf6aa8014bab64dd6e8096
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Sat Dec 12 16:38:07 2015 +0000

    Implement -fwarn-missing-pat-syn-sigs
    
    This adds a warning when a pattern synonym is not accompanied by a
    signature in the style of `-fwarn-missing-sigs`.
    
    It is turned on by -Wall.
    
    If the user specifies, `-fwarn-missing-exported-signatures` with
    `-fwarn-missing-pat-syn-sigs` then it will only warn when the pattern
    synonym is exported.
    
    Test Plan: ./validate
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1596
    
    GHC Trac Issues: #11053


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

1883afb2eee88c828adf6aa8014bab64dd6e8096
 compiler/hsSyn/HsBinds.hs                        | 13 +++++-
 compiler/main/DynFlags.hs                        |  7 +++-
 compiler/rename/RnNames.hs                       | 50 ++++++++++++++++--------
 docs/users_guide/7.12.1-notes.rst                |  4 ++
 docs/users_guide/using-warnings.rst              | 11 ++++++
 libraries/base/GHC/Exception.hs                  |  1 +
 testsuite/tests/patsyn/should_compile/all.T      |  2 -
 testsuite/tests/patsyn/should_fail/T11053.hs     | 18 +++++++++
 testsuite/tests/patsyn/should_fail/T11053.stderr | 19 +++++++++
 testsuite/tests/patsyn/should_fail/all.T         |  1 +
 10 files changed, 104 insertions(+), 22 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1883afb2eee88c828adf6aa8014bab64dd6e8096

From git at git.haskell.org  Sat Dec 12 17:38:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 17:38:51 +0000 (UTC)
Subject: [commit: ghc] master: Dwarf: Use .short instead of .hword on Darwin
 (3640ae9)
Message-ID: <20151212173851.E99FB3A300@ghc.haskell.org>

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

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

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

commit 3640ae92fc1ffa283425203bba3dbf231fcb3e52
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sat Dec 12 17:00:10 2015 +0100

    Dwarf: Use .short instead of .hword on Darwin
    
    Apparently gnu as uses `.short` as a synonym for `.word`. To emit a
    16-bit value one would use `.hword`. However, Darwin doesn't support
    `.hword`, instead taking `.short` to mean a 16-bit value. The
    insanity is nearly unbearable!
    
    OS X reference:
    https://developer.apple.com/library/mac/documentation/DeveloperTools/Ref
    erence/Assembler/040-Assembler_Directives/asm_directives.html#//apple_re
    f/doc/uid/TP30000823-TPXREF101
    
    gnu as reference:
    https://sourceware.org/binutils/docs/as/hword.html#hword
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1602
    
    GHC Trac Issues: #11202


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

3640ae92fc1ffa283425203bba3dbf231fcb3e52
 compiler/nativeGen/Dwarf/Types.hs | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/compiler/nativeGen/Dwarf/Types.hs b/compiler/nativeGen/Dwarf/Types.hs
index 91a5e41..e80f2a1 100644
--- a/compiler/nativeGen/Dwarf/Types.hs
+++ b/compiler/nativeGen/Dwarf/Types.hs
@@ -477,7 +477,14 @@ pprByte x = ptext (sLit "\t.byte ") <> ppr (fromIntegral x :: Word)
 
 -- | Assembly for a two-byte constant integer
 pprHalf :: Word16 -> SDoc
-pprHalf x = ptext (sLit "\t.hword ") <> ppr (fromIntegral x :: Word)
+pprHalf x = sdocWithPlatform $ \plat ->
+  -- Naturally Darwin doesn't support `.hword` and binutils uses `.short`
+  -- as a synonym for `.word` (but only some of the time!). The madness
+  -- is nearly too much to bear.
+  let dir = case platformOS plat of
+        OSDarwin -> text ".short"
+        _        -> text ".hword"
+  in text "\t" <> dir <+> ppr (fromIntegral x :: Word)
 
 -- | Assembly for a constant DWARF flag
 pprFlag :: Bool -> SDoc


From git at git.haskell.org  Sat Dec 12 17:38:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 17:38:55 +0000 (UTC)
Subject: [commit: ghc] master: Make -XStrict imply -XStrictData (4935b48)
Message-ID: <20151212173855.225FE3A300@ghc.haskell.org>

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

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

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

commit 4935b48bdbed916507d585f9185960916ed5f04b
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Sat Dec 12 16:58:40 2015 +0100

    Make -XStrict imply -XStrictData
    
    Fixes #11182.
    
    Reviewers: bgamari, simonpj, austin
    
    Reviewed By: simonpj, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1592
    
    GHC Trac Issues: #11182


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

4935b48bdbed916507d585f9185960916ed5f04b
 compiler/main/DynFlags.hs            |  1 +
 testsuite/tests/driver/T11182.hs     | 10 ++++++++++
 testsuite/tests/driver/T11182.stdout |  1 +
 testsuite/tests/driver/all.T         |  1 +
 4 files changed, 13 insertions(+)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 6487379..63cfe03 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3381,6 +3381,7 @@ impliedXFlags
     , (Opt_DuplicateRecordFields, turnOn, Opt_DisambiguateRecordFields)
 
     , (Opt_TemplateHaskell, turnOn, Opt_TemplateHaskellQuotes)
+    , (Opt_Strict, turnOn, Opt_StrictData)
   ]
 
 -- Note [Documenting optimisation flags]
diff --git a/testsuite/tests/driver/T11182.hs b/testsuite/tests/driver/T11182.hs
new file mode 100644
index 0000000..a8bedf4
--- /dev/null
+++ b/testsuite/tests/driver/T11182.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE Strict #-}
+-- | Strict should imply StrictData
+module Main where
+
+data Lazy a = Lazy ~a
+
+main :: IO ()
+main =
+  case Lazy undefined of
+    Lazy _ -> putStrLn "Lazy"
diff --git a/testsuite/tests/driver/T11182.stdout b/testsuite/tests/driver/T11182.stdout
new file mode 100644
index 0000000..e2749de
--- /dev/null
+++ b/testsuite/tests/driver/T11182.stdout
@@ -0,0 +1 @@
+Lazy
diff --git a/testsuite/tests/driver/all.T b/testsuite/tests/driver/all.T
index 5c0de6e..12522df 100644
--- a/testsuite/tests/driver/all.T
+++ b/testsuite/tests/driver/all.T
@@ -460,3 +460,4 @@ test('T9360b', normal, run_command, ['{compiler} -e "" --interactive'])
 test('T10970', normal, compile_and_run, ['-hide-all-packages -package base -package containers'])
 test('T10970a', normal, compile_and_run, [''])
 test('T4931', normal, compile_and_run, [''])
+test('T11182', normal, compile_and_run, [''])


From git at git.haskell.org  Sat Dec 12 17:38:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 17:38:58 +0000 (UTC)
Subject: [commit: ghc] master: Rework the Implicit CallStack solver to handle
 local lets. (3ec8288)
Message-ID: <20151212173858.CB6C33A300@ghc.haskell.org>

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

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

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

commit 3ec8288a18d57fb856e257905897daae237a1d5d
Author: Eric Seidel <gridaphobe at gmail.com>
Date:   Sat Dec 12 16:53:50 2015 +0100

    Rework the Implicit CallStack solver to handle local lets.
    
    We can't just solve CallStack constraints indiscriminately when they
    occur in the RHS of a let-binder. The top-level given CallStack (if
    any) will not be in scope, so I've re-worked the CallStack solver as
    follows:
    
    1. CallStacks are treated like regular IPs unless one of the following
       two rules apply.
    
    2. In a function call, we push the call-site onto a NEW wanted
       CallStack, which GHC will solve as a regular IP (either directly from a
       given, or by quantifying over it in a local let).
    
    3. If, after the constraint solver is done, any wanted CallStacks
       remain, we default them to the empty CallStack. This rule exists mainly
       to clean up after rule 2 in a top-level binder with no given CallStack.
    
    In rule (2) we have to be careful to emit the new wanted with an
    IPOccOrigin instead of an OccurrenceOf origin, so rule (2) doesn't fire
    again. This is a bit shady but I've updated the Note to explain the
    trick.
    
    Test Plan: validate
    
    Reviewers: simonpj, austin, bgamari, hvr
    
    Reviewed By: simonpj, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1422
    
    GHC Trac Issues: #10845


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

3ec8288a18d57fb856e257905897daae237a1d5d
 .gitignore                                         |   1 +
 compiler/deSugar/DsBinds.hs                        |   3 +-
 compiler/typecheck/TcEvidence.hs                   | 119 ++++++++++-----------
 compiler/typecheck/TcHsSyn.hs                      |   2 -
 compiler/typecheck/TcInteract.hs                   |  77 +++++++------
 compiler/typecheck/TcRnTypes.hs                    |  17 ++-
 compiler/typecheck/TcSimplify.hs                   |  38 ++++++-
 compiler/utils/Outputable.hs                       |   5 +-
 docs/users_guide/7.12.1-notes.rst                  |  46 ++++----
 docs/users_guide/glasgow_exts.rst                  |  63 +++++------
 libraries/base/GHC/Exception.hs                    |  40 ++++---
 libraries/base/GHC/IO/Exception.hs                 |   2 +-
 libraries/base/GHC/Stack.hs                        |   6 +-
 libraries/base/GHC/Stack/Types.hs                  |  59 +++++++---
 libraries/base/changelog.md                        |  12 ++-
 testsuite/.gitignore                               |   1 +
 testsuite/tests/codeGen/should_run/cgrun059.stderr |   1 +
 .../tests/concurrent/should_run/conc021.stderr     |   1 +
 .../tests/ghci.debugger/scripts/break011.stdout    |   8 +-
 .../tests/ghci.debugger/scripts/break017.stdout    |   3 +-
 .../tests/ghci.debugger/scripts/print033.stdout    |   2 +-
 testsuite/tests/ghci/scripts/T5557.stdout          |   6 +-
 testsuite/tests/ghci/scripts/T8959.stdout          |   9 +-
 testsuite/tests/ghci/scripts/ghci013.stdout        |   2 +-
 testsuite/tests/ghci/scripts/ghci046.stdout        |   4 +-
 testsuite/tests/ghci/scripts/ghci055.stdout        |   7 +-
 .../should_compile/ExtraConstraints3.stderr        |   4 +-
 .../tests/partial-sigs/should_fail/T10999.stderr   |   7 +-
 .../tests/pmcheck/should_compile/T3927b.stderr     |  39 -------
 testsuite/tests/th/T1849.script                    |   6 +-
 testsuite/tests/typecheck/should_run/IPLocation.hs |  26 ++---
 .../tests/typecheck/should_run/IPLocation.stdout   |  36 +++----
 testsuite/tests/typecheck/should_run/T10845.hs     |  20 ++++
 testsuite/tests/typecheck/should_run/T10845.stdout |   5 +
 testsuite/tests/typecheck/should_run/T10846.hs     |  20 ++++
 testsuite/tests/typecheck/should_run/T10846.stdout |   3 +
 testsuite/tests/typecheck/should_run/T8119.stdout  |   3 +-
 testsuite/tests/typecheck/should_run/all.T         |   2 +
 38 files changed, 396 insertions(+), 309 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3ec8288a18d57fb856e257905897daae237a1d5d

From git at git.haskell.org  Sat Dec 12 17:39:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 17:39:01 +0000 (UTC)
Subject: [commit: ghc] master: Build system: fix 'make install-strip' in
 bindist (aaed24a)
Message-ID: <20151212173901.709AC3A300@ghc.haskell.org>

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

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

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

commit aaed24a4e0d8fa0d49aca167fddfb8b606755e05
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Dec 12 17:02:28 2015 +0100

    Build system: fix 'make install-strip' in bindist
    
    The INSTALL_PROGRAM variable is set in mk/config.mk, so we have to
    include that file before using it.
    
    Running 'make install' before './configure' in a bindist will now also
    display a nice message.
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1604
    
    GHC Trac Issues: #1851


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

aaed24a4e0d8fa0d49aca167fddfb8b606755e05
 Makefile         | 25 +++++++++++++------------
 rules/haddock.mk |  2 ++
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/Makefile b/Makefile
index 348375f..6be584f 100644
--- a/Makefile
+++ b/Makefile
@@ -18,6 +18,18 @@
 MAKEFLAGS += --no-builtin-rules
 .SUFFIXES:
 
+ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
+-include mk/config.mk
+else
+include mk/config.mk
+ifeq "$(ProjectVersion)" ""
+$(error Please run ./configure first)
+endif
+endif
+
+include mk/custom-settings.mk
+
+
 ifeq "$(wildcard distrib/)" ""
 
 # We're in a bindist
@@ -45,7 +57,7 @@ install show:
 .PHONY: install-strip
 install-strip:
 	# See Note [install-strip].
-	$(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+	$(MAKE) --no-print-directory -f ghc.mk INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install BINDIST=YES NO_INCLUDE_DEPS=YES
 
 else
 
@@ -58,17 +70,6 @@ default : all
 help:
 	@cat MAKEHELP.md
 
-ifneq "$(filter maintainer-clean distclean clean clean_% help,$(MAKECMDGOALS))" ""
--include mk/config.mk
-else
-include mk/config.mk
-ifeq "$(ProjectVersion)" ""
-$(error Please run ./configure first)
-endif
-endif
-
-include mk/custom-settings.mk
-
 # Verify that stage 0 LLVM backend isn't affected by Bug #9439 if needed
 ifeq "$(GHC_LLVM_AFFECTED_BY_9439)" "1"
 ifneq "$(findstring -fllvm,$(SRC_HC_OPTS) $(GhcHcOpts) $(GhcStage1HcOpts))" ""
diff --git a/rules/haddock.mk b/rules/haddock.mk
index e716bb8..f6978a7 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -10,11 +10,13 @@
 #
 # -----------------------------------------------------------------------------
 
+ifneq "$(BINDIST)" "YES"
 HADDOCK_VER := $(shell grep "^version:" utils/haddock/haddock.cabal | sed "s/version: *//")
 HADDOCK_MAJOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\1/')
 HADDOCK_MINOR_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\2/')
 HADDOCK_PATCH_VER := $(shell echo $(HADDOCK_VER) | sed 's/\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)\.\([0-9]\{1,\}\)/\3/')
 HADDOCK_VERSION_STRING := $(shell echo $$(($(HADDOCK_MAJOR_VER) * 1000 + $(HADDOCK_MINOR_VER) * 10 + $(HADDOCK_PATCH_VER))))
+endif
 
 define haddock  # args: $1 = dir,  $2 = distdir
 $(call trace, haddock($1,$2))


From git at git.haskell.org  Sat Dec 12 19:01:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 19:01:30 +0000 (UTC)
Subject: [commit: ghc] master: Refactor type families in Template Haskell
 (9934819)
Message-ID: <20151212190130.07BCA3A300@ghc.haskell.org>

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

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

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

commit 9934819f3bb086bba91874cde4f0b17b30b10451
Author: John Leo <leo at halfaya.org>
Date:   Sat Dec 12 19:28:18 2015 +0100

    Refactor type families in Template Haskell
    
    Fixes #10902.
    
    Test Plan: validate
    
    Reviewers: goldfire, austin, hvr, jstolarek, bgamari
    
    Reviewed By: jstolarek, bgamari
    
    Subscribers: hvr, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1570
    
    GHC Trac Issues: #10902


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

9934819f3bb086bba91874cde4f0b17b30b10451
 compiler/hsSyn/Convert.hs                          | 29 ++++++++++++++--------
 compiler/typecheck/TcSplice.hs                     | 14 +++++------
 docs/users_guide/7.12.1-notes.rst                  |  5 ++++
 libraries/template-haskell/Language/Haskell/TH.hs  |  2 +-
 .../template-haskell/Language/Haskell/TH/Lib.hs    | 14 ++++++-----
 .../template-haskell/Language/Haskell/TH/Ppr.hs    | 21 ++++++++--------
 .../template-haskell/Language/Haskell/TH/Syntax.hs | 18 ++++++++------
 libraries/template-haskell/changelog.md            |  7 ++++++
 testsuite/tests/indexed-types/should_fail/T9160.hs |  3 ++-
 .../tests/indexed-types/should_fail/T9160.stderr   |  2 +-
 testsuite/tests/th/ClosedFam2TH.hs                 | 11 ++++----
 testsuite/tests/th/T10306.hs                       |  4 +--
 testsuite/tests/th/T6018th.hs                      | 18 +++++++-------
 testsuite/tests/th/T8028.hs                        |  4 +--
 testsuite/tests/th/T8028a.hs                       |  2 +-
 testsuite/tests/th/T8884.hs                        | 10 +++++---
 testsuite/tests/th/TH_RichKinds2.hs                | 15 +++++------
 testsuite/tests/th/TH_RichKinds2.stderr            |  2 +-
 18 files changed, 106 insertions(+), 75 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9934819f3bb086bba91874cde4f0b17b30b10451

From git at git.haskell.org  Sat Dec 12 19:46:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 19:46:20 +0000 (UTC)
Subject: [commit: ghc] master: Fix release notes markup (59cc6ed)
Message-ID: <20151212194620.8D3853A300@ghc.haskell.org>

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

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

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

commit 59cc6edbada5f87b917805627294caf3f602052a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 12 20:46:20 2015 +0100

    Fix release notes markup


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

59cc6edbada5f87b917805627294caf3f602052a
 docs/users_guide/7.12.1-notes.rst | 76 ++++++++++++++++++++++++++-------------
 1 file changed, 51 insertions(+), 25 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index c0b1042..7932708 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -12,7 +12,36 @@ Highlights
 
 The highlights, since the 7.10 branch, are:
 
--  TODO FIXME
+- TODO FIXME
+
+- nokinds
+
+- Record pattern synonyms
+
+- ``-XDeriveAnyClass``
+
+- More reliable DWARF debugging information
+
+- Injective type classes
+
+- Applicative ``do`` notation
+
+- Support for wildcards in data and type family instances
+
+- ``Strict`` and ``StrictData`` extensions, allowing modules to be compiled with
+   strict-by-default bindings.
+
+- ``DuplicateRecordFields``, allowing multiple datatypes to declare the same
+  record field names provided they are used unambiguously
+
+- Support for implicit parameters providing light-weight callstacks and source locations
+
+- User-defined error messages for type errors
+
+- A rewritten (and greatly improved) pattern exhaustiveness checker
+
+- The reworked users guide you are now reading
+
 
 Full details
 ------------
@@ -23,20 +52,17 @@ Language
 -  TODO FIXME.
 
 -  The parser now supports Haddock comments on GADT data constructors.
-   For example,
-
-   ::
+   For example ::
 
-                             data Expr a where
-                               -- | Just a normal sum
-                               Sum :: Int -> Int -> Expr Int
+        data Expr a where
+            -- | Just a normal sum
+            Sum :: Int -> Int -> Expr Int
 
 -  Implicit parameters of the new ``base`` type ``GHC.Stack.CallStack``
    are treated specially in function calls, the solver automatically
    appends the source location of the call to the ``CallStack`` in
-   the environment. For example
+   the environment. For example ::
 
-   ::
         myerror :: (?callStack :: CallStack) => String -> a
         myerror msg = error (msg ++ "\n" ++ prettyCallStack ?callStack)
 
@@ -84,12 +110,12 @@ Language
       pattern P :: a -> b -> (a, b)
       pattern P{x,y} = (x,y)
 
-   will allow `P` to be used like a record data constructor and also defines
-   selector functions `x :: (a, b) -> a` and `y :: (a, b) -> b`.
+   will allow ``P`` to be used like a record data constructor and also defines
+   selector functions ``x :: (a, b) -> a`` and ``y :: (a, b) -> b``.
 
 -  Pattern synonyms can now be bundled with type constructors. For a pattern
-   synonym `P` and a type constructor `T`, `P` can be bundled with `T` so that
-   when `T` is imported `P` is also imported. With this change
+   synonym ``P`` and a type constructor ``T``, ``P`` can be bundled with ``T``
+   so that when ``T`` is imported ``P`` is also imported. With this change
    a library author can provide either real data constructors or pattern
    synonyms in an opaque manner. See :ref:`pattern-synonyms` for details. ::
 
@@ -127,7 +153,7 @@ Language
      import Bar (T(MkT))
 
    In previous versions of GHC, this required a workaround via an
-   explicit export list in Bar.
+   explicit export list in ``Bar``.
 
 
 
@@ -190,9 +216,9 @@ Compiler
    warnings makes sure the definition of ``Semigroup`` as a superclass of
    ``Monoid`` does not break any code.
 
-- Added the ``-fwarn-missing-pat-syn-sigs`` flag. When enabled, this will issue
-  a warning when a pattern synonym definition doesn't have a type signature.
-  It is turned off by default but enabled by ``-Wall``.
+-  Added the ``-fwarn-missing-pat-syn-sigs`` flag. When enabled, this will issue
+   a warning when a pattern synonym definition doesn't have a type signature.
+   It is turned off by default but enabled by ``-Wall``.
 
 GHCi
 ~~~~
@@ -364,25 +390,25 @@ ghc
    strictness annotations as the user wrote them, whether from an
    imported module or not.
 
--  Moved `startsVarSym`, `startsVarId`, `startsConSym`, `startsConId`,
-   `startsVarSymASCII`, and `isVarSymChar` from `Lexeme` to the `GHC.Lemexe`
-   module of the `ghc-boot` library.
+-  Moved ``startsVarSym``, ``startsVarId``, ``startsConSym``, ``startsConId``,
+   ``startsVarSymASCII``, and ``isVarSymChar`` from ``Lexeme`` to the
+   ``GHC.Lemexe`` module of the ``ghc-boot`` library.
 
-- Add `isImport`, `isDecl`, and `isStmt` functions.
+-  Add ``isImport``, ``isDecl``, and ``isStmt`` functions.
 
 ghc-boot
 ~~~~~~~~
 
 -  This is an internal package. Use with caution.
 
--  This package was renamed from `bin-package-db` to reflect its new purpose
+-  This package was renamed from ``bin-package-db`` to reflect its new purpose
    of containing intra-GHC functionality that needs to be shared across
    multiple GHC boot libraries.
 
--  Added `GHC.Lexeme`, which contains functions for determining if a
+-  Added ``GHC.Lexeme``, which contains functions for determining if a
    character can be the first letter of a variable or data constructor in
-   Haskell, as defined by GHC. (These functions were moved from `Lexeme`
-   in `ghc`.)
+   Haskell, as defined by GHC. (These functions were moved from ``Lexeme``
+   in ``ghc``.)
 
 ghc-prim
 ~~~~~~~~


From git at git.haskell.org  Sat Dec 12 22:31:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 12 Dec 2015 22:31:29 +0000 (UTC)
Subject: [commit: ghc] master: Remove redundant imports (669c5ed)
Message-ID: <20151212223129.12BE53A300@ghc.haskell.org>

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

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

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

commit 669c5ed6e67deb39648de614a2e58892807a6840
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Dec 12 17:31:31 2015 -0500

    Remove redundant imports


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

669c5ed6e67deb39648de614a2e58892807a6840
 compiler/typecheck/Inst.hs      | 1 -
 compiler/typecheck/TcArrows.hs  | 1 -
 compiler/typecheck/TcRnTypes.hs | 1 -
 3 files changed, 3 deletions(-)

diff --git a/compiler/typecheck/Inst.hs b/compiler/typecheck/Inst.hs
index bd27a18..ed12eff 100644
--- a/compiler/typecheck/Inst.hs
+++ b/compiler/typecheck/Inst.hs
@@ -43,7 +43,6 @@ import TysWiredIn  ( heqDataCon )
 import FunDeps
 import TcMType
 import Type
-import Coercion ( Role(..) )
 import TcType
 import HscTypes
 import Class( Class )
diff --git a/compiler/typecheck/TcArrows.hs b/compiler/typecheck/TcArrows.hs
index f078403e..444b148 100644
--- a/compiler/typecheck/TcArrows.hs
+++ b/compiler/typecheck/TcArrows.hs
@@ -25,7 +25,6 @@ import TcEvidence
 import Id( mkLocalId )
 import Inst
 import Name
-import Coercion ( Role(..) )
 import TysWiredIn
 import VarSet
 import TysPrim
diff --git a/compiler/typecheck/TcRnTypes.hs b/compiler/typecheck/TcRnTypes.hs
index b0c2e80..94b7478 100644
--- a/compiler/typecheck/TcRnTypes.hs
+++ b/compiler/typecheck/TcRnTypes.hs
@@ -129,7 +129,6 @@ import HscTypes
 import TcEvidence
 import TysWiredIn ( callStackTyCon, ipClass )
 import Type
-import CoAxiom  ( Role )
 import Class    ( Class )
 import TyCon    ( TyCon )
 import Coercion ( Coercion, mkHoleCo )


From git at git.haskell.org  Sun Dec 13 12:41:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 13 Dec 2015 12:41:13 +0000 (UTC)
Subject: [commit: ghc] master: configure: add support for 'sh4' (Trac #11209)
 (f48015b)
Message-ID: <20151213124113.361223A300@ghc.haskell.org>

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

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

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

commit f48015bcac59960f6d266506a5f378c9bcf8f005
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Sun Dec 13 12:36:47 2015 +0000

    configure: add support for 'sh4' (Trac #11209)
    
    Debian has Renesas SH4 (SuperH) port with a triplet:
    
        sh4-linux-gnu
    
    Patch by glaubitz adds 'sh4' CPU to recognize target
    as ArchUnknown.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


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

f48015bcac59960f6d266506a5f378c9bcf8f005
 aclocal.m4 | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e0cd330..e46a19f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -212,7 +212,7 @@ AC_DEFUN([FPTOOLS_SET_HASKELL_PLATFORM_VARS],
         mipsel)
             test -z "[$]2" || eval "[$]2=ArchMipsel"
             ;;
-        hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sparc64|vax)
+        hppa|hppa1_1|ia64|m68k|rs6000|s390|s390x|sh4|sparc64|vax)
             test -z "[$]2" || eval "[$]2=ArchUnknown"
             ;;
         *)
@@ -1825,6 +1825,9 @@ case "$1" in
   s390*)
     $2="s390"
     ;;
+  sh4)
+    $2="sh4"
+    ;;
   sparc64*)
     $2="sparc64"
     ;;


From git at git.haskell.org  Sun Dec 13 17:10:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 13 Dec 2015 17:10:05 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: configure: add support for
 'sh4' (Trac #11209) (f48015b)
Message-ID: <20151213171005.0A09A3A300@ghc.haskell.org>

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

Branch 'wip/gadtpm' now includes:

     d25f3c0 users_guide/glasgow_exts.rst: fix link markup
     8a50610 Major Overhaul of Pattern Match Checking (Fixes #595)
     43a31fe testsuite: haddock.compiler: Bump expected allocations
     a034031 extending_ghc.rst: fix broken link (Trac #10950)
     c5597bb Revert "Create empty dump files when there was nothing to dump"
     7b29b0b Fix haddock syntax
     0dd61fe Kill redundant patterns
     934b3a0 Update test output
     40fc353 Bump hoopl submodule
     ae4398d Improve performance for PM check on literals (Fixes #11160 and #11161)
     99d01e1 Remove unused import in deSugar/TmOracle.hs
     7af29da Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
     cd9f3bf RTS: Rename InCall.stat struct field to .rstat
     6ef351d On AIX we need -D_BSD defined in <Stg.h>
     d40f5b7 PmExpr: Fix CPP unacceptable too clang's CPP
     36a208f Use builtin ISO 8859-1 decoder in mkTextEncoding
     befc4e4 Check: More Clang/CPP wibbles
     e9220da Bump allocations for T783
     dc33e4c T5642 is broken
     96e67c0 T5642: Skip it entirely
     5b2b7e3 Make callToPats deterministic in SpecConstr
     1c9fd3f Case-of-empty-alts is trivial (Trac #11155)
     28035c0 Add derived constraints for wildcard signatures
     1cb3c8c Wibbles only
     822141b Make -dppr-debug show contents of (TypeError ...)
     1160dc5 Fix egregious error in eta-reduction of data families
     31b482b Minor refactoring of user type errors
     67565a7 Tidy user type errors in checkValidType
     43a5970 Comments only
     16aae60 T5642: Fix skip usage
     caa6851 testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
     d4bf863 Update peak_megabytes_allocated for T9675
     020375d Add linter to check for binaries accidentally added to repository
     901cab1 lint: Add linter to catch uses of ASSERT macro that Clang dislikes
     c865c42 StgCmmMonad: Implement Outputable instance for Sequel for debugging
     e2c518e libdw: enable support only on i386 and amd64
     81cf200 pmcheck: Comments about term equality representation
     406444b pmcheck: Comments about undecidability of literal equality
     8f28797 Fix broken linters when using python3
     c714f8f Use git.h.o copy of arcanist-external-json-linter
     a14296c Temporarily disable external-json linters
     51d08d8 Enable non-canonical Monad instance warnings for stage1/2
     314bc99 ghc.mk: cleanup: use tab consistently
     d6512c7 ghc.mk: don't run mkUserGuidePart more than once
     13ab2c6 ghc.mk: fix docs re-rebuilding
     5f1e42f Allow to compile OSMem.c when MEM_NORESERVE is not available
     df67940 Make ghc.mk compatible with pedantic /bin/sh impls
     986ceb1 Implement new `-fwarn-noncanonical-monoid-instances`
     8b42214 Tweak use of AC_USE_SYSTEM_EXTENSIONS
     be92c28 Update hoopl submodule
     f5127c8 linters/check-cpp: Don't produce debug log
     3ea4fb7 Documentation: escape characters in template-haskell Haddocks
     42a5469 Ignore generated linter.log
     3d55e41 ghc-pkg: Restore old behavior in colored version; fixes 6119
     8cef8af Re-export data family when exporting a data instance without an export list
     91e985c Minor stylistic fixes in glasgow_exts.rst
     2110037 Add isImport, isDecl, and isStmt functions to GHC API
     d4bcd05 rts: Remove space before argument list in ASSERTs
     700c42b Use TypeLits in the meta-data encoding of GHC.Generics
     51a5e68 Refactor ConDecl
     1bd40c8 Move checking for missing signatures to RnNames.reportUnusedNames
     151c4b0 ghc-pkg: don't sort packages unnecessarily
     04e1c27 rts: One more Clang-unfriendly CPP usage
     0933331 Re-use `transformers`'s `MaybeT` rather than our own
     b292720 Remove redundant CPP conditionals
     834f9a4 Get rid of tcView altogether
     2f6e87a Introduce HasGhciState class and refactor use-sites
     9f4ca5a Associate ErrorCall pattern with ErrorCall type
     fd3b845 Make HasDynFlags more transformers friendly
     7a40a6c Update libffi-tarballs submodule to libffi 3.1 (re #10238)
     bb753c5 Rename s/7.12.1/8.0.1/ two minor occurences
     2cfa5db Fix double MaybeT instance
     2106d86 Fix typo sneaked in with fd3b845c01aa26b6e5
     69c3964 docs/glasgow_exts: Use warning admonition
     e792711 users_guide: Show sub-sub-sections in ToC
     aa6ae8a Comments only
     6c794c3 Comments about polymorphic recursion
     d7729c7 An assortment of typos
     7997d6c Refactor GHCi Command type; allow "hidden" commands
     31bddc4 Add missing whitespace in toArgs' error msg
     af77089 Fix DeriveAnyClass (Trac #9968)
     e9ea020 Comments only
     8317893 Improve documentation for DeriveAnyClass
     688069c More typos in comments/docs
     602889a Test Trac #11192
     f4f00c0 Test Trac #11187
     41ef8f7 Make sure PatSyns only get added once to tcg_patsyns
     f7c17c8 T7478: Don't expect broken on Darwin
     5447c20 Mark retc001 as broken on Darwin
     262954c T4801: Update expected allocations on Darwin
     c205aeb Removed colon append operation (fixes #10785)
     b138248 Improved data family export documentation
     ceaf0f4 testsuite: Only run recomp015 on ELF-based platforms
     6e56ac5 Fix infix record field fixity (#11167 and #11173).
     6746549 Add kind equalities to GHC.
     5183109 Revert README.md changes from 6746549772c5
     a6e0394 haddock: Fix submodule commit to point to ghc-head
     b5d5d83 Revert .gitmodules changes from 6746549772c5
     a459451 rm rae.txt
     68f198f Test case for #7961.
     779dfea Test #9017 in polykinds/T9017
     a3c2a26 Frontend plugins.
     1883afb Implement -fwarn-missing-pat-syn-sigs
     3ec8288 Rework the Implicit CallStack solver to handle local lets.
     4935b48 Make -XStrict imply -XStrictData
     3640ae9 Dwarf: Use .short instead of .hword on Darwin
     aaed24a Build system: fix 'make install-strip' in bindist
     9934819 Refactor type families in Template Haskell
     59cc6ed Fix release notes markup
     669c5ed Remove redundant imports
     f48015b configure: add support for 'sh4' (Trac #11209)

From git at git.haskell.org  Sun Dec 13 23:03:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 13 Dec 2015 23:03:56 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule (0bf0cf9)
Message-ID: <20151213230356.B69A53A300@ghc.haskell.org>

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

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

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

commit 0bf0cf936c7895b19d0fd6a19d5238eed6c8feb6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 13 23:37:27 2015 +0100

    Update Cabal submodule


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

0bf0cf936c7895b19d0fd6a19d5238eed6c8feb6
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 4e11fb9..d602f63 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 4e11fb9f353ad78c862c4c123143a0e793fc22d5
+Subproject commit d602f63e7daf426514e38492bfdeeb4f33bd361d


From git at git.haskell.org  Mon Dec 14 07:33:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 07:33:27 +0000 (UTC)
Subject: [commit: ghc] master: Use idiomatic way to tell Autoconf the c
 compiler (fcc6b1d)
Message-ID: <20151214073327.F39983A300@ghc.haskell.org>

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

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

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

commit fcc6b1def57d3009f9a3662a96d87ee041eb49b8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 07:36:37 2015 +0100

    Use idiomatic way to tell Autoconf the c compiler
    
    The non-idiomatic `--with-cc` flag was added via
    5c789e424c1461c1dadfd38c44fcb9e8f38bf755
    
    However, `--with-cc` seems rather fragile and support for `--with-cc` needs
    to be added explicitly to autoconf-based Cabal packages. The `CC=` flag, however,
    is supported natively by GNU Autoconf, so let's use the standard facility for that.
    
    Relatedly, Cabal prior to version 1.24 used a similiar flag `--with-gcc=...`,
    but starting with Cabal-1.24 this has been changed to use `CC=...` instead as well
    (see https://github.com/haskell/cabal/pull/2946)
    
    This also updates a few submodules removing the now obsolete `--with-cc` flag
    support.
    
    Reviewed By: trofi, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1608


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

fcc6b1def57d3009f9a3662a96d87ee041eb49b8
 libraries/base/configure.ac        | 5 +----
 libraries/directory                | 2 +-
 libraries/integer-gmp/configure.ac | 5 +----
 libraries/process                  | 2 +-
 libraries/unix                     | 2 +-
 rules/build-package-data.mk        | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index 3d372d7..b8a4774 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -10,10 +10,7 @@ AC_CANONICAL_BUILD
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 
-AC_ARG_WITH([cc],
-            [C compiler],
-            [CC=$withval])
-AC_PROG_CC()
+AC_PROG_CC
 dnl make extensions visible to allow feature-tests to detect them lateron
 AC_USE_SYSTEM_EXTENSIONS
 
diff --git a/libraries/directory b/libraries/directory
index a7a5b0b..298529b 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit a7a5b0b738aad432a9cad512a26d7564120ef0e8
+Subproject commit 298529bf8adc38ed602eab300c63bbc68510e5a3
diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac
index 4e3df11..c19dbbc 100644
--- a/libraries/integer-gmp/configure.ac
+++ b/libraries/integer-gmp/configure.ac
@@ -6,10 +6,7 @@ AC_CONFIG_SRCDIR([cbits/wrappers.c])
 
 AC_CANONICAL_TARGET
 
-AC_ARG_WITH([cc],
-            [C compiler],
-            [CC=$withval])
-AC_PROG_CC()
+AC_PROG_CC
 dnl make extensions visible to allow feature-tests to detect them lateron
 AC_USE_SYSTEM_EXTENSIONS
 
diff --git a/libraries/process b/libraries/process
index 0edb978..e594712 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit 0edb97876c2f783b33f9a69089ca9d26a061e112
+Subproject commit e594712a8fe49c94ff43ab016739e0fa63f0de00
diff --git a/libraries/unix b/libraries/unix
index 147630c..59edb0a 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 147630c7c76bd9b947524ef140d21b9e81967c6e
+Subproject commit 59edb0a0a0d91ecfe938029b3b00a0c99dcb8481
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 938b6bf..3525c91 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -111,7 +111,7 @@ ifneq "$3" "0"
 $1_$2_CONFIGURE_OPTS += --with-ld="$$(LD_STAGE$3)"
 endif
 
-$1_$2_CONFIGURE_OPTS += --configure-option=--with-cc="$$(CC_STAGE$3)"
+$1_$2_CONFIGURE_OPTS += --configure-option=CC="$$(CC_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)")
 $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)")


From git at git.haskell.org  Mon Dec 14 09:42:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 09:42:28 +0000 (UTC)
Subject: [commit: ghc] master: Don't pass CC= explicitly to `./configure`
 scripts (baed2f5)
Message-ID: <20151214094228.2FB4A3A300@ghc.haskell.org>

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

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

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

commit baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 10:42:17 2015 +0100

    Don't pass CC= explicitly to `./configure` scripts
    
    This is a follow-up to fcc6b1d / D1608 which is made possible
    by the recent Cabal update:
    
    As `ghc-cabal` is called with `--with-gcc`, this gets passed to `./configure`
    as `CC=...` argument. So we don't need to set `CC=...` ourselves explicitly again.
    
    Prior to the changes in Cabal (pulled in via  0bf0cf936c7) and fcc6b1d,
    `./configure` scripts would be called with a `--with-cc` argument followed by a
    `--with-gcc` argument.
    
    After this commit, `./configure` will be passed a single `CC=...` argument
    constructed by the `Cabal` library.
    
    Reviewed By: erikd
    
    Differential Revision: https://phabricator.haskell.org/D1611


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

baed2f5a26a5d4c4e951bd8f003f71fca3ef45e8
 rules/build-package-data.mk | 1 -
 1 file changed, 1 deletion(-)

diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk
index 3525c91..17b87e0 100644
--- a/rules/build-package-data.mk
+++ b/rules/build-package-data.mk
@@ -111,7 +111,6 @@ ifneq "$3" "0"
 $1_$2_CONFIGURE_OPTS += --with-ld="$$(LD_STAGE$3)"
 endif
 
-$1_$2_CONFIGURE_OPTS += --configure-option=CC="$$(CC_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += --with-ar="$$(AR_STAGE$3)"
 $1_$2_CONFIGURE_OPTS += $$(if $$(ALEX),--with-alex="$$(ALEX)")
 $1_$2_CONFIGURE_OPTS += $$(if $$(HAPPY),--with-happy="$$(HAPPY)")


From git at git.haskell.org  Mon Dec 14 14:10:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 14:10:17 +0000 (UTC)
Subject: [commit: ghc] master: Some more typos in comments (65920c9)
Message-ID: <20151214141017.E49433A300@ghc.haskell.org>

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

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

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

commit 65920c9e6a17094c3a0abbdbed5ab01f8524850e
Author: Gabor Greif <ggreif at gmail.com>
Date:   Mon Dec 14 10:43:23 2015 +0100

    Some more typos in comments


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

65920c9e6a17094c3a0abbdbed5ab01f8524850e
 compiler/typecheck/TcSimplify.hs                  | 4 ++--
 rts/Capability.c                                  | 2 +-
 testsuite/tests/programs/andy_cherry/DataTypes.hs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcSimplify.hs b/compiler/typecheck/TcSimplify.hs
index 190c6c4..261abd0 100644
--- a/compiler/typecheck/TcSimplify.hs
+++ b/compiler/typecheck/TcSimplify.hs
@@ -425,11 +425,11 @@ tcCheckSatisfiability :: Bag EvVar -> TcM Bool
 tcCheckSatisfiability givens
   = do { lcl_env <- TcM.getLclEnv
        ; let given_loc = mkGivenLoc topTcLevel UnkSkol lcl_env
-       ; traceTc "checkSatisfiabilty {" (ppr givens)
+       ; traceTc "checkSatisfiability {" (ppr givens)
        ; (res, _ev_binds) <- runTcS $
              do { cts <- solveSimpleGivens given_loc (bagToList givens)
                 ; return (not (isEmptyBag cts)) }
-       ; traceTc "checkSatisfiabilty }" (ppr res)
+       ; traceTc "checkSatisfiability }" (ppr res)
        ; return (not res) }
 
 {-
diff --git a/rts/Capability.c b/rts/Capability.c
index b0b7f30..45ee2c8 100644
--- a/rts/Capability.c
+++ b/rts/Capability.c
@@ -859,7 +859,7 @@ yieldCapability (Capability** pCap, Task *task, rtsBool gcAllowed)
 //
 //  - A bound thread can only be migrated by the holder of the
 //    Capability on which the bound thread currently lives.  So, if we
-//    hold Capabilty C, and task->cap == C, then task cannot be
+//    hold Capability C, and task->cap == C, then task cannot be
 //    migrated under our feet.
 
 // Note [migrated bound threads 2]
diff --git a/testsuite/tests/programs/andy_cherry/DataTypes.hs b/testsuite/tests/programs/andy_cherry/DataTypes.hs
index b36de83..bcb6cbc 100644
--- a/testsuite/tests/programs/andy_cherry/DataTypes.hs
+++ b/testsuite/tests/programs/andy_cherry/DataTypes.hs
@@ -508,7 +508,7 @@
  data Board 
        = Board (Array BoardPos BoardSquare)
                MoveNumber              -- current player & and move
-               (Maybe ChessFile)       -- e.p. possibilties.
+               (Maybe ChessFile)       -- e.p. possibilities.
 
 
 


From git at git.haskell.org  Mon Dec 14 14:33:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 14:33:25 +0000 (UTC)
Subject: [commit: ghc] master: Add testcase for #11216 (59d3948)
Message-ID: <20151214143325.542A03A300@ghc.haskell.org>

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

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

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

commit 59d3948f02b8a50788f2049014b302bb5b88c5a7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 14 15:14:36 2015 +0100

    Add testcase for #11216


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

59d3948f02b8a50788f2049014b302bb5b88c5a7
 testsuite/tests/rebindable/T11216.hs | 6 ++++++
 testsuite/tests/rebindable/all.T     | 1 +
 2 files changed, 7 insertions(+)

diff --git a/testsuite/tests/rebindable/T11216.hs b/testsuite/tests/rebindable/T11216.hs
new file mode 100644
index 0000000..e05feb9
--- /dev/null
+++ b/testsuite/tests/rebindable/T11216.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE RebindableSyntax #-}
+
+module Bug where
+
+foo :: (a, b) -> ()
+foo x | (_,_) <- x = ()
diff --git a/testsuite/tests/rebindable/all.T b/testsuite/tests/rebindable/all.T
index b00e721..3ca873e 100644
--- a/testsuite/tests/rebindable/all.T
+++ b/testsuite/tests/rebindable/all.T
@@ -31,3 +31,4 @@ test('T4851', normal, compile, [''])
 
 test('T5908', normal, compile, [''])
 test('T10112', normal, compile, [''])
+test('T11216', [expect_broken(11216)], compile, [''])
\ No newline at end of file


From git at git.haskell.org  Mon Dec 14 14:33:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 14:33:28 +0000 (UTC)
Subject: [commit: ghc] master: Make binds in do-blocks strict when -XStrict
 (#11193) (419b6c0)
Message-ID: <20151214143328.7E9193A300@ghc.haskell.org>

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

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

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

commit 419b6c00c194ccbd3c94539c26246dc41c88ed6c
Author: Adam Sandberg Eriksson <adam at sandbergericsson.se>
Date:   Mon Dec 14 15:03:15 2015 +0100

    Make binds in do-blocks strict when -XStrict (#11193)
    
    Previously bindings in `do` blocks were omitted. With `-XStrict`
    ```lang=hs
    do content <- action
       other_things
    ```
    should be equivalent to
    ```lang=hs
    do !content <- action
       other_things
    ```
    
    Fixes #11193.
    
    Reviewers: bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1612
    
    GHC Trac Issues: #11193


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

419b6c00c194ccbd3c94539c26246dc41c88ed6c
 compiler/deSugar/Match.hs                        | 20 +++++++++++---------
 testsuite/tests/deSugar/should_run/T11193.hs     |  8 ++++++++
 testsuite/tests/deSugar/should_run/T11193.stderr |  3 +++
 testsuite/tests/deSugar/should_run/all.T         |  1 +
 4 files changed, 23 insertions(+), 9 deletions(-)

diff --git a/compiler/deSugar/Match.hs b/compiler/deSugar/Match.hs
index 6ffa25d..f551fa4 100644
--- a/compiler/deSugar/Match.hs
+++ b/compiler/deSugar/Match.hs
@@ -700,7 +700,7 @@ matchWrapper ctxt mb_scr (MG { mg_alts = L _ matches
   where
     mk_eqn_info vars (L _ (Match _ pats _ grhss))
       = do { dflags <- getDynFlags
-           ; let upats = map (strictify dflags) pats
+           ; let upats = map (getMaybeStrictPat dflags) pats
                  dicts = toTcTypeBag (collectEvVarsPats upats) -- Only TcTyVars
            ; tm_cs <- genCaseTmCs2 mb_scr upats vars
            ; match_result <- addDictsDs dicts $  -- See Note [Type and Term Equality Propagation]
@@ -708,10 +708,6 @@ matchWrapper ctxt mb_scr (MG { mg_alts = L _ matches
                                  dsGRHSs ctxt upats grhss rhs_ty
            ; return (EqnInfo { eqn_pats = upats, eqn_rhs  = match_result}) }
 
-    strictify dflags pat =
-      let (is_strict, pat') = getUnBangedLPat dflags pat
-      in if is_strict then BangPat pat' else unLoc pat'
-
     handleWarnings = if isGenerated origin
                      then discardWarningsDs
                      else id
@@ -760,21 +756,27 @@ matchSinglePat :: CoreExpr -> HsMatchContext Name -> LPat Id
 -- Do not warn about incomplete patterns
 -- Used for things like [ e | pat <- stuff ], where
 -- incomplete patterns are just fine
-matchSinglePat (Var var) ctx (L _ pat) ty match_result
+matchSinglePat (Var var) ctx pat ty match_result
   = do { dflags <- getDynFlags
        ; locn   <- getSrcSpanDs
-
+       ; let pat' = getMaybeStrictPat dflags pat
        -- pattern match check warnings
-       ; dsPmWarn dflags (DsMatchContext ctx locn) (checkSingle var pat)
+       ; dsPmWarn dflags (DsMatchContext ctx locn) (checkSingle var pat')
 
        ; match [var] ty
-               [EqnInfo { eqn_pats = [pat], eqn_rhs  = match_result }] }
+               [EqnInfo { eqn_pats = [pat'], eqn_rhs  = match_result }] }
 
 matchSinglePat scrut hs_ctx pat ty match_result
   = do { var <- selectSimpleMatchVarL pat
        ; match_result' <- matchSinglePat (Var var) hs_ctx pat ty match_result
        ; return (adjustMatchResult (bindNonRec var scrut) match_result') }
 
+getMaybeStrictPat :: DynFlags -> LPat Id -> Pat Id
+getMaybeStrictPat dflags pat =
+  let (is_strict, pat') = getUnBangedLPat dflags pat
+  in if is_strict then BangPat pat' else unLoc pat'
+
+
 {-
 ************************************************************************
 *                                                                      *
diff --git a/testsuite/tests/deSugar/should_run/T11193.hs b/testsuite/tests/deSugar/should_run/T11193.hs
new file mode 100644
index 0000000..a8759a3
--- /dev/null
+++ b/testsuite/tests/deSugar/should_run/T11193.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE Strict #-}
+
+module Main where
+
+main = do
+  ~a <- return (error "don't error here!")
+  b <- return (error "error here!") -- this binding should be strict
+  print "should never reach here"
diff --git a/testsuite/tests/deSugar/should_run/T11193.stderr b/testsuite/tests/deSugar/should_run/T11193.stderr
new file mode 100644
index 0000000..50e427c
--- /dev/null
+++ b/testsuite/tests/deSugar/should_run/T11193.stderr
@@ -0,0 +1,3 @@
+T11193: error here!
+CallStack (from ImplicitParams):
+  error, called at T11193.hs:7:16 in main:Main
diff --git a/testsuite/tests/deSugar/should_run/all.T b/testsuite/tests/deSugar/should_run/all.T
index cc21ed7..9f50ea6 100644
--- a/testsuite/tests/deSugar/should_run/all.T
+++ b/testsuite/tests/deSugar/should_run/all.T
@@ -52,3 +52,4 @@ test('T10215', normal, compile_and_run, [''])
 test('DsStrictData', normal, compile_and_run, [''])
 test('DsStrict', normal, compile_and_run, [''])
 test('DsStrictLet', normal, compile_and_run, ['-O'])
+test('T11193', exit_code(1), compile_and_run, [''])


From git at git.haskell.org  Mon Dec 14 14:33:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 14:33:32 +0000 (UTC)
Subject: [commit: ghc] master: Use Cxt for deriving clauses in TH (#10819)
 (04ab55d)
Message-ID: <20151214143332.15F933A300@ghc.haskell.org>

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

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

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

commit 04ab55d9a6fe311b7cb544211738caca6c00c720
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Dec 14 15:01:12 2015 +0100

    Use Cxt for deriving clauses in TH (#10819)
    
    Summary:
    Deriving clauses in the TH representations of data, newtype, data
    instance, and newtype instance declarations previously were just [Name],
    which didn't allow for more complex derived classes, eg. multi-parameter
    typeclasses.
    
    This switches out [Name] for Cxt, representing the derived classes as
    types instead of names.
    
    Test Plan: validate
    
    Reviewers: goldfire, spinda, austin
    
    Reviewed By: goldfire, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1202
    
    GHC Trac Issues: #10819


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

04ab55d9a6fe311b7cb544211738caca6c00c720
 compiler/deSugar/DsMeta.hs                         | 28 +++++++++++-----------
 compiler/hsSyn/Convert.hs                          | 12 ++++------
 docs/users_guide/7.12.1-notes.rst                  |  6 +++++
 .../template-haskell/Language/Haskell/TH/Lib.hs    | 20 +++++++++-------
 .../template-haskell/Language/Haskell/TH/Ppr.hs    | 18 +++++++-------
 .../template-haskell/Language/Haskell/TH/Syntax.hs | 14 +++++------
 testsuite/tests/rts/T7919A.hs                      |  4 ++--
 testsuite/tests/th/T10819.hs                       | 25 +++++++++++++++++++
 testsuite/tests/th/T10819_Lib.hs                   |  6 +++++
 testsuite/tests/th/TH_dataD1.hs                    |  2 +-
 testsuite/tests/th/all.T                           |  5 +++-
 11 files changed, 92 insertions(+), 48 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 04ab55d9a6fe311b7cb544211738caca6c00c720

From git at git.haskell.org  Mon Dec 14 14:33:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 14:33:35 +0000 (UTC)
Subject: [commit: ghc] master: Suggest import Data.Kinds when * is out of
 scope (023f11f)
Message-ID: <20151214143335.5D0D83A300@ghc.haskell.org>

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

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

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

commit 023f11f562c7d08af121e4dac04ec66418e6923b
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon Dec 14 15:02:54 2015 +0100

    Suggest import Data.Kinds when * is out of scope
    
    With -XTypeInType, `*` must be imported to be used. This patch makes
    sure the user knows this.
    
    But I'm not sure this is the best way to deal with `*`. Feedback welcome
    on either this small fix or the approach to `*`, in general.
    
    You may wish to see `Note [HsAppsTy]` in HsTypes if you want to take a
    broader view.
    
    Test Plan: dependent/should_fail/RenamingStar
    
    Reviewers: simonpj, bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1610


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

023f11f562c7d08af121e4dac04ec66418e6923b
 compiler/rename/RnEnv.hs                           | 35 ++++++++++++++--------
 .../tests/dependent/should_fail/RenamingStar.hs    |  5 ++++
 .../dependent/should_fail/RenamingStar.stderr      | 11 +++++++
 testsuite/tests/dependent/should_fail/all.T        |  1 +
 4 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/compiler/rename/RnEnv.hs b/compiler/rename/RnEnv.hs
index a398e33..4337dbb 100644
--- a/compiler/rename/RnEnv.hs
+++ b/compiler/rename/RnEnv.hs
@@ -713,16 +713,12 @@ lookupKindOccRn :: RdrName -> RnM Name
 -- Looking up a name occurring in a kind
 lookupKindOccRn rdr_name
   = do { typeintype <- xoptM Opt_TypeInType
-       ; if | typeintype   -> lookupTypeOccRn rdr_name
-            | is_star      -> return starKindTyConName
-            | is_uni_star  -> return unicodeStarKindTyConName
-            | otherwise    -> lookupOccRn rdr_name }
-  where
+       ; if | typeintype           -> lookupTypeOccRn rdr_name
       -- With -XNoTypeInType, treat any usage of * in kinds as in scope
       -- this is a dirty hack, but then again so was the old * kind.
-    fs_name = occNameFS $ rdrNameOcc rdr_name
-    is_star     = fs_name == fsLit "*"
-    is_uni_star = fs_name == fsLit "?"
+            | is_star rdr_name     -> return starKindTyConName
+            | is_uni_star rdr_name -> return unicodeStarKindTyConName
+            | otherwise            -> lookupOccRn rdr_name }
 
 -- lookupPromotedOccRn looks up an optionally promoted RdrName.
 lookupTypeOccRn :: RdrName -> RnM Name
@@ -731,16 +727,17 @@ lookupTypeOccRn rdr_name
   = do { mb_name <- lookupOccRn_maybe rdr_name
        ; case mb_name of {
              Just name -> return name ;
-             Nothing   -> lookup_demoted rdr_name } }
+             Nothing   -> do { dflags <- getDynFlags
+                             ; lookup_demoted rdr_name dflags } } }
 
-lookup_demoted :: RdrName -> RnM Name
-lookup_demoted rdr_name
+lookup_demoted :: RdrName -> DynFlags -> RnM Name
+lookup_demoted rdr_name dflags
   | Just demoted_rdr <- demoteRdrName rdr_name
     -- Maybe it's the name of a *data* constructor
   = do { data_kinds <- xoptM Opt_DataKinds
        ; mb_demoted_name <- lookupOccRn_maybe demoted_rdr
        ; case mb_demoted_name of
-           Nothing -> reportUnboundName rdr_name
+           Nothing -> unboundNameX WL_Any rdr_name star_info
            Just demoted_name
              | data_kinds ->
              do { whenWOptM Opt_WarnUntickedPromotedConstructors $
@@ -761,6 +758,20 @@ lookup_demoted rdr_name
            , text "instead of"
            , quotes (ppr name) <> dot ]
 
+    star_info
+      | is_star rdr_name || is_uni_star rdr_name
+      = if xopt Opt_TypeInType dflags
+        then text "NB: With TypeInType, you must import" <+>
+             ppr rdr_name <+> text "from Data.Kind"
+        else empty
+
+      | otherwise
+      = empty
+
+is_star, is_uni_star :: RdrName -> Bool
+is_star     = (fsLit "*" ==) . occNameFS . rdrNameOcc
+is_uni_star = (fsLit "?" ==) . occNameFS . rdrNameOcc
+
 {-
 Note [Demotion]
 ~~~~~~~~~~~~~~~
diff --git a/testsuite/tests/dependent/should_fail/RenamingStar.hs b/testsuite/tests/dependent/should_fail/RenamingStar.hs
new file mode 100644
index 0000000..255021c
--- /dev/null
+++ b/testsuite/tests/dependent/should_fail/RenamingStar.hs
@@ -0,0 +1,5 @@
+{-# LANGUAGE TypeInType #-}
+
+module RenamingStar where
+
+data Foo :: *
diff --git a/testsuite/tests/dependent/should_fail/RenamingStar.stderr b/testsuite/tests/dependent/should_fail/RenamingStar.stderr
new file mode 100644
index 0000000..5efda69
--- /dev/null
+++ b/testsuite/tests/dependent/should_fail/RenamingStar.stderr
@@ -0,0 +1,11 @@
+
+RenamingStar.hs:5:13: error:
+    Not in scope: type constructor or class ?*?
+    NB: With TypeInType, you must import * from Data.Kind
+
+RenamingStar.hs:5:13: error:
+    Illegal operator ?*? in type ?*?
+      Use TypeOperators to allow operators in types
+
+RenamingStar.hs:5:13: error:
+    Operator applied to too few arguments: *
diff --git a/testsuite/tests/dependent/should_fail/all.T b/testsuite/tests/dependent/should_fail/all.T
index 8d4b288..8f9c9d0 100644
--- a/testsuite/tests/dependent/should_fail/all.T
+++ b/testsuite/tests/dependent/should_fail/all.T
@@ -7,3 +7,4 @@ test('BadTelescope3', normal, compile_fail, [''])
 test('PromotedClass', normal, compile_fail, [''])
 test('SelfDep', normal, compile_fail, [''])
 test('BadTelescope4', normal, compile_fail, [''])
+test('RenamingStar', normal, compile_fail, [''])


From git at git.haskell.org  Mon Dec 14 19:54:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 19:54:48 +0000 (UTC)
Subject: [commit: ghc] master: Add IsString Outputable.SDoc instance (402bbe6)
Message-ID: <20151214195448.F323D3A300@ghc.haskell.org>

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

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

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

commit 402bbe6e2dddb96326e29b247adc40d9081ab224
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 20:55:08 2015 +0100

    Add IsString Outputable.SDoc instance
    
    This allows to conveniently interpret string literals as `text`
    when `-XOverloadedStrings` is in effect.
    
    For what it's worth, `Text.PrettyPrint.Doc` also possesses such
    an instance.
    
    This is a spin-off from D1240
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1618


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

402bbe6e2dddb96326e29b247adc40d9081ab224
 compiler/utils/Outputable.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/compiler/utils/Outputable.hs b/compiler/utils/Outputable.hs
index b539fa6..cda7475 100644
--- a/compiler/utils/Outputable.hs
+++ b/compiler/utils/Outputable.hs
@@ -103,6 +103,7 @@ import Data.Int
 import qualified Data.IntMap as IM
 import Data.Set (Set)
 import qualified Data.Set as Set
+import Data.String
 import Data.Word
 import System.IO        ( Handle )
 import System.FilePath
@@ -286,6 +287,9 @@ data SDocContext = SDC
   , sdocDynFlags   :: !DynFlags
   }
 
+instance IsString SDoc where
+  fromString = text
+
 initSDocContext :: DynFlags -> PprStyle -> SDocContext
 initSDocContext dflags sty = SDC
   { sdocStyle = sty


From git at git.haskell.org  Mon Dec 14 20:59:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 14 Dec 2015 20:59:48 +0000 (UTC)
Subject: [commit: ghc] master: Test #9632 in dependent/should_compile/T9632
 (05fe546)
Message-ID: <20151214205948.4B7E03A300@ghc.haskell.org>

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

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

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

commit 05fe5463143769a2e84d5e3508a829792d5a1817
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon Dec 14 15:59:21 2015 -0500

    Test #9632 in dependent/should_compile/T9632


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

05fe5463143769a2e84d5e3508a829792d5a1817
 testsuite/tests/dependent/should_compile/T9632.hs | 11 +++++++++++
 testsuite/tests/dependent/should_compile/all.T    |  1 +
 2 files changed, 12 insertions(+)

diff --git a/testsuite/tests/dependent/should_compile/T9632.hs b/testsuite/tests/dependent/should_compile/T9632.hs
new file mode 100644
index 0000000..bea468f
--- /dev/null
+++ b/testsuite/tests/dependent/should_compile/T9632.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE TypeInType #-}
+
+module T9632 where
+
+import Data.Kind
+
+data B = T | F
+data P :: B -> *
+
+type B' = B
+data P' :: B' -> *
diff --git a/testsuite/tests/dependent/should_compile/all.T b/testsuite/tests/dependent/should_compile/all.T
index 1724ff6..e1e064a 100644
--- a/testsuite/tests/dependent/should_compile/all.T
+++ b/testsuite/tests/dependent/should_compile/all.T
@@ -9,3 +9,4 @@ test('KindLevels', normal, compile, [''])
 test('RaeBlogPost', normal, compile, [''])
 test('mkGADTVars', normal, compile, [''])
 test('TypeLevelVec',normal,compile, [''])
+test('T9632', normal, compile, [''])


From git at git.haskell.org  Tue Dec 15 00:37:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:43 +0000 (UTC)
Subject: [commit: ghc] master: Document -XOverloadedLabels (f4dd486)
Message-ID: <20151215003743.954143A300@ghc.haskell.org>

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

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

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

commit f4dd4862fd8cbb092f86dcaa97c937e0494fab36
Author: Adam Gundry <adam at well-typed.com>
Date:   Tue Dec 15 01:11:03 2015 +0100

    Document -XOverloadedLabels
    
    This adds documentation of the new `OverloadedLabels` extension to
    the users' guide.  Thanks to @bgamari for patiently reminding me
    to get this done.  Feedback welcome.
    
    Test Plan: N/A
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1623


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

f4dd4862fd8cbb092f86dcaa97c937e0494fab36
 docs/users_guide/glasgow_exts.rst | 81 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 81 insertions(+)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index ebe1f75..b9ad620 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -5751,6 +5751,87 @@ A small example:
 Note that deriving ``Eq`` is necessary for the pattern matching to work
 since it gets translated into an equality comparison.
 
+.. _overloaded-labels:
+
+Overloaded labels
+-----------------
+
+GHC supports *overloaded labels*, a form of identifier whose interpretation may
+depend both on its type and on its literal text.  When the
+``-XOverloadedLabels`` extension is enabled, an overloaded label can written
+with a prefix hash, for example ``#foo``.  The type of this expression is
+``IsLabel "foo" a => a``.
+
+The class ``IsLabel`` is defined as:
+
+::
+
+    class IsLabel (x :: Symbol) a where
+      fromLabel :: Proxy# x -> a
+
+This is rather similar to the class ``IsString`` (see
+:ref:`overloaded-strings`), but with an additional type parameter that makes the
+text of the label available as a type-level string (see
+:ref:`type-level-literals`).
+
+There are no predefined instances of this class.  It is not in scope by default,
+but can be brought into scope by importing
+:base-ref:`GHC.OverloadedLabels <GHC-OverloadedLabels.html>`:.  Unlike
+``IsString``, there are no special defaulting rules for ``IsLabel``.
+
+During typechecking, GHC will replace an occurrence of an overloaded label like
+``#foo`` with
+
+::
+
+    fromLabel (proxy# :: Proxy# "foo")
+
+This will have some type ``alpha`` and require the solution of a class
+constraint ``IsLabel "foo" alpha``.
+
+The intention is for ``IsLabel`` to be used to support overloaded record fields
+and perhaps anonymous records.  Thus, it may be given instances for base
+datatypes (in particular ``(->)``) in the future.
+
+When writing an overloaded label, there must be no space between the hash sign
+and the following identifier.  :ref:`magic-hash` makes use of postfix hash
+signs; if ``OverloadedLabels`` and ``MagicHash`` are both enabled then ``x#y``
+means ``x# y``, but if only ``OverloadedLabels`` is enabled then it means ``x
+#y``.  To avoid confusion, you are strongly encouraged to put a space before the
+hash when using ``OverloadedLabels``.
+
+When using ``OverloadedLabels`` (or ``MagicHash``) in a ``.hsc`` file (see
+:ref:`hsc2hs`), the hash signs must be doubled (write ``##foo`` instead of
+``#foo``) to avoid them being treated as ``hsc2hs`` directives.
+
+Here is an extension of the record access example in :ref:`type-level-literals`
+showing how an overloaded label can be used as a record selector:
+
+::
+
+    {-# LANGUAGE DataKinds, KindSignatures, MultiParamTypeClasses,
+                 FunctionalDependencies, FlexibleInstances,
+                 OverloadedLabels, ScopedTypeVariables #-}
+
+    import GHC.OverloadedLabels (IsLabel(..))
+    import GHC.TypeLits (Symbol)
+
+    data Label (l :: Symbol) = Get
+
+    class Has a l b | a l -> b where
+      from :: a -> Label l -> b
+
+    data Point = Point Int Int deriving Show
+
+    instance Has Point "x" Int where from (Point x _) _ = x
+    instance Has Point "y" Int where from (Point _ y) _ = y
+
+    instance Has a l b => IsLabel l (a -> b) where
+      fromLabel _ x = from x (Get :: Label l)
+
+    example = #x (Point 1 2)
+
+
 .. _overloaded-lists:
 
 Overloaded lists


From git at git.haskell.org  Tue Dec 15 00:37:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:46 +0000 (UTC)
Subject: [commit: ghc] master: Mention "handle is semi-closed" in error
 messages (9017f16)
Message-ID: <20151215003746.4440D3A300@ghc.haskell.org>

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

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

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

commit 9017f16a78d66fe5aaf0ec98aeb9add1792fd838
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Dec 15 01:02:39 2015 +0100

    Mention "handle is semi-closed" in error messages
    
    Semi-closedness is mentioned in the Haskell report, so lets not hide it
    from users.
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1624


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

9017f16a78d66fe5aaf0ec98aeb9add1792fd838
 libraries/base/GHC/IO/Handle.hs           | 10 +++++-----
 libraries/base/GHC/IO/Handle/Internals.hs | 14 +++++++++-----
 libraries/base/tests/IO/IOError001.stdout |  4 ++--
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/libraries/base/GHC/IO/Handle.hs b/libraries/base/GHC/IO/Handle.hs
index 23272ce..ac37ad4 100644
--- a/libraries/base/GHC/IO/Handle.hs
+++ b/libraries/base/GHC/IO/Handle.hs
@@ -113,7 +113,7 @@ hFileSize handle =
     withHandle_ "hFileSize" handle $ \ handle_ at Handle__{haDevice=dev} -> do
     case haType handle_ of
       ClosedHandle              -> ioe_closedHandle
-      SemiClosedHandle          -> ioe_closedHandle
+      SemiClosedHandle          -> ioe_semiclosedHandle
       _ -> do flushWriteBuffer handle_
               r <- IODevice.getSize dev
               if r /= -1
@@ -129,7 +129,7 @@ hSetFileSize handle size =
     withHandle_ "hSetFileSize" handle $ \ handle_ at Handle__{haDevice=dev} -> do
     case haType handle_ of
       ClosedHandle              -> ioe_closedHandle
-      SemiClosedHandle          -> ioe_closedHandle
+      SemiClosedHandle          -> ioe_semiclosedHandle
       _ -> do flushWriteBuffer handle_
               IODevice.setSize dev size
               return ()
@@ -473,7 +473,7 @@ hIsReadable handle =
     withHandle_ "hIsReadable" handle $ \ handle_ -> do
     case haType handle_ of
       ClosedHandle         -> ioe_closedHandle
-      SemiClosedHandle     -> ioe_closedHandle
+      SemiClosedHandle     -> ioe_semiclosedHandle
       htype                -> return (isReadableHandleType htype)
 
 hIsWritable :: Handle -> IO Bool
@@ -482,7 +482,7 @@ hIsWritable handle =
     withHandle_ "hIsWritable" handle $ \ handle_ -> do
     case haType handle_ of
       ClosedHandle         -> ioe_closedHandle
-      SemiClosedHandle     -> ioe_closedHandle
+      SemiClosedHandle     -> ioe_semiclosedHandle
       htype                -> return (isWritableHandleType htype)
 
 -- | Computation 'hGetBuffering' @hdl@ returns the current buffering mode
@@ -503,7 +503,7 @@ hIsSeekable handle =
     withHandle_ "hIsSeekable" handle $ \ handle_ at Handle__{..} -> do
     case haType of
       ClosedHandle         -> ioe_closedHandle
-      SemiClosedHandle     -> ioe_closedHandle
+      SemiClosedHandle     -> ioe_semiclosedHandle
       AppendHandle         -> return False
       _                    -> IODevice.isSeekable haDevice
 
diff --git a/libraries/base/GHC/IO/Handle/Internals.hs b/libraries/base/GHC/IO/Handle/Internals.hs
index 99cfb31..37251ab 100644
--- a/libraries/base/GHC/IO/Handle/Internals.hs
+++ b/libraries/base/GHC/IO/Handle/Internals.hs
@@ -42,7 +42,8 @@ module GHC.IO.Handle.Internals (
   decodeByteBuf,
 
   augmentIOError,
-  ioe_closedHandle, ioe_EOF, ioe_notReadable, ioe_notWritable,
+  ioe_closedHandle, ioe_semiclosedHandle,
+  ioe_EOF, ioe_notReadable, ioe_notWritable,
   ioe_finalizedHandle, ioe_bufsiz,
 
   hClose_help, hLookAhead_,
@@ -238,7 +239,7 @@ checkWritableHandle :: (Handle__ -> IO a) -> Handle__ -> IO a
 checkWritableHandle act h_ at Handle__{..}
   = case haType of
       ClosedHandle         -> ioe_closedHandle
-      SemiClosedHandle     -> ioe_closedHandle
+      SemiClosedHandle     -> ioe_semiclosedHandle
       ReadHandle           -> ioe_notWritable
       ReadWriteHandle      -> do
         buf <- readIORef haCharBuffer
@@ -277,7 +278,7 @@ checkReadableHandle :: (Handle__ -> IO a) -> Handle__ -> IO a
 checkReadableHandle act h_ at Handle__{..} =
     case haType of
       ClosedHandle         -> ioe_closedHandle
-      SemiClosedHandle     -> ioe_closedHandle
+      SemiClosedHandle     -> ioe_semiclosedHandle
       AppendHandle         -> ioe_notReadable
       WriteHandle          -> ioe_notReadable
       ReadWriteHandle      -> do
@@ -307,7 +308,7 @@ checkSeekableHandle :: (Handle__ -> IO a) -> Handle__ -> IO a
 checkSeekableHandle act handle_ at Handle__{haDevice=dev} =
     case haType handle_ of
       ClosedHandle      -> ioe_closedHandle
-      SemiClosedHandle  -> ioe_closedHandle
+      SemiClosedHandle  -> ioe_semiclosedHandle
       AppendHandle      -> ioe_notSeekable
       _ -> do b <- IODevice.isSeekable dev
               if b then act handle_
@@ -316,13 +317,16 @@ checkSeekableHandle act handle_ at Handle__{haDevice=dev} =
 -- -----------------------------------------------------------------------------
 -- Handy IOErrors
 
-ioe_closedHandle, ioe_EOF,
+ioe_closedHandle, ioe_semiclosedHandle, ioe_EOF,
   ioe_notReadable, ioe_notWritable, ioe_cannotFlushNotSeekable,
   ioe_notSeekable :: IO a
 
 ioe_closedHandle = ioException
    (IOError Nothing IllegalOperation ""
         "handle is closed" Nothing Nothing)
+ioe_semiclosedHandle = ioException
+   (IOError Nothing IllegalOperation ""
+        "handle is semi-closed" Nothing Nothing)
 ioe_EOF = ioException
    (IOError Nothing EOF "" "" Nothing Nothing)
 ioe_notReadable = ioException
diff --git a/libraries/base/tests/IO/IOError001.stdout b/libraries/base/tests/IO/IOError001.stdout
index 1e689bb..c235b62 100644
--- a/libraries/base/tests/IO/IOError001.stdout
+++ b/libraries/base/tests/IO/IOError001.stdout
@@ -1,2 +1,2 @@
-<stdin>: hGetChar: illegal operation (handle is closed)
-<stdin>: hGetChar: illegal operation (handle is closed)
+<stdin>: hGetChar: illegal operation (handle is semi-closed)
+<stdin>: hGetChar: illegal operation (handle is semi-closed)


From git at git.haskell.org  Tue Dec 15 00:37:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:48 +0000 (UTC)
Subject: [commit: ghc] master: Fix runghc when $1_$2_SHELL_WRAPPER = NO
 (05a5ebe)
Message-ID: <20151215003748.F22713A300@ghc.haskell.org>

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

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

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

commit 05a5ebed916dc00bc5761224047440fefe10485e
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Tue Dec 15 01:02:46 2015 +0100

    Fix runghc when $1_$2_SHELL_WRAPPER = NO
    
    When that variable isn't on (which is always the case on Windows),
    `runghc` naively attempts to invoke `ghc` by finding an executable
    simply named `ghc`. This won't work if `ghc` doesn't exist (e.g., if
    we're building GHC and using `ghc-stage2` instead). A simple fix is to
    test for the existence of `ghc` beforehand, and if that fails, fall back
    on `ghc-stage2`.
    
    Fixes #11185.
    
    Test Plan: ./validate
    
    Reviewers: austin, hvr, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1621
    
    GHC Trac Issues: #11185


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

05a5ebed916dc00bc5761224047440fefe10485e
 utils/runghc/Main.hs | 22 ++++++++++++++++++----
 utils/runghc/ghc.mk  |  1 -
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/utils/runghc/Main.hs b/utils/runghc/Main.hs
index 42ddb83..d048125 100644
--- a/utils/runghc/Main.hs
+++ b/utils/runghc/Main.hs
@@ -52,9 +52,24 @@ main = do
             mbPath <- getExecPath
             case mbPath of
                 Nothing  -> dieProg ("cannot find ghc")
-                Just path ->
-                    let ghc = takeDirectory (normalise path) </> "ghc"
-                    in uncurry (doIt ghc) $ getGhcArgs args'
+                Just path -> do
+                    ghc <- findGhc path
+                    uncurry (doIt ghc) $ getGhcArgs args'
+
+-- In some cases, runghc isn't given a path to ghc explicitly. This can occur
+-- if $1_$2_SHELL_WRAPPER = NO (which is always the case on Windows). In such
+-- a scenario, we must guess where ghc lives. Given a path where ghc might
+-- live, we check for the existence of ghc. If we can't find it, we assume that
+-- we're building ghc from source, in which case we fall back on ghc-stage2.
+-- (See Trac #1185.)
+findGhc :: FilePath -> IO FilePath
+findGhc path = do
+    let ghcDir = takeDirectory (normalise path)
+        ghc    = ghcDir </> "ghc" <.> exeExtension
+    ghcExists <- doesFileExist ghc
+    return $ if ghcExists
+             then ghc
+             else ghcDir </> "ghc-stage2" <.> exeExtension
 
 data RunGhcFlags = RunGhcFlags (Maybe FilePath) -- GHC location
                  | Help -- Print help text
@@ -177,4 +192,3 @@ foreign import WINDOWS_CCONV unsafe "windows.h GetModuleFileNameW"
 #else
 getExecPath = return Nothing
 #endif
-
diff --git a/utils/runghc/ghc.mk b/utils/runghc/ghc.mk
index e981abf..9169ca2 100644
--- a/utils/runghc/ghc.mk
+++ b/utils/runghc/ghc.mk
@@ -42,4 +42,3 @@ install_runhaskell:
 	$(call removeFiles,"$(DESTDIR)$(bindir)/runghc")
 	$(LN_S) runghc-$(ProjectVersion) "$(DESTDIR)$(bindir)/runghc"
 endif
-


From git at git.haskell.org  Tue Dec 15 00:37:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:51 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: delete function that doesn't do
 anything (33742db)
Message-ID: <20151215003751.9883F3A300@ghc.haskell.org>

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

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

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

commit 33742db5798ef09192e8468af7dd71d58b316ab9
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Dec 15 01:07:39 2015 +0100

    DynFlags: delete function that doesn't do anything
    
    Reviewers: austin, bgamari
    
    Reviewed By: austin, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1606


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

33742db5798ef09192e8468af7dd71d58b316ab9
 compiler/main/DynFlags.hs | 15 +++------------
 1 file changed, 3 insertions(+), 12 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 7003a6c..98a3631 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -1328,14 +1328,6 @@ wayUnsetGeneralFlags _ WayDyn      = [-- There's no point splitting objects
 wayUnsetGeneralFlags _ WayProf     = []
 wayUnsetGeneralFlags _ WayEventLog = []
 
-wayExtras :: Platform -> Way -> DynFlags -> DynFlags
-wayExtras _ (WayCustom {}) dflags = dflags
-wayExtras _ WayThreaded dflags = dflags
-wayExtras _ WayDebug    dflags = dflags
-wayExtras _ WayDyn      dflags = dflags
-wayExtras _ WayProf     dflags = dflags
-wayExtras _ WayEventLog dflags = dflags
-
 wayOptc :: Platform -> Way -> [String]
 wayOptc _ (WayCustom {}) = []
 wayOptc platform WayThreaded = case platformOS platform of
@@ -3692,12 +3684,11 @@ addWay w = upd (addWay' w)
 addWay' :: Way -> DynFlags -> DynFlags
 addWay' w dflags0 = let platform = targetPlatform dflags0
                         dflags1 = dflags0 { ways = w : ways dflags0 }
-                        dflags2 = wayExtras platform w dflags1
-                        dflags3 = foldr setGeneralFlag' dflags2
+                        dflags2 = foldr setGeneralFlag' dflags1
                                         (wayGeneralFlags platform w)
-                        dflags4 = foldr unSetGeneralFlag' dflags3
+                        dflags3 = foldr unSetGeneralFlag' dflags2
                                         (wayUnsetGeneralFlags platform w)
-                    in dflags4
+                    in dflags3
 
 removeWayDyn :: DynP ()
 removeWayDyn = upd (\dfs -> dfs { ways = filter (WayDyn /=) (ways dfs) })


From git at git.haskell.org  Tue Dec 15 00:37:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:54 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags Remove -fwarn-context-quantification
 flag (ddde542)
Message-ID: <20151215003754.4D73F3A300@ghc.haskell.org>

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

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

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

commit ddde542dbcb088e0a10aa3cdc3e0aef0a1c4a9b7
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 01:01:39 2015 +0100

    DynFlags Remove -fwarn-context-quantification flag
    
    As mentioned in #4426 these warnings are now errors since the Great
    Wildcards Refactor of 2015 (1e041b7382b6aa329e4ad9625439f811e0f27232).
    I've opened #11221 to ensure we remove the last traces of the option in
    8.2.
    
    Test Plan: validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1615
    
    GHC Trac Issues: #4426


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

ddde542dbcb088e0a10aa3cdc3e0aef0a1c4a9b7
 compiler/main/DynFlags.hs                          |  6 ++---
 compiler/rename/RnTypes.hs                         |  4 ++--
 docs/users_guide/glasgow_exts.rst                  |  4 ++--
 docs/users_guide/using-warnings.rst                | 26 ++--------------------
 testsuite/tests/rename/should_compile/T4426.hs     |  1 -
 testsuite/tests/rename/should_compile/T4426.stderr | 18 +++++++--------
 6 files changed, 18 insertions(+), 41 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 63cfe03..b306253 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -504,7 +504,7 @@ data WarningFlag =
    | Opt_WarnUnusedPatternBinds
    | Opt_WarnUnusedImports
    | Opt_WarnUnusedMatches
-   | Opt_WarnContextQuantification
+   | Opt_WarnContextQuantification    -- remove in 8.2
    | Opt_WarnWarningsDeprecations
    | Opt_WarnDeprecatedFlags
    | Opt_WarnAMP -- Introduced in GHC 7.8, obsolete since 7.10
@@ -2904,7 +2904,8 @@ fWarningFlags = [
   flagSpec "warn-dodgy-foreign-imports"       Opt_WarnDodgyForeignImports,
   flagSpec "warn-dodgy-imports"               Opt_WarnDodgyImports,
   flagSpec "warn-empty-enumerations"          Opt_WarnEmptyEnumerations,
-  flagSpec "warn-context-quantification"      Opt_WarnContextQuantification,
+  flagSpec' "warn-context-quantification"      Opt_WarnContextQuantification
+    (\_ -> deprecate "it is subsumed by an error message that cannot be disabled"),
   flagSpec' "warn-duplicate-constraints"      Opt_WarnDuplicateConstraints
     (\_ -> deprecate "it is subsumed by -fwarn-redundant-constraints"),
   flagSpec "warn-redundant-constraints"       Opt_WarnRedundantConstraints,
@@ -3473,7 +3474,6 @@ standardWarnings -- see Note [Documenting warning flags]
         Opt_WarnInlineRuleShadowing,
         Opt_WarnAlternativeLayoutRuleTransitional,
         Opt_WarnUnsupportedLlvmVersion,
-        Opt_WarnContextQuantification,
         Opt_WarnTabs
       ]
 
diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index fef7b67..4f7c291 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -264,8 +264,8 @@ f :: forall a. a -> b         is an error
 f :: forall a. () => a -> b   is an error
 f :: forall a. a -> (() => b) binds "a" and "b"
 
-The -fwarn-context-quantification flag warns about
-this situation. See rnHsTyKi for case HsForAllTy Qualified.
+This situation is now considered to be an error. See rnHsTyKi for case
+HsForAllTy Qualified.
 
 Note [Dealing with *]
 ~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 3c98dc7..ebe1f75 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -8379,8 +8379,8 @@ example:
 
 As of GHC 7.10, this is deprecated. The
 ``-fwarn-context-quantification`` flag detects this situation and issues
-a warning. In GHC 7.12, declarations such as ``MkSwizzle'`` will cause
-an out-of-scope error.
+a warning. In GHC 8.0 this flag was deprecated and declarations such as
+``MkSwizzle'`` will cause an out-of-scope error.
 
 As for type signatures, implicit quantification happens for
 non-overloaded types too. So if you write this:
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 9b98686..699c8fd 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -19,9 +19,8 @@ generally likely to indicate bugs in your program. These are:
 ``-fwarn-missing-methods``, ``-fwarn-wrong-do-bind``,
 ``-fwarn-unsupported-calling-conventions``,
 ``-fwarn-dodgy-foreign-imports``, ``-fwarn-inline-rule-shadowing``,
-``-fwarn-unsupported-llvm-version``, ``-fwarn-context-quantification``,
-and ``-fwarn-tabs``. The following flags are simple ways to select
-standard ?packages? of warnings:
+``-fwarn-unsupported-llvm-version`` and ``-fwarn-tabs``. The following flags are
+simple ways to select standard ?packages? of warnings:
 
 ``-W``
     .. index::
@@ -894,27 +893,6 @@ command line.
 
         do { mapM_ popInt xs ; return 10 }
 
-``-fwarn-context-quantification``
-    .. index::
-       single: -fwarn-context-quantification
-       single: implicit context quantification, warning
-       single: context, implicit quantification
-
-    Report if a variable is quantified only due to its presence in a
-    context (see :ref:`universal-quantification`). For example,
-
-    ::
-
-        type T a = Monad m => a -> f a
-
-    It is recommended to write this polymorphic type as
-
-    ::
-
-        type T a = forall m. Monad m => a -> f a
-
-    instead.
-
 ``-fwarn-wrong-do-bind``
     .. index::
        single: -fwarn-wrong-do-bind
diff --git a/testsuite/tests/rename/should_compile/T4426.hs b/testsuite/tests/rename/should_compile/T4426.hs
index 610f670..49e5875 100644
--- a/testsuite/tests/rename/should_compile/T4426.hs
+++ b/testsuite/tests/rename/should_compile/T4426.hs
@@ -1,5 +1,4 @@
 {-# LANGUAGE RankNTypes #-}
-{- # OPTIONS_GHC -fwarn-context-quantification #-}
 
 module T4426 where
 
diff --git a/testsuite/tests/rename/should_compile/T4426.stderr b/testsuite/tests/rename/should_compile/T4426.stderr
index f731f35..0d0b706 100644
--- a/testsuite/tests/rename/should_compile/T4426.stderr
+++ b/testsuite/tests/rename/should_compile/T4426.stderr
@@ -1,18 +1,18 @@
 
-T4426.hs:11:18: error: Not in scope: type variable ?m?
+T4426.hs:10:18: error: Not in scope: type variable ?m?
 
-T4426.hs:11:28: error: Not in scope: type variable ?m?
+T4426.hs:10:28: error: Not in scope: type variable ?m?
 
-T4426.hs:13:18: error: Not in scope: type variable ?b?
+T4426.hs:12:18: error: Not in scope: type variable ?b?
 
-T4426.hs:13:28: error: Not in scope: type variable ?b?
+T4426.hs:12:28: error: Not in scope: type variable ?b?
 
-T4426.hs:15:24: error: Not in scope: type variable ?b?
+T4426.hs:14:24: error: Not in scope: type variable ?b?
 
-T4426.hs:15:34: error: Not in scope: type variable ?b?
+T4426.hs:14:34: error: Not in scope: type variable ?b?
 
-T4426.hs:15:39: error: Not in scope: type variable ?c?
+T4426.hs:14:39: error: Not in scope: type variable ?c?
 
-T4426.hs:17:23: error: Not in scope: type variable ?m?
+T4426.hs:16:23: error: Not in scope: type variable ?m?
 
-T4426.hs:17:28: error: Not in scope: type variable ?m?
+T4426.hs:16:28: error: Not in scope: type variable ?m?


From git at git.haskell.org  Tue Dec 15 00:37:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 00:37:57 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: remove Opt_Static (6d9c18c)
Message-ID: <20151215003757.08C6B3A300@ghc.haskell.org>

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

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

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

commit 6d9c18cb43c1fda95932ef0f640dcf41906a2773
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Dec 15 01:07:24 2015 +0100

    DynFlags: remove Opt_Static
    
    There are currently 2 different ways to test for a static or dynamic
    build:
    
        * Test if WayDyn is in ways
        * Test if Opt_Static is set
    
    The problem is that these can easily go out of sync, especially when
    using the
    GHC API.
    
    This commit replaces all queries of Opt_Static with an equivalent query
    of
    WayDyn. This would have prevented bug #8294 and fixes #11154.
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: austin, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1607
    
    GHC Trac Issues: #10636


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

6d9c18cb43c1fda95932ef0f640dcf41906a2773
 compiler/cmm/CLabel.hs          | 10 +++++-----
 compiler/ghci/Linker.hs         | 11 ++++++-----
 compiler/main/DriverPipeline.hs |  8 ++++----
 compiler/main/DynFlags.hs       | 13 ++++---------
 compiler/main/Packages.hs       |  6 +++---
 compiler/main/SysTools.hs       |  2 +-
 compiler/nativeGen/PIC.hs       | 14 +++++++-------
 7 files changed, 30 insertions(+), 34 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6d9c18cb43c1fda95932ef0f640dcf41906a2773

From git at git.haskell.org  Tue Dec 15 01:06:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 01:06:17 +0000 (UTC)
Subject: [commit: ghc] master: TysWiredIn: Fix a comment - Note [TYPE] is in
 TysPrim (8e6f9bf)
Message-ID: <20151215010617.1A7BB3A300@ghc.haskell.org>

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

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

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

commit 8e6f9bf2fa436aa76a2f43dfca8503513af95b41
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Mon Dec 14 20:05:43 2015 -0500

    TysWiredIn: Fix a comment - Note [TYPE] is in TysPrim


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

8e6f9bf2fa436aa76a2f43dfca8503513af95b41
 compiler/prelude/TysWiredIn.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index 1d0feab..d92c4cd 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -662,7 +662,7 @@ heqSCSelId, coercibleSCSelId :: Id
     sc_sel_id = mkDictSelId coercibleSCSelIdName klass
 
 -- For information about the usage of the following type, see Note [TYPE]
--- in module Kind
+-- in module TysPrim
 levityTy :: Type
 levityTy = mkTyConTy levityTyCon
 


From git at git.haskell.org  Tue Dec 15 10:52:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 10:52:42 +0000 (UTC)
Subject: [commit: ghc] master: Update expected test output for 32 bit
 platforms (4c9d1ea)
Message-ID: <20151215105242.A0AFE3A300@ghc.haskell.org>

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

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

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

commit 4c9d1eab2479a40e759d086ed7069dbd970d1307
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Dec 15 21:53:11 2015 +1100

    Update expected test output for 32 bit platforms
    
    Test Plan: Run tests on a 32 bit platform
    
    Reviewers: austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1627


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

4c9d1eab2479a40e759d086ed7069dbd970d1307
 .../deSugar/should_compile/T2431.stderr-ws-32      | 22 ++++--
 .../tests/roles/should_compile/Roles1.stderr-ws-32 | 84 ++++++----------------
 .../roles/should_compile/Roles13.stderr-ws-32      | 34 +++++----
 .../roles/should_compile/Roles14.stderr-ws-32      |  9 +--
 .../tests/roles/should_compile/Roles2.stderr-ws-32 | 18 ++---
 .../tests/roles/should_compile/Roles3.stderr-ws-32 | 38 ++++------
 .../tests/roles/should_compile/Roles4.stderr-ws-32 | 16 ++---
 .../tests/roles/should_compile/T8958.stderr-ws-32  |  6 +-
 .../simplCore/should_compile/T7360.stderr-ws-32    | 58 ++++++++++++++-
 testsuite/tests/th/TH_Roles2.stderr-ws-32          |  1 +
 10 files changed, 146 insertions(+), 140 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4c9d1eab2479a40e759d086ed7069dbd970d1307

From git at git.haskell.org  Tue Dec 15 11:03:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 11:03:39 +0000 (UTC)
Subject: [commit: packages/xhtml] tag '3000.2.1' created
Message-ID: <20151215110339.0AF903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/xhtml

New tag    : 3000.2.1
Referencing: 6567d42aaf8a4b5da825056367d330a1797a811e

From git at git.haskell.org  Tue Dec 15 13:34:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:16 +0000 (UTC)
Subject: [commit: packages/process] branch 'less-cpp' created
Message-ID: <20151215133416.A5E503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

New branch : less-cpp
Referencing: 9dae7ad1b5688723f129cd9eb2b2b82f7f2f6ec4

From git at git.haskell.org  Tue Dec 15 13:34:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:18 +0000 (UTC)
Subject: [commit: packages/process] tag 'v1.4.1.0' created
Message-ID: <20151215133418.A627B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

New tag    : v1.4.1.0
Referencing: dac7908c884fefebd037cfcbadfd5c374cf10d90

From git at git.haskell.org  Tue Dec 15 13:34:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:20 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Refactor .Internals into .Common, .Windows,
 and .Posix (tested only on Windows) (78b807a)
Message-ID: <20151215133420.B14D33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/78b807a7574eada97d4126099ddfd2c42dfabd8a/process

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

commit 78b807a7574eada97d4126099ddfd2c42dfabd8a
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Nov 2 08:12:16 2015 -0800

    Refactor .Internals into .Common, .Windows, and .Posix (tested only on Windows)


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

78b807a7574eada97d4126099ddfd2c42dfabd8a
 System/Process/Common.hs    | 201 ++++++++++++++
 System/Process/Internals.hs | 651 +-------------------------------------------
 System/Process/Posix.hs     | 276 +++++++++++++++++++
 System/Process/Windows.hs   | 244 +++++++++++++++++
 process.cabal               |   6 +
 5 files changed, 741 insertions(+), 637 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 78b807a7574eada97d4126099ddfd2c42dfabd8a

From git at git.haskell.org  Tue Dec 15 13:34:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:22 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,master: appveyor.yml (3b3ba4b)
Message-ID: <20151215133422.B8B683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3b3ba4b827060117324ab233a950e48eba3b45e5/process

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

commit 3b3ba4b827060117324ab233a950e48eba3b45e5
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Nov 2 08:12:53 2015 -0800

    appveyor.yml


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

3b3ba4b827060117324ab233a950e48eba3b45e5
 appveyor.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..671e09b
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+cache:
+- "c:\\sr" # stack root, short paths == less problems
+
+build: off
+
+before_test:
+- curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
+- 7z x stack.zip stack.exe
+
+clone_folder: "c:\\stack"
+environment:
+  global:
+    STACK_ROOT: "c:\\sr"
+
+test_script:
+- stack setup > nul
+# The ugly echo "" hack is to avoid complaints about 0 being an invalid file
+# descriptor
+- echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:24 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Fail on all warnings on Travis (7738849)
Message-ID: <20151215133424.BF8AC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/77388495bad902fdc0757c774e7b1e16afbe53ed/process

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

commit 77388495bad902fdc0757c774e7b1e16afbe53ed
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Nov 2 08:13:26 2015 -0800

    Fail on all warnings on Travis


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

77388495bad902fdc0757c774e7b1e16afbe53ed
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index ef55c45..911a546 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,7 @@ install:
 
 script:
  - autoreconf -i
- - cabal configure -v2 --enable-tests
+ - cabal configure -v2 --enable-tests --ghc-options="-Wall -Werror"
  - cabal build
  - cabal check || [ "$CABALVER" == "1.16" ]
  - ./dist/build/test/test # Using cabal test was giving trouble with cabal 1.22


From git at git.haskell.org  Tue Dec 15 13:34:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:26 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: appveyor: do autoreconf (807e4e9)
Message-ID: <20151215133426.C50B33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/807e4e94bec9091c884357448b43c630bfd8cb08/process

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

commit 807e4e94bec9091c884357448b43c630bfd8cb08
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Nov 2 08:24:54 2015 -0800

    appveyor: do autoreconf


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

807e4e94bec9091c884357448b43c630bfd8cb08
 appveyor.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/appveyor.yml b/appveyor.yml
index 671e09b..806c078 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,4 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
+- echo "" | stack exec "bash -c 'pacman -S autoconf && autoreconf -i'"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:28 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Builds on non-Windows (46f0f27)
Message-ID: <20151215133428.CBD373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/46f0f2778fbc3e62e9d36cd2aabfda2ef612e0cb/process

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

commit 46f0f2778fbc3e62e9d36cd2aabfda2ef612e0cb
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:30:17 2015 +0000

    Builds on non-Windows


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

46f0f2778fbc3e62e9d36cd2aabfda2ef612e0cb
 System/Process/Common.hs    |  4 ++++
 System/Process/Internals.hs | 14 +++-----------
 System/Process/Posix.hs     | 45 +++++++++++++++++++++------------------------
 System/Process/Windows.hs   |  2 --
 4 files changed, 28 insertions(+), 37 deletions(-)

diff --git a/System/Process/Common.hs b/System/Process/Common.hs
index fd9f38b..e7ce4d9 100644
--- a/System/Process/Common.hs
+++ b/System/Process/Common.hs
@@ -40,6 +40,8 @@ import GHC.IO.IOMode
 #ifdef WINDOWS
 import Data.Word (Word32)
 import System.Win32.DebugApi (PHANDLE)
+#else
+import System.Posix.Types
 #endif
 
 #ifdef WINDOWS
@@ -47,6 +49,8 @@ import System.Win32.DebugApi (PHANDLE)
 newtype CGid = CGid Word32
 type GroupID = CGid
 type UserID = CGid
+#else
+type PHANDLE = CPid
 #endif
 
 data CreateProcess = CreateProcess{
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 04eb1d2..32052eb 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, RecordWildCards, BangPatterns #-}
+{-# LANGUAGE CPP #-}
 {-# OPTIONS_HADDOCK not-home #-}
 #ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Trustworthy #-}
@@ -43,15 +43,8 @@ module System.Process.Internals (
     translate,
     ) where
 
-import Control.Concurrent
-import Control.Exception
-import Data.Bits
 import Foreign.C
-import Foreign.Marshal
-import Foreign.Ptr
-import Foreign.Storable
 import System.IO
-import System.IO.Unsafe
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.IO.Handle.FD (fdToHandle)
@@ -65,9 +58,6 @@ import System.Process.Windows
 import System.Process.Posix
 #endif
 
-#include "HsProcessConfig.h"
-#include "processFlags.h"
-
 -- ----------------------------------------------------------------------------
 
 -- | This function is almost identical to
@@ -88,6 +78,7 @@ createProcess_
   -> CreateProcess
   -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
 createProcess_ = createProcess_Internal
+{-# INLINE createProcess_ #-}
 
 -- ------------------------------------------------------------------------
 -- Escaping commands for shells
@@ -146,6 +137,7 @@ use lpCommandLine alone, which CreateProcess supports.
 
 translate :: String -> String
 translate = translateInternal
+{-# INLINE translate #-}
 
 
 -- ----------------------------------------------------------------------------
diff --git a/System/Process/Posix.hs b/System/Process/Posix.hs
index 4619fd8..ec95743 100644
--- a/System/Process/Posix.hs
+++ b/System/Process/Posix.hs
@@ -1,5 +1,19 @@
+{-# LANGUAGE BangPatterns #-}
+{-# LANGUAGE CPP #-}
 module System.Process.Posix
-    (
+    ( mkProcessHandle
+    , translateInternal
+    , createProcess_Internal
+    , withCEnvironment
+    , closePHANDLE
+    , startDelegateControlC
+    , endDelegateControlC
+    , stopDelegateControlC
+    , isDefaultSignal
+    , ignoreSignal
+    , defaultSignal
+    , c_execvpe
+    , pPrPr_disableITimers
     ) where
 
 import Control.Concurrent
@@ -11,43 +25,21 @@ import Foreign.Ptr
 import Foreign.Storable
 import System.IO.Unsafe
 
-#if !defined(mingw32_HOST_OS) && !defined(__MINGW32__)
 import Control.Monad
 import Data.Char
 import System.IO
 import System.Posix.Process.Internals ( pPrPr_disableITimers, c_execvpe )
 import System.Posix.Types
-#endif
 
-#ifdef __GLASGOW_HASKELL__
 import System.Posix.Internals
 import GHC.IO.Exception
-import GHC.IO.Encoding
-import qualified GHC.IO.FD as FD
-import GHC.IO.Device
-import GHC.IO.Handle.FD
-import GHC.IO.Handle.Internals
-import GHC.IO.Handle.Types hiding (ClosedHandle)
-import System.IO.Error
-import Data.Typeable
-# ifndef WINDOWS
 import System.Posix.Signals as Sig
-# endif
-#endif
 
 import System.Process.Common
 
-#if WINDOWS
-import System.Process.Windows
-#else
-import System.Process.Posix
-#endif
-
 #include "HsProcessConfig.h"
 #include "processFlags.h"
 
-type PHANDLE = CPid
-
 mkProcessHandle :: PHANDLE -> Bool -> IO ProcessHandle
 mkProcessHandle p mb_delegate_ctlc = do
   m <- newMVar (OpenHandle p)
@@ -102,7 +94,12 @@ withCEnvironment envir act =
 -- -----------------------------------------------------------------------------
 -- POSIX runProcess with signal handling in the child
 
-createProcess_ fun CreateProcess{ cmdspec = cmdsp,
+createProcess_Internal
+    :: String
+    -> CreateProcess
+    -> IO (Maybe Handle, Maybe Handle, Maybe Handle, ProcessHandle)
+createProcess_Internal fun
+                   CreateProcess{ cmdspec = cmdsp,
                                   cwd = mb_cwd,
                                   env = mb_env,
                                   std_in = mb_stdin,
diff --git a/System/Process/Windows.hs b/System/Process/Windows.hs
index 3afeeb3..bae63c6 100644
--- a/System/Process/Windows.hs
+++ b/System/Process/Windows.hs
@@ -75,7 +75,6 @@ foreign import WINDOWS_CCONV unsafe "CloseHandle"
         :: PHANDLE
         -> IO ()
 
-{-# INLINE createProcess_Internal #-}
 createProcess_Internal
   :: String                     -- ^ function name (for error messages)
   -> CreateProcess
@@ -222,7 +221,6 @@ findCommandInterpreter = do
                                 "findCommandInterpreter" Nothing Nothing)
       Just cmd -> return cmd
 
-{-# INLINE translateInternal #-}
 translateInternal :: String -> String
 translateInternal xs = '"' : snd (foldr escape (True,"\"") xs)
   where escape '"'  (_,     str) = (True,  '\\' : '"'  : str)


From git at git.haskell.org  Tue Dec 15 13:34:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:30 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Add some clarifying comments (edaedae)
Message-ID: <20151215133430.D26053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/edaedaee7461560cb3b9ca3a4ef0b3990d95cd7f/process

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

commit edaedaee7461560cb3b9ca3a4ef0b3990d95cd7f
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:35:09 2015 +0000

    Add some clarifying comments


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

edaedaee7461560cb3b9ca3a4ef0b3990d95cd7f
 System/Process/Common.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/System/Process/Common.hs b/System/Process/Common.hs
index e7ce4d9..5d2e180 100644
--- a/System/Process/Common.hs
+++ b/System/Process/Common.hs
@@ -37,6 +37,8 @@ import System.IO.Error
 import Data.Typeable
 import GHC.IO.IOMode
 
+-- We do a minimal amount of CPP here to provide uniform data types across
+-- Windows and POSIX.
 #ifdef WINDOWS
 import Data.Word (Word32)
 import System.Win32.DebugApi (PHANDLE)
@@ -45,7 +47,9 @@ import System.Posix.Types
 #endif
 
 #ifdef WINDOWS
--- Define some missing types for Windows compatibility
+-- Define some missing types for Windows compatibility. Note that these values
+-- will never actually be used, as the setuid/setgid system calls are not
+-- applicable on Windows. No value of this type will ever exist.
 newtype CGid = CGid Word32
 type GroupID = CGid
 type UserID = CGid


From git at git.haskell.org  Tue Dec 15 13:34:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:32 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: appveyor: s/bash/sh (6715752)
Message-ID: <20151215133432.D86AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/67157525e26de80933eded966865372ac52eb638/process

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

commit 67157525e26de80933eded966865372ac52eb638
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:36:02 2015 +0000

    appveyor: s/bash/sh


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

67157525e26de80933eded966865372ac52eb638
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 806c078..3749543 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack exec "bash -c 'pacman -S autoconf && autoreconf -i'"
+- echo "" | stack exec "sh -c 'pacman -S autoconf && autoreconf -i'"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:34 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Fix some GHC 7.2 warnings (c12eb1c)
Message-ID: <20151215133434.DED253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c12eb1cd92b54333bec29356dd88a966ccf67ada/process

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

commit c12eb1cd92b54333bec29356dd88a966ccf67ada
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:40:17 2015 +0000

    Fix some GHC 7.2 warnings


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

c12eb1cd92b54333bec29356dd88a966ccf67ada
 System/Process.hsc       |  2 ++
 System/Process/Common.hs | 10 ++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index a390c74..f8431a4 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -94,8 +94,10 @@ import Control.Exception (onException)
 #else
 import System.Posix.Process (getProcessGroupIDOf)
 import qualified System.Posix.IO as Posix
+#if MIN_VERSION_base(4,5,0)
 import System.Posix.Types
 #endif
+#endif
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.IO.Exception ( ioException, IOErrorType(..), IOException(..) )
diff --git a/System/Process/Common.hs b/System/Process/Common.hs
index 5d2e180..0c55ff1 100644
--- a/System/Process/Common.hs
+++ b/System/Process/Common.hs
@@ -1,8 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# LANGUAGE RecordWildCards #-}
 module System.Process.Common
-    ( CGid (..)
-    , CreateProcess (..)
+    ( CreateProcess (..)
     , CmdSpec (..)
     , StdStream (..)
     , ProcessHandle(..)
@@ -17,6 +16,13 @@ module System.Process.Common
     , mbFd
     , mbPipe
     , pfdToHandle
+
+-- Avoid a warning on Windows
+#ifdef WINDOWS
+    , CGid (..)
+#else
+    , CGid
+#endif
     ) where
 
 import Control.Concurrent


From git at git.haskell.org  Tue Dec 15 13:34:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:36 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Ignore Vim .swp files (c045a6e)
Message-ID: <20151215133436.E50A83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c045a6ea1334dbfbf39c22cf06bede20f1b34cdd/process

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

commit c045a6ea1334dbfbf39c22cf06bede20f1b34cdd
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:43:21 2015 +0000

    Ignore Vim .swp files


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

c045a6ea1334dbfbf39c22cf06bede20f1b34cdd
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 63b58e1..a123a67 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 /dist/
 /.stack-work/
+*.swp
 
 # Specific generated files
 GNUmakefile


From git at git.haskell.org  Tue Dec 15 13:34:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:38 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: appveyor: I'll get this right eventually (5d81377)
Message-ID: <20151215133438.EB1C93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5d813773e409b1146de44fe4337cf458358ba9c2/process

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

commit 5d813773e409b1146de44fe4337cf458358ba9c2
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:54:00 2015 +0000

    appveyor: I'll get this right eventually


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

5d813773e409b1146de44fe4337cf458358ba9c2
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 3749543..4117809 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack exec "sh -c 'pacman -S autoconf && autoreconf -i'"
+- echo "" | stack exec -- sh -c "pacman -S autoconf && autoreconf -i"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:40 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Move createPipe to per-OS modules (e63f474)
Message-ID: <20151215133440.F2EBA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e63f47445f50c64496c71171d938f511dd1a6d4d/process

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

commit e63f47445f50c64496c71171d938f511dd1a6d4d
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 16:57:45 2015 +0000

    Move createPipe to per-OS modules


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

e63f47445f50c64496c71171d938f511dd1a6d4d
 System/Process.hsc          | 38 --------------------------------------
 System/Process/Internals.hs | 12 ++++++++++++
 System/Process/Posix.hs     |  9 +++++++++
 System/Process/Windows.hs   | 22 ++++++++++++++++++++++
 4 files changed, 43 insertions(+), 38 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index f8431a4..c0b08ee 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -88,12 +88,9 @@ import System.IO
 import System.IO.Error (mkIOError, ioeSetErrorString)
 
 #if defined(mingw32_HOST_OS)
-# include <io.h>        /* for _close and _pipe */
 # include <fcntl.h>     /* for _O_BINARY */
-import Control.Exception (onException)
 #else
 import System.Posix.Process (getProcessGroupIDOf)
-import qualified System.Posix.IO as Posix
 #if MIN_VERSION_base(4,5,0)
 import System.Posix.Types
 #endif
@@ -934,38 +931,3 @@ rawSystem cmd args = system (showCommandForUser cmd args)
 #else
 rawSystem cmd args = system (showCommandForUser cmd args)
 #endif
-
--- ---------------------------------------------------------------------------
--- createPipe
-
--- | Create a pipe for interprocess communication and return a
--- @(readEnd, writeEnd)@ `Handle` pair.
---
--- @since 1.2.1.0
-createPipe :: IO (Handle, Handle)
-#if !mingw32_HOST_OS
-createPipe = do
-    (readfd, writefd) <- Posix.createPipe
-    readh <- Posix.fdToHandle readfd
-    writeh <- Posix.fdToHandle writefd
-    return (readh, writeh)
-#else
-createPipe = do
-    (readfd, writefd) <- allocaArray 2 $ \ pfds -> do
-        throwErrnoIfMinus1_ "_pipe" $ c__pipe pfds 2 (#const _O_BINARY)
-        readfd <- peek pfds
-        writefd <- peekElemOff pfds 1
-        return (readfd, writefd)
-    (do readh <- fdToHandle readfd
-        writeh <- fdToHandle writefd
-        return (readh, writeh)) `onException` (close readfd >> close writefd)
-
-close :: CInt -> IO ()
-close = throwErrnoIfMinus1_ "_close" . c__close
-
-foreign import ccall "io.h _pipe" c__pipe ::
-    Ptr CInt -> CUInt -> CInt -> IO CInt
-
-foreign import ccall "io.h _close" c__close ::
-    CInt -> IO CInt
-#endif
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 32052eb..3a673c7 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -41,6 +41,7 @@ module System.Process.Internals (
 #endif
     withFilePathException, withCEnvironment,
     translate,
+    createPipe,
     ) where
 
 import Foreign.C
@@ -158,3 +159,14 @@ runGenProcess_ fun c (Just sig) (Just sig') | isDefaultSignal sig && sig == sig'
 runGenProcess_ fun c _ _ = createProcess_ fun c
 
 #endif
+
+-- ---------------------------------------------------------------------------
+-- createPipe
+
+-- | Create a pipe for interprocess communication and return a
+-- @(readEnd, writeEnd)@ `Handle` pair.
+--
+-- @since 1.2.1.0
+createPipe :: IO (Handle, Handle)
+createPipe = createPipeInternal
+{-# INLINE createPipe #-}
diff --git a/System/Process/Posix.hs b/System/Process/Posix.hs
index ec95743..e9d1e31 100644
--- a/System/Process/Posix.hs
+++ b/System/Process/Posix.hs
@@ -14,6 +14,7 @@ module System.Process.Posix
     , defaultSignal
     , c_execvpe
     , pPrPr_disableITimers
+    , createPipeInternal
     ) where
 
 import Control.Concurrent
@@ -34,6 +35,7 @@ import System.Posix.Types
 import System.Posix.Internals
 import GHC.IO.Exception
 import System.Posix.Signals as Sig
+import qualified System.Posix.IO as Posix
 
 import System.Process.Common
 
@@ -271,3 +273,10 @@ defaultSignal = CONST_SIG_DFL
 
 isDefaultSignal :: CLong -> Bool
 isDefaultSignal = (== defaultSignal)
+
+createPipeInternal :: IO (Handle, Handle)
+createPipeInternal = do
+    (readfd, writefd) <- Posix.createPipe
+    readh <- Posix.fdToHandle readfd
+    writeh <- Posix.fdToHandle writefd
+    return (readh, writeh)
diff --git a/System/Process/Windows.hs b/System/Process/Windows.hs
index bae63c6..676ecbe 100644
--- a/System/Process/Windows.hs
+++ b/System/Process/Windows.hs
@@ -9,6 +9,7 @@ module System.Process.Windows
     , endDelegateControlC
     , stopDelegateControlC
     , isDefaultSignal
+    , createPipeInternal
     ) where
 
 import System.Process.Common
@@ -45,6 +46,7 @@ import System.Process.Common
 # define WINDOWS_CCONV ccall
 #endif
 
+#include <io.h>        /* for _close and _pipe */
 #include "HsProcessConfig.h"
 #include "processFlags.h"
 
@@ -240,3 +242,23 @@ withCEnvironment envir act =
 
 isDefaultSignal :: CLong -> Bool
 isDefaultSignal = const False
+
+createPipeInternal :: IO (Handle, Handle)
+createPipeInternal = do
+    (readfd, writefd) <- allocaArray 2 $ \ pfds -> do
+        throwErrnoIfMinus1_ "_pipe" $ c__pipe pfds 2 (#const _O_BINARY)
+        readfd <- peek pfds
+        writefd <- peekElemOff pfds 1
+        return (readfd, writefd)
+    (do readh <- fdToHandle readfd
+        writeh <- fdToHandle writefd
+        return (readh, writeh)) `onException` (close readfd >> close writefd)
+
+close :: CInt -> IO ()
+close = throwErrnoIfMinus1_ "_close" . c__close
+
+foreign import ccall "io.h _pipe" c__pipe ::
+    Ptr CInt -> CUInt -> CInt -> IO CInt
+
+foreign import ccall "io.h _close" c__close ::
+    CInt -> IO CInt


From git at git.haskell.org  Tue Dec 15 13:34:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:43 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Move interruptProcessGroupOf into per-OS modules (6a8ca1e)
Message-ID: <20151215133443.054413A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6a8ca1ea4376bf93ac8fcfe88ffa6d9f860c9687/process

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

commit 6a8ca1ea4376bf93ac8fcfe88ffa6d9f860c9687
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 17:02:44 2015 +0000

    Move interruptProcessGroupOf into per-OS modules


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

6a8ca1ea4376bf93ac8fcfe88ffa6d9f860c9687
 System/Process.hsc          | 38 --------------------------------------
 System/Process/Internals.hs | 17 +++++++++++++++++
 System/Process/Posix.hs     | 13 +++++++++++++
 System/Process/Windows.hs   | 23 +++++++++++++++++++++++
 4 files changed, 53 insertions(+), 38 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index c0b08ee..de07225 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -90,7 +90,6 @@ import System.IO.Error (mkIOError, ioeSetErrorString)
 #if defined(mingw32_HOST_OS)
 # include <fcntl.h>     /* for _O_BINARY */
 #else
-import System.Posix.Process (getProcessGroupIDOf)
 #if MIN_VERSION_base(4,5,0)
 import System.Posix.Types
 #endif
@@ -98,12 +97,6 @@ import System.Posix.Types
 
 #ifdef __GLASGOW_HASKELL__
 import GHC.IO.Exception ( ioException, IOErrorType(..), IOException(..) )
-# if defined(mingw32_HOST_OS)
-import System.Win32.Console (generateConsoleCtrlEvent, cTRL_BREAK_EVENT)
-import System.Win32.Process (getProcessId)
-# else
-import System.Posix.Signals
-# endif
 #endif
 
 -- ----------------------------------------------------------------------------
@@ -689,37 +682,6 @@ terminateProcess ph = do
 
 
 -- ----------------------------------------------------------------------------
--- interruptProcessGroupOf
-
--- | Sends an interrupt signal to the process group of the given process.
---
--- On Unix systems, it sends the group the SIGINT signal.
---
--- On Windows systems, it generates a CTRL_BREAK_EVENT and will only work for
--- processes created using 'createProcess' and setting the 'create_group' flag
-
-interruptProcessGroupOf
-    :: ProcessHandle    -- ^ A process in the process group
-    -> IO ()
-interruptProcessGroupOf ph = do
-    withProcessHandle ph $ \p_ -> do
-        case p_ of
-            ClosedHandle _ -> return ()
-            OpenHandle h -> do
-#if mingw32_HOST_OS
-                pid <- getProcessId h
-                generateConsoleCtrlEvent cTRL_BREAK_EVENT pid
--- We can't use an #elif here, because MIN_VERSION_unix isn't defined
--- on Windows, so on Windows cpp fails:
--- error: missing binary operator before token "("
-#else
-                pgid <- getProcessGroupIDOf h
-                signalProcessGroup sigINT pgid
-#endif
-                return ()
-
-
--- ----------------------------------------------------------------------------
 -- Interface to C bits
 
 foreign import ccall unsafe "terminateProcess"
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 3a673c7..69ecd2b 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -42,6 +42,7 @@ module System.Process.Internals (
     withFilePathException, withCEnvironment,
     translate,
     createPipe,
+    interruptProcessGroupOf,
     ) where
 
 import Foreign.C
@@ -170,3 +171,19 @@ runGenProcess_ fun c _ _ = createProcess_ fun c
 createPipe :: IO (Handle, Handle)
 createPipe = createPipeInternal
 {-# INLINE createPipe #-}
+
+
+-- ----------------------------------------------------------------------------
+-- interruptProcessGroupOf
+
+-- | Sends an interrupt signal to the process group of the given process.
+--
+-- On Unix systems, it sends the group the SIGINT signal.
+--
+-- On Windows systems, it generates a CTRL_BREAK_EVENT and will only work for
+-- processes created using 'createProcess' and setting the 'create_group' flag
+
+interruptProcessGroupOf
+    :: ProcessHandle    -- ^ A process in the process group
+    -> IO ()
+interruptProcessGroupOf = interruptProcessGroupOfInternal
diff --git a/System/Process/Posix.hs b/System/Process/Posix.hs
index e9d1e31..a68d942 100644
--- a/System/Process/Posix.hs
+++ b/System/Process/Posix.hs
@@ -15,6 +15,7 @@ module System.Process.Posix
     , c_execvpe
     , pPrPr_disableITimers
     , createPipeInternal
+    , interruptProcessGroupOfInternal
     ) where
 
 import Control.Concurrent
@@ -36,6 +37,7 @@ import System.Posix.Internals
 import GHC.IO.Exception
 import System.Posix.Signals as Sig
 import qualified System.Posix.IO as Posix
+import System.Posix.Process (getProcessGroupIDOf)
 
 import System.Process.Common
 
@@ -280,3 +282,14 @@ createPipeInternal = do
     readh <- Posix.fdToHandle readfd
     writeh <- Posix.fdToHandle writefd
     return (readh, writeh)
+
+interruptProcessGroupOfInternal
+    :: ProcessHandle    -- ^ A process in the process group
+    -> IO ()
+interruptProcessGroupOfInternal ph = do
+    withProcessHandle ph $ \p_ -> do
+        case p_ of
+            ClosedHandle _ -> return ()
+            OpenHandle h -> do
+                pgid <- getProcessGroupIDOf h
+                signalProcessGroup sigINT pgid
diff --git a/System/Process/Windows.hs b/System/Process/Windows.hs
index 676ecbe..51a4c51 100644
--- a/System/Process/Windows.hs
+++ b/System/Process/Windows.hs
@@ -10,6 +10,7 @@ module System.Process.Windows
     , stopDelegateControlC
     , isDefaultSignal
     , createPipeInternal
+    , interruptProcessGroupOfInternal
     ) where
 
 import System.Process.Common
@@ -37,6 +38,8 @@ import GHC.IO.IOMode
 import System.Directory         ( doesFileExist )
 import System.Environment       ( getEnv )
 import System.FilePath
+import System.Win32.Console (generateConsoleCtrlEvent, cTRL_BREAK_EVENT)
+import System.Win32.Process (getProcessId)
 
 import System.Process.Common
 
@@ -262,3 +265,23 @@ foreign import ccall "io.h _pipe" c__pipe ::
 
 foreign import ccall "io.h _close" c__close ::
     CInt -> IO CInt
+
+interruptProcessGroupOfInternal
+    :: ProcessHandle    -- ^ A process in the process group
+    -> IO ()
+interruptProcessGroupOfInternal ph = do
+    withProcessHandle ph $ \p_ -> do
+        case p_ of
+            ClosedHandle _ -> return ()
+            OpenHandle h -> do
+#if mingw32_HOST_OS
+                pid <- getProcessId h
+                generateConsoleCtrlEvent cTRL_BREAK_EVENT pid
+-- We can't use an #elif here, because MIN_VERSION_unix isn't defined
+-- on Windows, so on Windows cpp fails:
+-- error: missing binary operator before token "("
+#else
+                pgid <- getProcessGroupIDOf h
+                signalProcessGroup sigINT pgid
+#endif
+                return ()


From git at git.haskell.org  Tue Dec 15 13:34:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:45 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Pass -y to pacman (34a6894)
Message-ID: <20151215133445.0B5F93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34a68947d2efc3c1a3076745328a9d5a0fb39649/process

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

commit 34a68947d2efc3c1a3076745328a9d5a0fb39649
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 17:13:33 2015 +0000

    Pass -y to pacman


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

34a68947d2efc3c1a3076745328a9d5a0fb39649
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 4117809..195e8e2 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack exec -- sh -c "pacman -S autoconf && autoreconf -i"
+- echo "" | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:47 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Even less CPP in System.Process (81243af)
Message-ID: <20151215133447.125CC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/81243afb78e8672c869d4806da5a9c410a346433/process

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

commit 81243afb78e8672c869d4806da5a9c410a346433
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 17:13:56 2015 +0000

    Even less CPP in System.Process


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

81243afb78e8672c869d4806da5a9c410a346433
 System/Process.hsc        | 13 ++++---------
 System/Process/Windows.hs |  1 +
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index de07225..0673ca5 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -87,12 +87,9 @@ import System.Exit      ( ExitCode(..) )
 import System.IO
 import System.IO.Error (mkIOError, ioeSetErrorString)
 
-#if defined(mingw32_HOST_OS)
-# include <fcntl.h>     /* for _O_BINARY */
-#else
-#if MIN_VERSION_base(4,5,0)
-import System.Posix.Types
-#endif
+-- Provide the data constructors for CPid on GHC 7.4 and later
+#if !defined(WINDOWS) && MIN_VERSION_base(4,5,0)
+import System.Posix.Types (CPid (..))
 #endif
 
 #ifdef __GLASGOW_HASKELL__
@@ -887,9 +884,7 @@ rawSystem :: String -> [String] -> IO ExitCode
 rawSystem cmd args = do
   (_,_,_,p) <- createProcess_ "rawSystem" (proc cmd args) { delegate_ctlc = True }
   waitForProcess p
-#elif !mingw32_HOST_OS
--- crude fallback implementation: could do much better than this under Unix
-rawSystem cmd args = system (showCommandForUser cmd args)
 #else
+-- crude fallback implementation: could do much better than this under Unix
 rawSystem cmd args = system (showCommandForUser cmd args)
 #endif
diff --git a/System/Process/Windows.hs b/System/Process/Windows.hs
index 51a4c51..4c1d7ce 100644
--- a/System/Process/Windows.hs
+++ b/System/Process/Windows.hs
@@ -40,6 +40,7 @@ import System.Environment       ( getEnv )
 import System.FilePath
 import System.Win32.Console (generateConsoleCtrlEvent, cTRL_BREAK_EVENT)
 import System.Win32.Process (getProcessId)
+# include <fcntl.h>     /* for _O_BINARY */
 
 import System.Process.Common
 


From git at git.haskell.org  Tue Dec 15 13:34:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:49 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Fix Windows build again (9d923c5)
Message-ID: <20151215133449.197023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9d923c57adfa75626ee4c2c9d3d76bf137414233/process

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

commit 9d923c57adfa75626ee4c2c9d3d76bf137414233
Author: Michael Snoyman <michael at snoyman.com>
Date:   Mon Nov 2 11:29:10 2015 -0800

    Fix Windows build again


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

9d923c57adfa75626ee4c2c9d3d76bf137414233
 System/Process/{Windows.hs => Windows.hsc} | 37 +++++++++++++-----------------
 1 file changed, 16 insertions(+), 21 deletions(-)

diff --git a/System/Process/Windows.hs b/System/Process/Windows.hsc
similarity index 93%
rename from System/Process/Windows.hs
rename to System/Process/Windows.hsc
index 4c1d7ce..a984bae 100644
--- a/System/Process/Windows.hs
+++ b/System/Process/Windows.hsc
@@ -25,14 +25,9 @@ import System.IO.Unsafe
 
 import System.Posix.Internals
 import GHC.IO.Exception
-import GHC.IO.Encoding
-import qualified GHC.IO.FD as FD
-import GHC.IO.Device
 import GHC.IO.Handle.FD
-import GHC.IO.Handle.Internals
 import GHC.IO.Handle.Types hiding (ClosedHandle)
 import System.IO.Error
-import Data.Typeable
 import GHC.IO.IOMode
 
 import System.Directory         ( doesFileExist )
@@ -40,19 +35,11 @@ import System.Environment       ( getEnv )
 import System.FilePath
 import System.Win32.Console (generateConsoleCtrlEvent, cTRL_BREAK_EVENT)
 import System.Win32.Process (getProcessId)
-# include <fcntl.h>     /* for _O_BINARY */
 
-import System.Process.Common
-
-#if defined(i386_HOST_ARCH)
-# define WINDOWS_CCONV stdcall
-#elif defined(x86_64_HOST_ARCH)
-# define WINDOWS_CCONV ccall
-#endif
+-- The double hash is used so that hsc does not process this include file
+##include "processFlags.h"
 
-#include <io.h>        /* for _close and _pipe */
-#include "HsProcessConfig.h"
-#include "processFlags.h"
+#include <fcntl.h>     /* for _O_BINARY */
 
 throwErrnoIfBadPHandle :: String -> IO PHANDLE -> IO PHANDLE
 throwErrnoIfBadPHandle = throwErrnoIfNull
@@ -76,7 +63,15 @@ processHandleFinaliser m =
 closePHANDLE :: PHANDLE -> IO ()
 closePHANDLE ph = c_CloseHandle ph
 
-foreign import WINDOWS_CCONV unsafe "CloseHandle"
+foreign import
+#if defined(i386_HOST_ARCH)
+  stdcall
+#elif defined(x86_64_HOST_ARCH)
+  ccall
+#else
+#error "Unknown architecture"
+#endif
+  unsafe "CloseHandle"
   c_CloseHandle
         :: PHANDLE
         -> IO ()
@@ -241,7 +236,7 @@ translateInternal xs = '"' : snd (foldr escape (True,"\"") xs)
 
 withCEnvironment :: [(String,String)] -> (Ptr CWString -> IO a) -> IO a
 withCEnvironment envir act =
-  let env' = foldr (\(name, val) env -> name ++ ('=':val)++'\0':env) "\0" envir
+  let env' = foldr (\(name, val) env0 -> name ++ ('=':val)++'\0':env0) "\0" envir
   in withCWString env' (act . castPtr)
 
 isDefaultSignal :: CLong -> Bool
@@ -256,10 +251,10 @@ createPipeInternal = do
         return (readfd, writefd)
     (do readh <- fdToHandle readfd
         writeh <- fdToHandle writefd
-        return (readh, writeh)) `onException` (close readfd >> close writefd)
+        return (readh, writeh)) `onException` (close' readfd >> close' writefd)
 
-close :: CInt -> IO ()
-close = throwErrnoIfMinus1_ "_close" . c__close
+close' :: CInt -> IO ()
+close' = throwErrnoIfMinus1_ "_close" . c__close
 
 foreign import ccall "io.h _pipe" c__pipe ::
     Ptr CInt -> CUInt -> CInt -> IO CInt


From git at git.haskell.org  Tue Dec 15 13:34:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:51 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,master: echo y (8b58ee0)
Message-ID: <20151215133451.20A173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8b58ee06394cc778ae34dfeec44b38253759c75a/process

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

commit 8b58ee06394cc778ae34dfeec44b38253759c75a
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 21:11:35 2015 +0000

    echo y


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

8b58ee06394cc778ae34dfeec44b38253759c75a
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 195e8e2..0db89ce 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "" | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
+- echo "y" | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:53 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Remove (broken) support for non-GHC compilers (60dbdb9)
Message-ID: <20151215133453.263C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/60dbdb959996e49b8a61b249c7e96971295f0cca/process

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

commit 60dbdb959996e49b8a61b249c7e96971295f0cca
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 21:20:40 2015 +0000

    Remove (broken) support for non-GHC compilers


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

60dbdb959996e49b8a61b249c7e96971295f0cca
 System/Process.hsc          | 15 ---------------
 System/Process/Internals.hs |  9 ---------
 System/Process/Posix.hs     |  4 ----
 process.cabal               | 24 ++++++++++--------------
 4 files changed, 10 insertions(+), 42 deletions(-)

diff --git a/System/Process.hsc b/System/Process.hsc
index 0673ca5..6b870fd 100644
--- a/System/Process.hsc
+++ b/System/Process.hsc
@@ -1,12 +1,10 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
-#ifdef __GLASGOW_HASKELL__
 #if __GLASGOW_HASKELL__ >= 709
 {-# LANGUAGE Safe #-}
 #else
 {-# LANGUAGE Trustworthy #-}
 #endif
 {-# LANGUAGE InterruptibleFFI #-}
-#endif
 
 -----------------------------------------------------------------------------
 -- |
@@ -92,9 +90,7 @@ import System.IO.Error (mkIOError, ioeSetErrorString)
 import System.Posix.Types (CPid (..))
 #endif
 
-#ifdef __GLASGOW_HASKELL__
 import GHC.IO.Exception ( ioException, IOErrorType(..), IOException(..) )
-#endif
 
 -- ----------------------------------------------------------------------------
 -- createProcess
@@ -548,15 +544,11 @@ withForkWait async body = do
     restore (body wait) `C.onException` killThread tid
 
 ignoreSigPipe :: IO () -> IO ()
-#if defined(__GLASGOW_HASKELL__)
 ignoreSigPipe = C.handle $ \e -> case e of
                                    IOError { ioe_type  = ResourceVanished
                                            , ioe_errno = Just ioe }
                                      | Errno ioe == ePIPE -> return ()
                                    _ -> throwIO e
-#else
-ignoreSigPipe = id
-#endif
 
 -- ----------------------------------------------------------------------------
 -- showCommandForUser
@@ -860,13 +852,11 @@ will not work.
 On Unix systems, see 'waitForProcess' for the meaning of exit codes
 when the process died as the result of a signal.
 -}
-#ifdef __GLASGOW_HASKELL__
 system :: String -> IO ExitCode
 system "" = ioException (ioeSetErrorString (mkIOError InvalidArgument "system" Nothing Nothing) "null command")
 system str = do
   (_,_,_,p) <- createProcess_ "system" (shell str) { delegate_ctlc = True }
   waitForProcess p
-#endif  /* __GLASGOW_HASKELL__ */
 
 
 --TODO: in a later release {-# DEPRECATED rawSystem "Use 'callProcess' (or 'spawnProcess' and 'waitForProcess') instead" #-}
@@ -880,11 +870,6 @@ It will therefore behave more portably between operating systems than 'system'.
 The return codes and possible failures are the same as for 'system'.
 -}
 rawSystem :: String -> [String] -> IO ExitCode
-#ifdef __GLASGOW_HASKELL__
 rawSystem cmd args = do
   (_,_,_,p) <- createProcess_ "rawSystem" (proc cmd args) { delegate_ctlc = True }
   waitForProcess p
-#else
--- crude fallback implementation: could do much better than this under Unix
-rawSystem cmd args = system (showCommandForUser cmd args)
-#endif
diff --git a/System/Process/Internals.hs b/System/Process/Internals.hs
index 69ecd2b..ef8ff8f 100644
--- a/System/Process/Internals.hs
+++ b/System/Process/Internals.hs
@@ -1,9 +1,7 @@
 {-# LANGUAGE CPP #-}
 {-# OPTIONS_HADDOCK not-home #-}
-#ifdef __GLASGOW_HASKELL__
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE InterruptibleFFI #-}
-#endif
 
 -----------------------------------------------------------------------------
 -- |
@@ -25,13 +23,11 @@ module System.Process.Internals (
     ProcessHandle(..), ProcessHandle__(..),
     PHANDLE, closePHANDLE, mkProcessHandle,
     modifyProcessHandle, withProcessHandle,
-#ifdef __GLASGOW_HASKELL__
     CreateProcess(..),
     CmdSpec(..), StdStream(..),
     createProcess_,
     runGenProcess_, --deprecated
     fdToHandle,
-#endif
     startDelegateControlC,
     endDelegateControlC,
     stopDelegateControlC,
@@ -48,9 +44,7 @@ module System.Process.Internals (
 import Foreign.C
 import System.IO
 
-#ifdef __GLASGOW_HASKELL__
 import GHC.IO.Handle.FD (fdToHandle)
-#endif
 
 import System.Process.Common
 
@@ -145,7 +139,6 @@ translate = translateInternal
 -- ----------------------------------------------------------------------------
 -- Deprecated / compat
 
-#ifdef __GLASGOW_HASKELL__
 {-# DEPRECATED runGenProcess_
       "Please do not use this anymore, use the ordinary 'System.Process.createProcess'. If you need the SIGINT handling, use delegate_ctlc = True (runGenProcess_ is now just an imperfectly emulated stub that probably duplicates or overrides your own signal handling)." #-}
 runGenProcess_
@@ -159,8 +152,6 @@ runGenProcess_ fun c (Just sig) (Just sig') | isDefaultSignal sig && sig == sig'
                          = createProcess_ fun c { delegate_ctlc = True }
 runGenProcess_ fun c _ _ = createProcess_ fun c
 
-#endif
-
 -- ---------------------------------------------------------------------------
 -- createPipe
 
diff --git a/System/Process/Posix.hs b/System/Process/Posix.hs
index a68d942..6129197 100644
--- a/System/Process/Posix.hs
+++ b/System/Process/Posix.hs
@@ -93,8 +93,6 @@ withCEnvironment envir act =
   let env' = map (\(name, val) -> name ++ ('=':val)) envir
   in withMany withCString env' (\pEnv -> withArray0 nullPtr pEnv act)
 
-#ifdef __GLASGOW_HASKELL__
-
 -- -----------------------------------------------------------------------------
 -- POSIX runProcess with signal handling in the child
 
@@ -267,8 +265,6 @@ foreign import ccall unsafe "runInteractiveProcess"
         -> Ptr CString
         -> IO PHANDLE
 
-#endif /* __GLASGOW_HASKELL__ */
-
 ignoreSignal, defaultSignal :: CLong
 ignoreSignal  = CONST_SIG_IGN
 defaultSignal = CONST_SIG_DFL
diff --git a/process.cabal b/process.cabal
index ee79452..0b4ffd7 100644
--- a/process.cabal
+++ b/process.cabal
@@ -44,14 +44,16 @@ library
     exposed-modules:
         System.Cmd
         System.Process
-    if impl(ghc)
-        exposed-modules:
-            System.Process.Internals
-        other-modules: System.Process.Common
-        if os(windows)
-            other-modules: System.Process.Windows
-        else
-            other-modules: System.Process.Posix
+        System.Process.Internals
+    other-modules: System.Process.Common
+    if os(windows)
+        other-modules: System.Process.Windows
+        build-depends: Win32 >=2.2 && < 2.4
+        extra-libraries: kernel32
+        cpp-options: -DWINDOWS
+    else
+        other-modules: System.Process.Posix
+        build-depends: unix >= 2.5 && < 2.8
 
     c-sources:
         cbits/runProcess.c
@@ -68,12 +70,6 @@ library
                    directory >= 1.1 && < 1.3,
                    filepath  >= 1.2 && < 1.5,
                    deepseq   >= 1.1 && < 1.5
-    if os(windows)
-        build-depends: Win32 >=2.2 && < 2.4
-        extra-libraries: kernel32
-        cpp-options: -DWINDOWS
-    else
-        build-depends: unix >= 2.5 && < 2.8
 
 test-suite test
   default-language: Haskell2010


From git at git.haskell.org  Tue Dec 15 13:34:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:55 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Another shot at appveyor (88a63dd)
Message-ID: <20151215133455.2C7653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/88a63dd1ee821471654ff008a804b0c518af8941/process

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

commit 88a63dd1ee821471654ff008a804b0c518af8941
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 23:27:35 2015 +0000

    Another shot at appveyor


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

88a63dd1ee821471654ff008a804b0c518af8941
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 0db89ce..91ade29 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo "y" | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
+- echo y | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:57 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: appveyor: install perl (3c73538)
Message-ID: <20151215133457.322CA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c73538d48ea6ca2b988dbd74290893019fb9318/process

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

commit 3c73538d48ea6ca2b988dbd74290893019fb9318
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Mon Nov 2 23:52:51 2015 +0000

    appveyor: install perl


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

3c73538d48ea6ca2b988dbd74290893019fb9318
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 91ade29..2c313d4 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,5 +16,5 @@ test_script:
 - stack setup > nul
 # The ugly echo "" hack is to avoid complaints about 0 being an invalid file
 # descriptor
-- echo y | stack exec -- sh -c "pacman -Sy autoconf && autoreconf -i"
+- echo y | stack exec -- sh -c "pacman -Sy autoconf perl && autoreconf -i"
 - echo "" | stack --no-terminal test --pedantic


From git at git.haskell.org  Tue Dec 15 13:34:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:34:59 +0000 (UTC)
Subject: [commit: packages/process] less-cpp,
 master: Add appveyor badge (9dae7ad)
Message-ID: <20151215133459.3900F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branches: less-cpp,master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9dae7ad1b5688723f129cd9eb2b2b82f7f2f6ec4/process

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

commit 9dae7ad1b5688723f129cd9eb2b2b82f7f2f6ec4
Author: Michael Snoyman <michael at fpcomplete.com>
Date:   Tue Nov 3 16:56:24 2015 +0000

    Add appveyor badge


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

9dae7ad1b5688723f129cd9eb2b2b82f7f2f6ec4
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index f0698ea..0244c4e 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-The `process` Package  [![Hackage](https://img.shields.io/hackage/v/process.svg)](https://hackage.haskell.org/package/process) [![Build Status](https://travis-ci.org/haskell/process.svg)](https://travis-ci.org/haskell/process)
+The `process` Package  [![Hackage](https://img.shields.io/hackage/v/process.svg)](https://hackage.haskell.org/package/process) [![Build Status](https://travis-ci.org/haskell/process.svg)](https://travis-ci.org/haskell/process) [![Windows build status](https://ci.appveyor.com/api/projects/status/0o4c3w99frtxyrht?svg=true)](https://ci.appveyor.com/project/snoyberg/process)
 =====================
 
 See [`process` on Hackage](http://hackage.haskell.org/package/process) for


From git at git.haskell.org  Tue Dec 15 13:35:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:35:01 +0000 (UTC)
Subject: [commit: packages/process] master: Merge pull request #47 from
 haskell/less-cpp (e5a7ee3)
Message-ID: <20151215133501.428323A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit e5a7ee3189028d12a57391388184f20d0d257c08
Merge: 7428b61 9dae7ad
Author: Michael Snoyman <michael at snoyman.com>
Date:   Tue Nov 17 05:28:35 2015 +0200

    Merge pull request #47 from haskell/less-cpp
    
    Use less CPP



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

e5a7ee3189028d12a57391388184f20d0d257c08
 .gitignore                  |   1 +
 .travis.yml                 |   2 +-
 README.md                   |   2 +-
 System/Process.hsc          | 100 +------
 System/Process/Common.hs    | 215 ++++++++++++++
 System/Process/Internals.hs | 695 +++-----------------------------------------
 System/Process/Posix.hs     | 291 +++++++++++++++++++
 System/Process/Windows.hsc  | 283 ++++++++++++++++++
 appveyor.yml                |  20 ++
 process.cabal               |  18 +-
 10 files changed, 867 insertions(+), 760 deletions(-)


From git at git.haskell.org  Tue Dec 15 13:35:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:35:03 +0000 (UTC)
Subject: [commit: packages/process] master: Version bump (0edb978)
Message-ID: <20151215133503.495683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0edb97876c2f783b33f9a69089ca9d26a061e112/process

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

commit 0edb97876c2f783b33f9a69089ca9d26a061e112
Author: Michael Snoyman <michael at snoyman.com>
Date:   Tue Nov 17 15:34:47 2015 +0200

    Version bump


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

0edb97876c2f783b33f9a69089ca9d26a061e112
 changelog.md  | 6 ++++++
 process.cabal | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 6507bf8..b01b324 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for [`process` package](http://hackage.haskell.org/package/process)
 
+## 1.4.1.0 *November 2015*
+
+* Use less CPP [#47](https://github.com/haskell/process/pull/47)
+    * Refactor to have separate Windows and POSIX modules internally
+    * Remove the broken non-GHC code paths
+
 ## 1.4.0.0 *November 2015*
 
 * Added `child_user` and `child_group` to `CreateProcess` for unix. [#45](https://github.com/haskell/process/pull/45)
diff --git a/process.cabal b/process.cabal
index 0b4ffd7..ee69285 100644
--- a/process.cabal
+++ b/process.cabal
@@ -1,5 +1,5 @@
 name:          process
-version:       1.4.0.0
+version:       1.4.1.0
 -- NOTE: Don't forget to update ./changelog.md
 license:       BSD3
 license-file:  LICENSE


From git at git.haskell.org  Tue Dec 15 13:35:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:35:05 +0000 (UTC)
Subject: [commit: packages/process] master: Remove obsolete `--with-cc` flag
 from configure.ac (e594712)
Message-ID: <20151215133505.4EB093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/process

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

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

commit e594712a8fe49c94ff43ab016739e0fa63f0de00
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 07:40:56 2015 +0100

    Remove obsolete `--with-cc` flag from configure.ac
    
    This non-standard flag was used previously by GHC's build-system to set the `CC` variable.
    
    See https://phabricator.haskell.org/D1608 for more details


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

e594712a8fe49c94ff43ab016739e0fa63f0de00
 configure.ac | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 5f0731d..7599986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,10 +5,7 @@ AC_CONFIG_SRCDIR([include/runProcess.h])
 
 AC_CONFIG_HEADERS([include/HsProcessConfig.h])
 
-AC_ARG_WITH([cc],
-            [C compiler],
-            [CC=$withval])
-AC_PROG_CC()
+AC_PROG_CC
 
 dnl ** Working vfork?
 AC_FUNC_FORK


From git at git.haskell.org  Tue Dec 15 13:40:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 13:40:13 +0000 (UTC)
Subject: [commit: ghc] master: Reset process submodule to v1.4.1.0 release tag
 (f4d90f9)
Message-ID: <20151215134013.4768B3A300@ghc.haskell.org>

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

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

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

commit f4d90f96433ae7cc4f7d4051e5adc1b9d739a523
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 15 14:37:55 2015 +0100

    Reset process submodule to v1.4.1.0 release tag
    
    The `process-1.4.1.0` release is the version designated for GHC 8.0.1
    
    /cc @snoyberg


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

f4d90f96433ae7cc4f7d4051e5adc1b9d739a523
 libraries/process | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/process b/libraries/process
index e594712..0edb978 160000
--- a/libraries/process
+++ b/libraries/process
@@ -1 +1 @@
-Subproject commit e594712a8fe49c94ff43ab016739e0fa63f0de00
+Subproject commit 0edb97876c2f783b33f9a69089ca9d26a061e112


From git at git.haskell.org  Tue Dec 15 14:33:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 14:33:38 +0000 (UTC)
Subject: [commit: ghc] master: Allow recursive (undecidable) superclasses
 (6eabb6d)
Message-ID: <20151215143338.7E9A63A300@ghc.haskell.org>

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

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

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

commit 6eabb6ddb7c53784792ee26b1e0657bde7eee7fb
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 15 14:26:13 2015 +0000

    Allow recursive (undecidable) superclasses
    
    This patch fulfils the request in Trac #11067, #10318, and #10592,
    by lifting the conservative restrictions on superclass constraints.
    
    These restrictions are there (and have been since Haskell was born) to
    ensure that the transitive superclasses of a class constraint is a finite
    set.  However (a) this restriction is conservative, and can be annoying
    when there really is no recursion, and (b) sometimes genuinely recursive
    superclasses are useful (see the tickets).
    
    Dimitrios and I worked out that there is actually a relatively simple way
    to do the job. It?s described in some detail in
    
       Note [The superclass story] in TcCanonical
       Note [Expanding superclasses] in TcType
    
    In brief, the idea is to expand superclasses only finitely, but to
    iterate (using a loop that already existed) if there are more
    superclasses to explore.
    
    Other small things
    
    - I improved grouping of error messages a bit in TcErrors
    
    - I re-centred the haddock.compiler test, which was at 9.8%
      above the norm, and which this patch pushed slightly over


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

6eabb6ddb7c53784792ee26b1e0657bde7eee7fb
 compiler/main/DynFlags.hs                          |   2 +
 compiler/typecheck/TcCanonical.hs                  | 256 ++++++++++++++-------
 compiler/typecheck/TcErrors.hs                     |  84 +++++--
 compiler/typecheck/TcInteract.hs                   |  18 +-
 compiler/typecheck/TcRnTypes.hs                    |  18 +-
 compiler/typecheck/TcSMonad.hs                     |  37 ++-
 compiler/typecheck/TcSimplify.hs                   | 113 ++++++---
 compiler/typecheck/TcTyClsDecls.hs                 |  21 +-
 compiler/typecheck/TcTyDecls.hs                    | 207 ++++++++---------
 compiler/typecheck/TcType.hs                       |  90 ++++++--
 compiler/utils/Bag.hs                              |  16 +-
 docs/users_guide/glasgow_exts.rst                  |  49 ++++
 libraries/ghc-prim/GHC/Classes.hs                  |   2 +
 testsuite/tests/ado/ado004.stderr                  |  10 +-
 testsuite/tests/driver/T4437.hs                    |   1 +
 testsuite/tests/ghci/scripts/ghci013.stdout        |   2 +-
 .../tests/indexed-types/should_compile/T10318.hs   |  35 +++
 .../tests/indexed-types/should_compile/T11067.hs   |  35 +++
 .../indexed-types/should_compile/T3017.stderr      |   2 +-
 .../indexed-types/should_compile/T3208b.stderr     |  10 -
 .../indexed-types/should_compile/T8889.stderr      |   4 +-
 testsuite/tests/indexed-types/should_compile/all.T |   2 +
 .../tests/indexed-types/should_fail/T1897b.stderr  |  22 +-
 .../tests/indexed-types/should_fail/T3330a.stderr  |  22 +-
 .../tests/indexed-types/should_fail/T4174.stderr   |  16 --
 .../tests/indexed-types/should_fail/T8227.stderr   |  35 +--
 .../tests/indexed-types/should_fail/T9662.stderr   |  80 +------
 testsuite/tests/module/mod40.stderr                |  18 +-
 .../should_compile/ExtraConstraints1.stderr        |   6 +-
 .../should_compile/ExtraConstraints3.stderr        |  38 +--
 .../WarningWildcardInstantiations.stderr           |   2 +-
 .../InstantiatedNamedWildcardsInConstraints.stderr |   2 +-
 .../tests/partial-sigs/should_fail/T10999.stderr   |   6 +-
 .../should_fail/WildcardInstantiations.stderr      |   2 +-
 testsuite/tests/perf/haddock/all.T                 |   3 +-
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   1 +
 testsuite/tests/polykinds/T7332.hs                 |  30 ++-
 testsuite/tests/polykinds/T7594.hs                 |   2 +
 testsuite/tests/polykinds/T7594.stderr             |  27 +--
 testsuite/tests/polykinds/T9017.stderr             |  13 --
 .../tests/simplCore/should_compile/T4398.stderr    |   2 +-
 testsuite/tests/typecheck/should_compile/T10100.hs |   1 +
 testsuite/tests/typecheck/should_compile/T10109.hs |   1 +
 testsuite/tests/typecheck/should_compile/T10564.hs |   1 +
 .../tests/typecheck/should_compile/T9834.stderr    |  45 +---
 testsuite/tests/typecheck/should_compile/tc256.hs  |   2 +-
 testsuite/tests/typecheck/should_fail/T2714.stderr |  35 +--
 testsuite/tests/typecheck/should_fail/T5853.stderr |  22 +-
 testsuite/tests/typecheck/should_fail/T7869.stderr |  43 ++--
 testsuite/tests/typecheck/should_fail/T8883.stderr |  12 +-
 testsuite/tests/typecheck/should_fail/T9415.stderr |  18 +-
 testsuite/tests/typecheck/should_fail/T9739.stderr |  20 +-
 .../tests/typecheck/should_fail/tcfail027.stderr   |  18 +-
 testsuite/tests/typecheck/should_fail/tcfail216.hs |   1 -
 .../tests/typecheck/should_fail/tcfail216.stderr   |   9 +-
 testsuite/tests/typecheck/should_fail/tcfail217.hs |   2 +-
 .../tests/typecheck/should_fail/tcfail217.stderr   |   6 +-
 57 files changed, 895 insertions(+), 682 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6eabb6ddb7c53784792ee26b1e0657bde7eee7fb

From git at git.haskell.org  Tue Dec 15 14:33:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 14:33:41 +0000 (UTC)
Subject: [commit: ghc] master: Comments on equality types and classes (b8ca645)
Message-ID: <20151215143341.37C8E3A300@ghc.haskell.org>

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

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

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

commit b8ca64592e331005def4f734e026d5418950e6e1
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 15 14:22:37 2015 +0000

    Comments on equality types and classes
    
    This is really just doucumenting one aspect of the kind-equality patch.
    
    See especially Note [Equality types and classes] in TysWiredIn.
    Other places should just point to this Note.
    
    Richard please check for veracity.


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

b8ca64592e331005def4f734e026d5418950e6e1
 compiler/prelude/TysPrim.hs          | 57 ++++++++++++++++++++----------------
 compiler/prelude/TysWiredIn.hs       | 50 ++++++++++++++++++++++++++++---
 libraries/base/Data/Type/Equality.hs | 20 +++++++++----
 libraries/ghc-prim/GHC/Types.hs      |  6 ++--
 4 files changed, 96 insertions(+), 37 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b8ca64592e331005def4f734e026d5418950e6e1

From git at git.haskell.org  Tue Dec 15 14:33:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 14:33:43 +0000 (UTC)
Subject: [commit: ghc] master: Fix formatting complaint from Sphinx (d1ca5d2)
Message-ID: <20151215143343.E4AB63A300@ghc.haskell.org>

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

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

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

commit d1ca5d215591a89dbfba7b87887b1197d03f567f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 15 14:19:12 2015 +0000

    Fix formatting complaint from Sphinx


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

d1ca5d215591a89dbfba7b87887b1197d03f567f
 docs/users_guide/glasgow_exts.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index b9ad620..853397a 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -8238,6 +8238,7 @@ the source location of the call to the ``CallStack`` in the
 environment. For example
 
 ::
+
    myerror :: (?callStack :: CallStack) => String -> a
    myerror msg = error (msg ++ "\n" ++ prettyCallStack ?callStack)
 
@@ -8254,6 +8255,7 @@ The ``CallStack`` will only extend as far as the types allow it, for
 example
 
 ::
+
    head :: (?callStack :: CallStack) => [a] -> a
    head []     = myerror "empty"
    head (x:xs) = x


From git at git.haskell.org  Tue Dec 15 14:33:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 14:33:46 +0000 (UTC)
Subject: [commit: ghc] master: Improve documentation for -XStrict (98cdaee)
Message-ID: <20151215143346.93B133A300@ghc.haskell.org>

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

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

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

commit 98cdaee73038094eea25d994f1fd0828b3c8dd0e
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 15 14:19:52 2015 +0000

    Improve documentation for -XStrict
    
    In particular, highlight that we do not put bangs on nested patterns


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

98cdaee73038094eea25d994f1fd0828b3c8dd0e
 docs/users_guide/glasgow_exts.rst | 55 +++++++++++++++++++++++++--------------
 1 file changed, 36 insertions(+), 19 deletions(-)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 853397a..566ecda 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -12917,27 +12917,17 @@ optionally had by adding ``!`` in front of a variable.
      let !pat = ...
 
    Adding ``~`` in front of ``x`` gives the regular lazy
-   behavior. Notice that we do not put bangs on nested patterns. For
-   example ::
-
-     let (p,q) = if flob then (undefined, undefined) else (True, False)
-     in ...
-
-   will behave like ::
-
-     let !(p,q) = if flob then (undefined, undefined) else (True,False)
-     in ...
+   behavior.
+   The general rule is that we add an implicit bang on the outermost pattern,
+   unless disabled with ``~``.
 
-   which will strictly evaluate the right hand side, and bind ``p``
-   and ``q`` to the components of the pair. But the pair itself is
-   lazy (unless we also compile the ``Prelude`` with ``Strict``; see
-   :ref:`strict-modularity` below). So ``p`` and ``q`` may end up bound to
-   undefined. See also :ref:`recursive-and-polymorphic-let-bindings` below.
+-  **Pattern matching in case expressions, lambdas, do-notation, etc**
 
--  **Case expressions.**
-
-   The patterns of a case expression get an implicit bang, unless
-   disabled with ``~``. For example ::
+   The outermost pattern of all pattern matches gets an implicit bang,
+   unless disabled with ``~``.
+   This applies to case expressions, patterns in lambda, do-notation,
+   list comprehension, and so on.
+   For example ::
 
        case x of (a,b) -> rhs
 
@@ -12962,6 +12952,33 @@ optionally had by adding ``!`` in front of a variable.
    is lazy in Haskell; but with ``Strict`` the added bang makes it
    strict.
 
+   Similarly ::
+
+      \ x -> body
+      do { x <- rhs; blah }
+      [ e | x <- rhs; blah }
+
+   all get implicit bangs on the ``x`` pattern.
+
+-  ** Nested patterns **
+
+   Notice that we do *not* put bangs on nested patterns. For
+   example ::
+
+     let (p,q) = if flob then (undefined, undefined) else (True, False)
+     in ...
+
+   will behave like ::
+
+     let !(p,q) = if flob then (undefined, undefined) else (True,False)
+     in ...
+
+   which will strictly evaluate the right hand side, and bind ``p``
+   and ``q`` to the components of the pair. But the pair itself is
+   lazy (unless we also compile the ``Prelude`` with ``Strict``; see
+   :ref:`strict-modularity` below). So ``p`` and ``q`` may end up bound to
+   undefined. See also :ref:`recursive-and-polymorphic-let-bindings` below.
+
 -  **Top level bindings.**
 
    are unaffected by ``Strict``. For example: ::


From git at git.haskell.org  Tue Dec 15 14:33:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 14:33:49 +0000 (UTC)
Subject: [commit: ghc] master: Comment layout only (947e44f)
Message-ID: <20151215143349.54CCF3A300@ghc.haskell.org>

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

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

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

commit 947e44feebb4e979d7d476ff2aa5c7054a1c0899
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 15 14:26:34 2015 +0000

    Comment layout only


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

947e44feebb4e979d7d476ff2aa5c7054a1c0899
 compiler/deSugar/DsUtils.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/deSugar/DsUtils.hs b/compiler/deSugar/DsUtils.hs
index 053fc13..6d47af3 100644
--- a/compiler/deSugar/DsUtils.hs
+++ b/compiler/deSugar/DsUtils.hs
@@ -871,11 +871,11 @@ mkBinaryTickBox ixT ixF e = do
 -- also make irrefutable patterns ordinary patterns if -XStrict.
 --
 -- Example:
--- ~pat    => False, pat -- when -XStrict
--- ~pat    => False, ~pat -- without -XStrict
--- ~(~pat) => False, ~pat -- when -XStrict
--- pat     => True, pat -- when -XStrict
--- !pat    => True, pat -- always
+-- ~pat    => False, pat   -- when -XStrict
+-- ~pat    => False, ~pat  -- without -XStrict
+-- ~(~pat) => False, ~pat  -- when -XStrict
+-- pat     => True,  pat   -- when -XStrict
+-- !pat    => True,  pat   -- always
 getUnBangedLPat :: DynFlags
                 -> LPat id  -- ^ Original pattern
                 -> (Bool, LPat id) -- is bind strict?, pattern without bangs


From git at git.haskell.org  Tue Dec 15 20:06:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 20:06:01 +0000 (UTC)
Subject: [commit: packages/array] master: Update testsuite for D1617 (f643793)
Message-ID: <20151215200601.C1DDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/array

On branch  : master
Link       : http://git.haskell.org/packages/array.git/commitdiff/f643793b3fbffd7419f403bedc65b7ac06dff0cd

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

commit f643793b3fbffd7419f403bedc65b7ac06dff0cd
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 15 14:01:30 2015 -0500

    Update testsuite for D1617


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

f643793b3fbffd7419f403bedc65b7ac06dff0cd
 tests/T9220.stdout | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/tests/T9220.stdout b/tests/T9220.stdout
index 41287b1..71582f2 100644
--- a/tests/T9220.stdout
+++ b/tests/T9220.stdout
@@ -1,23 +1,26 @@
 type role Data.Array.Base.UArray nominal nominal
 data Data.Array.Base.UArray i e
-  = Data.Array.Base.UArray !i !i {-# UNPACK #-}Int ByteArray#
+  = Data.Array.Base.UArray !i
+                           !i
+                           {-# UNPACK #-}Int
+                           GHC.Prim.ByteArray#
   	-- Defined in ?Data.Array.Base?
-instance (Ix ix, Eq e,
+instance (GHC.Arr.Ix ix, Eq e,
           Data.Array.Base.IArray Data.Array.Base.UArray e) =>
          Eq (Data.Array.Base.UArray ix e)
   -- Defined in ?Data.Array.Base?
-instance (Ix ix, Ord e,
+instance (GHC.Arr.Ix ix, Ord e,
           Data.Array.Base.IArray Data.Array.Base.UArray e) =>
          Ord (Data.Array.Base.UArray ix e)
   -- Defined in ?Data.Array.Base?
-instance (Ix ix, Show ix, Show e,
+instance (GHC.Arr.Ix ix, Show ix, Show e,
           Data.Array.Base.IArray Data.Array.Base.UArray e) =>
          Show (Data.Array.Base.UArray ix e)
   -- Defined in ?Data.Array.Base?
 type role Data.Array.IO.Internals.IOUArray nominal nominal
 newtype Data.Array.IO.Internals.IOUArray i e
   = Data.Array.IO.Internals.IOUArray (Data.Array.Base.STUArray
-                                        RealWorld i e)
+                                        GHC.Prim.RealWorld i e)
   	-- Defined in ?Data.Array.IO.Internals?
 instance Eq (Data.Array.IO.Internals.IOUArray i e)
   -- Defined in ?Data.Array.IO.Internals?
@@ -26,7 +29,7 @@ data Data.Array.Base.STUArray s i e
   = Data.Array.Base.STUArray !i
                              !i
                              {-# UNPACK #-}Int
-                             (MutableByteArray# s)
+                             (GHC.Prim.MutableByteArray# s)
   	-- Defined in ?Data.Array.Base?
 instance Eq (Data.Array.Base.STUArray s i e)
   -- Defined in ?Data.Array.Base?
@@ -35,5 +38,5 @@ data Data.Array.Storable.Internals.StorableArray i e
   = Data.Array.Storable.Internals.StorableArray !i
                                                 !i
                                                 Int
-                                                !(ForeignPtr e)
+                                                !(GHC.ForeignPtr.ForeignPtr e)
   	-- Defined in ?Data.Array.Storable.Internals?


From git at git.haskell.org  Tue Dec 15 20:06:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 20:06:22 +0000 (UTC)
Subject: [commit: ghc] master: Narrow scope of special-case for unqualified
 printing of names in core libraries (e2c9173)
Message-ID: <20151215200622.130A53A300@ghc.haskell.org>

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

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

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

commit e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 16:08:52 2015 +0100

    Narrow scope of special-case for unqualified printing of names in core libraries
    
    Commit 547c597112954353cef7157cb0a389bc4f6303eb modifies the
    pretty-printer to render names from a set of core packages (`base`,
    `ghc-prim`, `template-haskell`) as unqualified. The idea here was that
    many of these names typically are not in scope but are well-known by the
    user and therefore qualification merely introduces noise.
    
    This, however, is a very large hammer and potentially breaks any
    consumer who relies on parsing GHC output (hence #11208). This commit
    partially reverts this change, now only printing `Constraint` (which
    appears quite often in errors) as unqualified.
    
    Fixes #11208.
    
    Updates tests in `array` submodule.
    
    Test Plan: validate
    
    Reviewers: hvr, thomie, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1619
    
    GHC Trac Issues: #11208


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

e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f
 compiler/main/HscTypes.hs                          |  42 ++++---
 compiler/prelude/TysWiredIn.hs                     |   3 +-
 libraries/array                                    |   2 +-
 .../tests/annotations/should_fail/annfail05.stderr |   7 +-
 .../tests/annotations/should_fail/annfail08.stderr |  13 ++-
 .../tests/annotations/should_fail/annfail10.stderr |  49 ++++----
 .../tests/deSugar/should_compile/T2431.stderr      |  33 +++---
 testsuite/tests/deriving/should_fail/T4846.stderr  |  19 ++--
 testsuite/tests/ghc-api/annotations/T10268.stderr  |   3 +-
 .../tests/ghci.debugger/scripts/break006.stderr    |  56 +++++----
 .../tests/ghci.debugger/scripts/break024.stdout    |   9 +-
 .../tests/ghci.debugger/scripts/print019.stderr    |  23 ++--
 .../tests/ghci.debugger/scripts/print028.stdout    |   7 +-
 .../tests/ghci.debugger/scripts/print033.stdout    |   3 +-
 testsuite/tests/ghci/scripts/T11208.hs             |   8 ++
 testsuite/tests/ghci/scripts/T11208.script         |   2 +
 testsuite/tests/ghci/scripts/T11208.stdout         |   2 +
 testsuite/tests/ghci/scripts/T2182ghci2.stderr     |  14 ++-
 testsuite/tests/ghci/scripts/T7873.stdout          |   4 +-
 testsuite/tests/ghci/scripts/T8469.stdout          |   2 +-
 testsuite/tests/ghci/scripts/T8959.stdout          |   8 +-
 testsuite/tests/ghci/scripts/T9181.stdout          | 105 ++++++++++-------
 testsuite/tests/ghci/scripts/T9881.stdout          |   3 +-
 testsuite/tests/ghci/scripts/ghci008.stdout        |  12 +-
 testsuite/tests/ghci/scripts/ghci013.stdout        |   3 +-
 testsuite/tests/ghci/scripts/ghci019.stderr        |   8 +-
 testsuite/tests/ghci/scripts/ghci019.stdout        |   2 +-
 testsuite/tests/ghci/scripts/ghci023.stdout        |  16 +--
 testsuite/tests/ghci/scripts/ghci025.stdout        |  26 +++--
 testsuite/tests/ghci/scripts/ghci027.stdout        |   8 +-
 testsuite/tests/ghci/scripts/ghci046.stdout        |   4 +-
 testsuite/tests/ghci/scripts/ghci055.stdout        |   2 +-
 testsuite/tests/module/mod87.stderr                |   6 +-
 testsuite/tests/module/mod97.stderr                |   7 +-
 .../tests/numeric/should_compile/T7116.stdout      |  37 ++++--
 .../should_fail/overloadedlistsfail01.stderr       |  67 +++++------
 .../should_fail/overloadedlistsfail02.stderr       |  20 ++--
 .../ghci/overloadedlabelsghci01.stdout             |   2 +-
 .../should_compile/ExtraConstraints3.stderr        |  52 +++++----
 .../tests/partial-sigs/should_fail/T10999.stderr   |   7 +-
 testsuite/tests/quotes/TH_localname.stderr         |  50 ++++----
 testsuite/tests/rebindable/rebindable6.stderr      | 126 ++++++++++-----------
 .../should_fail/RnStaticPointersFail02.stderr      |   7 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |  60 +++++++---
 .../tests/roles/should_compile/Roles13.stderr      |  44 +++----
 .../tests/roles/should_compile/Roles14.stderr      |  11 +-
 testsuite/tests/roles/should_compile/Roles2.stderr |  20 +++-
 testsuite/tests/roles/should_compile/Roles3.stderr |  36 ++++--
 testsuite/tests/roles/should_compile/Roles4.stderr |  20 +++-
 testsuite/tests/roles/should_compile/T8958.stderr  |  24 ++--
 .../tests/simplCore/should_compile/T3717.stderr    |  28 ++---
 .../tests/simplCore/should_compile/T3772.stdout    |  28 ++---
 .../tests/simplCore/should_compile/T4908.stderr    |  17 +--
 .../tests/simplCore/should_compile/T4930.stderr    |  38 ++++---
 .../tests/simplCore/should_compile/T5366.stdout    |   2 +-
 .../tests/simplCore/should_compile/T7360.stderr    |  71 +++++++-----
 .../tests/simplCore/should_compile/T7865.stdout    |   4 +-
 .../tests/simplCore/should_compile/T8274.stdout    |  20 ++--
 .../tests/simplCore/should_compile/T8832.stdout    |  20 ++--
 .../simplCore/should_compile/T8832.stdout-ws-32    |  16 +--
 .../tests/simplCore/should_compile/T9400.stderr    |   9 +-
 .../simplCore/should_compile/spec-inline.stderr    | 101 ++++++++++-------
 testsuite/tests/stranal/should_compile/Makefile    |   6 +-
 .../tests/stranal/should_compile/T10482.stdout     |   2 +-
 .../tests/stranal/should_compile/T10482a.stdout    |   8 +-
 testsuite/tests/th/T3319.stderr                    |   2 +-
 testsuite/tests/th/T5700.stderr                    |   2 +-
 testsuite/tests/th/T7276.stderr                    |  13 ++-
 testsuite/tests/th/TH_Roles2.stderr                |   9 +-
 testsuite/tests/th/TH_foreignInterruptible.stderr  |   3 +-
 .../tests/typecheck/should_compile/holes2.stderr   |  35 +++---
 .../tests/typecheck/should_fail/T10971b.stderr     | 124 ++++++++++----------
 testsuite/tests/typecheck/should_fail/T5095.stderr |  28 ++---
 testsuite/tests/typecheck/should_fail/T8262.stderr |   2 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |   3 +-
 .../should_fail/TcStaticPointersFail02.stderr      |  20 ++--
 .../tests/typecheck/should_fail/tcfail068.stderr   |  28 ++---
 .../tests/typecheck/should_fail/tcfail072.stderr   |  32 +++---
 .../tests/typecheck/should_fail/tcfail123.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail128.stderr   |  40 +++----
 .../tests/typecheck/should_fail/tcfail133.stderr   |  42 +++----
 .../tests/typecheck/should_fail/tcfail200.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail220.stderr   |   2 +-
 testsuite/tests/typecheck/should_run/T8119.stdout  |   2 +-
 .../wcompat-warnings/WCompatWarningsOn.stderr      |   6 +-
 85 files changed, 1055 insertions(+), 814 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f

From git at git.haskell.org  Tue Dec 15 20:50:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 20:50:31 +0000 (UTC)
Subject: [commit: ghc] master: base: NonEmpty: Fix documentation example
 (758e6b3)
Message-ID: <20151215205031.E5DD23A300@ghc.haskell.org>

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

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

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

commit 758e6b3a935242acacfa5f1c23ecd1b0e9310e28
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 15 21:50:36 2015 +0100

    base: NonEmpty: Fix documentation example
    
    Fixes #11178.


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

758e6b3a935242acacfa5f1c23ecd1b0e9310e28
 libraries/base/Data/List/NonEmpty.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/base/Data/List/NonEmpty.hs b/libraries/base/Data/List/NonEmpty.hs
index a66ea8f..1553836 100644
--- a/libraries/base/Data/List/NonEmpty.hs
+++ b/libraries/base/Data/List/NonEmpty.hs
@@ -313,7 +313,7 @@ iterate f a = a :| List.iterate f (f a)
 
 -- | @'cycle' xs@ returns the infinite repetition of @xs@:
 --
--- > cycle [1,2,3] = 1 :| [2,3,1,2,3,...]
+-- > cycle (1 :| [2,3]) = 1 :| [2,3,1,2,3,...]
 cycle :: NonEmpty a -> NonEmpty a
 cycle = fromList . List.cycle . toList
 


From git at git.haskell.org  Tue Dec 15 20:51:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 20:51:43 +0000 (UTC)
Subject: [commit: ghc] master: Add testcase for #11224 (a701694)
Message-ID: <20151215205143.288FB3A300@ghc.haskell.org>

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

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

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

commit a701694b27143d094f9de0a78757bbdeaa07daa6
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 20:50:40 2015 +0000

    Add testcase for #11224
    
    Test Plan: Validate
    
    Reviewers: austin, mpickering
    
    Reviewed By: mpickering
    
    Subscribers: mpickering, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1622
    
    GHC Trac Issues: #11224


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

a701694b27143d094f9de0a78757bbdeaa07daa6
 testsuite/tests/patsyn/should_run/T11224.hs     | 28 +++++++++++++++++++++++++
 testsuite/tests/patsyn/should_run/T11224.stdout |  6 ++++++
 testsuite/tests/patsyn/should_run/all.T         |  1 +
 3 files changed, 35 insertions(+)

diff --git a/testsuite/tests/patsyn/should_run/T11224.hs b/testsuite/tests/patsyn/should_run/T11224.hs
new file mode 100644
index 0000000..f834e9b
--- /dev/null
+++ b/testsuite/tests/patsyn/should_run/T11224.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE PatternSynonyms , ViewPatterns #-}
+
+-- inlining a pattern synonym shouldn't change semantics
+
+import Text.Read
+
+-- pattern PRead :: () => Read a => a -> String
+pattern PRead a <- (readMaybe -> Just a)
+
+foo :: String -> Int
+foo (PRead x)  = (x::Int)
+foo (PRead xs) = sum (xs::[Int])
+foo _ = 666
+
+bar :: String -> Int
+bar (readMaybe -> Just x)  = (x::Int)
+bar (readMaybe -> Just xs) = sum (xs::[Int])
+bar _ = 666
+
+main :: IO ()
+main = do
+  print $ foo "1"       -- 1
+  print $ foo "[1,2,3]" -- 666 -- ???
+  print $ foo "xxx"     -- 666
+
+  print $ bar "1"       -- 1
+  print $ bar "[1,2,3]" -- 6
+  print $ bar "xxx"     -- 666
diff --git a/testsuite/tests/patsyn/should_run/T11224.stdout b/testsuite/tests/patsyn/should_run/T11224.stdout
new file mode 100644
index 0000000..3a42854
--- /dev/null
+++ b/testsuite/tests/patsyn/should_run/T11224.stdout
@@ -0,0 +1,6 @@
+1
+6
+666
+1
+6
+666
diff --git a/testsuite/tests/patsyn/should_run/all.T b/testsuite/tests/patsyn/should_run/all.T
index 45c48fb..c12bfc6 100644
--- a/testsuite/tests/patsyn/should_run/all.T
+++ b/testsuite/tests/patsyn/should_run/all.T
@@ -12,3 +12,4 @@ test('match-unboxed', normal, compile_and_run, [''])
 test('unboxed-wrapper', normal, compile_and_run, [''])
 test('records-run', normal, compile_and_run, [''])
 test('ghci', just_ghci, ghci_script, ['ghci.script'])
+test('T11224', [expect_broken(11224)], compile_and_run, [''])
\ No newline at end of file


From git at git.haskell.org  Tue Dec 15 21:22:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 21:22:45 +0000 (UTC)
Subject: [commit: ghc] master: primops: Mark actions evaluated by `catch*` as
 lazy (28638df)
Message-ID: <20151215212245.61E8E3A300@ghc.haskell.org>

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

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

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

commit 28638dfe79e915f33d75a1b22c5adce9e2b62b97
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 20:08:17 2015 +0100

    primops: Mark actions evaluated by `catch*` as lazy
    
    There is something very peculiar about the `catch` family of operations
    with respect to strictness analysis: they turn divergence into
    non-divergence. For this reason, it isn't safe to mark them as strict in
    the expression whose exceptions they are catching. The reason is this:
    
    Consider,
    
        let r = \st -> raiseIO# blah st
        in catch (\st -> ...(r st)..) handler st
    
    If we give the first argument of catch a strict signature, we'll get a
    demand 'C(S)' for 'r'; that is, 'r' is definitely called with one
    argument, which indeed it is. The trouble comes when we feed 'C(S)' into
    'r's RHS as the demand of the body as this will lead us to conclude that
    the whole 'let' will diverge; clearly this isn't right.
    
    This is essentially the problem in #10712, which arose when
    7c0fff41789669450b02dc1db7f5d7babba5dee6 marked the `catch*` primops as
    being strict in the thing to be evaluated. Here I've partially reverted
    this commit, again marking the first argument of these primops as lazy.
    
    Fixes #10712.
    
    Test Plan: Validate checking `exceptionsrun001`
    
    Reviewers: simonpj, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1616
    
    GHC Trac Issues: #10712, #11222


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

28638dfe79e915f33d75a1b22c5adce9e2b62b97
 compiler/prelude/primops.txt.pp       | 30 ++++++++++++++++++++----------
 testsuite/tests/perf/should_run/all.T |  3 ++-
 2 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/compiler/prelude/primops.txt.pp b/compiler/prelude/primops.txt.pp
index c16646e..de14e30 100644
--- a/compiler/prelude/primops.txt.pp
+++ b/compiler/prelude/primops.txt.pp
@@ -1946,17 +1946,27 @@ necessarily the second.  Hence strictApply1Dmd and lazyApply1Dmd
 Howver, consider
     catch# (\st -> case x of ...) (..handler..) st
 We'll see that the entire thing is strict in 'x', so 'x' may be evaluated
-before the catch#.  So fi evaluting 'x' causes a divide-by-zero exception,
+before the catch#.  So if evaluting 'x' causes a divide-by-zero exception,
 it won't be caught.  This seems acceptable:
+
   - x might be evaluated somewhere else outside the catch# anyway
   - It's an imprecise eception anyway.  Synchronous exceptions (in the
     IO monad) will never move in this way.
-There was originally a comment
-  "Catch is actually strict in its first argument
-   but we don't want to tell the strictness
-   analyser about that, so that exceptions stay inside it."
-but tracing it back through the commit logs did not give any
-rationale.  And making catch# lazy has performance costs for everyone.
+
+Unfortunately, there is a tricky wrinkle here, as pointed out in #10712.
+Consider,
+
+    let r = \st -> raiseIO# blah st
+    in catch (\st -> ...(r st)..) handler st
+
+If we give the first argument of catch a strict signature, we'll get
+a demand 'C(S)' for 'r'; that is, 'r' is definitely called with one
+argument, which indeed it is. The trouble comes when we feed 'C(S)'
+into 'r's RHS as the demand of the body as this will lead us to conclude that
+the whole 'let' will diverge; clearly this isn't right.
+
+There's something very special about catch: it turns divergence into
+non-divergence.
 -}
 
 primop  CatchOp "catch#" GenPrimOp
@@ -1965,7 +1975,7 @@ primop  CatchOp "catch#" GenPrimOp
        -> State# RealWorld
        -> (# State# RealWorld, a #)
    with
-   strictness  = { \ _arity -> mkClosedStrictSig [strictApply1Dmd,lazyApply2Dmd,topDmd] topRes }
+   strictness  = { \ _arity -> mkClosedStrictSig [lazyApply1Dmd,lazyApply2Dmd,topDmd] topRes }
                  -- See Note [Strictness for mask/unmask/catch]
    out_of_line = True
    has_side_effects = True
@@ -2069,7 +2079,7 @@ primop  CatchRetryOp "catchRetry#" GenPrimOp
    -> (State# RealWorld -> (# State# RealWorld, a #) )
    -> (State# RealWorld -> (# State# RealWorld, a #) )
    with
-   strictness  = { \ _arity -> mkClosedStrictSig [strictApply1Dmd,lazyApply1Dmd,topDmd] topRes }
+   strictness  = { \ _arity -> mkClosedStrictSig [lazyApply1Dmd,lazyApply1Dmd,topDmd] topRes }
                  -- See Note [Strictness for mask/unmask/catch]
    out_of_line = True
    has_side_effects = True
@@ -2079,7 +2089,7 @@ primop  CatchSTMOp "catchSTM#" GenPrimOp
    -> (b -> State# RealWorld -> (# State# RealWorld, a #) )
    -> (State# RealWorld -> (# State# RealWorld, a #) )
    with
-   strictness  = { \ _arity -> mkClosedStrictSig [strictApply1Dmd,lazyApply2Dmd,topDmd] topRes }
+   strictness  = { \ _arity -> mkClosedStrictSig [lazyApply1Dmd,lazyApply2Dmd,topDmd] topRes }
                  -- See Note [Strictness for mask/unmask/catch]
    out_of_line = True
    has_side_effects = True
diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index a86d61f..8260ee1 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -53,12 +53,13 @@ test('lazy-bs-alloc',
      [stats_num_field('peak_megabytes_allocated', (2, 1)),
                                  # expected value: 2 (amd64/Linux)
       stats_num_field('bytes allocated',
-          [(wordsize(64), 431500, 3),
+          [(wordsize(64), 444720, 3),
             #             489776 (amd64/Linux)
             # 2013-02-07: 429744 (amd64/Linux)
             # 2013-12-12: 425400 (amd64/Linux)
             # 2015-04-04: Widen 1->3% (amd64/Windows was failing)
             # 2015-08-15: 431500 (Windows not good enough. avg of Windows&Linux)
+            # 2015-12-15: 444720 (amd64/Linux, D1616)
            (wordsize(32), 411500, 2)]),
             # 2013-02-10: 421296 (x86/Windows)
             # 2013-02-10: 414180 (x86/OSX)


From git at git.haskell.org  Tue Dec 15 23:03:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 15 Dec 2015 23:03:24 +0000 (UTC)
Subject: [commit: ghc] master: Expose enabled language extensions to TH
 (c1e2553)
Message-ID: <20151215230324.310423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c1e25536d67fba33ad6ddae5556115340d99000a/ghc

>---------------------------------------------------------------

commit c1e25536d67fba33ad6ddae5556115340d99000a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 23:57:46 2015 +0100

    Expose enabled language extensions to TH
    
    This exposes `template-haskell` functions for querying the language
    extensions which are enabled when compiling a module,
    
    - an `isExtEnabled` function to check whether an extension is enabled
    - an `extsEnabled` function to obtain a full list of enabled extensions
    
    To avoid code duplication this adds a `GHC.LanguageExtensions` module to
    `ghc-boot` and moves `DynFlags.ExtensionFlag` into it. A happy
    consequence of this is that the ungainly `DynFlags` lost around 500
    lines. Moreover, flags corresponding to language extensions are now
    clearly distinguished from other flags due to the `LangExt.*` prefix.
    
    Updates haddock submodule.
    
    This fixes #10820.
    
    Test Plan: validate
    
    Reviewers: austin, spinda, hvr, goldfire, alanz
    
    Reviewed By: goldfire
    
    Subscribers: mpickering, RyanGlScott, hvr, simonpj, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1200
    
    GHC Trac Issues: #10820


>---------------------------------------------------------------

c1e25536d67fba33ad6ddae5556115340d99000a
 compiler/basicTypes/MkId.hs                        |   7 +-
 compiler/deSugar/DsBinds.hs                        |   7 +-
 compiler/deSugar/DsMonad.hs                        |   3 +-
 compiler/deSugar/DsUtils.hs                        |   5 +-
 compiler/deSugar/MatchLit.hs                       |   5 +-
 compiler/main/DriverPipeline.hs                    |  11 +-
 compiler/main/DynFlags.hs                          | 568 +++++++++------------
 compiler/main/GHC.hs                               |   3 +-
 compiler/main/GhcMake.hs                           |   3 +-
 compiler/main/HeaderInfo.hs                        |   3 +-
 compiler/parser/Lexer.x                            |  75 +--
 compiler/parser/Parser.y                           |   7 +-
 compiler/parser/RdrHsSyn.hs                        |   7 +-
 compiler/rename/RnBinds.hs                         |  16 +-
 compiler/rename/RnEnv.hs                           |  18 +-
 compiler/rename/RnExpr.hs                          |  25 +-
 compiler/rename/RnNames.hs                         |   5 +-
 compiler/rename/RnPat.hs                           |  23 +-
 compiler/rename/RnSource.hs                        |   7 +-
 compiler/rename/RnSplice.hs                        |   6 +-
 compiler/rename/RnTypes.hs                         |  28 +-
 compiler/typecheck/Inst.hs                         |   6 +-
 compiler/typecheck/TcBinds.hs                      |   7 +-
 compiler/typecheck/TcDefaults.hs                   |   4 +-
 compiler/typecheck/TcDeriv.hs                      |  35 +-
 compiler/typecheck/TcEnv.hs                        |  14 +-
 compiler/typecheck/TcErrors.hs                     |   3 +-
 compiler/typecheck/TcExpr.hs                       |   6 +-
 compiler/typecheck/TcForeign.hs                    |   3 +-
 compiler/typecheck/TcHsSyn.hs                      |   4 +-
 compiler/typecheck/TcHsType.hs                     |  15 +-
 compiler/typecheck/TcInstDcls.hs                   |   7 +-
 compiler/typecheck/TcInteract.hs                   |   3 +-
 compiler/typecheck/TcMType.hs                      |   4 +-
 compiler/typecheck/TcMatches.hs                    |   5 +-
 compiler/typecheck/TcPat.hs                        |   5 +-
 compiler/typecheck/TcRnDriver.hs                   |   5 +-
 compiler/typecheck/TcRnMonad.hs                    |   8 +-
 compiler/typecheck/TcSimplify.hs                   |   6 +-
 compiler/typecheck/TcSplice.hs                     |   6 +
 compiler/typecheck/TcTyClsDecls.hs                 |  31 +-
 compiler/typecheck/TcType.hs                       |   5 +-
 compiler/typecheck/TcValidity.hs                   |  40 +-
 docs/users_guide/7.12.1-notes.rst                  |   8 +
 ghc/InteractiveUI.hs                               |  11 +-
 ghc/ghc-bin.cabal.in                               |   1 +
 libraries/ghc-boot/GHC/LanguageExtensions.hs       | 122 +++++
 libraries/ghc-boot/ghc-boot.cabal                  |   1 +
 libraries/template-haskell/Language/Haskell/TH.hs  |   3 +
 .../Language/Haskell/TH/LanguageExtensions.hs      |  22 +
 .../template-haskell/Language/Haskell/TH/Syntax.hs |  26 +-
 libraries/template-haskell/template-haskell.cabal  |   1 +
 testsuite/tests/ghc-api/T10508_api.hs              |   3 +-
 testsuite/tests/th/T10820.hs                       |  16 +
 .../scripts/ghci053.stdout => th/T10820.stdout}    |   1 +
 testsuite/tests/th/all.T                           |   1 +
 utils/haddock                                      |   2 +-
 utils/mkUserGuidePart/Main.hs                      |   7 +-
 58 files changed, 709 insertions(+), 570 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c1e25536d67fba33ad6ddae5556115340d99000a

From git at git.haskell.org  Wed Dec 16 07:11:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:31 +0000 (UTC)
Subject: [commit: packages/pretty] tag 'pretty-1.1.3.2-release' created
Message-ID: <20151216071131.624F13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

New tag    : pretty-1.1.3.2-release
Referencing: 489d58643c5781bd221ccf21f5537b29c4011db8

From git at git.haskell.org  Wed Dec 16 07:11:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:33 +0000 (UTC)
Subject: [commit: packages/pretty] master: Fix missing files from test-suite.
 (9f462e1)
Message-ID: <20151216071133.682D13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/9f462e10739655eb80a1141c22dae13c9595fdc1

>---------------------------------------------------------------

commit 9f462e10739655eb80a1141c22dae13c9595fdc1
Author: David Terei <code at davidterei.com>
Date:   Sat Jan 17 14:52:33 2015 -0800

    Fix missing files from test-suite.


>---------------------------------------------------------------

9f462e10739655eb80a1141c22dae13c9595fdc1
 pretty.cabal | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pretty.cabal b/pretty.cabal
index 8b81005..e1bf6a9 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -47,11 +47,13 @@ Test-Suite test-pretty
                    QuickCheck >= 2.5 && <3
     main-is: Test.hs
     other-modules:
+        PrettyTestVersion
         TestGenerators
         TestStructures
+        TestUtils
+        UnitLargeDoc
         UnitPP1
         UnitT3911
-        UnitLargeDoc
     extensions: CPP, BangPatterns, DeriveGeneric
     include-dirs: src/Text/PrettyPrint
 


From git at git.haskell.org  Wed Dec 16 07:11:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:35 +0000 (UTC)
Subject: [commit: packages/pretty] master: Bump to version 1.1.2.1 (7deb64c)
Message-ID: <20151216071135.6E8213A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/7deb64ce5f18a14ca99752feecfd4b52f7fc9a99

>---------------------------------------------------------------

commit 7deb64ce5f18a14ca99752feecfd4b52f7fc9a99
Author: David Terei <code at davidterei.com>
Date:   Fri Dec 26 01:05:37 2014 -0800

    Bump to version 1.1.2.1


>---------------------------------------------------------------

7deb64ce5f18a14ca99752feecfd4b52f7fc9a99
 CHANGELOG.md | 5 +++++
 pretty.cabal | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5cb8069..1dbdce5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Pretty library change log
 
+## 1.1.2.1 -- 25th December, 2014
+
+* Fix overly-strict issue preventing use of pretty for very large
+  docs (by Eyal Lotem).
+
 ## 1.1.2.0 -- 25th December, 2014
 
 * Merge in prettyclass package -- new Text.PrettyPrint.HughesPHClass.
diff --git a/pretty.cabal b/pretty.cabal
index e1bf6a9..25898c4 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -1,5 +1,5 @@
 name:          pretty
-version:       1.1.2.0
+version:       1.1.2.1
 synopsis:      Pretty-printing library
 description:
         This package contains a pretty-printing library, a set of API's


From git at git.haskell.org  Wed Dec 16 07:11:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:37 +0000 (UTC)
Subject: [commit: packages/pretty] master: Improve module description for
 HughesPJ (b093b1e)
Message-ID: <20151216071137.742B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/b093b1e2eebd0023e6cdf003fd0723d32ecda968

>---------------------------------------------------------------

commit b093b1e2eebd0023e6cdf003fd0723d32ecda968
Author: David Terei <code at davidterei.com>
Date:   Fri Dec 26 00:38:36 2014 -0800

    Improve module description for HughesPJ


>---------------------------------------------------------------

b093b1e2eebd0023e6cdf003fd0723d32ecda968
 src/Text/PrettyPrint/HughesPJ.hs | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/Text/PrettyPrint/HughesPJ.hs b/src/Text/PrettyPrint/HughesPJ.hs
index c45f691..a091bdd 100644
--- a/src/Text/PrettyPrint/HughesPJ.hs
+++ b/src/Text/PrettyPrint/HughesPJ.hs
@@ -15,12 +15,17 @@
 -- Stability   :  stable
 -- Portability :  portable
 --
--- John Hughes's and Simon Peyton Jones's Pretty Printer Combinators
+-- Provides a collection of pretty printer combinators, a set of API's
+-- that provides a way to easily print out text in a consistent format
+-- of your choosing.
 --
--- Based on /The Design of a Pretty-printing Library/
--- in Advanced Functional Programming,
--- Johan Jeuring and Erik Meijer (eds), LNCS 925
--- <http://www.cs.chalmers.se/~rjmh/Papers/pretty.ps>
+-- Originally designed by John Hughes's and Simon Peyton Jones's.
+--
+-- For more information you can refer to the
+-- <http://belle.sourceforge.net/doc/hughes95design.pdf original paper> that
+-- serves as the basis for this libraries design:
+-- /The Design -- of a Pretty-printing Library/ by John Hughes, in Advanced
+-- Functional Programming, 1995
 --
 -----------------------------------------------------------------------------
 
@@ -58,7 +63,6 @@ module Text.PrettyPrint.HughesPJ (
 
         -- * Utility functions for documents
         first, reduceDoc,
-        -- TODO: Should these be exported? Previously they weren't
 
         -- * Rendering documents
 


From git at git.haskell.org  Wed Dec 16 07:11:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:39 +0000 (UTC)
Subject: [commit: packages/pretty] master: Bump base dependency to >= 4.5
 (#18). (e34ba99)
Message-ID: <20151216071139.79E483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/e34ba99e109259b66f188bb25c2cfe3bca664522

>---------------------------------------------------------------

commit e34ba99e109259b66f188bb25c2cfe3bca664522
Author: David Terei <code at davidterei.com>
Date:   Mon Jan 19 00:11:19 2015 -0800

    Bump base dependency to >= 4.5 (#18).
    
    Support SafeHaskell and Generics, both of which require GHC 7.4 or
    greater.


>---------------------------------------------------------------

e34ba99e109259b66f188bb25c2cfe3bca664522
 pretty.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pretty.cabal b/pretty.cabal
index 25898c4..89e739c 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -31,7 +31,7 @@ Library
         Text.PrettyPrint
         Text.PrettyPrint.HughesPJ
         Text.PrettyPrint.HughesPJClass
-    build-depends: base >= 3 && < 5,
+    build-depends: base >= 4.5 && < 5,
                    deepseq >= 1.1,
                    ghc-prim
     extensions: CPP, BangPatterns, DeriveGeneric
@@ -41,7 +41,7 @@ Test-Suite test-pretty
     type: exitcode-stdio-1.0
     hs-source-dirs: tests
                     src
-    build-depends: base >= 3 && < 5,
+    build-depends: base >= 4.5 && < 5,
                    deepseq >= 1.1,
                    ghc-prim,
                    QuickCheck >= 2.5 && <3


From git at git.haskell.org  Wed Dec 16 07:11:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:41 +0000 (UTC)
Subject: [commit: packages/pretty] master: Add annotations to the Doc type
 (49b786d)
Message-ID: <20151216071141.80ABE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/49b786dcdc9add53ad494615ae6bbe4b263c9766

>---------------------------------------------------------------

commit 49b786dcdc9add53ad494615ae6bbe4b263c9766
Author: Trevor Elliott <trevor at galois.com>
Date:   Sat Jan 24 10:29:20 2015 -0800

    Add annotations to the Doc type
    
     * Parameterize the Doc type by the type of annotations present
     * Add the Span type for describing annotated regions in the resulting String
     * Add renderSpans, and fullRenderAnn, for rendering with annotations


>---------------------------------------------------------------

49b786dcdc9add53ad494615ae6bbe4b263c9766
 src/Text/PrettyPrint/HughesPJ.hs      | 388 ++++++++++++++++++++++------------
 src/Text/PrettyPrint/HughesPJClass.hs |  10 +-
 2 files changed, 256 insertions(+), 142 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 49b786dcdc9add53ad494615ae6bbe4b263c9766

From git at git.haskell.org  Wed Dec 16 07:11:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:43 +0000 (UTC)
Subject: [commit: packages/pretty] master: Build in compatibility with the old
 pretty API (a1b780c)
Message-ID: <20151216071143.8D51E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/a1b780c5a3a335a369a7149c1145bdb8d0212aeb

>---------------------------------------------------------------

commit a1b780c5a3a335a369a7149c1145bdb8d0212aeb
Author: Trevor Elliott <trevor at galois.com>
Date:   Sat Jan 24 12:19:19 2015 -0800

    Build in compatibility with the old pretty API


>---------------------------------------------------------------

a1b780c5a3a335a369a7149c1145bdb8d0212aeb
 .../{PrettyPrint.hs => PrettyPrint/Annotated.hs}   |  13 +-
 src/Text/PrettyPrint/{ => Annotated}/HughesPJ.hs   |   4 +-
 .../PrettyPrint/{ => Annotated}/HughesPJClass.hs   |   8 +-
 src/Text/PrettyPrint/HughesPJ.hs                   | 898 +++------------------
 src/Text/PrettyPrint/HughesPJClass.hs              |  10 +-
 5 files changed, 143 insertions(+), 790 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a1b780c5a3a335a369a7149c1145bdb8d0212aeb

From git at git.haskell.org  Wed Dec 16 07:11:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:45 +0000 (UTC)
Subject: [commit: packages/pretty] master: Export the Annotated modules
 (08d8913)
Message-ID: <20151216071145.9354B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/08d8913f11e7087a45fcde8b08adf59e44107d25

>---------------------------------------------------------------

commit 08d8913f11e7087a45fcde8b08adf59e44107d25
Author: Trevor Elliott <trevor at galois.com>
Date:   Sat Jan 24 12:31:15 2015 -0800

    Export the Annotated modules


>---------------------------------------------------------------

08d8913f11e7087a45fcde8b08adf59e44107d25
 pretty.cabal                      | 3 +++
 src/Text/PrettyPrint/Annotated.hs | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/pretty.cabal b/pretty.cabal
index 89e739c..38a12b1 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -31,6 +31,9 @@ Library
         Text.PrettyPrint
         Text.PrettyPrint.HughesPJ
         Text.PrettyPrint.HughesPJClass
+        Text.PrettyPrint.Annotated
+        Text.PrettyPrint.Annotated.HughesPJ
+        Text.PrettyPrint.Annotated.HughesPJClass
     build-depends: base >= 4.5 && < 5,
                    deepseq >= 1.1,
                    ghc-prim
diff --git a/src/Text/PrettyPrint/Annotated.hs b/src/Text/PrettyPrint/Annotated.hs
index 3bfc353..dc967e6 100644
--- a/src/Text/PrettyPrint/Annotated.hs
+++ b/src/Text/PrettyPrint/Annotated.hs
@@ -21,7 +21,7 @@
 --
 -----------------------------------------------------------------------------
 
-module Text.PrettyPrintAnnotated ( 
+module Text.PrettyPrint.Annotated ( 
 
         -- * The document type
         Doc,


From git at git.haskell.org  Wed Dec 16 07:11:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:47 +0000 (UTC)
Subject: [commit: packages/pretty] master: Update the test suite (b96d2aa)
Message-ID: <20151216071147.9C2793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/b96d2aaddb133391a0d17e8d2a0004eaf8f1dd77

>---------------------------------------------------------------

commit b96d2aaddb133391a0d17e8d2a0004eaf8f1dd77
Author: Trevor Elliott <trevor at galois.com>
Date:   Sat Jan 24 12:58:34 2015 -0800

    Update the test suite


>---------------------------------------------------------------

b96d2aaddb133391a0d17e8d2a0004eaf8f1dd77
 pretty.cabal            |   2 +-
 tests/Test.hs           | 170 ++++++++++++++++++++++++------------------------
 tests/TestStructures.hs |  18 +++--
 3 files changed, 98 insertions(+), 92 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b96d2aaddb133391a0d17e8d2a0004eaf8f1dd77

From git at git.haskell.org  Wed Dec 16 07:11:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:49 +0000 (UTC)
Subject: [commit: packages/pretty] master: Add renderDecorated,
 and renderDecoratedM (aca8d01)
Message-ID: <20151216071149.A246B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/aca8d0163b0d4f0e06856d6dde22da40546ca8c2

>---------------------------------------------------------------

commit aca8d0163b0d4f0e06856d6dde22da40546ca8c2
Author: Trevor Elliott <trevor at galois.com>
Date:   Sat Jan 24 13:47:04 2015 -0800

    Add renderDecorated, and renderDecoratedM
    
      Also, go back to storing the annotation value in the AnnotEnd constructor, as
    that makes it easier to use that value when processing both the start and end of
    an annotation.


>---------------------------------------------------------------

aca8d0163b0d4f0e06856d6dde22da40546ca8c2
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 88 +++++++++++++++++++++++++-----
 1 file changed, 74 insertions(+), 14 deletions(-)

diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
index 971a53f..de89c8e 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -74,6 +74,8 @@ module Text.PrettyPrint.Annotated.HughesPJ (
 
         -- ** Annotation rendering
         renderSpans, Span(..),
+        renderDecorated,
+        renderDecoratedM,
 
         -- ** Rendering with a particular style
         Style(..),
@@ -235,15 +237,15 @@ Notice the difference between
 -- | RDoc is a "reduced GDoc", guaranteed not to have a top-level Above or Beside.
 type RDoc = Doc
 
-data AnnotDetails a = AnnotStart a
+data AnnotDetails a = AnnotStart
                     | NoAnnot TextDetails {-# UNPACK #-} !Int
-                    | AnnotEnd
+                    | AnnotEnd a
                       deriving (Show,Eq)
 
 instance Functor AnnotDetails where
-  fmap f (AnnotStart a) = AnnotStart (f a)
+  fmap _ AnnotStart     = AnnotStart
   fmap _ (NoAnnot d i)  = NoAnnot d i
-  fmap _ AnnotEnd       = AnnotEnd
+  fmap f (AnnotEnd a)   = AnnotEnd (f a)
 
 -- NOTE: Annotations are assumed to have zero length; only text has a length.
 annotSize :: AnnotDetails a -> Int
@@ -300,9 +302,9 @@ instance NFData a => NFData (Doc a) where
   rnf (Above ud s ld)     = rnf ud `seq` rnf s `seq` rnf ld
 
 instance NFData a => NFData (AnnotDetails a) where
-  rnf (AnnotStart a) = rnf a
+  rnf AnnotStart     = ()
   rnf (NoAnnot d sl) = rnf d `seq` rnf sl
-  rnf AnnotEnd       = ()
+  rnf (AnnotEnd a)   = rnf a
 
 instance NFData TextDetails where
   rnf (Chr c)    = rnf c
@@ -314,9 +316,9 @@ instance NFData TextDetails where
 
 -- | Attach an annotation to a document.
 annotate :: a -> Doc a -> Doc a
-annotate a d = TextBeside (AnnotStart a)
+annotate a d = TextBeside AnnotStart
              $ beside (reduceDoc d) False
-             $ TextBeside AnnotEnd Empty
+             $ TextBeside (AnnotEnd a) Empty
 
 
 -- | A document of height and width 1, containing a literal character.
@@ -1056,7 +1058,7 @@ instance Functor Span where
 -- State required for generating document spans.
 data Spans a = Spans { sOffset :: !Int
                        -- ^ Current offset from the end of the document
-                     , sStack  :: [Int -> a -> Span a]
+                     , sStack  :: [Int -> Span a]
                        -- ^ Currently open spans
                      , sSpans  :: [Span a]
                        -- ^ Collected annotation regions
@@ -1075,7 +1077,7 @@ renderSpans  = finalize
     where
     adjust s = s { spanStart = size - spanStart s }
 
-  mkSpan end start a = Span { spanStart      = start
+  mkSpan a end start = Span { spanStart      = start
                             , spanLength     = start - end
                               -- ^ this seems wrong, but remember that it's
                               -- working backwards at this point
@@ -1083,16 +1085,74 @@ renderSpans  = finalize
 
   -- the document gets generated in reverse, which is why the starting
   -- annotation ends the annotation.
-  spanPrinter (AnnotStart a) s =
+  spanPrinter AnnotStart s =
     case sStack s of
-      sp : rest -> s { sSpans = sp (sOffset s) a : sSpans s, sStack = rest }
+      sp : rest -> s { sSpans = sp (sOffset s) : sSpans s, sStack = rest }
       _         -> error "renderSpans: stack underflow"
 
-  spanPrinter AnnotEnd s =
-    s { sStack = mkSpan (sOffset s) : sStack s }
+  spanPrinter (AnnotEnd a) s =
+    s { sStack = mkSpan a (sOffset s) : sStack s }
 
   spanPrinter (NoAnnot td l) s =
     case td of
       Chr  c -> s { sOutput = c  : sOutput s, sOffset = sOffset s + l }
       Str  t -> s { sOutput = t ++ sOutput s, sOffset = sOffset s + l }
       PStr t -> s { sOutput = t ++ sOutput s, sOffset = sOffset s + l }
+
+
+-- | Render out a String, interpreting the annotations as part of the resulting
+-- document.
+--
+-- IMPORTANT: the size of the annotation string does NOT figure into the layout
+-- of the document, so the document will lay out as though the annotations are
+-- not present.
+renderDecorated :: (ann -> String) -- ^ Starting an annotation
+                -> (ann -> String) -- ^ Ending an annotation
+                -> Doc ann -> String
+renderDecorated startAnn endAnn =
+  finalize . fullRenderAnn (mode style) (lineLength style) (ribbonsPerLine style)
+                 annPrinter
+                 ("", [])
+  where
+  annPrinter AnnotStart (rest,stack) =
+    case stack of
+      a : as -> (startAnn a ++ rest, as)
+      _      -> error "renderDecorated: stack underflow"
+
+  annPrinter (AnnotEnd a) (rest,stack) =
+    (endAnn a ++ rest, a : stack)
+
+  annPrinter (NoAnnot s _) (rest,stack) =
+    (txtPrinter s rest, stack)
+
+  finalize (str,_) = str
+
+
+-- | Render a document with annotations, by interpreting the start and end of
+-- the annotations, as well as the text details in the context of a monad.
+renderDecoratedM :: Monad m
+                 => (ann    -> m r) -- ^ Starting an annotation
+                 -> (ann    -> m r) -- ^ Ending an annotation
+                 -> (String -> m r) -- ^ Text formatting
+                 -> m r             -- ^ Document end
+                 -> Doc ann -> m r
+renderDecoratedM startAnn endAnn txt docEnd =
+  finalize . fullRenderAnn (mode style) (lineLength style) (ribbonsPerLine style)
+                 annPrinter
+                 (docEnd, [])
+  where
+  annPrinter AnnotStart (rest,stack) =
+    case stack of
+      a : as -> (startAnn a >> rest, as)
+      _      -> error "renderDecorated: stack underflow"
+
+  annPrinter (AnnotEnd a) (rest,stack) =
+    (endAnn a >> rest, a : stack)
+
+  annPrinter (NoAnnot td _) (rest,stack) =
+    case td of
+      Chr  c -> (txt [c] >> rest, stack)
+      Str  s -> (txt s   >> rest, stack)
+      PStr s -> (txt s   >> rest, stack)
+
+  finalize (m,_) = m


From git at git.haskell.org  Wed Dec 16 07:11:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:51 +0000 (UTC)
Subject: [commit: packages/pretty] master: Make TextDetails strict in the
 NoAnnot constructor (764213f)
Message-ID: <20151216071151.A80663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/764213f8632571a2ba1dbc559242249f7c04d318

>---------------------------------------------------------------

commit 764213f8632571a2ba1dbc559242249f7c04d318
Author: Trevor Elliott <trevor at galois.com>
Date:   Mon Jan 26 17:07:43 2015 -0800

    Make TextDetails strict in the NoAnnot constructor


>---------------------------------------------------------------

764213f8632571a2ba1dbc559242249f7c04d318
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
index de89c8e..8670fbd 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -238,7 +238,7 @@ Notice the difference between
 type RDoc = Doc
 
 data AnnotDetails a = AnnotStart
-                    | NoAnnot TextDetails {-# UNPACK #-} !Int
+                    | NoAnnot !TextDetails {-# UNPACK #-} !Int
                     | AnnotEnd a
                       deriving (Show,Eq)
 


From git at git.haskell.org  Wed Dec 16 07:11:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:53 +0000 (UTC)
Subject: [commit: packages/pretty] master: Merge pull request #19 from
 elliottt/annotations (b718d1f)
Message-ID: <20151216071153.B25C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/b718d1f65acd5d153820d78684b6b139ac36b8d6

>---------------------------------------------------------------

commit b718d1f65acd5d153820d78684b6b139ac36b8d6
Merge: e34ba99 764213f
Author: David Terei <github at davidterei.com>
Date:   Mon Jan 26 17:33:51 2015 -0800

    Merge pull request #19 from elliottt/annotations
    
    Add an annotation API



>---------------------------------------------------------------

b718d1f65acd5d153820d78684b6b139ac36b8d6
 pretty.cabal                                       |   5 +-
 .../{PrettyPrint.hs => PrettyPrint/Annotated.hs}   |  13 +-
 src/Text/PrettyPrint/{ => Annotated}/HughesPJ.hs   | 452 +++++++++-----
 .../PrettyPrint/{ => Annotated}/HughesPJClass.hs   |  18 +-
 src/Text/PrettyPrint/HughesPJ.hs                   | 664 ++-------------------
 tests/Test.hs                                      | 170 +++---
 tests/TestStructures.hs                            |  18 +-
 7 files changed, 495 insertions(+), 845 deletions(-)


From git at git.haskell.org  Wed Dec 16 07:11:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:55 +0000 (UTC)
Subject: [commit: packages/pretty] master: Bump version to 1.1.3.1 (f93bc6f)
Message-ID: <20151216071155.B7DD63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/f93bc6fd5a3065c7e54fec44a80895ea3af3d706

>---------------------------------------------------------------

commit f93bc6fd5a3065c7e54fec44a80895ea3af3d706
Author: David Terei <code at davidterei.com>
Date:   Wed Mar 11 11:49:45 2015 -0700

    Bump version to 1.1.3.1


>---------------------------------------------------------------

f93bc6fd5a3065c7e54fec44a80895ea3af3d706
 pretty.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pretty.cabal b/pretty.cabal
index 1598faa..c4ac991 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -1,5 +1,5 @@
 name:          pretty
-version:       1.1.2.1
+version:       1.1.3.1
 synopsis:      Pretty-printing library
 description:
         This package contains a pretty-printing library, a set of API's


From git at git.haskell.org  Wed Dec 16 07:11:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:57 +0000 (UTC)
Subject: [commit: packages/pretty] master: fix a comment that confuses Haddock
 (1b06c69)
Message-ID: <20151216071157.BDE0A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/1b06c695fb56d360afa39fdc47c67c0fe06b0825

>---------------------------------------------------------------

commit 1b06c695fb56d360afa39fdc47c67c0fe06b0825
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Fri Mar 13 17:54:23 2015 -0400

    fix a comment that confuses Haddock


>---------------------------------------------------------------

1b06c695fb56d360afa39fdc47c67c0fe06b0825
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
index 8670fbd..dfc48dd 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -1079,7 +1079,7 @@ renderSpans  = finalize
 
   mkSpan a end start = Span { spanStart      = start
                             , spanLength     = start - end
-                              -- ^ this seems wrong, but remember that it's
+                              -- this seems wrong, but remember that it's
                               -- working backwards at this point
                             , spanAnnotation = a }
 


From git at git.haskell.org  Wed Dec 16 07:11:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:11:59 +0000 (UTC)
Subject: [commit: packages/pretty] master: test haddock generation in CI
 (60a5241)
Message-ID: <20151216071159.C35DB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/60a5241c6e21a4a593e650088a165feca7962619

>---------------------------------------------------------------

commit 60a5241c6e21a4a593e650088a165feca7962619
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Fri Mar 13 17:58:47 2015 -0400

    test haddock generation in CI


>---------------------------------------------------------------

60a5241c6e21a4a593e650088a165feca7962619
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index de5fe5b..2790e4b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -34,6 +34,7 @@ script:
  - cabal check
  - ([ "$CABALVER" == "1.20" ] && cabal test --show-details=streaming) || ([ "$CABALVER" != "1.20" ] && cabal test)
  - cabal sdist
+ - cabal haddock
  - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
    cd dist/;
    if [ -f "$SRC_TGZ" ]; then


From git at git.haskell.org  Wed Dec 16 07:12:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:12:01 +0000 (UTC)
Subject: [commit: packages/pretty] master: Merge pull request #24 from
 osa1/master (bfc6295)
Message-ID: <20151216071201.C91923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/bfc6295ed2d9755e824b9e148bf7d0b6d63d0130

>---------------------------------------------------------------

commit bfc6295ed2d9755e824b9e148bf7d0b6d63d0130
Merge: f93bc6f 60a5241
Author: David Terei <github at davidterei.com>
Date:   Thu Mar 19 01:46:35 2015 -0700

    Merge pull request #24 from osa1/master
    
    fix a comment that confuses Haddock



>---------------------------------------------------------------

bfc6295ed2d9755e824b9e148bf7d0b6d63d0130
 .travis.yml                                | 1 +
 src/Text/PrettyPrint/Annotated/HughesPJ.hs | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)


From git at git.haskell.org  Wed Dec 16 07:12:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:12:03 +0000 (UTC)
Subject: [commit: packages/pretty] master: Clean up module intro
 documentation. (2ce46a5)
Message-ID: <20151216071203.D0E713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/2ce46a57385ef480ba0777d790ed5ed554d4544b

>---------------------------------------------------------------

commit 2ce46a57385ef480ba0777d790ed5ed554d4544b
Author: David Terei <code at davidterei.com>
Date:   Thu Mar 19 02:03:01 2015 -0700

    Clean up module intro documentation.


>---------------------------------------------------------------

2ce46a57385ef480ba0777d790ed5ed554d4544b
 src/Text/PrettyPrint.hs                         |  2 +-
 src/Text/PrettyPrint/Annotated.hs               | 14 +++++++-------
 src/Text/PrettyPrint/Annotated/HughesPJ.hs      | 16 ++++------------
 src/Text/PrettyPrint/Annotated/HughesPJClass.hs |  5 +++--
 4 files changed, 15 insertions(+), 22 deletions(-)

diff --git a/src/Text/PrettyPrint.hs b/src/Text/PrettyPrint.hs
index 0d6b6d4..6c65111 100644
--- a/src/Text/PrettyPrint.hs
+++ b/src/Text/PrettyPrint.hs
@@ -15,7 +15,7 @@
 -- that provides a way to easily print out text in a consistent format
 -- of your choosing.
 --
--- This module should be used as opposed to the "Text.PrettyPrint.HughesPJ"
+-- This module should be used as opposed to the 'Text.PrettyPrint.HughesPJ'
 -- module. Both are equivalent though as this module simply re-exports the
 -- other.
 --
diff --git a/src/Text/PrettyPrint/Annotated.hs b/src/Text/PrettyPrint/Annotated.hs
index dc967e6..a9e5862 100644
--- a/src/Text/PrettyPrint/Annotated.hs
+++ b/src/Text/PrettyPrint/Annotated.hs
@@ -4,20 +4,20 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.PrettyPrint.Annotated
--- Copyright   :  (c) The University of Glasgow 2001
+-- Copyright   :  (c) Trevor Elliott <revor at galois.com> 2015
 -- License     :  BSD-style (see the file LICENSE)
 -- 
 -- Maintainer  :  David Terei <code at davidterei.com>
 -- Stability   :  stable
 -- Portability :  portable
 --
--- Provides a collection of pretty printer combinators, a set of API's
--- that provides a way to easily print out text in a consistent format
--- of your choosing.
+-- This module provides a version of pretty that allows for annotations to be
+-- attached to documents. Annotations are arbitrary pieces of metadata that can
+-- be attached to sub-documents.
 --
--- This module should be used as opposed to the "Text.PrettyPrint.HughesPJ"
--- module. Both are equivalent though as this module simply re-exports the
--- other.
+-- This module should be used as opposed to the
+-- 'Text.PrettyPrint.Annotated.HughesPJ' module. Both are equivalent though as
+-- this module simply re-exports the other.
 --
 -----------------------------------------------------------------------------
 
diff --git a/src/Text/PrettyPrint/Annotated/HughesPJ.hs b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
index dfc48dd..02fe34c 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJ.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJ.hs
@@ -8,24 +8,16 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.PrettyPrint.Annotated.HughesPJ
--- Copyright   :  (c) The University of Glasgow 2001
+-- Copyright   :  (c) Trevor Elliott <revor at galois.com> 2015
 -- License     :  BSD-style (see the file LICENSE)
 --
 -- Maintainer  :  David Terei <code at davidterei.com>
 -- Stability   :  stable
 -- Portability :  portable
 --
--- Provides a collection of pretty printer combinators, a set of API's
--- that provides a way to easily print out text in a consistent format
--- of your choosing.
---
--- Originally designed by John Hughes's and Simon Peyton Jones's.
---
--- For more information you can refer to the
--- <http://belle.sourceforge.net/doc/hughes95design.pdf original paper> that
--- serves as the basis for this libraries design:
--- /The Design -- of a Pretty-printing Library/ by John Hughes, in Advanced
--- Functional Programming, 1995
+-- This module provides a version of pretty that allows for annotations to be
+-- attached to documents. Annotations are arbitrary pieces of metadata that can
+-- be attached to sub-documents.
 --
 -----------------------------------------------------------------------------
 
diff --git a/src/Text/PrettyPrint/Annotated/HughesPJClass.hs b/src/Text/PrettyPrint/Annotated/HughesPJClass.hs
index 4e2b2c7..1aefc49 100644
--- a/src/Text/PrettyPrint/Annotated/HughesPJClass.hs
+++ b/src/Text/PrettyPrint/Annotated/HughesPJClass.hs
@@ -5,7 +5,7 @@
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Text.PrettyPrint.Annotated.HughesPJClass
--- Copyright   :  (c) Lennart Augustsson 2014
+-- Copyright   :  (c) Trevor Elliott <revor at galois.com> 2015
 -- License     :  BSD-style (see the file LICENSE)
 --
 -- Maintainer  :  David Terei <code at davidterei.com>
@@ -15,7 +15,8 @@
 -- Pretty printing class, simlar to 'Show' but nicer looking.
 --
 -- Note that the precedence level is a 'Rational' so there is an unlimited
--- number of levels. This module re-exports 'Text.PrettyPrint.HughesPJ'.
+-- number of levels. This module re-exports
+-- 'Text.PrettyPrint.Annotated.HughesPJ'.
 --
 -----------------------------------------------------------------------------
 


From git at git.haskell.org  Wed Dec 16 07:12:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:12:05 +0000 (UTC)
Subject: [commit: packages/pretty] master: Bump to version 1.1.3.2 (9fd5f2b)
Message-ID: <20151216071205.D6D933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

On branch  : master
Link       : http://git.haskell.org/packages/pretty.git/commitdiff/9fd5f2b596bdfbce0414f973009b579d5d2430fa

>---------------------------------------------------------------

commit 9fd5f2b596bdfbce0414f973009b579d5d2430fa
Author: David Terei <code at davidterei.com>
Date:   Thu Mar 19 02:03:31 2015 -0700

    Bump to version 1.1.3.2


>---------------------------------------------------------------

9fd5f2b596bdfbce0414f973009b579d5d2430fa
 CHANGELOG.md | 9 +++++++++
 pretty.cabal | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1dbdce5..8524efe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Pretty library change log
 
+## 1.1.3.2 -- 19th March, 2015
+
+* Fix bug with haddock documentation.
+* Clean up module intro documentation.
+
+## 1.1.3.1 -- 11th March, 2015
+
+* Add support for annotations in pretty (by Trevor Elliott).
+
 ## 1.1.2.1 -- 25th December, 2014
 
 * Fix overly-strict issue preventing use of pretty for very large
diff --git a/pretty.cabal b/pretty.cabal
index c4ac991..d336635 100644
--- a/pretty.cabal
+++ b/pretty.cabal
@@ -1,5 +1,5 @@
 name:          pretty
-version:       1.1.3.1
+version:       1.1.3.2
 synopsis:      Pretty-printing library
 description:
         This package contains a pretty-printing library, a set of API's


From git at git.haskell.org  Wed Dec 16 07:12:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:12:08 +0000 (UTC)
Subject: [commit: packages/pretty] master's head updated: Bump to version
 1.1.3.2 (9fd5f2b)
Message-ID: <20151216071208.058903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/pretty

Branch 'master' now includes:

     4ce5928 add minimal pragma to pretty class
     912f63c Add appropriate Show, Eq and Generic instances
     ac4c532 fix hslint warnings
     f6b2e75 work around bug with `cabal test`
     ead25e7 remove some unused helper functions from test-suite
     459bca1 fix travis for bug in cabal 1.20
     02503a3 Improve test-suite, merging in GHC tests
     04ca57e Fix compilation under GHC 7.10
     8be7d73 Update changelog
     7eb7c6c Bump to version 1.1.2.0
     dfc5ff9 Add failing test for large vcat
     307b817 Resolve foldr-strictness stack overflow bug
     9ebd518 Put large_doc test (slowest) last
     c57c7a9 Special-case reduce for horiz/vert
     0a0b534 Improve bench1 cabal support
     b036410 Clean up UnitLargeDoc style to be like rest of test-suite
     b093b1e Improve module description for HughesPJ
     9f462e1 Fix missing files from test-suite.
     7deb64c Bump to version 1.1.2.1
     e34ba99 Bump base dependency to >= 4.5 (#18).
     49b786d Add annotations to the Doc type
     a1b780c Build in compatibility with the old pretty API
     08d8913 Export the Annotated modules
     b96d2aa Update the test suite
     aca8d01 Add renderDecorated, and renderDecoratedM
     764213f Make TextDetails strict in the NoAnnot constructor
     b718d1f Merge pull request #19 from elliottt/annotations
     f93bc6f Bump version to 1.1.3.1
     1b06c69 fix a comment that confuses Haddock
     60a5241 test haddock generation in CI
     bfc6295 Merge pull request #24 from osa1/master
     2ce46a5 Clean up module intro documentation.
     9fd5f2b Bump to version 1.1.3.2

From git at git.haskell.org  Wed Dec 16 07:54:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 07:54:00 +0000 (UTC)
Subject: [commit: ghc] master: Update pretty submodule to v1.1.3.2 release
 (50c795c)
Message-ID: <20151216075400.5AC7A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/50c795c1a4ce021652d682b08579596dc458ccbc/ghc

>---------------------------------------------------------------

commit 50c795c1a4ce021652d682b08579596dc458ccbc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 00:12:32 2015 +0100

    Update pretty submodule to v1.1.3.2 release
    
    The `pretty-1.1.3.2` release is the version designated for GHC 8.0.1
    
    /cc @dterei
    
    Differential Revision: https://phabricator.haskell.org/D1633


>---------------------------------------------------------------

50c795c1a4ce021652d682b08579596dc458ccbc
 libraries/pretty | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/pretty b/libraries/pretty
index 7eb7c6c..9fd5f2b 160000
--- a/libraries/pretty
+++ b/libraries/pretty
@@ -1 +1 @@
-Subproject commit 7eb7c6c01be4596da3dae9ca57d8adac37cc33fc
+Subproject commit 9fd5f2b596bdfbce0414f973009b579d5d2430fa


From git at git.haskell.org  Wed Dec 16 09:42:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:16 +0000 (UTC)
Subject: [commit: packages/binary] master: Instance for GHC.Fingerprint,
 which is part of base. (551515e)
Message-ID: <20151216094216.E2B433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/551515ec34daf416b69a17eb843a202662b5b0a1

>---------------------------------------------------------------

commit 551515ec34daf416b69a17eb843a202662b5b0a1
Author: Mathieu Boespflug <m at tweag.io>
Date:   Sat May 23 23:08:57 2015 +0200

    Instance for GHC.Fingerprint, which is part of base.


>---------------------------------------------------------------

551515ec34daf416b69a17eb843a202662b5b0a1
 src/Data/Binary/Class.hs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 2477056..1cba18a 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -77,6 +77,10 @@ import qualified Data.Sequence as Seq
 import qualified Data.Foldable as Fold
 #endif
 
+#if __GLASGOW_HASKELL__ >= 704
+import GHC.Fingerprint
+#endif
+
 ------------------------------------------------------------------------
 
 #ifdef GENERICS
@@ -577,3 +581,17 @@ instance (Binary i, Ix i, Binary e, IArray UArray e) => Binary (UArray i e) wher
         n  <- get
         xs <- getMany n
         return (listArray bs xs)
+
+------------------------------------------------------------------------
+-- Fingerprints
+
+#if __GLASGOW_HASKELL__ >= 704
+instance Binary Fingerprint where
+    put (Fingerprint x1 x2) = do
+        put x1
+        put x2
+    get = do
+        x1 <- get
+        x2 <- get
+        return (Fingerprint x1 x2)
+#endif


From git at git.haskell.org  Wed Dec 16 09:42:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:18 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge branch 'instance-fingerprint'
 of https://github.com/mboes/binary (0cd1529)
Message-ID: <20151216094218.E8D003A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/0cd152901e8d296cfb2994f01a363e23e7d0e469

>---------------------------------------------------------------

commit 0cd152901e8d296cfb2994f01a363e23e7d0e469
Merge: 86e4c9a 551515e
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jun 3 11:37:38 2015 -0700

    Merge branch 'instance-fingerprint' of https://github.com/mboes/binary



>---------------------------------------------------------------

0cd152901e8d296cfb2994f01a363e23e7d0e469
 src/Data/Binary/Class.hs | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)



From git at git.haskell.org  Wed Dec 16 09:42:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:20 +0000 (UTC)
Subject: [commit: packages/binary] master: Force the Fingerprint constructor
 to reduce memory usage. (66146ae)
Message-ID: <20151216094220.EF15A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/66146ae3423fbbd62a24246f591cfba46ce3a0d4

>---------------------------------------------------------------

commit 66146ae3423fbbd62a24246f591cfba46ce3a0d4
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jun 3 11:50:56 2015 -0700

    Force the Fingerprint constructor to reduce memory usage.
    
    The two fields are unpacked, so this saves a couple of words per field
    until the Fingerprint value gets used.


>---------------------------------------------------------------

66146ae3423fbbd62a24246f591cfba46ce3a0d4
 src/Data/Binary/Class.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 8904381..79a30b2 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -599,5 +599,5 @@ instance Binary Fingerprint where
     get = do
         x1 <- get
         x2 <- get
-        return (Fingerprint x1 x2)
+        return $! Fingerprint x1 x2
 #endif


From git at git.haskell.org  Wed Dec 16 09:42:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:23 +0000 (UTC)
Subject: [commit: packages/binary] master: Add roundtrip tests for
 GHC.Fingerprint. (2a84d67)
Message-ID: <20151216094223.019EB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/2a84d6707a72fb21891ba842bcfff240d52e16cb

>---------------------------------------------------------------

commit 2a84d6707a72fb21891ba842bcfff240d52e16cb
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jun 3 11:52:46 2015 -0700

    Add roundtrip tests for GHC.Fingerprint.


>---------------------------------------------------------------

2a84d6707a72fb21891ba842bcfff240d52e16cb
 src/Data/Binary/Class.hs |  8 ++++++--
 tests/QC.hs              | 25 +++++++++++++++++++++++--
 2 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 79a30b2..4259165 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -10,6 +10,10 @@
 #define HAS_NATURAL
 #endif
 
+#if __GLASGOW_HASKELL__ >= 704
+#define HAS_GHC_FINGERPRINT
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Data.Binary.Class
@@ -77,7 +81,7 @@ import qualified Data.Sequence as Seq
 import qualified Data.Foldable as Fold
 #endif
 
-#if __GLASGOW_HASKELL__ >= 704
+#ifdef HAS_GHC_FINGERPRINT
 import GHC.Fingerprint
 #endif
 
@@ -591,7 +595,7 @@ instance (Binary i, Ix i, Binary e, IArray UArray e) => Binary (UArray i e) wher
 ------------------------------------------------------------------------
 -- Fingerprints
 
-#if __GLASGOW_HASKELL__ >= 704
+#ifdef HAS_GHC_FINGERPRINT
 instance Binary Fingerprint where
     put (Fingerprint x1 x2) = do
         put x1
diff --git a/tests/QC.hs b/tests/QC.hs
index addf185..58991a4 100644
--- a/tests/QC.hs
+++ b/tests/QC.hs
@@ -5,10 +5,14 @@ module Main ( main ) where
 #define HAS_NATURAL
 #endif
 
+#if __GLASGOW_HASKELL__ >= 704
+#define HAS_GHC_FINGERPRINT
+#endif
+
 import           Control.Applicative
 import           Control.Exception                    as C (SomeException,
                                                             catch, evaluate)
-import           Control.Monad                        (unless)
+import           Control.Monad                        (unless, liftM2)
 import qualified Data.ByteString                      as B
 import qualified Data.ByteString.Lazy                 as L
 import qualified Data.ByteString.Lazy.Internal        as L
@@ -20,6 +24,10 @@ import           System.IO.Unsafe
 import           Numeric.Natural
 #endif
 
+#ifdef HAS_GHC_FINGERPRINT
+import           GHC.Fingerprint
+#endif
+
 import           Test.Framework
 import           Test.Framework.Providers.QuickCheck2
 import           Test.QuickCheck
@@ -376,6 +384,16 @@ prop_test_Natural = forAll (gen :: Gen Natural) test
 
 ------------------------------------------------------------------------
 
+#ifdef HAS_GHC_FINGERPRINT
+prop_test_GHC_Fingerprint :: Property
+prop_test_GHC_Fingerprint = forAll gen test
+  where
+    gen :: Gen Fingerprint
+    gen = liftM2 Fingerprint arbitrary arbitrary
+#endif
+
+------------------------------------------------------------------------
+
 type T a = a -> Property
 type B a = a -> Bool
 
@@ -454,7 +472,10 @@ tests =
             , ("Int",        p (test :: T Int                    ))
             , ("Integer",    p (test :: T Integer                ))
 #ifdef HAS_NATURAL
-            , ("Natural",      (prop_test_Natural :: Property    ))
+            , ("Natural",         prop_test_Natural               )
+#endif
+#ifdef HAS_GHC_FINGERPRINT
+            , ("GHC.Fingerprint", prop_test_GHC_Fingerprint       )
 #endif
 
             , ("Float",      p (test :: T Float                  ))


From git at git.haskell.org  Wed Dec 16 09:42:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:25 +0000 (UTC)
Subject: [commit: packages/binary] master: Add Show instance for Fingerprint
 on GHC < 7.8. (8debedd)
Message-ID: <20151216094225.07DD73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/8debedd3fcb6525ac0d7de2dd49217dce2abc0d9

>---------------------------------------------------------------

commit 8debedd3fcb6525ac0d7de2dd49217dce2abc0d9
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jun 3 14:46:21 2015 -0700

    Add Show instance for Fingerprint on GHC < 7.8.
    
    'forAll' needs Fingerprint to have a Show instance.
    Starting from GHC 7.8 (base-4.7) Fingerprint has a Show instance, but
    for older versions we need to provide one ourselves.


>---------------------------------------------------------------

8debedd3fcb6525ac0d7de2dd49217dce2abc0d9
 tests/QC.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/tests/QC.hs b/tests/QC.hs
index 58991a4..493d2aa 100644
--- a/tests/QC.hs
+++ b/tests/QC.hs
@@ -390,6 +390,10 @@ prop_test_GHC_Fingerprint = forAll gen test
   where
     gen :: Gen Fingerprint
     gen = liftM2 Fingerprint arbitrary arbitrary
+#if !MIN_VERSION_base(4,7,0)
+instance Show Fingerprint where
+  show (Fingerprint x1 x2) = show (x1,x2)
+#endif
 #endif
 
 ------------------------------------------------------------------------


From git at git.haskell.org  Wed Dec 16 09:42:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:27 +0000 (UTC)
Subject: [commit: packages/binary] master: Fix AMP and Safe Haskell related
 warnings in GHC 7.10. (7524d87)
Message-ID: <20151216094227.0EACD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/7524d87040395793375c8752ef2ae4314d8d69f5

>---------------------------------------------------------------

commit 7524d87040395793375c8752ef2ae4314d8d69f5
Author: Mathieu Boespflug <m at tweag.io>
Date:   Sat Jun 6 23:30:05 2015 +0200

    Fix AMP and Safe Haskell related warnings in GHC 7.10.


>---------------------------------------------------------------

7524d87040395793375c8752ef2ae4314d8d69f5
 src/Data/Binary/Builder/Base.hs     | 1 +
 src/Data/Binary/Builder/Internal.hs | 2 +-
 src/Data/Binary/Generic.hs          | 1 +
 src/Data/Binary/Get.hs              | 2 --
 src/Data/Binary/Put.hs              | 1 +
 5 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
index 897aa2b..c4f0790 100644
--- a/src/Data/Binary/Builder/Base.hs
+++ b/src/Data/Binary/Builder/Base.hs
@@ -87,6 +87,7 @@ import GHC.Word (Word32(..),Word16(..),Word64(..))
 import GHC.Word (uncheckedShiftRL64#)
 # endif
 #endif
+import Prelude -- Silence AMP warning.
 
 ------------------------------------------------------------------------
 
diff --git a/src/Data/Binary/Builder/Internal.hs b/src/Data/Binary/Builder/Internal.hs
index c9d2fbf..2a28539 100644
--- a/src/Data/Binary/Builder/Internal.hs
+++ b/src/Data/Binary/Builder/Internal.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index a2eb6ea..e1a3a1c 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -26,6 +26,7 @@ import Data.Binary.Put
 import Data.Bits
 import Data.Word
 import GHC.Generics
+import Prelude -- Silence AMP warning.
 
 -- Type without constructors
 instance GBinary V1 where
diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
index afff081..0541efb 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/Data/Binary/Get.hs
@@ -203,8 +203,6 @@ import qualified Data.ByteString.Unsafe as B
 import qualified Data.ByteString.Lazy as L
 import qualified Data.ByteString.Lazy.Internal as L
 
-import Control.Applicative
-
 import Data.Binary.Get.Internal hiding ( Decoder(..), runGetIncremental )
 import qualified Data.Binary.Get.Internal as I
 
diff --git a/src/Data/Binary/Put.hs b/src/Data/Binary/Put.hs
index 38a1b31..004c15a 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/Data/Binary/Put.hs
@@ -62,6 +62,7 @@ import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
 
 import Control.Applicative
+import Prelude -- Silence AMP warning.
 
 
 ------------------------------------------------------------------------


From git at git.haskell.org  Wed Dec 16 09:42:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:29 +0000 (UTC)
Subject: [commit: packages/binary] master: Declare a few modules as Safe
 rather than Trustworthy. (5714385)
Message-ID: <20151216094229.145963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/571438513fdf060e56fd73883c590a926fdde948

>---------------------------------------------------------------

commit 571438513fdf060e56fd73883c590a926fdde948
Author: Mathieu Boespflug <m at tweag.io>
Date:   Sat Jun 6 23:31:29 2015 +0200

    Declare a few modules as Safe rather than Trustworthy.
    
    This silences a GHC 7.10 warning that indicates that these modules are
    marked trustworthy when in fact they don't need to, since they are safe.


>---------------------------------------------------------------

571438513fdf060e56fd73883c590a926fdde948
 src/Data/Binary/Class.hs   | 5 +++--
 src/Data/Binary/Generic.hs | 2 +-
 src/Data/Binary/Put.hs     | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 4259165..0807c5f 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP, FlexibleContexts #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 #ifdef GENERICS
 {-# LANGUAGE DefaultSignatures #-}
@@ -41,12 +41,13 @@ module Data.Binary.Class (
     ) where
 
 import Data.Word
+import Data.Bits
+import Data.Int
 
 import Data.Binary.Put
 import Data.Binary.Get
 
 import Control.Monad
-import Foreign
 
 import Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index e1a3a1c..2077772 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE BangPatterns, CPP, FlexibleInstances, KindSignatures,
-    ScopedTypeVariables, Trustworthy, TypeOperators, TypeSynonymInstances #-}
+    ScopedTypeVariables, Safe, TypeOperators, TypeSynonymInstances #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -----------------------------------------------------------------------------
diff --git a/src/Data/Binary/Put.hs b/src/Data/Binary/Put.hs
index 004c15a..112d145 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/Data/Binary/Put.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ >= 701
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 
 -----------------------------------------------------------------------------


From git at git.haskell.org  Wed Dec 16 09:42:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:31 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #77 from
 mboes/ghc710-warnings (6892225)
Message-ID: <20151216094231.1ACA23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/6892225ebc38c8bb7fee85b903fafcae3cbbfd8e

>---------------------------------------------------------------

commit 6892225ebc38c8bb7fee85b903fafcae3cbbfd8e
Merge: 8debedd 5714385
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Jun 7 20:17:31 2015 -0700

    Merge pull request #77 from mboes/ghc710-warnings
    
    Fix AMP and Safe Haskell related warnings in GHC 7.10.



>---------------------------------------------------------------

6892225ebc38c8bb7fee85b903fafcae3cbbfd8e
 src/Data/Binary/Builder/Base.hs     | 1 +
 src/Data/Binary/Builder/Internal.hs | 2 +-
 src/Data/Binary/Class.hs            | 5 +++--
 src/Data/Binary/Generic.hs          | 3 ++-
 src/Data/Binary/Get.hs              | 2 --
 src/Data/Binary/Put.hs              | 3 ++-
 6 files changed, 9 insertions(+), 7 deletions(-)


From git at git.haskell.org  Wed Dec 16 09:42:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:33 +0000 (UTC)
Subject: [commit: packages/binary] master: Add changelog.md to 'cabal sdist'
 (fb98a5b)
Message-ID: <20151216094233.20C443A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/fb98a5b15880aca220caeca3f5c404adb6a35eaf

>---------------------------------------------------------------

commit fb98a5b15880aca220caeca3f5c404adb6a35eaf
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jul 8 16:10:13 2015 +0200

    Add changelog.md to 'cabal sdist'
    
    Should fix issue #80.


>---------------------------------------------------------------

fb98a5b15880aca220caeca3f5c404adb6a35eaf
 binary.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/binary.cabal b/binary.cabal
index f8ccb69..a8a65a8 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -20,7 +20,7 @@ build-type:      Simple
 cabal-version:   >= 1.8
 tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.2, GHC == 7.10.1
 extra-source-files:
-  README.md docs/hcar/binary-Lb.tex tools/derive/*.hs
+  README.md changelog.md docs/hcar/binary-Lb.tex tools/derive/*.hs
 
 -- from the benchmark 'bench'
 extra-source-files:


From git at git.haskell.org  Wed Dec 16 09:42:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:35 +0000 (UTC)
Subject: [commit: packages/binary] master: Bump version to 0.7.6.0. (23b5911)
Message-ID: <20151216094235.2720A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/23b59113a757e05446f236fb76e965f1c18f1b7e

>---------------------------------------------------------------

commit 23b59113a757e05446f236fb76e965f1c18f1b7e
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Mon Jul 27 13:59:19 2015 +0200

    Bump version to 0.7.6.0.


>---------------------------------------------------------------

23b59113a757e05446f236fb76e965f1c18f1b7e
 binary.cabal | 2 +-
 changelog.md | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/binary.cabal b/binary.cabal
index a8a65a8..8109975 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -1,5 +1,5 @@
 name:            binary
-version:         0.7.5.0
+version:         0.7.6.0
 license:         BSD3
 license-file:    LICENSE
 author:          Lennart Kolmodin <kolmodin at gmail.com>
diff --git a/changelog.md b/changelog.md
index 6763f96..1bf50de 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 binary
 ======
 
+binary-0.7.6.0
+--------------
+
+- Added binary instance for GHC.Fingerprint (from GHC >= 7.4).
+
 binary-0.7.5.0
 --------------
 


From git at git.haskell.org  Wed Dec 16 09:42:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:37 +0000 (UTC)
Subject: [commit: packages/binary] master: Update Travis CI to use GHC 7.8.3
 -> 7.8.4. (cd7030e)
Message-ID: <20151216094237.2D58A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/cd7030ebfdc58867018e35eb56fa7ffef1eeced9

>---------------------------------------------------------------

commit cd7030ebfdc58867018e35eb56fa7ffef1eeced9
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Tue Jul 28 13:25:48 2015 +0200

    Update Travis CI to use GHC 7.8.3 -> 7.8.4.


>---------------------------------------------------------------

cd7030ebfdc58867018e35eb56fa7ffef1eeced9
 .travis.yml  | 2 +-
 binary.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index eb66f2c..a405342 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,7 +4,7 @@
 env:
  - CABALVER=1.18 GHCVER=7.4.2
  - CABALVER=1.18 GHCVER=7.6.3
- - CABALVER=1.18 GHCVER=7.8.3
+ - CABALVER=1.18 GHCVER=7.8.4
  - CABALVER=1.22 GHCVER=7.10.1
 
 before_install:
diff --git a/binary.cabal b/binary.cabal
index 8109975..78dc074 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -18,7 +18,7 @@ category:        Data, Parsing
 stability:       provisional
 build-type:      Simple
 cabal-version:   >= 1.8
-tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.2, GHC == 7.10.1
+tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.1
 extra-source-files:
   README.md changelog.md docs/hcar/binary-Lb.tex tools/derive/*.hs
 


From git at git.haskell.org  Wed Dec 16 09:42:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:39 +0000 (UTC)
Subject: [commit: packages/binary] master: Don't mark modules using bytestring
 as safe on GHC 7.2 to fix compilation (fb381cc)
Message-ID: <20151216094239.356433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/fb381cc6b8bbe23a87cb48c8a5681990bf522d2a

>---------------------------------------------------------------

commit fb381cc6b8bbe23a87cb48c8a5681990bf522d2a
Author: Adam Bergmark <adam at bergmark.nl>
Date:   Wed Jul 29 17:13:50 2015 +0200

    Don't mark modules using bytestring as safe on GHC 7.2 to fix compilation


>---------------------------------------------------------------

fb381cc6b8bbe23a87cb48c8a5681990bf522d2a
 src/Data/Binary/Class.hs   | 2 +-
 src/Data/Binary/Generic.hs | 5 ++++-
 src/Data/Binary/Put.hs     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 0807c5f..37117f7 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP, FlexibleContexts #-}
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ >= 701 && __GLASGOW_HASKELL__ != 702
 {-# LANGUAGE Safe #-}
 #endif
 #ifdef GENERICS
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index 2077772..3f8edb3 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -1,5 +1,8 @@
 {-# LANGUAGE BangPatterns, CPP, FlexibleInstances, KindSignatures,
-    ScopedTypeVariables, Safe, TypeOperators, TypeSynonymInstances #-}
+    ScopedTypeVariables, TypeOperators, TypeSynonymInstances #-}
+#if __GLASGOW_HASKELL__ >= 701 && __GLASGOW_HASKELL__ != 702
+{-# LANGUAGE Safe #-}
+#endif
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 -----------------------------------------------------------------------------
diff --git a/src/Data/Binary/Put.hs b/src/Data/Binary/Put.hs
index 112d145..5ada9b2 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/Data/Binary/Put.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-#if __GLASGOW_HASKELL__ >= 701
+#if __GLASGOW_HASKELL__ >= 701 && __GLASGOW_HASKELL__ != 702
 {-# LANGUAGE Safe #-}
 #endif
 


From git at git.haskell.org  Wed Dec 16 09:42:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:41 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #83 from
 bergmark/ghc72 (6e636f4)
Message-ID: <20151216094241.3B1C73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/6e636f468701ed82b3e79eda9129215fc0f4ef68

>---------------------------------------------------------------

commit 6e636f468701ed82b3e79eda9129215fc0f4ef68
Merge: cd7030e fb381cc
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Wed Jul 29 19:31:45 2015 +0200

    Merge pull request #83 from bergmark/ghc72
    
    Don't mark modules using bytestring as safe on GHC 7.2 to fix compilation



>---------------------------------------------------------------

6e636f468701ed82b3e79eda9129215fc0f4ef68
 src/Data/Binary/Class.hs   | 2 +-
 src/Data/Binary/Generic.hs | 5 ++++-
 src/Data/Binary/Put.hs     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)


From git at git.haskell.org  Wed Dec 16 09:42:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:43 +0000 (UTC)
Subject: [commit: packages/binary] master: Bump version to 0.7.6.1. (cfd4680)
Message-ID: <20151216094243.40F1B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/cfd4680104d44982605d9c985bb2ebc4c0abe304

>---------------------------------------------------------------

commit cfd4680104d44982605d9c985bb2ebc4c0abe304
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Jul 29 19:36:28 2015 +0200

    Bump version to 0.7.6.1.


>---------------------------------------------------------------

cfd4680104d44982605d9c985bb2ebc4c0abe304
 binary.cabal | 2 +-
 changelog.md | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/binary.cabal b/binary.cabal
index 78dc074..59b55b6 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -1,5 +1,5 @@
 name:            binary
-version:         0.7.6.0
+version:         0.7.6.1
 license:         BSD3
 license-file:    LICENSE
 author:          Lennart Kolmodin <kolmodin at gmail.com>
diff --git a/changelog.md b/changelog.md
index 1bf50de..493a50a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 binary
 ======
 
+binary-0.7.6.1
+--------------
+
+- Fix compilation for GHC == 7.2.*.
+
 binary-0.7.6.0
 --------------
 


From git at git.haskell.org  Wed Dec 16 09:42:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:45 +0000 (UTC)
Subject: [commit: packages/binary] master: Use GHC 7.10.2 on Travis CI instead
 of GHC 7.10.1. (cd675bb)
Message-ID: <20151216094245.4745E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/cd675bb30acd66b1301e7f4ac721e1440e1858df

>---------------------------------------------------------------

commit cd675bb30acd66b1301e7f4ac721e1440e1858df
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Jul 30 10:17:25 2015 +0200

    Use GHC 7.10.2 on Travis CI instead of GHC 7.10.1.


>---------------------------------------------------------------

cd675bb30acd66b1301e7f4ac721e1440e1858df
 .travis.yml  | 2 +-
 binary.cabal | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a405342..d77d543 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ env:
  - CABALVER=1.18 GHCVER=7.4.2
  - CABALVER=1.18 GHCVER=7.6.3
  - CABALVER=1.18 GHCVER=7.8.4
- - CABALVER=1.22 GHCVER=7.10.1
+ - CABALVER=1.22 GHCVER=7.10.2
 
 before_install:
  - sudo add-apt-repository -y ppa:hvr/ghc
diff --git a/binary.cabal b/binary.cabal
index 59b55b6..c88993b 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -18,7 +18,7 @@ category:        Data, Parsing
 stability:       provisional
 build-type:      Simple
 cabal-version:   >= 1.8
-tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.1
+tested-with:     GHC == 7.4.2, GHC == 7.6.3, GHC == 7.8.4, GHC == 7.10.2
 extra-source-files:
   README.md changelog.md docs/hcar/binary-Lb.tex tools/derive/*.hs
 


From git at git.haskell.org  Wed Dec 16 09:42:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:47 +0000 (UTC)
Subject: [commit: packages/binary] master: Inline flush late to give the RULES
 a chanse to act (bbebc9a)
Message-ID: <20151216094247.4E38A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/bbebc9a58906a98cf8a734fc8c270ffc941ed654

>---------------------------------------------------------------

commit bbebc9a58906a98cf8a734fc8c270ffc941ed654
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Jul 30 18:55:21 2015 +0200

    Inline flush late to give the RULES a chanse to act
    
    RULE:
      append flush flush = flush


>---------------------------------------------------------------

bbebc9a58906a98cf8a734fc8c270ffc941ed654
 src/Data/Binary/Builder/Base.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
index c4f0790..a1f46b5 100644
--- a/src/Data/Binary/Builder/Base.hs
+++ b/src/Data/Binary/Builder/Base.hs
@@ -191,6 +191,7 @@ flush = Builder $ \ k buf@(Buffer p o u l) ->
       else let !b  = Buffer p (o+u) 0 l
                !bs = S.PS p o u
            in return $! L.Chunk bs (inlinePerformIO (k b))
+{-# INLINE [0] flush #-}
 
 ------------------------------------------------------------------------
 


From git at git.haskell.org  Wed Dec 16 09:42:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:49 +0000 (UTC)
Subject: [commit: packages/binary] master: Mark INLINEs with a phase to remove
 warning. (112a1a5)
Message-ID: <20151216094249.5438D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/112a1a5d6d8069cd227d51d99a142da64f0a61aa

>---------------------------------------------------------------

commit 112a1a5d6d8069cd227d51d99a142da64f0a61aa
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Jul 30 18:56:51 2015 +0200

    Mark INLINEs with a phase to remove warning.
    
    The warnings are like this;
    Rule "getWord16le/readN" may never fire
      because ?getWord16le? might inline first
    
    The RULES do the same thing as the inlining, so either one is fine.
    Specifying a phase removes the warning.


>---------------------------------------------------------------

112a1a5d6d8069cd227d51d99a142da64f0a61aa
 src/Data/Binary/Get.hs | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
index 0541efb..091a14c 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/Data/Binary/Get.hs
@@ -409,7 +409,7 @@ getPtr n = readNWith n peek
 -- | Read a Word8 from the monad state
 getWord8 :: Get Word8
 getWord8 = readN 1 B.unsafeHead
-{-# INLINE getWord8 #-}
+{-# INLINE[2] getWord8 #-}
 
 -- force GHC to inline getWordXX
 {-# RULES
@@ -429,7 +429,7 @@ word16be :: B.ByteString -> Word16
 word16be = \s ->
         (fromIntegral (s `B.unsafeIndex` 0) `shiftl_w16` 8) .|.
         (fromIntegral (s `B.unsafeIndex` 1))
-{-# INLINE getWord16be #-}
+{-# INLINE[2] getWord16be #-}
 {-# INLINE word16be #-}
 
 -- | Read a Word16 in little endian format
@@ -440,7 +440,7 @@ word16le :: B.ByteString -> Word16
 word16le = \s ->
               (fromIntegral (s `B.unsafeIndex` 1) `shiftl_w16` 8) .|.
               (fromIntegral (s `B.unsafeIndex` 0) )
-{-# INLINE getWord16le #-}
+{-# INLINE[2] getWord16le #-}
 {-# INLINE word16le #-}
 
 -- | Read a Word32 in big endian format
@@ -453,7 +453,7 @@ word32be = \s ->
               (fromIntegral (s `B.unsafeIndex` 1) `shiftl_w32` 16) .|.
               (fromIntegral (s `B.unsafeIndex` 2) `shiftl_w32`  8) .|.
               (fromIntegral (s `B.unsafeIndex` 3) )
-{-# INLINE getWord32be #-}
+{-# INLINE[2] getWord32be #-}
 {-# INLINE word32be #-}
 
 -- | Read a Word32 in little endian format
@@ -466,7 +466,7 @@ word32le = \s ->
               (fromIntegral (s `B.unsafeIndex` 2) `shiftl_w32` 16) .|.
               (fromIntegral (s `B.unsafeIndex` 1) `shiftl_w32`  8) .|.
               (fromIntegral (s `B.unsafeIndex` 0) )
-{-# INLINE getWord32le #-}
+{-# INLINE[2] getWord32le #-}
 {-# INLINE word32le #-}
 
 -- | Read a Word64 in big endian format
@@ -483,7 +483,7 @@ word64be = \s ->
               (fromIntegral (s `B.unsafeIndex` 5) `shiftl_w64` 16) .|.
               (fromIntegral (s `B.unsafeIndex` 6) `shiftl_w64`  8) .|.
               (fromIntegral (s `B.unsafeIndex` 7) )
-{-# INLINE getWord64be #-}
+{-# INLINE[2] getWord64be #-}
 {-# INLINE word64be #-}
 
 -- | Read a Word64 in little endian format
@@ -500,7 +500,7 @@ word64le = \s ->
               (fromIntegral (s `B.unsafeIndex` 2) `shiftl_w64` 16) .|.
               (fromIntegral (s `B.unsafeIndex` 1) `shiftl_w64`  8) .|.
               (fromIntegral (s `B.unsafeIndex` 0) )
-{-# INLINE getWord64le #-}
+{-# INLINE[2] getWord64le #-}
 {-# INLINE word64le #-}
 
 ------------------------------------------------------------------------


From git at git.haskell.org  Wed Dec 16 09:42:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:51 +0000 (UTC)
Subject: [commit: packages/binary] master: Silence some warnings in
 benchmarks/Get.hs (76d2475)
Message-ID: <20151216094251.599693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/76d2475f47dbbecc6aced2a4799db5ade11c392b

>---------------------------------------------------------------

commit 76d2475f47dbbecc6aced2a4799db5ade11c392b
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Sun Aug 9 17:49:26 2015 +0200

    Silence some warnings in benchmarks/Get.hs


>---------------------------------------------------------------

76d2475f47dbbecc6aced2a4799db5ade11c392b
 benchmarks/Get.hs | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs
index fd18acf..7a51492 100644
--- a/benchmarks/Get.hs
+++ b/benchmarks/Get.hs
@@ -8,21 +8,17 @@ module Main where
 
 import Control.DeepSeq
 import Control.Exception (evaluate)
-import Control.Monad.Trans (liftIO)
 import Criterion.Main
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as C8
 import qualified Data.ByteString.Lazy as L
 import Data.Char (ord)
-import Data.Monoid (Monoid(mappend, mempty))
-import Data.Word (Word8, Word16, Word32)
+import Data.Word (Word8)
 
 import Control.Applicative
 import Data.Binary.Get
-import Data.Binary ( get )
 
 import qualified Data.Serialize.Get as Cereal
-import qualified Data.Serialize as Cereal
 
 import qualified Data.Attoparsec.ByteString as A
 import qualified Data.Attoparsec.ByteString.Lazy as AL
@@ -86,16 +82,24 @@ main = do
         whnf (runTest (getWord8N16A mega)) oneMegabyteLBS
     ]
 
+checkBracket :: Int -> Int
 checkBracket x | x == bracketCount = x
                | otherwise = error "argh!"
 
+runTest :: Get a -> L.ByteString -> a
 runTest decoder inp = runGet decoder inp
+
+runCereal :: Cereal.Get a -> C8.ByteString -> a
 runCereal decoder inp = case Cereal.runGet decoder inp of
                           Right a -> a
                           Left err -> error err
+
+runAtto :: AL.Parser a -> C8.ByteString -> a
 runAtto decoder inp = case A.parseOnly decoder inp of
                         Right a -> a
                         Left err -> error err
+
+runAttoL :: Show a => AL.Parser a -> L.ByteString -> a
 runAttoL decoder inp = case AL.parse decoder inp of
                         AL.Done _ r -> r
                         a -> error (show a)
@@ -108,15 +112,20 @@ oneMegabyte = S.replicate mega $ fromIntegral $ ord 'a'
 oneMegabyteLBS :: L.ByteString
 oneMegabyteLBS = L.fromChunks [oneMegabyte]
 
+mega :: Int
 mega = 1024 * 1024
 
 -- 100k of brackets
+bracketTest :: L.ByteString -> Int
 bracketTest inp = runTest bracketParser inp
 
 bracketCount :: Int
 bracketCount = fromIntegral $ L.length brackets `div` 2
 
+brackets :: L.ByteString
 brackets = L.fromChunks [C8.concat (L.toChunks bracketsInChunks)]
+
+bracketsInChunks :: L.ByteString
 bracketsInChunks = L.fromChunks (replicate chunksOfBrackets oneChunk)
   where
     oneChunk = "((()((()()))((()(()()()()()()()(((()()()()(()()(()(()())))))()((())())))()())(((())())(()))))()(()))"
@@ -143,9 +152,9 @@ bracketParser_cereal = cont <|> return 0
 bracketParser_atto :: A.Parser Int
 bracketParser_atto = cont <|> return 0
   where
-  cont = do v <- some ( do A.word8 40
+  cont = do v <- some ( do _ <- A.word8 40
                            n <- bracketParser_atto
-                           A.word8 41
+                           _ <- A.word8 41
                            return $! n + 1)
             return $! sum v
 


From git at git.haskell.org  Wed Dec 16 09:42:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:53 +0000 (UTC)
Subject: [commit: packages/binary] master: Change the non-allocating
 benchmarks to allocating. (848a000)
Message-ID: <20151216094253.608283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/848a000cee0e01fcf685f52b93aa77c8d68b7f0b

>---------------------------------------------------------------

commit 848a000cee0e01fcf685f52b93aa77c8d68b7f0b
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Sun Aug 9 18:11:02 2015 +0200

    Change the non-allocating benchmarks to allocating.
    
    Previously we had several non-allocating benchmarks.
    They were not representative to the most common use case where we want
    to save all the decoded input, not just a fraction.
    This patch updates the benchmark to save the decoded input in lists.


>---------------------------------------------------------------

848a000cee0e01fcf685f52b93aa77c8d68b7f0b
 benchmarks/Get.hs | 128 ++++++++++++++++++++++++++++++------------------------
 1 file changed, 71 insertions(+), 57 deletions(-)

diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs
index 7a51492..de0a19f 100644
--- a/benchmarks/Get.hs
+++ b/benchmarks/Get.hs
@@ -159,12 +159,16 @@ bracketParser_atto = cont <|> return 0
             return $! sum v
 
 -- Strict struct of 4 Word8s
-data Struct4 = Struct4 {-# UNPACK #-} !Word8
-                       {-# UNPACK #-} !Word8
-                       {-# UNPACK #-} !Word8
-                       {-# UNPACK #-} !Word8
-               deriving Show
-
+data S2 = S2 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+data S4 = S4 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+data S8 = S8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+             {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+data S16 = S16 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+               {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+               {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+               {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8 {-# UNPACK #-} !Word8
+
+getStruct4 :: Int -> Get [S4]
 getStruct4 = loop []
   where loop acc 0 = return acc
         loop acc n = do
@@ -172,9 +176,10 @@ getStruct4 = loop []
           !w1 <- getWord8
           !w2 <- getWord8
           !w3 <- getWord8
-          let !s = Struct4 w0 w1 w2 w3
+          let !s = S4 w0 w1 w2 w3
           loop (s : acc) (n - 4)
 
+getStruct4_cereal :: Int -> Cereal.Get [S4]
 getStruct4_cereal = loop []
   where loop acc 0 = return acc
         loop acc n = do
@@ -182,9 +187,10 @@ getStruct4_cereal = loop []
           !w1 <- Cereal.getWord8
           !w2 <- Cereal.getWord8
           !w3 <- Cereal.getWord8
-          let !s = Struct4 w0 w1 w2 w3
+          let !s = S4 w0 w1 w2 w3
           loop (s : acc) (n - 4)
 
+getStruct4_atto :: Int -> A.Parser [S4]
 getStruct4_atto = loop []
   where loop acc 0 = return acc
         loop acc n = do
@@ -192,48 +198,53 @@ getStruct4_atto = loop []
           !w1 <- A.anyWord8
           !w2 <- A.anyWord8
           !w3 <- A.anyWord8
-          let !s = Struct4 w0 w1 w2 w3
+          let !s = S4 w0 w1 w2 w3
           loop (s : acc) (n - 4)
 
--- No-allocation loops.
-
-getWord8N1 = loop 0
+getWord8N1 :: Int -> Get [Word8]
+getWord8N1 = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
           s0 <- getWord8
-          loop (s0+s) (n-1)
+          loop (s0:s) (n-1)
 
-getWord8N1_cereal = loop 0
+getWord8N1_cereal :: Int -> Cereal.Get [Word8]
+getWord8N1_cereal = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
           s0 <- Cereal.getWord8
-          loop (s0+s) (n-1)
+          loop (s0:s) (n-1)
 
-getWord8N1_atto = loop 0
+getWord8N1_atto :: Int -> A.Parser [Word8]
+getWord8N1_atto = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
           s0 <- A.anyWord8
-          loop (s0+s) (n-1)
+          loop (s0:s) (n-1)
 
-getWord8N2 = loop 0
+getWord8N2 :: Int -> Get [S2]
+getWord8N2 = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
           s0 <- getWord8
           s1 <- getWord8
-          loop (s0+s1+s) (n-2)
+          let !v = S2 s0 s1
+          loop (v:s) (n-2)
 
-getWord8N2A = loop 0
+getWord8N2A :: Int -> Get [S2]
+getWord8N2A = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
-          v <- (+) <$> getWord8 <*> getWord8
-          loop (s+v) (n-2)
+          !v <- S2 <$> getWord8 <*> getWord8
+          loop (v:s) (n-2)
 
-getWord8N4 = loop 0
+getWord8N4 :: Int -> Get [S4]
+getWord8N4 = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
@@ -241,17 +252,19 @@ getWord8N4 = loop 0
           s1 <- getWord8
           s2 <- getWord8
           s3 <- getWord8
-          loop (s+s0+s1+s2+s3) (n-4)
+          let !v = S4 s0 s1 s2 s3
+          loop (v:s) (n-4)
 
-getWord8N4A = loop 0
+getWord8N4A :: Int -> Get [S4]
+getWord8N4A = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
-          let p !s0 !s1 !s2 !s3 = s0 + s1 + s2 + s3
-          v <- p <$> getWord8 <*> getWord8 <*> getWord8 <*> getWord8
-          loop (s+v) (n-4)
+          !v <- S4 <$> getWord8 <*> getWord8 <*> getWord8 <*> getWord8
+          loop (v:s) (n-4)
 
-getWord8N8 = loop 0
+getWord8N8 :: Int -> Get [S8]
+getWord8N8 = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
@@ -263,15 +276,15 @@ getWord8N8 = loop 0
           s5 <- getWord8
           s6 <- getWord8
           s7 <- getWord8
-          loop (s+s0+s1+s2+s3+s4+s5+s6+s7) (n-8)
+          let !v = S8 s0 s1 s2 s3 s4 s5 s6 s7
+          loop (v:s) (n-8)
 
-getWord8N8A = loop 0
+getWord8N8A :: Int -> Get [S8]
+getWord8N8A = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
-          let p !s0 !s1 !s2 !s3 !s4 !s5 !s6 !s7 =
-                s0 + s1 + s2 + s3 + s4 + s5 + s6 + s7
-          v <- p <$> getWord8
+          !v <- S8 <$> getWord8
                    <*> getWord8
                    <*> getWord8
                    <*> getWord8
@@ -279,9 +292,10 @@ getWord8N8A = loop 0
                    <*> getWord8
                    <*> getWord8
                    <*> getWord8
-          loop (s+v) (n-8)
+          loop (v:s) (n-8)
 
-getWord8N16 = loop 0
+getWord8N16 :: Int -> Get [S16]
+getWord8N16 = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
@@ -301,28 +315,28 @@ getWord8N16 = loop 0
           s13 <- getWord8
           s14 <- getWord8
           s15 <- getWord8
-          loop (s+s0+s1+s2+s3+s4+s5+s6+s7+s8+s9+s10+s11+s12+s13+s14+s15) (n-16)
+          let !v = S16 s0 s1 s2 s3 s4 s5 s6 s7 s8 s9 s10 s11 s12 s13 s14 s15
+          loop (v:s) (n-16)
 
-getWord8N16A = loop 0
+getWord8N16A :: Int -> Get [S16]
+getWord8N16A = loop []
   where loop s n | s `seq` n `seq` False = undefined
         loop s 0 = return s
         loop s n = do
-          let p !s0 !s1 !s2 !s3 !s4 !s5 !s6 !s7 !s8 !s9 !s10 !s11 !s12 !s13 !s14 !s15 =
-                s0 + s1 + s2 + s3 + s4 + s5 + s6 + s7 + s8 + s9 + s10 + s11 + s12 + s13 + s14 + s15
-          !v <- p <$> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-                   <*> getWord8
-          loop (s+v) (n-16)
+          !v <- S16 <$> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+                    <*> getWord8
+          loop (v:s) (n-16)


From git at git.haskell.org  Wed Dec 16 09:42:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:55 +0000 (UTC)
Subject: [commit: packages/binary] master: Structure the benchmarks in the the
 "get" bench in groups. (8c530d7)
Message-ID: <20151216094255.6606E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/8c530d7a31c04e54231fad68e89c6cec13233dad

>---------------------------------------------------------------

commit 8c530d7a31c04e54231fad68e89c6cec13233dad
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Sun Aug 9 18:14:28 2015 +0200

    Structure the  benchmarks in the the "get" bench in groups.


>---------------------------------------------------------------

8c530d7a31c04e54231fad68e89c6cec13233dad
 benchmarks/Get.hs | 91 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 50 insertions(+), 41 deletions(-)

diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs
index de0a19f..26c2f98 100644
--- a/benchmarks/Get.hs
+++ b/benchmarks/Get.hs
@@ -39,47 +39,56 @@ main = do
     rnf oneMegabyteLBS
      ]
   defaultMain
-    [
-      bench "brackets 100kb one chunk input" $
-        whnf (checkBracket . runTest bracketParser) brackets
-    , bench "brackets 100kb in 100 byte chunks" $
-        whnf (checkBracket . runTest bracketParser) bracketsInChunks
-    , bench "Attoparsec lazy-bs brackets 100kb one chunk" $
-        whnf (checkBracket . runAttoL bracketParser_atto) brackets
-    , bench "Attoparsec lazy-bs brackets 100kb in 100 byte chunks" $
-        whnf (checkBracket . runAttoL bracketParser_atto) bracketsInChunks
-    , bench "Attoparsec strict-bs brackets 100kb" $
-        whnf (checkBracket . runAtto bracketParser_atto) $ S.concat (L.toChunks brackets)
-    , bench "Cereal strict-bs brackets 100kb" $
-        whnf (checkBracket . runCereal bracketParser_cereal) $ S.concat (L.toChunks brackets)
-    , bench "Binary getStruct4 1MB struct of 4 word8" $
-        whnf (runTest (getStruct4 mega)) oneMegabyteLBS
-    , bench "Cereal getStruct4 1MB struct of 4 word8" $
-        whnf (runCereal (getStruct4_cereal mega)) oneMegabyte
-    , bench "Attoparsec getStruct4 1MB struct of 4 word8" $
-        whnf (runAtto (getStruct4_atto mega)) oneMegabyte
-    , bench "Binary getWord8 1MB chunk size 1 byte" $
-        whnf (runTest (getWord8N1 mega)) oneMegabyteLBS
-    , bench "Cereal getWord8 1MB chunk size 1 byte" $
-        whnf (runCereal (getWord8N1_cereal mega)) oneMegabyte
-    , bench "Attoparsec getWord8 1MB chunk size 1 byte" $
-        whnf (runAtto (getWord8N1_atto mega)) oneMegabyte
-    , bench "getWord8 1MB chunk size 2 bytes" $
-        whnf (runTest (getWord8N2 mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 4 bytes" $
-        whnf (runTest (getWord8N4 mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 8 bytes" $
-        whnf (runTest (getWord8N8 mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 16 bytes" $
-        whnf (runTest (getWord8N16 mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 2 bytes Applicative" $
-        whnf (runTest (getWord8N2A mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 4 bytes Applicative" $
-        whnf (runTest (getWord8N4A mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 8 bytes Applicative" $
-        whnf (runTest (getWord8N8A mega)) oneMegabyteLBS
-    , bench "getWord8 1MB chunk size 16 bytes Applicative" $
-        whnf (runTest (getWord8N16A mega)) oneMegabyteLBS
+    [ bgroup "brackets"
+        [ bench "Binary 100kb, one chunk" $
+            whnf (checkBracket . runTest bracketParser) brackets
+        , bench "Binary 100kb, 100 byte chunks" $
+            whnf (checkBracket . runTest bracketParser) bracketsInChunks
+        , bench "Attoparsec lazy-bs 100kb, one chunk" $
+            whnf (checkBracket . runAttoL bracketParser_atto) brackets
+        , bench "Attoparsec lazy-bs 100kb, 100 byte chunks" $
+            whnf (checkBracket . runAttoL bracketParser_atto) bracketsInChunks
+        , bench "Attoparsec strict-bs 100kb" $
+            whnf (checkBracket . runAtto bracketParser_atto) $ S.concat (L.toChunks brackets)
+        , bench "Cereal strict-bs 100kb" $
+            whnf (checkBracket . runCereal bracketParser_cereal) $ S.concat (L.toChunks brackets)
+        ]
+    , bgroup "comparison getStruct4, 1MB of struct of 4 Word8s"
+      [ bench "Attoparsec" $
+          whnf (runAtto (getStruct4_atto mega)) oneMegabyte
+      , bench "Binary" $
+          whnf (runTest (getStruct4 mega)) oneMegabyteLBS
+      , bench "Cereal" $
+          whnf (runCereal (getStruct4_cereal mega)) oneMegabyte
+      ]
+    , bgroup "comparison getWord8, 1MB"
+        [ bench "Attoparsec" $
+            whnf (runAtto (getWord8N1_atto mega)) oneMegabyte
+        , bench "Binary" $
+            whnf (runTest (getWord8N1 mega)) oneMegabyteLBS
+        , bench "Cereal" $
+            whnf (runCereal (getWord8N1_cereal mega)) oneMegabyte
+        ]
+    , bgroup "getWord8 1MB"
+        [ bench "chunk size 2 bytes" $
+            whnf (runTest (getWord8N2 mega)) oneMegabyteLBS
+        , bench "chunk size 4 bytes" $
+            whnf (runTest (getWord8N4 mega)) oneMegabyteLBS
+        , bench "chunk size 8 bytes" $
+            whnf (runTest (getWord8N8 mega)) oneMegabyteLBS
+        , bench "chunk size 16 bytes" $
+            whnf (runTest (getWord8N16 mega)) oneMegabyteLBS
+        ]
+    , bgroup "getWord8 1MB Applicative"
+        [ bench "chunk size 2 bytes" $
+            whnf (runTest (getWord8N2A mega)) oneMegabyteLBS
+        , bench "chunk size 4 bytes" $
+            whnf (runTest (getWord8N4A mega)) oneMegabyteLBS
+        , bench "chunk size 8 bytes" $
+            whnf (runTest (getWord8N8A mega)) oneMegabyteLBS
+        , bench "chunk size 16 bytes" $
+            whnf (runTest (getWord8N16A mega)) oneMegabyteLBS
+        ]
     ]
 
 checkBracket :: Int -> Int


From git at git.haskell.org  Wed Dec 16 09:42:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:57 +0000 (UTC)
Subject: [commit: packages/binary] master: Compile benchmark get with -Wall.
 (b72bd25)
Message-ID: <20151216094257.6D0143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/b72bd25c690fcb073c71664df2e3e0d238096a54

>---------------------------------------------------------------

commit b72bd25c690fcb073c71664df2e3e0d238096a54
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Aug 13 22:12:11 2015 +0200

    Compile benchmark get with -Wall.


>---------------------------------------------------------------

b72bd25c690fcb073c71664df2e3e0d238096a54
 binary.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/binary.cabal b/binary.cabal
index c88993b..cf9955e 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -120,7 +120,7 @@ benchmark get
     mtl
   -- build dependencies from using binary source rather than depending on the library
   build-depends: array, containers
-  ghc-options: -O2
+  ghc-options: -O2 -Wall
 
 benchmark builder
   type: exitcode-stdio-1.0


From git at git.haskell.org  Wed Dec 16 09:42:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:42:59 +0000 (UTC)
Subject: [commit: packages/binary] master: Add benchmark for Generic generated
 Binary instances. (6ab893a)
Message-ID: <20151216094259.76A233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/6ab893a8decbabacb3a7c076d9d2f427ed07902c

>---------------------------------------------------------------

commit 6ab893a8decbabacb3a7c076d9d2f427ed07902c
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Aug 13 22:25:19 2015 +0200

    Add benchmark for Generic generated Binary instances.
    
    We use Cabal's PackageDescription as the type to serialize. It is large,
    has many levels of data types, and also uses enums and strings. It's a
    good stress test.
    
    GenericsBench defines criterion benchmarks for serialization and
    deserialization.
    
    In GenericsBenchTypes we derive the Binary instances. PackageDescription
    already defines Binary instances for the system installed Binary, but
    naturally this won't work for the benchmark - we need our own instances
    that are derived from the code in this library.
    
    The data to serialize we get from your
    .cabal/package/hackage.haskell.org/ directory, it's data from hackage,
    not autogenerated.
    GenericsBenchCache makes sure that if we rerun the benchmark we will use
    the same PackageDescriptions, even if the user has executed
    'cabal update' since the last benchmark run.


>---------------------------------------------------------------

6ab893a8decbabacb3a7c076d9d2f427ed07902c
 benchmarks/GenericsBench.hs      | 52 ++++++++++++++++++++++++
 benchmarks/GenericsBenchCache.hs | 86 ++++++++++++++++++++++++++++++++++++++++
 benchmarks/GenericsBenchTypes.hs | 47 ++++++++++++++++++++++
 binary.cabal                     | 27 +++++++++++++
 4 files changed, 212 insertions(+)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6ab893a8decbabacb3a7c076d9d2f427ed07902c

From git at git.haskell.org  Wed Dec 16 09:43:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:01 +0000 (UTC)
Subject: [commit: packages/binary] master: Add new deps to .travis.yml file.
 (160246b)
Message-ID: <20151216094301.7BDD43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/160246b8967de544d39d6218ffe41f7f4d21d28a

>---------------------------------------------------------------

commit 160246b8967de544d39d6218ffe41f7f4d21d28a
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Aug 13 22:39:01 2015 +0200

    Add new deps to .travis.yml file.
    
    Due to the dependency cycle we need to manually preinstall all deps
    before we attempt to configure/build binary.


>---------------------------------------------------------------

160246b8967de544d39d6218ffe41f7f4d21d28a
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index d77d543..bec9245 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -17,7 +17,7 @@ install:
  - cabal update
  - cabal sandbox init
 # can't use "cabal install --only-dependencies --enable-tests --enable-benchmarks" due to dep-cycle
- - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal -j
+ - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal 'Cabal == 1.22.*' tar zlib -j
 
 script:
  - cabal configure --enable-tests --enable-benchmarks -v2 --ghc-options=-fno-spec-constr


From git at git.haskell.org  Wed Dec 16 09:43:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:03 +0000 (UTC)
Subject: [commit: packages/binary] master: Conditionally include <$> for older
 GHC versions. (5a91e0d)
Message-ID: <20151216094303.817233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/5a91e0d8b7ef5150b268b52536751f44c4a9a052

>---------------------------------------------------------------

commit 5a91e0d8b7ef5150b268b52536751f44c4a9a052
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Fri Aug 14 12:56:59 2015 +0200

    Conditionally include <$> for older GHC versions.


>---------------------------------------------------------------

5a91e0d8b7ef5150b268b52536751f44c4a9a052
 benchmarks/GenericsBenchCache.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/benchmarks/GenericsBenchCache.hs b/benchmarks/GenericsBenchCache.hs
index 1b6f041..d65e731 100644
--- a/benchmarks/GenericsBenchCache.hs
+++ b/benchmarks/GenericsBenchCache.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE DeriveGeneric, StandaloneDeriving, BangPatterns #-}
+{-# LANGUAGE DeriveGeneric, StandaloneDeriving, BangPatterns, CPP #-}
 module GenericsBenchCache (readPackageDescriptionCache) where
 
 import qualified Text.ParserCombinators.ReadP                  as Read
@@ -20,6 +20,9 @@ import           System.Exit
 
 import           GenericsBenchTypes                            ()
 
+#if ! MIN_VERSION_base(4,8,0)
+import           Control.Applicative                           ((<$>))
+#endif
 
 readTar :: String -> Int -> IO [PackageDescription]
 readTar tarPath limit = do


From git at git.haskell.org  Wed Dec 16 09:43:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:05 +0000 (UTC)
Subject: [commit: packages/binary] master: Conditionally include
 Control.Applicative for older GHC versions. (e07fccb)
Message-ID: <20151216094305.884FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/e07fccbe9935b0e7a0c1487bdae40cb0c1706656

>---------------------------------------------------------------

commit e07fccbe9935b0e7a0c1487bdae40cb0c1706656
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Fri Aug 14 22:22:42 2015 +0200

    Conditionally include Control.Applicative for older GHC versions.


>---------------------------------------------------------------

e07fccbe9935b0e7a0c1487bdae40cb0c1706656
 tests/File.hs | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/tests/File.hs b/tests/File.hs
index 1998bc6..1ec631b 100644
--- a/tests/File.hs
+++ b/tests/File.hs
@@ -1,14 +1,18 @@
+{-# LANGUAGE CPP #-}
 module Main where
 
-import Control.Applicative
-import Test.HUnit
-import System.Directory ( getTemporaryDirectory )
-import System.FilePath ( (</>) )
+#if ! MIN_VERSION_base(4,8,0)
+import           Control.Applicative
+#endif
 
-import Distribution.Simple.Utils ( withTempDirectory )
-import Distribution.Verbosity ( silent )
+import           System.Directory          (getTemporaryDirectory)
+import           System.FilePath           ((</>))
+import           Test.HUnit
 
-import Data.Binary
+import           Distribution.Simple.Utils (withTempDirectory)
+import           Distribution.Verbosity    (silent)
+
+import           Data.Binary
 
 data Foo = Bar !Word32 !Word32 !Word32 deriving (Eq, Show)
 


From git at git.haskell.org  Wed Dec 16 09:43:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:07 +0000 (UTC)
Subject: [commit: packages/binary] master: Conditionally include Data.Monoid
 for older GHC versions. (f9ff5c3)
Message-ID: <20151216094307.8EFC03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/f9ff5c36f46f4f6d12baf5ab2fce7d553dba712f

>---------------------------------------------------------------

commit f9ff5c36f46f4f6d12baf5ab2fce7d553dba712f
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Fri Aug 14 22:30:16 2015 +0200

    Conditionally include Data.Monoid for older GHC versions.


>---------------------------------------------------------------

f9ff5c36f46f4f6d12baf5ab2fce7d553dba712f
 benchmarks/Builder.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Builder.hs b/benchmarks/Builder.hs
index 042b371..71a202f 100644
--- a/benchmarks/Builder.hs
+++ b/benchmarks/Builder.hs
@@ -6,6 +6,10 @@
 
 module Main (main) where
 
+#if ! MIN_VERSION_base(4,8,0)
+import Data.Monoid (Monoid(mappend, mempty))
+#endif
+
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
@@ -14,7 +18,6 @@ import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as C
 import qualified Data.ByteString.Lazy as L
 import Data.Char (ord)
-import Data.Monoid (Monoid(mappend, mempty))
 import Data.Word (Word8)
 
 import Data.Binary.Builder


From git at git.haskell.org  Wed Dec 16 09:43:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:09 +0000 (UTC)
Subject: [commit: packages/binary] master: Remove unused import. (9f74d40)
Message-ID: <20151216094309.967DA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/9f74d402ce304f58644ee0f56f98d87653a39500

>---------------------------------------------------------------

commit 9f74d402ce304f58644ee0f56f98d87653a39500
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Fri Aug 14 22:31:00 2015 +0200

    Remove unused import.


>---------------------------------------------------------------

9f74d402ce304f58644ee0f56f98d87653a39500
 benchmarks/Builder.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/benchmarks/Builder.hs b/benchmarks/Builder.hs
index 71a202f..ad08e16 100644
--- a/benchmarks/Builder.hs
+++ b/benchmarks/Builder.hs
@@ -12,7 +12,6 @@ import Data.Monoid (Monoid(mappend, mempty))
 
 import Control.DeepSeq
 import Control.Exception (evaluate)
-import Control.Monad.Trans (liftIO)
 import Criterion.Main
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as C


From git at git.haskell.org  Wed Dec 16 09:43:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:11 +0000 (UTC)
Subject: [commit: packages/binary] master: benchmark builder: Specify Int as
 we otherwise default to Integer. (0388304)
Message-ID: <20151216094311.9C2B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/038830410c1880e337cbfd85343ca78d07b11180

>---------------------------------------------------------------

commit 038830410c1880e337cbfd85343ca78d07b11180
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Fri Aug 14 22:31:12 2015 +0200

    benchmark builder: Specify Int as we otherwise default to Integer.
    
    The benchmark executes 25% faster, time which could not be attribute to
    the speed of binary itself.


>---------------------------------------------------------------

038830410c1880e337cbfd85343ca78d07b11180
 benchmarks/Builder.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/Builder.hs b/benchmarks/Builder.hs
index ad08e16..3c48e7b 100644
--- a/benchmarks/Builder.hs
+++ b/benchmarks/Builder.hs
@@ -86,7 +86,7 @@ from4Word8s (x:xs) = singleton x <> singleton x <> singleton x <> singleton x <>
 
 -- Write 100 short, length-prefixed ByteStrings.
 lengthPrefixedBS :: S.ByteString -> Builder
-lengthPrefixedBS bs = loop 100
+lengthPrefixedBS bs = loop (100 :: Int)
   where loop n | n `seq` False = undefined
         loop 0 = mempty
         loop n =


From git at git.haskell.org  Wed Dec 16 09:43:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:13 +0000 (UTC)
Subject: [commit: packages/binary] master: Optimize roll by using foldl'
 instead of foldr (1f643cb)
Message-ID: <20151216094313.A271F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/1f643cbc973751605ec6a3ed0d93a6dab0bd0774

>---------------------------------------------------------------

commit 1f643cbc973751605ec6a3ed0d93a6dab0bd0774
Author: Bas van Dijk <v.dijk.bas at gmail.com>
Date:   Mon Sep 28 22:39:28 2015 +0200

    Optimize roll by using foldl' instead of foldr
    
    The "roll" benchmarks in the get executable show the difference:
    
      get roll
      benchmarking roll/foldr
      time                 547.4 ms   (537.8 ms .. 553.5 ms)
                           1.000 R?   (1.000 R? .. 1.000 R?)
      mean                 549.4 ms   (547.2 ms .. 550.4 ms)
      std dev              1.857 ms   (0.0 s .. 1.896 ms)
      variance introduced by outliers: 19% (moderately inflated)
    
      benchmarking roll/foldl'
      time                 434.7 ms   (426.4 ms .. 443.1 ms)
                           1.000 R?   (1.000 R? .. 1.000 R?)
      mean                 433.7 ms   (432.3 ms .. 434.7 ms)
      std dev              1.472 ms   (0.0 s .. 1.696 ms)
      variance introduced by outliers: 19% (moderately inflated)
    
    The "Integer/decode" benchmark shows the actual decoding speed.
    First the old implementation based on foldr:
    
      get Integer/decode
      benchmarking Integer/decode
      time                 552.9 ms   (540.2 ms .. 569.3 ms)
                           1.000 R?   (1.000 R? .. 1.000 R?)
      mean                 558.2 ms   (556.1 ms .. 559.3 ms)
      std dev              1.824 ms   (0.0 s .. 1.906 ms)
      variance introduced by outliers: 19% (moderately inflated)
    
    The new implementation based on foldl':
    
      get Integer/decode
      benchmarking Integer/decode
      time                 457.5 ms   (406.2 ms .. 505.6 ms)
                           0.998 R?   (0.994 R? .. 1.000 R?)
      mean                 455.9 ms   (448.3 ms .. 462.3 ms)
      std dev              10.11 ms   (0.0 s .. 11.02 ms)
      variance introduced by outliers: 19% (moderately inflated)


>---------------------------------------------------------------

1f643cbc973751605ec6a3ed0d93a6dab0bd0774
 benchmarks/Get.hs        | 34 ++++++++++++++++++++++++++++++++--
 src/Data/Binary/Class.hs |  6 +++---
 2 files changed, 35 insertions(+), 5 deletions(-)

diff --git a/benchmarks/Get.hs b/benchmarks/Get.hs
index 26c2f98..191f585 100644
--- a/benchmarks/Get.hs
+++ b/benchmarks/Get.hs
@@ -12,10 +12,12 @@ import Criterion.Main
 import qualified Data.ByteString as S
 import qualified Data.ByteString.Char8 as C8
 import qualified Data.ByteString.Lazy as L
+import Data.Bits
 import Data.Char (ord)
-import Data.Word (Word8)
+import Data.List (foldl')
 
 import Control.Applicative
+import Data.Binary
 import Data.Binary.Get
 
 import qualified Data.Serialize.Get as Cereal
@@ -36,7 +38,9 @@ main = do
     rnf bracketsInChunks,
     rnf bracketCount,
     rnf oneMegabyte,
-    rnf oneMegabyteLBS
+    rnf oneMegabyteLBS,
+    rnf manyBytes,
+    rnf encodedBigInteger
      ]
   defaultMain
     [ bgroup "brackets"
@@ -89,6 +93,13 @@ main = do
         , bench "chunk size 16 bytes" $
             whnf (runTest (getWord8N16A mega)) oneMegabyteLBS
         ]
+    , bgroup "roll"
+        [ bench "foldr"  $ nf (roll_foldr  :: [Word8] -> Integer) manyBytes
+        , bench "foldl'" $ nf (roll_foldl' :: [Word8] -> Integer) manyBytes
+        ]
+    , bgroup "Integer"
+        [ bench "decode" $ nf (decode :: L.ByteString -> Integer) encodedBigInteger
+        ]
     ]
 
 checkBracket :: Int -> Int
@@ -349,3 +360,22 @@ getWord8N16A = loop []
                     <*> getWord8
                     <*> getWord8
           loop (v:s) (n-16)
+
+manyBytes :: [Word8]
+manyBytes = concat $ replicate 256 [0..255]
+
+bigInteger :: Integer
+bigInteger = roll_foldl' manyBytes
+
+encodedBigInteger :: L.ByteString
+encodedBigInteger = encode bigInteger
+
+roll_foldr :: (Integral a, Num a, Bits a) => [Word8] -> a
+roll_foldr   = foldr unstep 0
+  where
+    unstep b a = a `shiftL` 8 .|. fromIntegral b
+
+roll_foldl' :: (Integral a, Num a, Bits a) => [Word8] -> a
+roll_foldl'   = foldl' unstep 0 . reverse
+  where
+    unstep a b = a `shiftL` 8 .|. fromIntegral b
diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 37117f7..b0f7529 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -53,7 +53,7 @@ import Data.ByteString.Lazy (ByteString)
 import qualified Data.ByteString.Lazy as L
 
 import Data.Char    (ord)
-import Data.List    (unfoldr)
+import Data.List    (unfoldr, foldl')
 
 -- And needed for the instances:
 import qualified Data.ByteString as B
@@ -249,9 +249,9 @@ unroll = unfoldr step
     step i = Just (fromIntegral i, i `shiftR` 8)
 
 roll :: (Integral a, Num a, Bits a) => [Word8] -> a
-roll   = foldr unstep 0
+roll   = foldl' unstep 0 . reverse
   where
-    unstep b a = a `shiftL` 8 .|. fromIntegral b
+    unstep a b = a `shiftL` 8 .|. fromIntegral b
 
 #ifdef HAS_NATURAL
 -- Fixed-size type for a subset of Natural


From git at git.haskell.org  Wed Dec 16 09:43:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:15 +0000 (UTC)
Subject: [commit: packages/binary] master: Add Binary Version instance
 (48c1250)
Message-ID: <20151216094315.A9C173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/48c12500ae34ad6e0d8e23edf81a8d3564bfdb48

>---------------------------------------------------------------

commit 48c12500ae34ad6e0d8e23edf81a8d3564bfdb48
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Fri Oct 2 13:10:49 2015 +0300

    Add Binary Version instance


>---------------------------------------------------------------

48c12500ae34ad6e0d8e23edf81a8d3564bfdb48
 src/Data/Binary/Class.hs | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 37117f7..5aacb5f 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -86,6 +86,8 @@ import qualified Data.Foldable as Fold
 import GHC.Fingerprint
 #endif
 
+import Data.Version (Version(..))
+
 ------------------------------------------------------------------------
 
 #ifdef GENERICS
@@ -606,3 +608,14 @@ instance Binary Fingerprint where
         x2 <- get
         return $! Fingerprint x1 x2
 #endif
+
+------------------------------------------------------------------------
+-- Version
+
+-- | /Since: binary-0.8/
+instance Binary Version where
+    get = do
+        br <- get
+        tags <- get
+        return $ Version br tags
+    put (Version br tags) = put br >> put tags


From git at git.haskell.org  Wed Dec 16 09:43:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:17 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #86 from
 basvandijk/optimize-roll (63d7834)
Message-ID: <20151216094317.B13B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/63d7834f171624113094a4cff6613c9b869699af

>---------------------------------------------------------------

commit 63d7834f171624113094a4cff6613c9b869699af
Merge: 0388304 1f643cb
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Tue Oct 6 15:40:17 2015 +0200

    Merge pull request #86 from basvandijk/optimize-roll
    
    Optimize roll by using foldl' instead of foldr



>---------------------------------------------------------------

63d7834f171624113094a4cff6613c9b869699af
 benchmarks/Get.hs        | 34 ++++++++++++++++++++++++++++++++--
 src/Data/Binary/Class.hs |  6 +++---
 2 files changed, 35 insertions(+), 5 deletions(-)


From git at git.haskell.org  Wed Dec 16 09:43:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:19 +0000 (UTC)
Subject: [commit: packages/binary] master: Add Binary Void instance (57cf1f0)
Message-ID: <20151216094319.B84F13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/57cf1f0460fdc27b8f5783749c90201503a7a87a

>---------------------------------------------------------------

commit 57cf1f0460fdc27b8f5783749c90201503a7a87a
Author: Brian McKenna <bmckenna at atlassian.com>
Date:   Fri Oct 23 14:44:31 2015 +1100

    Add Binary Void instance
    
    This is so that we can write and read things like [Void], or (Expr Void)
    - something I'm actually doing in Morte.
    
    https://github.com/Gabriel439/Haskell-Morte-Library/pull/26
    
    The reader always fails if you actually try to get an instance of it.
    Trying to access a void value should not happen for well-formed
    instances, for example:
    
        *Data.Binary Data.Void> decode $ encode ([] :: [Void]) :: [Void]
        []


>---------------------------------------------------------------

57cf1f0460fdc27b8f5783749c90201503a7a87a
 binary.cabal             | 4 ++++
 src/Data/Binary/Class.hs | 7 +++++++
 2 files changed, 11 insertions(+)

diff --git a/binary.cabal b/binary.cabal
index 37ed51c..503e588 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -50,6 +50,10 @@ library
       -- prior to ghc-7.4 generics lived in ghc-prim
       build-depends: ghc-prim
 
+  if impl(ghc <= 7.8)
+    -- Data.Void was moved to base for 7.10
+    build-depends: void
+
   ghc-options:     -O2 -Wall -fliberate-case-threshold=1000
 
 -- Due to circular dependency, we cannot make any of the test-suites or
diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index b0f7529..9984a93 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -43,6 +43,7 @@ module Data.Binary.Class (
 import Data.Word
 import Data.Bits
 import Data.Int
+import Data.Void
 
 import Data.Binary.Put
 import Data.Binary.Get
@@ -128,6 +129,12 @@ class Binary t where
 ------------------------------------------------------------------------
 -- Simple instances
 
+-- Void never gets written nor reconstructed since it's impossible to have a
+-- value of that type
+instance Binary Void where
+    put     = absurd
+    get     = mzero
+
 -- The () type need never be written to disk: values of singleton type
 -- can be reconstructed from the type alone
 instance Binary () where


From git at git.haskell.org  Wed Dec 16 09:43:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:21 +0000 (UTC)
Subject: [commit: packages/binary] master: Use Travis CI containers. (bf75741)
Message-ID: <20151216094321.BE1713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/bf757416875b1683345e6d55f2dcad3a9b0ae00e

>---------------------------------------------------------------

commit bf757416875b1683345e6d55f2dcad3a9b0ae00e
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Oct 29 17:20:56 2015 +0100

    Use Travis CI containers.


>---------------------------------------------------------------

bf757416875b1683345e6d55f2dcad3a9b0ae00e
 .travis.yml | 31 +++++++++++++++++++++----------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bec9245..56097f2 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,31 @@
-# NB: don't set `language: haskell` here
 # See https://github.com/hvr/multi-ghc-travis for more information
 
-env:
- - CABALVER=1.18 GHCVER=7.4.2
- - CABALVER=1.18 GHCVER=7.6.3
- - CABALVER=1.18 GHCVER=7.8.4
- - CABALVER=1.22 GHCVER=7.10.2
+language: c
+
+sudo: false
+
+matrix:
+  include:
+    - env: CABALVER=1.18 GHCVER=7.4.2
+      addons: {apt: {packages: [cabal-install-1.18,ghc-7.4.2], sources: [hvr-ghc]}}
+    - env: CABALVER=1.18 GHCVER=7.6.3
+      addons: {apt: {packages: [cabal-install-1.18,ghc-7.6.3], sources: [hvr-ghc]}}
+    - env: CABALVER=1.18 GHCVER=7.8.4
+      addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+    - env: CABALVER=1.22 GHCVER=7.10.2
+      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.2], sources: [hvr-ghc]}}
+    - env: CABALVER=head GHCVER=head
+      addons: {apt: {packages: [cabal-install-head,ghc-head],  sources: [hvr-ghc]}}
+
+  allow_failures:
+    - env: CABALVER=head GHCVER=head
 
 before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
- - cabal update
+ - cabal --version
+ - travis_retry cabal update
  - cabal sandbox init
 # can't use "cabal install --only-dependencies --enable-tests --enable-benchmarks" due to dep-cycle
  - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal 'Cabal == 1.22.*' tar zlib -j


From git at git.haskell.org  Wed Dec 16 09:43:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:23 +0000 (UTC)
Subject: [commit: packages/binary] master: Attempt to reduce compile time on
 Travis CI. (0b7abd9)
Message-ID: <20151216094323.C385E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/0b7abd9f8e168382babc43e57621ea25daaa8c4e

>---------------------------------------------------------------

commit 0b7abd9f8e168382babc43e57621ea25daaa8c4e
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Thu Oct 29 18:14:00 2015 +0100

    Attempt to reduce compile time on Travis CI.
    
    As suggested at https://github.com/hvr/multi-ghc-travis, reduce the
    effect of bug https://ghc.haskell.org/trac/ghc/ticket/9221.


>---------------------------------------------------------------

0b7abd9f8e168382babc43e57621ea25daaa8c4e
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 56097f2..cf16df1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -26,6 +26,8 @@ before_install:
 install:
  - cabal --version
  - travis_retry cabal update
+# workaround for https://ghc.haskell.org/trac/ghc/ticket/9221
+ - sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
  - cabal sandbox init
 # can't use "cabal install --only-dependencies --enable-tests --enable-benchmarks" due to dep-cycle
  - cabal install criterion deepseq mtl "QuickCheck >= 2.8" HUnit "test-framework-quickcheck2 >= 0.3" "random >= 1.0.1.0" attoparsec cereal 'Cabal == 1.22.*' tar zlib -j


From git at git.haskell.org  Wed Dec 16 09:43:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:25 +0000 (UTC)
Subject: [commit: packages/binary] master: Only support Void for >= GHC 7.10.
 (0adaed9)
Message-ID: <20151216094325.CB32A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/0adaed92127dde38d5fd9ad584b0e2215f0eb09a

>---------------------------------------------------------------

commit 0adaed92127dde38d5fd9ad584b0e2215f0eb09a
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Nov 11 11:12:14 2015 +0100

    Only support Void for >= GHC 7.10.


>---------------------------------------------------------------

0adaed92127dde38d5fd9ad584b0e2215f0eb09a
 binary.cabal             | 4 ----
 src/Data/Binary/Class.hs | 5 +++++
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/binary.cabal b/binary.cabal
index 503e588..37ed51c 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -50,10 +50,6 @@ library
       -- prior to ghc-7.4 generics lived in ghc-prim
       build-depends: ghc-prim
 
-  if impl(ghc <= 7.8)
-    -- Data.Void was moved to base for 7.10
-    build-depends: void
-
   ghc-options:     -O2 -Wall -fliberate-case-threshold=1000
 
 -- Due to circular dependency, we cannot make any of the test-suites or
diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 9984a93..a022a42 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -8,6 +8,7 @@
 
 #if MIN_VERSION_base(4,8,0)
 #define HAS_NATURAL
+#define HAS_VOID
 #endif
 
 #if __GLASGOW_HASKELL__ >= 704
@@ -43,7 +44,9 @@ module Data.Binary.Class (
 import Data.Word
 import Data.Bits
 import Data.Int
+#ifdef HAS_VOID
 import Data.Void
+#endif
 
 import Data.Binary.Put
 import Data.Binary.Get
@@ -129,11 +132,13 @@ class Binary t where
 ------------------------------------------------------------------------
 -- Simple instances
 
+#ifdef HAS_VOID
 -- Void never gets written nor reconstructed since it's impossible to have a
 -- value of that type
 instance Binary Void where
     put     = absurd
     get     = mzero
+#endif
 
 -- The () type need never be written to disk: values of singleton type
 -- can be reconstructed from the type alone


From git at git.haskell.org  Wed Dec 16 09:43:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:27 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge branch
 'feature/void-binary-instance' (db20135)
Message-ID: <20151216094327.D17093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/db201353ed55c9392670a927a9caaed66035b6c7

>---------------------------------------------------------------

commit db201353ed55c9392670a927a9caaed66035b6c7
Merge: 0b7abd9 0adaed9
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Nov 11 11:51:36 2015 +0100

    Merge branch 'feature/void-binary-instance'



>---------------------------------------------------------------

db201353ed55c9392670a927a9caaed66035b6c7
 src/Data/Binary/Class.hs | 12 ++++++++++++
 1 file changed, 12 insertions(+)


From git at git.haskell.org  Wed Dec 16 09:43:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:29 +0000 (UTC)
Subject: [commit: packages/binary] master: Use applicative form in 'get' for
 Version. (67ccd53)
Message-ID: <20151216094329.D7F2F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/67ccd5398f199f3e92cc7c34dcf0fa47d41c3011

>---------------------------------------------------------------

commit 67ccd5398f199f3e92cc7c34dcf0fa47d41c3011
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Nov 11 16:05:39 2015 +0100

    Use applicative form in 'get' for Version.


>---------------------------------------------------------------

67ccd5398f199f3e92cc7c34dcf0fa47d41c3011
 src/Data/Binary/Class.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 5aacb5f..eb11cb4 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -47,6 +47,9 @@ import Data.Int
 import Data.Binary.Put
 import Data.Binary.Get
 
+#if ! MIN_VERSION_base(4,8,0)
+import Control.Applicative
+#endif
 import Control.Monad
 
 import Data.ByteString.Lazy (ByteString)
@@ -614,8 +617,5 @@ instance Binary Fingerprint where
 
 -- | /Since: binary-0.8/
 instance Binary Version where
-    get = do
-        br <- get
-        tags <- get
-        return $ Version br tags
+    get = Version <$> get <*> get
     put (Version br tags) = put br >> put tags


From git at git.haskell.org  Wed Dec 16 09:43:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:31 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge branch 'phadej/version'
 (6c5d126)
Message-ID: <20151216094331.E01693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/6c5d12623fabee47d044ca3532574c13c7c26c9c

>---------------------------------------------------------------

commit 6c5d12623fabee47d044ca3532574c13c7c26c9c
Merge: db20135 67ccd53
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Nov 11 16:06:23 2015 +0100

    Merge branch 'phadej/version'



>---------------------------------------------------------------

6c5d12623fabee47d044ca3532574c13c7c26c9c
 src/Data/Binary/Class.hs | 13 +++++++++++++
 1 file changed, 13 insertions(+)



From git at git.haskell.org  Wed Dec 16 09:43:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:33 +0000 (UTC)
Subject: [commit: packages/binary] master: Remove duplicate Binary instance of
 Version. (abc306b)
Message-ID: <20151216094333.E57A53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/abc306b5f7bdd8fff2fa95781c458d23491ee66f

>---------------------------------------------------------------

commit abc306b5f7bdd8fff2fa95781c458d23491ee66f
Author: Lennart Kolmodin <kolmodin at google.com>
Date:   Wed Nov 11 17:26:52 2015 +0100

    Remove duplicate Binary instance of Version.


>---------------------------------------------------------------

abc306b5f7bdd8fff2fa95781c458d23491ee66f
 benchmarks/GenericsBenchTypes.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/benchmarks/GenericsBenchTypes.hs b/benchmarks/GenericsBenchTypes.hs
index 4aeb7ba..65f1efa 100644
--- a/benchmarks/GenericsBenchTypes.hs
+++ b/benchmarks/GenericsBenchTypes.hs
@@ -43,5 +43,4 @@ instance Binary SourceRepo
 instance Binary TestSuite
 instance Binary TestSuiteInterface
 instance Binary TestType
-instance Binary Version
 instance Binary VersionRange


From git at git.haskell.org  Wed Dec 16 09:43:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:35 +0000 (UTC)
Subject: [commit: packages/binary] master: Bump version to 0.8.0.0 (43ee092)
Message-ID: <20151216094335.EB1923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/43ee092f022517222e1573f9c9468aa0b6a2cc00

>---------------------------------------------------------------

commit 43ee092f022517222e1573f9c9468aa0b6a2cc00
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Thu Nov 12 06:34:22 2015 +0200

    Bump version to 0.8.0.0


>---------------------------------------------------------------

43ee092f022517222e1573f9c9468aa0b6a2cc00
 binary.cabal | 2 +-
 changelog.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/binary.cabal b/binary.cabal
index 37ed51c..25c7c7c 100644
--- a/binary.cabal
+++ b/binary.cabal
@@ -1,5 +1,5 @@
 name:            binary
-version:         0.7.6.1
+version:         0.8.0.0
 license:         BSD3
 license-file:    LICENSE
 author:          Lennart Kolmodin <kolmodin at gmail.com>
diff --git a/changelog.md b/changelog.md
index 493a50a..d9aaa3f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,12 @@
 binary
 ======
 
+binary-0.8.0.0
+--------------
+
+- Added binary instance for `Version` from `Data.Version`.
+- Added binary instance for `Void` (from `base >= 4.8`).
+
 binary-0.7.6.1
 --------------
 


From git at git.haskell.org  Wed Dec 16 09:43:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:37 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #89 from
 phadej/bump-0.8 (8d643d1)
Message-ID: <20151216094337.F190F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/8d643d14025d0b6bef0fc410bf085565ad5540f6

>---------------------------------------------------------------

commit 8d643d14025d0b6bef0fc410bf085565ad5540f6
Merge: abc306b 43ee092
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Thu Nov 12 17:44:39 2015 +0100

    Merge pull request #89 from phadej/bump-0.8
    
    Bump version to 0.8.0.0



>---------------------------------------------------------------

8d643d14025d0b6bef0fc410bf085565ad5540f6
 binary.cabal | 2 +-
 changelog.md | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)


From git at git.haskell.org  Wed Dec 16 09:43:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:40 +0000 (UTC)
Subject: [commit: packages/binary] master: Add since annotations (53ea7cb)
Message-ID: <20151216094340.047E63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/53ea7cb290d69a85b07dedfd51022c0684b2db48

>---------------------------------------------------------------

commit 53ea7cb290d69a85b07dedfd51022c0684b2db48
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Fri Nov 13 07:35:25 2015 +0200

    Add since annotations


>---------------------------------------------------------------

53ea7cb290d69a85b07dedfd51022c0684b2db48
 src/Data/Binary.hs              |  4 ++++
 src/Data/Binary/Class.hs        |  6 +++++-
 src/Data/Binary/Get.hs          |  2 ++
 src/Data/Binary/Get/Internal.hs | 14 +++++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/Data/Binary.hs b/src/Data/Binary.hs
index d5a1858..bb25ee5 100644
--- a/src/Data/Binary.hs
+++ b/src/Data/Binary.hs
@@ -180,6 +180,8 @@ decode = runGet get
 -- 'Right' on success. In both cases the unconsumed input and the number of
 -- consumed bytes is returned. In case of failure, a human-readable error
 -- message will be returned as well.
+--
+-- /Since: 0.7.0.0/
 decodeOrFail :: Binary a => L.ByteString
              -> Either (L.ByteString, ByteOffset, String)
                        (L.ByteString, ByteOffset, a)
@@ -204,6 +206,8 @@ encodeFile f v = L.writeFile f (encode v)
 
 -- | Decode a value from a file. In case of errors, 'error' will
 -- be called with the error message.
+--
+-- /Since: 0.7.0.0/
 decodeFile :: Binary a => FilePath -> IO a
 decodeFile f = do
   result <- decodeFileOrFail f
diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 6247daf..ffb9734 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -140,6 +140,8 @@ class Binary t where
 #ifdef HAS_VOID
 -- Void never gets written nor reconstructed since it's impossible to have a
 -- value of that type
+
+-- | /Since: 0.8.0.0/
 instance Binary Void where
     put     = absurd
     get     = mzero
@@ -274,6 +276,7 @@ roll   = foldl' unstep 0 . reverse
 -- Fixed-size type for a subset of Natural
 type NaturalWord = Word64
 
+-- | /Since: 0.7.3.0/
 instance Binary Natural where
     {-# INLINE put #-}
     put n | n <= hi = do
@@ -614,6 +617,7 @@ instance (Binary i, Ix i, Binary e, IArray UArray e) => Binary (UArray i e) wher
 -- Fingerprints
 
 #ifdef HAS_GHC_FINGERPRINT
+-- | /Since: 0.7.6.0/
 instance Binary Fingerprint where
     put (Fingerprint x1 x2) = do
         put x1
@@ -627,7 +631,7 @@ instance Binary Fingerprint where
 ------------------------------------------------------------------------
 -- Version
 
--- | /Since: binary-0.8/
+-- | /Since: 0.8.0.0/
 instance Binary Version where
     get = Version <$> get <*> get
     put (Version br tags) = put br >> put tags
diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
index 091a14c..de1a326 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/Data/Binary/Get.hs
@@ -299,6 +299,8 @@ dropHeadChunk lbs =
 -- success. In both cases any unconsumed input and the number of bytes
 -- consumed is returned. In the case of failure, a human-readable
 -- error message is included as well.
+--
+-- /Since: 0.6.4.0/
 runGetOrFail :: Get a -> L.ByteString
              -> Either (L.ByteString, ByteOffset, String) (L.ByteString, ByteOffset, a)
 runGetOrFail g lbs0 = feedAll (runGetIncremental g) lbs0
diff --git a/src/Data/Binary/Get/Internal.hs b/src/Data/Binary/Get/Internal.hs
index 804fde1..3669242 100644
--- a/src/Data/Binary/Get/Internal.hs
+++ b/src/Data/Binary/Get/Internal.hs
@@ -123,6 +123,7 @@ instance Applicative Get where
   (<*>) = apG
   {-# INLINE (<*>) #-}
 
+-- | /Since: 0.7.1.0/
 instance MonadPlus Get where
   mzero = empty
   mplus = (<|>)
@@ -192,6 +193,8 @@ bytesRead = C $ \inp k -> BytesRead (fromIntegral $ B.length inp) (k inp)
 -- If the given decoder fails, 'isolate' will also fail.
 -- Offset from 'bytesRead' will be relative to the start of 'isolate', not the
 -- absolute of the input.
+--
+-- /Since: 0.7.2.0/
 isolate :: Int   -- ^ The number of bytes that must be consumed
         -> Get a -- ^ The decoder to isolate
         -> Get a
@@ -254,6 +257,7 @@ getBytes :: Int -> Get B.ByteString
 getBytes = getByteString
 {-# INLINE getBytes #-}
 
+-- | /Since: 0.7.0.0/
 instance Alternative Get where
   empty = C $ \inp _ks -> Fail inp "Data.Binary.Get(Alternative).empty"
   (<|>) f g = do
@@ -298,6 +302,8 @@ pushFront bs = C $ \ inp ks -> ks (B.append bs inp) ()
 
 -- | Run the given decoder, but without consuming its input. If the given
 -- decoder fails, then so will this function.
+--
+-- /Since: 0.7.0.0/
 lookAhead :: Get a -> Get a
 lookAhead g = do
   (decoder, bs) <- runAndKeepTrack g
@@ -309,6 +315,8 @@ lookAhead g = do
 -- | Run the given decoder, and only consume its input if it returns 'Just'.
 -- If 'Nothing' is returned, the input will be unconsumed.
 -- If the given decoder fails, then so will this function.
+--
+-- /Since: 0.7.0.0/
 lookAheadM :: Get (Maybe a) -> Get (Maybe a)
 lookAheadM g = do
   let g' = maybe (Left ()) Right <$> g
@@ -317,6 +325,8 @@ lookAheadM g = do
 -- | Run the given decoder, and only consume its input if it returns 'Right'.
 -- If 'Left' is returned, the input will be unconsumed.
 -- If the given decoder fails, then so will this function.
+--
+-- /Since: 0.7.1.0/
 lookAheadE :: Get (Either a b) -> Get (Either a b)
 lookAheadE g = do
   (decoder, bs) <- runAndKeepTrack g
@@ -326,8 +336,10 @@ lookAheadE g = do
     Fail inp s -> C $ \_ _ -> Fail inp s
     _ -> error "Binary: impossible"
 
--- Label a decoder. If the decoder fails, the label will be appended on
+-- | Label a decoder. If the decoder fails, the label will be appended on
 -- a new line to the error message string.
+--
+-- /Since: 0.7.2.0/
 label :: String -> Get a -> Get a
 label msg decoder = C $ \inp ks ->
   let r0 = runCont decoder inp (\inp' a -> Done inp' a)


From git at git.haskell.org  Wed Dec 16 09:43:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 09:43:42 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #90 from
 phadej/since-0.8 (8429d6b)
Message-ID: <20151216094342.0AFCF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/8429d6b4a04970b8a0a151109a8299675ad5d190

>---------------------------------------------------------------

commit 8429d6b4a04970b8a0a151109a8299675ad5d190
Merge: 8d643d1 53ea7cb
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Fri Nov 13 11:17:29 2015 +0100

    Merge pull request #90 from phadej/since-0.8
    
    Add since annotations



>---------------------------------------------------------------

8429d6b4a04970b8a0a151109a8299675ad5d190
 src/Data/Binary.hs              |  4 ++++
 src/Data/Binary/Class.hs        |  6 +++++-
 src/Data/Binary/Get.hs          |  2 ++
 src/Data/Binary/Get/Internal.hs | 14 +++++++++++++-
 4 files changed, 24 insertions(+), 2 deletions(-)


From git at git.haskell.org  Wed Dec 16 10:38:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 10:38:31 +0000 (UTC)
Subject: [commit: ghc] master: Update binary submodule to binary-0.8 snapshot
 (3a48e6e)
Message-ID: <20151216103831.93DB43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3a48e6ef80e4bf3d84814316cace259147f67df2/ghc

>---------------------------------------------------------------

commit 3a48e6ef80e4bf3d84814316cace259147f67df2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 11:37:20 2015 +0100

    Update binary submodule to binary-0.8 snapshot
    
    This requires tweaking version constraints to allow this new major version
    of `binary`.
    
    Starting with binary-0.8, `Binary Version` is de-orphaned into `binary`.
    This requires some minor adaptations to remove/hide orphan instances.
    
    /cc @kolmodin
    
    Differential Revision: https://phabricator.haskell.org/D1635


>---------------------------------------------------------------

3a48e6ef80e4bf3d84814316cace259147f67df2
 compiler/ghc.cabal.in               |  2 +-
 libraries/Cabal                     |  2 +-
 libraries/binary                    |  2 +-
 libraries/ghc-boot/GHC/PackageDb.hs | 13 +------------
 libraries/ghc-boot/ghc-boot.cabal   |  2 +-
 utils/ghc-cabal/ghc.mk              |  1 +
 6 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index f053f79..8dc4e23 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -48,7 +48,7 @@ Library
                    directory  >= 1   && < 1.3,
                    process    >= 1   && < 1.5,
                    bytestring >= 0.9 && < 0.11,
-                   binary     >= 0.7 && < 0.8,
+                   binary     == 0.8.*,
                    time                 < 1.6,
                    containers >= 0.5 && < 0.6,
                    array      >= 0.1 && < 0.6,
diff --git a/libraries/Cabal b/libraries/Cabal
index d602f63..35f50ba 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit d602f63e7daf426514e38492bfdeeb4f33bd361d
+Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
diff --git a/libraries/binary b/libraries/binary
index 86e4c9a..8429d6b 160000
--- a/libraries/binary
+++ b/libraries/binary
@@ -1 +1 @@
-Subproject commit 86e4c9a6125cdddb0592a653f48c699a574ccf7b
+Subproject commit 8429d6b4a04970b8a0a151109a8299675ad5d190
diff --git a/libraries/ghc-boot/GHC/PackageDb.hs b/libraries/ghc-boot/GHC/PackageDb.hs
index fcb24d8..2be20b2 100644
--- a/libraries/ghc-boot/GHC/PackageDb.hs
+++ b/libraries/ghc-boot/GHC/PackageDb.hs
@@ -1,6 +1,4 @@
-{-# LANGUAGE CPP #-}
--- This module deliberately defines orphan instances for now (Binary Version).
-{-# OPTIONS_GHC -fno-warn-orphans -fno-warn-name-shadowing #-}
+{-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  GHC.PackageDb
@@ -381,15 +379,6 @@ instance (BinaryStringRep a, BinaryStringRep b, BinaryStringRep c,
               (map (\(k,v) -> (fromStringRep k, v)) instantiatedWith)
               exposed trusted)
 
-instance Binary Version where
-  put (Version a b) = do
-    put a
-    put b
-  get = do
-    a <- get
-    b <- get
-    return (Version a b)
-
 instance (BinaryStringRep a, BinaryStringRep b) =>
          Binary (OriginalModule a b) where
   put (OriginalModule originalPackageId originalModuleName) = do
diff --git a/libraries/ghc-boot/ghc-boot.cabal b/libraries/ghc-boot/ghc-boot.cabal
index 7f0f14f..883bbaf 100644
--- a/libraries/ghc-boot/ghc-boot.cabal
+++ b/libraries/ghc-boot/ghc-boot.cabal
@@ -39,7 +39,7 @@ Library
             GHC.LanguageExtensions
 
     build-depends: base       >= 4   && < 5,
-                   binary     >= 0.7 && < 0.8,
+                   binary     == 0.8.*,
                    bytestring >= 0.9 && < 1,
                    directory  >= 1   && < 1.3,
                    filepath
diff --git a/utils/ghc-cabal/ghc.mk b/utils/ghc-cabal/ghc.mk
index 3ac864f..49a2ba3 100644
--- a/utils/ghc-cabal/ghc.mk
+++ b/utils/ghc-cabal/ghc.mk
@@ -38,6 +38,7 @@ $(ghc-cabal_DIST_BINARY): utils/ghc-cabal/Main.hs $(TOUCH_DEP) | $$(dir $$@)/. b
 	       -no-user-$(GHC_PACKAGE_DB_FLAG) \
 	       -Wall -fno-warn-unused-imports -fno-warn-warnings-deprecations \
 	       -DCABAL_VERSION=$(CABAL_VERSION) \
+	       -DMIN_VERSION_binary_0_8_0 \
 	       -DBOOTSTRAPPING \
 	       -optP-include -optPutils/ghc-cabal/cabal_macros_boot.h \
 	       -odir  bootstrapping \


From git at git.haskell.org  Wed Dec 16 11:31:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 11:31:22 +0000 (UTC)
Subject: [commit: ghc] master: Add `-W(no-)xxx` aliases for `-f(no-)warn-xxx`
 flags (2206fa8)
Message-ID: <20151216113122.F2DB73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2206fa8cdb1209320f3690690b610320b4810de6/ghc

>---------------------------------------------------------------

commit 2206fa8cdb1209320f3690690b610320b4810de6
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Wed Dec 16 11:42:00 2015 +0100

    Add `-W(no-)xxx` aliases for `-f(no-)warn-xxx` flags
    
    This also updates the user's guide to refer to the `-W`-based warning
    flags by default.
    
    Quoting the release note entry:
    
    | Warnings can now be controlled with `-W(no-)...` flags in addition to
    | the old `-f(no-)warn...` ones. This was done as the first part of a
    | rewrite of the warning system to provide better control over warnings,
    | better warning messages, and more common syntax compared to other
    | compilers. The old `-fwarn...`-based warning flags will remain
    | functional for the forseeable future.
    
    This is part of
    https://ghc.haskell.org/wiki/Design/Warnings
    and addresses #11218
    
    Reviewed By: hvr, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1613


>---------------------------------------------------------------

2206fa8cdb1209320f3690690b610320b4810de6
 compiler/main/DynFlags.hs                   | 176 +++++++++--------
 compiler/main/HscMain.hs                    |   4 +-
 compiler/main/InteractiveEval.hs            |   2 +-
 compiler/rename/RnPat.hs                    |   2 +-
 compiler/typecheck/TcClassDcl.hs            |   2 +-
 compiler/typecheck/TcDeriv.hs               |   2 +-
 compiler/typecheck/TcErrors.hs              |   4 +-
 compiler/typecheck/TcSimplify.hs            |   4 +-
 docs/users_guide/7.12.1-notes.rst           |  19 +-
 docs/users_guide/ghci.rst                   |   8 +-
 docs/users_guide/glasgow_exts.rst           |  18 +-
 docs/users_guide/runghc.rst                 |   2 +-
 docs/users_guide/safe_haskell.rst           |   6 +-
 docs/users_guide/separate_compilation.rst   |   4 +-
 docs/users_guide/sooner.rst                 |   2 +-
 docs/users_guide/using-warnings.rst         | 288 ++++++++++++++--------------
 docs/users_guide/using.rst                  |   4 +-
 ghc/InteractiveUI.hs                        |  15 +-
 testsuite/tests/ghci/scripts/Makefile       |   2 +-
 testsuite/tests/ghci/scripts/ghci024.stdout |   4 +-
 utils/mkUserGuidePart/Options/Warnings.hs   | 196 +++++++++----------
 21 files changed, 391 insertions(+), 373 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2206fa8cdb1209320f3690690b610320b4810de6

From git at git.haskell.org  Wed Dec 16 13:51:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 13:51:31 +0000 (UTC)
Subject: [commit: ghc] master: Start using `-W` instead of `-f(no-)warn` in
 some places (437ebdd)
Message-ID: <20151216135131.94C483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/437ebdda48e7a32fe1bea49cb503f456a0152a36/ghc

>---------------------------------------------------------------

commit 437ebdda48e7a32fe1bea49cb503f456a0152a36
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 13:32:32 2015 +0100

    Start using `-W` instead of `-f(no-)warn` in some places
    
    This replaces some occurences of `-f(no-)warn` with the new `-W`-aliases
    introduced via 2206fa8cdb120932 / #11218, in cases which are guaranteed
    to be invoked with recent enough GHC (i.e. the stage1+ GHC).
    
    After this commit, mostly the compiler and the testsuite remain using
    `-f(wo-)warn...` because the compiler needs to be bootstrappable with
    older GHCs, while for the testsuite it's convenient to be able to quickly
    compare the behavior to older GHCs (which may not support the new flags yet).
    
    The compiler-part can be updated to use the new flags once GHC 8.3 development
    starts.
    
    Reviewed By: quchen
    
    Differential Revision: https://phabricator.haskell.org/D1637


>---------------------------------------------------------------

437ebdda48e7a32fe1bea49cb503f456a0152a36
 libraries/base/Control/Arrow.hs                |  2 +-
 libraries/base/Control/Category.hs             |  2 +-
 libraries/base/Control/Concurrent.hs           |  2 +-
 libraries/base/Foreign/C/Types.hs              |  4 +-
 libraries/base/GHC/Base.hs                     |  4 +-
 libraries/base/GHC/Conc.hs                     |  2 +-
 libraries/base/GHC/Conc/IO.hs                  |  2 +-
 libraries/base/GHC/Conc/Sync.hs                |  2 +-
 libraries/base/GHC/Conc/Windows.hs             |  2 +-
 libraries/base/GHC/Event/IntTable.hs           |  2 +-
 libraries/base/GHC/Float.hs                    |  2 +-
 libraries/base/GHC/IO/Encoding/CodePage/API.hs |  2 +-
 libraries/base/GHC/IO/FD.hs                    |  2 +-
 libraries/base/GHC/IO/Handle.hs                |  2 +-
 libraries/base/GHC/IO/Handle/Internals.hs      |  4 +-
 libraries/base/GHC/IO/Handle/Text.hs           |  4 +-
 libraries/base/GHC/Real.hs                     |  2 +-
 libraries/base/Text/Show/Functions.hs          |  2 +-
 libraries/ghc-prim/GHC/Classes.hs              |  8 ++--
 mk/warnings.mk                                 | 57 ++++++++++++++------------
 20 files changed, 57 insertions(+), 52 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 437ebdda48e7a32fe1bea49cb503f456a0152a36

From git at git.haskell.org  Wed Dec 16 15:56:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 15:56:50 +0000 (UTC)
Subject: [commit: ghc] master: GHC.Stack: Fix Haddock markup (d36e9e1)
Message-ID: <20151216155650.4B5103A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d36e9e12b2f308e0d23db68889c18d01b6512bcc/ghc

>---------------------------------------------------------------

commit d36e9e12b2f308e0d23db68889c18d01b6512bcc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 12:27:34 2015 +0100

    GHC.Stack: Fix Haddock markup


>---------------------------------------------------------------

d36e9e12b2f308e0d23db68889c18d01b6512bcc
 libraries/base/GHC/Stack/CCS.hsc  | 3 +--
 libraries/base/GHC/Stack/Types.hs | 9 ++++++++-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/libraries/base/GHC/Stack/CCS.hsc b/libraries/base/GHC/Stack/CCS.hsc
index 6d62a1e..b62c80a 100644
--- a/libraries/base/GHC/Stack/CCS.hsc
+++ b/libraries/base/GHC/Stack/CCS.hsc
@@ -75,7 +75,7 @@ ccModule p = (# peek CostCentre, module) p
 ccSrcSpan :: Ptr CostCentre -> IO CString
 ccSrcSpan p = (# peek CostCentre, srcloc) p
 
--- | returns a '[String]' representing the current call stack.  This
+-- | Returns a @[String]@ representing the current call stack.  This
 -- can be useful for debugging.
 --
 -- The implementation uses the call-stack simulation maintined by the
@@ -85,7 +85,6 @@ ccSrcSpan p = (# peek CostCentre, srcloc) p
 -- uninformative.
 --
 -- @since 4.5.0.0
-
 currentCallStack :: IO [String]
 currentCallStack = ccsToStrings =<< getCurrentCCS ()
 
diff --git a/libraries/base/GHC/Stack/Types.hs b/libraries/base/GHC/Stack/Types.hs
index f877f7e..ebe4591 100644
--- a/libraries/base/GHC/Stack/Types.hs
+++ b/libraries/base/GHC/Stack/Types.hs
@@ -65,10 +65,14 @@ import GHC.Integer ()
 -- myerror msg = error (msg ++ "\n" ++ prettyCallStack ?callStack)
 -- @
 --
+-- Will produce the following when evaluated,
+--
+-- @
 -- ghci> myerror "die"
 -- *** Exception: die
 -- CallStack (from ImplicitParams):
 --   myerror, called at <interactive>:2:1 in interactive:Ghci1
+-- @
 --
 -- @CallStack at s do not interact with the RTS and do not require compilation with
 -- @-prof at . On the other hand, as they are built up explicitly using
@@ -80,7 +84,10 @@ import GHC.Integer ()
 -- ordered with the most recently called function at the head.
 --
 -- @since 4.8.1.0
-data CallStack = CallStack { getCallStack :: [([Char], SrcLoc)] }
+data CallStack = CallStack { getCallStack :: [([Char], SrcLoc)]
+                             -- ^ Get a list of stack frames with the most
+                             -- recently called function at the head.
+                           }
   -- See Note [Overview of implicit CallStacks]
 
 


From git at git.haskell.org  Wed Dec 16 15:56:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 15:56:53 +0000 (UTC)
Subject: [commit: ghc] master: Update haddock submodule (4c7da9c)
Message-ID: <20151216155653.3C6E73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4c7da9c557ac5990fb4ccdd6145e0d2487a57219/ghc

>---------------------------------------------------------------

commit 4c7da9c557ac5990fb4ccdd6145e0d2487a57219
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 07:47:51 2015 -0500

    Update haddock submodule
    
    Also rename and move the horribly named isVanillaLSig to Haddock as
    isUserLSig, reflecting the fact that it returns whether the signature
    was provided by the user or generated.


>---------------------------------------------------------------

4c7da9c557ac5990fb4ccdd6145e0d2487a57219
 compiler/hsSyn/HsBinds.hs | 6 ------
 utils/haddock             | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/compiler/hsSyn/HsBinds.hs b/compiler/hsSyn/HsBinds.hs
index 267627d..3641642 100644
--- a/compiler/hsSyn/HsBinds.hs
+++ b/compiler/hsSyn/HsBinds.hs
@@ -819,12 +819,6 @@ isFixityLSig :: LSig name -> Bool
 isFixityLSig (L _ (FixSig {})) = True
 isFixityLSig _                 = False
 
-isVanillaLSig :: LSig name -> Bool       -- User type signatures
--- A badly-named function, but it's part of the GHCi (used
--- by Haddock) so I don't want to change it gratuitously.
-isVanillaLSig (L _(TypeSig {})) = True
-isVanillaLSig _                 = False
-
 isTypeLSig :: LSig name -> Bool  -- Type signatures
 isTypeLSig (L _(TypeSig {}))    = True
 isTypeLSig (L _(ClassOpSig {})) = True
diff --git a/utils/haddock b/utils/haddock
index d4657f0..66cf3d2 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit d4657f07912416a1b14ddb517696f8ef3ffb85a7
+Subproject commit 66cf3d2714ef1cf851782fbe4378f8c2b1af3335


From git at git.haskell.org  Wed Dec 16 16:16:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 16:16:24 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T11224' created
Message-ID: <20151216161624.DBBD03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/T11224
Referencing: a729ac8c091cbcc8c3b456836dbcdea5c20b0af5

From git at git.haskell.org  Wed Dec 16 16:16:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 16:16:28 +0000 (UTC)
Subject: [commit: ghc] wip/T11224: WIP for Trac #11224 (a729ac8)
Message-ID: <20151216161628.8C9883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11224
Link       : http://ghc.haskell.org/trac/ghc/changeset/a729ac8c091cbcc8c3b456836dbcdea5c20b0af5/ghc

>---------------------------------------------------------------

commit a729ac8c091cbcc8c3b456836dbcdea5c20b0af5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 16 12:00:58 2015 +0000

    WIP for Trac #11224
    
    Not right yet.
    
    But the fix in Match.hs is solid; could be cherry-picked.


>---------------------------------------------------------------

a729ac8c091cbcc8c3b456836dbcdea5c20b0af5
 compiler/basicTypes/PatSyn.hs                      |   2 +-
 compiler/deSugar/Match.hs                          |  86 +++++----
 compiler/typecheck/TcBinds.hs                      |  25 +--
 compiler/typecheck/TcHsType.hs                     |   2 +-
 compiler/typecheck/TcPatSyn.hs                     | 209 +++++++++++----------
 compiler/typecheck/TcRnTypes.hs                    |   7 +-
 testsuite/tests/patsyn/should_compile/T11224b.hs   |  16 ++
 testsuite/tests/patsyn/should_compile/all.T        |   1 +
 .../tests/patsyn/should_fail/as-pattern.stderr     |   7 +-
 testsuite/tests/patsyn/should_run/T11224.hs        |  28 +++
 testsuite/tests/patsyn/should_run/T11224.stdout    |   6 +
 testsuite/tests/patsyn/should_run/all.T            |   1 +
 12 files changed, 231 insertions(+), 159 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a729ac8c091cbcc8c3b456836dbcdea5c20b0af5

From git at git.haskell.org  Wed Dec 16 16:40:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 16:40:47 +0000 (UTC)
Subject: [commit: ghc] master: Improve detection of `fdatasync(2)` (re #11137)
 (ab79ed7)
Message-ID: <20151216164047.83CE53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ab79ed763cfbaa1b0d1f39ba5ed1cde7dffd4b87/ghc

>---------------------------------------------------------------

commit ab79ed763cfbaa1b0d1f39ba5ed1cde7dffd4b87
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 17:40:48 2015 +0100

    Improve detection of `fdatasync(2)` (re #11137)
    
    This updates the `unix` submodule to pull in an improved
    Autoconf test for `fdatasync(2)` in cases where `<unistd.h>` lacks
    a declaration, but linking against `fdatasync` works which led to a
    false positive previously.


>---------------------------------------------------------------

ab79ed763cfbaa1b0d1f39ba5ed1cde7dffd4b87
 libraries/unix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/unix b/libraries/unix
index 59edb0a..5d5b747 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 59edb0a0a0d91ecfe938029b3b00a0c99dcb8481
+Subproject commit 5d5b74716b696b0f22c37a88ccc5c114b13f0398


From git at git.haskell.org  Wed Dec 16 16:57:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 16:57:53 +0000 (UTC)
Subject: [commit: ghc] master: Synchronize Haddock submodule with master
 branch (11b9ada)
Message-ID: <20151216165753.25F6F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/11b9ada1310fda8f5ac2e53ad87b7309e02f1df3/ghc

>---------------------------------------------------------------

commit 11b9ada1310fda8f5ac2e53ad87b7309e02f1df3
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 17:24:40 2015 +0100

    Synchronize Haddock submodule with master branch
    
    Thanks for Matthew Pickering for managing this rebase.


>---------------------------------------------------------------

11b9ada1310fda8f5ac2e53ad87b7309e02f1df3
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index 66cf3d2..6f46d59 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 66cf3d2714ef1cf851782fbe4378f8c2b1af3335
+Subproject commit 6f46d59d7def2afc0b0aa59ad96aa5f06482c799


From git at git.haskell.org  Wed Dec 16 17:13:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 17:13:58 +0000 (UTC)
Subject: [commit: ghc] master: Look through type synonyms in GADT kind
 signatures (efaa51d)
Message-ID: <20151216171358.E693B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/efaa51de15017b92618634898fc2c2aee2c5fd5b/ghc

>---------------------------------------------------------------

commit efaa51de15017b92618634898fc2c2aee2c5fd5b
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Dec 16 12:57:45 2015 +0100

    Look through type synonyms in GADT kind signatures
    
    Summary: Fixes #11237
    
    Test Plan: ./validate
    
    Reviewers: goldfire, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1636
    
    GHC Trac Issues: #11237


>---------------------------------------------------------------

efaa51de15017b92618634898fc2c2aee2c5fd5b
 compiler/types/TyCoRep.hs                          |  6 +++---
 compiler/types/Type.hs-boot                        |  2 ++
 testsuite/tests/typecheck/should_compile/T11237.hs | 13 +++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 4 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index c25bd11..d409c7d 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -114,7 +114,7 @@ module TyCoRep (
 import {-# SOURCE #-} DataCon( dataConTyCon, dataConFullSig
                               , DataCon, eqSpecTyVar )
 import {-# SOURCE #-} Type( isPredTy, isCoercionTy, mkAppTy
-                          , partitionInvisibles )
+                          , partitionInvisibles, coreView )
    -- Transitively pulls in a LOT of stuff, better to break the loop
 
 import {-# SOURCE #-} Coercion
@@ -412,13 +412,13 @@ Some basic functions, put here to break loops eg with the pretty printer
 -}
 
 isLiftedTypeKind :: Kind -> Bool
-isLiftedTypeKind (TyConApp tc []) = isLiftedTypeKindTyConName (tyConName tc)
+isLiftedTypeKind ki | Just ki' <- coreView ki = isLiftedTypeKind ki'
 isLiftedTypeKind (TyConApp tc [TyConApp lev []])
   = tc `hasKey` tYPETyConKey && lev `hasKey` liftedDataConKey
 isLiftedTypeKind _                = False
 
 isUnliftedTypeKind :: Kind -> Bool
-isUnliftedTypeKind (TyConApp tc []) = tc `hasKey` unliftedTypeKindTyConKey
+isUnliftedTypeKind ki | Just ki' <- coreView ki = isUnliftedTypeKind ki'
 isUnliftedTypeKind (TyConApp tc [TyConApp lev []])
   = tc `hasKey` tYPETyConKey && lev `hasKey` unliftedDataConKey
 isUnliftedTypeKind _ = False
diff --git a/compiler/types/Type.hs-boot b/compiler/types/Type.hs-boot
index aa12398..abddc24 100644
--- a/compiler/types/Type.hs-boot
+++ b/compiler/types/Type.hs-boot
@@ -14,3 +14,5 @@ eqType :: Type -> Type -> Bool
 coreViewOneStarKind :: Type -> Maybe Type
 
 partitionInvisibles :: TyCon -> (a -> Type) -> [a] -> ([a], [a])
+
+coreView :: Type -> Maybe Type
diff --git a/testsuite/tests/typecheck/should_compile/T11237.hs b/testsuite/tests/typecheck/should_compile/T11237.hs
new file mode 100644
index 0000000..422aefd
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T11237.hs
@@ -0,0 +1,13 @@
+{-# LANGUAGE TypeInType #-}
+{-# LANGUAGE GADTs #-}
+module TypeInTypeBug where
+
+import qualified Data.Kind
+
+data Works :: Data.Kind.Type where
+  WorksConstr :: Works
+
+type Set = Data.Kind.Type
+
+data ShouldWork :: Set where
+  ShouldWorkConstr :: ShouldWork
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 8acb9a3..6bd0b03 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -479,3 +479,4 @@ test('T10770a', expect_broken(10770), compile, [''])
 test('T10770b', expect_broken(10770), compile, [''])
 test('T10935', normal, compile, [''])
 test('T10971a', normal, compile, [''])
+test('T11237', normal, compile, [''])


From git at git.haskell.org  Wed Dec 16 18:05:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 18:05:13 +0000 (UTC)
Subject: [commit: ghc] master: Note [The equality types story] in TysPrim
 (046b47a)
Message-ID: <20151216180513.4AF183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/046b47ab5a077e76abd9610946428419cfe82ca9/ghc

>---------------------------------------------------------------

commit 046b47ab5a077e76abd9610946428419cfe82ca9
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Wed Dec 16 13:04:09 2015 -0500

    Note [The equality types story] in TysPrim
    
    This supercedes the Note recently written in TysWiredIn.


>---------------------------------------------------------------

046b47ab5a077e76abd9610946428419cfe82ca9
 compiler/prelude/PrelNames.hs        |   2 +-
 compiler/prelude/TysPrim.hs          | 150 ++++++++++++++++++++++++++++++++---
 compiler/prelude/TysWiredIn.hs       |  31 +-------
 compiler/typecheck/TcInteract.hs     |   2 +
 compiler/typecheck/TcRnTypes.hs      |   2 +
 compiler/typecheck/TcUnify.hs        |   3 +-
 compiler/types/Class.hs              |   1 +
 libraries/base/Data/Type/Equality.hs |  13 ++-
 libraries/ghc-prim/GHC/Types.hs      |   6 +-
 9 files changed, 158 insertions(+), 52 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 046b47ab5a077e76abd9610946428419cfe82ca9

From git at git.haskell.org  Wed Dec 16 22:25:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 22:25:40 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule to latest snapshot
 (b35cc1f)
Message-ID: <20151216222540.96E203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b35cc1fb649173c2aea59b98640c026f30960219/ghc

>---------------------------------------------------------------

commit b35cc1fb649173c2aea59b98640c026f30960219
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 23:22:42 2015 +0100

    Update Cabal submodule to latest snapshot
    
    This needs minor adaptations to ghc-cabal due to
    http://git.haskell.org/packages/Cabal.git/commitdiff/b39b906d05c409e4960ae15dbaca89664826a85f


>---------------------------------------------------------------

b35cc1fb649173c2aea59b98640c026f30960219
 libraries/Cabal         | 2 +-
 utils/ghc-cabal/Main.hs | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 35f50ba..4e33454 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 35f50ba6946fbfbff8aa5a9ff548f0d1f481dbdb
+Subproject commit 4e33454f5566c1ad3339c4bdf7444dff6c8fc21f
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 6da7733..ad18f2e 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -167,7 +167,7 @@ doCopy directory distDir
                                                  (installDirTemplates lbi)
                 progs = withPrograms lbi
                 stripProgram' = stripProgram {
-                    programFindLocation = \_ _ -> return (Just strip) }
+                    programFindLocation = \_ _ -> return (Just (strip,[])) }
 
             progs' <- configureProgram verbosity stripProgram' progs
             let lbi' = lbi {
@@ -216,12 +216,12 @@ doRegister directory distDir ghc ghcpkg topdir
                 ghcpkgconf = topdir </> "package.conf.d"
                 ghcProgram' = ghcProgram {
                     programPostConf = \_ cp -> return cp { programDefaultArgs = ["-B" ++ topdir] },
-                    programFindLocation = \_ _ -> return (Just ghc) }
+                    programFindLocation = \_ _ -> return (Just (ghc,[])) }
                 ghcPkgProgram' = ghcPkgProgram {
                     programPostConf = \_ cp -> return cp { programDefaultArgs =
                                                                 ["--global-package-db", ghcpkgconf]
                                                                 ++ ["--force" | not (null myDestDir) ] },
-                    programFindLocation = \_ _ -> return (Just ghcpkg) }
+                    programFindLocation = \_ _ -> return (Just (ghcpkg,[])) }
                 configurePrograms ps conf = foldM (flip (configureProgram verbosity)) conf ps
 
             progs' <- configurePrograms [ghcProgram', ghcPkgProgram'] progs


From git at git.haskell.org  Wed Dec 16 22:37:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 22:37:02 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Relax upper bound to allow
 upcoming `transformers-0.5` (285f032)
Message-ID: <20151216223702.608673A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/285f0325dce25f08f51318b6806bb21a045e3c9e

>---------------------------------------------------------------

commit 285f0325dce25f08f51318b6806bb21a045e3c9e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 17:09:30 2015 +0100

    Relax upper bound to allow upcoming `transformers-0.5`
    
    GHC 8.0 will ship with the not yet released `transformers-0.5.0.0`
    release.


>---------------------------------------------------------------

285f0325dce25f08f51318b6806bb21a045e3c9e
 haskeline.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskeline.cabal b/haskeline.cabal
index b1e41ae..508312b 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -52,7 +52,7 @@ flag legacy-encoding
 Library
     Build-depends: base >=4.3 && < 4.10, containers>=0.4 && < 0.6,
                    directory>=1.1 && < 1.3, bytestring>=0.9 && < 0.11,
-                   filepath >= 1.2 && < 1.5, transformers >= 0.2 && < 0.5
+                   filepath >= 1.2 && < 1.5, transformers >= 0.2 && < 0.6
     Default-Language: Haskell98
     Default-Extensions: 
                 ForeignFunctionInterface, Rank2Types, FlexibleInstances,


From git at git.haskell.org  Wed Dec 16 22:37:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 22:37:04 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #33 from
 hvr/pr/transformers-0.5 (56a17bd)
Message-ID: <20151216223704.65B0D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/56a17bd9b917ace9045991cddb882636c1508002

>---------------------------------------------------------------

commit 56a17bd9b917ace9045991cddb882636c1508002
Merge: 06349b7 285f032
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Wed Dec 16 13:04:32 2015 -0800

    Merge pull request #33 from hvr/pr/transformers-0.5
    
    Relax upper bound to allow upcoming `transformers-0.5`



>---------------------------------------------------------------

56a17bd9b917ace9045991cddb882636c1508002
 haskeline.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Wed Dec 16 22:37:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 22:37:38 +0000 (UTC)
Subject: [commit: ghc] master: Update transformers submodule to latest
 v0.5.0.0 (1687f99)
Message-ID: <20151216223738.1A5053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1687f999dfa09e975e679f1fdec807fc87de40e8/ghc

>---------------------------------------------------------------

commit 1687f999dfa09e975e679f1fdec807fc87de40e8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 16 23:31:34 2015 +0100

    Update transformers submodule to latest v0.5.0.0
    
    `transformers-0.5.0.0` will be the next version of `transformers`
    and this is the designated version to be used for GHC 8.0.1
    
    This needs to update the haskeline submodule in order to relax
    the upper bound for the major version bump to 0.5


>---------------------------------------------------------------

1687f999dfa09e975e679f1fdec807fc87de40e8
 libraries/haskeline    | 2 +-
 libraries/transformers | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index 06349b7..56a17bd 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 06349b7ffc503ba0c8bdf0293d1adc6026da97bd
+Subproject commit 56a17bd9b917ace9045991cddb882636c1508002
diff --git a/libraries/transformers b/libraries/transformers
index 34fba39..4c66312 160000
--- a/libraries/transformers
+++ b/libraries/transformers
@@ -1 +1 @@
-Subproject commit 34fba39b1279936a739ca8857e9592cc9a44c34e
+Subproject commit 4c66312b8d72d463dd293d50cc81a885ec588af2


From git at git.haskell.org  Wed Dec 16 23:16:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 16 Dec 2015 23:16:52 +0000 (UTC)
Subject: [commit: ghc] master: Add test for #10897 (6c9258d)
Message-ID: <20151216231652.56A3E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6c9258def53008f050e91e6d3e08c4c297392c00/ghc

>---------------------------------------------------------------

commit 6c9258def53008f050e91e6d3e08c4c297392c00
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Wed Dec 16 23:16:15 2015 +0000

    Add test for #10897


>---------------------------------------------------------------

6c9258def53008f050e91e6d3e08c4c297392c00
 testsuite/tests/patsyn/should_compile/T10897a.hs | 4 ++++
 testsuite/tests/patsyn/should_compile/T10897b.hs | 4 ++++
 testsuite/tests/patsyn/should_compile/all.T      | 3 +++
 3 files changed, 11 insertions(+)

diff --git a/testsuite/tests/patsyn/should_compile/T10897a.hs b/testsuite/tests/patsyn/should_compile/T10897a.hs
new file mode 100644
index 0000000..2bad0d9
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/T10897a.hs
@@ -0,0 +1,4 @@
+{-# LANGUAGE PatternSynonyms #-}
+module T10897a where
+pattern Single :: a -> a
+pattern Single x = x
diff --git a/testsuite/tests/patsyn/should_compile/T10897b.hs b/testsuite/tests/patsyn/should_compile/T10897b.hs
new file mode 100644
index 0000000..6b506b8
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/T10897b.hs
@@ -0,0 +1,4 @@
+module B where
+import T10897a
+
+Single y = True
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index d89cab6..4452711 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -42,3 +42,6 @@ test('poly-export3', normal, compile, [''])
 test('multi-export', normal, compile, [''])
 test('export-super-class', normal, compile, [''])
 test('export-record-selector', normal, compile, [''])
+test('T10897', expect_broken(10897), multi_compile, ['T10897', [
+                                       ('T10897a.hs','-c')
+                                      ,('T10897b.hs', '-c')], ''])


From git at git.haskell.org  Thu Dec 17 00:41:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 00:41:10 +0000 (UTC)
Subject: [commit: ghc] master: GHC doesn't have a way to ask for
 user-package-db, so Cabal reimplemented it. (7221ad7)
Message-ID: <20151217004110.29FE23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7221ad70daa363d77f60d96c3f6e1baa1d9bec81/ghc

>---------------------------------------------------------------

commit 7221ad70daa363d77f60d96c3f6e1baa1d9bec81
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Wed Dec 16 10:39:12 2015 -0800

    GHC doesn't have a way to ask for user-package-db, so Cabal reimplemented it.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: docs only
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1644


>---------------------------------------------------------------

7221ad70daa363d77f60d96c3f6e1baa1d9bec81
 compiler/main/DynFlags.hs | 2 ++
 compiler/main/Packages.hs | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 5b16bd6..e443926 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -973,6 +973,8 @@ versionedAppDir :: DynFlags -> IO FilePath
 versionedAppDir dflags = do
   appdir <- getAppUserDataDirectory (programName dflags)
   return $ appdir </> (TARGET_ARCH ++ '-':TARGET_OS ++ '-':projectVersion dflags)
+  -- NB: This functionality is reimplemented in Cabal, so if you
+  -- change it, be sure to update Cabal.
 
 -- | The target code type of the compilation (if any).
 --
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index 8d0f2a6..a26b275 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -378,6 +378,9 @@ getPackageConfRefs dflags = do
 
 resolvePackageConfig :: DynFlags -> PkgConfRef -> IO (Maybe FilePath)
 resolvePackageConfig dflags GlobalPkgConf = return $ Just (systemPackageConfig dflags)
+-- NB: This logic is reimplemented in Cabal, so if you change it,
+-- make sure you update Cabal.  (Or, better yet, dump it in the
+-- compiler info so Cabal can use the info.)
 resolvePackageConfig dflags UserPkgConf = handleIO (\_ -> return Nothing) $ do
   dir <- versionedAppDir dflags
   let pkgconf = dir </> "package.conf.d"


From git at git.haskell.org  Thu Dec 17 09:39:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 09:39:51 +0000 (UTC)
Subject: [commit: ghc] master: Fix tests when run in parallel (dd3837a)
Message-ID: <20151217093951.0E9F83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dd3837aba04ff1549217dcf5db8adc3625f175ae/ghc

>---------------------------------------------------------------

commit dd3837aba04ff1549217dcf5db8adc3625f175ae
Author: Simon Marlow <smarlow at fb.com>
Date:   Thu Dec 17 01:37:23 2015 -0800

    Fix tests when run in parallel


>---------------------------------------------------------------

dd3837aba04ff1549217dcf5db8adc3625f175ae
 testsuite/tests/ghc-api/annotations-literals/Makefile  | 4 ++--
 testsuite/tests/ghc-api/annotations-literals/all.T     | 6 ++++--
 testsuite/tests/ghc-api/annotations-literals/parsed.hs | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/testsuite/tests/ghc-api/annotations-literals/Makefile b/testsuite/tests/ghc-api/annotations-literals/Makefile
index 5b06030..58b50e8 100644
--- a/testsuite/tests/ghc-api/annotations-literals/Makefile
+++ b/testsuite/tests/ghc-api/annotations-literals/Makefile
@@ -6,12 +6,12 @@ clean:
 	rm -f *.o *.hi
 
 literals:
-	rm -f literals.o literals.hi
+	rm -f literals.o literals.hi LiteralsTest.o LiteralsTest.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc literals
 	./literals "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
 
 parsed:
-	rm -f parsed.o parsed.hi
+	rm -f parsed.o parsed.hi LiteralsTest2.o LiteralsTest2.hi
 	'$(TEST_HC)' $(TEST_HC_OPTS) --make -v0 -package ghc parsed
 	./parsed "`'$(TEST_HC)' $(TEST_HC_OPTS) --print-libdir | tr -d '\r'`"
 
diff --git a/testsuite/tests/ghc-api/annotations-literals/all.T b/testsuite/tests/ghc-api/annotations-literals/all.T
index 999c5a4..bef7049 100644
--- a/testsuite/tests/ghc-api/annotations-literals/all.T
+++ b/testsuite/tests/ghc-api/annotations-literals/all.T
@@ -1,2 +1,4 @@
-test('literals', normal, run_command, ['$MAKE -s --no-print-directory literals'])
-test('parsed',   normal, run_command, ['$MAKE -s --no-print-directory parsed'])
\ No newline at end of file
+test('literals', extra_clean(['LiteralsTest.o', 'LiteralsTest.hi']),
+                 run_command, ['$MAKE -s --no-print-directory literals'])
+test('parsed',   extra_clean(['LiteralsTest2.o', 'LiteralsTest2.hi']),
+                 run_command, ['$MAKE -s --no-print-directory parsed'])
diff --git a/testsuite/tests/ghc-api/annotations-literals/parsed.hs b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
index 063e6bc..8664fdc 100644
--- a/testsuite/tests/ghc-api/annotations-literals/parsed.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/parsed.hs
@@ -20,7 +20,7 @@ import Data.Dynamic ( fromDynamic,Dynamic )
 main::IO()
 main = do
         [libdir] <- getArgs
-        testOneFile libdir "LiteralsTest"
+        testOneFile libdir "LiteralsTest2"
 
 testOneFile libdir fileName = do
     p <- runGhc (Just libdir) $ do


From git at git.haskell.org  Thu Dec 17 09:39:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 09:39:54 +0000 (UTC)
Subject: [commit: ghc] master: Remote GHCi, -fexternal-interpreter (4905b83)
Message-ID: <20151217093954.04FE63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4905b83a2d448c65ccced385343d4e8124548a3b/ghc

>---------------------------------------------------------------

commit 4905b83a2d448c65ccced385343d4e8124548a3b
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Wed Nov 18 16:42:24 2015 +0000

    Remote GHCi, -fexternal-interpreter
    
    Summary:
    (Apologies for the size of this patch, I couldn't make a smaller one
    that was validate-clean and also made sense independently)
    
    (Some of this code is derived from GHCJS.)
    
    This commit adds support for running interpreted code (for GHCi and
    TemplateHaskell) in a separate process.  The functionality is
    experimental, so for now it is off by default and enabled by the flag
    -fexternal-interpreter.
    
    Reaosns we want this:
    
    * compiling Template Haskell code with -prof does not require
      building the code without -prof first
    
    * when GHC itself is profiled, it can interpret unprofiled code, and
      the same applies to dynamic linking.  We would no longer need to
      force -dynamic-too with TemplateHaskell, and we can load ordinary
      objects into a dynamically-linked GHCi (and vice versa).
    
    * An unprofiled GHCi can load and run profiled code, which means it
      can use the stack-trace functionality provided by profiling without
      taking the performance hit on the compiler that profiling would
      entail.
    
    Amongst other things; see
    https://ghc.haskell.org/trac/ghc/wiki/RemoteGHCi for more details.
    
    Notes on the implementation are in Note [Remote GHCi] in the new
    module compiler/ghci/GHCi.hs.  It probably needs more documenting,
    feel free to suggest things I could elaborate on.
    
    Things that are not currently implemented for -fexternal-interpreter:
    
    * The GHCi debugger
    * :set prog, :set args in GHCi
    * `recover` in Template Haskell
    * Redirecting stdin/stdout for the external process
    
    These are all doable, I just wanted to get to a working validate-clean
    patch first.
    
    I also haven't done any benchmarking yet.  I expect there to be slight hit
    to link times for byte code and some penalty due to having to
    serialize/deserialize TH syntax, but I don't expect it to be a serious
    problem.  There's also lots of low-hanging fruit in the byte code
    generator/linker that we could exploit to speed things up.
    
    Test Plan:
    * validate
    * I've run parts of the test suite with
    EXTRA_HC_OPTS=-fexternal-interpreter, notably tests/ghci and tests/th.
    There are a few failures due to the things not currently implemented
    (see above).
    
    Reviewers: simonpj, goldfire, ezyang, austin, alanz, hvr, niteria, bgamari, gibiansky, luite
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1562


>---------------------------------------------------------------

4905b83a2d448c65ccced385343d4e8124548a3b
 .gitignore                                         |   1 +
 aclocal.m4                                         |   2 +-
 compiler/basicTypes/BasicTypes.hs                  |   5 -
 compiler/basicTypes/Literal.hs                     |  14 +-
 compiler/coreSyn/MkCore.hs                         |   7 +-
 compiler/deSugar/Coverage.hs                       |   4 +-
 compiler/ghc.cabal.in                              |   7 +-
 compiler/ghc.mk                                    |  47 +-
 compiler/ghci/ByteCodeAsm.hs                       |  93 +---
 compiler/ghci/ByteCodeGen.hs                       | 175 ++++---
 compiler/ghci/ByteCodeInstr.hs                     |  55 +--
 compiler/ghci/ByteCodeItbls.hs                     | 437 ++---------------
 compiler/ghci/ByteCodeLink.hs                      | 284 ++++-------
 compiler/ghci/ByteCodeTypes.hs                     |  90 ++++
 compiler/ghci/Debugger.hs                          |   8 +-
 compiler/ghci/DebuggerUtils.hs                     |   2 +-
 compiler/ghci/GHCi.hs                              | 499 +++++++++++++++++++
 compiler/ghci/Linker.hs                            | 544 ++++++++++++---------
 compiler/ghci/RtClosureInspect.hs                  |  14 +-
 compiler/main/Annotations.hs                       |  14 +-
 compiler/main/DriverPipeline.hs                    |   9 +-
 compiler/main/DynFlags.hs                          |  77 +--
 compiler/main/DynamicLoading.hs                    |   5 +-
 compiler/main/GHC.hs                               |  51 +-
 compiler/main/GhcMake.hs                           |   2 +-
 compiler/main/GhcPlugins.hs                        |   4 +-
 compiler/main/Hooks.hs                             |  33 +-
 compiler/main/HscMain.hs                           |  55 ++-
 compiler/main/HscTypes.hs                          |  29 +-
 compiler/main/InteractiveEval.hs                   | 332 ++++---------
 compiler/main/InteractiveEvalTypes.hs              |  26 +-
 compiler/main/SysTools.hs                          |  10 +-
 compiler/specialise/SpecConstr.hs                  |   2 +-
 compiler/typecheck/TcRnDriver.hs                   |   8 +-
 compiler/typecheck/TcRnMonad.hs                    |   2 +
 compiler/typecheck/TcRnTypes.hs                    |   2 +
 compiler/typecheck/TcSplice.hs                     | 200 +++++++-
 compiler/typecheck/TcSplice.hs-boot                |   1 +
 compiler/utils/Binary.hs                           |  10 +
 compiler/utils/Outputable.hs                       |   4 +
 compiler/utils/Panic.hs                            |  43 +-
 ghc.mk                                             |  12 +-
 ghc/GhciMonad.hs                                   | 127 +++--
 ghc/InteractiveUI.hs                               |  65 ++-
 ghc/Main.hs                                        |  46 +-
 ghc/ghc-bin.cabal.in                               |   3 +-
 iserv/Main.hs                                      |  94 ++++
 iserv/Makefile                                     |  15 +
 iserv/ghc.mk                                       |  67 +++
 iserv/iserv-bin.cabal                              |  26 +
 iserv/iservmain.c                                  |  16 +
 libraries/ghc-boot/GHC/LanguageExtensions.hs       |   8 +-
 .../utils => libraries/ghc-boot/GHC}/Serialized.hs |  30 +-
 libraries/ghc-boot/ghc-boot.cabal                  |   1 +
 libraries/ghci/GHCi/CreateBCO.hs                   | 147 ++++++
 libraries/ghci/GHCi/FFI.hsc                        | 149 ++++++
 libraries/ghci/GHCi/InfoTable.hsc                  | 348 +++++++++++++
 libraries/ghci/GHCi/Message.hs                     | 386 +++++++++++++++
 {compiler/ghci => libraries/ghci/GHCi}/ObjLink.hs  |  88 ++--
 libraries/ghci/GHCi/RemoteTypes.hs                 |  91 ++++
 libraries/ghci/GHCi/ResolvedBCO.hs                 |  62 +++
 libraries/ghci/GHCi/Run.hs                         | 308 ++++++++++++
 libraries/ghci/GHCi/Signals.hs                     |  46 ++
 libraries/ghci/GHCi/TH.hs                          | 175 +++++++
 libraries/ghci/GHCi/TH/Binary.hs                   |  73 +++
 libraries/ghci/GNUmakefile                         |   4 +
 libraries/ghci/LICENSE                             |  31 ++
 libraries/ghci/SizedSeq.hs                         |  37 ++
 libraries/ghci/ghc.mk                              |   5 +
 libraries/ghci/ghci.cabal                          |  41 ++
 rts/Interpreter.c                                  |   7 +-
 rules/build-prog.mk                                |  18 +-
 rules/shell-wrapper.mk                             |   2 +-
 testsuite/config/ghc                               |   5 +-
 testsuite/driver/testlib.py                        |  17 +-
 testsuite/tests/annotations/should_run/annrun01.hs |   2 +-
 testsuite/tests/cabal/cabal04/Makefile             |   3 +-
 testsuite/tests/cabal/cabal04/all.T                |   0
 testsuite/tests/ghc-api/T4891/T4891.hs             |  19 +-
 .../tests/ghci.debugger/scripts/break006.stderr    |   4 +-
 .../tests/ghci.debugger/scripts/break011.script    |   3 +
 .../tests/ghci.debugger/scripts/break011.stdout    |  12 +
 .../tests/ghci.debugger/scripts/break013.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break024.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/print019.stderr    |   2 +-
 .../prog001/{prog001.stdout => prog001-ext.stdout} |   0
 testsuite/tests/ghci/prog001/prog001.T             |   4 +-
 testsuite/tests/ghci/scripts/T10110A.hs            |   1 +
 testsuite/tests/ghci/scripts/all.T                 |  12 +-
 .../tests/profiling/should_run/scc003.prof.sample  |  48 +-
 testsuite/tests/rts/LinkerUnload.hs                |   4 +-
 testsuite/tests/rts/T2615.hs                       |   2 +-
 testsuite/tests/th/Makefile                        |   7 +
 testsuite/tests/th/TH_Roles2.stderr                |   5 +-
 testsuite/tests/th/TH_finalizer.hs                 |  11 +
 testsuite/tests/th/TH_finalizer.stderr             |   2 +
 testsuite/tests/th/TH_spliceE5_prof_ext.hs         |  14 +
 ...spliceE5.stdout => TH_spliceE5_prof_ext.stdout} |   0
 testsuite/tests/th/TH_spliceE5_prof_ext_Lib.hs     |   8 +
 testsuite/tests/th/all.T                           |  10 +
 utils/ghctags/Main.hs                              |   6 +-
 101 files changed, 4163 insertions(+), 1779 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4905b83a2d448c65ccced385343d4e8124548a3b

From git at git.haskell.org  Thu Dec 17 09:39:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 09:39:56 +0000 (UTC)
Subject: [commit: ghc] master: accept output (a6d664c)
Message-ID: <20151217093956.989493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a6d664cf8afc5ad86240d83052772e4dc14df9cb/ghc

>---------------------------------------------------------------

commit a6d664cf8afc5ad86240d83052772e4dc14df9cb
Author: Simon Marlow <smarlow at fb.com>
Date:   Thu Dec 17 01:32:20 2015 -0800

    accept output


>---------------------------------------------------------------

a6d664cf8afc5ad86240d83052772e4dc14df9cb
 testsuite/tests/th/TH_Roles2.stderr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index c44e5b9..a8a4ed1 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -5,7 +5,7 @@ TYPE CONSTRUCTORS
     Kind: forall k1. k1 -> *
 COERCION AXIOMS
 Dependent modules: []
-Dependent packages: [array-0.5.1.0, base-4.9.0.0, binary-0.7.5.0,
+Dependent packages: [array-0.5.1.0, base-4.9.0.0, binary-0.8.0.0,
                      bytestring-0.10.7.0, containers-0.5.6.3, deepseq-1.4.2.0,
                      ghc-boot-0.0.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.0,
                      pretty-1.1.3.2, template-haskell-2.11.0.0]


From git at git.haskell.org  Thu Dec 17 11:11:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:11:13 +0000 (UTC)
Subject: [commit: ghc] master: Bump haddock expected performance numbers
 (acd447e)
Message-ID: <20151217111113.5B94C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/acd447e671e90c2f964069f268943db0f2a57a7c/ghc

>---------------------------------------------------------------

commit acd447e671e90c2f964069f268943db0f2a57a7c
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 17 10:40:57 2015 +0100

    Bump haddock expected performance numbers
    
    This was a pretty brutal upgrade, with >100% increase in allocations
    while processing `base`. Ugh.


>---------------------------------------------------------------

acd447e671e90c2f964069f268943db0f2a57a7c
 testsuite/tests/perf/haddock/all.T | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index 49a126b..296dc1e 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -5,7 +5,7 @@
 test('haddock.base',
      [unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 11119767632, 5)
+          [(wordsize(64), 26282821104, 5)
             # 2012-08-14: 5920822352 (amd64/Linux)
             # 2012-09-20: 5829972376 (amd64/Linux)
             # 2012-10-08: 5902601224 (amd64/Linux)
@@ -25,7 +25,8 @@ test('haddock.base',
             # 2014-01-08: 9014511528 (x86_64/Linux) - Eliminate so-called "silent superclass parameters" (and others)
             # 2015-07-22: 9418857192 (x86_64/Linux) - Just slowly creeping up.
             # 2015-10-03: 9894189856 (x86_64/Linux) - Still creeping
-	    # 2015-12-11: 11119767632 (amd64/Linux) TypeInType (see #11196)
+            # 2015-12-11: 11119767632 (amd64/Linux) - TypeInType (see #11196)
+            # 2015-12-17: 26282821104 (x86_64/Linux) - Update Haddock to master
 
           ,(platform('i386-unknown-mingw32'), 4434804940, 5)
             # 2013-02-10:                     3358693084 (x86/Windows)
@@ -48,7 +49,7 @@ test('haddock.base',
 test('haddock.Cabal',
      [unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 8114833312, 5)
+          [(wordsize(64), 9982130512, 5)
             # 2012-08-14: 3255435248 (amd64/Linux)
             # 2012-08-29: 3324606664 (amd64/Linux, new codegen)
             # 2012-10-08: 3373401360 (amd64/Linux)
@@ -68,8 +69,9 @@ test('haddock.Cabal',
             # 2014-10-04: 6019839624 (x86_64/Linux - Burning Bridges, Cabal update)
             # 2014-12-14: 6387320816 (x86_64/Linux) - Update to Haddock 2.16
             # 2015-01-22: 6710234312 (x86_64/Linux) - Cabal updated
-            # 2015-06-29: 7413958344 (x86_64/Linux) due to #10482, not yet investigated
-	    # 2015-12-11: 8114833312 (amd64/Linux) TypeInType (See #11196)
+            # 2015-06-29: 7413958344 (x86_64/Linux) - due to #10482, not yet investigated
+            # 2015-12-11: 8114833312 (amd64/Linux) - TypeInType (See #11196)
+            # 2015-12-17: 9982130512 (amd64/Linux) - Update Haddock to master
 
           ,(platform('i386-unknown-mingw32'), 3293415576, 5)
             # 2012-10-30:                     1733638168 (x86/Windows)
@@ -91,7 +93,7 @@ test('haddock.Cabal',
 test('haddock.compiler',
      [unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 49395782136, 10)
+          [(wordsize(64), 58017214568, 10)
             # 2012P-08-14: 26070600504 (amd64/Linux)
             # 2012-08-29: 26353100288 (amd64/Linux, new CG)
             # 2012-09-18: 26882813032 (amd64/Linux)
@@ -104,6 +106,7 @@ test('haddock.compiler',
             # 2015-06-29: 40624322224 (amd64/Linux) due to #10482, not yet investigated
             # 2015-12-03: 44721228752 (amd64/Linux) slow creep upwards
             # 2015-12-15: 49395782136 (amd64/Linux) more creep, following kind-equalities
+            # 2015-12-17: 58017214568 (amd64/Linux) update Haddock to master
 
           ,(platform('i386-unknown-mingw32'),   902576468, 10)
             # 2012-10-30:                     13773051312 (x86/Windows)


From git at git.haskell.org  Thu Dec 17 11:11:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:11:16 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: Add missing LiteralsTest2.hs
 (b20a65d)
Message-ID: <20151217111116.723EF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b20a65d5bf0ebf656c67f57e9b2c1094b459b827/ghc

>---------------------------------------------------------------

commit b20a65d5bf0ebf656c67f57e9b2c1094b459b827
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 17 06:08:02 2015 -0500

    testsuite: Add missing LiteralsTest2.hs


>---------------------------------------------------------------

b20a65d5bf0ebf656c67f57e9b2c1094b459b827
 .../ghc-api/annotations-literals/{LiteralsTest.hs => LiteralsTest2.hs}  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/ghc-api/annotations-literals/LiteralsTest.hs b/testsuite/tests/ghc-api/annotations-literals/LiteralsTest2.hs
similarity index 90%
copy from testsuite/tests/ghc-api/annotations-literals/LiteralsTest.hs
copy to testsuite/tests/ghc-api/annotations-literals/LiteralsTest2.hs
index 9081adf..e85eb17 100644
--- a/testsuite/tests/ghc-api/annotations-literals/LiteralsTest.hs
+++ b/testsuite/tests/ghc-api/annotations-literals/LiteralsTest2.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE MagicHash #-}
-module LiteralsTest where
+module LiteralsTest2 where
 
 x,y :: Int
 x = 0003


From git at git.haskell.org  Thu Dec 17 11:11:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:11:19 +0000 (UTC)
Subject: [commit: ghc] master: Fix haddock hyperlinker (62e60bb)
Message-ID: <20151217111119.146A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/62e60bb914980dff1b29eecbe1270deb0b265d9d/ghc

>---------------------------------------------------------------

commit 62e60bb914980dff1b29eecbe1270deb0b265d9d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 16 23:33:08 2015 +0100

    Fix haddock hyperlinker
    
    Updates haddock submodule


>---------------------------------------------------------------

62e60bb914980dff1b29eecbe1270deb0b265d9d
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index 6f46d59..fa03f80 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 6f46d59d7def2afc0b0aa59ad96aa5f06482c799
+Subproject commit fa03f80d76f1511a811a0209ea7a6a8b6c58704f


From git at git.haskell.org  Thu Dec 17 11:11:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:11:21 +0000 (UTC)
Subject: [commit: ghc] master: TcTypeable: Don't use bogus fingerprints when
 suppress-uniques is enabled (786d528)
Message-ID: <20151217111121.B330E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/786d528e8f949daeb62d34e0daa5e35f642065fc/ghc

>---------------------------------------------------------------

commit 786d528e8f949daeb62d34e0daa5e35f642065fc
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Dec 16 21:09:54 2015 +0100

    TcTypeable: Don't use bogus fingerprints when suppress-uniques is enabled
    
    Previously the Typeable implementation would intentionally create TyCon
    representations with bogus fingerprints to avoid fingerprints (which may
    change often) from leaking into test output. As pointed out by Richard
    in #10376 this is very bad as simply enabling a debug flag,
    `-dsuppress-uniques`, completely breaks the soundness of `Typeable`!
    
    This patch removes this behavior and replaces it with logic in the
    testsuite driver to filter out spurious changes due to Typeable
    representations.
    
    Test Plan: Validate
    
    Reviewers: austin, simonpj, goldfire
    
    Reviewed By: goldfire
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1629
    
    GHC Trac Issues: #10376


>---------------------------------------------------------------

786d528e8f949daeb62d34e0daa5e35f642065fc
 compiler/typecheck/TcTypeable.hs                      | 4 +---
 testsuite/driver/testlib.py                           | 9 +++++++++
 testsuite/tests/simplCore/should_compile/Makefile     | 3 ++-
 testsuite/tests/simplCore/should_compile/T8274.stdout | 8 ++++----
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/compiler/typecheck/TcTypeable.hs b/compiler/typecheck/TcTypeable.hs
index c951387..032ff79 100644
--- a/compiler/typecheck/TcTypeable.hs
+++ b/compiler/typecheck/TcTypeable.hs
@@ -194,9 +194,7 @@ mkTyConRepBinds (dflags, mod_expr, pkg_str, mod_str, tr_datacon, trn_datacon) ty
     hashThis :: String
     hashThis = unwords [pkg_str, mod_str, tycon_str]
 
-    Fingerprint high low
-       | gopt Opt_SuppressUniques dflags = Fingerprint 0 0
-       | otherwise                       = fingerprintString hashThis
+    Fingerprint high low = fingerprintString hashThis
 
     word64 :: Word64 -> HsLit
     word64 | wORD_SIZE dflags == 4 = \n -> HsWord64Prim (show n) (toInteger n)
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index c41bb8c..4e9a1fb 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1691,12 +1691,20 @@ def normalise_callstacks(str):
     # Ignore line number differences in call stacks (#10834).
     return re.sub(', called at (.+):[\\d]+:[\\d]+ in [\\w\-\.]+:', repl, str)
 
+def normalise_type_reps(str):
+    """ Normalise out fingerprints from Typeable TyCon representations """
+    return re.sub(r'TyCon\s*\d+\#\#\s*\d+\#\#\s*',
+                  'TyCon FINGERPRINT FINGERPRINT ',
+                  str,
+                  flags=re.MULTILINE)
+
 def normalise_errmsg( str ):
     # remove " error:" and lower-case " Warning:" to make patch for
     # trac issue #10021 smaller
     str = modify_lines(str, lambda l: re.sub(' error:', '', l))
     str = modify_lines(str, lambda l: re.sub(' Warning:', ' warning:', l))
     str = normalise_callstacks(str)
+    str = normalise_type_reps(str)
 
     # If somefile ends in ".exe" or ".exe:", zap ".exe" (for Windows)
     #    the colon is there because it appears in error messages; this
@@ -1766,6 +1774,7 @@ def normalise_output( str ):
     # This can occur in error messages generated by the program.
     str = re.sub('([^\\s])\\.exe', '\\1', str)
     str = normalise_callstacks(str)
+    str = normalise_type_reps(str)
     return str
 
 def normalise_asm( str ):
diff --git a/testsuite/tests/simplCore/should_compile/Makefile b/testsuite/tests/simplCore/should_compile/Makefile
index a804768..87b1d95 100644
--- a/testsuite/tests/simplCore/should_compile/Makefile
+++ b/testsuite/tests/simplCore/should_compile/Makefile
@@ -14,7 +14,8 @@ T11155:
 
 T8274:
 	$(RM) -f T8274.o T8274.hi
-	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques T8274.hs | grep '#'
+	# Set -dppr-cols to ensure things don't wrap
+	'$(TEST_HC)' $(TEST_HC_OPTS) -O -c -ddump-simpl -dsuppress-uniques -dppr-cols=200 T8274.hs | grep '#'
 
 T7865:
 	$(RM) -f T7865.o T7865.hi
diff --git a/testsuite/tests/simplCore/should_compile/T8274.stdout b/testsuite/tests/simplCore/should_compile/T8274.stdout
index 269f4e7..05a0069 100644
--- a/testsuite/tests/simplCore/should_compile/T8274.stdout
+++ b/testsuite/tests/simplCore/should_compile/T8274.stdout
@@ -1,12 +1,12 @@
 T8274.$trModule2 = GHC.Types.TrNameS "main"#
 T8274.$trModule1 = GHC.Types.TrNameS "T8274"#
 T8274.$tc'Positives1 = GHC.Types.TrNameS "'Positives"#
-  GHC.Types.TyCon 0## 0## T8274.$trModule T8274.$tc'Positives1
+T8274.$tc'Positives = GHC.Types.TyCon 14732531009298850569## 4925356269917933860## T8274.$trModule T8274.$tc'Positives1
 T8274.$tcP1 = GHC.Types.TrNameS "P"#
-T8274.$tcP = GHC.Types.TyCon 0## 0## T8274.$trModule T8274.$tcP1
+T8274.$tcP = GHC.Types.TyCon 11095028091707994303## 9476557054198009608## T8274.$trModule T8274.$tcP1
 T8274.$tc'Negatives1 = GHC.Types.TrNameS "'Negatives"#
-  GHC.Types.TyCon 0## 0## T8274.$trModule T8274.$tc'Negatives1
+T8274.$tc'Negatives = GHC.Types.TyCon 15950179315687996644## 11481167534507418130## T8274.$trModule T8274.$tc'Negatives1
 T8274.$tcN1 = GHC.Types.TrNameS "N"#
-T8274.$tcN = GHC.Types.TyCon 0## 0## T8274.$trModule T8274.$tcN1
+T8274.$tcN = GHC.Types.TyCon 7479687563082171902## 17616649989360543185## T8274.$trModule T8274.$tcN1
 p = T8274.Positives 42# 4.23# 4.23## '4'# 4##
 n = T8274.Negatives -4# -4.0# -4.0##


From git at git.haskell.org  Thu Dec 17 11:48:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:48:40 +0000 (UTC)
Subject: [commit: ghc] master: Fix libffi dependency,
 and remove redundant LibFFI.hsc (27f47cd)
Message-ID: <20151217114840.14CAA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/27f47cda4a2d91bbeaeeb5efa8d0e3a908798120/ghc

>---------------------------------------------------------------

commit 27f47cda4a2d91bbeaeeb5efa8d0e3a908798120
Author: Simon Marlow <smarlow at fb.com>
Date:   Thu Dec 17 03:03:29 2015 -0800

    Fix libffi dependency, and remove redundant LibFFI.hsc
    
    LibFFI.hsc was moved to libraries/ghci/GHCi/FFI.hsc, I just forgot to
    remove the old one.  We also need an explicit dependency on libffi,
    which moves from compiler/ghc.mk to the top-level ghc.mk (because
    libraries/ghci/ghc.mk is auto-generated).


>---------------------------------------------------------------

27f47cda4a2d91bbeaeeb5efa8d0e3a908798120
 compiler/ghc.cabal.in    |   1 -
 compiler/ghc.mk          |   5 --
 compiler/ghci/LibFFI.hsc | 138 -----------------------------------------------
 ghc.mk                   |   6 +++
 4 files changed, 6 insertions(+), 144 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index ae702ef..fc81942 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -587,7 +587,6 @@ Library
             ByteCodeItbls
             ByteCodeLink
             Debugger
-            LibFFI
             Linker
             RtClosureInspect
             DebuggerUtils
diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index d93b879..f5c53d4 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -704,11 +704,6 @@ ifeq "$(DYNAMIC_GHC_PROGRAMS)" "YES"
 compiler/utils/Util_HC_OPTS += -DDYNAMIC_GHC_PROGRAMS
 endif
 
-# LibFFI.hs #includes ffi.h
-ifneq "$(UseSystemLibFFI)" "YES"
-compiler/stage2/build/LibFFI.hs : $(libffi_HEADERS)
-endif
-
 # Note [munge-stage1-package-config]
 # Strip the date/patchlevel from the version of stage1.  See Note
 # [fiddle-stage1-version] above.
diff --git a/compiler/ghci/LibFFI.hsc b/compiler/ghci/LibFFI.hsc
deleted file mode 100644
index d3759f3..0000000
--- a/compiler/ghci/LibFFI.hsc
+++ /dev/null
@@ -1,138 +0,0 @@
------------------------------------------------------------------------------
---
--- libffi bindings
---
--- (c) The University of Glasgow 2008
---
------------------------------------------------------------------------------
-
-#include <ffi.h>
-
-module LibFFI (
-  ForeignCallToken,
-  prepForeignCall
- ) where
-
-import TyCon
-import ForeignCall
-import Panic
-import DynFlags
-
-import Control.Monad
-import Foreign
-import Foreign.C
-
-----------------------------------------------------------------------------
-
-type ForeignCallToken = C_ffi_cif
-
-prepForeignCall
-    :: DynFlags
-    -> CCallConv
-    -> [PrimRep]                        -- arg types
-    -> PrimRep                          -- result type
-    -> IO (Ptr ForeignCallToken)        -- token for making calls
-                                        -- (must be freed by caller)
-prepForeignCall dflags cconv arg_types result_type
-  = do
-    let n_args = length arg_types
-    arg_arr <- mallocArray n_args
-    let init_arg ty n = pokeElemOff arg_arr n (primRepToFFIType dflags ty)
-    zipWithM_ init_arg arg_types [0..]
-    cif <- mallocBytes (#const sizeof(ffi_cif))
-    let abi = convToABI cconv
-    let res_ty = primRepToFFIType dflags result_type
-    r <- ffi_prep_cif cif abi (fromIntegral n_args) res_ty arg_arr
-    if (r /= fFI_OK)
-       then throwGhcExceptionIO (InstallationError
-                                     ("prepForeignCallFailed: " ++ show r))
-       else return cif
-
-convToABI :: CCallConv -> C_ffi_abi
-convToABI CCallConv   = fFI_DEFAULT_ABI
-#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH)
-convToABI StdCallConv = fFI_STDCALL
-#endif
--- unknown conventions are mapped to the default, (#3336)
-convToABI _           = fFI_DEFAULT_ABI
-
--- c.f. DsForeign.primTyDescChar
-primRepToFFIType :: DynFlags -> PrimRep -> Ptr C_ffi_type
-primRepToFFIType dflags r
-  = case r of
-     VoidRep     -> ffi_type_void
-     IntRep      -> signed_word
-     WordRep     -> unsigned_word
-     Int64Rep    -> ffi_type_sint64
-     Word64Rep   -> ffi_type_uint64
-     AddrRep     -> ffi_type_pointer
-     FloatRep    -> ffi_type_float
-     DoubleRep   -> ffi_type_double
-     _           -> panic "primRepToFFIType"
-  where
-    (signed_word, unsigned_word)
-       | wORD_SIZE dflags == 4  = (ffi_type_sint32, ffi_type_uint32)
-       | wORD_SIZE dflags == 8  = (ffi_type_sint64, ffi_type_uint64)
-       | otherwise              = panic "primTyDescChar"
-
-
-data C_ffi_type
-data C_ffi_cif
-
-type C_ffi_status = (#type ffi_status)
-type C_ffi_abi    = (#type ffi_abi)
-
-foreign import ccall "&ffi_type_void"   ffi_type_void    :: Ptr C_ffi_type
---foreign import ccall "&ffi_type_uint8"  ffi_type_uint8   :: Ptr C_ffi_type
---foreign import ccall "&ffi_type_sint8"  ffi_type_sint8   :: Ptr C_ffi_type
---foreign import ccall "&ffi_type_uint16" ffi_type_uint16  :: Ptr C_ffi_type
---foreign import ccall "&ffi_type_sint16" ffi_type_sint16  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_uint32" ffi_type_uint32  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_sint32" ffi_type_sint32  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_uint64" ffi_type_uint64  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_sint64" ffi_type_sint64  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_float"  ffi_type_float   :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_double" ffi_type_double  :: Ptr C_ffi_type
-foreign import ccall "&ffi_type_pointer"ffi_type_pointer :: Ptr C_ffi_type
-
-fFI_OK            :: C_ffi_status
-fFI_OK            = (#const FFI_OK)
---fFI_BAD_ABI     :: C_ffi_status
---fFI_BAD_ABI     = (#const FFI_BAD_ABI)
---fFI_BAD_TYPEDEF :: C_ffi_status
---fFI_BAD_TYPEDEF = (#const FFI_BAD_TYPEDEF)
-
-fFI_DEFAULT_ABI :: C_ffi_abi
-fFI_DEFAULT_ABI = (#const FFI_DEFAULT_ABI)
-#if defined(mingw32_HOST_OS) && defined(i386_HOST_ARCH)
-fFI_STDCALL     :: C_ffi_abi
-fFI_STDCALL     = (#const FFI_STDCALL)
-#endif
-
--- ffi_status ffi_prep_cif(ffi_cif *cif,
---                         ffi_abi abi,
---                         unsigned int nargs,
---                         ffi_type *rtype,
---                         ffi_type **atypes);
-
-foreign import ccall "ffi_prep_cif"
-  ffi_prep_cif :: Ptr C_ffi_cif         -- cif
-               -> C_ffi_abi             -- abi
-               -> CUInt                 -- nargs
-               -> Ptr C_ffi_type        -- result type
-               -> Ptr (Ptr C_ffi_type)  -- arg types
-               -> IO C_ffi_status
-
--- Currently unused:
-
--- void ffi_call(ffi_cif *cif,
---               void (*fn)(),
---               void *rvalue,
---               void **avalue);
-
--- foreign import ccall "ffi_call"
---   ffi_call :: Ptr C_ffi_cif             -- cif
---            -> FunPtr (IO ())            -- function to call
---            -> Ptr ()                    -- put result here
---            -> Ptr (Ptr ())              -- arg values
---            -> IO ()
diff --git a/ghc.mk b/ghc.mk
index 883e0b3..64eb9bb 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -727,6 +727,12 @@ include $(patsubst %, %/ghc.mk, $(BUILD_DIRS))
 .PHONY: stage1_libs
 stage1_libs : $(ALL_STAGE1_LIBS)
 
+# We need this extra dependency when building our own libffi, because
+# GHCi.FFI.hs #includes ffi.h
+ifneq "$(UseSystemLibFFI)" "YES"
+libraries/ghci/dist-install/build/GHCi/FFI.hs : $(libffi_HEADERS)
+endif
+
 # ----------------------------------------------
 # Per-package compiler flags
 #


From git at git.haskell.org  Thu Dec 17 11:54:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:18 +0000 (UTC)
Subject: [commit: ghc] master: Add Shake configuration to configure.ac
 (86ad116)
Message-ID: <20151217115418.EB1403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/86ad116fd73824776a6addd7b068db4358093bee/ghc

>---------------------------------------------------------------

commit 86ad116fd73824776a6addd7b068db4358093bee
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:14:17 2015 +0100

    Add Shake configuration to configure.ac
    
    The Shake build system requires that this file be generated by autoconf.
    Generate it if we find a shake tree.
    
    Reviewers: austin, hvr
    
    Reviewed By: hvr
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1638


>---------------------------------------------------------------

86ad116fd73824776a6addd7b068db4358093bee
 configure.ac | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/configure.ac b/configure.ac
index c8708ae..0f335a4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1098,6 +1098,9 @@ if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
+if test -e shake/cfg/system.config.in; then
+    AC_CONFIG_FILES([shake/cfg/system.config])
+fi
 AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 


From git at git.haskell.org  Thu Dec 17 11:54:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:22 +0000 (UTC)
Subject: [commit: ghc] master: Build system: Cabalize genapply (0cc4aad)
Message-ID: <20151217115422.65F703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0cc4aad36f91570b1b489e3d239256d1c781daac/ghc

>---------------------------------------------------------------

commit 0cc4aad36f91570b1b489e3d239256d1c781daac
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:13:17 2015 +0100

    Build system: Cabalize genapply
    
    Test Plan: Validate
    
    Reviewers: thomie, austin
    
    Reviewed By: thomie, austin
    
    Differential Revision: https://phabricator.haskell.org/D1639


>---------------------------------------------------------------

0cc4aad36f91570b1b489e3d239256d1c781daac
 utils/genapply/{GenApply.hs => Main.hs}                  |  1 -
 utils/{ghc-pwd/ghc-pwd.cabal => genapply/genapply.cabal} | 15 +++++++++++----
 utils/genapply/ghc.mk                                    | 14 +++++---------
 3 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/utils/genapply/GenApply.hs b/utils/genapply/Main.hs
similarity index 97%
rename from utils/genapply/GenApply.hs
rename to utils/genapply/Main.hs
index 26b5154..e58a496 100644
--- a/utils/genapply/GenApply.hs
+++ b/utils/genapply/Main.hs
@@ -1042,4 +1042,3 @@ genBitmapArray types =
         where bitmap_val =
                 (fromIntegral (mkBitmap ty) `shiftL` BITMAP_BITS_SHIFT)
                  .|. sum (map argSize ty)
-
diff --git a/utils/ghc-pwd/ghc-pwd.cabal b/utils/genapply/genapply.cabal
similarity index 52%
copy from utils/ghc-pwd/ghc-pwd.cabal
copy to utils/genapply/genapply.cabal
index dcd9529..dba3b6d 100644
--- a/utils/ghc-pwd/ghc-pwd.cabal
+++ b/utils/genapply/genapply.cabal
@@ -1,4 +1,4 @@
-Name: ghc-pwd
+Name: genapply
 Version: 0.1
 Copyright: XXX
 License: BSD3
@@ -7,13 +7,20 @@ License: BSD3
 -- XXX Maintainer:
 Synopsis: XXX
 Description:
-	XXX
+  XXX
 build-type: Simple
 cabal-version: >=1.10
 
-Executable ghc-pwd
+Flag unregisterised
+    description: Are we building an unregisterised compiler?
+    default:     False
+    manual:      True
+
+Executable genapply
     Default-Language: Haskell2010
     Main-Is: Main.hs
     Build-Depends: base       >= 3   && < 5,
-                   directory  >= 1   && < 1.3
+                   pretty
 
+    if flag(unregisterised)
+        Cpp-Options: -DNO_REGS
diff --git a/utils/genapply/ghc.mk b/utils/genapply/ghc.mk
index 2eea233..e0e5886 100644
--- a/utils/genapply/ghc.mk
+++ b/utils/genapply/ghc.mk
@@ -10,18 +10,14 @@
 #
 # -----------------------------------------------------------------------------
 
-utils/genapply_dist_MODULES = GenApply
-utils/genapply_dist_PROGNAME = genapply
+utils/genapply_USES_CABAL           = YES
+utils/genapply_PACKAGE              = genapply
+utils/genapply_dist_PROGNAME        = genapply
+utils/genapply_dist_INSTALL         = NO
 utils/genapply_dist_INSTALL_INPLACE = YES
 
-utils/genapply_HC_OPTS += -package pretty
-
 ifeq "$(GhcUnregisterised)" "YES"
-utils/genapply_HC_OPTS += -DNO_REGS
+utils/genapply_CONFIGURE_OPTS = --flag unregisterised
 endif
 
-utils/genapply/GenApply.hs : includes/ghcconfig.h
-utils/genapply/GenApply.hs : includes/MachRegs.h
-utils/genapply/GenApply.hs : includes/Constants.h
-
 $(eval $(call build-prog,utils/genapply,dist,0))


From git at git.haskell.org  Thu Dec 17 11:54:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:25 +0000 (UTC)
Subject: [commit: ghc] master: Build system: Make cGhcRtsWithLibdw flag a
 proper Bool (109d847)
Message-ID: <20151217115425.0C89E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/109d847971691a89dab6c80b37f46dc33197b8c2/ghc

>---------------------------------------------------------------

commit 109d847971691a89dab6c80b37f46dc33197b8c2
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:14:53 2015 +0100

    Build system: Make cGhcRtsWithLibdw flag a proper Bool
    
    Test Plan: validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1642


>---------------------------------------------------------------

109d847971691a89dab6c80b37f46dc33197b8c2
 compiler/ghc.mk           |  8 ++++++--
 compiler/main/DynFlags.hs | 15 +++++++--------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index f5c53d4..9148c79 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -102,8 +102,12 @@ endif
 	@echo 'cGhcWithSMP           = "$(GhcWithSMP)"'                     >> $@
 	@echo 'cGhcRTSWays           :: String'                             >> $@
 	@echo 'cGhcRTSWays           = "$(GhcRTSWays)"'                     >> $@
-	@echo 'cGhcRtsWithLibdw      :: String'                             >> $@
-	@echo 'cGhcRtsWithLibdw      = "$(GhcRtsWithLibdw)"'                >> $@
+	@echo 'cGhcRtsWithLibdw      :: Bool'                               >> $@
+ifeq "$(GhcRtsWithLibdw)" "YES"
+	@echo 'cGhcRtsWithLibdw      = True'                                >> $@
+else
+	@echo 'cGhcRtsWithLibdw      = False'                               >> $@
+endif
 	@echo 'cGhcEnableTablesNextToCode :: String'                        >> $@
 	@echo 'cGhcEnableTablesNextToCode = "$(GhcEnableTablesNextToCode)"' >> $@
 	@echo 'cLeadingUnderscore    :: String'                             >> $@
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 03eb398..f6a551b 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -4117,25 +4117,24 @@ compilerInfo dflags
        ("Support SMP",                 cGhcWithSMP),
        ("Tables next to code",         cGhcEnableTablesNextToCode),
        ("RTS ways",                    cGhcRTSWays),
-       ("RTS expects libdw",           cGhcRtsWithLibdw),
-       ("Support dynamic-too",         if isWindows then "NO" else "YES"),
+       ("RTS expects libdw",           showBool cGhcRtsWithLibdw),
+       ("Support dynamic-too",         showBool $ not isWindows),
        ("Support parallel --make",     "YES"),
        ("Support reexported-modules",  "YES"),
        ("Support thinning and renaming package flags", "YES"),
        ("Requires unified installed package IDs", "YES"),
        ("Uses package keys",           "YES"),
-       ("Dynamic by default",          if dYNAMIC_BY_DEFAULT dflags
-                                       then "YES" else "NO"),
-       ("GHC Dynamic",                 if dynamicGhc
-                                       then "YES" else "NO"),
-       ("GHC Profiled",                if rtsIsProfiled
-                                       then "YES" else "NO"),
+       ("Dynamic by default",          showBool $ dYNAMIC_BY_DEFAULT dflags),
+       ("GHC Dynamic",                 showBool dynamicGhc),
+       ("GHC Profiled",                showBool rtsIsProfiled),
        ("Leading underscore",          cLeadingUnderscore),
        ("Debug on",                    show debugIsOn),
        ("LibDir",                      topDir dflags),
        ("Global Package DB",           systemPackageConfig dflags)
       ]
   where
+    showBool True  = "YES"
+    showBool False = "NO"
     isWindows = platformOS (targetPlatform dflags) == OSMinGW32
 
 #include "../includes/dist-derivedconstants/header/GHCConstantsHaskellWrappers.hs"


From git at git.haskell.org  Thu Dec 17 11:54:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:28 +0000 (UTC)
Subject: [commit: ghc] master: Conditionally show plural "s" in warnings
 (4f870f8)
Message-ID: <20151217115428.5F3F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f870f8481b2611619adf66d61eff06f02e3741f/ghc

>---------------------------------------------------------------

commit 4f870f8481b2611619adf66d61eff06f02e3741f
Author: David Luposchainsky <dluposchainsky at gmail.com>
Date:   Thu Dec 17 12:17:32 2015 +0100

    Conditionally show plural "s" in warnings
    
    Redundant constraints and defaulting warnings had "constraint(s)" in
    their messages; the "s" is now conditional based on the number of things
    warned about.
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1647


>---------------------------------------------------------------

4f870f8481b2611619adf66d61eff06f02e3741f
 compiler/typecheck/TcErrors.hs                     | 10 ++++--
 compiler/typecheck/TcValidity.hs                   |  5 ++-
 .../tests/ghc-api/apirecomp001/apirecomp001.stderr | 40 +++++++++++-----------
 testsuite/tests/parser/should_compile/T2245.stderr | 38 ++++++++++----------
 .../tests/typecheck/should_compile/T10971a.stderr  | 34 +++++++++---------
 .../tests/typecheck/should_fail/tcfail204.stderr   | 20 +++++------
 testsuite/tests/warnings/should_compile/PluralS.hs | 27 +++++++++++++++
 .../tests/warnings/should_compile/PluralS.stderr   | 26 ++++++++++++++
 testsuite/tests/warnings/should_compile/all.T      |  1 +
 9 files changed, 131 insertions(+), 70 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4f870f8481b2611619adf66d61eff06f02e3741f

From git at git.haskell.org  Thu Dec 17 11:54:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:31 +0000 (UTC)
Subject: [commit: ghc] master: rules/haddock: Add EXTRA_HADDOCK_OPTS flag
 (e58a936)
Message-ID: <20151217115431.0110A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e58a9361ac7e3699e298aa5c99398a21ac732500/ghc

>---------------------------------------------------------------

commit e58a9361ac7e3699e298aa5c99398a21ac732500
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Dec 17 12:15:27 2015 +0100

    rules/haddock: Add EXTRA_HADDOCK_OPTS flag
    
    Allowing one to pass the new `--hyperlinked-source` option to generate
    pretty marked-up sources for the core libraries.
    
    Test Plan: Try it
    
    Reviewers: hvr, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1643


>---------------------------------------------------------------

e58a9361ac7e3699e298aa5c99398a21ac732500
 rules/haddock.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rules/haddock.mk b/rules/haddock.mk
index f6978a7..3d3a83c 100644
--- a/rules/haddock.mk
+++ b/rules/haddock.mk
@@ -64,13 +64,14 @@ endif
 	  --hoogle \
 	  --title="$$($1_PACKAGE)-$$($1_$2_VERSION)$$(if $$(strip $$($1_$2_SYNOPSIS)),: $$(strip $$($1_$2_SYNOPSIS)),)" \
 	  --prologue="$1/$2/haddock-prologue.txt" \
-    --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \
+	  --optghc="-D__HADDOCK_VERSION__=$$(HADDOCK_VERSION_STRING)" \
 	  $$(foreach mod,$$($1_$2_HIDDEN_MODULES),--hide=$$(mod)) \
 	  $$(foreach pkg,$$($1_$2_DEPS),$$(if $$($$(pkg)_HADDOCK_FILE),--read-interface=../$$(pkg)$$(comma)../$$(pkg)/src/%{MODULE/./-}.html\#%{NAME}$$(comma)$$($$(pkg)_HADDOCK_FILE))) \
 	  $$(foreach opt,$$($1_$2_$$(HADDOCK_WAY)_ALL_HC_OPTS),--optghc=$$(opt)) \
 	  $$($1_$2_HADDOCK_FLAGS) $$($1_$2_HADDOCK_OPTS) \
 	  $$($1_$2_HS_SRCS) \
 	  $$($1_$2_EXTRA_HADDOCK_SRCS) \
+	  $$(EXTRA_HADDOCK_OPTS) \
 	  +RTS -t"$1/$2/haddock.t" --machine-readable
 
 # --no-tmp-comp-dir above is important: it saves a few minutes in a


From git at git.haskell.org  Thu Dec 17 11:54:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:34 +0000 (UTC)
Subject: [commit: ghc] master: Reify DuplicateRecordFields by label,
 rather than by selector (4b161c9)
Message-ID: <20151217115434.7D5A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4b161c93dba774cc8051cf40a2024ad86f3259f2/ghc

>---------------------------------------------------------------

commit 4b161c93dba774cc8051cf40a2024ad86f3259f2
Author: Adam Gundry <adam at well-typed.com>
Date:   Thu Dec 17 12:19:23 2015 +0100

    Reify DuplicateRecordFields by label, rather than by selector
    
    See `Note [Reifying field labels]` in `TcSplice`. This makes
    typical uses of TH work better with `DuplicateRecordFields`.
    If `reify` is called on the `Name` of a field label produced by
    the output of a previous `reify`, and there are multiple  fields
    with that label defined in the same module, it may fail with
    an ambiguity error.
    
    Test Plan:
    Added tests, and manually tested that this makes
    Aeson's `deriveJSON` avoid the `$sel:` prefixes.
    
    Reviewers: simonpj, goldfire, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1586
    
    GHC Trac Issues: #11103


>---------------------------------------------------------------

4b161c93dba774cc8051cf40a2024ad86f3259f2
 compiler/typecheck/TcSplice.hs                     | 51 +++++++++++++++++++++-
 .../tests/overloadedrecflds/should_fail/T11103.hs  | 20 +++++++++
 .../overloadedrecflds/should_fail/T11103.stderr    |  6 +++
 .../tests/overloadedrecflds/should_fail/all.T      |  1 +
 .../should_run/overloadedrecfldsrun04.hs           | 15 ++++++-
 .../should_run/overloadedrecfldsrun04.stdout       |  5 ++-
 6 files changed, 95 insertions(+), 3 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4b161c93dba774cc8051cf40a2024ad86f3259f2

From git at git.haskell.org  Thu Dec 17 11:54:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:38 +0000 (UTC)
Subject: [commit: ghc] master: Add -fprint-typechecker-elaboration flag (fixes
 #10662) (d3dac4e)
Message-ID: <20151217115438.09EF63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d3dac4e3c8c7032151a8b89040f799cc5a9575d8/ghc

>---------------------------------------------------------------

commit d3dac4e3c8c7032151a8b89040f799cc5a9575d8
Author: Eugene Akentyev <ak3ntev at gmail.com>
Date:   Thu Dec 17 12:22:44 2015 +0100

    Add -fprint-typechecker-elaboration flag (fixes #10662)
    
    Reviewers: thomie, austin, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1625
    
    GHC Trac Issues: #10662


>---------------------------------------------------------------

d3dac4e3c8c7032151a8b89040f799cc5a9575d8
 compiler/hsSyn/HsBinds.hs                          | 22 ++++++++----
 compiler/main/DynFlags.hs                          |  2 ++
 docs/users_guide/using.rst                         | 41 ++++++++++++++++++++++
 testsuite/tests/deSugar/should_compile/T10662.hs   |  4 +++
 .../tests/deSugar/should_compile/T10662.stderr     |  6 ++++
 testsuite/tests/deSugar/should_compile/all.T       |  1 +
 testsuite/tests/roles/should_compile/T8958.stderr  |  7 ++--
 testsuite/tests/roles/should_compile/all.T         |  2 +-
 utils/mkUserGuidePart/Options/Verbosity.hs         |  6 ++++
 9 files changed, 80 insertions(+), 11 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d3dac4e3c8c7032151a8b89040f799cc5a9575d8

From git at git.haskell.org  Thu Dec 17 11:54:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:41 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11232. (cab1316)
Message-ID: <20151217115441.1E3933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cab131624ad0cdd54e2f3a70f93c1bd574ccf102/ghc

>---------------------------------------------------------------

commit cab131624ad0cdd54e2f3a70f93c1bd574ccf102
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Dec 17 12:18:47 2015 +0100

    Fix #11232.
    
    I somehow forgot to propagate roles into UnivCos. Very
    simple fix, happily.
    
    Test Plan: simplCore/should_compile/T11232
    
    Reviewers: bgamari, austin, simonpj
    
    Reviewed By: simonpj
    
    Subscribers: simonpj, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1645
    
    GHC Trac Issues: #11232


>---------------------------------------------------------------

cab131624ad0cdd54e2f3a70f93c1bd574ccf102
 compiler/types/OptCoercion.hs                      | 37 ++++++++++++----------
 testsuite/tests/simplCore/should_compile/T11232.hs | 15 +++++++++
 testsuite/tests/simplCore/should_compile/all.T     |  1 +
 3 files changed, 36 insertions(+), 17 deletions(-)

diff --git a/compiler/types/OptCoercion.hs b/compiler/types/OptCoercion.hs
index f68bc8c..436b16a 100644
--- a/compiler/types/OptCoercion.hs
+++ b/compiler/types/OptCoercion.hs
@@ -87,21 +87,24 @@ optCoercion :: TCvSubst -> Coercion -> NormalCo
 --   *and* optimises it to reduce its size
 optCoercion env co
   | opt_NoOptCoercion = substCo env co
-  | debugIsOn         = let out_co = opt_co1 lc False co
-                            Pair in_ty1  in_ty2  = coercionKind co
-                            Pair out_ty1 out_ty2 = coercionKind out_co
-                        in
-                        ASSERT2( substTy env in_ty1 `eqType` out_ty1 &&
-                                 substTy env in_ty2 `eqType` out_ty2
-                               , text "optCoercion changed types!"
-                              $$ hang (text "in_co:") 2 (ppr co)
-                              $$ hang (text "in_ty1:") 2 (ppr in_ty1)
-                              $$ hang (text "in_ty2:") 2 (ppr in_ty2)
-                              $$ hang (text "out_co:") 2 (ppr out_co)
-                              $$ hang (text "out_ty1:") 2 (ppr out_ty1)
-                              $$ hang (text "out_ty2:") 2 (ppr out_ty2)
-                              $$ hang (text "subst:") 2 (ppr env) )
-                        out_co
+  | debugIsOn
+  = let out_co = opt_co1 lc False co
+        (Pair in_ty1  in_ty2,  in_role)  = coercionKindRole co
+        (Pair out_ty1 out_ty2, out_role) = coercionKindRole out_co
+    in
+    ASSERT2( substTy env in_ty1 `eqType` out_ty1 &&
+             substTy env in_ty2 `eqType` out_ty2 &&
+             in_role == out_role
+           , text "optCoercion changed types!"
+             $$ hang (text "in_co:") 2 (ppr co)
+             $$ hang (text "in_ty1:") 2 (ppr in_ty1)
+             $$ hang (text "in_ty2:") 2 (ppr in_ty2)
+             $$ hang (text "out_co:") 2 (ppr out_co)
+             $$ hang (text "out_ty1:") 2 (ppr out_ty1)
+             $$ hang (text "out_ty2:") 2 (ppr out_ty2)
+             $$ hang (text "subst:") 2 (ppr env) )
+    out_co
+
   | otherwise         = opt_co1 lc False co
   where
     lc = mkSubstLiftingContext env
@@ -230,9 +233,9 @@ opt_co4 env sym rep r (AxiomInstCo con ind cos)
                                  cos)
       -- Note that the_co does *not* have sym pushed into it
 
-opt_co4 env sym _ r (UnivCo prov _r t1 t2)
+opt_co4 env sym rep r (UnivCo prov _r t1 t2)
   = ASSERT( r == _r )
-    opt_univ env sym prov r t1 t2
+    opt_univ env sym prov (chooseRole rep r) t1 t2
 
 opt_co4 env sym rep r (TransCo co1 co2)
                       -- sym (g `o` h) = sym h `o` sym g
diff --git a/testsuite/tests/simplCore/should_compile/T11232.hs b/testsuite/tests/simplCore/should_compile/T11232.hs
new file mode 100644
index 0000000..5b98d39
--- /dev/null
+++ b/testsuite/tests/simplCore/should_compile/T11232.hs
@@ -0,0 +1,15 @@
+module T11232 where
+
+import Control.Monad
+import Data.Data
+
+mkMp :: ( MonadPlus m
+        , Typeable a
+        , Typeable b
+        )
+     => (b -> m b)
+     -> a
+     -> m a
+mkMp ext = unM (maybe (M (const mzero)) id (gcast (M ext)))
+
+newtype M m x = M { unM :: x -> m x }
diff --git a/testsuite/tests/simplCore/should_compile/all.T b/testsuite/tests/simplCore/should_compile/all.T
index f9388c9..2ea15f6 100644
--- a/testsuite/tests/simplCore/should_compile/all.T
+++ b/testsuite/tests/simplCore/should_compile/all.T
@@ -228,3 +228,4 @@ test('T11155',
      normal,
      run_command,
      ['$MAKE -s --no-print-directory T11155'])
+test('T11232', normal, compile, ['-O2'])


From git at git.haskell.org  Thu Dec 17 11:54:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 11:54:43 +0000 (UTC)
Subject: [commit: ghc] master: users_guide: Remove extraneous vertical
 whitespace (575f0ad)
Message-ID: <20151217115443.B33013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/575f0ad67c2b036b686bf0b1b4d4c47d7d436b95/ghc

>---------------------------------------------------------------

commit 575f0ad67c2b036b686bf0b1b4d4c47d7d436b95
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 17 12:26:43 2015 +0100

    users_guide: Remove extraneous vertical whitespace


>---------------------------------------------------------------

575f0ad67c2b036b686bf0b1b4d4c47d7d436b95
 docs/users_guide/using.rst | 96 ++++++++++++----------------------------------
 1 file changed, 24 insertions(+), 72 deletions(-)

diff --git a/docs/users_guide/using.rst b/docs/users_guide/using.rst
index 1253355..b936ea4 100644
--- a/docs/users_guide/using.rst
+++ b/docs/users_guide/using.rst
@@ -18,15 +18,11 @@ quick introduction to the basic usage of GHC for compiling a Haskell
 program, before the following sections dive into the full syntax.
 
 Let's create a Hello World program, and compile and run it. First,
-create a file ``hello.hs`` containing the Haskell code:
-
-::
+create a file ``hello.hs`` containing the Haskell code: ::
 
     main = putStrLn "Hello, World!"
 
-To compile the program, use GHC like this:
-
-::
+To compile the program, use GHC like this: ::
 
     $ ghc hello.hs
 
@@ -40,9 +36,7 @@ By default GHC will be very quiet about what it is doing, only printing
 error messages. If you want to see in more detail what's going on behind
 the scenes, add ``-v`` to the command line.
 
-Then we can run the program like this:
-
-::
+Then we can run the program like this: ::
 
     $ ./hello
     Hello World!
@@ -72,9 +66,7 @@ Command-line arguments
    single: command-line; arguments
    single: arguments; command-line
 
-An invocation of GHC takes the following form:
-
-::
+An invocation of GHC takes the following form: ::
 
     ghc [argument...]
 
@@ -101,9 +93,7 @@ Haskell source file deliberately uses name shadowing, it should be
 compiled with the ``-Wno-name-shadowing`` option. Rather than
 maintaining the list of per-file options in a ``Makefile``, it is
 possible to do this directly in the source file using the
-``OPTIONS_GHC`` :ref:`pragma <options-pragma>`.
-
-::
+``OPTIONS_GHC`` :ref:`pragma <options-pragma>` ::
 
     {-# OPTIONS_GHC -Wno-name-shadowing #-}
     module X where
@@ -362,17 +352,13 @@ Using ``ghc`` ``--make``
 In this mode, GHC will build a multi-module Haskell program by following
 dependencies from one or more root modules (usually just ``Main``). For
 example, if your ``Main`` module is in a file called ``Main.hs``, you
-could compile and link the program like this:
-
-::
+could compile and link the program like this: ::
 
     ghc --make Main.hs
 
 In fact, GHC enters make mode automatically if there are any Haskell
 source files on the command line and no other mode is specified, so in
-this case we could just type
-
-::
+this case we could just type ::
 
     ghc Main.hs
 
@@ -432,9 +418,7 @@ Expression evaluation mode
 
 This mode is very similar to interactive mode, except that there is a
 single expression to evaluate which is specified on the command line as
-an argument to the ``-e`` option:
-
-::
+an argument to the ``-e`` option: ::
 
     ghc -e expr
 
@@ -443,16 +427,12 @@ loaded exactly as in interactive mode. The expression is evaluated in
 the context of the loaded modules.
 
 For example, to load and run a Haskell program containing a module
-``Main``, we might say
-
-::
+``Main``, we might say ::
 
     ghc -e Main.main Main.hs
 
 or we can just use this mode to evaluate expressions in the context of
-the ``Prelude``:
-
-::
+the ``Prelude``: ::
 
     $ ghc -e "interact (unlines.map reverse.lines)"
     hello
@@ -608,9 +588,7 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
     These three flags control the way in which GHC displays types, in
     error messages and in GHCi. Using ``-fprint-explicit-foralls`` makes
     GHC print explicit ``forall`` quantification at the top level of a
-    type; normally this is suppressed. For example, in GHCi:
-
-    ::
+    type; normally this is suppressed. For example, in GHCi: ::
 
         ghci> let f x = x
         ghci> :t f
@@ -622,17 +600,13 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
     However, regardless of the flag setting, the quantifiers are printed
     under these circumstances:
 
-    -  For nested ``foralls``, e.g.
-
-       ::
+    -  For nested ``foralls``, e.g. ::
 
            ghci> :t GHC.ST.runST
            GHC.ST.runST :: (forall s. GHC.ST.ST s a) -> a
 
     -  If any of the quantified type variables has a kind that mentions
-       a kind variable, e.g.
-
-       ::
+       a kind variable, e.g. ::
 
            ghci> :i Data.Type.Equality.sym
            Data.Type.Equality.sym ::
@@ -642,9 +616,7 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
 
     Using ``-fprint-explicit-kinds`` makes GHC print kind arguments in
     types, which are normally suppressed. This can be important when you
-    are using kind polymorphism. For example:
-
-    ::
+    are using kind polymorphism. For example: ::
 
         ghci> :set -XPolyKinds
         ghci> data T a = MkT
@@ -656,9 +628,7 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
 
     When ``-fprint-unicode-syntax`` is enabled, GHC prints type
     signatures using the unicode symbols from the ``-XUnicodeSyntax``
-    extension.
-
-    ::
+    extension. ::
 
         ghci> :set -fprint-unicode-syntax
         ghci> :t (>>)
@@ -684,25 +654,19 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
        single: -fprint-expanded-synonyms
 
     When enabled, GHC also prints type-synonym-expanded types in type
-    errors. For example, with this type synonyms:
-
-    ::
+    errors. For example, with this type synonyms: ::
 
         type Foo = Int
         type Bar = Bool
         type MyBarST s = ST s Bar
 
-    This error message:
-
-    ::
+    This error message: ::
 
         Couldn't match type 'Int' with 'Bool'
         Expected type: ST s Foo
           Actual type: MyBarST s
 
-    Becomes this:
-
-    ::
+    Becomes this: ::
 
         Couldn't match type 'Int' with 'Bool'
         Expected type: ST s Foo
@@ -716,27 +680,21 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
        single: -fprint-typechecker-elaboration
 
     When enabled, GHC also prints extra information from the typechecker in
-    warnings. For example:
-
-    ::
+    warnings. For example: ::
 
         main :: IO ()
         main = do
           return $ let a = "hello" in a
           return ()
 
-    This warning message:
-
-    ::
+    This warning message: ::
 
         A do-notation statement discarded a result of type ?[Char]?
         Suppress this warning by saying
           ?_ <- ($) return let a = "hello" in a?
         or by using the flag -fno-warn-unused-do-bind
 
-    Becomes this:
-
-    ::
+    Becomes this: ::
 
         A do-notation statement discarded a result of type ?[Char]?
         Suppress this warning by saying
@@ -760,21 +718,15 @@ See also the ``--help``, ``--version``, ``--numeric-version``, and
     relating to an error message. Normally, GHC emits the source
     location of the start of the syntactic entity only.
 
-    For example:
-
-    ::
+    For example: ::
 
         test.hs:3:6: parse error on input `where'
 
-    becomes:
-
-    ::
+    becomes: ::
 
         test296.hs:3:6-10: parse error on input `where'
 
-    And multi-line spans are possible too:
-
-    ::
+    And multi-line spans are possible too: ::
 
         test.hs:(5,4)-(6,7):
             Conflicting definitions for `a'


From git at git.haskell.org  Thu Dec 17 12:29:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 12:29:22 +0000 (UTC)
Subject: [commit: ghc] master: Improve pretty-printing in pprIfaceIdBndr
 (e7f22bf)
Message-ID: <20151217122922.8C3F83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e7f22bfb70d82dc92eb5ac5579d763e1a1f5522d/ghc

>---------------------------------------------------------------

commit e7f22bfb70d82dc92eb5ac5579d763e1a1f5522d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 14 13:34:26 2015 +0000

    Improve pretty-printing in pprIfaceIdBndr
    
    In particular, add parnes when we need an explicit type.


>---------------------------------------------------------------

e7f22bfb70d82dc92eb5ac5579d763e1a1f5522d
 compiler/iface/IfaceType.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/iface/IfaceType.hs b/compiler/iface/IfaceType.hs
index f744f81..640d104 100644
--- a/compiler/iface/IfaceType.hs
+++ b/compiler/iface/IfaceType.hs
@@ -565,7 +565,7 @@ pprIfaceLamBndr (b, IfaceNoOneShot) = ppr b
 pprIfaceLamBndr (b, IfaceOneShot)   = ppr b <> text "[OneShot]"
 
 pprIfaceIdBndr :: (IfLclName, IfaceType) -> SDoc
-pprIfaceIdBndr (name, ty) = hsep [ppr name, dcolon, ppr ty]
+pprIfaceIdBndr (name, ty) = parens (ppr name <+> dcolon <+> ppr ty)
 
 pprIfaceTvBndr :: IfaceTvBndr -> SDoc
 pprIfaceTvBndr (tv, IfaceTyConApp tc ITC_Nil)


From git at git.haskell.org  Thu Dec 17 12:29:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 12:29:25 +0000 (UTC)
Subject: [commit: ghc] master: Remove unused T10524.stderr (e32c2e1)
Message-ID: <20151217122925.2BA633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e32c2e1f2c0adbed1f726233d3552bf5e9aad833/ghc

>---------------------------------------------------------------

commit e32c2e1f2c0adbed1f726233d3552bf5e9aad833
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 16 10:38:54 2015 +0000

    Remove unused T10524.stderr


>---------------------------------------------------------------

e32c2e1f2c0adbed1f726233d3552bf5e9aad833
 testsuite/tests/deriving/should_fail/T10524.stderr | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/testsuite/tests/deriving/should_fail/T10524.stderr b/testsuite/tests/deriving/should_fail/T10524.stderr
deleted file mode 100644
index 1569972..0000000
--- a/testsuite/tests/deriving/should_fail/T10524.stderr
+++ /dev/null
@@ -1,10 +0,0 @@
-
-T10524.hs:7:58: error:
-    No instance for (Typeable WrappedFunctor)
-      arising from the 'deriving' clause of a data type declaration
-      GHC can't yet do polykinded
-        Typeable (WrappedFunctor :: (k -> *) -> k -> *)
-    Possible fix:
-      use a standalone 'deriving instance' declaration,
-        so you can specify the instance context yourself
-    When deriving the instance for (Data (WrappedFunctor f a))


From git at git.haskell.org  Thu Dec 17 12:42:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 12:42:02 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule (89d70f9)
Message-ID: <20151217124202.1FB5C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/89d70f9fe1ea989887cc73de2b71c7701c257e7a/ghc

>---------------------------------------------------------------

commit 89d70f9fe1ea989887cc73de2b71c7701c257e7a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 17 13:41:09 2015 +0100

    Update Cabal submodule
    
    Previously it didn't build on Windows.


>---------------------------------------------------------------

89d70f9fe1ea989887cc73de2b71c7701c257e7a
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 4e33454..e275a16 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 4e33454f5566c1ad3339c4bdf7444dff6c8fc21f
+Subproject commit e275a162ccac087f8b25b424551e8a1598dd5943


From git at git.haskell.org  Thu Dec 17 15:00:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 15:00:13 +0000 (UTC)
Subject: [commit: ghc] master: T9961 allocations crept further upwards
 (aee58e1)
Message-ID: <20151217150013.C50EB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/aee58e166c771ab1f72d22c008ecb326488c0909/ghc

>---------------------------------------------------------------

commit aee58e166c771ab1f72d22c008ecb326488c0909
Author: Ben Gamari <ben at well-typed.com>
Date:   Thu Dec 17 16:10:18 2015 +0200

    T9961 allocations crept further upwards
    
    Sad.


>---------------------------------------------------------------

aee58e166c771ab1f72d22c008ecb326488c0909
 testsuite/tests/perf/compiler/all.T | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/perf/compiler/all.T b/testsuite/tests/perf/compiler/all.T
index ae093be..184628a 100644
--- a/testsuite/tests/perf/compiler/all.T
+++ b/testsuite/tests/perf/compiler/all.T
@@ -714,11 +714,12 @@ test('T9872d',
 test('T9961',
      [ only_ways(['normal']),
        compiler_stats_num_field('bytes allocated',
-          [(wordsize(64), 708680480, 5),
+          [(wordsize(64), 745044392, 5),
           # 2015-01-12    807117816   Initally created
           # 2015-spring   772510192   Got better
           # 2015-05-22    663978160   Fix for #10370 improves it more
-          # 2015-10-28    708680480   Emit Typeable at definition site
+          # 2015-10-28    708680480   x86_64/Linux   Emit Typeable at definition site
+          # 2015-12-17    745044392   x86_64/Darwin  Creep upwards
            (wordsize(32), 375647160, 5)
           ]),
       ],


From git at git.haskell.org  Thu Dec 17 15:00:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 15:00:16 +0000 (UTC)
Subject: [commit: ghc] master: Disable recomp015 on ARM (e2e24f2)
Message-ID: <20151217150016.6E08D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e2e24f2808561e5e6e1086e2ee15bf320d879e46/ghc

>---------------------------------------------------------------

commit e2e24f2808561e5e6e1086e2ee15bf320d879e46
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 17 15:24:41 2015 +0100

    Disable recomp015 on ARM
    
    Due to differences in assembly syntax. See #11022.


>---------------------------------------------------------------

e2e24f2808561e5e6e1086e2ee15bf320d879e46
 testsuite/tests/driver/recomp015/all.T | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/driver/recomp015/all.T b/testsuite/tests/driver/recomp015/all.T
index 4ab3e88..1b91218 100644
--- a/testsuite/tests/driver/recomp015/all.T
+++ b/testsuite/tests/driver/recomp015/all.T
@@ -2,7 +2,9 @@
 
 test('recomp015',
      [ clean_cmd('$MAKE -s clean'),
-       unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip)],
+       # See ticket:11022#comment:7
+       unless(opsys('linux') or opsys('solaris2') or opsys('openbsd'), skip),
+       when(arch('arm'), skip)],
      run_command,
      ['$MAKE -s --no-print-directory recomp015'])
 


From git at git.haskell.org  Thu Dec 17 15:53:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 15:53:55 +0000 (UTC)
Subject: [commit: ghc] master: Remove warning-suppression flags for Cabal
 (ece8aff)
Message-ID: <20151217155355.7948A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ece8aff3470cac4cce497004bf8b7ea52612f095/ghc

>---------------------------------------------------------------

commit ece8aff3470cac4cce497004bf8b7ea52612f095
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 17 16:52:55 2015 +0100

    Remove warning-suppression flags for Cabal
    
    Cabal is currently warning free. So let's drop the `-w`-flags.
    
    /cc @dcoutts


>---------------------------------------------------------------

ece8aff3470cac4cce497004bf8b7ea52612f095
 mk/warnings.mk | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/mk/warnings.mk b/mk/warnings.mk
index dd79673..7efcf08 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -47,11 +47,6 @@ SRC_HC_WARNING_OPTS_STAGE2 += -Wnoncanonical-monad-instances
 # Libraries that have dubious RULES
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-inline-rule-shadowing
 
-# Cabal doesn't promise to be warning-free
-utils/ghc-cabal_dist_EXTRA_HC_OPTS += -w
-libraries/Cabal/Cabal_dist-boot_EXTRA_HC_OPTS += -w
-libraries/Cabal/Cabal_dist-install_EXTRA_HC_OPTS += -w
-
 # Turn off import warnings for bad unused imports
 libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports


From git at git.haskell.org  Thu Dec 17 17:22:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 17:22:06 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: #10712 is fixed (a2f04a2)
Message-ID: <20151217172206.844CA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a2f04a26fe6bf989fb3575d73cb2a07464ab81a5/ghc

>---------------------------------------------------------------

commit a2f04a26fe6bf989fb3575d73cb2a07464ab81a5
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Dec 17 18:18:30 2015 +0100

    Testsuite: #10712 is fixed
    
    Verified by running:
    
      make TEST='exceptionsrun001 T3279 conc012 conc014' slowtest


>---------------------------------------------------------------

a2f04a26fe6bf989fb3575d73cb2a07464ab81a5
 libraries/base/tests/all.T                  | 2 +-
 testsuite/tests/concurrent/should_run/all.T | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index 00b653b..da14cb2 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -84,7 +84,7 @@ test('enum02',          enum_setups, compile_and_run, [''])
 test('enum03',          enum_setups, compile_and_run, [''])
 test('enum04',          normal, compile_and_run, [''])
 
-test('exceptionsrun001', expect_broken_for(10712, opt_ways), compile_and_run, [''])
+test('exceptionsrun001',        normal, compile_and_run, [''])
 test('exceptionsrun002', 	normal, compile_and_run, [''])
 test('foldableArray',   normal, compile_and_run, [''])
 test('list001'	,	when(fast(), skip), compile_and_run, [''])
diff --git a/testsuite/tests/concurrent/should_run/all.T b/testsuite/tests/concurrent/should_run/all.T
index 760ac18..1dd1e1a 100644
--- a/testsuite/tests/concurrent/should_run/all.T
+++ b/testsuite/tests/concurrent/should_run/all.T
@@ -32,7 +32,7 @@ test('T367_letnoescape',
 test('T1980', normal, compile_and_run, [''])
 test('T2910', normal, compile_and_run, [''])
 test('T2910a', normal, compile_and_run, [''])
-test('T3279', expect_broken_for(10712, opt_ways), compile_and_run, [''])
+test('T3279', normal, compile_and_run, [''])
 
 # This test takes a long time with the default context switch interval
 test('T3429', extra_run_opts('+RTS -C0.001 -RTS'), compile_and_run, [''])
@@ -126,11 +126,11 @@ test('conc010', normal, compile_and_run, [''])
 
 # conc012(ghci) needs a smaller stack, or it takes forever
 test('conc012',
-     [extra_run_opts('+RTS -K8m -RTS'), expect_broken_for(10712, opt_ways)],
+     extra_run_opts('+RTS -K8m -RTS'),
      compile_and_run, [''])
 
 test('conc013', normal, compile_and_run, [''])
-test('conc014', expect_broken_for(10712, opt_ways), compile_and_run, [''])
+test('conc014', normal, compile_and_run, [''])
 test('conc015', normal, compile_and_run, [''])
 test('conc015a', normal, compile_and_run, [''])
 test('conc016', omit_ways(['threaded2']), # see comment in conc016.hs


From git at git.haskell.org  Thu Dec 17 17:22:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 17:22:09 +0000 (UTC)
Subject: [commit: ghc] master: Lexer: update outdated comments [skip ci]
 (9d9c534)
Message-ID: <20151217172209.320823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9d9c534796bf7ecc6271603707450b8d297aeb4a/ghc

>---------------------------------------------------------------

commit 9d9c534796bf7ecc6271603707450b8d297aeb4a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Nov 11 02:17:56 2015 +0100

    Lexer: update outdated comments [skip ci]
    
    The test for TemplateHaskell was removed in
    09015be8d580bc33f5f1960c8e31d00ba7a459a1.


>---------------------------------------------------------------

9d9c534796bf7ecc6271603707450b8d297aeb4a
 compiler/parser/Lexer.x | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/parser/Lexer.x b/compiler/parser/Lexer.x
index 084cd9e..cee8540 100644
--- a/compiler/parser/Lexer.x
+++ b/compiler/parser/Lexer.x
@@ -1425,9 +1425,9 @@ lex_stringgap s = do
 
 lex_char_tok :: Action
 -- Here we are basically parsing character literals, such as 'x' or '\n'
--- but, when Template Haskell is on, we additionally spot
--- 'x and ''T, returning ITsimpleQuote and ITtyQuote respectively,
--- but WITHOUT CONSUMING the x or T part  (the parser does that).
+-- but we additionally spot 'x and ''T, returning ITsimpleQuote and
+-- ITtyQuote respectively, but WITHOUT CONSUMING the x or T part
+-- (the parser does that).
 -- So we have to do two characters of lookahead: when we see 'x we need to
 -- see if there's a trailing quote
 lex_char_tok span buf _len = do        -- We've seen '
@@ -1460,7 +1460,7 @@ lex_char_tok span buf _len = do        -- We've seen '
                         finish_char_tok buf loc c
                 _other -> do            -- We've seen 'x not followed by quote
                                         -- (including the possibility of EOF)
-                                        -- If TH is on, just parse the quote only
+                                        -- Just parse the quote only
                         let (AI end _) = i1
                         return (L (mkRealSrcSpan loc end) ITsimpleQuote)
 


From git at git.haskell.org  Thu Dec 17 17:42:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 17:42:40 +0000 (UTC)
Subject: [commit: ghc] master: IO Handles: update comments [skip ci] (1b6323b)
Message-ID: <20151217174240.784753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b6323b3ad576ef1806170d8cea871038b51de5e/ghc

>---------------------------------------------------------------

commit 1b6323b3ad576ef1806170d8cea871038b51de5e
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Mon Dec 14 17:00:27 2015 +0100

    IO Handles: update comments [skip ci]
    
    * hSetEcho, hGetEcho and hIsTerminalDevice are part of the Haskell2010
    report (but not Haskell98)
    
    * there are great `Note`s in GHC.IO.Handle.Types. Link to them.


>---------------------------------------------------------------

1b6323b3ad576ef1806170d8cea871038b51de5e
 libraries/base/GHC/IO/Handle.hs           |  2 +-
 libraries/base/GHC/IO/Handle/Internals.hs | 12 ++++++++----
 libraries/base/GHC/IO/Handle/Types.hs     |  4 ++--
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/libraries/base/GHC/IO/Handle.hs b/libraries/base/GHC/IO/Handle.hs
index 750dbf7..c1d15a9 100644
--- a/libraries/base/GHC/IO/Handle.hs
+++ b/libraries/base/GHC/IO/Handle.hs
@@ -508,7 +508,7 @@ hIsSeekable handle =
       _                    -> IODevice.isSeekable haDevice
 
 -- -----------------------------------------------------------------------------
--- Changing echo status (Non-standard GHC extensions)
+-- Changing echo status
 
 -- | Set the echoing status of a handle connected to a terminal.
 
diff --git a/libraries/base/GHC/IO/Handle/Internals.hs b/libraries/base/GHC/IO/Handle/Internals.hs
index 581eb9b..5d8ddfd 100644
--- a/libraries/base/GHC/IO/Handle/Internals.hs
+++ b/libraries/base/GHC/IO/Handle/Internals.hs
@@ -480,15 +480,19 @@ flushCharBuffer h_ at Handle__{..} = do
     ReadBuffer  -> do
         flushCharReadBuffer h_
     WriteBuffer ->
+        -- Nothing to do here. Char buffer on a write Handle is always empty
+        -- between Handle operations.
+        -- See [note Buffer Flushing], GHC.IO.Handle.Types.
         when (not (isEmptyBuffer cbuf)) $
            error "internal IO library error: Char buffer non-empty"
 
 -- -----------------------------------------------------------------------------
 -- Writing data (flushing write buffers)
 
--- flushWriteBuffer flushes the buffer iff it contains pending write
--- data.  Flushes both the Char and the byte buffer, leaving both
--- empty.
+-- flushWriteBuffer flushes the byte buffer iff it contains pending write
+-- data. Because the Char buffer on a write Handle is always empty between
+-- Handle operations (see [note Buffer Flushing], GHC.IO.Handle.Types),
+-- both buffers are empty after this.
 flushWriteBuffer :: Handle__ -> IO ()
 flushWriteBuffer h_ at Handle__{..} = do
   buf <- readIORef haByteBuffer
@@ -519,7 +523,7 @@ writeCharBuffer h_ at Handle__{..} !cbuf = do
   debugIO ("writeCharBuffer after encoding: cbuf=" ++ summaryBuffer cbuf' ++
         " bbuf=" ++ summaryBuffer bbuf')
 
-          -- flush if the write buffer is full
+          -- flush the byte buffer if it is full
   if isFullBuffer bbuf'
           --  or we made no progress
      || not (isEmptyBuffer cbuf') && bufL cbuf' == bufL cbuf
diff --git a/libraries/base/GHC/IO/Handle/Types.hs b/libraries/base/GHC/IO/Handle/Types.hs
index c784c5c..195054a 100644
--- a/libraries/base/GHC/IO/Handle/Types.hs
+++ b/libraries/base/GHC/IO/Handle/Types.hs
@@ -122,10 +122,10 @@ data Handle__
     Handle__ {
       haDevice      :: !dev,
       haType        :: HandleType,           -- type (read/write/append etc.)
-      haByteBuffer  :: !(IORef (Buffer Word8)),
+      haByteBuffer  :: !(IORef (Buffer Word8)), -- See [note Buffering Implementation]
       haBufferMode  :: BufferMode,
       haLastDecode  :: !(IORef (dec_state, Buffer Word8)),
-      haCharBuffer  :: !(IORef (Buffer CharBufElem)), -- the current buffer
+      haCharBuffer  :: !(IORef (Buffer CharBufElem)), -- See [note Buffering Implementation]
       haBuffers     :: !(IORef (BufferList CharBufElem)),  -- spare buffers
       haEncoder     :: Maybe (TextEncoder enc_state),
       haDecoder     :: Maybe (TextDecoder dec_state),


From git at git.haskell.org  Thu Dec 17 17:57:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 17:57:47 +0000 (UTC)
Subject: [commit: ghc] master: Fix tcTyClTyVars to handle SigTvs (ae86eb9)
Message-ID: <20151217175747.ED48D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ae86eb9f72fa7220fe47ac54d6d21395691c1308/ghc

>---------------------------------------------------------------

commit ae86eb9f72fa7220fe47ac54d6d21395691c1308
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 15 13:47:14 2015 -0500

    Fix tcTyClTyVars to handle SigTvs
    
    Previously, tcTyClTyVars required that the names of the LHsQTyVars
    matched up exactly with the names of the kind of the given TyCon.
    It now does a bit of matching up when necessary to relax this
    restriction.
    
    This commit enables a few tests that had previously been disabled.
    
    The shortcoming this addresses is discussed in #11203, but that
    ticket is not directly addressed here.
    
    Test case: polykinds/SigTvKinds, perf/compiler/T9872d


>---------------------------------------------------------------

ae86eb9f72fa7220fe47ac54d6d21395691c1308
 compiler/typecheck/TcHsType.hs      | 179 +++++++++++++++++++++++++-----------
 testsuite/tests/perf/compiler/all.T |  12 +--
 testsuite/tests/polykinds/all.T     |   2 +-
 3 files changed, 130 insertions(+), 63 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ae86eb9f72fa7220fe47ac54d6d21395691c1308

From git at git.haskell.org  Thu Dec 17 17:57:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 17:57:51 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11230. (1722fa1)
Message-ID: <20151217175751.3AC093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1722fa106e10e63160bb2322e2ccb830fd5b9ab3/ghc

>---------------------------------------------------------------

commit 1722fa106e10e63160bb2322e2ccb830fd5b9ab3
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 15 17:36:32 2015 -0500

    Fix #11230.
    
    Previously, we were optimizing away all case expressions over
    coercions with dead binders. But sometimes we want to force
    the coercion expression. Like when it contains an error.
    
    Test case: typecheck/should_run/T11230


>---------------------------------------------------------------

1722fa106e10e63160bb2322e2ccb830fd5b9ab3
 compiler/coreSyn/CoreSubst.hs                      | 11 ++++----
 .../indexed-types/should_compile/T7837.stderr      |  3 +++
 testsuite/tests/typecheck/should_run/T11230.hs     | 31 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_run/T11230.stdout |  2 ++
 testsuite/tests/typecheck/should_run/all.T         |  1 +
 5 files changed, 42 insertions(+), 6 deletions(-)

diff --git a/compiler/coreSyn/CoreSubst.hs b/compiler/coreSyn/CoreSubst.hs
index 0668816..e77886b 100644
--- a/compiler/coreSyn/CoreSubst.hs
+++ b/compiler/coreSyn/CoreSubst.hs
@@ -56,8 +56,7 @@ import Coercion hiding ( substCo, substCoVarBndr )
 
 import TyCon       ( tyConArity )
 import DataCon
-import PrelNames   ( heqDataConKey, coercibleDataConKey, unpackCStringIdKey
-                   , unpackCStringUtf8IdKey )
+import PrelNames
 import OptCoercion ( optCoercion )
 import PprCore     ( pprCoreBindings, pprRules )
 import Module      ( Module )
@@ -67,7 +66,6 @@ import Id
 import Name     ( Name )
 import Var
 import IdInfo
-import Unique
 import UniqSupply
 import Maybes
 import ErrUtils
@@ -840,9 +838,7 @@ separate actions:
      is made in maybe_substitute. Note the rather specific check for
      MkCoercible in there.
 
-  2. Stripping silly case expressions, like the Coercible_SCSel one.
-     A case expression is silly if its binder is dead, it has only one,
-     DEFAULT, alternative, and the scrutinee is a coercion.
+  2. Stripping case expressions like the Coercible_SCSel one.
      See the `Case` case of simple_opt_expr's `go` function.
 
   3. Look for case expressions that unpack something that was
@@ -952,6 +948,9 @@ simple_opt_expr subst expr
       | isDeadBinder b
       , [(DEFAULT, _, rhs)] <- as
       , isCoercionType (varType b)
+      , (Var fun, _args) <- collectArgs e
+      , fun `hasKey` coercibleSCSelIdKey
+         -- without this last check, we get #11230
       = go rhs
 
       | otherwise
diff --git a/testsuite/tests/indexed-types/should_compile/T7837.stderr b/testsuite/tests/indexed-types/should_compile/T7837.stderr
index 838a8fb..a4d96b1 100644
--- a/testsuite/tests/indexed-types/should_compile/T7837.stderr
+++ b/testsuite/tests/indexed-types/should_compile/T7837.stderr
@@ -1,3 +1,6 @@
 Rule fired: Class op signum
 Rule fired: Class op abs
 Rule fired: normalize/Double
+Rule fired: Class op HEq_sc
+Rule fired: Class op HEq_sc
+Rule fired: Class op HEq_sc
diff --git a/testsuite/tests/typecheck/should_run/T11230.hs b/testsuite/tests/typecheck/should_run/T11230.hs
new file mode 100644
index 0000000..769b6ba
--- /dev/null
+++ b/testsuite/tests/typecheck/should_run/T11230.hs
@@ -0,0 +1,31 @@
+{-# LANGUAGE RoleAnnotations #-}
+{-# OPTIONS_GHC -fdefer-type-errors #-}
+
+module Main where
+
+import Control.Exception
+
+newtype Representational a = Representational ()
+type role Representational representational
+
+newtype Phantom a = Phantom ()
+type role Phantom phantom
+
+testRepresentational :: Representational Char -> Representational Bool
+testRepresentational = id
+{-# NOINLINE testRepresentational #-}
+
+testPhantom :: Phantom Char -> Phantom Bool
+testPhantom = id
+{-# NOINLINE testPhantom #-}
+
+throwsException :: String -> a -> IO ()
+throwsException c v = do
+  result <- try (evaluate v)
+  case result of
+    Right _ -> error (c ++ " (Failure): No exception!")
+    Left (TypeError _) -> putStrLn (c ++ "(Success): exception found")
+
+main = do
+  throwsException "representational" testRepresentational
+  throwsException "phantom" testPhantom
diff --git a/testsuite/tests/typecheck/should_run/T11230.stdout b/testsuite/tests/typecheck/should_run/T11230.stdout
new file mode 100644
index 0000000..b0ccf01
--- /dev/null
+++ b/testsuite/tests/typecheck/should_run/T11230.stdout
@@ -0,0 +1,2 @@
+representational(Success): exception found
+phantom(Success): exception found
diff --git a/testsuite/tests/typecheck/should_run/all.T b/testsuite/tests/typecheck/should_run/all.T
index def9ede..1c4f234 100755
--- a/testsuite/tests/typecheck/should_run/all.T
+++ b/testsuite/tests/typecheck/should_run/all.T
@@ -111,3 +111,4 @@ test('T9497c-run', [exit_code(1)], compile_and_run, ['-fdefer-type-errors -fno-w
 test('T9858c', normal, compile_and_run, [''])
 test('T9858d', normal, compile_and_run, [''])
 test('T10284', exit_code(1), compile_and_run, [''])
+test('T11230', normal, compile_and_run, [''])


From git at git.haskell.org  Thu Dec 17 20:25:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 20:25:32 +0000 (UTC)
Subject: [commit: ghc] master: Build system: also put scripts in
 libexecdir/bin (c1bd3d4)
Message-ID: <20151217202532.D15883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c1bd3d444f8c52c688fdbea695ee0ae7f402945d/ghc

>---------------------------------------------------------------

commit c1bd3d444f8c52c688fdbea695ee0ae7f402945d
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Dec 17 19:45:13 2015 +0100

    Build system: also put scripts in libexecdir/bin
    
    This follows a similar change in
    4905b83a2d448c65ccced385343d4e8124548a3b, where binaries are installed
    in libexecdir/bin instead of libexecdir.
    
    This fixes a problem with ghc not able to find ghc-split, when
    SplitObjs=YES.


>---------------------------------------------------------------

c1bd3d444f8c52c688fdbea695ee0ae7f402945d
 ghc.mk              | 17 ++++++-----------
 mk/install.mk.in    |  5 -----
 rules/build-perl.mk |  6 +++---
 3 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 64eb9bb..4455eb9 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -851,7 +851,7 @@ TAGS: TAGS_compiler
 # Installation
 
 install: install_libs install_packages install_libexecs \
-         install_bins install_topdirs
+         install_bins install_libexec_scripts
 ifeq "$(HADDOCK_DOCS)" "YES"
 install: install_docs
 endif
@@ -910,14 +910,11 @@ ifeq "$(Windows_Host)" "NO"
 endif
 endif
 
-install_topdirs: $(INSTALL_TOPDIR_BINS) $(INSTALL_TOPDIR_SCRIPTS)
-	$(INSTALL_DIR) "$(DESTDIR)$(topdir)"
-	for i in $(INSTALL_TOPDIR_BINS); do \
-		$(INSTALL_PROGRAM) $(INSTALL_BIN_OPTS) $$i "$(DESTDIR)$(topdir)"; \
-	done
-ifneq "$(INSTALL_TOPDIR_SCRIPTS)" ""
-	for i in $(INSTALL_TOPDIR_SCRIPTS); do \
-		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(topdir)"; \
+install_libexec_scripts: $(INSTALL_LIBEXEC_SCRIPTS)
+ifneq "$(INSTALL_LIBEXEC_SCRIPTS)" ""
+	$(INSTALL_DIR) "$(DESTDIR)$(ghclibexecdir)/bin"
+	for i in $(INSTALL_LIBEXEC_SCRIPTS); do \
+		$(INSTALL_SCRIPT) $(INSTALL_OPTS) $$i "$(DESTDIR)$(ghclibexecdir)/bin"; \
 	done
 endif
 
@@ -1035,8 +1032,6 @@ $(eval $(call bindist-list,.,\
     $(libffi_HEADERS) \
     $(INSTALL_LIBEXECS) \
     $(INSTALL_LIBEXEC_SCRIPTS) \
-    $(INSTALL_TOPDIR_BINS) \
-    $(INSTALL_TOPDIR_SCRIPTS) \
     $(INSTALL_BINS) \
     $(INSTALL_SCRIPTS) \
     $(INSTALL_MANPAGES) \
diff --git a/mk/install.mk.in b/mk/install.mk.in
index 38e6459..e404397 100644
--- a/mk/install.mk.in
+++ b/mk/install.mk.in
@@ -100,11 +100,6 @@ else
 
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
-#
-# datadir is set to libdir here as GHC needs package.conf and unlit
-# to be in the same place (and things like ghc-pkg need to agree on
-# where package.conf is, so we just set it globally).
-#
 ghclibdir     = $(libdir)/$(CrossCompilePrefix)ghc-$(ProjectVersion)
 ghcdocdir     = $(datarootdir)/doc/ghc
 endif
diff --git a/rules/build-perl.mk b/rules/build-perl.mk
index 5a1660c..58660fc 100644
--- a/rules/build-perl.mk
+++ b/rules/build-perl.mk
@@ -36,7 +36,7 @@ ifneq "$$($$($1_$2_PROG)_INPLACE)" ""
 $$(error $$($1_$2_PROG)_INPLACE defined twice)
 endif
 ifeq "$$($1_$2_TOPDIR)" "YES"
-$$($1_$2_PROG)_INPLACE = $$(INPLACE_TOPDIR)/$$($1_$2_PROG)
+$$($1_$2_PROG)_INPLACE = $$(INPLACE_LIB)/bin/$$($1_$2_PROG)
 else
 $$($1_$2_PROG)_INPLACE = $$(INPLACE_BIN)/$$($1_$2_PROG)
 endif
@@ -66,11 +66,11 @@ $$($1_$2_INPLACE): $1/$2/$$($1_$2_PROG) | $$$$(dir $$$$@)/.
 endif
 
 ifeq "$$($1_$2_INSTALL)" "YES"
-# Don't add to INSTALL_BINS or INSTAL_TOPDIR_BINS, because they will get
+# Don't add to INSTALL_BINS or INSTALL_LIBEXECS, because they will get
 # stripped when calling 'make install-strip', and stripping a Perl script
 # doesn't work.
 ifeq "$$($1_$2_TOPDIR)" "YES"
-INSTALL_TOPDIR_SCRIPTS += $$($1_$2_INPLACE)
+INSTALL_LIBEXEC_SCRIPTS += $$($1_$2_INPLACE)
 else
 INSTALL_SCRIPTS += $$($1_$2_INPLACE)
 endif


From git at git.haskell.org  Thu Dec 17 20:25:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 20:25:35 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: allow spaces in TEST_HC passed in by
 the user (272e1cc)
Message-ID: <20151217202535.79ADA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/272e1cc811e5d693d8a36e63c90a1ece68a0495a/ghc

>---------------------------------------------------------------

commit 272e1cc811e5d693d8a36e63c90a1ece68a0495a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Oct 28 10:35:08 2015 +0100

    Testsuite: allow spaces in TEST_HC passed in by the user
    
    Don't use the GNU make function 'realpath' (reverting e66a81c6),
    because it doesn't handle spaces in paths. Instead, use 'cygpath' to
    convert Windows style paths (e.g. C:/foo/) to mingw style paths (e.g.
    c/foo/), and then call 'which'.
    
    Tests:
     * make TEST_HC=ghc
     * make TEST_HC=/d/home/thomie/ghc-validate/bindisttest/install\ \ \ dir/bin/ghc
     * make TEST_HC=D:/home/thomie/ghc-validate/bindisttest/install\ \ \ dir/bin/ghc
    
    Reviewed by: Phyx
    
    Differential Revision: https://phabricator.haskell.org/D1431


>---------------------------------------------------------------

272e1cc811e5d693d8a36e63c90a1ece68a0495a
 testsuite/mk/boilerplate.mk | 30 +++++++++++++-----------------
 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/testsuite/mk/boilerplate.mk b/testsuite/mk/boilerplate.mk
index 3039879..5f4a3e9 100644
--- a/testsuite/mk/boilerplate.mk
+++ b/testsuite/mk/boilerplate.mk
@@ -24,7 +24,9 @@ show:
 
 define canonicalise
 # $1 = path variable
-$1_CYGPATH := $$(shell $(SHELL) -c "cygpath -m '$$($1)'" 2> /dev/null)
+# Don't use 'cygpath -m', because it doesn't change drive letters to
+# something 'which' can understand.
+$1_CYGPATH := $$(shell $(SHELL) -c "cygpath '$$($1)'" 2> /dev/null)
 ifneq "$$($1_CYGPATH)" ""
 # We use 'override' in case we are trying to update a value given on
 # the commandline (e.g. TEST_HC)
@@ -121,25 +123,19 @@ else
 IMPLICIT_COMPILER = NO
 endif
 IN_TREE_COMPILER = NO
-# We want to support both "ghc" and "/usr/bin/ghc" as values of TEST_HC
-# passed in by the user, but
-#     which ghc          == /usr/bin/ghc
-#     which /usr/bin/ghc == /usr/bin/ghc
-# so on unix-like platforms we can just always 'which' it.
-# However, on cygwin, we can't just use which:
-#     $ which c:/ghc/ghc-7.4.1/bin/ghc.exe
-#     which: no ghc.exe in (./c:/ghc/ghc-7.4.1/bin)
-# so we start off by using realpath, and if that succeeds then we use
-# that value. Otherwise we fall back on 'which'.
-#
+
+# As values of TEST_HC passed in by the user, we want to support:
+#  * both "ghc" and "/usr/bin/ghc"
+#      We use 'which' to convert the former to the latter.
+#  * both "C:/path/to/ghc.exe" and "/c/path/to/ghc.exe"
+#      We use 'cygpath' to convert the former to the latter, because
+#      'which' can't handle paths starting with a drive letter.
+#  * paths that contain spaces
+#      So we can't use the GNU make function 'realpath'.
 # Note also that we need to use 'override' in order to override a
 # value given on the commandline.
-TEST_HC_REALPATH := $(realpath $(TEST_HC))
-ifeq "$(TEST_HC_REALPATH)" ""
+$(eval $(call canonicaliseExecutable,TEST_HC))
 override TEST_HC := $(shell which '$(TEST_HC)')
-else
-override TEST_HC := $(TEST_HC_REALPATH)
-endif
 endif # "$(TEST_HC)" ""
 
 # We can't use $(dir ...) here as TEST_HC might be in a path


From git at git.haskell.org  Thu Dec 17 20:25:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 20:25:38 +0000 (UTC)
Subject: [commit: ghc] master: Build system: allow bindist without docs
 (116ba5e)
Message-ID: <20151217202538.2577E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/116ba5e702916a938ab72970437efa5fd26287b7/ghc

>---------------------------------------------------------------

commit 116ba5e702916a938ab72970437efa5fd26287b7
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Tue Oct 27 23:43:58 2015 +0100

    Build system: allow bindist without docs
    
    Useful for testing 'make binary-dist-prep' when HADDOCK_DOCS=NO.
    
    Reviewed by: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1648


>---------------------------------------------------------------

116ba5e702916a938ab72970437efa5fd26287b7
 ghc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ghc.mk b/ghc.mk
index 4455eb9..ba9aead 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1039,7 +1039,7 @@ $(eval $(call bindist-list,.,\
     $(INSTALL_LIBRARY_DOCS) \
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
     docs/index.html \
-    compiler/stage2/doc \
+    $(wildcard compiler/stage2/doc) \
     $(wildcard libraries/*/dist-install/doc/) \
     $(wildcard libraries/*/*/dist-install/doc/) \
     $(filter-out settings,$(INSTALL_LIBS)) \


From git at git.haskell.org  Thu Dec 17 20:25:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 20:25:40 +0000 (UTC)
Subject: [commit: ghc] master: Suppress warnings when compiling primitive and
 random (f1fa383)
Message-ID: <20151217202540.BC1883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f1fa3839047925c75278f0a83835478e3aa437da/ghc

>---------------------------------------------------------------

commit f1fa3839047925c75278f0a83835478e3aa437da
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Oct 22 17:50:03 2015 +0200

    Suppress warnings when compiling primitive and random
    
    And fix a redundant constraint warning in a test that requires
    primitive.


>---------------------------------------------------------------

f1fa3839047925c75278f0a83835478e3aa437da
 mk/warnings.mk                                   | 5 +++++
 testsuite/tests/deriving/should_compile/T8138.hs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/mk/warnings.mk b/mk/warnings.mk
index 7efcf08..9107abc 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -79,6 +79,11 @@ libraries/pretty_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 
 # primitive has a warning about deprecated use of GHC.IOBase
 libraries/primitive_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
+# primitive uses deprecated Control.Monad.Trans.Error
+libraries/primitive_dist-install_EXTRA_HC_OPTS += -Wno-deprecations
+
+# See https://github.com/haskell/random/pull/20
+libraries/random_dist-install_EXTRA_HC_OPTS += -Wno-redundant-constraints
 
 # temporarily turn off unused-imports warnings for terminfo
 libraries/terminfo_dist-boot_EXTRA_HC_OPTS += -fno-warn-unused-imports
diff --git a/testsuite/tests/deriving/should_compile/T8138.hs b/testsuite/tests/deriving/should_compile/T8138.hs
index 2e7e47b..e6d9781 100644
--- a/testsuite/tests/deriving/should_compile/T8138.hs
+++ b/testsuite/tests/deriving/should_compile/T8138.hs
@@ -22,7 +22,7 @@ mutableByteArrayFromList xs = do
     loop arr 0 xs
     return arr
   where
-    loop :: (Prim a) => MutableByteArray s -> Int -> [a] -> ST s ()
+    loop :: MutableByteArray s -> Int -> [a] -> ST s ()
     loop _ _ [] = return ()
 
     loop arr i (x : xs) = do


From git at git.haskell.org  Thu Dec 17 20:42:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 20:42:06 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: mark frontend01 conditionally
 expect_broken on #10301 (bc436f9)
Message-ID: <20151217204206.6ED2D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc436f9ec51eb54aaebfbcd7de9c10543d629917/ghc

>---------------------------------------------------------------

commit bc436f9ec51eb54aaebfbcd7de9c10543d629917
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Thu Dec 17 21:42:04 2015 +0100

    Testsuite: mark frontend01 conditionally expect_broken on #10301
    
    This should fix validate on Travis.


>---------------------------------------------------------------

bc436f9ec51eb54aaebfbcd7de9c10543d629917
 testsuite/tests/plugins/all.T | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/plugins/all.T b/testsuite/tests/plugins/all.T
index 2e4aacf..1f9ec3b 100644
--- a/testsuite/tests/plugins/all.T
+++ b/testsuite/tests/plugins/all.T
@@ -63,5 +63,8 @@ test('T10294a',
      run_command,
      ['$MAKE -s --no-print-directory T10294a'])
 
-test('frontend01', [ extra_clean(['FrontendPlugin.hi', 'FrontendPlugin.o', 'frontend01', 'frontend01.o', 'frontend01.hi']) ],
+test('frontend01',
+     [extra_clean(['FrontendPlugin.hi', 'FrontendPlugin.o',
+                   'frontend01', 'frontend01.o', 'frontend01.hi']),
+      unless(have_dynamic(), expect_broken(10301))],
      run_command, ['$MAKE -s --no-print-directory frontend01'])


From git at git.haskell.org  Thu Dec 17 21:03:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:03:16 +0000 (UTC)
Subject: [commit: ghc] master: Move Data.Functor.(Classes, Compose, Product,
 Sum) into base (e0e03d5)
Message-ID: <20151217210316.98C373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e0e03d5b9d5cd678f6402534451964d491f16540/ghc

>---------------------------------------------------------------

commit e0e03d5b9d5cd678f6402534451964d491f16540
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Thu Dec 17 20:22:25 2015 +0100

    Move Data.Functor.(Classes,Compose,Product,Sum) into base
    
    These modules were previously provided by the `transformers`
    package. Hence the submodule update.
    
    This patch was originally contributed by M Farkas-Dyck and
    subsequently taken over and completed by Ryan.
    
    The original proposal discussion can be found at
    https://mail.haskell.org/pipermail/libraries/2015-July/026014.html
    
    This addresses #11135
    
    Differential Revision: https://phabricator.haskell.org/D1543


>---------------------------------------------------------------

e0e03d5b9d5cd678f6402534451964d491f16540
 libraries/base/Data/Functor/Classes.hs | 470 +++++++++++++++++++++++++++++++++
 libraries/base/Data/Functor/Compose.hs |  99 +++++++
 libraries/base/Data/Functor/Product.hs |  97 +++++++
 libraries/base/Data/Functor/Sum.hs     |  77 ++++++
 libraries/base/base.cabal              |   4 +
 libraries/base/changelog.md            |   4 +
 libraries/transformers                 |   2 +-
 testsuite/tests/perf/haddock/all.T     |   3 +-
 8 files changed, 754 insertions(+), 2 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e0e03d5b9d5cd678f6402534451964d491f16540

From git at git.haskell.org  Thu Dec 17 21:53:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:33 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts/StgCRun.c: Add d15 to clobbered
 regs (c8e36e2)
Message-ID: <20151217215333.61BB63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/c8e36e230940f850915836fd69f7d4c045ac49a2/ghc

>---------------------------------------------------------------

commit c8e36e230940f850915836fd69f7d4c045ac49a2
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Oct 13 09:45:39 2015 +1100

    rts/StgCRun.c: Add d15 to clobbered regs


>---------------------------------------------------------------

c8e36e230940f850915836fd69f7d4c045ac49a2
 rts/StgCRun.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index c9bbef0..9e80d02 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -834,7 +834,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
         "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
         "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
         "%x30",
-        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14", "%d15"
+        /* Since all these registers listed as clobbered are being explicitly
+         * saved and restored, they should probably not be listed as
+         * clobbered. Leaving them as is for now while I debug other
+         * issues.
+         */
     );
     return r;
 }


From git at git.haskell.org  Thu Dec 17 21:53:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:36 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts: Fix clobbered regs list for
 aarch64 StgRun (f13bf92)
Message-ID: <20151217215336.085743A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/f13bf9287f8f04f69bcbda6df37eedea78fd4336/ghc

>---------------------------------------------------------------

commit f13bf9287f8f04f69bcbda6df37eedea78fd4336
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Jun 3 05:54:23 2015 +0000

    rts: Fix clobbered regs list for aarch64 StgRun


>---------------------------------------------------------------

f13bf9287f8f04f69bcbda6df37eedea78fd4336
 rts/StgCRun.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 0a010d4..c9bbef0 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -829,8 +829,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
 
       : "=r" (r)
       : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
-        : "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25", "%x26", "%x27", "%x28",
-          "%x16", "%x17", "%x30"
+
+      : "%x16", "%x17", /* Exclude %r18 (platform/temporary register) */
+        "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
+        "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
+        "%x30",
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
     );
     return r;
 }


From git at git.haskell.org  Thu Dec 17 21:53:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:38 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Linker: WIP on supporting
 Arm64/AArch64 (728d57b)
Message-ID: <20151217215338.A02963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/728d57b51343854e29c92cc4ea09147c3afb3ae7/ghc

>---------------------------------------------------------------

commit 728d57b51343854e29c92cc4ea09147c3afb3ae7
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Oct 23 14:35:20 2015 +1100

    Linker: WIP on supporting Arm64/AArch64


>---------------------------------------------------------------

728d57b51343854e29c92cc4ea09147c3afb3ae7
 rts/Linker.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 7ca7e94..5a1a991 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4131,16 +4131,24 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define FALSE 0
 #define TRUE  1
 
-#if defined(sparc_HOST_ARCH)
+#if sparc_HOST_ARCH
 #  define ELF_TARGET_SPARC  /* Used inside <elf.h> */
-#elif defined(i386_HOST_ARCH)
+#elif i386_HOST_ARCH
 #  define ELF_TARGET_386    /* Used inside <elf.h> */
-#elif defined(x86_64_HOST_ARCH)
+#elif x86_64_HOST_ARCH
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
-#elif defined(powerpc64_HOST_ARCH)
+#elif powerpc64_HOST_ARCH
+#  define ELF_64BIT
+#elif aarch64_HOST_ARCH
 #  define ELF_64BIT
+#elif (arm_HOST_ARCH || arm_HOST_ARCH_PRE_ARMv7 || arm_HOST_ARCH_PRE_ARMv7 \
+		|| powerpc_HOST_ARCH)
+   /* Nothing here */
+#else
+	/* Need this so that new architectures get a compile error. */
+# error "Unknown HOST_ARCH"
 #endif
 
 #if !defined(openbsd_HOST_OS)
@@ -4471,6 +4479,10 @@ ocVerifyImage_ELF ( ObjectCode* oc )
 #elif defined(EM_AMD64)
       case EM_AMD64: IF_DEBUG(linker,debugBelch( "amd64" )); break;
 #endif
+#ifdef EM_AARCH64
+      case EM_AARCH64: IF_DEBUG(linker,debugBelch( "aarch64" )); break;
+#endif
+
       default:       IF_DEBUG(linker,debugBelch( "unknown" ));
                      errorBelch("%s: unknown architecture (e_machine == %d)"
                                 , oc->fileName, ehdr->e_machine);
@@ -5272,7 +5284,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
 #if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
 #endif
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
 #endif
@@ -5290,7 +5302,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    }
 
    for (j = 0; j < nent; j++) {
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
       Elf_Addr  offset = rtab[j].r_offset;
       Elf_Addr  P      = targ + offset;
@@ -5595,12 +5607,55 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
       }
 #endif
 
+	case R_AARCH64_ABS64:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ABS64");
+          *(Elf64_Xword *)P = S + A;
+          break;
+
+	case R_AARCH64_ADR_PREL_PG_HI21:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADR_PREL_PG_HI21");
+          {
+            uint64_t final_address = (uint64_t) rtab + rtab[j].r_offset ;
+            // Operation: Page(S+A) - Page(P)
+            uint64_t result = ((S + A) & ~0xfffULL) - (final_address & ~0xfffULL);
+
+printf ("ehdrC: %p\nrtab : %p\n\n", ehdrC, rtab) ;
+
+printf ("rtab 0x%lx + 0x%lx -> 0x%lx\n", (uint64_t) rtab, (uint64_t) rtab[j].r_offset, final_address) ;
+printf ("S 0x%lx + A 0x%lx : 0x%lx\n", S, A, S + A) ;
+printf ("result 0x%lx\n", result) ;
+
+            // Check that -2^32 <= X < 2^32
+            if (result >> 32)
+                 barf ("%s: overflow check failed for relocation", oc->fileName);
+
+            *(Elf64_Xword *)P &= 0x9f00001fU;
+            // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
+            // from bits 32:12 of X.
+            *(Elf64_Xword *)P |= ((result & 0x3000U) << (29 - 12));
+            *(Elf64_Xword *)P |= ((result & 0x1ffffc000ULL) >> (14 - 5));
+          }
+          break;
+
+	case R_AARCH64_CALL26:
+	case R_AARCH64_JUMP26:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_CALL26/JUMP64");
+          {
+              // These two are handled in the same way.
+          }
+          break;
+
+	case R_AARCH64_ADD_ABS_LO12_NC:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADD_ABS_LO12_NC");
+          {
+          }
+          break;
+
          default:
             errorBelch("%s: unhandled ELF relocation(RelA) type %" FMT_Word "\n",
                   oc->fileName, (W_)ELF_R_TYPE(info));
             return 0;
       }
-
    }
    return 1;
 }


From git at git.haskell.org  Thu Dec 17 21:53:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:41 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Implement AArch64 codegen in
 `mkJumpToAddr` (for GHCi) (686720d)
Message-ID: <20151217215341.4484D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/686720d4f64e7c2244b446697a918c2832db6a65/ghc

>---------------------------------------------------------------

commit 686720d4f64e7c2244b446697a918c2832db6a65
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Dec 17 20:45:17 2015 +1100

    Implement AArch64 codegen in `mkJumpToAddr` (for GHCi)


>---------------------------------------------------------------

686720d4f64e7c2244b446697a918c2832db6a65
 libraries/ghci/GHCi/InfoTable.hsc | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index d9d6314..cbd58a4 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -54,6 +54,7 @@ funPtrToInt :: FunPtr a -> Int
 funPtrToInt (FunPtr a) = I## (addr2Int## a)
 
 data Arch = ArchSPARC | ArchPPC | ArchX86 | ArchX86_64 | ArchAlpha | ArchARM
+ | ArchARM64
  deriving Show
 
 platform :: Arch
@@ -70,6 +71,8 @@ platform =
        ArchAlpha
 #elif defined(arm_HOST_ARCH)
        ArchARM
+#elif defined(aarch64_HOST_ARCH)
+       ArchARM64
 #endif
 
 mkJumpToAddr :: EntryFunPtr -> ItblCodes
@@ -173,6 +176,22 @@ mkJumpToAddr a = case platform of
                 , 0x11, 0xff, 0x2f, 0xe1
                 , byte0 w32, byte1 w32, byte2 w32, byte3 w32]
 
+    ArchARM64 { } ->
+        -- Generates:
+        --
+        --      ldr     x1, label
+        --      br      x1
+        -- label:
+        --      .quad <addr>
+        --
+        -- which looks like:
+        --     0:       58000041        ldr     x1, <label>
+        --     4:       d61f0020        br      x1
+       let w64 = fromIntegral (funPtrToInt a) :: Word64
+       in Right [ 0x58000041
+                , 0xd61f0020
+                , fromIntegral w64
+                , fromIntegral (w64 `shiftR` 32) ]
 
 byte0 :: (Integral w) => w -> Word8
 byte0 w = fromIntegral w


From git at git.haskell.org  Thu Dec 17 21:53:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:43 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: configure.ac: AArch64 is now
 registerised (e404cb5)
Message-ID: <20151217215343.DC48B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/e404cb5a13808715ac043cfbc2d5024633a5bb14/ghc

>---------------------------------------------------------------

commit e404cb5a13808715ac043cfbc2d5024633a5bb14
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Jul 5 11:22:24 2015 +0000

    configure.ac: AArch64 is now registerised


>---------------------------------------------------------------

e404cb5a13808715ac043cfbc2d5024633a5bb14
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 0f335a4..c112d97 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,7 +240,7 @@ AC_SUBST(SOLARIS_BROKEN_SHLD)
 dnl ** Do an unregisterised build?
 dnl --------------------------------------------------------------
 case "$HostArch" in
-    i386|x86_64|powerpc|powerpc64|powerpc64le|arm)
+    i386|x86_64|powerpc|powerpc64|powerpc64le|arm|aarch64)
         UnregisterisedDefault=NO
         ;;
     *)


From git at git.haskell.org  Thu Dec 17 21:53:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 21:53:47 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd's head updated: Implement AArch64
 codegen in `mkJumpToAddr` (for GHCi) (686720d)
Message-ID: <20151217215347.7AD913A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/aarch64-regd' now includes:

     fe95463 ApiAnnotations: Add SourceText for unicode tokens
     ee91482 ApiAnnotations : ITopenExpQuote needs SourceText
     83b214d RtsFlags: Clean up stale CPP
     b8a849b users-guide: Limit column width
     69822f0 RtsFlags: Refactor some of the deeper switches
     7485d0c ghc.mk: Make install_docs rule sh-compatible
     82cf672 haddock.mk: Use \{1,\} instead of \+
     3773e91 Use TcM instead of it's expanded form, in TcSplice
     741cf18 Weaken monadic list operations to Applicative
     e2d9821 Data.List.isSubsequenceOf documentation clarification
     2d1a563 Implement support for user-defined type errors.
     3d88e89 s/FrontendMerge/FrontendInterface/g
     9193629 Move usage calculation to desugaring, simplifying ModGuts.
     ac1a379 Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
     df8169c Bump process submodule
     4e74ef9 T9181: Fix testsuite output
     615ba5f Remove orphan Functor instance of Data.Graph.SCC
     7c9cbfd template-haskell: drop `TemplateHaskell` requirement
     b3d6c0f Update Cabal submodule for new known extension
     8ad9e74 Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
     acce37f Fix archive loading on Windows by the runtime loader
     7b962ba Implement OverloadedLabels
     233d131 MonadFail proposal, phase 1
     98a4fa5 DynFlags: Don't list TemplateHaskell as supported if it's not
     11e336e More import related hints
     f405e1e Disable failed specialisation warnings by default & update documentation.
     f9e17fd Add -fwarn-missing-monadfail-instance to mkUserGuidePart
     6b3d5b5 rts: Kill PAPI support
     c945c90 base: Documentation for TypeError
     112ce87 docs: Ignore Sphinx doctrees produced by manpage build
     3ee0c14 Improve MonadFail errors by mentioning the pattern
     2f7e895 users-guide: Give links more contrast
     a0f977e relnotes: Update base version
     8eefdf0 users-guide: Use tango pygments style
     02eb44d users-guide: Fix typo in conf.py
     2d0e1db Comments only
     8e8d26a Comments on TcRnTypes.canDischarge
     07eb258 Refactor HsExpr.RecordCon, RecordUpd
     c61759d Fix inconsistent pretty-printing of type families
     cc79dd1 users-guide: Move <h1> outside of <a> tag
     971f2c9 Correct &gt; to > in user's guide
     a41830f Mention "-XMonadFailDesugaring" in the docs
     a586622 Release Notes: Mention out-of-scope error message improvements
     2442038 Fix interaction of DuplicateRecordFields and GHC.Generics
     3e2a4ee Fix broken build-system when libffi uses install-sh
     65d7ff0 Make `derivedConstants` more crosscompile-friendly
     7dfde0e derivedConstants: Add support for AIX
     c5d8162 Make GHC aware of OSAIX and AixLD
     75036aa Set AIX specific CFLAGS flags
     fce0465 Unbreak Text.Read.Lex.lex on Unicode symbols
     d732ce0 Bump process submodule
     b72ca3e Pattern Synonym Documentation
     a689c8e ghci: don't let ctags/etags overwrite source files
     1994304 user's guide: Fix some accidental triple-` quote
     998c371 users-guide: Fix version number
     7e6dcf4 base: Delete errant GHC/Stack.hsc
     f40fe62 Follow-up fixup to c5d8162d230c373
     7f77e4e Fix Windows builds after D1242
     d585073 RtsFlags: Fix const warning
     192dd06 Suppress conflicting types for builtins warnings
     6664ab8 Add DVarSet - a deterministic set of Vars
     2325bd4 Create a deterministic version of tyVarsOfType
     b98ff3c Function definition in GHCi
     a703fbc Remove accidentally added T10359 blob
     4976ab2 Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
     638fde5 Add comment to Parser.y re extra API Annotation
     64737f2 New expected test output for 32 bit platforms
     3df9563 ApiAnnotations: Make all RdrName occurences Located
     6393dd8 Make abstractVars deterministic in SetLevel
     02c689c build.mk.sample: Document meaning of WERROR
     5d6cfbc Rip out Papi configure check
     7c9a04d Add a note explaining why every RdrName is Located
     dbad0d5 Libdw: Fix build on 32-bit platforms
     70ee638 Libdw: Fix initial register collection on i386
     36b2139 rts: Expose more libdw symbols
     a3a8ce6 rts: Add simple resource pool
     6fbf22d rts: Add LibdwPool, a pool for libdw sessions
     bb249aa base: Add Haskell interface to ExecutionStack
     7aaeaf8 Support multiple debug output levels
     40be909 Dwarf: Ensure tick parentage is preserved
     9471562 Output source notes in extended DWARF DIEs
     5955510 Improve constraint-used-as-type error msg
     70efb62 Add tests/monadfail/Makefile
     e587217 Add the rest of the notes for Located RdrName
     1c45f41 rts: Always export Libdw* symbols
     12dbc89 Add `PrelNames.thenAName` for `Applicative(*>)`
     f09f247 Implement new `-fwarn-noncanonical-monad-instances`
     c05fddd Rearrange error msgs and add section markers (Trac #11014).
     6d14793 Add -Wcompat warning flag group
     e506f02 Rewrite checkUniques and incorporate into validate
     8c5fe53 DynFlags: Update comments to reflect new users guide
     8dc6da8 Comments only
     5e04c38 Simplify the MonadFail code
     76f3142 DynFlags: Drop stale comment
     9032d05 update link to MonadFail proposal
     924f851 Refactor default methods (Trac #11105)
     e9a4c09 Comments only
     e913676 Add a simplifier trace for eta-expansion
     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     36c1247 Remove duplicated line
     44c3e37 Fix warning about unused pattern variable
     b432e2f Make the determinism tests more robust
     1e041b7 Refactor treatment of wildcards
     218fdf9 Make the order of fixities in the iface file deterministic
     741f837 Implement more deterministic operations and document them
     52b02e6 Comments only (isIrrefutablePat)
     b564731 Comments (TcSMonad)
     d00cdf2 Revert "ghci: Add support for prompt functions"
     1caff20 StgSyn: Remove unused SRT constructor
     c75948b Move Stg-specific code from DynFlags to SimplStg
     d4d54b4 Remove *.xml from gitignore
     a12e47b Avoid panic due to partial ieName
     8cba907 Create empty dump files when there was nothing to dump
     0d1a2d2 ErrUtils: Spruce up Haddocks
     e7929ba Update bytestring submodule
     d25f3c0 users_guide/glasgow_exts.rst: fix link markup
     8a50610 Major Overhaul of Pattern Match Checking (Fixes #595)
     43a31fe testsuite: haddock.compiler: Bump expected allocations
     a034031 extending_ghc.rst: fix broken link (Trac #10950)
     c5597bb Revert "Create empty dump files when there was nothing to dump"
     7b29b0b Fix haddock syntax
     0dd61fe Kill redundant patterns
     934b3a0 Update test output
     40fc353 Bump hoopl submodule
     ae4398d Improve performance for PM check on literals (Fixes #11160 and #11161)
     99d01e1 Remove unused import in deSugar/TmOracle.hs
     7af29da Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
     cd9f3bf RTS: Rename InCall.stat struct field to .rstat
     6ef351d On AIX we need -D_BSD defined in <Stg.h>
     d40f5b7 PmExpr: Fix CPP unacceptable too clang's CPP
     36a208f Use builtin ISO 8859-1 decoder in mkTextEncoding
     befc4e4 Check: More Clang/CPP wibbles
     e9220da Bump allocations for T783
     dc33e4c T5642 is broken
     96e67c0 T5642: Skip it entirely
     5b2b7e3 Make callToPats deterministic in SpecConstr
     1c9fd3f Case-of-empty-alts is trivial (Trac #11155)
     28035c0 Add derived constraints for wildcard signatures
     1cb3c8c Wibbles only
     822141b Make -dppr-debug show contents of (TypeError ...)
     1160dc5 Fix egregious error in eta-reduction of data families
     31b482b Minor refactoring of user type errors
     67565a7 Tidy user type errors in checkValidType
     43a5970 Comments only
     16aae60 T5642: Fix skip usage
     caa6851 testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
     d4bf863 Update peak_megabytes_allocated for T9675
     020375d Add linter to check for binaries accidentally added to repository
     901cab1 lint: Add linter to catch uses of ASSERT macro that Clang dislikes
     c865c42 StgCmmMonad: Implement Outputable instance for Sequel for debugging
     e2c518e libdw: enable support only on i386 and amd64
     81cf200 pmcheck: Comments about term equality representation
     406444b pmcheck: Comments about undecidability of literal equality
     8f28797 Fix broken linters when using python3
     c714f8f Use git.h.o copy of arcanist-external-json-linter
     a14296c Temporarily disable external-json linters
     51d08d8 Enable non-canonical Monad instance warnings for stage1/2
     314bc99 ghc.mk: cleanup: use tab consistently
     d6512c7 ghc.mk: don't run mkUserGuidePart more than once
     13ab2c6 ghc.mk: fix docs re-rebuilding
     5f1e42f Allow to compile OSMem.c when MEM_NORESERVE is not available
     df67940 Make ghc.mk compatible with pedantic /bin/sh impls
     986ceb1 Implement new `-fwarn-noncanonical-monoid-instances`
     8b42214 Tweak use of AC_USE_SYSTEM_EXTENSIONS
     be92c28 Update hoopl submodule
     f5127c8 linters/check-cpp: Don't produce debug log
     3ea4fb7 Documentation: escape characters in template-haskell Haddocks
     42a5469 Ignore generated linter.log
     3d55e41 ghc-pkg: Restore old behavior in colored version; fixes 6119
     8cef8af Re-export data family when exporting a data instance without an export list
     91e985c Minor stylistic fixes in glasgow_exts.rst
     2110037 Add isImport, isDecl, and isStmt functions to GHC API
     d4bcd05 rts: Remove space before argument list in ASSERTs
     700c42b Use TypeLits in the meta-data encoding of GHC.Generics
     51a5e68 Refactor ConDecl
     1bd40c8 Move checking for missing signatures to RnNames.reportUnusedNames
     151c4b0 ghc-pkg: don't sort packages unnecessarily
     04e1c27 rts: One more Clang-unfriendly CPP usage
     0933331 Re-use `transformers`'s `MaybeT` rather than our own
     b292720 Remove redundant CPP conditionals
     834f9a4 Get rid of tcView altogether
     2f6e87a Introduce HasGhciState class and refactor use-sites
     9f4ca5a Associate ErrorCall pattern with ErrorCall type
     fd3b845 Make HasDynFlags more transformers friendly
     7a40a6c Update libffi-tarballs submodule to libffi 3.1 (re #10238)
     bb753c5 Rename s/7.12.1/8.0.1/ two minor occurences
     2cfa5db Fix double MaybeT instance
     2106d86 Fix typo sneaked in with fd3b845c01aa26b6e5
     69c3964 docs/glasgow_exts: Use warning admonition
     e792711 users_guide: Show sub-sub-sections in ToC
     aa6ae8a Comments only
     6c794c3 Comments about polymorphic recursion
     d7729c7 An assortment of typos
     7997d6c Refactor GHCi Command type; allow "hidden" commands
     31bddc4 Add missing whitespace in toArgs' error msg
     af77089 Fix DeriveAnyClass (Trac #9968)
     e9ea020 Comments only
     8317893 Improve documentation for DeriveAnyClass
     688069c More typos in comments/docs
     602889a Test Trac #11192
     f4f00c0 Test Trac #11187
     41ef8f7 Make sure PatSyns only get added once to tcg_patsyns
     f7c17c8 T7478: Don't expect broken on Darwin
     5447c20 Mark retc001 as broken on Darwin
     262954c T4801: Update expected allocations on Darwin
     c205aeb Removed colon append operation (fixes #10785)
     b138248 Improved data family export documentation
     ceaf0f4 testsuite: Only run recomp015 on ELF-based platforms
     6e56ac5 Fix infix record field fixity (#11167 and #11173).
     6746549 Add kind equalities to GHC.
     5183109 Revert README.md changes from 6746549772c5
     a6e0394 haddock: Fix submodule commit to point to ghc-head
     b5d5d83 Revert .gitmodules changes from 6746549772c5
     a459451 rm rae.txt
     68f198f Test case for #7961.
     779dfea Test #9017 in polykinds/T9017
     a3c2a26 Frontend plugins.
     1883afb Implement -fwarn-missing-pat-syn-sigs
     3ec8288 Rework the Implicit CallStack solver to handle local lets.
     4935b48 Make -XStrict imply -XStrictData
     3640ae9 Dwarf: Use .short instead of .hword on Darwin
     aaed24a Build system: fix 'make install-strip' in bindist
     9934819 Refactor type families in Template Haskell
     59cc6ed Fix release notes markup
     669c5ed Remove redundant imports
     f48015b configure: add support for 'sh4' (Trac #11209)
     0bf0cf9 Update Cabal submodule
     fcc6b1d Use idiomatic way to tell Autoconf the c compiler
     baed2f5 Don't pass CC= explicitly to `./configure` scripts
     65920c9 Some more typos in comments
     04ab55d Use Cxt for deriving clauses in TH (#10819)
     023f11f Suggest import Data.Kinds when * is out of scope
     419b6c0 Make binds in do-blocks strict when -XStrict (#11193)
     59d3948 Add testcase for #11216
     402bbe6 Add IsString Outputable.SDoc instance
     05fe546 Test #9632 in dependent/should_compile/T9632
     ddde542 DynFlags Remove -fwarn-context-quantification flag
     9017f16 Mention "handle is semi-closed" in error messages
     05a5ebe Fix runghc when $1_$2_SHELL_WRAPPER = NO
     6d9c18c DynFlags: remove Opt_Static
     33742db DynFlags: delete function that doesn't do anything
     f4dd486 Document -XOverloadedLabels
     8e6f9bf TysWiredIn: Fix a comment - Note [TYPE] is in TysPrim
     4c9d1ea Update expected test output for 32 bit platforms
     f4d90f9 Reset process submodule to v1.4.1.0 release tag
     d1ca5d2 Fix formatting complaint from Sphinx
     98cdaee Improve documentation for -XStrict
     b8ca645 Comments on equality types and classes
     6eabb6d Allow recursive (undecidable) superclasses
     947e44f Comment layout only
     e2c9173 Narrow scope of special-case for unqualified printing of names in core libraries
     758e6b3 base: NonEmpty: Fix documentation example
     a701694 Add testcase for #11224
     28638df primops: Mark actions evaluated by `catch*` as lazy
     c1e2553 Expose enabled language extensions to TH
     50c795c Update pretty submodule to v1.1.3.2 release
     3a48e6e Update binary submodule to binary-0.8 snapshot
     2206fa8 Add `-W(no-)xxx` aliases for `-f(no-)warn-xxx` flags
     437ebdd Start using `-W` instead of `-f(no-)warn` in some places
     d36e9e1 GHC.Stack: Fix Haddock markup
     4c7da9c Update haddock submodule
     ab79ed7 Improve detection of `fdatasync(2)` (re #11137)
     11b9ada Synchronize Haddock submodule with master branch
     efaa51d Look through type synonyms in GADT kind signatures
     046b47a Note [The equality types story] in TysPrim
     b35cc1f Update Cabal submodule to latest snapshot
     1687f99 Update transformers submodule to latest v0.5.0.0
     6c9258d Add test for #10897
     7221ad7 GHC doesn't have a way to ask for user-package-db, so Cabal reimplemented it.
     4905b83 Remote GHCi, -fexternal-interpreter
     a6d664c accept output
     dd3837a Fix tests when run in parallel
     acd447e Bump haddock expected performance numbers
     b20a65d testsuite: Add missing LiteralsTest2.hs
     786d528 TcTypeable: Don't use bogus fingerprints when suppress-uniques is enabled
     62e60bb Fix haddock hyperlinker
     27f47cd Fix libffi dependency, and remove redundant LibFFI.hsc
     0cc4aad Build system: Cabalize genapply
     86ad116 Add Shake configuration to configure.ac
     109d847 Build system: Make cGhcRtsWithLibdw flag a proper Bool
     e58a936 rules/haddock: Add EXTRA_HADDOCK_OPTS flag
     4f870f8 Conditionally show plural "s" in warnings
     cab1316 Fix #11232.
     4b161c9 Reify DuplicateRecordFields by label, rather than by selector
     d3dac4e Add -fprint-typechecker-elaboration flag (fixes #10662)
     575f0ad users_guide: Remove extraneous vertical whitespace
     e7f22bf Improve pretty-printing in pprIfaceIdBndr
     e32c2e1 Remove unused T10524.stderr
     89d70f9 Update Cabal submodule
     aee58e1 T9961 allocations crept further upwards
     e2e24f2 Disable recomp015 on ARM
     ece8aff Remove warning-suppression flags for Cabal
     a2f04a2 Testsuite: #10712 is fixed
     9d9c534 Lexer: update outdated comments [skip ci]
     1b6323b IO Handles: update comments [skip ci]
     ae86eb9 Fix tcTyClTyVars to handle SigTvs
     1722fa1 Fix #11230.
     c1bd3d4 Build system: also put scripts in libexecdir/bin
     272e1cc Testsuite: allow spaces in TEST_HC passed in by the user
     116ba5e Build system: allow bindist without docs
     f1fa383 Suppress warnings when compiling primitive and random
     bc436f9 Testsuite: mark frontend01 conditionally expect_broken on #10301
     e0e03d5 Move Data.Functor.(Classes,Compose,Product,Sum) into base
     f13bf92 rts: Fix clobbered regs list for aarch64 StgRun
     e404cb5 configure.ac: AArch64 is now registerised
     c8e36e2 rts/StgCRun.c: Add d15 to clobbered regs
     728d57b Linker: WIP on supporting Arm64/AArch64
     686720d Implement AArch64 codegen in `mkJumpToAddr` (for GHCi)

From git at git.haskell.org  Thu Dec 17 23:04:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 23:04:16 +0000 (UTC)
Subject: [commit: ghc] master: Update containers submodule to v0.5.7.0 release
 (c5c72aa)
Message-ID: <20151217230416.0234C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c5c72aaf1bfd7fd8b1455ba0e64a313a68c837e3/ghc

>---------------------------------------------------------------

commit c5c72aaf1bfd7fd8b1455ba0e64a313a68c837e3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 17 23:30:53 2015 +0100

    Update containers submodule to v0.5.7.0 release
    
    This is the designated release to go with GHC 8.0.1
    
    This release doesn't need any warning-suppression flags anymore, so
    remove those from mk/warnings.mk
    
    /cc @foxik


>---------------------------------------------------------------

c5c72aaf1bfd7fd8b1455ba0e64a313a68c837e3
 libraries/containers                      | 2 +-
 mk/warnings.mk                            | 5 -----
 testsuite/tests/driver/T10970.stdout      | 2 +-
 testsuite/tests/package/package01e.stderr | 8 ++++----
 testsuite/tests/th/TH_Roles2.stderr       | 2 +-
 5 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index 6405653..d86ba69 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit 6405653480afa675eec804616547b8625244bc7c
+Subproject commit d86ba69819e716d9ee021cf3b34ba7244f2e1649
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 9107abc..63b705f 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -48,7 +48,6 @@ SRC_HC_WARNING_OPTS_STAGE2 += -Wnoncanonical-monad-instances
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-inline-rule-shadowing
 
 # Turn off import warnings for bad unused imports
-libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
@@ -56,10 +55,6 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 # haddock's attoparsec uses deprecated `inlinePerformIO`
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
 
-# containers uses bitSize at the moment
-libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-deprecations
-libraries/containers_dist-install_EXTRA_HC_OPTS += -Wno-redundant-constraints
-
 # On Windows, there are also some unused import warnings
 ifeq "$(HostOS_CPP)" "mingw32"
 libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index 9476b7c..18e75ef 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.6.3
+0.5.7.0
 OK
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 33e2deb..103b0fe 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
 
-package01e.hs:2:1:
+package01e.hs:2:1: error:
     Failed to load interface for ?Data.Map?
-    It is a member of the hidden package ?containers-0.5.6.3?.
+    It is a member of the hidden package ?containers-0.5.7.0?.
     Use -v to see a list of the files searched for.
 
-package01e.hs:3:1:
+package01e.hs:3:1: error:
     Failed to load interface for ?Data.IntMap?
-    It is a member of the hidden package ?containers-0.5.6.3?.
+    It is a member of the hidden package ?containers-0.5.7.0?.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index a8a4ed1..0eec5ac 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
 Dependent packages: [array-0.5.1.0, base-4.9.0.0, binary-0.8.0.0,
-                     bytestring-0.10.7.0, containers-0.5.6.3, deepseq-1.4.2.0,
+                     bytestring-0.10.7.0, containers-0.5.7.0, deepseq-1.4.2.0,
                      ghc-boot-0.0.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.0,
                      pretty-1.1.3.2, template-haskell-2.11.0.0]
 


From git at git.haskell.org  Thu Dec 17 23:31:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 17 Dec 2015 23:31:16 +0000 (UTC)
Subject: [commit: ghc] master: Random typo fixes (3dd06d5)
Message-ID: <20151217233116.51A213A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3dd06d5e710f1c64268eec2587c57bad46080636/ghc

>---------------------------------------------------------------

commit 3dd06d5e710f1c64268eec2587c57bad46080636
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 17 23:59:59 2015 +0100

    Random typo fixes
    
    [skip ci]


>---------------------------------------------------------------

3dd06d5e710f1c64268eec2587c57bad46080636
 compiler/cmm/CmmParse.y            | 2 +-
 compiler/coreSyn/CoreArity.hs      | 2 +-
 compiler/coreSyn/CoreUtils.hs      | 2 +-
 compiler/iface/IfaceSyn.hs         | 2 +-
 compiler/main/Elf.hs               | 2 +-
 docs/stg-spec/stg-spec.mng         | 2 +-
 docs/users_guide/editing-guide.rst | 2 +-
 includes/rts/Constants.h           | 2 +-
 libraries/ghci/GHCi/Message.hs     | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/compiler/cmm/CmmParse.y b/compiler/cmm/CmmParse.y
index 8aa3a79..2cbb7b2 100644
--- a/compiler/cmm/CmmParse.y
+++ b/compiler/cmm/CmmParse.y
@@ -192,7 +192,7 @@ where info_ptr and field1..fieldN describe the stack frame, and
 arg1..argN are the arguments passed to f using the NativeNodeCall
 convention. Note if a field is longer than a word (e.g. a D_ on
 a 32-bit machine) then the call will push as many words as
-necessary to the stack to accomodate it (e.g. 2).
+necessary to the stack to accommodate it (e.g. 2).
 
 
 ----------------------------------------------------------------------------- -}
diff --git a/compiler/coreSyn/CoreArity.hs b/compiler/coreSyn/CoreArity.hs
index e832f54..0f392ae 100644
--- a/compiler/coreSyn/CoreArity.hs
+++ b/compiler/coreSyn/CoreArity.hs
@@ -440,7 +440,7 @@ ArityType 'at', then
    assuming the calls of f respect the one-shot-ness of
    its definition.
 
-   NB 'f' is an arbitary expression, eg (f = g e1 e2).  This 'f'
+   NB 'f' is an arbitrary expression, eg (f = g e1 e2).  This 'f'
    can have ArityType as ATop, with length as > 0, only if e1 e2 are
    themselves.
 
diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 059abf1..9d887ec 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -539,7 +539,7 @@ trimConArgs :: AltCon -> [CoreArg] -> [CoreArg]
 -- >        C b x y -> ...
 --
 -- We want to drop the leading type argument of the scrutinee
--- leaving the arguments to match agains the pattern
+-- leaving the arguments to match against the pattern
 
 trimConArgs DEFAULT      args = ASSERT( null args ) []
 trimConArgs (LitAlt _)   args = ASSERT( null args ) []
diff --git a/compiler/iface/IfaceSyn.hs b/compiler/iface/IfaceSyn.hs
index 247566c..b5929e0 100644
--- a/compiler/iface/IfaceSyn.hs
+++ b/compiler/iface/IfaceSyn.hs
@@ -80,7 +80,7 @@ infixl 3 &&&
 -}
 
 type IfaceTopBndr = OccName
-  -- It's convenient to have an OccName in the IfaceSyn, altough in each
+  -- It's convenient to have an OccName in the IfaceSyn, although in each
   -- case the namespace is implied by the context. However, having an
   -- OccNames makes things like ifaceDeclImplicitBndrs and ifaceDeclFingerprints
   -- very convenient.
diff --git a/compiler/main/Elf.hs b/compiler/main/Elf.hs
index 6dd1019..50f11a7 100644
--- a/compiler/main/Elf.hs
+++ b/compiler/main/Elf.hs
@@ -36,7 +36,7 @@ import qualified Data.ByteString.Lazy.Char8 as B8
    ELF (Executable and Linking Format) is described in the System V Application
    Binary Interface (or ABI). The latter is composed of two parts: a generic
    part and a processor specific part. The generic ABI describes the parts of
-   the interface that remain constant accross all hardware implementations of
+   the interface that remain constant across all hardware implementations of
    System V.
 
    The latest release of the specification of the generic ABI is the version
diff --git a/docs/stg-spec/stg-spec.mng b/docs/stg-spec/stg-spec.mng
index cf8a716..ce5ca3f 100644
--- a/docs/stg-spec/stg-spec.mng
+++ b/docs/stg-spec/stg-spec.mng
@@ -132,7 +132,7 @@ acts as a pointer to the value on the heap.
 \gram{\ottheap}
 
 Execution procedes until a return value (a literal or a variable, i.e.
-pointer to the heap) is produced.  To accomodate for let-no-escape
+pointer to the heap) is produced.  To accommodate for let-no-escape
 bindings, we also allow execution to terminate with a jump to a function
 application of a let-no-escape variable.
 
diff --git a/docs/users_guide/editing-guide.rst b/docs/users_guide/editing-guide.rst
index 64db781..ff3d4b8 100644
--- a/docs/users_guide/editing-guide.rst
+++ b/docs/users_guide/editing-guide.rst
@@ -91,7 +91,7 @@ The above would be rendered as,
 Headings
 ~~~~~~~~
 
-While ReST can accomodate a wide range of heading styles, we have standardized
+While ReST can accommodate a wide range of heading styles, we have standardized
 on this convention in the User's Guide,
 
 .. code-block:: rest
diff --git a/includes/rts/Constants.h b/includes/rts/Constants.h
index 02cb632..6e44410 100644
--- a/includes/rts/Constants.h
+++ b/includes/rts/Constants.h
@@ -115,7 +115,7 @@
    How much Haskell stack space to reserve for the saving of registers
    etc. in the case of a stack/heap overflow.
 
-   This must be large enough to accomodate the largest stack frame
+   This must be large enough to accommodate the largest stack frame
    pushed in one of the heap check fragments in HeapStackCheck.hc
    (ie. currently the generic heap checks - 3 words for StgRetDyn,
    18 words for the saved registers, see StgMacros.h).
diff --git a/libraries/ghci/GHCi/Message.hs b/libraries/ghci/GHCi/Message.hs
index bdf29cb..0d28c68 100644
--- a/libraries/ghci/GHCi/Message.hs
+++ b/libraries/ghci/GHCi/Message.hs
@@ -208,7 +208,7 @@ instance Binary a => Binary (EvalResult a)
 --
 -- * We print them, e.g. "*** Exception: <something>"
 -- * UserInterrupt has a special meaning
--- * In ghc -e, exitWith should exit with the appropraite exit code
+-- * In ghc -e, exitWith should exit with the appropriate exit code
 --
 -- So all we need to do is distinguish UserInterrupt and ExitCode, and
 -- all other exceptions can be represented by their 'show' string.


From git at git.haskell.org  Fri Dec 18 00:01:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 00:01:12 +0000 (UTC)
Subject: [commit: ghc] master: ghci: fix UNREG build (missing fromJust import)
 (06cb695)
Message-ID: <20151218000112.667803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/06cb695c17f3df70255181e3205ff2b64ba016fa/ghc

>---------------------------------------------------------------

commit 06cb695c17f3df70255181e3205ff2b64ba016fa
Author: Sergei Trofimovich <slyfox at gentoo.org>
Date:   Fri Dec 18 00:00:41 2015 +0000

    ghci: fix UNREG build (missing fromJust import)
    
    libraries/ghci/GHCi/InfoTable.hsc:249:45: error:
        ? Variable not in scope: fromJust :: Maybe EntryFunPtr -> a0
        ? Perhaps you meant ?fromList? (imported from GHC.Exts)
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>
    
    Test Plan: build --enable-unregisterised ghc
    
    Reviewers: simonmar, bgamari, austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1649


>---------------------------------------------------------------

06cb695c17f3df70255181e3205ff2b64ba016fa
 libraries/ghci/GHCi/InfoTable.hsc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index d9d6314..1a1116f 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -11,6 +11,9 @@ module GHCi.InfoTable
   , conInfoPtr
   ) where
 
+#if !defined(TABLES_NEXT_TO_CODE)
+import Data.Maybe (fromJust)
+#endif
 import Foreign
 import Foreign.C
 import GHC.Ptr


From git at git.haskell.org  Fri Dec 18 00:50:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 00:50:42 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite Windows: fix sigof01m,
 sigof012m and sigof02dm (8d45ccd)
Message-ID: <20151218005042.24E493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8d45ccddafa7c8da4a01d74a0c6810e36258cf84/ghc

>---------------------------------------------------------------

commit 8d45ccddafa7c8da4a01d74a0c6810e36258cf84
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 00:45:28 2015 +0100

    Testsuite Windows: fix sigof01m, sigof012m and sigof02dm


>---------------------------------------------------------------

8d45ccddafa7c8da4a01d74a0c6810e36258cf84
 testsuite/tests/driver/sigof01/all.T                    |  2 +-
 testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32  |  8 --------
 testsuite/tests/driver/sigof02/all.T                    |  4 ++--
 testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 | 10 ----------
 testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32  | 11 -----------
 5 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/testsuite/tests/driver/sigof01/all.T b/testsuite/tests/driver/sigof01/all.T
index d0cdc3c..077263a 100644
--- a/testsuite/tests/driver/sigof01/all.T
+++ b/testsuite/tests/driver/sigof01/all.T
@@ -4,6 +4,6 @@ test('sigof01',
      ['$MAKE -s --no-print-directory sigof01'])
 
 test('sigof01m',
-     [ clean_cmd('rm -rf tmp_sigof01m') ],
+     [ clean_cmd('rm -rf tmp_sigof01m'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof01m'])
diff --git a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32 b/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
deleted file mode 100644
index 898dc7a..0000000
--- a/testsuite/tests/driver/sigof01/sigof01m.stdout-mingw32
+++ /dev/null
@@ -1,8 +0,0 @@
-[1 of 4] Compiling A                ( A.hs, tmp_sigof01m\A.o )
-[2 of 4] Compiling B[boot]          ( B.hs-boot, tmp_sigof01m\B.o-boot )
-[3 of 4] Compiling B[merge]         ( B.hi, tmp_sigof01m\B.o )
-[4 of 4] Compiling Main             ( Main.hs, tmp_sigof01m\Main.o )
-Linking tmp_sigof01m/Main.exe ...
-False
-T
-True
diff --git a/testsuite/tests/driver/sigof02/all.T b/testsuite/tests/driver/sigof02/all.T
index 9cb1ea5..68c08ef 100644
--- a/testsuite/tests/driver/sigof02/all.T
+++ b/testsuite/tests/driver/sigof02/all.T
@@ -9,7 +9,7 @@ test('sigof02t',
      ['$MAKE -s --no-print-directory sigof02t'])
 
 test('sigof02m',
-     [ clean_cmd('rm -rf tmp_sigof02m') ],
+     [ clean_cmd('rm -rf tmp_sigof02m'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof02m'])
 
@@ -30,7 +30,7 @@ test('sigof02dt',
 
 
 test('sigof02dm',
-     [ clean_cmd('rm -rf tmp_sigof02dm') ],
+     [ clean_cmd('rm -rf tmp_sigof02dm'), normalise_slashes ],
      run_command,
      ['$MAKE -s --no-print-directory sigof02dm'])
 
diff --git a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
deleted file mode 100644
index 7fde989..0000000
--- a/testsuite/tests/driver/sigof02/sigof02dm.stdout-mingw32
+++ /dev/null
@@ -1,10 +0,0 @@
-[1 of 5] Compiling MapAsSet[boot]   ( MapAsSet.hs-boot, tmp_sigof02dm\MapAsSet.o-boot )
-[2 of 5] Compiling MapAsSet[merge]  ( MapAsSet.hi, tmp_sigof02dm\MapAsSet.o )
-[3 of 5] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02dm\Map.o-boot )
-[4 of 5] Compiling Map[merge]       ( Map.hi, tmp_sigof02dm\Map.o )
-[5 of 5] Compiling Main             ( Double.hs, tmp_sigof02dm\Main.o )
-Linking tmp_sigof02dm/Double.exe ...
-False
-fromList [0,6]
-[(0,"foo"),(6,"foo")]
-fromList [(0,"foo"),(6,"foo")]
diff --git a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32 b/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
deleted file mode 100644
index f7cca89..0000000
--- a/testsuite/tests/driver/sigof02/sigof02m.stdout-mingw32
+++ /dev/null
@@ -1,11 +0,0 @@
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot )
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o )
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o )
-Linking tmp_sigof02m/StrictMain.exe ...
-[1 of 3] Compiling Map[boot]        ( Map.hs-boot, tmp_sigof02m\Map.o-boot ) [sig-of changed]
-[2 of 3] Compiling Map[merge]       ( Map.hi, tmp_sigof02m\Map.o ) [sig-of changed]
-[3 of 3] Compiling Main             ( Main.hs, tmp_sigof02m\Main.o ) [Map changed]
-Linking tmp_sigof02m/LazyMain.exe ...
-False
-[(0,"foo"),(6,"foo")]
-fromList [(0,"foo"),(6,"foo")]


From git at git.haskell.org  Fri Dec 18 00:50:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 00:50:44 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite Windows: fix ghcpkg03 and ghcpkg05
 (dc8b647)
Message-ID: <20151218005044.C076F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dc8b64748f7871e519ab962a8822245ab87c42ae/ghc

>---------------------------------------------------------------

commit dc8b64748f7871e519ab962a8822245ab87c42ae
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 00:49:45 2015 +0100

    Testsuite Windows: fix ghcpkg03 and ghcpkg05


>---------------------------------------------------------------

dc8b64748f7871e519ab962a8822245ab87c42ae
 testsuite/tests/cabal/ghcpkg03.stderr-mingw32 |  6 +++---
 testsuite/tests/cabal/ghcpkg05.stderr         | 23 -----------------------
 testsuite/tests/cabal/ghcpkg05.stderr-mingw32 |  2 +-
 3 files changed, 4 insertions(+), 27 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc dc8b64748f7871e519ab962a8822245ab87c42ae

From git at git.haskell.org  Fri Dec 18 00:50:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 00:50:47 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: widen lazy-bs-alloc 3->5% (98ccb72)
Message-ID: <20151218005047.6239A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/98ccb72ab6b94f513c066eec6e688f20aa68d2a7/ghc

>---------------------------------------------------------------

commit 98ccb72ab6b94f513c066eec6e688f20aa68d2a7
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 00:36:36 2015 +0100

    Testsuite: widen lazy-bs-alloc 3->5%


>---------------------------------------------------------------

98ccb72ab6b94f513c066eec6e688f20aa68d2a7
 testsuite/tests/perf/should_run/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/perf/should_run/all.T b/testsuite/tests/perf/should_run/all.T
index 8260ee1..2303914 100644
--- a/testsuite/tests/perf/should_run/all.T
+++ b/testsuite/tests/perf/should_run/all.T
@@ -53,13 +53,14 @@ test('lazy-bs-alloc',
      [stats_num_field('peak_megabytes_allocated', (2, 1)),
                                  # expected value: 2 (amd64/Linux)
       stats_num_field('bytes allocated',
-          [(wordsize(64), 444720, 3),
+          [(wordsize(64), 444720, 5),
             #             489776 (amd64/Linux)
             # 2013-02-07: 429744 (amd64/Linux)
             # 2013-12-12: 425400 (amd64/Linux)
             # 2015-04-04: Widen 1->3% (amd64/Windows was failing)
             # 2015-08-15: 431500 (Windows not good enough. avg of Windows&Linux)
             # 2015-12-15: 444720 (amd64/Linux, D1616)
+            # 2015-12-17: 444720 (widen 3->5%, Windows is at 462688)
            (wordsize(32), 411500, 2)]),
             # 2013-02-10: 421296 (x86/Windows)
             # 2013-02-10: 414180 (x86/OSX)


From git at git.haskell.org  Fri Dec 18 09:15:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:15:33 +0000 (UTC)
Subject: [commit: ghc] master: Documentation for -fexternal-interpreter
 (34393d9)
Message-ID: <20151218091533.4B1193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34393d99df6e8abec1aead0bc03ba44de218d1c8/ghc

>---------------------------------------------------------------

commit 34393d99df6e8abec1aead0bc03ba44de218d1c8
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Dec 18 09:08:36 2015 +0000

    Documentation for -fexternal-interpreter


>---------------------------------------------------------------

34393d99df6e8abec1aead0bc03ba44de218d1c8
 docs/users_guide/7.12.1-notes.rst |  4 ++++
 docs/users_guide/ghci.rst         | 41 +++++++++++++++++++++++++++++++++++++++
 docs/users_guide/glasgow_exts.rst | 15 ++++++++++++--
 docs/users_guide/phases.rst       | 19 ++++++++++++++++++
 4 files changed, 77 insertions(+), 2 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 77d012b..749f7af 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -40,6 +40,10 @@ The highlights, since the 7.10 branch, are:
 
 - A rewritten (and greatly improved) pattern exhaustiveness checker
 
+- GHC can run the interpreter in a separate process (see
+  :ref:`external-interpreter`), and the interpreter can now run profiled
+  code.
+
 - The reworked users guide you are now reading
 
 
diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst
index 06cc7a2..272f05a 100644
--- a/docs/users_guide/ghci.rst
+++ b/docs/users_guide/ghci.rst
@@ -2938,6 +2938,47 @@ breakpoints in object-code modules, for example. Only the exports of an
 object-code module will be visible in GHCi, rather than all top-level
 bindings as in interpreted modules.
 
+.. _external-interpreter:
+
+Running the interpreter in a separate process
+---------------------------------------------
+
+Normally GHCi runs the interpreted code in the same process as GHC
+itself, on top of the same RTS and sharing the same heap.  However, if
+the flag ``-fexternal-interpreter`` is given, then GHC will spawn a
+separate process for running interpreted code, and communicate with it
+using messages over a pipe.
+
+``-fexternal-interpreter``
+    .. index::
+       single: -fexternal-interpreter
+
+    Run interpreted code (for GHCi, Template Haskell, Quasi-quoting,
+    or Annotations) in a separate process.  The interpreter will run
+    in profiling mode if ``-prof`` is in effect, and in
+    dynamically-linked mode if ``-dynamic`` is in effect.
+
+    There are a couple of caveats that will hopefully be removed in
+    the future: this option is currently not implemented on Windows
+    (it is a no-op), and the external interpreter does not support the
+    GHCi debugger, so breakpoints and single-stepping don't work with
+    ``-fexternal-interpreter``.
+
+    See also the ``-pgmi`` (:ref:`replacing-phases`) and ``-opti``
+    (:ref:`forcing-options-through`) flags.
+
+Why might we want to do this?  The main reason is that the RTS running
+the interpreted code can be a different flavour (profiling or
+dynamically-linked) from GHC itself.  So for example, when compiling
+Template Haskell code with ``-prof``, we don't need to compile the
+modules without ``-prof`` first (see :ref:`th-profiling`) because we
+can run the profiled object code in the interpreter.  GHCi can also
+load and run profiled object code when run with
+``-fexternal-interpreter`` and ``-prof``.
+
+This feature is experimental in GHC 8.0.x, but it may become the
+default in future releases.
+
 .. _ghci-faq:
 
 FAQ and Things To Watch Out For
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 30a1b68..da08c7b 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -10097,6 +10097,8 @@ Run "main.exe" and here is your output:
     $ ./main
     Hello
 
+.. _th-profiling:
+
 Using Template Haskell with Profiling
 -------------------------------------
 
@@ -10116,9 +10118,11 @@ runtime.
 This causes difficulties if you have a multi-module program containing
 Template Haskell code and you need to compile it for profiling, because
 GHC cannot load the profiled object code and use it when executing the
-splices. Fortunately GHC provides a workaround. The basic idea is to
-compile the program twice:
+splices.
+
+Fortunately GHC provides two workarounds.
 
+The first option is to compile the program twice:
 
 1. Compile the program or library first the normal way, without ``-prof``.
 
@@ -10136,6 +10140,13 @@ compile the program twice:
    .. index::
       single : ``-osuf``
 
+The second option is to add the flag ``-fexternal-interpreter`` (see
+:ref:`external-interpreter`), which runs the interpreter in a separate
+process, wherein it can load and run the profiled code directly.
+There's no need to compile the code twice, just add
+``-fexternal-interpreter`` and it should just work.  (this option is
+experimental in GHC 8.0.x, but it may become the default in future
+releases).
 
 .. _th-quasiquotation:
 
diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
index 27b54cb..1c48cfc 100644
--- a/docs/users_guide/phases.rst
+++ b/docs/users_guide/phases.rst
@@ -92,6 +92,15 @@ given compilation phase:
 
     Use ?cmd? as the libtool command (when using ``-staticlib`` only).
 
+``-pgmi ?cmd?``
+    .. index::
+       single: -pgmi
+
+    Use ?cmd? as the external interpreter command (see:
+    :ref:`external-interpreter`).  Default: ``ghc-iserv-prof`` if
+    ``-prof`` is enabled, ``ghc-iserv-dyn`` if ``-dynamic`` is
+    enabled, or ``ghc-iserv`` otherwise.
+
 .. _forcing-options-through:
 
 Forcing options to a particular phase
@@ -165,6 +174,16 @@ the following flags:
     Pass ?option? to ``windres`` when embedding manifests on Windows.
     See ``-fno-embed-manifest`` in :ref:`options-linker`.
 
+``-opti ?option?``
+    .. index::
+       single: -opti
+
+    Pass ?option? to the interpreter sub-process (see
+    :ref:`external-interpreter`).  A common use for this is to pass
+    RTS options e.g., ``-opti+RTS -opti-A64m``, or to enable verbosity
+    with ``-opti-v`` to see what messages are being exchanged by GHC
+    and the interpreter.
+
 So, for example, to force an ``-Ewurble`` option to the assembler, you
 would tell the driver ``-opta-Ewurble`` (the dash before the E is
 required).


From git at git.haskell.org  Fri Dec 18 09:48:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:48:26 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Untabify and delete trailing
 whitespace (5c0e6dc)
Message-ID: <20151218094826.8343B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/5c0e6dcfcdb11c6ece244c99eaca7b138a49f4a3

>---------------------------------------------------------------

commit 5c0e6dcfcdb11c6ece244c99eaca7b138a49f4a3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 08:54:18 2015 +0100

    Untabify and delete trailing whitespace
    
    This makes haskeline `-Wtabs`-clean


>---------------------------------------------------------------

5c0e6dcfcdb11c6ece244c99eaca7b138a49f4a3
 System/Console/Haskeline/Command/Completion.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/System/Console/Haskeline/Command/Completion.hs b/System/Console/Haskeline/Command/Completion.hs
index 97a887b..71a0f12 100644
--- a/System/Console/Haskeline/Command/Completion.hs
+++ b/System/Console/Haskeline/Command/Completion.hs
@@ -134,7 +134,7 @@ padWords :: Int -> [String] -> String
 padWords _ [x] = x
 padWords _ [] = ""
 padWords len (x:xs) = x ++ replicate (len - glength x) ' '
-			++ padWords len xs
+                        ++ padWords len xs
     where
         -- kludge: compute the length in graphemes, not chars.
         -- but don't use graphemes for the max length, since I'm not convinced
@@ -159,5 +159,3 @@ splitIntoGroups n xs = transpose $ unfoldr f xs
 ceilDiv :: Integral a => a -> a -> a
 ceilDiv m n | m `rem` n == 0    =  m `div` n
             | otherwise         =  m `div` n + 1
-
-


From git at git.haskell.org  Fri Dec 18 09:48:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:48:28 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #34 from
 hvr/pr/de-tab (8a017cc)
Message-ID: <20151218094828.88A793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/8a017ccdd85a391fd0dfcd5310f7adbb07970233

>---------------------------------------------------------------

commit 8a017ccdd85a391fd0dfcd5310f7adbb07970233
Merge: 56a17bd 5c0e6dc
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Fri Dec 18 01:40:09 2015 -0800

    Merge pull request #34 from hvr/pr/de-tab
    
    Untabify and delete trailing whitespace



>---------------------------------------------------------------

8a017ccdd85a391fd0dfcd5310f7adbb07970233
 System/Console/Haskeline/Command/Completion.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)


From git at git.haskell.org  Fri Dec 18 09:48:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:48:41 +0000 (UTC)
Subject: [commit: ghc] master: Use `-Wno-tabs` more targetted (77b7f24)
Message-ID: <20151218094841.7E5803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/77b7f24543fb23d79d58b51213577c85cf394d9d/ghc

>---------------------------------------------------------------

commit 77b7f24543fb23d79d58b51213577c85cf394d9d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 10:45:22 2015 +0100

    Use `-Wno-tabs` more targetted
    
    So far only `time` (fixed upstream already though) and `xhtml` still require
    `-Wno-tabs`, so let's apply that warning suppression flag only there.
    
    This also updates the haskeline submodule to pull in a tab-fix


>---------------------------------------------------------------

77b7f24543fb23d79d58b51213577c85cf394d9d
 libraries/haskeline |  2 +-
 mk/warnings.mk      | 13 +++----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index 56a17bd..8a017cc 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 56a17bd9b917ace9045991cddb882636c1508002
+Subproject commit 8a017ccdd85a391fd0dfcd5310f7adbb07970233
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 63b705f..e2b80be 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -55,6 +55,8 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 # haddock's attoparsec uses deprecated `inlinePerformIO`
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
 
+# not yet de-tabbed
+libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-tabs
 # On Windows, there are also some unused import warnings
 ifeq "$(HostOS_CPP)" "mingw32"
 libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities
@@ -89,6 +91,7 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wwarn
 
 # temporarily turn off unused-imports warnings for xhtml
 libraries/xhtml_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
+libraries/xhtml_dist-install_EXTRA_HC_OPTS += -Wno-tabs
 
 libraries/dph/dph-base_dist-install_EXTRA_HC_OPTS += -Wwarn
 libraries/dph/dph-prim-interface_dist-install_EXTRA_HC_OPTS += -Wwarn
@@ -110,16 +113,6 @@ libraries/Win32_dist-install_EXTRA_HC_OPTS += -Wno-trustworthy-safe
 GhcLibExtraHcOpts += -Wno-deprecated-flags
 GhcBootLibExtraHcOpts += -fno-warn-deprecated-flags
 
-# The warning suppression flag below is a temporary kludge. While working with
-# modules that contain tabs, please de-tab them so this flag can be eventually
-# removed. See
-# http://ghc.haskell.org/trac/ghc/wiki/Commentary/CodingStyle#TabsvsSpaces
-# for details
-#
-GhcLibExtraHcOpts += -Wno-tabs
-GhcBootLibExtraHcOpts += -fno-warn-tabs
-
-
 # Note [Order of warning flags]
 #
 # In distdir-way-opts, build flags are added in the following order (this


From git at git.haskell.org  Fri Dec 18 09:50:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:02 +0000 (UTC)
Subject: [commit: packages/directory] tag 'v1.2.5.0' created
Message-ID: <20151218095002.822FA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

New tag    : v1.2.5.0
Referencing: 1869199de3c14fe84dff1cdf4fb2a9a54d92fc34

From git at git.haskell.org  Fri Dec 18 09:50:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:04 +0000 (UTC)
Subject: [commit: packages/directory] master: Include 'python' and 'which' as
 build-tools for tests (079da19)
Message-ID: <20151218095004.8A3EE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/079da19a4596f2477de3519f77cd84e4acf90610/directory

>---------------------------------------------------------------

commit 079da19a4596f2477de3519f77cd84e4acf90610
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Apr 5 03:19:00 2015 -0400

    Include 'python' and 'which' as build-tools for tests
    
    This is needed to make sure the Nix package works correctly.


>---------------------------------------------------------------

079da19a4596f2477de3519f77cd84e4acf90610
 Setup.hs        | 2 ++
 directory.cabal | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/Setup.hs b/Setup.hs
index 54f57d6..f9dfab8 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,6 +1,8 @@
 module Main (main) where
 
 import Distribution.Simple
+import Distribution.Simple.Program (simpleProgram)
 
 main :: IO ()
 main = defaultMainWithHooks autoconfUserHooks
+       { hookedPrograms = [simpleProgram "python", simpleProgram "which"] }
diff --git a/directory.cabal b/directory.cabal
index 52e0116..c8a89f6 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -10,7 +10,7 @@ description:
   This library provides a basic set of operations for manipulating files and
   directories in a portable way.
 category:       System
-build-type:     Configure
+build-type:     Custom
 cabal-version:  >= 1.10
 tested-with:    GHC>=7.4.1
 
@@ -86,6 +86,7 @@ test-suite test
     other-extensions: CPP ForeignFunctionInterface
     ghc-options:      -Wall
     hs-source-dirs:   tools
+    build-tools:      python, which
     main-is:          dispatch-tests.hs
     type:             exitcode-stdio-1.0
     build-depends:    base, directory


From git at git.haskell.org  Fri Dec 18 09:50:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:06 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove patch in tools/ghc.patch
 (fixed upstream) (3d83d75)
Message-ID: <20151218095006.915253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3d83d7554794ac5ba6b921e4876429dc1ed77144/directory

>---------------------------------------------------------------

commit 3d83d7554794ac5ba6b921e4876429dc1ed77144
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Apr 5 03:20:52 2015 -0400

    Remove patch in tools/ghc.patch (fixed upstream)


>---------------------------------------------------------------

3d83d7554794ac5ba6b921e4876429dc1ed77144
 tools/ghc.patch | 48 ------------------------------------------------
 1 file changed, 48 deletions(-)

diff --git a/tools/ghc.patch b/tools/ghc.patch
index 61ce567..db2be18 100644
--- a/tools/ghc.patch
+++ b/tools/ghc.patch
@@ -1,51 +1,3 @@
-# allow ghc and its tools to be located in different directories
---- testsuite/mk/boilerplate.mk
-+++ testsuite/mk/boilerplate.mk
-@@ -56,6 +56,7 @@ TEST_HC := $(STAGE2_GHC)
- endif
- 
- else
-+implicit_compiler = YES
- IN_TREE_COMPILER = NO
- TEST_HC := $(shell which ghc)
- endif
-@@ -87,24 +88,30 @@ endif
- # containing spaces
- BIN_ROOT = $(shell dirname '$(TEST_HC)')
- 
-+ifeq "$(implicit_compiler)" "YES"
-+find_tool = $(shell which $(1))
-+else
-+find_tool = $(BIN_ROOT)/$(1)
-+endif
-+
- ifeq "$(GHC_PKG)" ""
--GHC_PKG := $(BIN_ROOT)/ghc-pkg
-+GHC_PKG := $(call find_tool,ghc-pkg)
- endif
- 
- ifeq "$(RUNGHC)" ""
--RUNGHC := $(BIN_ROOT)/runghc
-+RUNGHC := $(call find_tool,runghc)
- endif
- 
- ifeq "$(HSC2HS)" ""
--HSC2HS := $(BIN_ROOT)/hsc2hs
-+HSC2HS := $(call find_tool,hsc2hs)
- endif
- 
- ifeq "$(HP2PS_ABS)" ""
--HP2PS_ABS := $(BIN_ROOT)/hp2ps
-+HP2PS_ABS := $(call find_tool,hp2ps)
- endif
- 
- ifeq "$(HPC)" ""
--HPC := $(BIN_ROOT)/hpc
-+HPC := $(call find_tool,hpc)
- endif
- 
- $(eval $(call canonicaliseExecutable,TEST_HC))
-
 # 'die' is not available until GHC 7.10
 --- testsuite/timeout/timeout.hs
 +++ testsuite/timeout/timeout.hs


From git at git.haskell.org  Fri Dec 18 09:50:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:08 +0000 (UTC)
Subject: [commit: packages/directory] master: Update test scripts to save
 local copy of test framework (9072fd9)
Message-ID: <20151218095008.9D8CA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9072fd92cccc62a24579dfc8bd05854e695b5de0/directory

>---------------------------------------------------------------

commit 9072fd92cccc62a24579dfc8bd05854e695b5de0
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 10 19:22:37 2015 -0400

    Update test scripts to save local copy of test framework
    
    Nix requires everything to be built from source without external inputs,
    so we need to cache our own copy of the GHC test framework.  We could
    tar.gz it, but:
    
      - it's binary, making it hard to compare changes without extracting;
      - metadata such as timestamps can introduce spurious changes.
    
    On the other hand, embedding it as a directory leads to a lot of extra
    entries in the `.cabal` file that'd have to be maintained separately.
    
    Therefore we choose to store the test framework in a shell archive.


>---------------------------------------------------------------

9072fd92cccc62a24579dfc8bd05854e695b5de0
 directory.cabal                               |    3 +-
 LICENSE => tools/ghc-test-framework.LICENSE   |   39 +-
 tools/{ghc.patch => ghc-test-framework.patch} |    4 +-
 tools/ghc-test-framework.shar                 | 4253 +++++++++++++++++++++++++
 tools/run-tests                               |   18 +-
 tools/update-test-framework                   |   80 +
 6 files changed, 4357 insertions(+), 40 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9072fd92cccc62a24579dfc8bd05854e695b5de0

From git at git.haskell.org  Fri Dec 18 09:50:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:10 +0000 (UTC)
Subject: [commit: packages/directory] master: Fix warnings in
 dispatch-tests.hs on GHC 7.10 (e3c63d8)
Message-ID: <20151218095010.A3F663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e3c63d88db11fe00c8057a04dbaaba22897cc80b/directory

>---------------------------------------------------------------

commit e3c63d88db11fe00c8057a04dbaaba22897cc80b
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 10 19:52:46 2015 -0400

    Fix warnings in dispatch-tests.hs on GHC 7.10


>---------------------------------------------------------------

e3c63d88db11fe00c8057a04dbaaba22897cc80b
 tools/dispatch-tests.hs | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tools/dispatch-tests.hs b/tools/dispatch-tests.hs
index 598cd8b..2b9d6df 100644
--- a/tools/dispatch-tests.hs
+++ b/tools/dispatch-tests.hs
@@ -1,9 +1,12 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
 module Main (main) where
+import Prelude (($), (.), (=<<), (==), Eq, IO, Int, String,
+                id, fromIntegral, otherwise, unwords)
+import Data.Functor ((<$>))
+import Data.Monoid ((<>), mconcat)
 import Foreign (Ptr)
 import Foreign.C (CChar(..), CInt(..), withCString)
-import Data.Functor ((<$>))
-import System.Directory ()     -- to make sure `directory` is built beforehand
+import System.Directory ()        -- to ensure `directory` is built beforehand
 import System.Environment (getArgs)
 import System.Exit (ExitCode(ExitSuccess, ExitFailure), exitWith)
 
@@ -19,7 +22,7 @@ main = do
                  ExitFailure _ -> []
 
   args <- getArgs
-  let command : arguments = prefix ++ ["sh", "tools/run-tests"] ++ args
+  let command : arguments = prefix <> ["sh", "tools/run-tests"] <> args
   exitWith =<< normalizeExitCode <$> rawSystem command arguments
 
 makeExitCode :: Int -> ExitCode
@@ -48,15 +51,16 @@ quoteCmdArgs cmdArgs =
   -- the arcane quoting rules require us to add an extra set of quotes
   -- around the entire thing: see `help cmd` or look at
   -- https://superuser.com/a/238813
-  "\"" ++ unwords (quote <$> cmdArgs) ++ "\""
-  where quote s = "\"" ++ replaceElem '"' "\"\"" s ++ "\""
+  let quote s = "\"" <> replaceElem '"' "\"\"" s <> "\""
+  in (\ s -> "\"" <> s <> "\"") $
 #else
-  unwords (quote <$> cmdArgs)
-  where quote s = "'" ++ replaceElem '\'' "'\\''" s ++ "'"
+  let quote s = "'" <> replaceElem '\'' "'\\''" s <> "'"
+  in id $
 #endif
+     unwords (quote <$> cmdArgs)
 
 replaceElem :: Eq a => a -> [a] -> [a] -> [a]
-replaceElem match repl = concat . (replace <$>)
+replaceElem match repl = mconcat . (replace <$>)
   where replace c | c == match = repl
                   | otherwise  = [c]
 


From git at git.haskell.org  Fri Dec 18 09:50:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:12 +0000 (UTC)
Subject: [commit: packages/directory] master: Add GHC 7.10 to Travis tests
 (291ab06)
Message-ID: <20151218095012.A99243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/291ab06596e9e69a6c54e2a3d36ef179b2566d53/directory

>---------------------------------------------------------------

commit 291ab06596e9e69a6c54e2a3d36ef179b2566d53
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 10 20:03:44 2015 -0400

    Add GHC 7.10 to Travis tests


>---------------------------------------------------------------

291ab06596e9e69a6c54e2a3d36ef179b2566d53
 .travis.yml | 43 +++++++++++++++++++++++++++++--------------
 1 file changed, 29 insertions(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index bc3fe44..c3bddb0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,11 +4,12 @@ language: c
 env:
  # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
  # no package for earlier cabal versions in the PPA
- - GHCVER=7.4.1 CABALVER=1.16
- - GHCVER=7.4.2 CABALVER=1.16
- - GHCVER=7.6.3 CABALVER=1.16
- - GHCVER=7.8.3 CABALVER=1.18
- - GHCVER=head  CABALVER=head
+ - GHCVER=7.4.1  CABALVER=1.16
+ - GHCVER=7.4.2  CABALVER=1.16
+ - GHCVER=7.6.3  CABALVER=1.16
+ - GHCVER=7.8.3  CABALVER=1.18
+ - GHCVER=7.10.1 CABALVER=1.22
+ - GHCVER=head   CABALVER=head
 
 matrix:
   allow_failures:
@@ -34,6 +35,27 @@ before_script:
      else streaming=streaming
      fi
      export streaming
+ - | # check if '--run-tests' is supported (didn't exist until 1.20);
+     # tests must be run prior to install as packages may be broken by install
+     if cabal 2>&1 install --run-tests __dummy |
+        grep >/dev/null 2>&1 "cabal: unrecognized option"
+     then def_cabal_install_run_tests='cabal_install_run_tests() {
+          tgz=$1
+          shift
+          tmp=cabal-install-run-tests.tmp
+          mkdir -p "$tmp"
+          ( cd "$tmp" && tar xzf - ) <"$tgz"
+          ( cd "$tmp"/* &&
+            cabal configure --enable-tests &&
+            cabal build &&
+            cabal test )
+          cabal install "$@" "$tgz"
+     }'
+     else def_cabal_install_run_tests='cabal_install_run_tests() {
+          cabal install --run-tests "$@" "$1"
+     }'
+     fi
+     export def_cabal_install_run_tests
 
 script:
  - autoreconf -i
@@ -42,12 +64,5 @@ script:
  - cabal check
  - cabal sdist
  - cabal test --show-details=$streaming
- - | # in the future, use '--run-tests' (didn't exist until 1.20)
-     cabal install --force-reinstalls dist/*-*.tar.gz
-     mkdir install-tmp
-     cd install-tmp
-     tar xzf ../dist/*-*.tar.gz
-     cd *-*
-     cabal configure --enable-tests
-     cabal build
-     cabal test
+ - eval "$def_cabal_install_run_tests" &&
+   cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz


From git at git.haskell.org  Fri Dec 18 09:50:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:14 +0000 (UTC)
Subject: [commit: packages/directory] master: Update changelog and version
 (1.2.2.1) (184c668)
Message-ID: <20151218095014.AF9F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/184c668b1b830bd04e33d87e2b16863b8354f99a/directory

>---------------------------------------------------------------

commit 184c668b1b830bd04e33d87e2b16863b8354f99a
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 10 20:04:32 2015 -0400

    Update changelog and version (1.2.2.1)


>---------------------------------------------------------------

184c668b1b830bd04e33d87e2b16863b8354f99a
 changelog.md    | 5 +++++
 directory.cabal | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 31c8393..8d2b934 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.2.1 (Apr 2015)
+
+  * [#24](https://github.com/haskell/directory/issues/24):
+    Fix dependency problem on NixOS when building with tests
+
 ## 1.2.2.0 (Mar 2015)
 
   * Bundled with GHC 7.10.1
diff --git a/directory.cabal b/directory.cabal
index a6a330c..396c845 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.2.0
+version:        1.2.2.1
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Fri Dec 18 09:50:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:16 +0000 (UTC)
Subject: [commit: packages/directory] master: Hacky way to support sandbox
 installations (0371514)
Message-ID: <20151218095016.B5F6F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/03715140eced9c0531f700e643bc75cb3ff43289/directory

>---------------------------------------------------------------

commit 03715140eced9c0531f700e643bc75cb3ff43289
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 10 22:20:02 2015 -0400

    Hacky way to support sandbox installations


>---------------------------------------------------------------

03715140eced9c0531f700e643bc75cb3ff43289
 tools/run-tests | 25 ++++++++++++++++++++++---
 1 file changed, 22 insertions(+), 3 deletions(-)

diff --git a/tools/run-tests b/tools/run-tests
index 44a675b..cfc1c74 100755
--- a/tools/run-tests
+++ b/tools/run-tests
@@ -16,9 +16,28 @@ then db=conf
 else db=db
 fi
 
-[ -z "$HSFLAGS" ] || HSFLAGS=\ $HSFLAGS
-HSFLAGS="-package-$db ../dist/package.conf.inplace$HSFLAGS"
-HSFLAGS="-optP-include -optP../dist/build/autogen/cabal_macros.h $HSFLAGS"
+# guess which package db(s) we should use;
+# very dirty hack but cabal doesn't expose it to us directly
+if [ -f cabal.sandbox.config ]
+then
+    patt="s/'/'\\\\''/g"
+    dbfn=`grep 'package-db: [^, }]*' cabal.sandbox.config \
+        | sed 's/^[^:]*: //'`
+    HSFLAGS="-package-$db $dbfn "$HSFLAGS
+fi
+if [ -f dist/package.conf.inplace ]
+then
+    HSFLAGS="-package-$db ../dist/package.conf.inplace "$HSFLAGS
+fi
+if [ -f dist/build/autogen/cabal_macros.h ]
+then
+    cabal_macros='-optP-include -optP../dist/build/autogen/cabal_macros.h'
+elif [ -f build/autogen/cabal_macros.h ]
+then
+    cabal_macros='-optP-include -optP../build/autogen/cabal_macros.h'
+fi
+HSFLAGS="$cabal_macros "$HSFLAGS
+HSFLAGS=`printf "%s" "$HSFLAGS" | sed 's/ *$//'`
 export HSFLAGS
 
 # extract the test framework if needed


From git at git.haskell.org  Fri Dec 18 09:50:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:18 +0000 (UTC)
Subject: [commit: packages/directory] master: changelog.md: Move issue number
 to the end (ec8c86b)
Message-ID: <20151218095018.BC4033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ec8c86baac5cbcf3fd7708178256951bb95e963f/directory

>---------------------------------------------------------------

commit ec8c86baac5cbcf3fd7708178256951bb95e963f
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Apr 11 02:24:50 2015 -0400

    changelog.md: Move issue number to the end


>---------------------------------------------------------------

ec8c86baac5cbcf3fd7708178256951bb95e963f
 changelog.md | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/changelog.md b/changelog.md
index 8d2b934..d54fdf8 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,8 +3,8 @@ Changelog for the [`directory`][1] package
 
 ## 1.2.2.1 (Apr 2015)
 
-  * [#24](https://github.com/haskell/directory/issues/24):
-    Fix dependency problem on NixOS when building with tests
+  * Fix dependency problem on NixOS when building with tests
+    ([#24](https://github.com/haskell/directory/issues/24))
 
 ## 1.2.2.0 (Mar 2015)
 
@@ -16,23 +16,23 @@ Changelog for the [`directory`][1] package
 
   * Replace `throw` by better defined `throwIO`s
 
-  * [#17](https://github.com/haskell/directory/pull/17):
-    Avoid stack overflow in `getDirectoryContents`
+  * Avoid stack overflow in `getDirectoryContents`
+    ([#17](https://github.com/haskell/directory/pull/17))
 
-  * [#14](https://github.com/haskell/directory/issues/14):
-    Expose `findExecutables`
+  * Expose `findExecutables`
+    ([#14](https://github.com/haskell/directory/issues/14))
 
-  * [#15](https://github.com/haskell/directory/issues/15):
-    `removeDirectoryRecursive` no longer follows symlinks under any
+  * `removeDirectoryRecursive` no longer follows symlinks under any
     circumstances
+    ([#15](https://github.com/haskell/directory/issues/15))
 
-  * [#9](https://github.com/haskell/directory/issues/9):
-    Allow trailing path separators in `getPermissions` on Windows
+  * Allow trailing path separators in `getPermissions` on Windows
+    ([#9](https://github.com/haskell/directory/issues/9))
 
-  * [#8](https://github.com/haskell/directory/pull/8):
-    `renameFile` now always throws the correct error type
+  * `renameFile` now always throws the correct error type
     (`InappropriateType`) when the destination is a directory, as long as the
     filesystem is not being modified concurrently
+    ([#8](https://github.com/haskell/directory/pull/8))
 
   * Add `makeAbsolute`, which should be preferred over `canonicalizePath`
     unless one requires symbolic links to be resolved


From git at git.haskell.org  Fri Dec 18 09:50:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:20 +0000 (UTC)
Subject: [commit: packages/directory] master: Docs: Windows doesn't use
 'Documents and Settings' anymore (b21df6d)
Message-ID: <20151218095020.C38D93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b21df6d4f4cc82c7d1f21f6bbeb00fe339f71e71/directory

>---------------------------------------------------------------

commit b21df6d4f4cc82c7d1f21f6bbeb00fe339f71e71
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 24 01:15:42 2015 -0400

    Docs: Windows doesn't use 'Documents and Settings' anymore


>---------------------------------------------------------------

b21df6d4f4cc82c7d1f21f6bbeb00fe339f71e71
 System/Directory.hs | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index be8379d..d49d909 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1142,8 +1142,7 @@ instead.
 
 On Unix, 'getHomeDirectory' returns the value of the @HOME@
 environment variable.  On Windows, the system is queried for a
-suitable path; a typical path might be
- at C:\/Documents And Settings\/user at .
+suitable path; a typical path might be @C:\/Users\//\<user\>/@.
 
 The operation may fail with:
 
@@ -1184,9 +1183,7 @@ first.  It is expected that the parent directory exists and is
 writable.
 
 On Unix, this function returns @$HOME\/.appName at .  On Windows, a
-typical path might be
-
-> C:/Users/user/AppData/Roaming/appName
+typical path might be @C:\/Users\//\<user\>/\/AppData\/Roaming\//\<app\>/@
 
 The operation may fail with:
 
@@ -1217,8 +1214,7 @@ instead.
 
 On Unix, 'getUserDocumentsDirectory' returns the value of the @HOME@
 environment variable.  On Windows, the system is queried for a
-suitable path; a typical path might be
- at C:\/Documents And Settings\/user\/My Documents at .
+suitable path; a typical path might be @C:\/Users\//\<user\>/\/Documents at .
 
 The operation may fail with:
 


From git at git.haskell.org  Fri Dec 18 09:50:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:22 +0000 (UTC)
Subject: [commit: packages/directory] master: Fix .travis.yml (allow_failures
 is whitespace-sensitive) (4bcba4a)
Message-ID: <20151218095022.CA04D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bcba4a119f1891c8ad5a4ce692f6865f83a6734/directory

>---------------------------------------------------------------

commit 4bcba4a119f1891c8ad5a4ce692f6865f83a6734
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Apr 24 02:11:43 2015 -0400

    Fix .travis.yml (allow_failures is whitespace-sensitive)


>---------------------------------------------------------------

4bcba4a119f1891c8ad5a4ce692f6865f83a6734
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index c3bddb0..68756df 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,7 +13,7 @@ env:
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=head
+   - env: GHCVER=head   CABALVER=head
 
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc


From git at git.haskell.org  Fri Dec 18 09:50:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:24 +0000 (UTC)
Subject: [commit: packages/directory] master: Implement support for
 XDG-conforming application directories (ab9d081)
Message-ID: <20151218095024.D11B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ab9d0810ce0172e10ff1ca437ad7f723d6648f0d/directory

>---------------------------------------------------------------

commit ab9d0810ce0172e10ff1ca437ad7f723d6648f0d
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Apr 26 22:11:47 2015 -0400

    Implement support for XDG-conforming application directories
    
    This addresses issue #6 in a backward-compatible way by adding a new
    function that conforms to the XDG Base Directory Specification.


>---------------------------------------------------------------

ab9d0810ce0172e10ff1ca437ad7f723d6648f0d
 System/Directory.hs | 122 +++++++++++++++++++++++++++++++++++++++++-----------
 changelog.md        |   5 +++
 directory.cabal     |   2 +-
 3 files changed, 103 insertions(+), 26 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index d49d909..43edc9a 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -34,6 +34,8 @@ module System.Directory
 
     -- * Pre-defined directories
     , getHomeDirectory
+    , XdgDirectory(..)
+    , getXdgDirectory
     , getAppUserDataDirectory
     , getUserDocumentsDirectory
     , getTemporaryDirectory
@@ -80,6 +82,7 @@ module System.Directory
     , getModificationTime
    ) where
 
+import System.Environment ( getEnv )
 import System.FilePath
 import System.IO
 import System.IO.Error
@@ -111,7 +114,6 @@ import qualified System.Win32 as Win32
 #else
 import GHC.IO.Encoding
 import GHC.Foreign as GHC
-import System.Environment ( getEnv )
 import qualified System.Posix as Posix
 #endif
 
@@ -1169,31 +1171,101 @@ getHomeDirectory =
     getEnv "HOME"
 #endif
 
-{- | Returns the pathname of a directory in which application-specific
-data for the current user can be stored.  The result of
-'getAppUserDataDirectory' for a given application is specific to
-the current user.
-
-The argument should be the name of the application, which will be used
-to construct the pathname (so avoid using unusual characters that
-might result in an invalid pathname).
-
-Note: the directory may not actually exist, and may need to be created
-first.  It is expected that the parent directory exists and is
-writable.
-
-On Unix, this function returns @$HOME\/.appName at .  On Windows, a
-typical path might be @C:\/Users\//\<user\>/\/AppData\/Roaming\//\<app\>/@
-
-The operation may fail with:
-
-* 'UnsupportedOperation'
-The operating system has no notion of application-specific data directory.
+-- | Special directories for storing user-specific application data,
+--   configuration, and cache files, as specified by the
+--   <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html XDG Base Directory Specification>.
+--
+--   These will also work on Windows, although in that case 'XdgData' and
+--   'XdgConfig' will map to the same directory.
+--
+--   Note: the directory may not actually exist, in which case you would need
+--   to create it with file mode @700@ (i.e. only accessible by the owner).
+--
+--   /Since: 1.2.3.0/
+data XdgDirectory
+  = XdgData
+    -- ^ Data files:
+    --   may be overridden by the @XDG_DATA_HOME@ environment variable;
+    --   defaults to @~\/.local\/share@;
+    --   Windows equivalent: @%APPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@)
+  | XdgConfig
+    -- ^ For configuration files;
+    --   may be overridden by the @XDG_CONFIG_HOME@ environment variable;
+    --   defaults to @~\/.config@;
+    --   Windows equivalent: @%APPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@)
+  | XdgCache
+    -- ^ For non-essential (cached) data;
+    --   may be overridden by the @XDG_CACHE_HOME@ environment variable;
+    --   defaults to @~\/.cache@;
+    --   Windows equivalent: @%LOCALAPPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Local@)
+  deriving (Eq, Ord, Read, Show)
+
+-- | Obtain the path to special directories for storing user-specific
+--   application data, configuration, and cache files, as specified by the
+--   <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html XDG Base Directory Specification>.
+--
+--   These will also work on Windows, although in that case 'XdgData' and
+--   'XdgConfig' will map to the same directory.  See 'XdgDirectory' for
+--   details.
+--
+--   Note: the directory may not actually exist, in which case you would need
+--   to create it with file mode @700@ (i.e. only accessible by the owner).
+--
+--   /Since: 1.2.3.0/
+getXdgDirectory :: XdgDirectory -> IO FilePath
+getXdgDirectory xdgDir = modifyIOError (`ioeSetLocation` "getXdgDirectory") $
+  case xdgDir of
+    XdgData   -> get "XDG_DATA_HOME"   (alternative False ".local/share")
+    XdgConfig -> get "XDG_CONFIG_HOME" (alternative False ".config")
+    XdgCache  -> get "XDG_CACHE_HOME"  (alternative True  ".cache")
+  where get name fallback = do
+          env <- tryIOErrorType isDoesNotExistError (getEnv name)
+          case env of
+            Left  _                      -> fallback
+            Right path | isRelative path -> fallback
+                       | otherwise       -> return (normalise path)
+        tryIOErrorType check action = do
+          result <- tryIOError action
+          case result of
+            Left  err -> if check err then return (Left err) else throwIO err
+            Right val -> return (Right val)
+#if defined(mingw32_HOST_OS)
+        alternative local _ =
+          normalise `fmap` Win32.sHGetFolderPath nullPtr which nullPtr 0
+          where which | local     = Win32.cSIDL_LOCAL_APPDATA
+                      | otherwise = Win32.cSIDL_APPDATA
+#else
+        alternative _  path = fmap (normalise . (</> path)) getHomeDirectory
+#endif
 
-* 'isDoesNotExistError'
-The home directory for the current user does not exist, or
-cannot be found.
--}
+-- | Obtain the path to a special directory for storing user-specific
+--   application data.
+--
+--   The argument should the name of the application, which will be integrated
+--   into the directory name and therefore should not contain any unusual
+--   characters that result in an invalid path.
+--
+--   * On Unix-like systems, the path is @~\/./\<app\>/@.
+--   * On Windows, the path is @%APPDATA%\//\<app\>/@
+--     (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming\//\<app\>/@)
+--
+--   Note: the directory may not actually exist, in which case you would need
+--   to create it.  It is expected that the parent directory exists and is
+--   writable.
+--
+--   The operation may fail with:
+--
+--   * 'UnsupportedOperation'
+--     The operating system has no notion of application-specific data
+--     directory.
+--
+--   * 'isDoesNotExistError'
+--     The home directory for the current user does not exist, or cannot be
+--     found.
+--
 getAppUserDataDirectory :: String -> IO FilePath
 getAppUserDataDirectory appName = do
   modifyIOError ((`ioeSetLocation` "getAppUserDataDirectory")) $ do
diff --git a/changelog.md b/changelog.md
index d54fdf8..857d0a7 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.3.0 (May 2015)
+
+  * Add support for XDG Base Directory Specification
+    ([#6](https://github.com/haskell/directory/issues/6))
+
 ## 1.2.2.1 (Apr 2015)
 
   * Fix dependency problem on NixOS when building with tests
diff --git a/directory.cabal b/directory.cabal
index 396c845..3e5c7fb 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.2.1
+version:        1.2.3.0
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Fri Dec 18 09:50:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:26 +0000 (UTC)
Subject: [commit: packages/directory] master: Ignore XDG environment variables
 on Windows (a682ebb)
Message-ID: <20151218095026.D7AE03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a682ebb9a1bbc99f598f15b59e4077a8afae891c/directory

>---------------------------------------------------------------

commit a682ebb9a1bbc99f598f15b59e4077a8afae891c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Apr 27 03:35:05 2015 -0400

    Ignore XDG environment variables on Windows


>---------------------------------------------------------------

a682ebb9a1bbc99f598f15b59e4077a8afae891c
 System/Directory.hs | 57 +++++++++++++++++++++++++++++++++--------------------
 1 file changed, 36 insertions(+), 21 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 43edc9a..3e5f947 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -82,7 +82,6 @@ module System.Directory
     , getModificationTime
    ) where
 
-import System.Environment ( getEnv )
 import System.FilePath
 import System.IO
 import System.IO.Error
@@ -114,6 +113,7 @@ import qualified System.Win32 as Win32
 #else
 import GHC.IO.Encoding
 import GHC.Foreign as GHC
+import System.Environment ( getEnv )
 import qualified System.Posix as Posix
 #endif
 
@@ -1216,29 +1216,44 @@ data XdgDirectory
 --
 --   /Since: 1.2.3.0/
 getXdgDirectory :: XdgDirectory -> IO FilePath
-getXdgDirectory xdgDir = modifyIOError (`ioeSetLocation` "getXdgDirectory") $
+getXdgDirectory xdgDir =
+  modifyIOError (`ioeSetLocation` "getXdgDirectory") .
+  fmap normalise $
   case xdgDir of
-    XdgData   -> get "XDG_DATA_HOME"   (alternative False ".local/share")
-    XdgConfig -> get "XDG_CONFIG_HOME" (alternative False ".config")
-    XdgCache  -> get "XDG_CACHE_HOME"  (alternative True  ".cache")
-  where get name fallback = do
-          env <- tryIOErrorType isDoesNotExistError (getEnv name)
-          case env of
-            Left  _                      -> fallback
-            Right path | isRelative path -> fallback
-                       | otherwise       -> return (normalise path)
-        tryIOErrorType check action = do
-          result <- tryIOError action
-          case result of
-            Left  err -> if check err then return (Left err) else throwIO err
-            Right val -> return (Right val)
+    XdgData   -> get False "XDG_DATA_HOME"   ".local/share"
+    XdgConfig -> get False "XDG_CONFIG_HOME" ".config"
+    XdgCache  -> get True  "XDG_CACHE_HOME"  ".cache"
+  where
 #if defined(mingw32_HOST_OS)
-        alternative local _ =
-          normalise `fmap` Win32.sHGetFolderPath nullPtr which nullPtr 0
-          where which | local     = Win32.cSIDL_LOCAL_APPDATA
-                      | otherwise = Win32.cSIDL_APPDATA
+    get isLocal _ _ = Win32.sHGetFolderPath nullPtr which nullPtr 0
+      where which | isLocal   = Win32.cSIDL_LOCAL_APPDATA
+                  | otherwise = Win32.cSIDL_APPDATA
 #else
-        alternative _  path = fmap (normalise . (</> path)) getHomeDirectory
+    get _ name fallback = do
+      env <- lookupEnv name
+      case env of
+        Nothing                     -> fallback'
+        Just path | isRelative path -> fallback'
+                  | otherwise       -> return path
+      where fallback' = fmap (</> fallback) getHomeDirectory
+
+-- | Return the value of an environment variable, or 'Nothing' if there is no
+--   such value.  (Equivalent to "lookupEnv" from base-4.6.)
+lookupEnv :: String -> IO (Maybe String)
+lookupEnv name = do
+  env <- tryIOErrorType isDoesNotExistError (getEnv name)
+  case env of
+    Left  _     -> return Nothing
+    Right value -> return (Just value)
+
+-- | Similar to 'try' but only catches a specify kind of 'IOError' as
+--   specified by the predicate.
+tryIOErrorType :: (IOError -> Bool) -> IO a -> IO (Either IOError a)
+tryIOErrorType check action = do
+  result <- tryIOError action
+  case result of
+    Left  err -> if check err then return (Left err) else throwIO err
+    Right val -> return (Right val)
 #endif
 
 -- | Obtain the path to a special directory for storing user-specific


From git at git.haskell.org  Fri Dec 18 09:50:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:28 +0000 (UTC)
Subject: [commit: packages/directory] master: Allow a suffix to be specified
 in getXdgDirectory for convenience (eb3d0ff)
Message-ID: <20151218095028.DEDD03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/eb3d0ff1ad06320e20d15eddbf8499e9e5abf0de/directory

>---------------------------------------------------------------

commit eb3d0ff1ad06320e20d15eddbf8499e9e5abf0de
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Apr 27 03:38:22 2015 -0400

    Allow a suffix to be specified in getXdgDirectory for convenience


>---------------------------------------------------------------

eb3d0ff1ad06320e20d15eddbf8499e9e5abf0de
 System/Directory.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 3e5f947..d24fd3b 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1215,10 +1215,10 @@ data XdgDirectory
 --   to create it with file mode @700@ (i.e. only accessible by the owner).
 --
 --   /Since: 1.2.3.0/
-getXdgDirectory :: XdgDirectory -> IO FilePath
-getXdgDirectory xdgDir =
+getXdgDirectory :: XdgDirectory -> FilePath -> IO FilePath
+getXdgDirectory xdgDir suffix =
   modifyIOError (`ioeSetLocation` "getXdgDirectory") .
-  fmap normalise $
+  fmap (normalise . (</> suffix)) $
   case xdgDir of
     XdgData   -> get False "XDG_DATA_HOME"   ".local/share"
     XdgConfig -> get False "XDG_CONFIG_HOME" ".config"


From git at git.haskell.org  Fri Dec 18 09:50:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:30 +0000 (UTC)
Subject: [commit: packages/directory] master: Update docs:
 getAppUserDataDirectory and getXdgDirectory (3e57c08)
Message-ID: <20151218095030.E531F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e57c084d676e0223a6d46cfc3d279689fd81a74/directory

>---------------------------------------------------------------

commit 3e57c084d676e0223a6d46cfc3d279689fd81a74
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Apr 27 03:42:35 2015 -0400

    Update docs: getAppUserDataDirectory and getXdgDirectory


>---------------------------------------------------------------

3e57c084d676e0223a6d46cfc3d279689fd81a74
 System/Directory.hs | 51 ++++++++++++++++++++++++++++++---------------------
 1 file changed, 30 insertions(+), 21 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index d24fd3b..c49d67f 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1139,8 +1139,8 @@ long_path_size = 2048   --  // guess?
 
 The directory returned is expected to be writable by the current user,
 but note that it isn't generally considered good practice to store
-application-specific data here; use 'getAppUserDataDirectory'
-instead.
+application-specific data here; use 'getXdgDirectory' or
+'getAppUserDataDirectory' instead.
 
 On Unix, 'getHomeDirectory' returns the value of the @HOME@
 environment variable.  On Windows, the system is queried for a
@@ -1175,11 +1175,7 @@ getHomeDirectory =
 --   configuration, and cache files, as specified by the
 --   <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html XDG Base Directory Specification>.
 --
---   These will also work on Windows, although in that case 'XdgData' and
---   'XdgConfig' will map to the same directory.
---
---   Note: the directory may not actually exist, in which case you would need
---   to create it with file mode @700@ (i.e. only accessible by the owner).
+--   Note: On Windows, 'XdgData' and 'XdgConfig' map to the same directory.
 --
 --   /Since: 1.2.3.0/
 data XdgDirectory
@@ -1203,19 +1199,28 @@ data XdgDirectory
     --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Local@)
   deriving (Eq, Ord, Read, Show)
 
--- | Obtain the path to special directories for storing user-specific
---   application data, configuration, and cache files, as specified by the
+-- | Obtain the paths to special directories for storing user-specific
+--   application data, configuration, and cache files, conforming to the
 --   <http://standards.freedesktop.org/basedir-spec/basedir-spec-latest.html XDG Base Directory Specification>.
+--   Compared with 'getAppUserDataDirectory', this function provides a more
+--   fine-grained hierarchy as well as greater flexibility for the user.
 --
---   These will also work on Windows, although in that case 'XdgData' and
---   'XdgConfig' will map to the same directory.  See 'XdgDirectory' for
---   details.
+--   It also works on Windows, although in that case 'XdgData' and 'XdgConfig'
+--   will map to the same directory.
 --
---   Note: the directory may not actually exist, in which case you would need
+--   The second argument is usually the name of the application.  Since it
+--   will be integrated into the path, it must consist of valid path
+--   characters.
+--
+--   Note: The directory may not actually exist, in which case you would need
 --   to create it with file mode @700@ (i.e. only accessible by the owner).
 --
 --   /Since: 1.2.3.0/
-getXdgDirectory :: XdgDirectory -> FilePath -> IO FilePath
+getXdgDirectory :: XdgDirectory         -- ^ which special directory
+                -> FilePath             -- ^ a relative path that is appended
+                                        --   to the path; if empty, the base
+                                        --   path is returned
+                -> IO FilePath
 getXdgDirectory xdgDir suffix =
   modifyIOError (`ioeSetLocation` "getXdgDirectory") .
   fmap (normalise . (</> suffix)) $
@@ -1257,11 +1262,13 @@ tryIOErrorType check action = do
 #endif
 
 -- | Obtain the path to a special directory for storing user-specific
---   application data.
+--   application data (traditional Unix location).  Except for backward
+--   compatibility reasons, newer applications may prefer the the
+--   XDG-conformant location provided by 'getXdgDirectory', which offers a
+--   more fine-grained hierarchy as well as greater flexibility for the user.
 --
---   The argument should the name of the application, which will be integrated
---   into the directory name and therefore should not contain any unusual
---   characters that result in an invalid path.
+--   The argument is usually the name of the application.  Since it will be
+--   integrated into the path, it must consist of valid path characters.
 --
 --   * On Unix-like systems, the path is @~\/./\<app\>/@.
 --   * On Windows, the path is @%APPDATA%\//\<app\>/@
@@ -1281,7 +1288,9 @@ tryIOErrorType check action = do
 --     The home directory for the current user does not exist, or cannot be
 --     found.
 --
-getAppUserDataDirectory :: String -> IO FilePath
+getAppUserDataDirectory :: FilePath     -- ^ a relative path that is appended
+                                        --   to the path
+                        -> IO FilePath
 getAppUserDataDirectory appName = do
   modifyIOError ((`ioeSetLocation` "getAppUserDataDirectory")) $ do
 #if defined(mingw32_HOST_OS)
@@ -1296,8 +1305,8 @@ getAppUserDataDirectory appName = do
 
 The directory returned is expected to be writable by the current user,
 but note that it isn't generally considered good practice to store
-application-specific data here; use 'getAppUserDataDirectory'
-instead.
+application-specific data here; use 'getXdgDirectory' or
+'getAppUserDataDirectory' instead.
 
 On Unix, 'getUserDocumentsDirectory' returns the value of the @HOME@
 environment variable.  On Windows, the system is queried for a


From git at git.haskell.org  Fri Dec 18 09:50:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:32 +0000 (UTC)
Subject: [commit: packages/directory] master: Clarify docs for XDG directory
 and add link to migration guide (bac362f)
Message-ID: <20151218095032.EBEDC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bac362fffeb4c79e4b432d3fdfba80d8dfae02b7/directory

>---------------------------------------------------------------

commit bac362fffeb4c79e4b432d3fdfba80d8dfae02b7
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 2 04:00:31 2015 -0400

    Clarify docs for XDG directory and add link to migration guide


>---------------------------------------------------------------

bac362fffeb4c79e4b432d3fdfba80d8dfae02b7
 System/Directory.hs | 36 ++++++++++++++++++++----------------
 1 file changed, 20 insertions(+), 16 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index c49d67f..151533d 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1180,23 +1180,26 @@ getHomeDirectory =
 --   /Since: 1.2.3.0/
 data XdgDirectory
   = XdgData
-    -- ^ Data files:
-    --   may be overridden by the @XDG_DATA_HOME@ environment variable;
-    --   defaults to @~\/.local\/share@;
-    --   Windows equivalent: @%APPDATA%@
-    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@)
+    -- ^ For data files (e.g. images).
+    --   Defaults to @~\/.local\/share@ and can be
+    --   overridden by the @XDG_DATA_HOME@ environment variable.
+    --   On Windows, it is @%APPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@).
+    --   Can be considered as the user-specific equivalent of @\/usr\/share at .
   | XdgConfig
-    -- ^ For configuration files;
-    --   may be overridden by the @XDG_CONFIG_HOME@ environment variable;
-    --   defaults to @~\/.config@;
-    --   Windows equivalent: @%APPDATA%@
-    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@)
+    -- ^ For configuration files.
+    --   Defaults to @~\/.config@ and can be
+    --   overridden by the @XDG_CONFIG_HOME@ environment variable.
+    --   On Windows, it is @%APPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Roaming@).
+    --   Can be considered as the user-specific equivalent of @\/etc at .
   | XdgCache
-    -- ^ For non-essential (cached) data;
-    --   may be overridden by the @XDG_CACHE_HOME@ environment variable;
-    --   defaults to @~\/.cache@;
-    --   Windows equivalent: @%LOCALAPPDATA%@
-    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Local@)
+    -- ^ For non-essential files (e.g. cache).
+    --   Defaults to @~\/.cache@ and can be
+    --   overridden by the @XDG_CACHE_HOME@ environment variable.
+    --   On Windows, it is @%LOCALAPPDATA%@
+    --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Local@).
+    --   Can be considered as the user-specific equivalent of @\/var\/cache at .
   deriving (Eq, Ord, Read, Show)
 
 -- | Obtain the paths to special directories for storing user-specific
@@ -1265,7 +1268,8 @@ tryIOErrorType check action = do
 --   application data (traditional Unix location).  Except for backward
 --   compatibility reasons, newer applications may prefer the the
 --   XDG-conformant location provided by 'getXdgDirectory', which offers a
---   more fine-grained hierarchy as well as greater flexibility for the user.
+--   more fine-grained hierarchy as well as greater flexibility for the user
+--   (<https://github.com/haskell/directory/issues/6#issuecomment-96521020 migration guide>).
 --
 --   The argument is usually the name of the application.  Since it will be
 --   integrated into the path, it must consist of valid path characters.


From git at git.haskell.org  Fri Dec 18 09:50:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:34 +0000 (UTC)
Subject: [commit: packages/directory] master: Add Bounded and Enum instances
 for XdgDirectory (2cb99b3)
Message-ID: <20151218095034.F30983A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2cb99b3eee7fdafca015bd93f2fd36ac6bb6cc6b/directory

>---------------------------------------------------------------

commit 2cb99b3eee7fdafca015bd93f2fd36ac6bb6cc6b
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 2 04:00:59 2015 -0400

    Add Bounded and Enum instances for XdgDirectory


>---------------------------------------------------------------

2cb99b3eee7fdafca015bd93f2fd36ac6bb6cc6b
 System/Directory.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 151533d..e40c6b7 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1200,7 +1200,7 @@ data XdgDirectory
     --   On Windows, it is @%LOCALAPPDATA%@
     --   (e.g. @C:\/Users\//\<user\>/\/AppData\/Local@).
     --   Can be considered as the user-specific equivalent of @\/var\/cache at .
-  deriving (Eq, Ord, Read, Show)
+  deriving (Bounded, Enum, Eq, Ord, Read, Show)
 
 -- | Obtain the paths to special directories for storing user-specific
 --   application data, configuration, and cache files, conforming to the


From git at git.haskell.org  Fri Dec 18 09:50:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:37 +0000 (UTC)
Subject: [commit: packages/directory] master: Clarify docs for
 removeDirectoryRecursive (fixes #26) (dd3e722)
Message-ID: <20151218095037.05C843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dd3e722a0effdae32bad53b768fcac36d4a0a7d1/directory

>---------------------------------------------------------------

commit dd3e722a0effdae32bad53b768fcac36d4a0a7d1
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 16 09:49:06 2015 -0400

    Clarify docs for removeDirectoryRecursive (fixes #26)


>---------------------------------------------------------------

dd3e722a0effdae32bad53b768fcac36d4a0a7d1
 System/Directory.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index e40c6b7..70882e1 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -489,8 +489,8 @@ removeDirectory path =
 #endif
 
 -- | @'removeDirectoryRecursive' dir@ removes an existing directory /dir/
--- together with its contents and subdirectories. Symbolic links are removed
--- without affecting their the targets.
+-- together with its contents and subdirectories. Within this directory,
+-- symbolic links are removed without affecting their the targets.
 removeDirectoryRecursive :: FilePath -> IO ()
 removeDirectoryRecursive path =
   (`ioeSetLocation` "removeDirectoryRecursive") `modifyIOError` do


From git at git.haskell.org  Fri Dec 18 09:50:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:39 +0000 (UTC)
Subject: [commit: packages/directory] master: Ignore Cabal sandbox files
 (08d7106)
Message-ID: <20151218095039.0C5433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/08d71066eb021f00a8034f00f69fc98ee355891c/directory

>---------------------------------------------------------------

commit 08d71066eb021f00a8034f00f69fc98ee355891c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 18 02:29:26 2015 -0400

    Ignore Cabal sandbox files


>---------------------------------------------------------------

08d71066eb021f00a8034f00f69fc98ee355891c
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 1931232..0709a8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,5 @@
+.cabal-sandbox/
+cabal.sandbox.config
 GNUmakefile
 autom4te.cache/
 config.log


From git at git.haskell.org  Fri Dec 18 09:50:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:41 +0000 (UTC)
Subject: [commit: packages/directory] master: Refactor: fmap -> (<$>) (19039f7)
Message-ID: <20151218095041.129C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/19039f71dfaadc4eaa90fbd86e01a540f8ea229a/directory

>---------------------------------------------------------------

commit 19039f71dfaadc4eaa90fbd86e01a540f8ea229a
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 25 00:36:43 2015 -0400

    Refactor: fmap -> (<$>)


>---------------------------------------------------------------

19039f71dfaadc4eaa90fbd86e01a540f8ea229a
 System/Directory.hs | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 70882e1..49c8c1e 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -80,7 +80,17 @@ module System.Directory
     -- * Timestamps
 
     , getModificationTime
+
    ) where
+#if !MIN_VERSION_base(4, 8, 0)
+import Data.Functor ((<$>))
+#endif
+import Data.Maybe
+  ( listToMaybe
+#ifdef mingw32_HOST_OS
+  , maybeToList
+#endif
+  )
 
 import System.FilePath
 import System.IO
@@ -97,8 +107,6 @@ import Foreign.C
 
 {-# CFILES cbits/directory.c #-}
 
-import Data.Maybe
-
 import Data.Time ( UTCTime )
 import Data.Time.Clock.POSIX ( posixSecondsToUTCTime )
 
@@ -402,7 +410,7 @@ createDirectoryIfMissing create_parents path0
 #ifdef mingw32_HOST_OS
               canIgnore <- (withFileStatus "createDirectoryIfMissing" dir isDirectory)
 #else
-              canIgnore <- (Posix.isDirectory `fmap` Posix.getFileStatus dir)
+              canIgnore <- (Posix.isDirectory <$> Posix.getFileStatus dir)
 #endif
                            `E.catch` ((\ _ -> return (isAlreadyExistsError e))
                                     :: IOException -> IO Bool)
@@ -424,7 +432,7 @@ getDirectoryType :: FilePath -> IO DirectoryType
 getDirectoryType path =
   (`ioeSetLocation` "getDirectoryType") `modifyIOError` do
 #ifdef mingw32_HOST_OS
-    fmap classify (Win32.getFileAttributes path)
+    classify <$> Win32.getFileAttributes path
     where fILE_ATTRIBUTE_REPARSE_POINT = 0x400
           classify attr
             | attr .&. Win32.fILE_ATTRIBUTE_DIRECTORY == 0 = NotDirectory
@@ -791,9 +799,9 @@ foreign import ccall unsafe "realpath"
 --
 -- /Since: 1.2.2.0/
 makeAbsolute :: FilePath -> IO FilePath
-makeAbsolute = fmap normalise . absolutize
+makeAbsolute = (normalise <$>) . absolutize
   where absolutize path -- avoid the call to `getCurrentDirectory` if we can
-          | isRelative path = fmap (</> path) getCurrentDirectory
+          | isRelative path = (</> path) <$> getCurrentDirectory
           | otherwise       = return path
 
 -- | 'makeRelative' the current directory.
@@ -1225,8 +1233,8 @@ getXdgDirectory :: XdgDirectory         -- ^ which special directory
                                         --   path is returned
                 -> IO FilePath
 getXdgDirectory xdgDir suffix =
-  modifyIOError (`ioeSetLocation` "getXdgDirectory") .
-  fmap (normalise . (</> suffix)) $
+  modifyIOError (`ioeSetLocation` "getXdgDirectory") $
+  normalise . (</> suffix) <$>
   case xdgDir of
     XdgData   -> get False "XDG_DATA_HOME"   ".local/share"
     XdgConfig -> get False "XDG_CONFIG_HOME" ".config"
@@ -1243,7 +1251,7 @@ getXdgDirectory xdgDir suffix =
         Nothing                     -> fallback'
         Just path | isRelative path -> fallback'
                   | otherwise       -> return path
-      where fallback' = fmap (</> fallback) getHomeDirectory
+      where fallback' = (</> fallback) <$> getHomeDirectory
 
 -- | Return the value of an environment variable, or 'Nothing' if there is no
 --   such value.  (Equivalent to "lookupEnv" from base-4.6.)


From git at git.haskell.org  Fri Dec 18 09:50:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:43 +0000 (UTC)
Subject: [commit: packages/directory] master: Refactor imports of
 Control.Exception (and some others) (34ed1af)
Message-ID: <20151218095043.19B963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34ed1af53dd37dc60f7b2e6d3b171b582f636c48/directory

>---------------------------------------------------------------

commit 34ed1af53dd37dc60f7b2e6d3b171b582f636c48
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 25 02:44:10 2015 -0400

    Refactor imports of Control.Exception (and some others)


>---------------------------------------------------------------

34ed1af53dd37dc60f7b2e6d3b171b582f636c48
 System/Directory.hs | 74 ++++++++++++++++++++++++++++-------------------------
 1 file changed, 39 insertions(+), 35 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 49c8c1e..e871797 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -82,6 +82,8 @@ module System.Directory
     , getModificationTime
 
    ) where
+import Control.Exception ( bracket, bracketOnError )
+import Control.Monad ( when, unless )
 #if !MIN_VERSION_base(4, 8, 0)
 import Data.Functor ((<$>))
 #endif
@@ -95,8 +97,16 @@ import Data.Maybe
 import System.FilePath
 import System.IO
 import System.IO.Error
-import Control.Monad           ( when, unless )
-import Control.Exception.Base as E
+  ( catchIOError
+  , ioeSetErrorString
+  , ioeSetFileName
+  , ioeSetLocation
+  , isAlreadyExistsError
+  , isDoesNotExistError
+  , isPermissionError
+  , mkIOError
+  , modifyIOError
+  , tryIOError )
 
 #ifdef __HUGS__
 import Hugs.Directory
@@ -379,16 +389,15 @@ createDirectoryIfMissing create_parents path0
     parents = reverse . scanl1 (</>) . splitDirectories . normalise
 
     createDirs []         = return ()
-    createDirs (dir:[])   = createDir dir throwIO
+    createDirs (dir:[])   = createDir dir ioError
     createDirs (dir:dirs) =
       createDir dir $ \_ -> do
         createDirs dirs
-        createDir dir throwIO
+        createDir dir ioError
 
-    createDir :: FilePath -> (IOException -> IO ()) -> IO ()
     createDir dir notExistHandler = do
-      r <- E.try $ createDirectory dir
-      case (r :: Either IOException ()) of
+      r <- tryIOError (createDirectory dir)
+      case r of
         Right ()                   -> return ()
         Left  e
           | isDoesNotExistError  e -> notExistHandler e
@@ -406,16 +415,17 @@ createDirectoryIfMissing create_parents path0
           -- This caused GHCi to crash when loading a module in the root
           -- directory.
           | isAlreadyExistsError e
-         || isPermissionError e -> do
+         || isPermissionError    e -> do
+              canIgnore <- isDir `catchIOError` \ _ ->
+                           return (isAlreadyExistsError e)
+              unless canIgnore (ioError e)
+          | otherwise              -> ioError e
+      where
 #ifdef mingw32_HOST_OS
-              canIgnore <- (withFileStatus "createDirectoryIfMissing" dir isDirectory)
+        isDir = withFileStatus "createDirectoryIfMissing" dir isDirectory
 #else
-              canIgnore <- (Posix.isDirectory <$> Posix.getFileStatus dir)
+        isDir = (Posix.isDirectory <$> Posix.getFileStatus dir)
 #endif
-                           `E.catch` ((\ _ -> return (isAlreadyExistsError e))
-                                    :: IOException -> IO Bool)
-              unless canIgnore (throwIO e)
-          | otherwise              -> throwIO e
 
 #if __GLASGOW_HASKELL__
 
@@ -726,7 +736,7 @@ copied to /new/, if possible.
 
 copyFile :: FilePath -> FilePath -> IO ()
 copyFile fromFPath toFPath =
-    copy `catchIOError` (\exc -> throwIO $ ioeSetLocation exc "copyFile")
+    copy `catchIOError` (\ exc -> ioError (ioeSetLocation exc "copyFile"))
     where copy = bracket (openBinaryFile fromFPath ReadMode) hClose $ \hFrom ->
                  bracketOnError openTmp cleanTmp $ \(tmpFPath, hTmp) ->
                  do allocaBytes bufferSize $ copyContents hFrom hTmp
@@ -1051,7 +1061,7 @@ doesDirectoryExist name =
    (do stat <- Posix.getFileStatus name
        return (Posix.isDirectory stat))
 #endif
-   `E.catch` ((\ _ -> return False) :: IOException -> IO Bool)
+   `catchIOError` \ _ -> return False
 
 {- |The operation 'doesFileExist' returns 'True'
 if the argument file exists and is not a directory, and 'False' otherwise.
@@ -1065,7 +1075,7 @@ doesFileExist name =
    (do stat <- Posix.getFileStatus name
        return (not (Posix.isDirectory stat)))
 #endif
-   `E.catch` ((\ _ -> return False) :: IOException -> IO Bool)
+   `catchIOError` \ _ -> return False
 
 {- |The 'getModificationTime' operation returns the
 clock time at which the file or directory was last modified.
@@ -1164,19 +1174,14 @@ The home directory for the current user does not exist, or
 cannot be found.
 -}
 getHomeDirectory :: IO FilePath
-getHomeDirectory =
-  modifyIOError ((`ioeSetLocation` "getHomeDirectory")) $ do
+getHomeDirectory = modifyIOError (`ioeSetLocation` "getHomeDirectory") get
+  where
 #if defined(mingw32_HOST_OS)
-    r <- E.try $ Win32.sHGetFolderPath nullPtr Win32.cSIDL_PROFILE nullPtr 0
-    case (r :: Either IOException String) of
-      Right s -> return s
-      Left  _ -> do
-        r1 <- E.try $ Win32.sHGetFolderPath nullPtr Win32.cSIDL_WINDOWS nullPtr 0
-        case r1 of
-          Right s -> return s
-          Left  e -> ioError (e :: IOException)
+    get = getFolderPath Win32.cSIDL_PROFILE `catchIOError` \ _ ->
+          getFolderPath Win32.cSIDL_WINDOWS
+    getFolderPath what = Win32.sHGetFolderPath nullPtr what nullPtr 0
 #else
-    getEnv "HOME"
+    get = getEnv "HOME"
 #endif
 
 -- | Special directories for storing user-specific application data,
@@ -1268,7 +1273,7 @@ tryIOErrorType :: (IOError -> Bool) -> IO a -> IO (Either IOError a)
 tryIOErrorType check action = do
   result <- tryIOError action
   case result of
-    Left  err -> if check err then return (Left err) else throwIO err
+    Left  err -> if check err then return (Left err) else ioError err
     Right val -> return (Right val)
 #endif
 
@@ -1304,7 +1309,7 @@ getAppUserDataDirectory :: FilePath     -- ^ a relative path that is appended
                                         --   to the path
                         -> IO FilePath
 getAppUserDataDirectory appName = do
-  modifyIOError ((`ioeSetLocation` "getAppUserDataDirectory")) $ do
+  modifyIOError (`ioeSetLocation` "getAppUserDataDirectory") $ do
 #if defined(mingw32_HOST_OS)
     s <- Win32.sHGetFolderPath nullPtr Win32.cSIDL_APPDATA nullPtr 0
     return (s++'\\':appName)
@@ -1335,7 +1340,7 @@ cannot be found.
 -}
 getUserDocumentsDirectory :: IO FilePath
 getUserDocumentsDirectory = do
-  modifyIOError ((`ioeSetLocation` "getUserDocumentsDirectory")) $ do
+  modifyIOError (`ioeSetLocation` "getUserDocumentsDirectory") $ do
 #if defined(mingw32_HOST_OS)
     Win32.sHGetFolderPath nullPtr Win32.cSIDL_PERSONAL nullPtr 0
 #else
@@ -1369,13 +1374,12 @@ The operating system has no notion of temporary directory.
 The function doesn\'t verify whether the path exists.
 -}
 getTemporaryDirectory :: IO FilePath
-getTemporaryDirectory = do
+getTemporaryDirectory =
 #if defined(mingw32_HOST_OS)
   Win32.getTemporaryDirectory
 #else
-  getEnv "TMPDIR"
-    `catchIOError` \e -> if isDoesNotExistError e then return "/tmp"
-                          else throwIO e
+  getEnv "TMPDIR" `catchIOError` \ err ->
+  if isDoesNotExistError err then return "/tmp" else ioError err
 #endif
 
 -- ToDo: This should be determined via autoconf (AC_EXEEXT)


From git at git.haskell.org  Fri Dec 18 09:50:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:45 +0000 (UTC)
Subject: [commit: packages/directory] master: Check Win32 version before using
 cSIDL_LOCAL_APPDATA (b3d109e)
Message-ID: <20151218095045.1FD123A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b3d109e853b9854468e8e6129682326355a64c78/directory

>---------------------------------------------------------------

commit b3d109e853b9854468e8e6129682326355a64c78
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 25 02:51:00 2015 -0400

    Check Win32 version before using cSIDL_LOCAL_APPDATA


>---------------------------------------------------------------

b3d109e853b9854468e8e6129682326355a64c78
 System/Directory.hs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index e871797..6c4014b 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -137,6 +137,15 @@ import qualified System.Posix as Posix
 
 #endif /* __GLASGOW_HASKELL__ */
 
+#ifdef mingw32_HOST_OS
+win32_cSIDL_LOCAL_APPDATA :: Win32.CSIDL
+#if MIN_VERSION_Win32(2, 3, 1)
+win32_cSIDL_LOCAL_APPDATA = Win32.cSIDL_LOCAL_APPDATA -- only on HEAD atm
+#else
+win32_cSIDL_LOCAL_APPDATA = 0x001c
+#endif
+#endif
+
 {- $intro
 A directory contains a series of entries, each of which is a named
 reference to a file system object (file, directory etc.).  Some
@@ -1247,7 +1256,7 @@ getXdgDirectory xdgDir suffix =
   where
 #if defined(mingw32_HOST_OS)
     get isLocal _ _ = Win32.sHGetFolderPath nullPtr which nullPtr 0
-      where which | isLocal   = Win32.cSIDL_LOCAL_APPDATA
+      where which | isLocal   = win32_cSIDL_LOCAL_APPDATA
                   | otherwise = Win32.cSIDL_APPDATA
 #else
     get _ name fallback = do


From git at git.haskell.org  Fri Dec 18 09:50:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:47 +0000 (UTC)
Subject: [commit: packages/directory] master: Refactor
 dispatch-tests.hs:quoteCmdArgs (4b0ccb4)
Message-ID: <20151218095047.2677A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4b0ccb4d2508dbbc0925d779f184a68172f009ee/directory

>---------------------------------------------------------------

commit 4b0ccb4d2508dbbc0925d779f184a68172f009ee
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon May 25 02:48:19 2015 -0400

    Refactor dispatch-tests.hs:quoteCmdArgs


>---------------------------------------------------------------

4b0ccb4d2508dbbc0925d779f184a68172f009ee
 tools/dispatch-tests.hs | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/tools/dispatch-tests.hs b/tools/dispatch-tests.hs
index 2b9d6df..963060f 100644
--- a/tools/dispatch-tests.hs
+++ b/tools/dispatch-tests.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE CPP, ForeignFunctionInterface #-}
 module Main (main) where
 import Prelude (($), (.), (=<<), (==), Eq, IO, Int, String,
-                id, fromIntegral, otherwise, unwords)
+                fromIntegral, otherwise, unwords)
 import Data.Functor ((<$>))
 import Data.Monoid ((<>), mconcat)
 import Foreign (Ptr)
@@ -46,18 +46,19 @@ rawSystem cmd args  =
 
 -- handle the different quoting rules in CMD.EXE vs POSIX shells
 quoteCmdArgs :: [String] -> String
-quoteCmdArgs cmdArgs =
+quoteCmdArgs cmdArgs = quoted'
+  where
+    quoted  = unwords (quote <$> cmdArgs)
 #ifdef mingw32_HOST_OS
-  -- the arcane quoting rules require us to add an extra set of quotes
-  -- around the entire thing: see `help cmd` or look at
-  -- https://superuser.com/a/238813
-  let quote s = "\"" <> replaceElem '"' "\"\"" s <> "\""
-  in (\ s -> "\"" <> s <> "\"") $
+    -- the arcane quoting rules require us to add an extra set of quotes
+    -- around the entire thing: see `help cmd` or look at
+    -- https://superuser.com/a/238813
+    quote s = "\"" <> replaceElem '"' "\"\"" s <> "\""
+    quoted' = "\"" <> quoted <> "\""
 #else
-  let quote s = "'" <> replaceElem '\'' "'\\''" s <> "'"
-  in id $
+    quote s = "'" <> replaceElem '\'' "'\\''" s <> "'"
+    quoted' = quoted
 #endif
-     unwords (quote <$> cmdArgs)
 
 replaceElem :: Eq a => a -> [a] -> [a] -> [a]
 replaceElem match repl = mconcat . (replace <$>)


From git at git.haskell.org  Fri Dec 18 09:50:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:49 +0000 (UTC)
Subject: [commit: packages/directory] master: Implement setModificationTime
 (and rewrite getModificationTime) (499130c)
Message-ID: <20151218095049.305EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/499130ca810a4cff22623811265af2768aaac491/directory

>---------------------------------------------------------------

commit 499130ca810a4cff22623811265af2768aaac491
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 20:29:29 2015 -0400

    Implement setModificationTime (and rewrite getModificationTime)
    
    The unix package does not have a general setFileTimesHiRes that allowed
    setting mtime separately from atime.  Therefore, we import the foreign
    utimensat function in the new Internal module (hsc), which also involves
    implementing struct timespec.
    
    Fixes #13.


>---------------------------------------------------------------

499130ca810a4cff22623811265af2768aaac491
 System/Directory.hs           | 160 +++++++++++++++++++++++++++++++++---------
 System/Directory/Internal.hsc |  46 ++++++++++++
 changelog.md                  |   5 +-
 directory.cabal               |   2 +
 4 files changed, 180 insertions(+), 33 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 499130ca810a4cff22623811265af2768aaac491

From git at git.haskell.org  Fri Dec 18 09:50:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:51 +0000 (UTC)
Subject: [commit: packages/directory] master: Add new test suite,
 including tests for get/setModificationTime (c63b88d)
Message-ID: <20151218095051.398053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c63b88d628cba4c20cc9de914c094509c1e65dab/directory

>---------------------------------------------------------------

commit c63b88d628cba4c20cc9de914c094509c1e65dab
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 20:30:34 2015 -0400

    Add new test suite, including tests for get/setModificationTime
    
    For various reasons outlined in this issue #19 [1], the existing test
    suite does not serve our needs well and needs to be (eventually)
    replaced with a simple Cabal test suite. This commit implements the
    skeleton for the new test suite with a simple example for
    get/setModificationTime.
    
    [1]: https://github.com/haskell/directory/issues/19#issuecomment-105094988


>---------------------------------------------------------------

c63b88d628cba4c20cc9de914c094509c1e65dab
 directory.cabal           |  10 +++
 tests/Main.hs             |   7 ++
 tests/ModificationTime.hs |  22 +++++++
 tests/Util.hs             | 163 ++++++++++++++++++++++++++++++++++++++++++++++
 tests/util.inl            |   4 ++
 5 files changed, 206 insertions(+)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c63b88d628cba4c20cc9de914c094509c1e65dab

From git at git.haskell.org  Fri Dec 18 09:50:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:53 +0000 (UTC)
Subject: [commit: packages/directory] master: Add getAccessTime (4ac04a8)
Message-ID: <20151218095053.416D13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4ac04a820b2f8c822b0ba78c515fdf0e7afa03bd/directory

>---------------------------------------------------------------

commit 4ac04a820b2f8c822b0ba78c515fdf0e7afa03bd
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 20:31:58 2015 -0400

    Add getAccessTime


>---------------------------------------------------------------

4ac04a820b2f8c822b0ba78c515fdf0e7afa03bd
 System/Directory.hs                        | 43 ++++++++++++++++++++++++------
 changelog.md                               |  2 ++
 tests/{ModificationTime.hs => FileTime.hs} |  8 +++++-
 tests/Main.hs                              |  4 +--
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 9aba011..faddfe3 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -79,6 +79,7 @@ module System.Directory
 
     -- * Timestamps
 
+    , getAccessTime
     , getModificationTime
     , setModificationTime
 
@@ -1114,6 +1115,25 @@ openFileHandle path mode = Win32.createFile path mode share Nothing
              .|. Win32.fILE_FLAG_BACKUP_SEMANTICS -- required for directories
 #endif
 
+-- | Obtain the time at which the file or directory was last accessed.
+--
+-- The operation may fail with:
+--
+-- * 'isPermissionError' if the user is not permitted to read
+--   the access time; or
+--
+-- * 'isDoesNotExistError' if the file or directory does not exist.
+--
+-- Caveat for POSIX systems: This function returns a timestamp with sub-second
+-- resolution only if this package is compiled against @unix-2.6.0.0@ or later
+-- and the underlying filesystem supports them.
+--
+-- /Since: 1.2.3.0/
+--
+getAccessTime :: FilePath -> IO UTCTime
+getAccessTime = modifyIOError (`ioeSetLocation` "getAccessTime") .
+                getFileTime False
+
 -- | Obtain the time at which the file or directory was last modified.
 --
 -- The operation may fail with:
@@ -1128,24 +1148,31 @@ openFileHandle path mode = Win32.createFile path mode share Nothing
 -- and the underlying filesystem supports them.
 --
 getModificationTime :: FilePath -> IO UTCTime
-getModificationTime path =
-  modifyIOError (`ioeSetLocation` "getModificationTime") $
-  posixSecondsToUTCTime <$> getTime
+getModificationTime = modifyIOError (`ioeSetLocation` "getModificationTime") .
+                      getFileTime True
+
+getFileTime :: Bool -> FilePath -> IO UTCTime
+getFileTime isMtime path = posixSecondsToUTCTime <$> getTime
   where
     path' = normalise path              -- handle empty paths
 #ifdef mingw32_HOST_OS
     getTime =
       bracket (openFileHandle path' Win32.gENERIC_READ)
               Win32.closeHandle $ \ handle ->
-      alloca $ \ mtime -> do
-        Win32.failIf_ not "" (Win32.c_GetFileTime handle nullPtr nullPtr mtime)
-        windowsToPosixTime <$> peek mtime
+      alloca $ \ time -> do
+        Win32.failIf_ not "" $
+          Win32.c_GetFileTime handle nullPtr
+            (if isMtime then nullPtr else time)
+            (if isMtime then time    else nullPtr)
+        windowsToPosixTime <$> peek time
 #else
     getTime = convertTime <$> Posix.getFileStatus path'
 # if MIN_VERSION_unix(2, 6, 0)
-    convertTime = Posix.modificationTimeHiRes
+    convertTime = if isMtime then Posix.modificationTimeHiRes
+                             else Posix.accessTimeHiRes
 # else
-    convertTime = realToFrac . Posix.modificationTime
+    convertTime = realToFrac . if isMtime then Posix.modificationTime
+                                          else Posix.accessTime
 # endif
 #endif
 
diff --git a/changelog.md b/changelog.md
index 67724a6..05e9c51 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,6 +9,8 @@ Changelog for the [`directory`][1] package
   * Implement `setModificationTime` counterpart to `getModificationTime`
     ([#13](https://github.com/haskell/directory/issues/13))
 
+  * Implement `getAccessTime`
+
 ## 1.2.2.1 (Apr 2015)
 
   * Fix dependency problem on NixOS when building with tests
diff --git a/tests/ModificationTime.hs b/tests/FileTime.hs
similarity index 69%
rename from tests/ModificationTime.hs
rename to tests/FileTime.hs
index 0d4735a..c830864 100644
--- a/tests/ModificationTime.hs
+++ b/tests/FileTime.hs
@@ -1,5 +1,5 @@
 {-# LANGUAGE CPP #-}
-module ModificationTime where
+module FileTime where
 #include "util.inl"
 import System.Directory
 import Data.Foldable (for_)
@@ -15,8 +15,14 @@ main _t = do
        , (".",   someTimeAgo)
        , ("",    someTimeAgo) ] $ \ (file, mtime1) -> do
 
+    atime1 <- getAccessTime file
     setModificationTime file mtime1
+    atime2 <- getAccessTime file
     mtime2 <- getModificationTime file
 
     -- modification time should be set with at worst 1 sec resolution
     T(expectNearTime) ("mtime", file) mtime1 mtime2 1
+
+    -- access time should not change, although it may lose some precision
+    -- on POSIX systems without 'utimensat'
+    T(expectNearTime) ("atime", file) atime1 atime2 1
diff --git a/tests/Main.hs b/tests/Main.hs
index 11effa9..dba7706 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -1,7 +1,7 @@
 module Main (main) where
 import qualified Util as T
-import qualified ModificationTime
+import qualified FileTime
 
 main :: IO ()
 main = T.testMain $ \ _t -> do
-  T.isolatedRun _t "ModificationTime" ModificationTime.main
+  T.isolatedRun _t "FileTime" FileTime.main


From git at git.haskell.org  Fri Dec 18 09:50:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:55 +0000 (UTC)
Subject: [commit: packages/directory] master: Update GHC test framework to
 commit 508a3a3 (86cb571)
Message-ID: <20151218095055.4AB343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/86cb571ed144b185613e705f73ee0f2fbe382122/directory

>---------------------------------------------------------------

commit 86cb571ed144b185613e705f73ee0f2fbe382122
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 30 22:18:14 2015 -0400

    Update GHC test framework to commit 508a3a3


>---------------------------------------------------------------

86cb571ed144b185613e705f73ee0f2fbe382122
 tools/ghc-test-framework.shar | 163 +++++++++++++++++++++++++-----------------
 1 file changed, 96 insertions(+), 67 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 86cb571ed144b185613e705f73ee0f2fbe382122

From git at git.haskell.org  Fri Dec 18 09:50:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:57 +0000 (UTC)
Subject: [commit: packages/directory] master: Set the filename in IO errors
 from the file time functions (5f431e0)
Message-ID: <20151218095057.51E4C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f431e0905acb7e5d1c02beea0eefad94829645e/directory

>---------------------------------------------------------------

commit 5f431e0905acb7e5d1c02beea0eefad94829645e
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 30 23:58:10 2015 -0400

    Set the filename in IO errors from the file time functions


>---------------------------------------------------------------

5f431e0905acb7e5d1c02beea0eefad94829645e
 System/Directory.hs | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 8bd06c2..99b36a4 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1153,7 +1153,8 @@ getModificationTime = modifyIOError (`ioeSetLocation` "getModificationTime") .
                       getFileTime True
 
 getFileTime :: Bool -> FilePath -> IO UTCTime
-getFileTime isMtime path = posixSecondsToUTCTime <$> getTime
+getFileTime isMtime path = modifyIOError (`ioeSetFileName` path) $
+                           posixSecondsToUTCTime <$> getTime
   where
     path' = normalise path              -- handle empty paths
 #ifdef mingw32_HOST_OS
@@ -1202,7 +1203,8 @@ getFileTime isMtime path = posixSecondsToUTCTime <$> getTime
 --
 setModificationTime :: FilePath -> UTCTime -> IO ()
 setModificationTime path mtime =
-  modifyIOError (`ioeSetLocation` "setModificationTime") setTime
+  modifyIOError ((`ioeSetLocation` "setModificationTime") .
+                 (`ioeSetFileName` path)) setTime
   where
     path'  = normalise path             -- handle empty paths
     mtime' = utcTimeToPOSIXSeconds mtime


From git at git.haskell.org  Fri Dec 18 09:50:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:50:59 +0000 (UTC)
Subject: [commit: packages/directory] master: Use autoconf to figure out
 exeExtension (b6b625f)
Message-ID: <20151218095059.583E33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b6b625f42190ab489c0c6b071cb6188d15dd7c63/directory

>---------------------------------------------------------------

commit b6b625f42190ab489c0c6b071cb6188d15dd7c63
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 20:43:32 2015 -0400

    Use autoconf to figure out exeExtension


>---------------------------------------------------------------

b6b625f42190ab489c0c6b071cb6188d15dd7c63
 System/Directory.hs           | 15 +++------------
 System/Directory/Internal.hsc |  7 +++++++
 configure.ac                  |  5 +++++
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index faddfe3..8bd06c2 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -145,12 +145,13 @@ import qualified System.Posix as Posix
 #endif
 
 #ifdef HAVE_UTIMENSAT
-import System.Directory.Internal
 import System.Posix.Internals ( withFilePath )
 #endif
 
 #endif /* __GLASGOW_HASKELL__ */
 
+import System.Directory.Internal
+
 #ifdef mingw32_HOST_OS
 win32_cSIDL_LOCAL_APPDATA :: Win32.CSIDL
 win32_fILE_SHARE_DELETE   :: Win32.ShareMode
@@ -876,7 +877,7 @@ findExecutable fileName = do
 findExecutables :: String -> IO [FilePath]
 findExecutables binary = do
 #if defined(mingw32_HOST_OS)
-    file <- Win32.searchPath Nothing binary ('.':exeExtension)
+    file <- Win32.searchPath Nothing binary exeExtension
     return $ maybeToList file
 #else
     path <- getEnv "PATH"
@@ -1513,13 +1514,3 @@ getTemporaryDirectory =
   getEnv "TMPDIR" `catchIOError` \ err ->
   if isDoesNotExistError err then return "/tmp" else ioError err
 #endif
-
--- ToDo: This should be determined via autoconf (AC_EXEEXT)
--- | Extension for executable files
--- (typically @\"\"@ on Unix and @\"exe\"@ on Windows or OS\/2)
-exeExtension :: String
-#ifdef mingw32_HOST_OS
-exeExtension = "exe"
-#else
-exeExtension = ""
-#endif
diff --git a/System/Directory/Internal.hsc b/System/Directory/Internal.hsc
index 17c06f0..e20187b 100644
--- a/System/Directory/Internal.hsc
+++ b/System/Directory/Internal.hsc
@@ -1,5 +1,7 @@
 module System.Directory.Internal where
 
+#include <HsDirectory.h>
+
 #ifndef mingw32_HOST_OS
 # include <HsUnixConfig.h>
 #endif
@@ -13,6 +15,11 @@ import Foreign.C
 import System.Posix.Types
 #endif
 
+-- | Filename extension for executable files (including the dot if any)
+--   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
+exeExtension :: String
+exeExtension = (#const_str EXE_EXTENSION)
+
 #ifdef HAVE_UTIMENSAT
 
 data CTimeSpec = CTimeSpec EpochTime CLong
diff --git a/configure.ac b/configure.ac
index c75262c..6bd44ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,4 +13,9 @@ AC_PROG_CC()
 # check for specific header (.h) files that we are interested in
 AC_CHECK_HEADERS([sys/types.h unistd.h sys/stat.h])
 
+# EXTEXT is defined automatically by AC_PROG_CC;
+# we just need to capture it in the header file
+AC_DEFINE_UNQUOTED([EXE_EXTENSION], ["$EXEEXT"],
+                   [Filename extension of executable files])
+
 AC_OUTPUT


From git at git.haskell.org  Fri Dec 18 09:51:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:01 +0000 (UTC)
Subject: [commit: packages/directory] master: Stop ignoring Travis failures on
 HEAD (64fe718)
Message-ID: <20151218095101.5E9393A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/64fe7187c31eea99402187455f0fdc6d601dbf84/directory

>---------------------------------------------------------------

commit 64fe7187c31eea99402187455f0fdc6d601dbf84
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 22:37:13 2015 -0400

    Stop ignoring Travis failures on HEAD


>---------------------------------------------------------------

64fe7187c31eea99402187455f0fdc6d601dbf84
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 58105c6..00832fc 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,10 +11,6 @@ env:
  - GHCVER=7.10.1 CABALVER=1.22
  - GHCVER=head   CABALVER=head
 
-matrix:
-  allow_failures:
-   - env: GHCVER=head   CABALVER=head
-
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
  - travis_retry sudo apt-get update


From git at git.haskell.org  Fri Dec 18 09:51:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:03 +0000 (UTC)
Subject: [commit: packages/directory] master: Minor doc update for
 makeAbsolute (2c3789b)
Message-ID: <20151218095103.656173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2c3789b5db99a96143b005f4c6e9299765715a76/directory

>---------------------------------------------------------------

commit 2c3789b5db99a96143b005f4c6e9299765715a76
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun May 31 03:25:36 2015 -0400

    Minor doc update for makeAbsolute


>---------------------------------------------------------------

2c3789b5db99a96143b005f4c6e9299765715a76
 System/Directory.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 99b36a4..4707f38 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -830,9 +830,10 @@ foreign import ccall unsafe "realpath"
 #endif
 
 -- | Make a path absolute by prepending the current directory (if it isn't
--- already absolute) and applying @'normalise'@ to the result.
+-- already absolute) and applying 'normalise' to the result.
 --
--- The operation may fail with the same exceptions as @'getCurrentDirectory'@.
+-- If the path is already absolute, the operation never fails.  Otherwise, the
+-- operation may fail with the same exceptions as 'getCurrentDirectory'.
 --
 -- /Since: 1.2.2.0/
 makeAbsolute :: FilePath -> IO FilePath


From git at git.haskell.org  Fri Dec 18 09:51:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:05 +0000 (UTC)
Subject: [commit: packages/directory] master: Correct the trailing slash
 behavior of makeAbsolute on empty string (5da8cbc)
Message-ID: <20151218095105.6C0DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5da8cbcf978a8f63b3fc58c7a8825a3469bc2a17/directory

>---------------------------------------------------------------

commit 5da8cbcf978a8f63b3fc58c7a8825a3469bc2a17
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun May 31 04:15:48 2015 -0400

    Correct the trailing slash behavior of makeAbsolute on empty string
    
    Rationale: behavior of makeAbsolute on "." and "" should be identical


>---------------------------------------------------------------

5da8cbcf978a8f63b3fc58c7a8825a3469bc2a17
 System/Directory.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 4707f38..24a84d9 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -839,7 +839,8 @@ foreign import ccall unsafe "realpath"
 makeAbsolute :: FilePath -> IO FilePath
 makeAbsolute = (normalise <$>) . absolutize
   where absolutize path -- avoid the call to `getCurrentDirectory` if we can
-          | isRelative path = (</> path) <$> getCurrentDirectory
+          | isRelative path = (</> path) . addTrailingPathSeparator <$>
+                              getCurrentDirectory
           | otherwise       = return path
 
 -- | 'makeRelative' the current directory.


From git at git.haskell.org  Fri Dec 18 09:51:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:07 +0000 (UTC)
Subject: [commit: packages/directory] master: Update tests/FileTime.hs to also
 check for does-not-exist errors (41cd458)
Message-ID: <20151218095107.736053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/41cd458703d4ef88c3539c7ab46096afd8ef9deb/directory

>---------------------------------------------------------------

commit 41cd458703d4ef88c3539c7ab46096afd8ef9deb
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat May 30 23:47:32 2015 -0400

    Update tests/FileTime.hs to also check for does-not-exist errors


>---------------------------------------------------------------

41cd458703d4ef88c3539c7ab46096afd8ef9deb
 tests/FileTime.hs | 8 ++++++++
 tests/Util.hs     | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/FileTime.hs b/tests/FileTime.hs
index c830864..580aa7d 100644
--- a/tests/FileTime.hs
+++ b/tests/FileTime.hs
@@ -2,6 +2,7 @@
 module FileTime where
 #include "util.inl"
 import System.Directory
+import System.IO.Error (isDoesNotExistError)
 import Data.Foldable (for_)
 import qualified Data.Time.Clock as Time
 
@@ -10,6 +11,13 @@ main _t = do
   now <- Time.getCurrentTime
   let someTimeAgo = Time.addUTCTime (-3600) now
 
+  T(expectIOErrorType) () isDoesNotExistError $
+    getAccessTime "nonexistent-file"
+  T(expectIOErrorType) () isDoesNotExistError $
+    getModificationTime "nonexistent-file"
+  T(expectIOErrorType) () isDoesNotExistError $
+    setModificationTime "nonexistent-file" someTimeAgo
+
   writeFile  "foo" ""
   for_ [ ("foo", someTimeAgo)
        , (".",   someTimeAgo)
diff --git a/tests/Util.hs b/tests/Util.hs
index 3a0584c..cf1f134 100644
--- a/tests/Util.hs
+++ b/tests/Util.hs
@@ -108,7 +108,7 @@ expectNearTime t file line context x y diff =
 
 expectIOErrorType :: Show a =>
                      TestEnv -> String -> Integer -> a
-                  -> (IOError -> Bool) -> IO a -> IO ()
+                  -> (IOError -> Bool) -> IO b -> IO ()
 expectIOErrorType t file line context which action = do
   result <- tryIOError action
   checkEither t [showContext file line context] $ case result of


From git at git.haskell.org  Fri Dec 18 09:51:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:09 +0000 (UTC)
Subject: [commit: packages/directory] master: Implement safer version of
 canonicalizePath for POSIX (f7b8c8a)
Message-ID: <20151218095109.7B70B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f7b8c8ac527b6453925acf10bf2a95c61081ac04/directory

>---------------------------------------------------------------

commit f7b8c8ac527b6453925acf10bf2a95c61081ac04
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun May 31 04:20:07 2015 -0400

    Implement safer version of canonicalizePath for POSIX
    
    Apply realpath to the largest prefix of the given path that is still
    accessible (that can be stat successfully) so that canonicalizePath will
    return reasonable results even for non-existent paths.  It should very
    rarely throw exceptions now.
    
    Fixes #23.


>---------------------------------------------------------------

f7b8c8ac527b6453925acf10bf2a95c61081ac04
 System/Directory.hs              | 100 ++++++++++++++++++++++++---------------
 changelog.md                     |   5 ++
 tests/CanonicalizePath.hs        |  23 +++++++++
 tests/Main.hs                    |   2 +
 tests/Util.hs                    |   8 ++++
 tests/all.T                      |   1 -
 tests/canonicalizePath001.hs     |   8 ----
 tests/canonicalizePath001.stdout |   1 -
 8 files changed, 101 insertions(+), 47 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f7b8c8ac527b6453925acf10bf2a95c61081ac04

From git at git.haskell.org  Fri Dec 18 09:51:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:11 +0000 (UTC)
Subject: [commit: packages/directory] master: Work around Travis failures on
 HEAD due to Cabal bug (af37fa2)
Message-ID: <20151218095111.827183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/af37fa2bea504a9bc7a54fbaaf0d273009b84bc5/directory

>---------------------------------------------------------------

commit af37fa2bea504a9bc7a54fbaaf0d273009b84bc5
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 22:34:17 2015 -0400

    Work around Travis failures on HEAD due to Cabal bug
    
    The previous failures were due to this bug:
    https://github.com/haskell/cabal/issues/1938


>---------------------------------------------------------------

af37fa2bea504a9bc7a54fbaaf0d273009b84bc5
 .travis.yml | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 68756df..58105c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -35,6 +35,18 @@ before_script:
      else streaming=streaming
      fi
      export streaming
+ - | # skip cabal test on HEAD due to this bug:
+     # https://github.com/haskell/cabal/issues/1938
+     # this is fine as the test will be run during installation anyway
+     if [ "$CABALVER" = head ]
+     then def_cabal_test='cabal_test() {
+          echo "warning: cabal test skipped due to Cabal bug #1938"
+     }'
+     else def_cabal_test='cabal_test() {
+          cabal test "$@"
+     }'
+     fi
+     export def_cabal_test
  - | # check if '--run-tests' is supported (didn't exist until 1.20);
      # tests must be run prior to install as packages may be broken by install
      if cabal 2>&1 install --run-tests __dummy |
@@ -63,6 +75,6 @@ script:
  - cabal build
  - cabal check
  - cabal sdist
- - cabal test --show-details=$streaming
+ - eval "$def_cabal_test" && cabal_test --show-details=$streaming
  - eval "$def_cabal_install_run_tests" &&
    cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz


From git at git.haskell.org  Fri Dec 18 09:51:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:13 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove config.guess, config.sub,
 and install-sh (4e81c12)
Message-ID: <20151218095113.8A6493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4e81c1275981c35bdb482942fdb45f4ea7f5fb8b/directory

>---------------------------------------------------------------

commit 4e81c1275981c35bdb482942fdb45f4ea7f5fb8b
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Jun 1 20:11:24 2015 -0400

    Remove config.guess, config.sub, and install-sh
    
      - They are not needed by the configure script unless the
        AC_CANONICAL_* macros are used
    
      - They don't belong in the repository anyway, since they can be
        regenerated by 'autoreconf -i'


>---------------------------------------------------------------

4e81c1275981c35bdb482942fdb45f4ea7f5fb8b
 config.guess    | 1420 -------------------------------------------
 config.sub      | 1794 -------------------------------------------------------
 directory.cabal |    3 -
 install-sh      |  527 ----------------
 4 files changed, 3744 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4e81c1275981c35bdb482942fdb45f4ea7f5fb8b

From git at git.haskell.org  Fri Dec 18 09:51:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:15 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove dependence on the C bits
 entirely and fix realpath bug (3177ec4)
Message-ID: <20151218095115.947343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3177ec458d2bc6906755b57ecabf3a5f67c02320/directory

>---------------------------------------------------------------

commit 3177ec458d2bc6906755b57ecabf3a5f67c02320
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Jun 1 23:48:40 2015 -0400

    Remove dependence on the C bits entirely and fix realpath bug
    
    The directory package itself no longer depends on the C bits
    (cbits/directory.c, include/HsDirectory.h), but they will remain for
    backward compatibility.
    
    This also fixes the potential buffer overflow that can occur in realpath
    when PATH_MAX is absent.  Newer versions of POSIX support realpath with
    NULL as the second argument, in which case the result is dynamically
    allocated by the OS and may be freed using 'free'.  (The hope is that
    older systems that don't support this feature would be kind enough to
    provide a PATH_MAX, at least.)


>---------------------------------------------------------------

3177ec458d2bc6906755b57ecabf3a5f67c02320
 System/Directory.hs                       | 32 ++++-------------------
 System/Directory/Internal.hsc             | 18 +++++++++----
 System/Directory/Internal/C_utimensat.hsc | 17 ++++++++-----
 System/Directory/Internal/Posix.hsc       | 42 +++++++++++++++++++++++++++++++
 System/Directory/Internal/Windows.hsc     | 23 +++++++++++++++++
 configure.ac                              |  4 ++-
 directory.cabal                           |  2 ++
 7 files changed, 99 insertions(+), 39 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3177ec458d2bc6906755b57ecabf3a5f67c02320

From git at git.haskell.org  Fri Dec 18 09:51:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:17 +0000 (UTC)
Subject: [commit: packages/directory] master: Split Internal module to avoid
 #ifdef hell (f028566)
Message-ID: <20151218095117.9B91F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f0285668fcbe4154f6b6f38af9b971c08df838fb/directory

>---------------------------------------------------------------

commit f0285668fcbe4154f6b6f38af9b971c08df838fb
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Jun 1 23:38:37 2015 -0400

    Split Internal module to avoid #ifdef hell


>---------------------------------------------------------------

f0285668fcbe4154f6b6f38af9b971c08df838fb
 System/Directory/Internal.hsc                      | 50 +++++-----------------
 .../{Internal.hsc => Internal/C_utimensat.hsc}     | 20 +++------
 directory.cabal                                    |  1 +
 3 files changed, 16 insertions(+), 55 deletions(-)

diff --git a/System/Directory/Internal.hsc b/System/Directory/Internal.hsc
index e20187b..11bbfa8 100644
--- a/System/Directory/Internal.hsc
+++ b/System/Directory/Internal.hsc
@@ -1,53 +1,23 @@
-module System.Directory.Internal where
-
 #include <HsDirectory.h>
 
 #ifndef mingw32_HOST_OS
 # include <HsUnixConfig.h>
 #endif
 
+module System.Directory.Internal
+  ( module System.Directory.Internal
+
+#ifdef HAVE_UTIMENSAT
+  , module System.Directory.Internal.C_utimensat
+#endif
+
+) where
+
 #ifdef HAVE_UTIMENSAT
-# include <fcntl.h>
-# include <sys/stat.h>
-import Data.Time.Clock.POSIX (POSIXTime)
-import Foreign
-import Foreign.C
-import System.Posix.Types
+import System.Directory.Internal.C_utimensat
 #endif
 
 -- | Filename extension for executable files (including the dot if any)
 --   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
 exeExtension :: String
 exeExtension = (#const_str EXE_EXTENSION)
-
-#ifdef HAVE_UTIMENSAT
-
-data CTimeSpec = CTimeSpec EpochTime CLong
-
-instance Storable CTimeSpec where
-    sizeOf    _ = #size struct timespec
-    alignment _ = alignment (undefined :: CInt)
-    poke p (CTimeSpec sec nsec) = do
-      (#poke struct timespec, tv_sec ) p sec
-      (#poke struct timespec, tv_nsec) p nsec
-    peek p = do
-      sec  <- #{peek struct timespec, tv_sec } p
-      nsec <- #{peek struct timespec, tv_nsec} p
-      return (CTimeSpec sec nsec)
-
-c_AT_FDCWD :: Integral a => a
-c_AT_FDCWD = (#const AT_FDCWD)
-
-utimeOmit :: CTimeSpec
-utimeOmit = CTimeSpec (CTime 0) (#const UTIME_OMIT)
-
-toCTimeSpec :: POSIXTime -> CTimeSpec
-toCTimeSpec t = CTimeSpec (CTime sec) (truncate $ 10 ^ (9 :: Int) * frac)
-  where
-    (sec,  frac)  = if frac' < 0 then (sec' - 1, frac' + 1) else (sec', frac')
-    (sec', frac') = properFraction (toRational t)
-
-foreign import ccall unsafe "utimensat" c_utimensat
-  :: CInt -> CString -> Ptr CTimeSpec -> CInt -> IO CInt
-
-#endif // HAVE_UTIMENSAT
diff --git a/System/Directory/Internal.hsc b/System/Directory/Internal/C_utimensat.hsc
similarity index 75%
copy from System/Directory/Internal.hsc
copy to System/Directory/Internal/C_utimensat.hsc
index e20187b..7996f18 100644
--- a/System/Directory/Internal.hsc
+++ b/System/Directory/Internal/C_utimensat.hsc
@@ -1,26 +1,16 @@
-module System.Directory.Internal where
-
-#include <HsDirectory.h>
-
 #ifndef mingw32_HOST_OS
 # include <HsUnixConfig.h>
 #endif
 
+#include <fcntl.h>
+#include <sys/stat.h>
+
+module System.Directory.Internal.C_utimensat where
 #ifdef HAVE_UTIMENSAT
-# include <fcntl.h>
-# include <sys/stat.h>
 import Data.Time.Clock.POSIX (POSIXTime)
 import Foreign
 import Foreign.C
 import System.Posix.Types
-#endif
-
--- | Filename extension for executable files (including the dot if any)
---   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
-exeExtension :: String
-exeExtension = (#const_str EXE_EXTENSION)
-
-#ifdef HAVE_UTIMENSAT
 
 data CTimeSpec = CTimeSpec EpochTime CLong
 
@@ -50,4 +40,4 @@ toCTimeSpec t = CTimeSpec (CTime sec) (truncate $ 10 ^ (9 :: Int) * frac)
 foreign import ccall unsafe "utimensat" c_utimensat
   :: CInt -> CString -> Ptr CTimeSpec -> CInt -> IO CInt
 
-#endif // HAVE_UTIMENSAT
+#endif
diff --git a/directory.cabal b/directory.cabal
index 3ba045c..b4c1458 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -62,6 +62,7 @@ Library
         System.Directory
     other-modules:
         System.Directory.Internal
+        System.Directory.Internal.C_utimensat
 
     c-sources:
         cbits/directory.c


From git at git.haskell.org  Fri Dec 18 09:51:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:19 +0000 (UTC)
Subject: [commit: packages/directory] master: Deprecate HsDirectory.h and
 cbits/directory.c (6323523)
Message-ID: <20151218095119.A21713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6323523cf08f30b2e4d26ca3a732b827bed551b6/directory

>---------------------------------------------------------------

commit 6323523cf08f30b2e4d26ca3a732b827bed551b6
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 15:56:50 2015 -0400

    Deprecate HsDirectory.h and cbits/directory.c
    
    Rationale for deprecation:
    
      - The definition of __hscore_long_path_size is dangerous: if PATH_MAX
        is not defined, we cannot assume there is a maximum limit at all,
        and thus POSIX functions such as realpath will be susceptible to
        buffer overflow.
    
      - It includes the internal HsDirectoryConfig.h header.  It is
        considered bad practice to expose Autoconf-generated headers in the
        public API due to the high probability of macro collisions.
    
      - It doesn't really offer any useful functionality that isn't
        available elsewhere via more convenient means.
    
    Eventually, HsDirectory.h and cbits/directory.c would be removed
    entirely and HsDirectoryConfig.h would be made private (i.e. for
    internal use only).


>---------------------------------------------------------------

6323523cf08f30b2e4d26ca3a732b827bed551b6
 cbits/directory.c     |  2 ++
 changelog.md          |  2 ++
 include/HsDirectory.h | 10 +++++-----
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/cbits/directory.c b/cbits/directory.c
index 1a979ed..55cece2 100644
--- a/cbits/directory.c
+++ b/cbits/directory.c
@@ -4,6 +4,8 @@
  *
  */
 
+/* [DEPRECATED] This file may be removed in future versions. */
+
 #define INLINE
 #include "HsDirectory.h"
 
diff --git a/changelog.md b/changelog.md
index 75f2908..fd4bb4f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,8 @@ Changelog for the [`directory`][1] package
     current directory cannot be obtained
     ([#23](https://github.com/haskell/directory/issues/23))
 
+  * Deprecate use of `HsDirectory.h` and `HsDirectoryConfig.h`
+
 ## 1.2.2.1 (Apr 2015)
 
   * Fix dependency problem on NixOS when building with tests
diff --git a/include/HsDirectory.h b/include/HsDirectory.h
index eabaec1..46b7c51 100644
--- a/include/HsDirectory.h
+++ b/include/HsDirectory.h
@@ -6,6 +6,9 @@
  *
  * ---------------------------------------------------------------------------*/
 
+/* [DEPRECATED] Do not include this header nor HsDirectoryConfig.h.  They are
+   for internal use only and may be removed in future versions. */
+
 #ifndef __HSDIRECTORY_H__
 #define __HSDIRECTORY_H__
 
@@ -49,10 +52,8 @@
 # endif
 #endif
 
-/* A size that will contain many path names, but not necessarily all
- * (PATH_MAX is not defined on systems with unlimited path length,
- * e.g. the Hurd).
- */
+/* Do not use: it may give the wrong value on systems where PATH_MAX is not
+   defined (e.g. Hurd).  Instead, use System.Directory.Internal.c_PATH_MAX. */
 INLINE HsInt __hscore_long_path_size(void) {
 #ifdef PATH_MAX
     return PATH_MAX;
@@ -67,4 +68,3 @@ INLINE mode_t __hscore_S_IXUSR(void) { return S_IXUSR; }
 INLINE mode_t __hscore_S_IFDIR(void) { return S_IFDIR; }
 
 #endif /* __HSDIRECTORY_H__ */
-


From git at git.haskell.org  Fri Dec 18 09:51:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:21 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: T8482 (d619c51)
Message-ID: <20151218095121.A7D043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d619c51d72212103e3a8972280ca37ac141fc759/directory

>---------------------------------------------------------------

commit d619c51d72212103e3a8972280ca37ac141fc759
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri May 29 20:40:10 2015 -0400

    Migrate test: T8482


>---------------------------------------------------------------

d619c51d72212103e3a8972280ca37ac141fc759
 tests/Main.hs      |  2 ++
 tests/T8482.hs     | 23 ++++++++++++++---------
 tests/T8482.stdout |  3 ---
 tests/all.T        |  2 --
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/tests/Main.hs b/tests/Main.hs
index 0b9ee83..f831c8d 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -2,8 +2,10 @@ module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
 import qualified FileTime
+import qualified T8482
 
 main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
   T.isolatedRun _t "FileTime" FileTime.main
+  T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/T8482.hs b/tests/T8482.hs
index 3bea8af..33b2d25 100644
--- a/tests/T8482.hs
+++ b/tests/T8482.hs
@@ -1,16 +1,21 @@
+{-# LANGUAGE CPP #-}
+module T8482 where
+#include "util.inl"
+import GHC.IO.Exception (IOErrorType(InappropriateType))
 import System.Directory
-import Control.Exception
+import System.IO.Error (ioeGetErrorType)
 
+tmp1 :: FilePath
 tmp1 = "T8482.tmp1"
+
+testdir :: FilePath
 testdir = "T8482.dir"
 
-main = do
+main :: TestEnv -> IO ()
+main _t = do
   writeFile tmp1 "hello"
   createDirectory testdir
-  tryRenameFile testdir tmp1 >>= print  -- InappropriateType
-  tryRenameFile tmp1 testdir >>= print  -- InappropriateType
-  tryRenameFile tmp1 "." >>= print  -- InappropriateType
-  removeDirectory testdir
-  removeFile tmp1
-  where tryRenameFile :: FilePath -> FilePath -> IO (Either IOException ())
-        tryRenameFile opath npath = try $ renameFile opath npath
+  T(expectIOErrorType) () (is InappropriateType) (renameFile testdir tmp1)
+  T(expectIOErrorType) () (is InappropriateType) (renameFile tmp1    testdir)
+  T(expectIOErrorType) () (is InappropriateType) (renameFile tmp1    ".")
+  where is t = (== t) . ioeGetErrorType
diff --git a/tests/T8482.stdout b/tests/T8482.stdout
deleted file mode 100644
index 277bc18..0000000
--- a/tests/T8482.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-Left T8482.dir: renameFile: inappropriate type (is a directory)
-Left T8482.dir: renameFile: inappropriate type (is a directory)
-Left .: renameFile: inappropriate type (is a directory)
diff --git a/tests/all.T b/tests/all.T
index 54e4dd9..65c8cc5 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -26,6 +26,4 @@ test('createDirectoryIfMissing001',  normal, compile_and_run, [''])
 # No sane way to tell whether the output is reasonable here...
 test('getHomeDirectory001',  ignore_output, compile_and_run, [''])
 
-test('T8482',  normal, compile_and_run, [''])
-
 test('removeDirectoryRecursive001', normal, compile_and_run, [''])


From git at git.haskell.org  Fri Dec 18 09:51:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:23 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: Directory001
 (7d5c1eb)
Message-ID: <20151218095123.B099E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7d5c1eb6de40513a78c509f92307a232fd2c1d5c/directory

>---------------------------------------------------------------

commit 7d5c1eb6de40513a78c509f92307a232fd2c1d5c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 21:14:31 2015 -0400

    Migrate test: Directory001


>---------------------------------------------------------------

7d5c1eb6de40513a78c509f92307a232fd2c1d5c
 tests/Directory001.hs     | 19 +++++++++++++++++++
 tests/Main.hs             |  2 ++
 tests/all.T               |  1 -
 tests/directory001.hs     | 16 ----------------
 tests/directory001.stdout |  1 -
 5 files changed, 21 insertions(+), 18 deletions(-)

diff --git a/tests/Directory001.hs b/tests/Directory001.hs
new file mode 100644
index 0000000..60a2dac
--- /dev/null
+++ b/tests/Directory001.hs
@@ -0,0 +1,19 @@
+{-# LANGUAGE CPP #-}
+module Directory001 where
+#include "util.inl"
+import System.Directory
+
+main :: TestEnv -> IO ()
+main _t = do
+
+  createDirectory "foo"
+  writeFile "foo/bar" str
+  renameFile "foo/bar" "foo/baz"
+  renameDirectory "foo" "bar"
+  str' <- readFile "bar/baz"
+  T(expectEq) () str' str
+  removeFile "bar/baz"
+  removeDirectory "bar"
+
+  where
+    str = "Okay\n"
diff --git a/tests/Main.hs b/tests/Main.hs
index f831c8d..ccd54a1 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -1,11 +1,13 @@
 module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
+import qualified Directory001
 import qualified FileTime
 import qualified T8482
 
 main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
+  T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "FileTime" FileTime.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index 65c8cc5..6029348 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,5 +1,4 @@
 test('currentDirectory001',     normal, compile_and_run, [''])
-test('directory001',            normal, compile_and_run, [''])
 test('doesDirectoryExist001',   normal, compile_and_run, [''])
 
 # This test is a bit bogus.  Disable for GHCi.
diff --git a/tests/directory001.hs b/tests/directory001.hs
deleted file mode 100644
index 5abfbdc..0000000
--- a/tests/directory001.hs
+++ /dev/null
@@ -1,16 +0,0 @@
-import System.IO
-import System.Directory
-
-main = do
-    createDirectory "foo"
-    h <- openFile "foo/bar" WriteMode
-    hPutStr h "Okay\n"
-    hClose h
-    renameFile "foo/bar" "foo/baz"
-    renameDirectory "foo" "bar"
-    h <- openFile "bar/baz" ReadMode
-    stuff <- hGetContents h
-    putStr stuff
---    hClose h  -- an error !
-    removeFile "bar/baz"
-    removeDirectory "bar"
diff --git a/tests/directory001.stdout b/tests/directory001.stdout
deleted file mode 100644
index 1ddd42b..0000000
--- a/tests/directory001.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Okay


From git at git.haskell.org  Fri Dec 18 09:51:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:25 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test:
 DoesDirectoryExist001 (27e0ef9)
Message-ID: <20151218095125.B7ADB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/27e0ef9e03796b59eaa5b224d948a10da0874441/directory

>---------------------------------------------------------------

commit 27e0ef9e03796b59eaa5b224d948a10da0874441
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 21:41:53 2015 -0400

    Migrate test: DoesDirectoryExist001


>---------------------------------------------------------------

27e0ef9e03796b59eaa5b224d948a10da0874441
 tests/DoesDirectoryExist001.hs     | 17 +++++++++++++++++
 tests/Main.hs                      |  2 ++
 tests/all.T                        |  1 -
 tests/doesDirectoryExist001.hs     | 11 -----------
 tests/doesDirectoryExist001.stdout |  1 -
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/tests/DoesDirectoryExist001.hs b/tests/DoesDirectoryExist001.hs
new file mode 100644
index 0000000..b5a1aa9
--- /dev/null
+++ b/tests/DoesDirectoryExist001.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE CPP #-}
+module DoesDirectoryExist001 where
+#include "util.inl"
+import System.Directory
+
+main :: TestEnv -> IO ()
+main _t = do
+
+  -- [regression test] "/" was not recognised as a directory prior to GHC 6.1
+  T(expect) () =<< doesDirectoryExist rootDir
+
+  where
+#ifdef mingw32_HOST_OS
+    rootDir = "C:\\"
+#else
+    rootDir = "/"
+#endif
diff --git a/tests/Main.hs b/tests/Main.hs
index ccd54a1..fed205e 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -2,6 +2,7 @@ module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
 import qualified Directory001
+import qualified DoesDirectoryExist001
 import qualified FileTime
 import qualified T8482
 
@@ -9,5 +10,6 @@ main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
   T.isolatedRun _t "Directory001" Directory001.main
+  T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
   T.isolatedRun _t "FileTime" FileTime.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index 6029348..8a30d22 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,5 +1,4 @@
 test('currentDirectory001',     normal, compile_and_run, [''])
-test('doesDirectoryExist001',   normal, compile_and_run, [''])
 
 # This test is a bit bogus.  Disable for GHCi.
 test('getDirContents001', omit_ways(['ghci']), compile_and_run, ['-fno-gen-manifest'])
diff --git a/tests/doesDirectoryExist001.hs b/tests/doesDirectoryExist001.hs
deleted file mode 100644
index 2548183..0000000
--- a/tests/doesDirectoryExist001.hs
+++ /dev/null
@@ -1,11 +0,0 @@
-{-# LANGUAGE CPP #-}
--- !!! "/" was not recognised as a directory in 6.0.x
-import System.Directory
-
-#ifdef mingw32_HOST_OS
-root = "C:\\"
-#else
-root = "/"
-#endif
-
-main = doesDirectoryExist root >>= print
diff --git a/tests/doesDirectoryExist001.stdout b/tests/doesDirectoryExist001.stdout
deleted file mode 100644
index 0ca9514..0000000
--- a/tests/doesDirectoryExist001.stdout
+++ /dev/null
@@ -1 +0,0 @@
-True


From git at git.haskell.org  Fri Dec 18 09:51:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:27 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: CopyFile002
 (99841de)
Message-ID: <20151218095127.BFC723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/99841de10573f3762c7175c717205f1c56c57c4c/directory

>---------------------------------------------------------------

commit 99841de10573f3762c7175c717205f1c56c57c4c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 01:37:50 2015 -0400

    Migrate test: CopyFile002


>---------------------------------------------------------------

99841de10573f3762c7175c717205f1c56c57c4c
 tests/{CopyFile001.hs => CopyFile002.hs} | 17 ++++++++---------
 tests/Main.hs                            |  2 ++
 tests/all.T                              |  3 ---
 tests/copyFile002.hs                     | 31 -------------------------------
 tests/copyFile002.stdout                 |  5 -----
 tests/copyFile002dir/source              |  1 -
 6 files changed, 10 insertions(+), 49 deletions(-)

diff --git a/tests/CopyFile001.hs b/tests/CopyFile002.hs
similarity index 61%
copy from tests/CopyFile001.hs
copy to tests/CopyFile002.hs
index c354e8d..0319637 100644
--- a/tests/CopyFile001.hs
+++ b/tests/CopyFile002.hs
@@ -1,22 +1,21 @@
 {-# LANGUAGE CPP #-}
-module CopyFile001 where
+module CopyFile002 where
 #include "util.inl"
 import System.Directory
 import Data.List (sort)
 import Data.Monoid ((<>))
-import System.FilePath ((</>))
 
 main :: TestEnv -> IO ()
 main _t = do
-  createDirectory dir
-  writeFile (dir </> from) contents
-  T(expectEq) () (specials <> [from]) . sort =<< getDirectoryContents dir
-  copyFile (dir </> from) (dir </> to)
-  T(expectEq) () (specials <> [from, to]) . sort =<< getDirectoryContents dir
-  T(expectEq) () contents =<< readFile (dir </> to)
+  -- Similar to CopyFile001 but moves a file in the current directory
+  -- (Bug #1652 on GHC Trac)
+  writeFile from contents
+  T(expectEq) () (specials <> [from]) . sort =<< getDirectoryContents "."
+  copyFile from to
+  T(expectEq) () (specials <> [from, to]) . sort =<< getDirectoryContents "."
+  T(expectEq) () contents =<< readFile to
   where
     specials = [".", ".."]
     contents = "This is the data\n"
     from     = "source"
     to       = "target"
-    dir      = "dir"
diff --git a/tests/Main.hs b/tests/Main.hs
index 0d6cfe6..c72d022 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -2,6 +2,7 @@ module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
 import qualified CopyFile001
+import qualified CopyFile002
 import qualified CurrentDirectory001
 import qualified Directory001
 import qualified DoesDirectoryExist001
@@ -15,6 +16,7 @@ main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
   T.isolatedRun _t "CopyFile001" CopyFile001.main
+  T.isolatedRun _t "CopyFile002" CopyFile002.main
   T.isolatedRun _t "CurrentDirectory001" CurrentDirectory001.main
   T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
diff --git a/tests/all.T b/tests/all.T
index 750a06f..90e87d1 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,6 +1,3 @@
-test('copyFile002', extra_clean(['copyFile002dir/target']),
-                    compile_and_run, [''])
-
 test('renameFile001', extra_clean(['renameFile001.tmp1','renameFile001.tmp2']),
       compile_and_run, [''])
 
diff --git a/tests/copyFile002.hs b/tests/copyFile002.hs
deleted file mode 100644
index 66c79cd..0000000
--- a/tests/copyFile002.hs
+++ /dev/null
@@ -1,31 +0,0 @@
-
-module Main (main) where
-
-import Control.Exception
-import Data.List
-import System.Directory
-import System.IO
-
--- like copyFile001, but moves a file in the current directory
--- See bug #1652
-main :: IO ()
-main = do d <- getCurrentDirectory
-          flip finally (setCurrentDirectory d) $ do
-          setCurrentDirectory "copyFile002dir"
-          tryIO $ removeFile to
-          cs_before <- getDirectoryContents "."
-          putStrLn "Before:"
-          print $ sort cs_before
-          copyFile from to
-          cs_before <- getDirectoryContents "."
-          putStrLn "After:"
-          print $ sort cs_before
-          readFile to >>= print
-
-tryIO :: IO a -> IO (Either IOException a)
-tryIO = try
-
-from, to :: FilePath
-from = "source"
-to   = "target"
-
diff --git a/tests/copyFile002.stdout b/tests/copyFile002.stdout
deleted file mode 100644
index 6b17d94..0000000
--- a/tests/copyFile002.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-Before:
-[".","..","source"]
-After:
-[".","..","source","target"]
-"This is the data"
diff --git a/tests/copyFile002dir/source b/tests/copyFile002dir/source
deleted file mode 100644
index 1b44515..0000000
--- a/tests/copyFile002dir/source
+++ /dev/null
@@ -1 +0,0 @@
-This is the data
\ No newline at end of file


From git at git.haskell.org  Fri Dec 18 09:51:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:29 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: GetDirContents002
 (3e63d4b)
Message-ID: <20151218095129.C6F9F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e63d4bbed66c3f76b73cef5c2287e2772d21c33/directory

>---------------------------------------------------------------

commit 3e63d4bbed66c3f76b73cef5c2287e2772d21c33
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 23:28:24 2015 -0400

    Migrate test: GetDirContents002


>---------------------------------------------------------------

3e63d4bbed66c3f76b73cef5c2287e2772d21c33
 tests/GetDirContents002.hs             | 10 ++++++++++
 tests/Main.hs                          |  2 ++
 tests/all.T                            |  3 ---
 tests/getDirContents002.hs             |  3 ---
 tests/getDirContents002.stderr         |  1 -
 tests/getDirContents002.stderr-mingw32 |  1 -
 6 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/GetDirContents002.hs b/tests/GetDirContents002.hs
new file mode 100644
index 0000000..98a2353
--- /dev/null
+++ b/tests/GetDirContents002.hs
@@ -0,0 +1,10 @@
+{-# LANGUAGE CPP #-}
+module GetDirContents002 where
+#include "util.inl"
+import System.Directory
+import System.IO.Error (isDoesNotExistError)
+
+main :: TestEnv -> IO ()
+main _t = do
+  T(expectIOErrorType) () isDoesNotExistError $
+    getDirectoryContents "nonexistent"
diff --git a/tests/Main.hs b/tests/Main.hs
index 25d3cea..25ff4cc 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -6,6 +6,7 @@ import qualified Directory001
 import qualified DoesDirectoryExist001
 import qualified FileTime
 import qualified GetDirContents001
+import qualified GetDirContents002
 import qualified T8482
 
 main :: IO ()
@@ -16,4 +17,5 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
   T.isolatedRun _t "FileTime" FileTime.main
   T.isolatedRun _t "GetDirContents001" GetDirContents001.main
+  T.isolatedRun _t "GetDirContents002" GetDirContents002.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index 7d39c1a..ed6abbb 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,6 +1,3 @@
-test('getDirContents002', [ normalise_exe, exit_code(1) ],
-                          compile_and_run, [''])
-
 # Depends on binary from previous run, which gets removed by the driver way=ghci
 test('getPermissions001', omit_ways(['ghci']), compile_and_run, ['-cpp'])
 
diff --git a/tests/getDirContents002.hs b/tests/getDirContents002.hs
deleted file mode 100644
index 1b45a3a..0000000
--- a/tests/getDirContents002.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-import System.Directory
-
-main = getDirectoryContents "nonexistent"
diff --git a/tests/getDirContents002.stderr b/tests/getDirContents002.stderr
deleted file mode 100644
index 981c1bc..0000000
--- a/tests/getDirContents002.stderr
+++ /dev/null
@@ -1 +0,0 @@
-getDirContents002: nonexistent: getDirectoryContents: does not exist (No such file or directory)
diff --git a/tests/getDirContents002.stderr-mingw32 b/tests/getDirContents002.stderr-mingw32
deleted file mode 100644
index c90d9bc..0000000
--- a/tests/getDirContents002.stderr-mingw32
+++ /dev/null
@@ -1 +0,0 @@
-getDirContents002.exe: nonexistent: getDirectoryContents: does not exist (The system cannot find the path specified.)


From git at git.haskell.org  Fri Dec 18 09:51:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:31 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: GetDirContents001
 (87272bb)
Message-ID: <20151218095131.CE07C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/87272bb290dde7c5d1aa96c89f5c678dfe9a4461/directory

>---------------------------------------------------------------

commit 87272bb290dde7c5d1aa96c89f5c678dfe9a4461
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 23:23:46 2015 -0400

    Migrate test: GetDirContents001


>---------------------------------------------------------------

87272bb290dde7c5d1aa96c89f5c678dfe9a4461
 tests/GetDirContents001.hs     | 20 ++++++++++++++++++++
 tests/Main.hs                  |  2 ++
 tests/all.T                    |  3 ---
 tests/getDirContents001.hs     | 18 ------------------
 tests/getDirContents001.stdout |  2 --
 5 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/tests/GetDirContents001.hs b/tests/GetDirContents001.hs
new file mode 100644
index 0000000..aa7d495
--- /dev/null
+++ b/tests/GetDirContents001.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE CPP #-}
+module GetDirContents001 where
+#include "util.inl"
+import System.Directory
+import Data.List (sort)
+import Data.Monoid ((<>))
+import Data.Traversable (for)
+import System.FilePath  ((</>))
+
+main :: TestEnv -> IO ()
+main _t = do
+  createDirectory dir
+  T(expectEq) () specials . sort =<< getDirectoryContents dir
+  names <- for [1 .. 100 :: Int] $ \ i -> do
+    let name = 'f' : show i
+    writeFile (dir </> name) ""
+    return name
+  T(expectEq) () (sort (specials <> names)) . sort =<< getDirectoryContents dir
+  where dir      = "dir"
+        specials = [".", ".."]
diff --git a/tests/Main.hs b/tests/Main.hs
index b9efcce..25d3cea 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -5,6 +5,7 @@ import qualified CurrentDirectory001
 import qualified Directory001
 import qualified DoesDirectoryExist001
 import qualified FileTime
+import qualified GetDirContents001
 import qualified T8482
 
 main :: IO ()
@@ -14,4 +15,5 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
   T.isolatedRun _t "FileTime" FileTime.main
+  T.isolatedRun _t "GetDirContents001" GetDirContents001.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index 9b7c14f..7d39c1a 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,6 +1,3 @@
-# This test is a bit bogus.  Disable for GHCi.
-test('getDirContents001', omit_ways(['ghci']), compile_and_run, ['-fno-gen-manifest'])
-
 test('getDirContents002', [ normalise_exe, exit_code(1) ],
                           compile_and_run, [''])
 
diff --git a/tests/getDirContents001.hs b/tests/getDirContents001.hs
deleted file mode 100644
index d09b645..0000000
--- a/tests/getDirContents001.hs
+++ /dev/null
@@ -1,18 +0,0 @@
-import System.Directory
-import Control.Exception
-import System.FilePath
-import Data.List
-
-dir = "getDirContents001.dir"
-
-main = do
-    try cleanup :: IO (Either IOException ())
-    bracket (createDirectory dir) (const cleanup) $ \_ -> do
-      getDirectoryContents dir >>= print . sort
-      mapM_ (\s -> writeFile (dir </> ('f':show s)) (show s)) [1..100]
-      getDirectoryContents dir >>= print . sort
-
-cleanup = do
-   files <- getDirectoryContents dir
-   mapM_ (removeFile . (dir </>)) (filter (not . ("." `isPrefixOf`)) files)
-   removeDirectory dir
diff --git a/tests/getDirContents001.stdout b/tests/getDirContents001.stdout
deleted file mode 100644
index fd68c28..0000000
--- a/tests/getDirContents001.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-[".",".."]
-[".","..","f1","f10","f100","f11","f12","f13","f14","f15","f16","f17","f18","f19","f2","f20","f21","f22","f23","f24","f25","f26","f27","f28","f29","f3","f30","f31","f32","f33","f34","f35","f36","f37","f38","f39","f4","f40","f41","f42","f43","f44","f45","f46","f47","f48","f49","f5","f50","f51","f52","f53","f54","f55","f56","f57","f58","f59","f6","f60","f61","f62","f63","f64","f65","f66","f67","f68","f69","f7","f70","f71","f72","f73","f74","f75","f76","f77","f78","f79","f8","f80","f81","f82","f83","f84","f85","f86","f87","f88","f89","f9","f90","f91","f92","f93","f94","f95","f96","f97","f98","f99"]


From git at git.haskell.org  Fri Dec 18 09:51:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:33 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: GetPermissions001
 (057ebd8)
Message-ID: <20151218095133.D54343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/057ebd8b6c536c4daf155bf072fc8bf37ece600e/directory

>---------------------------------------------------------------

commit 057ebd8b6c536c4daf155bf072fc8bf37ece600e
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 01:21:17 2015 -0400

    Migrate test: GetPermissions001


>---------------------------------------------------------------

057ebd8b6c536c4daf155bf072fc8bf37ece600e
 tests/GetPermissions001.hs                         | 47 ++++++++++++++++++++++
 tests/Main.hs                                      |  2 +
 tests/all.T                                        |  3 --
 tests/getPermissions001.hs                         | 20 ---------
 tests/getPermissions001.stdout                     |  3 --
 tests/getPermissions001.stdout-alpha-dec-osf3      |  3 --
 .../getPermissions001.stdout-i386-unknown-freebsd  |  3 --
 .../getPermissions001.stdout-i386-unknown-openbsd  |  3 --
 tests/getPermissions001.stdout-mingw               |  3 --
 ...getPermissions001.stdout-x86_64-unknown-openbsd |  3 --
 10 files changed, 49 insertions(+), 41 deletions(-)

diff --git a/tests/GetPermissions001.hs b/tests/GetPermissions001.hs
new file mode 100644
index 0000000..e330230
--- /dev/null
+++ b/tests/GetPermissions001.hs
@@ -0,0 +1,47 @@
+{-# LANGUAGE CPP #-}
+module GetPermissions001 where
+#include "util.inl"
+import System.Directory
+
+main :: TestEnv -> IO ()
+main _t = do
+
+  checkCurrentDir
+  checkExecutable
+  checkOrdinary
+  checkTrailingSlash
+
+  where
+
+    checkCurrentDir = do
+      -- since the current directory is created by the test runner,
+      -- it should be readable, writable, and searchable
+      p <- getPermissions "."
+      T(expect) () (readable p)
+      T(expect) () (writable p)
+      T(expect) () (not (executable p))
+      T(expect) () (searchable p)
+
+    checkExecutable = do
+      -- 'find' expected to exist on both Windows and POSIX,
+      -- though we have no idea if it's writable
+      Just f <- findExecutable "find"
+      p <- getPermissions f
+      T(expect) () (readable p)
+      T(expect) () (executable p)
+      T(expect) () (not (searchable p))
+
+    checkOrdinary = do
+      writeFile "foo" ""
+      p <- getPermissions "foo"
+      T(expect) () (readable p)
+      T(expect) () (writable p)
+      T(expect) () (not (executable p))
+      T(expect) () (not (searchable p))
+
+    -- [regression test] (issue #9)
+    -- Windows doesn't like trailing path separators
+    checkTrailingSlash = do
+      createDirectory "bar"
+      _ <- getPermissions "bar/"
+      return ()
diff --git a/tests/Main.hs b/tests/Main.hs
index 25ff4cc..af44336 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -7,6 +7,7 @@ import qualified DoesDirectoryExist001
 import qualified FileTime
 import qualified GetDirContents001
 import qualified GetDirContents002
+import qualified GetPermissions001
 import qualified T8482
 
 main :: IO ()
@@ -18,4 +19,5 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "FileTime" FileTime.main
   T.isolatedRun _t "GetDirContents001" GetDirContents001.main
   T.isolatedRun _t "GetDirContents002" GetDirContents002.main
+  T.isolatedRun _t "GetPermissions001" GetPermissions001.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index ed6abbb..bb8fa54 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,6 +1,3 @@
-# Depends on binary from previous run, which gets removed by the driver way=ghci
-test('getPermissions001', omit_ways(['ghci']), compile_and_run, ['-cpp'])
-
 test('copyFile001', extra_clean(['copyFile001dir/target']),
                     compile_and_run, [''])
 test('copyFile002', extra_clean(['copyFile002dir/target']),
diff --git a/tests/getPermissions001.hs b/tests/getPermissions001.hs
deleted file mode 100644
index 6582928..0000000
--- a/tests/getPermissions001.hs
+++ /dev/null
@@ -1,20 +0,0 @@
-{-# LANGUAGE CPP #-}
-import System.Directory
-
-main = do
-#ifdef mingw32_HOST_OS
-  let exe = ".exe"
-#else
-  let exe = ""
-#endif
-  p <- getPermissions "."
-  print p
-  p <- getPermissions "getPermissions001.hs"
-  print p
-  p <- getPermissions ("getPermissions001" ++ exe)
-  print p
-
-  -- issue #9: Windows doesn't like trailing path separators
-  _ <- getPermissions "../tests/"
-
-  return ()
diff --git a/tests/getPermissions001.stdout b/tests/getPermissions001.stdout
deleted file mode 100644
index 1e18354..0000000
--- a/tests/getPermissions001.stdout
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = False, searchable = True}
-Permissions {readable = True, writable = True, executable = False, searchable = False}
-Permissions {readable = True, writable = True, executable = True, searchable = False}
diff --git a/tests/getPermissions001.stdout-alpha-dec-osf3 b/tests/getPermissions001.stdout-alpha-dec-osf3
deleted file mode 100644
index 8b030e2..0000000
--- a/tests/getPermissions001.stdout-alpha-dec-osf3
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = False, searchable = True}
-Permissions {readable = True, writable = True, executable = False, searchable = False}
-Permissions {readable = True, writable = False, executable = True, searchable = False}
diff --git a/tests/getPermissions001.stdout-i386-unknown-freebsd b/tests/getPermissions001.stdout-i386-unknown-freebsd
deleted file mode 100644
index 8b030e2..0000000
--- a/tests/getPermissions001.stdout-i386-unknown-freebsd
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = False, searchable = True}
-Permissions {readable = True, writable = True, executable = False, searchable = False}
-Permissions {readable = True, writable = False, executable = True, searchable = False}
diff --git a/tests/getPermissions001.stdout-i386-unknown-openbsd b/tests/getPermissions001.stdout-i386-unknown-openbsd
deleted file mode 100644
index 8b030e2..0000000
--- a/tests/getPermissions001.stdout-i386-unknown-openbsd
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = False, searchable = True}
-Permissions {readable = True, writable = True, executable = False, searchable = False}
-Permissions {readable = True, writable = False, executable = True, searchable = False}
diff --git a/tests/getPermissions001.stdout-mingw b/tests/getPermissions001.stdout-mingw
deleted file mode 100644
index 4dcaba5..0000000
--- a/tests/getPermissions001.stdout-mingw
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = True, searchable = True}
-Permissions {readable = True, writable = True, executable = True, searchable = True}
-Permissions {readable = True, writable = True, executable = True, searchable = True}
diff --git a/tests/getPermissions001.stdout-x86_64-unknown-openbsd b/tests/getPermissions001.stdout-x86_64-unknown-openbsd
deleted file mode 100644
index 8b030e2..0000000
--- a/tests/getPermissions001.stdout-x86_64-unknown-openbsd
+++ /dev/null
@@ -1,3 +0,0 @@
-Permissions {readable = True, writable = True, executable = False, searchable = True}
-Permissions {readable = True, writable = True, executable = False, searchable = False}
-Permissions {readable = True, writable = False, executable = True, searchable = False}


From git at git.haskell.org  Fri Dec 18 09:51:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:35 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test:
 CurrentDirectory001 (1b4b75b)
Message-ID: <20151218095135.DC8C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b4b75b68676acd505793849895c59ba608002c9/directory

>---------------------------------------------------------------

commit 1b4b75b68676acd505793849895c59ba608002c9
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 4 23:11:46 2015 -0400

    Migrate test: CurrentDirectory001


>---------------------------------------------------------------

1b4b75b68676acd505793849895c59ba608002c9
 tests/CurrentDirectory001.hs     | 14 ++++++++++++++
 tests/Main.hs                    |  2 ++
 tests/all.T                      |  2 --
 tests/currentDirectory001.hs     | 27 ---------------------------
 tests/currentDirectory001.stdout |  1 -
 5 files changed, 16 insertions(+), 30 deletions(-)

diff --git a/tests/CurrentDirectory001.hs b/tests/CurrentDirectory001.hs
new file mode 100644
index 0000000..b72c0dc
--- /dev/null
+++ b/tests/CurrentDirectory001.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE CPP #-}
+module CurrentDirectory001 where
+#include "util.inl"
+import System.Directory
+import Data.List (sort)
+
+main :: TestEnv -> IO ()
+main _t = do
+  prevDir <- getCurrentDirectory
+  createDirectory "dir"
+  setCurrentDirectory "dir"
+  T(expectEq) () [".", ".."] . sort =<< getDirectoryContents "."
+  setCurrentDirectory prevDir
+  removeDirectory "dir"
diff --git a/tests/Main.hs b/tests/Main.hs
index fed205e..b9efcce 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -1,6 +1,7 @@
 module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
+import qualified CurrentDirectory001
 import qualified Directory001
 import qualified DoesDirectoryExist001
 import qualified FileTime
@@ -9,6 +10,7 @@ import qualified T8482
 main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
+  T.isolatedRun _t "CurrentDirectory001" CurrentDirectory001.main
   T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
   T.isolatedRun _t "FileTime" FileTime.main
diff --git a/tests/all.T b/tests/all.T
index 8a30d22..9b7c14f 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,5 +1,3 @@
-test('currentDirectory001',     normal, compile_and_run, [''])
-
 # This test is a bit bogus.  Disable for GHCi.
 test('getDirContents001', omit_ways(['ghci']), compile_and_run, ['-fno-gen-manifest'])
 
diff --git a/tests/currentDirectory001.hs b/tests/currentDirectory001.hs
deleted file mode 100644
index 0b57a44..0000000
--- a/tests/currentDirectory001.hs
+++ /dev/null
@@ -1,27 +0,0 @@
-
-import System.Directory (getCurrentDirectory, setCurrentDirectory,
-                         createDirectory, removeDirectory,
-                         getDirectoryContents)
-
-main :: IO ()
-main = do
-    oldpwd <- getCurrentDirectory
-    createDirectory dir
-    setCurrentDirectory dir
-    ~[n1, n2] <- getDirectoryContents "."
-    if dot n1 && dot n2 
-     then do
-        setCurrentDirectory oldpwd
-        removeDirectory dir
-        putStr "Okay\n"
-      else
-        ioError (userError "Oops")
-
-dot :: String -> Bool
-dot "." = True
-dot ".." = True
-dot _ = False
-
-dir :: FilePath
-dir = "currentDirectory001-dir"
-
diff --git a/tests/currentDirectory001.stdout b/tests/currentDirectory001.stdout
deleted file mode 100644
index 1ddd42b..0000000
--- a/tests/currentDirectory001.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Okay


From git at git.haskell.org  Fri Dec 18 09:51:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:37 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: CopyFile001
 (d0d0e45)
Message-ID: <20151218095137.E3E783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d0d0e4558e623a141183c8b1e9dc21d839746d3d/directory

>---------------------------------------------------------------

commit d0d0e4558e623a141183c8b1e9dc21d839746d3d
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 01:29:34 2015 -0400

    Migrate test: CopyFile001


>---------------------------------------------------------------

d0d0e4558e623a141183c8b1e9dc21d839746d3d
 tests/CopyFile001.hs        | 22 ++++++++++++++++++++++
 tests/Main.hs               |  2 ++
 tests/all.T                 |  2 --
 tests/copyFile001.hs        | 26 --------------------------
 tests/copyFile001.stdout    |  5 -----
 tests/copyFile001dir/source |  1 -
 6 files changed, 24 insertions(+), 34 deletions(-)

diff --git a/tests/CopyFile001.hs b/tests/CopyFile001.hs
new file mode 100644
index 0000000..c354e8d
--- /dev/null
+++ b/tests/CopyFile001.hs
@@ -0,0 +1,22 @@
+{-# LANGUAGE CPP #-}
+module CopyFile001 where
+#include "util.inl"
+import System.Directory
+import Data.List (sort)
+import Data.Monoid ((<>))
+import System.FilePath ((</>))
+
+main :: TestEnv -> IO ()
+main _t = do
+  createDirectory dir
+  writeFile (dir </> from) contents
+  T(expectEq) () (specials <> [from]) . sort =<< getDirectoryContents dir
+  copyFile (dir </> from) (dir </> to)
+  T(expectEq) () (specials <> [from, to]) . sort =<< getDirectoryContents dir
+  T(expectEq) () contents =<< readFile (dir </> to)
+  where
+    specials = [".", ".."]
+    contents = "This is the data\n"
+    from     = "source"
+    to       = "target"
+    dir      = "dir"
diff --git a/tests/Main.hs b/tests/Main.hs
index af44336..0d6cfe6 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -1,6 +1,7 @@
 module Main (main) where
 import qualified Util as T
 import qualified CanonicalizePath
+import qualified CopyFile001
 import qualified CurrentDirectory001
 import qualified Directory001
 import qualified DoesDirectoryExist001
@@ -13,6 +14,7 @@ import qualified T8482
 main :: IO ()
 main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
+  T.isolatedRun _t "CopyFile001" CopyFile001.main
   T.isolatedRun _t "CurrentDirectory001" CurrentDirectory001.main
   T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
diff --git a/tests/all.T b/tests/all.T
index bb8fa54..750a06f 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,5 +1,3 @@
-test('copyFile001', extra_clean(['copyFile001dir/target']),
-                    compile_and_run, [''])
 test('copyFile002', extra_clean(['copyFile002dir/target']),
                     compile_and_run, [''])
 
diff --git a/tests/copyFile001.hs b/tests/copyFile001.hs
deleted file mode 100644
index 0a59af2..0000000
--- a/tests/copyFile001.hs
+++ /dev/null
@@ -1,26 +0,0 @@
-
-module Main (main) where
-
-import Control.Exception
-import Data.List
-import System.Directory
-import System.IO
-
-main :: IO ()
-main = do tryIO $ removeFile to
-          cs_before <- getDirectoryContents "copyFile001dir"
-          putStrLn "Before:"
-          print $ sort cs_before
-          copyFile from to
-          cs_before <- getDirectoryContents "copyFile001dir"
-          putStrLn "After:"
-          print $ sort cs_before
-          readFile to >>= print
-
-tryIO :: IO a -> IO (Either IOException a)
-tryIO = try
-
-from, to :: FilePath
-from = "copyFile001dir/source"
-to   = "copyFile001dir/target"
-
diff --git a/tests/copyFile001.stdout b/tests/copyFile001.stdout
deleted file mode 100644
index 6b17d94..0000000
--- a/tests/copyFile001.stdout
+++ /dev/null
@@ -1,5 +0,0 @@
-Before:
-[".","..","source"]
-After:
-[".","..","source","target"]
-"This is the data"
diff --git a/tests/copyFile001dir/source b/tests/copyFile001dir/source
deleted file mode 100644
index 1b44515..0000000
--- a/tests/copyFile001dir/source
+++ /dev/null
@@ -1 +0,0 @@
-This is the data
\ No newline at end of file


From git at git.haskell.org  Fri Dec 18 09:51:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:39 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: RenameFile001
 (d5f3d7e)
Message-ID: <20151218095139.EB5AC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d5f3d7e793dc2780928dc22a4e477b4aa4c4c02e/directory

>---------------------------------------------------------------

commit d5f3d7e793dc2780928dc22a4e477b4aa4c4c02e
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 01:41:18 2015 -0400

    Migrate test: RenameFile001


>---------------------------------------------------------------

d5f3d7e793dc2780928dc22a4e477b4aa4c4c02e
 tests/Main.hs              |  2 ++
 tests/RenameFile001.hs     | 18 ++++++++++++++++++
 tests/all.T                |  3 ---
 tests/renameFile001.hs     | 13 -------------
 tests/renameFile001.stdout |  2 --
 5 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/tests/Main.hs b/tests/Main.hs
index c72d022..3596e24 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -10,6 +10,7 @@ import qualified FileTime
 import qualified GetDirContents001
 import qualified GetDirContents002
 import qualified GetPermissions001
+import qualified RenameFile001
 import qualified T8482
 
 main :: IO ()
@@ -24,4 +25,5 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "GetDirContents001" GetDirContents001.main
   T.isolatedRun _t "GetDirContents002" GetDirContents002.main
   T.isolatedRun _t "GetPermissions001" GetPermissions001.main
+  T.isolatedRun _t "RenameFile001" RenameFile001.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/RenameFile001.hs b/tests/RenameFile001.hs
new file mode 100644
index 0000000..f20bfb7
--- /dev/null
+++ b/tests/RenameFile001.hs
@@ -0,0 +1,18 @@
+{-# LANGUAGE CPP #-}
+module RenameFile001 where
+#include "util.inl"
+import System.Directory
+
+main :: TestEnv -> IO ()
+main _t = do
+  writeFile tmp1 contents1
+  renameFile tmp1 tmp2
+  T(expectEq) () contents1 =<< readFile tmp2
+  writeFile tmp1 contents2
+  renameFile tmp2 tmp1
+  T(expectEq) () contents1 =<< readFile tmp1
+  where
+    tmp1 = "tmp1"
+    tmp2 = "tmp2"
+    contents1 = "test"
+    contents2 = "test2"
diff --git a/tests/all.T b/tests/all.T
index 90e87d1..ba53243 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,6 +1,3 @@
-test('renameFile001', extra_clean(['renameFile001.tmp1','renameFile001.tmp2']),
-      compile_and_run, [''])
-
 test('createDirectory001',  normal, compile_and_run, [''])
 
 test('createDirectoryIfMissing001',  normal, compile_and_run, [''])
diff --git a/tests/renameFile001.hs b/tests/renameFile001.hs
deleted file mode 100644
index 2bbdb8c..0000000
--- a/tests/renameFile001.hs
+++ /dev/null
@@ -1,13 +0,0 @@
-import System.Directory
-
-tmp1 = "renameFile001.tmp1"
-tmp2 = "renameFile001.tmp2"
-
-main = do
-  writeFile tmp1 "test"
-  renameFile tmp1 tmp2
-  readFile tmp2 >>= print
-  writeFile tmp1 "test2"
-  renameFile tmp2 tmp1  
-  readFile tmp1 >>= print
-  
diff --git a/tests/renameFile001.stdout b/tests/renameFile001.stdout
deleted file mode 100644
index 6449f83..0000000
--- a/tests/renameFile001.stdout
+++ /dev/null
@@ -1,2 +0,0 @@
-"test"
-"test"


From git at git.haskell.org  Fri Dec 18 09:51:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:41 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test: CreateDirectory001
 (7398d8c)
Message-ID: <20151218095141.F2C883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7398d8cfca4c7b3bd29f082cc2db785131d41917/directory

>---------------------------------------------------------------

commit 7398d8cfca4c7b3bd29f082cc2db785131d41917
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 01:45:08 2015 -0400

    Migrate test: CreateDirectory001


>---------------------------------------------------------------

7398d8cfca4c7b3bd29f082cc2db785131d41917
 tests/CreateDirectory001.hs             | 11 +++++++++++
 tests/Main.hs                           |  2 ++
 tests/all.T                             |  2 --
 tests/createDirectory001.hs             | 12 ------------
 tests/createDirectory001.stdout         |  1 -
 tests/createDirectory001.stdout-mingw32 |  1 -
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/tests/CreateDirectory001.hs b/tests/CreateDirectory001.hs
new file mode 100644
index 0000000..6047ef7
--- /dev/null
+++ b/tests/CreateDirectory001.hs
@@ -0,0 +1,11 @@
+{-# LANGUAGE CPP #-}
+module CreateDirectory001 where
+#include "util.inl"
+import System.Directory
+import System.IO.Error (isAlreadyExistsError)
+
+main :: TestEnv -> IO ()
+main _t = do
+  createDirectory testdir
+  T(expectIOErrorType) () isAlreadyExistsError (createDirectory testdir)
+  where testdir = "dir"
diff --git a/tests/Main.hs b/tests/Main.hs
index 3596e24..80a7fac 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -3,6 +3,7 @@ import qualified Util as T
 import qualified CanonicalizePath
 import qualified CopyFile001
 import qualified CopyFile002
+import qualified CreateDirectory001
 import qualified CurrentDirectory001
 import qualified Directory001
 import qualified DoesDirectoryExist001
@@ -18,6 +19,7 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "CanonicalizePath" CanonicalizePath.main
   T.isolatedRun _t "CopyFile001" CopyFile001.main
   T.isolatedRun _t "CopyFile002" CopyFile002.main
+  T.isolatedRun _t "CreateDirectory001" CreateDirectory001.main
   T.isolatedRun _t "CurrentDirectory001" CurrentDirectory001.main
   T.isolatedRun _t "Directory001" Directory001.main
   T.isolatedRun _t "DoesDirectoryExist001" DoesDirectoryExist001.main
diff --git a/tests/all.T b/tests/all.T
index ba53243..33de32c 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,5 +1,3 @@
-test('createDirectory001',  normal, compile_and_run, [''])
-
 test('createDirectoryIfMissing001',  normal, compile_and_run, [''])
 
 # No sane way to tell whether the output is reasonable here...
diff --git a/tests/createDirectory001.hs b/tests/createDirectory001.hs
deleted file mode 100644
index 9c718da..0000000
--- a/tests/createDirectory001.hs
+++ /dev/null
@@ -1,12 +0,0 @@
-import System.Directory
-import Control.Exception
-
-testdir = "createDirectory001.dir"
-
-main = do
-  try (removeDirectory testdir) :: IO (Either IOException ())
-  createDirectory testdir
-  r <- try $ createDirectory testdir
-  print (r :: Either IOException ()) -- already exists
-  removeDirectory testdir
-
diff --git a/tests/createDirectory001.stdout b/tests/createDirectory001.stdout
deleted file mode 100644
index a4c46ee..0000000
--- a/tests/createDirectory001.stdout
+++ /dev/null
@@ -1 +0,0 @@
-Left createDirectory001.dir: createDirectory: already exists (File exists)
diff --git a/tests/createDirectory001.stdout-mingw32 b/tests/createDirectory001.stdout-mingw32
deleted file mode 100644
index b295f14..0000000
--- a/tests/createDirectory001.stdout-mingw32
+++ /dev/null
@@ -1 +0,0 @@
-Left CreateDirectory "createDirectory001.dir": already exists (Cannot create a file when that file already exists.)


From git at git.haskell.org  Fri Dec 18 09:51:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:44 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test:
 CreateDirectoryIfMissing001 (bb2379d)
Message-ID: <20151218095144.06BDD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb2379dee93cf9b9fa7fbb1a83a7a8fb6a2116a8/directory

>---------------------------------------------------------------

commit bb2379dee93cf9b9fa7fbb1a83a7a8fb6a2116a8
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 02:52:30 2015 -0400

    Migrate test: CreateDirectoryIfMissing001


>---------------------------------------------------------------

bb2379dee93cf9b9fa7fbb1a83a7a8fb6a2116a8
 .travis.yml                                      |   3 +-
 tests/CreateDirectoryIfMissing001.hs             | 104 +++++++++++++++++++++++
 tests/Main.hs                                    |   2 +
 tests/all.T                                      |   2 -
 tests/createDirectoryIfMissing001.hs             |  79 -----------------
 tests/createDirectoryIfMissing001.stdout         |   8 --
 tests/createDirectoryIfMissing001.stdout-mingw32 |   8 --
 7 files changed, 108 insertions(+), 98 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc bb2379dee93cf9b9fa7fbb1a83a7a8fb6a2116a8

From git at git.haskell.org  Fri Dec 18 09:51:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:46 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test:
 RemoveDirectoryRecursive001 (a42860d)
Message-ID: <20151218095146.0DF5B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a42860dcb3acd039a2c23948bd44d577a5a689b9/directory

>---------------------------------------------------------------

commit a42860dcb3acd039a2c23948bd44d577a5a689b9
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 03:11:10 2015 -0400

    Migrate test: RemoveDirectoryRecursive001
    
    Note that we need to add unix/Win32 as a dependency for the tests due to
    TestUtils.  Not sure what should be done with TestUtils yet.


>---------------------------------------------------------------

a42860dcb3acd039a2c23948bd44d577a5a689b9
 directory.cabal                                    |  4 ++
 tests/Main.hs                                      |  2 +
 ...ursive001.hs => RemoveDirectoryRecursive001.hs} | 78 +++++++++++-----------
 tests/TestUtils.hs                                 |  1 -
 tests/all.T                                        |  1 -
 tests/removeDirectoryRecursive001.stdout           | 19 ------
 6 files changed, 44 insertions(+), 61 deletions(-)

diff --git a/directory.cabal b/directory.cabal
index 18bc23a..568e18e 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -93,6 +93,10 @@ test-suite test
     main-is:          Main.hs
     type:             exitcode-stdio-1.0
     build-depends:    base, directory, filepath, time
+    if os(windows)
+        build-depends: Win32
+    else
+        build-depends: unix
 
 test-suite test2
     default-language: Haskell2010
diff --git a/tests/Main.hs b/tests/Main.hs
index d4e0a4d..5ce8480 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -13,6 +13,7 @@ import qualified GetDirContents001
 import qualified GetDirContents002
 import qualified GetHomeDirectory001
 import qualified GetPermissions001
+import qualified RemoveDirectoryRecursive001
 import qualified RenameFile001
 import qualified T8482
 
@@ -31,5 +32,6 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "GetDirContents002" GetDirContents002.main
   T.isolatedRun _t "GetHomeDirectory001" GetHomeDirectory001.main
   T.isolatedRun _t "GetPermissions001" GetPermissions001.main
+  T.isolatedRun _t "RemoveDirectoryRecursive001" RemoveDirectoryRecursive001.main
   T.isolatedRun _t "RenameFile001" RenameFile001.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/removeDirectoryRecursive001.hs b/tests/RemoveDirectoryRecursive001.hs
similarity index 50%
rename from tests/removeDirectoryRecursive001.hs
rename to tests/RemoveDirectoryRecursive001.hs
index fbd38e7..c5b57df 100644
--- a/tests/removeDirectoryRecursive001.hs
+++ b/tests/RemoveDirectoryRecursive001.hs
@@ -1,22 +1,14 @@
 {-# LANGUAGE CPP #-}
-module Main (main) where
-import Data.List (sort)
+module RemoveDirectoryRecursive001 where
+#include "util.inl"
 import System.Directory
+import Data.List (sort)
 import System.FilePath ((</>), normalise)
 import System.IO.Error (catchIOError)
 import TestUtils
 
-testName :: String
-testName = "removeDirectoryRecursive001"
-
-tmpD :: String
-tmpD  = testName ++ ".tmp"
-
-tmp :: String -> String
-tmp s = tmpD </> normalise s
-
-main :: IO ()
-main = do
+main :: TestEnv -> IO ()
+main _t = do
 
   ------------------------------------------------------------
   -- clean up junk from previous invocations
@@ -44,13 +36,16 @@ main = do
   ------------------------------------------------------------
   -- tests
 
-  getDirectoryContents  tmpD     >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "a") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "b") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "c") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "d") >>= putStrLn . unwords . sort
-
-  putStrLn ""
+  T(expectEq) () [".", "..", "a", "b", "c", "d"] . sort =<<
+    getDirectoryContents  tmpD
+  T(expectEq) () [".", "..", "t", "x", "y", "z"] . sort =<<
+    getDirectoryContents (tmp "a")
+  T(expectEq) () [".", "..", "g"] . sort =<<
+    getDirectoryContents (tmp "b")
+  T(expectEq) () [".", "..", "h"] . sort =<<
+    getDirectoryContents (tmp "c")
+  T(expectEq) () [".", "..", "t", "x", "y", "z"] . sort =<<
+    getDirectoryContents (tmp "d")
 
   removeDirectoryRecursive (tmp "d")
     `catchIOError` \ _ -> removeFile      (tmp "d")
@@ -58,36 +53,39 @@ main = do
     `catchIOError` \ _ -> removeDirectory (tmp "d")
 #endif
 
-  getDirectoryContents  tmpD     >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "a") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "b") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "c") >>= putStrLn . unwords . sort
-
-  putStrLn ""
+  T(expectEq) () [".", "..", "a", "b", "c"] . sort =<<
+    getDirectoryContents  tmpD
+  T(expectEq) () [".", "..", "t", "x", "y", "z"] . sort =<<
+    getDirectoryContents (tmp "a")
+  T(expectEq) () [".", "..", "g"] . sort =<<
+    getDirectoryContents (tmp "b")
+  T(expectEq) () [".", "..", "h"] . sort =<<
+    getDirectoryContents (tmp "c")
 
   removeDirectoryRecursive (tmp "c")
     `catchIOError` \ _ -> do
       modifyPermissions (tmp "c") (\ p -> p { writable = True })
       removeDirectoryRecursive (tmp "c")
 
-  getDirectoryContents  tmpD     >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "a") >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "b") >>= putStrLn . unwords . sort
-
-  putStrLn ""
+  T(expectEq) () [".", "..", "a", "b"] . sort =<<
+    getDirectoryContents  tmpD
+  T(expectEq) () [".", "..", "t", "x", "y", "z"] . sort =<<
+   getDirectoryContents (tmp "a")
+  T(expectEq) () [".", "..", "g"] . sort =<<
+    getDirectoryContents (tmp "b")
 
   removeDirectoryRecursive (tmp "b")
 
-  getDirectoryContents  tmpD     >>= putStrLn . unwords . sort
-  getDirectoryContents (tmp "a") >>= putStrLn . unwords . sort
-
-  putStrLn ""
+  T(expectEq) () [".", "..", "a"] . sort =<<
+    getDirectoryContents  tmpD
+  T(expectEq) () [".", "..", "t", "x", "y", "z"] . sort =<<
+    getDirectoryContents (tmp "a")
 
   removeDirectoryRecursive (tmp "a")
 
-  getDirectoryContents  tmpD     >>= putStrLn . unwords . sort
+  T(expectEq) () [".", ".."] . sort =<<
+    getDirectoryContents  tmpD
 
-  ------------------------------------------------------------
-  -- clean up
-
-  removeDirectoryRecursive tmpD
+  where testName = "removeDirectoryRecursive001"
+        tmpD  = testName ++ ".tmp"
+        tmp s = tmpD </> normalise s
diff --git a/tests/TestUtils.hs b/tests/TestUtils.hs
index a6faea0..795fa09 100644
--- a/tests/TestUtils.hs
+++ b/tests/TestUtils.hs
@@ -12,7 +12,6 @@ import System.IO.Error (ioeSetLocation, modifyIOError)
 import Foreign (Ptr)
 import Foreign.C (CUChar(..), CULong(..), CWchar(..), withCWString)
 import System.FilePath (takeDirectory)
-import System.IO (hPutStrLn, stderr)
 import System.IO.Error (catchIOError, ioeSetErrorString, isPermissionError,
                         mkIOError, permissionErrorType)
 import System.Win32.Types (failWith, getLastError)
diff --git a/tests/all.T b/tests/all.T
index 13d6ce9..e69de29 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1 +0,0 @@
-test('removeDirectoryRecursive001', normal, compile_and_run, [''])
diff --git a/tests/removeDirectoryRecursive001.stdout b/tests/removeDirectoryRecursive001.stdout
deleted file mode 100644
index 0967014..0000000
--- a/tests/removeDirectoryRecursive001.stdout
+++ /dev/null
@@ -1,19 +0,0 @@
-. .. a b c d
-. .. t x y z
-. .. g
-. .. h
-. .. t x y z
-
-. .. a b c
-. .. t x y z
-. .. g
-. .. h
-
-. .. a b
-. .. t x y z
-. .. g
-
-. .. a
-. .. t x y z
-
-. ..


From git at git.haskell.org  Fri Dec 18 09:51:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:48 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate test:
 GetHomeDirectory001 (338bb10)
Message-ID: <20151218095148.16B2D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/338bb108159439b3d26f3a6bbcf257c8927d3291/directory

>---------------------------------------------------------------

commit 338bb108159439b3d26f3a6bbcf257c8927d3291
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 02:55:51 2015 -0400

    Migrate test: GetHomeDirectory001


>---------------------------------------------------------------

338bb108159439b3d26f3a6bbcf257c8927d3291
 tests/GetHomeDirectory001.hs | 16 ++++++++++++++++
 tests/Main.hs                |  2 ++
 tests/all.T                  |  3 ---
 tests/getHomeDirectory001.hs |  8 --------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/tests/GetHomeDirectory001.hs b/tests/GetHomeDirectory001.hs
new file mode 100644
index 0000000..68bf343
--- /dev/null
+++ b/tests/GetHomeDirectory001.hs
@@ -0,0 +1,16 @@
+{-# LANGUAGE CPP #-}
+module GetHomeDirectory001 where
+#include "util.inl"
+import System.Directory
+
+main :: TestEnv -> IO ()
+main _t = do
+  homeDir <- getHomeDirectory
+  T(expect) () (homeDir /= "") -- sanity check
+  _ <- getAppUserDataDirectory   "test"
+  _ <- getXdgDirectory XdgCache  "test"
+  _ <- getXdgDirectory XdgConfig "test"
+  _ <- getXdgDirectory XdgData   "test"
+  _ <- getUserDocumentsDirectory
+  _ <- getTemporaryDirectory
+  return ()
diff --git a/tests/Main.hs b/tests/Main.hs
index fa686d1..d4e0a4d 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -11,6 +11,7 @@ import qualified DoesDirectoryExist001
 import qualified FileTime
 import qualified GetDirContents001
 import qualified GetDirContents002
+import qualified GetHomeDirectory001
 import qualified GetPermissions001
 import qualified RenameFile001
 import qualified T8482
@@ -28,6 +29,7 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "FileTime" FileTime.main
   T.isolatedRun _t "GetDirContents001" GetDirContents001.main
   T.isolatedRun _t "GetDirContents002" GetDirContents002.main
+  T.isolatedRun _t "GetHomeDirectory001" GetHomeDirectory001.main
   T.isolatedRun _t "GetPermissions001" GetPermissions001.main
   T.isolatedRun _t "RenameFile001" RenameFile001.main
   T.isolatedRun _t "T8482" T8482.main
diff --git a/tests/all.T b/tests/all.T
index afbb52c..13d6ce9 100644
--- a/tests/all.T
+++ b/tests/all.T
@@ -1,4 +1 @@
-# No sane way to tell whether the output is reasonable here...
-test('getHomeDirectory001',  ignore_output, compile_and_run, [''])
-
 test('removeDirectoryRecursive001', normal, compile_and_run, [''])
diff --git a/tests/getHomeDirectory001.hs b/tests/getHomeDirectory001.hs
deleted file mode 100644
index ab3eae7..0000000
--- a/tests/getHomeDirectory001.hs
+++ /dev/null
@@ -1,8 +0,0 @@
-import System.Directory
-
-main = do
-  getHomeDirectory               >>= print
-  getAppUserDataDirectory "test" >>= print
-  getUserDocumentsDirectory      >>= print
-  getTemporaryDirectory          >>= print
-  return ()


From git at git.haskell.org  Fri Dec 18 09:51:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:50 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove files associated with old
 test framework (f539cc5)
Message-ID: <20151218095150.1F8FD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f539cc5c34ada4d48bcab171a818259cd1af94bb/directory

>---------------------------------------------------------------

commit f539cc5c34ada4d48bcab171a818259cd1af94bb
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 03:19:03 2015 -0400

    Remove files associated with old test framework


>---------------------------------------------------------------

f539cc5c34ada4d48bcab171a818259cd1af94bb
 .gitignore                       |    7 +-
 Setup.hs                         |    2 -
 directory.cabal                  |   29 +-
 tests/.gitignore                 |   27 -
 tests/all.T                      |    0
 tools/dispatch-tests.hs          |   68 -
 tools/ghc-test-framework.LICENSE |   44 -
 tools/ghc-test-framework.patch   |   14 -
 tools/ghc-test-framework.shar    | 4282 --------------------------------------
 tools/run-tests                  |   71 -
 tools/update-extra-source-files  |  123 --
 tools/update-test-framework      |   80 -
 12 files changed, 2 insertions(+), 4745 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f539cc5c34ada4d48bcab171a818259cd1af94bb

From git at git.haskell.org  Fri Dec 18 09:51:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:52 +0000 (UTC)
Subject: [commit: packages/directory] master: Add script to help manage tests
 (3df3097)
Message-ID: <20151218095152.261DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3df3097721660ab934b0731bdf40d0fff5a5ba71/directory

>---------------------------------------------------------------

commit 3df3097721660ab934b0731bdf40d0fff5a5ba71
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 03:23:36 2015 -0400

    Add script to help manage tests


>---------------------------------------------------------------

3df3097721660ab934b0731bdf40d0fff5a5ba71
 tools/testctl | 95 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 95 insertions(+)

diff --git a/tools/testctl b/tools/testctl
new file mode 100755
index 0000000..d0a36c1
--- /dev/null
+++ b/tools/testctl
@@ -0,0 +1,95 @@
+#!/usr/bin/env python
+import os, re, sys
+
+USAGE = """
+Usage:
+
+    {program} add NAME
+
+        Add a new test with the given NAME in the test directory and then
+        update the list of tests in Main.hs (warning: discards manual edits).
+
+    {program} update
+
+        Update the list of tests in Main.hs (warning: discards manual edits).
+
+"""[1:]
+
+LIBRARY = "System.Directory"
+TEST_DIR = "tests"
+TEST_EXT = ".hs"
+TEST_TEMPLATE = """
+{{-# LANGUAGE CPP #-}}
+module {name} where
+#include "util.inl"
+import {library}
+
+main :: TestEnv -> IO ()
+main _t = do
+
+"""[1:]
+MAIN_NAME = "Main"
+MAIN_TEMPLATE = """
+module Main (main) where
+import qualified Util as T
+{imports}
+main :: IO ()
+main = T.testMain $ \ _t -> do
+{runs}
+"""[1:-1]
+MAIN_IMPORT_TEMPLATE = "import qualified {name}\n"
+MAIN_RUN_TEMPLATE = '  T.isolatedRun _t "{name}" {name}.main\n'
+BLACKLIST = "^(Main|.*Util.*)$"
+
+program = os.path.basename(sys.argv[0])
+
+def usage():
+    sys.stderr.write(USAGE.format(program=program))
+    sys.exit(2)
+
+def add(name):
+    if not name[0].isupper():
+        sys.stderr.write("{0}: must start with a capital letter: {1}\n"
+                         .format(program, name))
+        sys.exit(1)
+    filename = os.path.join(TEST_DIR, name + TEST_EXT)
+    if os.path.exists(filename):
+        sys.stderr.write("{0}: test already exists: {1}\n"
+                         .format(program, filename))
+        sys.exit(1)
+    with open(filename, "wb") as file:
+        file.write(TEST_TEMPLATE.format(name=name, library=LIBRARY)
+                   .encode("utf8"))
+    update()
+    print("{0}: test added: {1}".format(program, filename))
+
+def update():
+    tests = []
+    for basename in os.listdir(TEST_DIR):
+        name, ext = os.path.splitext(basename)
+        if (ext == TEST_EXT and
+            len(name) > 0 and
+            not re.search(BLACKLIST, name) and
+            name[0].isupper()):
+            tests.append(name)
+    tests.sort()
+    with open(os.path.join(TEST_DIR, MAIN_NAME + TEST_EXT), "wb") as file:
+        file.write(MAIN_TEMPLATE.format(
+            imports="".join(MAIN_IMPORT_TEMPLATE.format(name=name)
+                            for name in tests),
+            runs="".join(MAIN_RUN_TEMPLATE.format(name=name)
+                         for name in tests),
+        ).encode("utf8"))
+
+if len(sys.argv) < 2:
+    usage()
+
+command = sys.argv[1]
+if command == "add":
+    if len(sys.argv) > 3:
+        usage()
+    add(sys.argv[2])
+elif command == "update":
+    if len(sys.argv) > 2:
+        usage()
+    update()


From git at git.haskell.org  Fri Dec 18 09:51:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:54 +0000 (UTC)
Subject: [commit: packages/directory] master: Update changelog about the
 recent makeAbsolute fix (b498be7)
Message-ID: <20151218095154.2C3E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b498be7bb190d460d8aea1e87f7055b3349e6fe6/directory

>---------------------------------------------------------------

commit b498be7bb190d460d8aea1e87f7055b3349e6fe6
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 13:26:28 2015 -0400

    Update changelog about the recent makeAbsolute fix
    
    See: 5da8cbcf978a8f63b3fc58c7a8825a3469bc2a17


>---------------------------------------------------------------

b498be7bb190d460d8aea1e87f7055b3349e6fe6
 changelog.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/changelog.md b/changelog.md
index fd4bb4f..1b455c4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -16,6 +16,9 @@ Changelog for the [`directory`][1] package
     current directory cannot be obtained
     ([#23](https://github.com/haskell/directory/issues/23))
 
+  * Corrected the trailing slash behavior of `makeAbsolute`
+    so that `makeAbsolute "" == makeAbsolute "."`
+
   * Deprecate use of `HsDirectory.h` and `HsDirectoryConfig.h`
 
 ## 1.2.2.1 (Apr 2015)


From git at git.haskell.org  Fri Dec 18 09:51:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:56 +0000 (UTC)
Subject: [commit: packages/directory] master: Implement setAccessTime (b6aca5d)
Message-ID: <20151218095156.336873A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b6aca5dd793444d6dee0c22953d524720a9ca177/directory

>---------------------------------------------------------------

commit b6aca5dd793444d6dee0c22953d524720a9ca177
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 5 16:33:55 2015 -0400

    Implement setAccessTime


>---------------------------------------------------------------

b6aca5dd793444d6dee0c22953d524720a9ca177
 System/Directory.hs | 78 +++++++++++++++++++++++++++++++++++++++++------------
 changelog.md        |  2 +-
 tests/FileTime.hs   | 31 ++++++++++++++++-----
 3 files changed, 86 insertions(+), 25 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index e1b7bfd..3fe8406 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -78,6 +78,7 @@ module System.Directory
 
     , getAccessTime
     , getModificationTime
+    , setAccessTime
     , setModificationTime
 
    ) where
@@ -92,6 +93,7 @@ import Data.Maybe
   , maybeToList
 #endif
   )
+import Data.Tuple (swap)
 
 import System.FilePath
 import System.IO
@@ -1183,10 +1185,9 @@ getFileTime isMtime path = modifyIOError (`ioeSetFileName` path) $
       bracket (openFileHandle path' Win32.gENERIC_READ)
               Win32.closeHandle $ \ handle ->
       alloca $ \ time -> do
-        Win32.failIf_ not "" $
-          Win32.c_GetFileTime handle nullPtr
-            (if isMtime then nullPtr else time)
-            (if isMtime then time    else nullPtr)
+        Win32.failIf_ not "" .
+          uncurry (Win32.c_GetFileTime handle nullPtr) $
+           swapIf isMtime (time, nullPtr)
         windowsToPosixTime <$> peek time
 #else
     getTime = convertTime <$> Posix.getFileStatus path'
@@ -1199,6 +1200,34 @@ getFileTime isMtime path = modifyIOError (`ioeSetFileName` path) $
 # endif
 #endif
 
+-- | Change the time at which the file or directory was last accessed.
+--
+-- The operation may fail with:
+--
+-- * 'isPermissionError' if the user is not permitted to alter the
+--   access time; or
+--
+-- * 'isDoesNotExistError' if the file or directory does not exist.
+--
+-- Some caveats for POSIX systems:
+--
+-- * Not all systems support @utimensat@, in which case the function can only
+--   emulate the behavior by reading the modification time and then setting
+--   both the access and modification times together.  On systems where
+--   @utimensat@ is supported, the access time is set atomically with
+--   nanosecond precision.
+--
+-- * If compiled against a version of @unix@ prior to @2.7.0.0@, the function
+--   would not be able to set timestamps with sub-second resolution.  In this
+--   case, there would also be loss of precision in the modification time.
+--
+-- /Since: 1.2.3.0/
+--
+setAccessTime :: FilePath -> UTCTime -> IO ()
+setAccessTime path =
+  modifyIOError (`ioeSetLocation` "setAccessTime") .
+  setFileTime False path
+
 -- | Change the time at which the file or directory was last modified.
 --
 -- The operation may fail with:
@@ -1223,39 +1252,54 @@ getFileTime isMtime path = modifyIOError (`ioeSetFileName` path) $
 -- /Since: 1.2.3.0/
 --
 setModificationTime :: FilePath -> UTCTime -> IO ()
-setModificationTime path mtime =
-  modifyIOError ((`ioeSetLocation` "setModificationTime") .
-                 (`ioeSetFileName` path)) setTime
+setModificationTime path =
+  modifyIOError (`ioeSetLocation` "setModificationTime") .
+  setFileTime True path
+
+setFileTime :: Bool -> FilePath -> UTCTime -> IO ()
+setFileTime isMtime path = modifyIOError (`ioeSetFileName` path) .
+                           setTime . utcTimeToPOSIXSeconds
   where
     path'  = normalise path             -- handle empty paths
-    mtime' = utcTimeToPOSIXSeconds mtime
 #ifdef mingw32_HOST_OS
-    setTime =
+    setTime time =
       bracket (openFileHandle path' Win32.gENERIC_WRITE)
               Win32.closeHandle $ \ handle ->
-      with (posixToWindowsTime mtime') $ \ mtime'' ->
-      Win32.failIf_ not "" (Win32.c_SetFileTime handle nullPtr nullPtr mtime'')
+      with (posixToWindowsTime time) $ \ time' ->
+      Win32.failIf_ not "" .
+        uncurry (Win32.c_SetFileTime handle nullPtr) $
+          swapIf isMtime (time', nullPtr)
 #elif defined HAVE_UTIMENSAT
-    setTime =
+    setTime time =
       withFilePath path' $ \ path'' ->
-      withArray [utimeOmit, toCTimeSpec mtime'] $ \ times ->
+      withArray [atime, mtime] $ \ times ->
       throwErrnoPathIfMinus1_ "" path' $
       c_utimensat c_AT_FDCWD path'' times 0
+      where (atime, mtime) = swapIf isMtime (toCTimeSpec time, utimeOmit)
 #else
-    setTime = do
+    setTime time = do
       stat <- Posix.getFileStatus path'
-      setFileTimes path' (accessTime stat) (convertTime mtime')
+      uncurry (setFileTimes path') $
+        swapIf isMtime (convertTime time, otherTime stat)
 # if MIN_VERSION_unix(2, 7, 0)
-    accessTime   = Posix.accessTimeHiRes
     setFileTimes = Posix.setFileTimesHiRes
     convertTime  = id
+    otherTime    = if isMtime
+                   then Posix.accessTimeHiRes
+                   else Posix.modificationTimeHiRes
 #  else
-    accessTime   = Posix.accessTime
     setFileTimes = Posix.setFileTimes
     convertTime  = fromInteger . truncate
+    otherTime    = if isMtime
+                   then Posix.accessTime
+                   else Posix.modificationTime
 # endif
 #endif
 
+swapIf :: Bool -> (a, a) -> (a, a)
+swapIf True  = swap
+swapIf False = id
+
 #ifdef mingw32_HOST_OS
 -- | Difference between the Windows and POSIX epochs in units of 100ns.
 windowsPosixEpochDifference :: Num a => a
diff --git a/changelog.md b/changelog.md
index 1b455c4..1d886f9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -9,7 +9,7 @@ Changelog for the [`directory`][1] package
   * Implement `setModificationTime` counterpart to `getModificationTime`
     ([#13](https://github.com/haskell/directory/issues/13))
 
-  * Implement `getAccessTime`
+  * Implement `getAccessTime` and `setAccessTime`
 
   * Fix `canonicalizePath` so that it always returns a reasonable result even
     if the path is inaccessible and will not throw exceptions unless the
diff --git a/tests/FileTime.hs b/tests/FileTime.hs
index 580aa7d..b2e980e 100644
--- a/tests/FileTime.hs
+++ b/tests/FileTime.hs
@@ -9,28 +9,45 @@ import qualified Data.Time.Clock as Time
 main :: TestEnv -> IO ()
 main _t = do
   now <- Time.getCurrentTime
-  let someTimeAgo = Time.addUTCTime (-3600) now
+  let someTimeAgo  = Time.addUTCTime (-3600) now
+      someTimeAgo' = Time.addUTCTime (-7200) now
 
   T(expectIOErrorType) () isDoesNotExistError $
     getAccessTime "nonexistent-file"
   T(expectIOErrorType) () isDoesNotExistError $
+    setAccessTime "nonexistent-file" someTimeAgo
+  T(expectIOErrorType) () isDoesNotExistError $
     getModificationTime "nonexistent-file"
   T(expectIOErrorType) () isDoesNotExistError $
     setModificationTime "nonexistent-file" someTimeAgo
 
   writeFile  "foo" ""
-  for_ [ ("foo", someTimeAgo)
-       , (".",   someTimeAgo)
-       , ("",    someTimeAgo) ] $ \ (file, mtime1) -> do
+  for_ [ "foo", ".", "" ] $ \ file -> do
+    let mtime = someTimeAgo
+        atime = someTimeAgo'
 
     atime1 <- getAccessTime file
-    setModificationTime file mtime1
+
+    setModificationTime file mtime
+
     atime2 <- getAccessTime file
     mtime2 <- getModificationTime file
 
     -- modification time should be set with at worst 1 sec resolution
-    T(expectNearTime) ("mtime", file) mtime1 mtime2 1
+    T(expectNearTime) file mtime  mtime2 1
 
     -- access time should not change, although it may lose some precision
     -- on POSIX systems without 'utimensat'
-    T(expectNearTime) ("atime", file) atime1 atime2 1
+    T(expectNearTime) file atime1 atime2 1
+
+    setAccessTime file atime
+
+    atime3 <- getAccessTime file
+    mtime3 <- getModificationTime file
+
+    -- access time should be set with at worst 1 sec resolution
+    T(expectNearTime) file atime  atime3 1
+
+    -- modification time should not change, although it may lose some precision
+    -- on POSIX systems without 'utimensat'
+    T(expectNearTime) file mtime2 mtime3 1


From git at git.haskell.org  Fri Dec 18 09:51:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:51:58 +0000 (UTC)
Subject: [commit: packages/directory] master: Implement `withCurrentDirectory`
 (497c555)
Message-ID: <20151218095158.3AD203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/497c55508fc2d7ebf5dedb726d0692837ccff0ce/directory

>---------------------------------------------------------------

commit 497c55508fc2d7ebf5dedb726d0692837ccff0ce
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Jun 11 22:29:46 2015 +0100

    Implement `withCurrentDirectory`
    
    This function allows us to perform an IO action in a different directory
    without the hassle of manually switching and restoring the directory.


>---------------------------------------------------------------

497c55508fc2d7ebf5dedb726d0692837ccff0ce
 System/Directory.hs           | 15 +++++++++++++++
 changelog.md                  |  2 ++
 tests/Main.hs                 |  2 ++
 tests/WithCurrentDirectory.hs | 26 ++++++++++++++++++++++++++
 4 files changed, 45 insertions(+)

diff --git a/System/Directory.hs b/System/Directory.hs
index 3fe8406..84895f5 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -28,6 +28,7 @@ module System.Directory
     , getDirectoryContents
     , getCurrentDirectory
     , setCurrentDirectory
+    , withCurrentDirectory
 
     -- * Pre-defined directories
     , getHomeDirectory
@@ -1098,6 +1099,20 @@ setCurrentDirectory path =
   Posix.changeWorkingDirectory path
 #endif
 
+-- | Run a given 'IO' action inside the specified directory while
+-- preserving the directory we were in at the start.
+--
+-- This function can fail with the same exceptions that
+-- 'getCurrentDirectory' and 'setCurrentDirectory' can.
+--
+-- @since 1.2.3.0
+withCurrentDirectory :: FilePath -- ^ The path of the directory to execute in
+                     -> IO a -- ^ The action to execute
+                     -> IO a
+withCurrentDirectory dir action =
+  bracket getCurrentDirectory setCurrentDirectory $ \_ ->
+    setCurrentDirectory dir >> action
+
 {- |The operation 'doesDirectoryExist' returns 'True' if the argument file
 exists and is either a directory or a symbolic link to a directory,
 and 'False' otherwise.
diff --git a/changelog.md b/changelog.md
index 1d886f9..fd8079e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -21,6 +21,8 @@ Changelog for the [`directory`][1] package
 
   * Deprecate use of `HsDirectory.h` and `HsDirectoryConfig.h`
 
+  * Implement `withCurrentDirectory`
+
 ## 1.2.2.1 (Apr 2015)
 
   * Fix dependency problem on NixOS when building with tests
diff --git a/tests/Main.hs b/tests/Main.hs
index 5ce8480..b5340ff 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -16,6 +16,7 @@ import qualified GetPermissions001
 import qualified RemoveDirectoryRecursive001
 import qualified RenameFile001
 import qualified T8482
+import qualified WithCurrentDirectory
 
 main :: IO ()
 main = T.testMain $ \ _t -> do
@@ -35,3 +36,4 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "RemoveDirectoryRecursive001" RemoveDirectoryRecursive001.main
   T.isolatedRun _t "RenameFile001" RenameFile001.main
   T.isolatedRun _t "T8482" T8482.main
+  T.isolatedRun _t "WithCurrentDirectory" WithCurrentDirectory.main
diff --git a/tests/WithCurrentDirectory.hs b/tests/WithCurrentDirectory.hs
new file mode 100644
index 0000000..520c363
--- /dev/null
+++ b/tests/WithCurrentDirectory.hs
@@ -0,0 +1,26 @@
+{-# LANGUAGE CPP #-}
+module WithCurrentDirectory where
+#include "util.inl"
+import Data.Monoid ((<>))
+import Data.List (sort)
+import System.Directory
+import System.FilePath ((</>))
+
+main :: TestEnv -> IO ()
+main _t = do
+  createDirectory dir
+  -- Make sure we're starting empty
+  T(expectEq) () specials . sort =<< getDirectoryContents dir
+  cwd <- getCurrentDirectory
+  withCurrentDirectory dir (writeFile testfile contents)
+  -- Are we still in original directory?
+  T(expectEq) () cwd =<< getCurrentDirectory
+  -- Did the test file get created?
+  T(expectEq) () (specials <> [testfile]) . sort =<< getDirectoryContents dir
+  -- Does the file contain what we expected to write?
+  T(expectEq) () contents =<< readFile (dir </> testfile)
+  where
+    testfile = "testfile"
+    contents = "some data\n"
+    dir = "dir"
+    specials = [".", ".."]


From git at git.haskell.org  Fri Dec 18 09:52:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:00 +0000 (UTC)
Subject: [commit: packages/directory] master: Convert Since annotations to
 Haddock-approved ones (11df477)
Message-ID: <20151218095200.4142C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/11df47737dffa64230e1623fa268312574de05a5/directory

>---------------------------------------------------------------

commit 11df47737dffa64230e1623fa268312574de05a5
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Jun 11 22:33:42 2015 +0100

    Convert Since annotations to Haddock-approved ones
    
    Since 2.16.0 (shipped with 7.10.x) we have implemented @since as very
    first metadata allowed in comments. With that version of Haddock, it
    will render in the same way as `/Since: 1.2.3.4/` but in the future we
    may do something more fancy, hence this change.


>---------------------------------------------------------------

11df47737dffa64230e1623fa268312574de05a5
 System/Directory.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 3fe8406..1de7764 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -859,7 +859,7 @@ canonicalizePath = \ path ->
 -- If the path is already absolute, the operation never fails.  Otherwise, the
 -- operation may fail with the same exceptions as 'getCurrentDirectory'.
 --
--- /Since: 1.2.2.0/
+-- @since 1.2.2.0
 makeAbsolute :: FilePath -> IO FilePath
 makeAbsolute = (normalise <$>) . absolutize
   where absolutize path -- avoid the call to `getCurrentDirectory` if we can
@@ -899,7 +899,7 @@ findExecutable fileName = do
 -- | Given a file name, searches for the file and returns a list of all
 -- occurences that are executable.
 --
--- /Since: 1.2.2.0/
+-- @since 1.2.2.0
 findExecutables :: String -> IO [FilePath]
 findExecutables binary = do
 #if defined(mingw32_HOST_OS)
@@ -923,7 +923,7 @@ findFile path fileName = do
 -- | Search through the given set of directories for the given file and
 -- returns a list of paths where the given file exists.
 --
--- /Since: 1.2.1.0/
+-- @since 1.2.1.0
 findFiles :: [FilePath] -> String -> IO [FilePath]
 findFiles = findFilesWith (\_ -> return True)
 
@@ -931,7 +931,7 @@ findFiles = findFilesWith (\_ -> return True)
 -- with the given property (usually permissions) and returns a list of
 -- paths where the given file exists and has the property.
 --
--- /Since: 1.2.1.0/
+-- @since 1.2.1.0
 findFilesWith :: (FilePath -> IO Bool) -> [FilePath] -> String -> IO [FilePath]
 findFilesWith _ [] _ = return []
 findFilesWith f (d:ds) fileName = do
@@ -1152,7 +1152,7 @@ openFileHandle path mode = Win32.createFile path mode share Nothing
 -- resolution only if this package is compiled against @unix-2.6.0.0@ or later
 -- and the underlying filesystem supports them.
 --
--- /Since: 1.2.3.0/
+-- @since 1.2.3.0
 --
 getAccessTime :: FilePath -> IO UTCTime
 getAccessTime = modifyIOError (`ioeSetLocation` "getAccessTime") .
@@ -1221,7 +1221,7 @@ getFileTime isMtime path = modifyIOError (`ioeSetFileName` path) $
 --   would not be able to set timestamps with sub-second resolution.  In this
 --   case, there would also be loss of precision in the modification time.
 --
--- /Since: 1.2.3.0/
+-- @since 1.2.3.0
 --
 setAccessTime :: FilePath -> UTCTime -> IO ()
 setAccessTime path =
@@ -1249,7 +1249,7 @@ setAccessTime path =
 --   would not be able to set timestamps with sub-second resolution.  In this
 --   case, there would also be loss of precision in the access time.
 --
--- /Since: 1.2.3.0/
+-- @since 1.2.3.0
 --
 setModificationTime :: FilePath -> UTCTime -> IO ()
 setModificationTime path =
@@ -1375,7 +1375,7 @@ getHomeDirectory = modifyIOError (`ioeSetLocation` "getHomeDirectory") get
 --
 --   Note: On Windows, 'XdgData' and 'XdgConfig' map to the same directory.
 --
---   /Since: 1.2.3.0/
+--   @since 1.2.3.0
 data XdgDirectory
   = XdgData
     -- ^ For data files (e.g. images).
@@ -1416,7 +1416,7 @@ data XdgDirectory
 --   Note: The directory may not actually exist, in which case you would need
 --   to create it with file mode @700@ (i.e. only accessible by the owner).
 --
---   /Since: 1.2.3.0/
+--   @since 1.2.3.0
 getXdgDirectory :: XdgDirectory         -- ^ which special directory
                 -> FilePath             -- ^ a relative path that is appended
                                         --   to the path; if empty, the base


From git at git.haskell.org  Fri Dec 18 09:52:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:02 +0000 (UTC)
Subject: [commit: packages/directory] master: Merge pull request #29 from
 Fuuzetsu/since-fixes (42ca2ab)
Message-ID: <20151218095202.478A03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/42ca2abf0471e3125d03479c0cdd90f092ea97fb/directory

>---------------------------------------------------------------

commit 42ca2abf0471e3125d03479c0cdd90f092ea97fb
Merge: b6aca5d 11df477
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Jun 11 22:13:31 2015 -0400

    Merge pull request #29 from Fuuzetsu/since-fixes
    
    Convert Since annotations to Haddock-approved ones



>---------------------------------------------------------------

42ca2abf0471e3125d03479c0cdd90f092ea97fb
 System/Directory.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)


From git at git.haskell.org  Fri Dec 18 09:52:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:04 +0000 (UTC)
Subject: [commit: packages/directory] master: Merge pull request #28 from
 Fuuzetsu/withCurrentDirectory (1cb408c)
Message-ID: <20151218095204.505043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1cb408cc4c36a4e5d718807033f606b07f6e64b9/directory

>---------------------------------------------------------------

commit 1cb408cc4c36a4e5d718807033f606b07f6e64b9
Merge: 42ca2ab 497c555
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 12 01:00:27 2015 -0400

    Merge pull request #28 from Fuuzetsu/withCurrentDirectory
    
    Implement `withCurrentDirectory`



>---------------------------------------------------------------

1cb408cc4c36a4e5d718807033f606b07f6e64b9
 System/Directory.hs           | 15 +++++++++++++++
 changelog.md                  |  2 ++
 tests/Main.hs                 |  2 ++
 tests/WithCurrentDirectory.hs | 26 ++++++++++++++++++++++++++
 4 files changed, 45 insertions(+)



From git at git.haskell.org  Fri Dec 18 09:52:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:06 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove withWorkingDirectory from
 tests/Util.hs (cfb7673)
Message-ID: <20151218095206.56E093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cfb7673bcacd113dbc5bbb4ddd4f89876d421d53/directory

>---------------------------------------------------------------

commit cfb7673bcacd113dbc5bbb4ddd4f89876d421d53
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 12 01:34:45 2015 -0400

    Remove withWorkingDirectory from tests/Util.hs


>---------------------------------------------------------------

cfb7673bcacd113dbc5bbb4ddd4f89876d421d53
 tests/Util.hs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/tests/Util.hs b/tests/Util.hs
index 68744f9..b0db8cd 100644
--- a/tests/Util.hs
+++ b/tests/Util.hs
@@ -12,10 +12,10 @@ import Control.Concurrent.MVar (newEmptyMVar, putMVar, readMVar)
 import Control.Exception (SomeException, bracket_, catch,
                           mask, onException, try)
 import Control.Monad (Monad(..), unless, when)
-import System.Directory (createDirectory, getCurrentDirectory, makeAbsolute,
-                         removeDirectoryRecursive, setCurrentDirectory)
+import System.Directory (createDirectory, makeAbsolute,
+                         removeDirectoryRecursive, withCurrentDirectory)
 import System.Exit (exitFailure)
-import System.FilePath (FilePath, (</>), normalise)
+import System.FilePath (FilePath, normalise)
 import System.IO (IO, hFlush, hPutStrLn, putStrLn, stderr, stdout)
 import System.IO.Error (IOError, isDoesNotExistError,
                         ioError, tryIOError, userError)
@@ -124,12 +124,6 @@ expectIOErrorType t file line context which action = do
             | otherwise -> Left  ["got wrong exception: ", show e]
     Right _             -> Left  ["did not throw an exception"]
 
-withWorkingDirectory :: FilePath -> IO a -> IO a
-withWorkingDirectory dir action = do
-  cur  <- getCurrentDirectory
-  bracket_ (setCurrentDirectory (cur </> dir))
-           (setCurrentDirectory  cur) action
-
 withNewDirectory :: FilePath -> IO a -> IO a
 withNewDirectory dir action = do
   dir' <- makeAbsolute dir
@@ -146,7 +140,7 @@ isolateWorkingDirectory dir action = do
     unless (isDoesNotExistError e) $
       ioError e
   withNewDirectory dir' $
-    withWorkingDirectory dir' $
+    withCurrentDirectory dir' $
       action
 
 run :: TestEnv -> String -> (TestEnv -> IO ()) -> IO ()


From git at git.haskell.org  Fri Dec 18 09:52:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:08 +0000 (UTC)
Subject: [commit: packages/directory] master: Clean up documentation and
 formatting of working directory functions (e5216b3)
Message-ID: <20151218095208.5D1913A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e5216b364f931e0393e366f8b98d0bc906c8ce03/directory

>---------------------------------------------------------------

commit e5216b364f931e0393e366f8b98d0bc906c8ce03
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Jun 12 01:48:46 2015 -0400

    Clean up documentation and formatting of working directory functions


>---------------------------------------------------------------

e5216b364f931e0393e366f8b98d0bc906c8ce03
 System/Directory.hs | 154 +++++++++++++++++++++++++---------------------------
 1 file changed, 75 insertions(+), 79 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 73e9802..d5c8abd 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -24,8 +24,8 @@ module System.Directory
     , removeDirectory
     , removeDirectoryRecursive
     , renameDirectory
-
     , getDirectoryContents
+    -- ** Current working directory
     , getCurrentDirectory
     , setCurrentDirectory
     , withCurrentDirectory
@@ -1015,36 +1015,33 @@ getDirectoryContents path =
 #endif /* __GLASGOW_HASKELL__ */
 
 
-{- |If the operating system has a notion of current directories,
-'getCurrentDirectory' returns an absolute path to the
-current directory of the calling process.
-
-The operation may fail with:
-
-* 'HardwareFault'
-A physical I\/O error has occurred.
-@[EIO]@
-
-* 'isDoesNotExistError' \/ 'NoSuchThing'
-There is no path referring to the current directory.
-@[EPERM, ENOENT, ESTALE...]@
-
-* 'isPermissionError' \/ 'PermissionDenied'
-The process has insufficient privileges to perform the operation.
-@[EACCES]@
-
-* 'ResourceExhausted'
-Insufficient resources are available to perform the operation.
-
-* 'UnsupportedOperation'
-The operating system has no notion of current directory.
-
-Note that in a concurrent program, the current directory is global
-state shared between all threads of the process.  When using
-filesystem operations from multiple threads, it is therefore highly
-recommended to use absolute rather than relative `FilePath`s.
-
--}
+-- | Obtain the current working directory as an absolute path.
+--
+-- In a multithreaded program, the current working directory is a global state
+-- shared among all threads of the process.  Therefore, when performing
+-- filesystem operations from multiple threads, it is highly recommended to
+-- use absolute rather than relative paths (see: 'makeAbsolute').
+--
+-- The operation may fail with:
+--
+-- * 'HardwareFault'
+-- A physical I\/O error has occurred.
+-- @[EIO]@
+--
+-- * 'isDoesNotExistError' or 'NoSuchThing'
+-- There is no path referring to the working directory.
+-- @[EPERM, ENOENT, ESTALE...]@
+--
+-- * 'isPermissionError' or 'PermissionDenied'
+-- The process has insufficient privileges to perform the operation.
+-- @[EACCES]@
+--
+-- * 'ResourceExhausted'
+-- Insufficient resources are available to perform the operation.
+--
+-- * 'UnsupportedOperation'
+-- The operating system has no notion of current working directory.
+--
 #ifdef __GLASGOW_HASKELL__
 getCurrentDirectory :: IO FilePath
 getCurrentDirectory = do
@@ -1054,64 +1051,63 @@ getCurrentDirectory = do
   Posix.getWorkingDirectory
 #endif
 
-{- |If the operating system has a notion of current directories,
-@'setCurrentDirectory' dir@ changes the current
-directory of the calling process to /dir/.
-
-The operation may fail with:
-
-* 'HardwareFault'
-A physical I\/O error has occurred.
-@[EIO]@
-
-* 'InvalidArgument'
-The operand is not a valid directory name.
-@[ENAMETOOLONG, ELOOP]@
-
-* 'isDoesNotExistError' \/ 'NoSuchThing'
-The directory does not exist.
-@[ENOENT, ENOTDIR]@
-
-* 'isPermissionError' \/ 'PermissionDenied'
-The process has insufficient privileges to perform the operation.
-@[EACCES]@
-
-* 'UnsupportedOperation'
-The operating system has no notion of current directory, or the
-current directory cannot be dynamically changed.
-
-* 'InappropriateType'
-The path refers to an existing non-directory object.
-@[ENOTDIR]@
-
-Note that in a concurrent program, the current directory is global
-state shared between all threads of the process.  When using
-filesystem operations from multiple threads, it is therefore highly
-recommended to use absolute rather than relative `FilePath`s.
-
--}
-
+-- | Change the working directory to the given path.
+--
+-- In a multithreaded program, the current working directory is a global state
+-- shared among all threads of the process.  Therefore, when performing
+-- filesystem operations from multiple threads, it is highly recommended to
+-- use absolute rather than relative paths (see: 'makeAbsolute').
+--
+-- The operation may fail with:
+--
+-- * 'HardwareFault'
+-- A physical I\/O error has occurred.
+-- @[EIO]@
+--
+-- * 'InvalidArgument'
+-- The operand is not a valid directory name.
+-- @[ENAMETOOLONG, ELOOP]@
+--
+-- * 'isDoesNotExistError' or 'NoSuchThing'
+-- The directory does not exist.
+-- @[ENOENT, ENOTDIR]@
+--
+-- * 'isPermissionError' or 'PermissionDenied'
+-- The process has insufficient privileges to perform the operation.
+-- @[EACCES]@
+--
+-- * 'UnsupportedOperation'
+-- The operating system has no notion of current working directory, or the
+-- working directory cannot be dynamically changed.
+--
+-- * 'InappropriateType'
+-- The path refers to an existing non-directory object.
+-- @[ENOTDIR]@
+--
 setCurrentDirectory :: FilePath -> IO ()
-setCurrentDirectory path =
+setCurrentDirectory =
 #ifdef mingw32_HOST_OS
-  Win32.setCurrentDirectory path
+  Win32.setCurrentDirectory
 #else
-  Posix.changeWorkingDirectory path
+  Posix.changeWorkingDirectory
 #endif
 
--- | Run a given 'IO' action inside the specified directory while
--- preserving the directory we were in at the start.
+-- | Run an 'IO' action with the given working directory and restore the
+-- original working directory afterwards, even if the given action fails due
+-- to an exception.
 --
--- This function can fail with the same exceptions that
--- 'getCurrentDirectory' and 'setCurrentDirectory' can.
+-- The operation may fail with the same exceptions as 'getCurrentDirectory'
+-- and 'setCurrentDirectory'.
 --
 -- @since 1.2.3.0
-withCurrentDirectory :: FilePath -- ^ The path of the directory to execute in
-                     -> IO a -- ^ The action to execute
+--
+withCurrentDirectory :: FilePath  -- ^ Directory to execute in
+                     -> IO a      -- ^ Action to be executed
                      -> IO a
 withCurrentDirectory dir action =
-  bracket getCurrentDirectory setCurrentDirectory $ \_ ->
-    setCurrentDirectory dir >> action
+  bracket getCurrentDirectory setCurrentDirectory $ \ _ -> do
+    setCurrentDirectory dir
+    action
 
 {- |The operation 'doesDirectoryExist' returns 'True' if the argument file
 exists and is either a directory or a symbolic link to a directory,


From git at git.haskell.org  Fri Dec 18 09:52:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:10 +0000 (UTC)
Subject: [commit: packages/directory] master: Update date in changelog
 (4449af7)
Message-ID: <20151218095210.636B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4449af7ef174b7a5140637612001e36068235783/directory

>---------------------------------------------------------------

commit 4449af7ef174b7a5140637612001e36068235783
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Mon Jul 13 17:36:38 2015 -0400

    Update date in changelog


>---------------------------------------------------------------

4449af7ef174b7a5140637612001e36068235783
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index fd8079e..f3e6088 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,7 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
-## 1.2.3.0 (June 2015)
+## 1.2.3.0 (July 2015)
 
   * Add support for XDG Base Directory Specification
     ([#6](https://github.com/haskell/directory/issues/6))


From git at git.haskell.org  Fri Dec 18 09:52:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:12 +0000 (UTC)
Subject: [commit: packages/directory] master: Restore Safe Haskell support
 with base < 4.8 (208d7fd)
Message-ID: <20151218095212.6A1353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/208d7fd2f2df69e9cb59ef1e88448e5d2d4a3ae0/directory

>---------------------------------------------------------------

commit 208d7fd2f2df69e9cb59ef1e88448e5d2d4a3ae0
Author: Eric Mertens <emertens at gmail.com>
Date:   Fri Aug 14 14:57:23 2015 -0700

    Restore Safe Haskell support with base < 4.8
    
    Fixes #30


>---------------------------------------------------------------

208d7fd2f2df69e9cb59ef1e88448e5d2d4a3ae0
 System/Directory.hs | 5 +++++
 changelog.md        | 5 +++++
 directory.cabal     | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index d5c8abd..b3c7fb8 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -1,5 +1,10 @@
 {-# LANGUAGE CPP, NondecreasingIndentation #-}
 
+#if !(MIN_VERSION_base(4,8,0))
+-- In base-4.8.0 the Foreign module became Safe
+{-# LANGUAGE Trustworthy #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  System.Directory
diff --git a/changelog.md b/changelog.md
index f3e6088..6cea768 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.3.1
+
+  * Restore support for Safe Haskell with base < 4.8
+    ([#30](https://github.com/haskell/directory/issues/30))
+
 ## 1.2.3.0 (July 2015)
 
   * Add support for XDG Base Directory Specification
diff --git a/directory.cabal b/directory.cabal
index 72f7b0a..9f82899 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.3.0
+version:        1.2.3.1
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Fri Dec 18 09:52:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:14 +0000 (UTC)
Subject: [commit: packages/directory] master: Add regression test to verify
 System.Directory is indeed Safe (600834e)
Message-ID: <20151218095214.70EE83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/600834e3e05641172192db3d8ced09ac9e791cb3/directory

>---------------------------------------------------------------

commit 600834e3e05641172192db3d8ced09ac9e791cb3
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Aug 14 17:56:37 2015 -0400

    Add regression test to verify System.Directory is indeed Safe


>---------------------------------------------------------------

600834e3e05641172192db3d8ced09ac9e791cb3
 tests/Main.hs | 2 ++
 tests/Safe.hs | 7 +++++++
 2 files changed, 9 insertions(+)

diff --git a/tests/Main.hs b/tests/Main.hs
index b5340ff..91f0065 100644
--- a/tests/Main.hs
+++ b/tests/Main.hs
@@ -15,6 +15,7 @@ import qualified GetHomeDirectory001
 import qualified GetPermissions001
 import qualified RemoveDirectoryRecursive001
 import qualified RenameFile001
+import qualified Safe
 import qualified T8482
 import qualified WithCurrentDirectory
 
@@ -35,5 +36,6 @@ main = T.testMain $ \ _t -> do
   T.isolatedRun _t "GetPermissions001" GetPermissions001.main
   T.isolatedRun _t "RemoveDirectoryRecursive001" RemoveDirectoryRecursive001.main
   T.isolatedRun _t "RenameFile001" RenameFile001.main
+  T.isolatedRun _t "Safe" Safe.main
   T.isolatedRun _t "T8482" T8482.main
   T.isolatedRun _t "WithCurrentDirectory" WithCurrentDirectory.main
diff --git a/tests/Safe.hs b/tests/Safe.hs
new file mode 100644
index 0000000..8f79efc
--- /dev/null
+++ b/tests/Safe.hs
@@ -0,0 +1,7 @@
+-- Verify that System.Directory is indeed Safe (regression test for issue #30)
+{-# LANGUAGE Safe #-}
+module Safe where
+import System.Directory ()
+
+main :: a -> IO ()
+main _ = return ()


From git at git.haskell.org  Fri Dec 18 09:52:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:16 +0000 (UTC)
Subject: [commit: packages/directory] master: Add date to changelog for
 1.2.3.1 (1754689)
Message-ID: <20151218095216.778E33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/17546891320f6ca89ea377592cfbd1f924523ced/directory

>---------------------------------------------------------------

commit 17546891320f6ca89ea377592cfbd1f924523ced
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Aug 14 18:59:19 2015 -0400

    Add date to changelog for 1.2.3.1


>---------------------------------------------------------------

17546891320f6ca89ea377592cfbd1f924523ced
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 6cea768..5e2bd85 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,7 +1,7 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
-## 1.2.3.1
+## 1.2.3.1 (August 2015)
 
   * Restore support for Safe Haskell with base < 4.8
     ([#30](https://github.com/haskell/directory/issues/30))


From git at git.haskell.org  Fri Dec 18 09:52:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:18 +0000 (UTC)
Subject: [commit: packages/directory] master: Work around lack of #const_str
 when cross-compiling (8926fb1)
Message-ID: <20151218095218.7DF553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8926fb113ce84a2eef359704b6b0286e7dc353fd/directory

>---------------------------------------------------------------

commit 8926fb113ce84a2eef359704b6b0286e7dc353fd
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Aug 15 18:12:41 2015 -0400

    Work around lack of #const_str when cross-compiling
    
    We simply paste the C string literal in Haskell code and hope it works.


>---------------------------------------------------------------

8926fb113ce84a2eef359704b6b0286e7dc353fd
 System/Directory/Internal.hsc       | 10 +++-------
 System/Directory/Internal/Config.hs | 12 ++++++++++++
 changelog.md                        |  7 +++++++
 directory.cabal                     |  3 ++-
 4 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/System/Directory/Internal.hsc b/System/Directory/Internal.hsc
index a0a71db..e6bd979 100644
--- a/System/Directory/Internal.hsc
+++ b/System/Directory/Internal.hsc
@@ -1,7 +1,7 @@
 #include <HsDirectoryConfig.h>
 
 module System.Directory.Internal
-  ( module System.Directory.Internal
+  ( module System.Directory.Internal.Config
 
 #ifdef HAVE_UTIMENSAT
   , module System.Directory.Internal.C_utimensat
@@ -13,7 +13,8 @@ module System.Directory.Internal
   , module System.Directory.Internal.Posix
 #endif
 
-) where
+  ) where
+import System.Directory.Internal.Config
 
 #ifdef HAVE_UTIMENSAT
 import System.Directory.Internal.C_utimensat
@@ -24,8 +25,3 @@ import System.Directory.Internal.Windows
 #else
 import System.Directory.Internal.Posix
 #endif
-
--- | Filename extension for executable files (including the dot if any)
---   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
-exeExtension :: String
-exeExtension = (#const_str EXE_EXTENSION)
diff --git a/System/Directory/Internal/Config.hs b/System/Directory/Internal/Config.hs
new file mode 100644
index 0000000..4547897
--- /dev/null
+++ b/System/Directory/Internal/Config.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE CPP #-}
+#include <HsDirectoryConfig.h>
+module System.Directory.Internal.Config where
+
+-- | Filename extension for executable files (including the dot if any)
+--   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
+exeExtension :: String
+exeExtension = EXE_EXTENSION
+-- We avoid using #const_str from hsc because it breaks cross-compilation
+-- builds, so we use this ugly workaround where we simply paste the C string
+-- literal directly in here.  This will probably break if the EXE_EXTENSION
+-- contains strange characters, but hopefully no sane OS would ever do that.
diff --git a/changelog.md b/changelog.md
index 5e2bd85..10f12c9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,13 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.3.2 (August 2015)
+
+  * Work around lack of `#const_str` when cross-compiling
+    ([haskell-cafe](F7D))
+
+[F7D]: https://mail.haskell.org/pipermail/haskell-cafe/2015-August/120892.html
+
 ## 1.2.3.1 (August 2015)
 
   * Restore support for Safe Haskell with base < 4.8
diff --git a/directory.cabal b/directory.cabal
index 9f82899..9300897 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.3.1
+version:        1.2.3.2
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE
@@ -45,6 +45,7 @@ Library
         System.Directory
     other-modules:
         System.Directory.Internal
+        System.Directory.Internal.Config
         System.Directory.Internal.C_utimensat
         System.Directory.Internal.Posix
         System.Directory.Internal.Windows


From git at git.haskell.org  Fri Dec 18 09:52:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:20 +0000 (UTC)
Subject: [commit: packages/directory] master: Inherit C compiler from Cabal
 (ec9e1af)
Message-ID: <20151218095220.840D13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ec9e1af1d11c311ffcc0c19185f51273590d049f/directory

>---------------------------------------------------------------

commit ec9e1af1d11c311ffcc0c19185f51273590d049f
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Aug 20 17:49:08 2015 -0400

    Inherit C compiler from Cabal
    
    Cabal passes --with-gcc and --with-compiler to the configure script,
    which used to be ignored, causing warnings.  The configure script now
    accepts both, although --with-compiler currently has no effect.


>---------------------------------------------------------------

ec9e1af1d11c311ffcc0c19185f51273590d049f
 configure.ac | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/configure.ac b/configure.ac
index ebea785..a9dbd12 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,14 @@ AC_CONFIG_HEADERS([include/HsDirectoryConfig.h])
 AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
+# inherit the C compiler from Cabal
+AC_ARG_WITH([gcc],
+            [C compiler],
+            [CC=$withval])
+# avoid warnings when run via Cabal
+AC_ARG_WITH([compiler],
+            [GHC compiler],
+            [])
 AC_PROG_CC()
 
 # check for specific header (.h) files that we are interested in


From git at git.haskell.org  Fri Dec 18 09:52:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:22 +0000 (UTC)
Subject: [commit: packages/directory] master: Migrate Travis to containerized
 infrastructure (77d34ee)
Message-ID: <20151218095222.8A6B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/77d34ee1ebd9ef58e1afb6052909095dca9aade0/directory

>---------------------------------------------------------------

commit 77d34ee1ebd9ef58e1afb6052909095dca9aade0
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Thu Aug 20 18:20:18 2015 -0400

    Migrate Travis to containerized infrastructure
    
    Additionally,
    
      - removed 7.4.1, and
      - upgraded 7.8.3 to 7.8.4.


>---------------------------------------------------------------

77d34ee1ebd9ef58e1afb6052909095dca9aade0
 .travis.yml | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 19c998f..5b9766f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,20 +1,26 @@
 # we want to use our custom environment, but the Travis YAML validator
 # requires this field to be specified, so we'll just use 'c'
 language: c
-env:
- # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
- # no package for earlier cabal versions in the PPA
- - GHCVER=7.4.1  CABALVER=1.16
- - GHCVER=7.4.2  CABALVER=1.16
- - GHCVER=7.6.3  CABALVER=1.16
- - GHCVER=7.8.3  CABALVER=1.18
- - GHCVER=7.10.1 CABALVER=1.22
- - GHCVER=head   CABALVER=head
+
+# use the new container-based infrastructure
+sudo: false
+
+matrix:
+  include:
+   # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
+   # no package for earlier cabal versions in the PPA
+   - env: GHCVER=7.4.2 CABALVER=1.16
+     addons: {apt: {packages: [cabal-install-1.16,ghc-7.4.2], sources: [hvr-ghc]}}
+   - env: GHCVER=7.6.3 CABALVER=1.16
+     addons: {apt: {packages: [cabal-install-1.16,ghc-7.6.3], sources: [hvr-ghc]}}
+   - env: GHCVER=7.8.4 CABALVER=1.18
+     addons: {apt: {packages: [cabal-install-1.18,ghc-7.8.4], sources: [hvr-ghc]}}
+   - env: GHCVER=7.10.1 CABALVER=1.22
+     addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
+   - env: GHCVER=head CABALVER=head
+     addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
 
 before_install:
- - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
- - travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
  - cabal --version
 


From git at git.haskell.org  Fri Dec 18 09:52:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:24 +0000 (UTC)
Subject: [commit: packages/directory] master: Add findExecutablesInDirectories
 (e4a6a38)
Message-ID: <20151218095224.914AC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e4a6a3824d837a9bcd95b91a841ce04d74e05b7e/directory

>---------------------------------------------------------------

commit e4a6a3824d837a9bcd95b91a841ce04d74e05b7e
Author: Daniel Gr?ber <dxld at darkboxed.org>
Date:   Fri Aug 28 04:35:58 2015 +0200

    Add findExecutablesInDirectories


>---------------------------------------------------------------

e4a6a3824d837a9bcd95b91a841ce04d74e05b7e
 System/Directory.hs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index b3c7fb8..adfa2fe 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -53,6 +53,7 @@ module System.Directory
     , makeRelativeToCurrentDirectory
     , findExecutable
     , findExecutables
+    , findExecutablesInDirectories
     , findFile
     , findFiles
     , findFilesWith
@@ -913,11 +914,17 @@ findExecutables binary = do
     return $ maybeToList file
 #else
     path <- getEnv "PATH"
-    findFilesWith isExecutable (splitSearchPath path) (binary <.> exeExtension)
+    findExecutablesInDirectories (splitSearchPath path) binary
+#endif
+
+-- | Given a file name, searches for the file on the given paths and returns a
+-- list of all occurences that are executable.
+findExecutablesInDirectories :: [FilePath] -> String -> IO [FilePath]
+findExecutablesInDirectories path binary =
+    findFilesWith isExecutable path (binary <.> exeExtension)
   where isExecutable file = do
             perms <- getPermissions file
             return $ executable perms
-#endif
 
 -- | Search through the given set of directories for the given file.
 -- Used by 'findExecutable' on non-windows platforms.


From git at git.haskell.org  Fri Dec 18 09:52:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:26 +0000 (UTC)
Subject: [commit: packages/directory] master: Update changelog and
 documentation (6b1a57c)
Message-ID: <20151218095226.97FAA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6b1a57c7099c52516e877269dde961f3a85d9bc6/directory

>---------------------------------------------------------------

commit 6b1a57c7099c52516e877269dde961f3a85d9bc6
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Aug 28 00:40:54 2015 -0400

    Update changelog and documentation


>---------------------------------------------------------------

6b1a57c7099c52516e877269dde961f3a85d9bc6
 System/Directory.hs | 8 +++++++-
 changelog.md        | 7 +++++++
 directory.cabal     | 2 +-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index adfa2fe..a1aa8fb 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -57,6 +57,7 @@ module System.Directory
     , findFile
     , findFiles
     , findFilesWith
+    , exeExtension
 
     -- * Existence tests
     , doesFileExist
@@ -906,6 +907,10 @@ findExecutable fileName = do
 -- | Given a file name, searches for the file and returns a list of all
 -- occurences that are executable.
 --
+-- On Windows, this only returns the first ocurrence, if any.  It uses the
+-- @SearchPath@ from the Win32 API, so the caveats noted in 'findExecutable'
+-- apply here as well.
+--
 -- @since 1.2.2.0
 findExecutables :: String -> IO [FilePath]
 findExecutables binary = do
@@ -919,6 +924,8 @@ findExecutables binary = do
 
 -- | Given a file name, searches for the file on the given paths and returns a
 -- list of all occurences that are executable.
+--
+-- @since 1.2.4.0
 findExecutablesInDirectories :: [FilePath] -> String -> IO [FilePath]
 findExecutablesInDirectories path binary =
     findFilesWith isExecutable path (binary <.> exeExtension)
@@ -927,7 +934,6 @@ findExecutablesInDirectories path binary =
             return $ executable perms
 
 -- | Search through the given set of directories for the given file.
--- Used by 'findExecutable' on non-windows platforms.
 findFile :: [FilePath] -> String -> IO (Maybe FilePath)
 findFile path fileName = do
     files <- findFiles path fileName
diff --git a/changelog.md b/changelog.md
index 10f12c9..85d26be 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,13 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.4.0 (September 2015)
+
+  * Add `findExecutablesInDirectories`
+    ([#33](https://github.com/haskell/directory/pull/33))
+
+  * Add `exeExtension`
+
 ## 1.2.3.2 (August 2015)
 
   * Work around lack of `#const_str` when cross-compiling
diff --git a/directory.cabal b/directory.cabal
index 9300897..3ffb2ca 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.3.2
+version:        1.2.4.0
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Fri Dec 18 09:52:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:28 +0000 (UTC)
Subject: [commit: packages/directory] master: Add @since to docs of
 exeExtension (4006c8a)
Message-ID: <20151218095228.9DAF13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4006c8a52904f97dc6d264cdc7f3d6df7e556744/directory

>---------------------------------------------------------------

commit 4006c8a52904f97dc6d264cdc7f3d6df7e556744
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Aug 28 01:56:29 2015 -0400

    Add @since to docs of exeExtension


>---------------------------------------------------------------

4006c8a52904f97dc6d264cdc7f3d6df7e556744
 System/Directory/Internal/Config.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/System/Directory/Internal/Config.hs b/System/Directory/Internal/Config.hs
index 4547897..5cc1b3e 100644
--- a/System/Directory/Internal/Config.hs
+++ b/System/Directory/Internal/Config.hs
@@ -4,6 +4,8 @@ module System.Directory.Internal.Config where
 
 -- | Filename extension for executable files (including the dot if any)
 --   (usually @\"\"@ on POSIX systems and @\".exe\"@ on Windows or OS\/2).
+--
+-- @since 1.2.4.0
 exeExtension :: String
 exeExtension = EXE_EXTENSION
 -- We avoid using #const_str from hsc because it breaks cross-compilation


From git at git.haskell.org  Fri Dec 18 09:52:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:30 +0000 (UTC)
Subject: [commit: packages/directory] master: Ignore --with-gcc if it contains
 spaces (81d95c9)
Message-ID: <20151218095230.A39A83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/81d95c9880d6168c2e205da6fdd74c0ef45d8215/directory

>---------------------------------------------------------------

commit 81d95c9880d6168c2e205da6fdd74c0ef45d8215
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Fri Aug 28 19:35:16 2015 -0400

    Ignore --with-gcc if it contains spaces
    
    Autoconf chokes on spaces, but we may receive a full path from Cabal
    containing spaces, so if that happens we just ignore Cabal's suggestion.
    Terrible hack, but what can you do?  We can't just bail because Windows
    users might have their compiler under "Program Files", so we'll just
    print a warning and hope for the best.


>---------------------------------------------------------------

81d95c9880d6168c2e205da6fdd74c0ef45d8215
 configure.ac | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9dbd12..448e7b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,12 +5,24 @@ AC_CONFIG_SRCDIR([include/HsDirectory.h])
 
 AC_CONFIG_HEADERS([include/HsDirectoryConfig.h])
 
-AC_ARG_WITH([cc],
-            [C compiler],
-            [CC=$withval])
-# inherit the C compiler from Cabal
+# Autoconf chokes on spaces, but we may receive a path from Cabal containing
+# spaces.  In that case, we just ignore Cabal's suggestion.
+set_with_gcc() {
+    case $withval in
+        *" "*)
+            AC_MSG_WARN([--with-gcc ignored due to presence of spaces]);;
+        *)
+            CC=$withval
+    esac
+}
+
+# inherit the C compiler from Cabal but allow it to be overridden by --with-cc
+# because Cabal puts its own flags at the end
 AC_ARG_WITH([gcc],
             [C compiler],
+            [set_with_gcc])
+AC_ARG_WITH([cc],
+            [C compiler],
             [CC=$withval])
 # avoid warnings when run via Cabal
 AC_ARG_WITH([compiler],


From git at git.haskell.org  Fri Dec 18 09:52:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:32 +0000 (UTC)
Subject: [commit: packages/directory] master: Add GHC build files to
 .gitignore (2f0c937)
Message-ID: <20151218095232.A9FE13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2f0c9377f0538011529fe43c3995e6718177cd66/directory

>---------------------------------------------------------------

commit 2f0c9377f0538011529fe43c3995e6718177cd66
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Aug 29 15:07:56 2015 +0200

    Add GHC build files to .gitignore


>---------------------------------------------------------------

2f0c9377f0538011529fe43c3995e6718177cd66
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 815a547..ad4e1bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,8 @@ dist/
 include/HsDirectoryConfig.h
 include/HsDirectoryConfig.h.in
 *~
+
+# In GHC build tree:
+GNUmakefile
+dist-install
+ghc.mk


From git at git.haskell.org  Fri Dec 18 09:52:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:34 +0000 (UTC)
Subject: [commit: packages/directory] master: Make foreign imports of realpath
 and utimensat safe (27bfd06)
Message-ID: <20151218095234.B09AE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/27bfd06ac3a8805976820677c508bf986f7c8cc3/directory

>---------------------------------------------------------------

commit 27bfd06ac3a8805976820677c508bf986f7c8cc3
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Sep 5 04:07:20 2015 -0400

    Make foreign imports of realpath and utimensat safe
    
    Although these functions never return EINTR, signals may still affect
    these calls.  In particular, realpath on Mac OS X contains a
    retry-if-interrupted loop on statfs64.  If the file system is slow
    (e.g. SSHFS), the call will hang due to the barrage of periodic alarm
    signals from the GHC runtime.  Marking the foreign import as safe
    appears to silence the alarm signals, although it is not guaranteed [1].
    This is the best we can do until [2] gets fixed.
    
    We also do this for utimensat as a precautionary measure.  Given that
    these are system calls that manipulate the file system, the performance
    overhead ought to be negligible.
    
    This should alleviate #35 for now.
    
    [1] https://mail.haskell.org/pipermail/ghc-devs/2015-September/009770.html
    [2] https://ghc.haskell.org/trac/ghc/ticket/10840


>---------------------------------------------------------------

27bfd06ac3a8805976820677c508bf986f7c8cc3
 System/Directory/Internal/C_utimensat.hsc | 2 +-
 System/Directory/Internal/Posix.hsc       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Directory/Internal/C_utimensat.hsc b/System/Directory/Internal/C_utimensat.hsc
index 7497f7e..d1775fb 100644
--- a/System/Directory/Internal/C_utimensat.hsc
+++ b/System/Directory/Internal/C_utimensat.hsc
@@ -42,7 +42,7 @@ toCTimeSpec t = CTimeSpec (CTime sec) (truncate $ 10 ^ (9 :: Int) * frac)
     (sec,  frac)  = if frac' < 0 then (sec' - 1, frac' + 1) else (sec', frac')
     (sec', frac') = properFraction (toRational t)
 
-foreign import ccall unsafe "utimensat" c_utimensat
+foreign import ccall "utimensat" c_utimensat
   :: CInt -> CString -> Ptr CTimeSpec -> CInt -> IO CInt
 
 #endif
diff --git a/System/Directory/Internal/Posix.hsc b/System/Directory/Internal/Posix.hsc
index 231e822..8dfd6fb 100644
--- a/System/Directory/Internal/Posix.hsc
+++ b/System/Directory/Internal/Posix.hsc
@@ -25,7 +25,7 @@ c_PATH_MAX | c_PATH_MAX' > toInteger maxValue = Nothing
 c_PATH_MAX = Nothing
 #endif
 
-foreign import ccall unsafe "realpath" c_realpath
+foreign import ccall "realpath" c_realpath
   :: CString -> CString -> IO CString
 
 withRealpath :: CString -> (CString -> IO a) -> IO a


From git at git.haskell.org  Fri Dec 18 09:52:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:36 +0000 (UTC)
Subject: [commit: packages/directory] master: Allow test parameters to be
 overridden via command-line arguments (4bcda8c)
Message-ID: <20151218095236.B87DE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bcda8ceb2d5773d6294cdd7271fa5271ea4b128/directory

>---------------------------------------------------------------

commit 4bcda8ceb2d5773d6294cdd7271fa5271ea4b128
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Sep 1 22:55:54 2015 -0400

    Allow test parameters to be overridden via command-line arguments
    
    Arguments of the form 'key=value' are accepted by test program.
    Currently, the following arguments are accepted:
    
      - silent=yes|no* (corresponds to testSilent in TestEnv)
      - keep-dirs=yes|no* (corresponds to testKeepDirs in TestEnv)
      - CreateDirectoryIfMissing001.num-repeats=<int> (10000*)
      - CreateDirectoryIfMissing001.num-threads=<int> (4*)
    
    * Default value.
    
    To keep the implementation simple, superfluous arguments or invalid
    arguments are silently ignored.


>---------------------------------------------------------------

4bcda8ceb2d5773d6294cdd7271fa5271ea4b128
 tests/CreateDirectoryIfMissing001.hs | 26 ++++++----
 tests/Util.hs                        | 99 +++++++++++++++++++++++++-----------
 tests/util.inl                       |  2 +-
 3 files changed, 86 insertions(+), 41 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4bcda8ceb2d5773d6294cdd7271fa5271ea4b128

From git at git.haskell.org  Fri Dec 18 09:52:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:38 +0000 (UTC)
Subject: [commit: packages/directory] master: Test on Travis with threading
 enabled (422d799)
Message-ID: <20151218095238.BDFBD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/422d79948e0b4fe2c1b615a80f4ba5beb8eefbad/directory

>---------------------------------------------------------------

commit 422d79948e0b4fe2c1b615a80f4ba5beb8eefbad
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Sep 1 18:30:30 2015 -0400

    Test on Travis with threading enabled
    
    (Also, as it turns out --test-option wasn't being used correctly.)


>---------------------------------------------------------------

422d79948e0b4fe2c1b615a80f4ba5beb8eefbad
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index df901c4..80d66f1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -61,10 +61,10 @@ before_script:
 
 script:
  - autoreconf -i
- - cabal configure -v2 --enable-tests
+ - cabal configure -v2 --enable-tests --ghc-options=-threaded
  - cabal build
  - cabal check
  - cabal sdist
- - cabal test --show-details=$streaming --test-option="+RTS -N2"
+ - cabal test --show-details=$streaming --test-option=+RTS --test-option=-N2
  - eval "$def_cabal_install_run_tests" &&
    cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz


From git at git.haskell.org  Fri Dec 18 09:52:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:40 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove workaround for
 haskell/cabal#1938, which has already been fixed (6e67318)
Message-ID: <20151218095240.C3D083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6e6731893ff52489320becbdd11e87c3759f3682/directory

>---------------------------------------------------------------

commit 6e6731893ff52489320becbdd11e87c3759f3682
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Sep 1 23:50:33 2015 -0400

    Remove workaround for haskell/cabal#1938, which has already been fixed


>---------------------------------------------------------------

6e6731893ff52489320becbdd11e87c3759f3682
 .travis.yml | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 5b9766f..df901c4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -37,18 +37,6 @@ before_script:
      else streaming=streaming
      fi
      export streaming
- - | # skip cabal test on HEAD due to this bug:
-     # https://github.com/haskell/cabal/issues/1938
-     # this is fine as the test will be run during installation anyway
-     if [ "$CABALVER" = head ]
-     then def_cabal_test='cabal_test() {
-          echo "warning: cabal test skipped due to Cabal bug #1938"
-     }'
-     else def_cabal_test='cabal_test() {
-          cabal test "$@"
-     }'
-     fi
-     export def_cabal_test
  - | # check if '--run-tests' is supported (didn't exist until 1.20);
      # tests must be run prior to install as packages may be broken by install
      if cabal 2>&1 install --run-tests __dummy |
@@ -77,7 +65,6 @@ script:
  - cabal build
  - cabal check
  - cabal sdist
- - eval "$def_cabal_test" &&
-   cabal_test --show-details=$streaming --test-option="+RTS -N2"
+ - cabal test --show-details=$streaming --test-option="+RTS -N2"
  - eval "$def_cabal_install_run_tests" &&
    cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz


From git at git.haskell.org  Fri Dec 18 09:52:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:42 +0000 (UTC)
Subject: [commit: packages/directory] master: Increase num-repeats to increase
 chance of catching bug (3592d2f)
Message-ID: <20151218095242.CAED73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3592d2f9d1444d09f0aaedd54cacb722bf979a9b/directory

>---------------------------------------------------------------

commit 3592d2f9d1444d09f0aaedd54cacb722bf979a9b
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Wed Sep 2 01:43:12 2015 -0400

    Increase num-repeats to increase chance of catching bug


>---------------------------------------------------------------

3592d2f9d1444d09f0aaedd54cacb722bf979a9b
 .travis.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 80d66f1..8b66290 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,15 +30,17 @@ install:
  - ghc --version
 
 before_script:
- - | # check if 'streaming' is supported (didn't exist until 1.20)
+   # check if 'streaming' is supported (didn't exist until 1.20)
+ - |
      if cabal 2>&1 test --show-details=streaming __dummy |
         grep >/dev/null 2>&1 "cabal: --show-details flag expects"
      then streaming=always
      else streaming=streaming
      fi
      export streaming
- - | # check if '--run-tests' is supported (didn't exist until 1.20);
-     # tests must be run prior to install as packages may be broken by install
+   # check if '--run-tests' is supported (didn't exist until 1.20);
+   # tests must be run prior to install as packages may be broken by install
+ - |
      if cabal 2>&1 install --run-tests __dummy |
         grep >/dev/null 2>&1 "cabal: unrecognized option"
      then def_cabal_install_run_tests='cabal_install_run_tests() {
@@ -65,6 +67,8 @@ script:
  - cabal build
  - cabal check
  - cabal sdist
- - cabal test --show-details=$streaming --test-option=+RTS --test-option=-N2
+ - cabal test --show-details=$streaming
+     --test-option=CreateDirectoryIfMissing001.num-repeats=100000
+     --test-option=+RTS --test-option=-N2
  - eval "$def_cabal_install_run_tests" &&
    cabal_install_run_tests --force-reinstalls dist/*-*.tar.gz


From git at git.haskell.org  Fri Dec 18 09:52:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:44 +0000 (UTC)
Subject: [commit: packages/directory] master: Accept InappropriateType in
 CreateDirectoryIfMissing001 races (7fc4aef)
Message-ID: <20151218095244.D13033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7fc4aef33f43153db35de66bad17cc98e1bc7db2/directory

>---------------------------------------------------------------

commit 7fc4aef33f43153db35de66bad17cc98e1bc7db2
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Wed Sep 2 05:26:23 2015 -0400

    Accept InappropriateType in CreateDirectoryIfMissing001 races
    
    For some reason, racing directory creation and removal in
    CreateDirectoryIfMissing001 causes failures due to "InappropriateType"
    (ENOTDIR).  The issue is very perplexing and I've not yet found the
    actual cause.  Here's what I do know:
    
     0. Hasn't occurred until threading was enabled (-threaded; +RTS -N2).
    
     1. Doesn't seem to occur on Travis unless containers are used.
    
     2. I could reproduce it on tmpfs.
    
     3. ENOTDIR can be detected by a simple C program that runs mkdir
        repeatedly while the cabal test is running.  However, I couldn't
        reproduce it using just two C programs, one running mkdir repeatedly
        and another running rmdir repeatedly.
    
     4. Seems to be more likely to occur in older GHC versions.


>---------------------------------------------------------------

7fc4aef33f43153db35de66bad17cc98e1bc7db2
 tests/CreateDirectoryIfMissing001.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/tests/CreateDirectoryIfMissing001.hs b/tests/CreateDirectoryIfMissing001.hs
index c3cb7eb..339585d 100644
--- a/tests/CreateDirectoryIfMissing001.hs
+++ b/tests/CreateDirectoryIfMissing001.hs
@@ -90,7 +90,7 @@ main _t = do
     -- (see bug #2924 on GHC Trac)
     create =
       createDirectoryIfMissing True testdir_a `E.catch` \ e ->
-      if isDoesNotExistError e || isPermissionError e
+      if isDoesNotExistError e || isPermissionError e || isInappropriateTypeError e
       then return ()
       else ioError e
 
@@ -102,7 +102,10 @@ main _t = do
 #ifdef mingw32_HOST_OS
     isNotADirectoryError = isAlreadyExistsError
 #else
-    isNotADirectoryError e = case ioeGetErrorType e of
-      InappropriateType -> True
-      _                 -> False
+    isNotADirectoryError = isInappropriateTypeError
 #endif
+
+    isInappropriateTypeError = isInappropriateTypeErrorType . ioeGetErrorType
+
+    isInappropriateTypeErrorType InappropriateType = True
+    isInappropriateTypeErrorType _                 = False


From git at git.haskell.org  Fri Dec 18 09:52:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:46 +0000 (UTC)
Subject: [commit: packages/directory] master: Changelog fix: 1.2.3.2 never
 happened (ce5ae1f)
Message-ID: <20151218095246.D6E663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ce5ae1f1d8c9d161bb3f55f02ce449bd8e9090ee/directory

>---------------------------------------------------------------

commit ce5ae1f1d8c9d161bb3f55f02ce449bd8e9090ee
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Sep 22 19:31:37 2015 -0400

    Changelog fix: 1.2.3.2 never happened


>---------------------------------------------------------------

ce5ae1f1d8c9d161bb3f55f02ce449bd8e9090ee
 changelog.md | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 85d26be..9de30d9 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,16 +3,14 @@ Changelog for the [`directory`][1] package
 
 ## 1.2.4.0 (September 2015)
 
+  * Work around lack of `#const_str` when cross-compiling
+    ([haskell-cafe](F7D))
+
   * Add `findExecutablesInDirectories`
     ([#33](https://github.com/haskell/directory/pull/33))
 
   * Add `exeExtension`
 
-## 1.2.3.2 (August 2015)
-
-  * Work around lack of `#const_str` when cross-compiling
-    ([haskell-cafe](F7D))
-
 [F7D]: https://mail.haskell.org/pipermail/haskell-cafe/2015-August/120892.html
 
 ## 1.2.3.1 (August 2015)


From git at git.haskell.org  Fri Dec 18 09:52:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:48 +0000 (UTC)
Subject: [commit: packages/directory] master: Add getDirectoryContentsA which
 ignores "." and ".." (07ad46b)
Message-ID: <20151218095248.DE1E43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/07ad46b7da730589eee6edbaf06c3f4f074fda70/directory

>---------------------------------------------------------------

commit 07ad46b7da730589eee6edbaf06c3f4f074fda70
Author: Guillaume Bouchard <guillaum.bouchard at gmail.com>
Date:   Fri Sep 25 22:20:04 2015 +0200

    Add getDirectoryContentsA which ignores "." and ".."


>---------------------------------------------------------------

07ad46b7da730589eee6edbaf06c3f4f074fda70
 System/Directory.hs        | 10 ++++++++++
 tests/GetDirContents001.hs |  2 ++
 2 files changed, 12 insertions(+)

diff --git a/System/Directory.hs b/System/Directory.hs
index a1aa8fb..78a9a1d 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -30,6 +30,7 @@ module System.Directory
     , removeDirectoryRecursive
     , renameDirectory
     , getDirectoryContents
+    , getDirectoryContentsA
     -- ** Current working directory
     , getCurrentDirectory
     , setCurrentDirectory
@@ -1030,6 +1031,15 @@ getDirectoryContents path =
                  -- no need to reverse, ordering is undefined
 #endif /* mingw32 */
 
+{- | A version of 'getDirectoryContents' which returns /almost all/
+entries, ignoring the current and parent directories, @.@ and @.. at .
+
+-}
+getDirectoryContentsA :: FilePath -> IO [FilePath]
+getDirectoryContentsA path =
+  (filter f) <$> (getDirectoryContents path)
+  where f filename = filename /= "." && filename /= ".."
+
 #endif /* __GLASGOW_HASKELL__ */
 
 
diff --git a/tests/GetDirContents001.hs b/tests/GetDirContents001.hs
index aa7d495..f460bb4 100644
--- a/tests/GetDirContents001.hs
+++ b/tests/GetDirContents001.hs
@@ -11,10 +11,12 @@ main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   T(expectEq) () specials . sort =<< getDirectoryContents dir
+  T(expectEq) () [] . sort =<< getDirectoryContentsA dir
   names <- for [1 .. 100 :: Int] $ \ i -> do
     let name = 'f' : show i
     writeFile (dir </> name) ""
     return name
   T(expectEq) () (sort (specials <> names)) . sort =<< getDirectoryContents dir
+  T(expectEq) () (sort (names)) . sort =<< getDirectoryContentsA dir
   where dir      = "dir"
         specials = [".", ".."]


From git at git.haskell.org  Fri Dec 18 09:52:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:50 +0000 (UTC)
Subject: [commit: packages/directory] master: Use getDirectoryContentsA when
 needed (a2e8088)
Message-ID: <20151218095250.E5A463A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a2e8088f7f603dc08bef7adbc20545fabeed51aa/directory

>---------------------------------------------------------------

commit a2e8088f7f603dc08bef7adbc20545fabeed51aa
Author: Guillaume Bouchard <guillaum.bouchard at gmail.com>
Date:   Sat Sep 26 09:25:22 2015 +0200

    Use getDirectoryContentsA when needed


>---------------------------------------------------------------

a2e8088f7f603dc08bef7adbc20545fabeed51aa
 System/Directory.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 78a9a1d..525ac3b 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -572,8 +572,8 @@ removePathRecursive path =
 removeContentsRecursive :: FilePath -> IO ()
 removeContentsRecursive path =
   (`ioeSetLocation` "removeContentsRecursive") `modifyIOError` do
-    cont <- getDirectoryContents path
-    mapM_ removePathRecursive [path </> x | x <- cont, x /= "." && x /= ".."]
+    cont <- getDirectoryContentsA path
+    mapM_ removePathRecursive [path </> x | x <- cont]
     removeDirectory path
 
 #if __GLASGOW_HASKELL__


From git at git.haskell.org  Fri Dec 18 09:52:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:52 +0000 (UTC)
Subject: [commit: packages/directory] master: Simplify tests using
 getDirectoryContentsA (0e7e7a3)
Message-ID: <20151218095252.EC4253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0e7e7a3da429aefab831e6f0c9e98d3948a50879/directory

>---------------------------------------------------------------

commit 0e7e7a3da429aefab831e6f0c9e98d3948a50879
Author: Guillaume Bouchard <guillaum.bouchard at gmail.com>
Date:   Sat Sep 26 09:55:56 2015 +0200

    Simplify tests using getDirectoryContentsA


>---------------------------------------------------------------

0e7e7a3da429aefab831e6f0c9e98d3948a50879
 tests/CopyFile001.hs          | 6 ++----
 tests/CopyFile002.hs          | 6 ++----
 tests/GetDirContents001.hs    | 5 +----
 tests/TestUtils.hs            | 4 ++--
 tests/WithCurrentDirectory.hs | 5 ++---
 5 files changed, 9 insertions(+), 17 deletions(-)

diff --git a/tests/CopyFile001.hs b/tests/CopyFile001.hs
index c354e8d..6ecb706 100644
--- a/tests/CopyFile001.hs
+++ b/tests/CopyFile001.hs
@@ -3,19 +3,17 @@ module CopyFile001 where
 #include "util.inl"
 import System.Directory
 import Data.List (sort)
-import Data.Monoid ((<>))
 import System.FilePath ((</>))
 
 main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   writeFile (dir </> from) contents
-  T(expectEq) () (specials <> [from]) . sort =<< getDirectoryContents dir
+  T(expectEq) () [from] . sort =<< getDirectoryContentsA dir
   copyFile (dir </> from) (dir </> to)
-  T(expectEq) () (specials <> [from, to]) . sort =<< getDirectoryContents dir
+  T(expectEq) () [from, to] . sort =<< getDirectoryContentsA dir
   T(expectEq) () contents =<< readFile (dir </> to)
   where
-    specials = [".", ".."]
     contents = "This is the data\n"
     from     = "source"
     to       = "target"
diff --git a/tests/CopyFile002.hs b/tests/CopyFile002.hs
index 0319637..ea2cd36 100644
--- a/tests/CopyFile002.hs
+++ b/tests/CopyFile002.hs
@@ -3,19 +3,17 @@ module CopyFile002 where
 #include "util.inl"
 import System.Directory
 import Data.List (sort)
-import Data.Monoid ((<>))
 
 main :: TestEnv -> IO ()
 main _t = do
   -- Similar to CopyFile001 but moves a file in the current directory
   -- (Bug #1652 on GHC Trac)
   writeFile from contents
-  T(expectEq) () (specials <> [from]) . sort =<< getDirectoryContents "."
+  T(expectEq) () [from] . sort =<< getDirectoryContentsA "."
   copyFile from to
-  T(expectEq) () (specials <> [from, to]) . sort =<< getDirectoryContents "."
+  T(expectEq) () [from, to] . sort =<< getDirectoryContentsA "."
   T(expectEq) () contents =<< readFile to
   where
-    specials = [".", ".."]
     contents = "This is the data\n"
     from     = "source"
     to       = "target"
diff --git a/tests/GetDirContents001.hs b/tests/GetDirContents001.hs
index f460bb4..b529337 100644
--- a/tests/GetDirContents001.hs
+++ b/tests/GetDirContents001.hs
@@ -10,13 +10,10 @@ import System.FilePath  ((</>))
 main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
-  T(expectEq) () specials . sort =<< getDirectoryContents dir
   T(expectEq) () [] . sort =<< getDirectoryContentsA dir
   names <- for [1 .. 100 :: Int] $ \ i -> do
     let name = 'f' : show i
     writeFile (dir </> name) ""
     return name
-  T(expectEq) () (sort (specials <> names)) . sort =<< getDirectoryContents dir
-  T(expectEq) () (sort (names)) . sort =<< getDirectoryContentsA dir
+  T(expectEq) () (sort names) . sort =<< getDirectoryContentsA dir
   where dir      = "dir"
-        specials = [".", ".."]
diff --git a/tests/TestUtils.hs b/tests/TestUtils.hs
index 795fa09..11a8ea8 100644
--- a/tests/TestUtils.hs
+++ b/tests/TestUtils.hs
@@ -41,10 +41,10 @@ copyPathRecursive source dest =
     dirExists <- doesDirectoryExist source
     if dirExists
       then do
-        contents <- getDirectoryContents source
+        contents <- getDirectoryContentsA source
         createDirectory dest
         mapM_ (uncurry copyPathRecursive)
-          [(source </> x, dest </> x) | x <- contents, x /= "." && x /= ".."]
+          [(source </> x, dest </> x) | x <- contents]
       else copyFile source dest
 
 modifyPermissions :: FilePath -> (Permissions -> Permissions) -> IO ()
diff --git a/tests/WithCurrentDirectory.hs b/tests/WithCurrentDirectory.hs
index 520c363..808d4cf 100644
--- a/tests/WithCurrentDirectory.hs
+++ b/tests/WithCurrentDirectory.hs
@@ -10,17 +10,16 @@ main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   -- Make sure we're starting empty
-  T(expectEq) () specials . sort =<< getDirectoryContents dir
+  T(expectEq) () [] . sort =<< getDirectoryContentsA dir
   cwd <- getCurrentDirectory
   withCurrentDirectory dir (writeFile testfile contents)
   -- Are we still in original directory?
   T(expectEq) () cwd =<< getCurrentDirectory
   -- Did the test file get created?
-  T(expectEq) () (specials <> [testfile]) . sort =<< getDirectoryContents dir
+  T(expectEq) () [testfile] . sort =<< getDirectoryContentsA dir
   -- Does the file contain what we expected to write?
   T(expectEq) () contents =<< readFile (dir </> testfile)
   where
     testfile = "testfile"
     contents = "some data\n"
     dir = "dir"
-    specials = [".", ".."]


From git at git.haskell.org  Fri Dec 18 09:52:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:54 +0000 (UTC)
Subject: [commit: packages/directory] master: Restore tests for
 getDirectoryContents in GetDirContents001 (38f9d57)
Message-ID: <20151218095254.F30B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/38f9d577b153e3e5d6c3cdc8fb6dea4b76998349/directory

>---------------------------------------------------------------

commit 38f9d577b153e3e5d6c3cdc8fb6dea4b76998349
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 3 14:18:10 2015 -0400

    Restore tests for getDirectoryContents in GetDirContents001


>---------------------------------------------------------------

38f9d577b153e3e5d6c3cdc8fb6dea4b76998349
 tests/GetDirContents001.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/GetDirContents001.hs b/tests/GetDirContents001.hs
index b529337..768d79a 100644
--- a/tests/GetDirContents001.hs
+++ b/tests/GetDirContents001.hs
@@ -10,10 +10,13 @@ import System.FilePath  ((</>))
 main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
+  T(expectEq) () specials . sort =<< getDirectoryContents dir
   T(expectEq) () [] . sort =<< getDirectoryContentsA dir
   names <- for [1 .. 100 :: Int] $ \ i -> do
     let name = 'f' : show i
     writeFile (dir </> name) ""
     return name
+  T(expectEq) () (sort (specials <> names)) . sort =<< getDirectoryContents dir
   T(expectEq) () (sort names) . sort =<< getDirectoryContentsA dir
   where dir      = "dir"
+        specials = [".", ".."]


From git at git.haskell.org  Fri Dec 18 09:52:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:57 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove unnecessary Monoid import
 in WithCurrentDirectory test (4aae747)
Message-ID: <20151218095257.045F53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4aae7470b2719407e61920d119410e911daad686/directory

>---------------------------------------------------------------

commit 4aae7470b2719407e61920d119410e911daad686
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 3 14:19:08 2015 -0400

    Remove unnecessary Monoid import in WithCurrentDirectory test


>---------------------------------------------------------------

4aae7470b2719407e61920d119410e911daad686
 tests/WithCurrentDirectory.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/tests/WithCurrentDirectory.hs b/tests/WithCurrentDirectory.hs
index 808d4cf..7389f6c 100644
--- a/tests/WithCurrentDirectory.hs
+++ b/tests/WithCurrentDirectory.hs
@@ -1,7 +1,6 @@
 {-# LANGUAGE CPP #-}
 module WithCurrentDirectory where
 #include "util.inl"
-import Data.Monoid ((<>))
 import Data.List (sort)
 import System.Directory
 import System.FilePath ((</>))


From git at git.haskell.org  Fri Dec 18 09:52:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:52:59 +0000 (UTC)
Subject: [commit: packages/directory] master: Update changelog for
 getDirectoryContentsA (05f3629)
Message-ID: <20151218095259.0A4E33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/05f36295c42a96dc4eab0cc8ba20f7d91703051c/directory

>---------------------------------------------------------------

commit 05f36295c42a96dc4eab0cc8ba20f7d91703051c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 3 14:22:28 2015 -0400

    Update changelog for getDirectoryContentsA


>---------------------------------------------------------------

05f36295c42a96dc4eab0cc8ba20f7d91703051c
 changelog.md    | 5 +++++
 directory.cabal | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 9de30d9..7a2e36d 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,11 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
+## 1.2.5.0 (October 2015)
+
+  * Add `getDirectoryContentsA`, which leaves out `.` and `..`
+    ([#36](https://github.com/haskell/directory/pull/36))
+
 ## 1.2.4.0 (September 2015)
 
   * Work around lack of `#const_str` when cross-compiling
diff --git a/directory.cabal b/directory.cabal
index 3ffb2ca..415e36a 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -1,5 +1,5 @@
 name:           directory
-version:        1.2.4.0
+version:        1.2.5.0
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Fri Dec 18 09:53:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:01 +0000 (UTC)
Subject: [commit: packages/directory] master: Minor tweaks to documentation
 about special directories (69532e2)
Message-ID: <20151218095301.11A253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/69532e291bd233f61af21b62676253fcdcc46ce2/directory

>---------------------------------------------------------------

commit 69532e291bd233f61af21b62676253fcdcc46ce2
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 3 14:24:17 2015 -0400

    Minor tweaks to documentation about special directories


>---------------------------------------------------------------

69532e291bd233f61af21b62676253fcdcc46ce2
 System/Directory.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 525ac3b..0cd3d10 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -177,8 +177,8 @@ win32_fILE_SHARE_DELETE   = 0x00000004
 A directory contains a series of entries, each of which is a named
 reference to a file system object (file, directory etc.).  Some
 entries may be hidden, inaccessible, or have some administrative
-function (e.g. `.' or `..' under POSIX
-<http://www.opengroup.org/onlinepubs/009695399/>), but in
+function (e.g. @.@ or @..@ under
+<http://www.opengroup.org/onlinepubs/009695399 POSIX>), but in
 this standard all such entries are considered to form part of the
 directory contents. Entries in sub-directories are not, however,
 considered to form part of the directory contents.
@@ -965,7 +965,7 @@ findFilesWith f (d:ds) fileName = do
 
 #ifdef __GLASGOW_HASKELL__
 {- |@'getDirectoryContents' dir@ returns a list of /all/ entries
-in /dir/.
+in /dir/, including @.@ and @..@ (even on Windows).
 
 The operation may fail with:
 


From git at git.haskell.org  Fri Dec 18 09:53:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:03 +0000 (UTC)
Subject: [commit: packages/directory] master: Emphasize the more useful
 variant of getDirectoryContents (02b1f45)
Message-ID: <20151218095303.17F2D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/02b1f4524cc52df780ca62ef0ef26ac4ab3d81c8/directory

>---------------------------------------------------------------

commit 02b1f4524cc52df780ca62ef0ef26ac4ab3d81c8
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 10 20:36:20 2015 -0400

    Emphasize the more useful variant of getDirectoryContents


>---------------------------------------------------------------

02b1f4524cc52df780ca62ef0ef26ac4ab3d81c8
 System/Directory.hs | 70 ++++++++++++++++++++++++++---------------------------
 1 file changed, 34 insertions(+), 36 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 0cd3d10..8f4dc36 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -29,8 +29,8 @@ module System.Directory
     , removeDirectory
     , removeDirectoryRecursive
     , renameDirectory
-    , getDirectoryContents
     , getDirectoryContentsA
+    , getDirectoryContents
     -- ** Current working directory
     , getCurrentDirectory
     , setCurrentDirectory
@@ -964,37 +964,8 @@ findFilesWith f (d:ds) fileName = do
         else findFilesWith f ds fileName
 
 #ifdef __GLASGOW_HASKELL__
-{- |@'getDirectoryContents' dir@ returns a list of /all/ entries
-in /dir/, including @.@ and @..@ (even on Windows).
-
-The operation may fail with:
-
-* 'HardwareFault'
-A physical I\/O error has occurred.
-@[EIO]@
-
-* 'InvalidArgument'
-The operand is not a valid directory name.
-@[ENAMETOOLONG, ELOOP]@
-
-* 'isDoesNotExistError' \/ 'NoSuchThing'
-The directory does not exist.
-@[ENOENT, ENOTDIR]@
-
-* 'isPermissionError' \/ 'PermissionDenied'
-The process has insufficient privileges to perform the operation.
-@[EACCES]@
-
-* 'ResourceExhausted'
-Insufficient resources are available to perform the operation.
-@[EMFILE, ENFILE]@
-
-* 'InappropriateType'
-The path refers to an existing non-directory object.
-@[ENOTDIR]@
-
--}
-
+-- | Similar to 'getDirectoryContentsA', but always includes the special entries (@.@
+-- and @..@).  (This applies to Windows as well.)
 getDirectoryContents :: FilePath -> IO [FilePath]
 getDirectoryContents path =
   modifyIOError ((`ioeSetFileName` path) .
@@ -1031,10 +1002,37 @@ getDirectoryContents path =
                  -- no need to reverse, ordering is undefined
 #endif /* mingw32 */
 
-{- | A version of 'getDirectoryContents' which returns /almost all/
-entries, ignoring the current and parent directories, @.@ and @.. at .
-
--}
+-- | @'getDirectoryContentsA' dir@ returns a list of /all/ entries in /dir/ without
+-- the special entries (@.@ and @..@).
+--
+-- The operation may fail with:
+--
+-- * 'HardwareFault'
+--   A physical I\/O error has occurred.
+--   @[EIO]@
+--
+-- * 'InvalidArgument'
+--   The operand is not a valid directory name.
+--   @[ENAMETOOLONG, ELOOP]@
+--
+-- * 'isDoesNotExistError' \/ 'NoSuchThing'
+--   The directory does not exist.
+--   @[ENOENT, ENOTDIR]@
+--
+-- * 'isPermissionError' \/ 'PermissionDenied'
+--   The process has insufficient privileges to perform the operation.
+--   @[EACCES]@
+--
+-- * 'ResourceExhausted'
+--   Insufficient resources are available to perform the operation.
+--   @[EMFILE, ENFILE]@
+--
+-- * 'InappropriateType'
+--   The path refers to an existing non-directory object.
+--   @[ENOTDIR]@
+--
+-- @since 1.2.5.0
+--
 getDirectoryContentsA :: FilePath -> IO [FilePath]
 getDirectoryContentsA path =
   (filter f) <$> (getDirectoryContents path)


From git at git.haskell.org  Fri Dec 18 09:53:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:05 +0000 (UTC)
Subject: [commit: packages/directory] master: Rename getDirectoryContentsA to
 listDirectory (91062ae)
Message-ID: <20151218095305.1E8693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/91062ae0aab4fc3c7ca7e725912fc46833e9681c/directory

>---------------------------------------------------------------

commit 91062ae0aab4fc3c7ca7e725912fc46833e9681c
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sat Oct 10 20:29:20 2015 -0400

    Rename getDirectoryContentsA to listDirectory
    
    Rationale:
    
      - Name is shorter and more familiar (most users don't need
        getDirectoryContents).
      - The 'A' suffix doesn't really fit within the existing conventions,
        nor is it clear what it means.


>---------------------------------------------------------------

91062ae0aab4fc3c7ca7e725912fc46833e9681c
 System/Directory.hs           | 12 ++++++------
 changelog.md                  |  3 ++-
 tests/CopyFile001.hs          |  4 ++--
 tests/CopyFile002.hs          |  4 ++--
 tests/GetDirContents001.hs    |  4 ++--
 tests/TestUtils.hs            |  2 +-
 tests/WithCurrentDirectory.hs |  4 ++--
 7 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/System/Directory.hs b/System/Directory.hs
index 8f4dc36..511b7c4 100644
--- a/System/Directory.hs
+++ b/System/Directory.hs
@@ -29,7 +29,7 @@ module System.Directory
     , removeDirectory
     , removeDirectoryRecursive
     , renameDirectory
-    , getDirectoryContentsA
+    , listDirectory
     , getDirectoryContents
     -- ** Current working directory
     , getCurrentDirectory
@@ -572,7 +572,7 @@ removePathRecursive path =
 removeContentsRecursive :: FilePath -> IO ()
 removeContentsRecursive path =
   (`ioeSetLocation` "removeContentsRecursive") `modifyIOError` do
-    cont <- getDirectoryContentsA path
+    cont <- listDirectory path
     mapM_ removePathRecursive [path </> x | x <- cont]
     removeDirectory path
 
@@ -964,7 +964,7 @@ findFilesWith f (d:ds) fileName = do
         else findFilesWith f ds fileName
 
 #ifdef __GLASGOW_HASKELL__
--- | Similar to 'getDirectoryContentsA', but always includes the special entries (@.@
+-- | Similar to 'listDirectory', but always includes the special entries (@.@
 -- and @..@).  (This applies to Windows as well.)
 getDirectoryContents :: FilePath -> IO [FilePath]
 getDirectoryContents path =
@@ -1002,7 +1002,7 @@ getDirectoryContents path =
                  -- no need to reverse, ordering is undefined
 #endif /* mingw32 */
 
--- | @'getDirectoryContentsA' dir@ returns a list of /all/ entries in /dir/ without
+-- | @'listDirectory' dir@ returns a list of /all/ entries in /dir/ without
 -- the special entries (@.@ and @..@).
 --
 -- The operation may fail with:
@@ -1033,8 +1033,8 @@ getDirectoryContents path =
 --
 -- @since 1.2.5.0
 --
-getDirectoryContentsA :: FilePath -> IO [FilePath]
-getDirectoryContentsA path =
+listDirectory :: FilePath -> IO [FilePath]
+listDirectory path =
   (filter f) <$> (getDirectoryContents path)
   where f filename = filename /= "." && filename /= ".."
 
diff --git a/changelog.md b/changelog.md
index 7a2e36d..8b90f78 100644
--- a/changelog.md
+++ b/changelog.md
@@ -3,7 +3,8 @@ Changelog for the [`directory`][1] package
 
 ## 1.2.5.0 (October 2015)
 
-  * Add `getDirectoryContentsA`, which leaves out `.` and `..`
+  * Add `listDirectory`, which is similar to `getDirectoryContents` but leaves
+    out `.` and `..`
     ([#36](https://github.com/haskell/directory/pull/36))
 
 ## 1.2.4.0 (September 2015)
diff --git a/tests/CopyFile001.hs b/tests/CopyFile001.hs
index 6ecb706..55df9ce 100644
--- a/tests/CopyFile001.hs
+++ b/tests/CopyFile001.hs
@@ -9,9 +9,9 @@ main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   writeFile (dir </> from) contents
-  T(expectEq) () [from] . sort =<< getDirectoryContentsA dir
+  T(expectEq) () [from] . sort =<< listDirectory dir
   copyFile (dir </> from) (dir </> to)
-  T(expectEq) () [from, to] . sort =<< getDirectoryContentsA dir
+  T(expectEq) () [from, to] . sort =<< listDirectory dir
   T(expectEq) () contents =<< readFile (dir </> to)
   where
     contents = "This is the data\n"
diff --git a/tests/CopyFile002.hs b/tests/CopyFile002.hs
index ea2cd36..66bd64a 100644
--- a/tests/CopyFile002.hs
+++ b/tests/CopyFile002.hs
@@ -9,9 +9,9 @@ main _t = do
   -- Similar to CopyFile001 but moves a file in the current directory
   -- (Bug #1652 on GHC Trac)
   writeFile from contents
-  T(expectEq) () [from] . sort =<< getDirectoryContentsA "."
+  T(expectEq) () [from] . sort =<< listDirectory "."
   copyFile from to
-  T(expectEq) () [from, to] . sort =<< getDirectoryContentsA "."
+  T(expectEq) () [from, to] . sort =<< listDirectory "."
   T(expectEq) () contents =<< readFile to
   where
     contents = "This is the data\n"
diff --git a/tests/GetDirContents001.hs b/tests/GetDirContents001.hs
index 768d79a..b70104b 100644
--- a/tests/GetDirContents001.hs
+++ b/tests/GetDirContents001.hs
@@ -11,12 +11,12 @@ main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   T(expectEq) () specials . sort =<< getDirectoryContents dir
-  T(expectEq) () [] . sort =<< getDirectoryContentsA dir
+  T(expectEq) () [] . sort =<< listDirectory dir
   names <- for [1 .. 100 :: Int] $ \ i -> do
     let name = 'f' : show i
     writeFile (dir </> name) ""
     return name
   T(expectEq) () (sort (specials <> names)) . sort =<< getDirectoryContents dir
-  T(expectEq) () (sort names) . sort =<< getDirectoryContentsA dir
+  T(expectEq) () (sort names) . sort =<< listDirectory dir
   where dir      = "dir"
         specials = [".", ".."]
diff --git a/tests/TestUtils.hs b/tests/TestUtils.hs
index 11a8ea8..b04cbb0 100644
--- a/tests/TestUtils.hs
+++ b/tests/TestUtils.hs
@@ -41,7 +41,7 @@ copyPathRecursive source dest =
     dirExists <- doesDirectoryExist source
     if dirExists
       then do
-        contents <- getDirectoryContentsA source
+        contents <- listDirectory source
         createDirectory dest
         mapM_ (uncurry copyPathRecursive)
           [(source </> x, dest </> x) | x <- contents]
diff --git a/tests/WithCurrentDirectory.hs b/tests/WithCurrentDirectory.hs
index 7389f6c..2f9c04a 100644
--- a/tests/WithCurrentDirectory.hs
+++ b/tests/WithCurrentDirectory.hs
@@ -9,13 +9,13 @@ main :: TestEnv -> IO ()
 main _t = do
   createDirectory dir
   -- Make sure we're starting empty
-  T(expectEq) () [] . sort =<< getDirectoryContentsA dir
+  T(expectEq) () [] . sort =<< listDirectory dir
   cwd <- getCurrentDirectory
   withCurrentDirectory dir (writeFile testfile contents)
   -- Are we still in original directory?
   T(expectEq) () cwd =<< getCurrentDirectory
   -- Did the test file get created?
-  T(expectEq) () [testfile] . sort =<< getDirectoryContentsA dir
+  T(expectEq) () [testfile] . sort =<< listDirectory dir
   -- Does the file contain what we expected to write?
   T(expectEq) () contents =<< readFile (dir </> testfile)
   where


From git at git.haskell.org  Fri Dec 18 09:53:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:07 +0000 (UTC)
Subject: [commit: packages/directory] master: Relax upper bound on `base` to
 allow base-4.9 (a7a5b0b)
Message-ID: <20151218095307.255E23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a7a5b0b738aad432a9cad512a26d7564120ef0e8/directory

>---------------------------------------------------------------

commit a7a5b0b738aad432a9cad512a26d7564120ef0e8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 09:25:40 2015 +0100

    Relax upper bound on `base` to allow base-4.9
    
    GHC 8.0 is going to bundle `base-4.9.0.0`


>---------------------------------------------------------------

a7a5b0b738aad432a9cad512a26d7564120ef0e8
 directory.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/directory.cabal b/directory.cabal
index 415e36a..30fcce8 100644
--- a/directory.cabal
+++ b/directory.cabal
@@ -59,7 +59,7 @@ Library
         HsDirectory.h
 
     build-depends:
-        base     >= 4.5 && < 4.9,
+        base     >= 4.5 && < 4.10,
         time     >= 1.4 && < 1.6,
         filepath >= 1.3 && < 1.5
     if os(windows)


From git at git.haskell.org  Fri Dec 18 09:53:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:09 +0000 (UTC)
Subject: [commit: packages/directory] master: Include "Set filename in
 IOErrors from file time functions" in changelog (6e04fad)
Message-ID: <20151218095309.2B6803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6e04fadc728b707beb756e7031bb463dca6c67b1/directory

>---------------------------------------------------------------

commit 6e04fadc728b707beb756e7031bb463dca6c67b1
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Nov 3 17:44:38 2015 +0800

    Include "Set filename in IOErrors from file time functions" in changelog
    
    as the changes made in commit 5f431e0905acb7e5d1c02beea0eefad94829645e
    were not previously mentioned in the changelog.
    
    See: https://github.com/haskell/directory/issues/38


>---------------------------------------------------------------

6e04fadc728b707beb756e7031bb463dca6c67b1
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.md b/changelog.md
index 8b90f78..2bfeb7a 100644
--- a/changelog.md
+++ b/changelog.md
@@ -34,6 +34,8 @@ Changelog for the [`directory`][1] package
 
   * Implement `getAccessTime` and `setAccessTime`
 
+  * Set the filename in IO errors from the file time functions
+
   * Fix `canonicalizePath` so that it always returns a reasonable result even
     if the path is inaccessible and will not throw exceptions unless the
     current directory cannot be obtained


From git at git.haskell.org  Fri Dec 18 09:53:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:11 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove obsolete `--with-cc` flag
 from configure.ac (298529b)
Message-ID: <20151218095311.31BC33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/298529bf8adc38ed602eab300c63bbc68510e5a3/directory

>---------------------------------------------------------------

commit 298529bf8adc38ed602eab300c63bbc68510e5a3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 14 07:58:30 2015 +0100

    Remove obsolete `--with-cc` flag from configure.ac
    
    This non-standard flag was used previously by GHC's build-system to set the `CC` variable.
    
    See https://phabricator.haskell.org/D1608 for more details


>---------------------------------------------------------------

298529bf8adc38ed602eab300c63bbc68510e5a3
 configure.ac | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 448e7b2..a620ec4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -16,14 +16,11 @@ set_with_gcc() {
     esac
 }
 
-# inherit the C compiler from Cabal but allow it to be overridden by --with-cc
-# because Cabal puts its own flags at the end
+# Legacy support for setting the C compiler with Cabal<1.24
+# Newer versions use Autoconf's native `CC=...` facility
 AC_ARG_WITH([gcc],
             [C compiler],
             [set_with_gcc])
-AC_ARG_WITH([cc],
-            [C compiler],
-            [CC=$withval])
 # avoid warnings when run via Cabal
 AC_ARG_WITH([compiler],
             [GHC compiler],


From git at git.haskell.org  Fri Dec 18 09:53:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:13 +0000 (UTC)
Subject: [commit: packages/directory] master: Add missing import on Windows in
 CreateDirectoryIfMissing001 (865b0f4)
Message-ID: <20151218095313.3759D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/865b0f4b92e2c18ecb346a15c71f99698022d11e/directory

>---------------------------------------------------------------

commit 865b0f4b92e2c18ecb346a15c71f99698022d11e
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Oct 11 00:16:10 2015 -0400

    Add missing import on Windows in CreateDirectoryIfMissing001


>---------------------------------------------------------------

865b0f4b92e2c18ecb346a15c71f99698022d11e
 tests/CreateDirectoryIfMissing001.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/CreateDirectoryIfMissing001.hs b/tests/CreateDirectoryIfMissing001.hs
index 339585d..bfa7089 100644
--- a/tests/CreateDirectoryIfMissing001.hs
+++ b/tests/CreateDirectoryIfMissing001.hs
@@ -6,13 +6,10 @@ import Control.Concurrent (forkIO, newEmptyMVar, putMVar, takeMVar)
 import qualified Control.Exception as E
 import Control.Monad (replicateM_)
 import Data.Monoid ((<>))
-import System.FilePath ((</>), addTrailingPathSeparator)
-import System.IO.Error(isAlreadyExistsError, isDoesNotExistError,
-                       isPermissionError)
-#ifndef mingw32_HOST_OS
 import GHC.IO.Exception (IOErrorType(InappropriateType))
-import System.IO.Error(ioeGetErrorType)
-#endif
+import System.FilePath ((</>), addTrailingPathSeparator)
+import System.IO.Error (ioeGetErrorType, isAlreadyExistsError,
+                        isDoesNotExistError, isPermissionError)
 
 main :: TestEnv -> IO ()
 main _t = do


From git at git.haskell.org  Fri Dec 18 09:53:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:15 +0000 (UTC)
Subject: [commit: packages/directory] master: Use createDirectoryIfMissing in
 test/Util.hs to avoid silly errors (73d1ef0)
Message-ID: <20151218095315.3DE4E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/73d1ef0602e7389c7c28773df0e63fff90cf1762/directory

>---------------------------------------------------------------

commit 73d1ef0602e7389c7c28773df0e63fff90cf1762
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Oct 11 03:50:31 2015 -0400

    Use createDirectoryIfMissing in test/Util.hs to avoid silly errors
    
    It seems that 'stack' does not use nor create the 'dist' directory, so
    we have to do this ourselves.


>---------------------------------------------------------------

73d1ef0602e7389c7c28773df0e63fff90cf1762
 tests/Util.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Util.hs b/tests/Util.hs
index 2ef5ec0..ca4a448 100644
--- a/tests/Util.hs
+++ b/tests/Util.hs
@@ -16,7 +16,7 @@ import Control.Concurrent.MVar (newEmptyMVar, putMVar, readMVar)
 import Control.Exception (SomeException, bracket_, catch,
                           mask, onException, try)
 import Control.Monad (Monad(..), unless, when)
-import System.Directory (createDirectory, makeAbsolute,
+import System.Directory (createDirectoryIfMissing, makeAbsolute,
                          removeDirectoryRecursive, withCurrentDirectory)
 import System.Environment (getArgs)
 import System.Exit (exitFailure)
@@ -134,7 +134,7 @@ expectIOErrorType t file line context which action = do
 withNewDirectory :: Bool -> FilePath -> IO a -> IO a
 withNewDirectory keep dir action = do
   dir' <- makeAbsolute dir
-  bracket_ (createDirectory dir') (cleanup dir') action
+  bracket_ (createDirectoryIfMissing True dir') (cleanup dir') action
   where cleanup dir' | keep      = return ()
                      | otherwise = removeDirectoryRecursive dir'
 


From git at git.haskell.org  Fri Dec 18 09:53:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:17 +0000 (UTC)
Subject: [commit: packages/directory] master: Revert "Stop ignoring Travis
 failures on HEAD" (89ae0b7)
Message-ID: <20151218095317.437963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/89ae0b7c11eb330f33bb30448747569cdfe8d9db/directory

>---------------------------------------------------------------

commit 89ae0b7c11eb330f33bb30448747569cdfe8d9db
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Dec 8 17:29:33 2015 -0500

    Revert "Stop ignoring Travis failures on HEAD"
    
    This reverts commit 64fe7187c31eea99402187455f0fdc6d601dbf84.
    
    Allow failures again because HEAD Cabal has been buggy for a long time.


>---------------------------------------------------------------

89ae0b7c11eb330f33bb30448747569cdfe8d9db
 .travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 8b66290..9a98189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,6 +19,8 @@ matrix:
      addons: {apt: {packages: [cabal-install-1.22,ghc-7.10.1], sources: [hvr-ghc]}}
    - env: GHCVER=head CABALVER=head
      addons: {apt: {packages: [cabal-install-head,ghc-head], sources: [hvr-ghc]}}
+  allow_failures:
+   - env: GHCVER=head CABALVER=head
 
 before_install:
  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH


From git at git.haskell.org  Fri Dec 18 09:53:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:19 +0000 (UTC)
Subject: [commit: packages/directory] master: Remove unnecessary polymorphism
 on c_AT_FDCWD (95ee8ec)
Message-ID: <20151218095319.4AFDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/95ee8ecea7ca852d8707b47de5201bf154c1eae8/directory

>---------------------------------------------------------------

commit 95ee8ecea7ca852d8707b47de5201bf154c1eae8
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Sun Nov 22 09:20:34 2015 -0500

    Remove unnecessary polymorphism on c_AT_FDCWD
    
    Should fix the new GHC warning about it not being INLINABLE.


>---------------------------------------------------------------

95ee8ecea7ca852d8707b47de5201bf154c1eae8
 System/Directory/Internal/C_utimensat.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Directory/Internal/C_utimensat.hsc b/System/Directory/Internal/C_utimensat.hsc
index d1775fb..cc3295b 100644
--- a/System/Directory/Internal/C_utimensat.hsc
+++ b/System/Directory/Internal/C_utimensat.hsc
@@ -30,7 +30,7 @@ instance Storable CTimeSpec where
       nsec <- #{peek struct timespec, tv_nsec} p
       return (CTimeSpec sec nsec)
 
-c_AT_FDCWD :: Integral a => a
+c_AT_FDCWD :: CInt
 c_AT_FDCWD = (#const AT_FDCWD)
 
 utimeOmit :: CTimeSpec


From git at git.haskell.org  Fri Dec 18 09:53:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:53:21 +0000 (UTC)
Subject: [commit: packages/directory] master: Add --with-cc change to
 changelog (4dcb287)
Message-ID: <20151218095321.50EFC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/directory

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4dcb2873166558575fe70142da87952bd558f943/directory

>---------------------------------------------------------------

commit 4dcb2873166558575fe70142da87952bd558f943
Author: Phil Ruffwind <rf at rufflewind.com>
Date:   Tue Dec 15 02:58:48 2015 -0500

    Add --with-cc change to changelog


>---------------------------------------------------------------

4dcb2873166558575fe70142da87952bd558f943
 changelog.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 2bfeb7a..13b6af3 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,12 +1,15 @@
 Changelog for the [`directory`][1] package
 ==========================================
 
-## 1.2.5.0 (October 2015)
+## 1.2.5.0 (December 2015)
 
-  * Add `listDirectory`, which is similar to `getDirectoryContents` but leaves
-    out `.` and `..`
+  * Add `listDirectory`, which is similar to `getDirectoryContents`
+    but omits `.` and `..`
     ([#36](https://github.com/haskell/directory/pull/36))
 
+  * Remove support for `--with-cc=` in `configure`; use the `CC=` flag instead
+    ([ghc:D1608](https://phabricator.haskell.org/D1608))
+
 ## 1.2.4.0 (September 2015)
 
   * Work around lack of `#const_str` when cross-compiling


From git at git.haskell.org  Fri Dec 18 09:56:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 09:56:20 +0000 (UTC)
Subject: [commit: ghc] master: Fix PowerPC build (ba80fc6)
Message-ID: <20151218095620.B391A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ba80fc6ac51fe46cc51c77c5f6d2a23af335c180/ghc

>---------------------------------------------------------------

commit ba80fc6ac51fe46cc51c77c5f6d2a23af335c180
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Dec 18 20:21:19 2015 +1100

    Fix PowerPC build
    
    Summary:
    Replace incorrect `ppc_HOST_ARCH` with `powerpc_HOST_ARCH`.
    
    Test Plan: Build on PowerPC
    
    Reviewers: hvr, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1651


>---------------------------------------------------------------

ba80fc6ac51fe46cc51c77c5f6d2a23af335c180
 libraries/ghci/GHCi/InfoTable.hsc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index 1a1116f..c32f3a4 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -63,7 +63,7 @@ platform :: Arch
 platform =
 #if defined(sparc_HOST_ARCH)
        ArchSparc
-#elif defined(ppc_HOST_ARCH)
+#elif defined(powerpc_HOST_ARCH)
        ArchPPC
 #elif defined(x86_HOST_ARCH)
        ArchX86


From git at git.haskell.org  Fri Dec 18 10:30:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 10:30:21 +0000 (UTC)
Subject: [commit: ghc] master: Update directory submodule to v1.2.5.0 release
 (55e9ab8)
Message-ID: <20151218103021.2FA713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/55e9ab80bd066cdffa3ed7a7f418f983a8e87716/ghc

>---------------------------------------------------------------

commit 55e9ab80bd066cdffa3ed7a7f418f983a8e87716
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 10:53:17 2015 +0100

    Update directory submodule to v1.2.5.0 release
    
    This is the designated release to go with GHC 8.0.1


>---------------------------------------------------------------

55e9ab80bd066cdffa3ed7a7f418f983a8e87716
 libraries/directory | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/directory b/libraries/directory
index 298529b..4dcb287 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 298529bf8adc38ed602eab300c63bbc68510e5a3
+Subproject commit 4dcb2873166558575fe70142da87952bd558f943


From git at git.haskell.org  Fri Dec 18 10:57:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 10:57:47 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (83e4140)
Message-ID: <20151218105747.BF6B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/83e4140ab36cc9fd31f6006d5731231f838d0df0/ghc

>---------------------------------------------------------------

commit 83e4140ab36cc9fd31f6006d5731231f838d0df0
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 18 08:50:37 2015 +0000

    Comments only


>---------------------------------------------------------------

83e4140ab36cc9fd31f6006d5731231f838d0df0
 compiler/prelude/TysPrim.hs | 38 +++++++++++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 11 deletions(-)

diff --git a/compiler/prelude/TysPrim.hs b/compiler/prelude/TysPrim.hs
index 3fabb3f..a4715df 100644
--- a/compiler/prelude/TysPrim.hs
+++ b/compiler/prelude/TysPrim.hs
@@ -454,9 +454,9 @@ GHC sports a veritable menagerie of equality types:
   ~           homo      lifted      Constraint   nominal   Data.Type.Equality
   :~:         homo      lifted      *            nominal   Data.Type.Equality
 
-  ~R#         hetero    unlifted    #            repr.     GHC.Prim
-  Coercible   homo      lifted      Constraint   repr.     GHC.Types
-  Coercion    homo      lifted      *            repr.     Data.Type.Coercion
+  ~R#         hetero    unlifted    #            repr      GHC.Prim
+  Coercible   homo      lifted      Constraint   repr      GHC.Types
+  Coercion    homo      lifted      *            repr      Data.Type.Coercion
 
   ~P#         hetero    unlifted                 phantom   GHC.Prim
 
@@ -471,7 +471,9 @@ error messages, and (~R#) is rendered as Coercible.
 
 Let's take these one at a time:
 
-(~#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
+    (~#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
 This is The Type Of Equality in GHC. It classifies nominal coercions.
 This type is used in the solver for recording equality constraints.
 It responds "yes" to Type.isEqPred and classifies as an EqPred in
@@ -485,7 +487,9 @@ equality constraints are deferred.
 Within GHC, ~# is called eqPrimTyCon, and it is defined in TysPrim.
 
 
-(~~) :: forall k1 k2. k1 -> k2 -> Constraint
+    --------------------------
+    (~~) :: forall k1 k2. k1 -> k2 -> Constraint
+    --------------------------
 This is (almost) an ordinary class, defined as if by
   class a ~# b => a ~~ b
   instance a ~# b => a ~~ b
@@ -516,7 +520,9 @@ in Haskell.
 Within GHC, ~~ is called heqTyCon, and it is defined in TysWiredIn.
 
 
-(~) :: forall k. k -> k -> Constraint
+    --------------------------
+    (~) :: forall k. k -> k -> Constraint
+    --------------------------
 This is defined in Data.Type.Equality:
   class a ~~ b => (a :: k) ~ (b :: k)
   instance a ~~ b => a ~ b
@@ -534,12 +540,16 @@ Within GHC, ~ is called eqTyCon, and it is defined in PrelNames. Note that
 it is *not* wired in.
 
 
-(:~:) :: forall k. k -> k -> *
+    --------------------------
+    (:~:) :: forall k. k -> k -> *
+    --------------------------
 This is a perfectly ordinary GADT, wrapping (~). It is not defined within
 GHC at all.
 
 
-(~R#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
+    (~R#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
 The is the representational analogue of ~#. This is the type of representational
 equalities that the solver works on. All wanted constraints of this type are
 built with coercion holes.
@@ -547,7 +557,9 @@ built with coercion holes.
 Within GHC, ~R# is called eqReprPrimTyCon, and it is defined in TysPrim.
 
 
-Coercible :: forall k. k -> k -> Constraint
+    --------------------------
+    Coercible :: forall k. k -> k -> Constraint
+    --------------------------
 This is quite like (~~) in the way it's defined and treated within GHC, but
 it's homogeneous. Homogeneity helps with type inference (as GHC can solve one
 kind from the other) and, in my (Richard's) estimation, will be more intuitive
@@ -563,12 +575,16 @@ Within GHC, Coercible is called coercibleTyCon, and it is defined in
 TysWiredIn.
 
 
-Coercion :: forall k. k -> k -> *
+    --------------------------
+    Coercion :: forall k. k -> k -> *
+    --------------------------
 This is a perfectly ordinary GADT, wrapping Coercible. It is not defined
 within GHC at all.
 
 
-(~P#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
+    (~P#) :: forall k1 k2. k1 -> k2 -> #
+    --------------------------
 This is the phantom analogue of ~# and it is barely used at all.
 (The solver has no idea about this one.) Here is the motivation:
 


From git at git.haskell.org  Fri Dec 18 11:56:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 11:56:58 +0000 (UTC)
Subject: [commit: ghc] master: Update Win32 submodule to fix 77b7f24543f
 fallout (ed3bfca)
Message-ID: <20151218115658.DB53C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed3bfca27c8b5a639875a803c7c86b75d70420ff/ghc

>---------------------------------------------------------------

commit ed3bfca27c8b5a639875a803c7c86b75d70420ff
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 12:56:38 2015 +0100

    Update Win32 submodule to fix 77b7f24543f fallout
    
    Turns out Win32 wasn't de-tabbed yet... sigh...
    
    [skip ci]


>---------------------------------------------------------------

ed3bfca27c8b5a639875a803c7c86b75d70420ff
 libraries/Win32 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Win32 b/libraries/Win32
index 3b573ee..fec966e6 160000
--- a/libraries/Win32
+++ b/libraries/Win32
@@ -1 +1 @@
-Subproject commit 3b573ee058560d1199a19efab10c016278dff252
+Subproject commit fec966e6d77a5e7f4a586de6096954137a1fe914


From git at git.haskell.org  Fri Dec 18 12:31:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 12:31:36 +0000 (UTC)
Subject: [commit: ghc] master: GHCi.Run: Remove redundant language pragma
 (8946ee6)
Message-ID: <20151218123136.42C143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8946ee6de770411f185007a2853c290a9a021638/ghc

>---------------------------------------------------------------

commit 8946ee6de770411f185007a2853c290a9a021638
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 18 11:56:37 2015 +0100

    GHCi.Run: Remove redundant language pragma


>---------------------------------------------------------------

8946ee6de770411f185007a2853c290a9a021638
 libraries/ghci/GHCi/Run.hs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libraries/ghci/GHCi/Run.hs b/libraries/ghci/GHCi/Run.hs
index 69f82db..fc142a2 100644
--- a/libraries/ghci/GHCi/Run.hs
+++ b/libraries/ghci/GHCi/Run.hs
@@ -1,5 +1,4 @@
-{-# LANGUAGE GADTs, RecordWildCards, UnboxedTuples, MagicHash,
-    ScopedTypeVariables #-}
+{-# LANGUAGE GADTs, RecordWildCards, MagicHash, ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 -- |


From git at git.haskell.org  Fri Dec 18 12:31:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 12:31:38 +0000 (UTC)
Subject: [commit: ghc] master: configure.ac: Rename shake/ to build/ (53a567c)
Message-ID: <20151218123138.D5F4D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/53a567c59f497d1af0ed5cc3c235c71701ed8cea/ghc

>---------------------------------------------------------------

commit 53a567c59f497d1af0ed5cc3c235c71701ed8cea
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 18 11:57:52 2015 +0100

    configure.ac: Rename shake/ to build/
    
    See https://github.com/snowleopard/shaking-up-ghc/pull/2


>---------------------------------------------------------------

53a567c59f497d1af0ed5cc3c235c71701ed8cea
 configure.ac | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0f335a4..d1f8115 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1098,9 +1098,11 @@ if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
    AC_MSG_ERROR([compiler/ghc.cabal.in contains tab characters; please remove them])
 fi
 
-if test -e shake/cfg/system.config.in; then
-    AC_CONFIG_FILES([shake/cfg/system.config])
+# Create the configuration for the Shake-based build system if it is present
+if test -e build/cfg/system.config.in; then
+    AC_CONFIG_FILES([build/cfg/system.config])
 fi
+
 AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])
 AC_OUTPUT
 


From git at git.haskell.org  Fri Dec 18 14:55:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 14:55:08 +0000 (UTC)
Subject: [commit: ghc] master: configure.ac: Rename build/ to shake-build/
 (f857d27)
Message-ID: <20151218145508.E95EC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f857d27affd545cf9a55de69c7147204c046cb8d/ghc

>---------------------------------------------------------------

commit f857d27affd545cf9a55de69c7147204c046cb8d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 18 13:33:42 2015 +0100

    configure.ac: Rename build/ to shake-build/
    
    Last naming change... I promise.


>---------------------------------------------------------------

f857d27affd545cf9a55de69c7147204c046cb8d
 configure.ac | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index d1f8115..69cdd2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1099,8 +1099,8 @@ if grep '	' compiler/ghc.cabal.in 2>&1 >/dev/null; then
 fi
 
 # Create the configuration for the Shake-based build system if it is present
-if test -e build/cfg/system.config.in; then
-    AC_CONFIG_FILES([build/cfg/system.config])
+if test -e shake-build/cfg/system.config.in; then
+    AC_CONFIG_FILES([shake-build/cfg/system.config])
 fi
 
 AC_CONFIG_FILES([mk/config.mk mk/install.mk mk/project.mk compiler/ghc.cabal ghc/ghc-bin.cabal utils/runghc/runghc.cabal settings docs/users_guide/ghc_config.py docs/index.html libraries/prologue.txt distrib/configure.ac])


From git at git.haskell.org  Fri Dec 18 15:38:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 15:38:56 +0000 (UTC)
Subject: [commit: ghc] master: Test Trac #11248, #11249 (9d921d6)
Message-ID: <20151218153856.D40563A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9d921d6bfeec8320f7ad5e4532bf4edadc7f92cd/ghc

>---------------------------------------------------------------

commit 9d921d6bfeec8320f7ad5e4532bf4edadc7f92cd
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 18 15:30:45 2015 +0000

    Test Trac #11248, #11249


>---------------------------------------------------------------

9d921d6bfeec8320f7ad5e4532bf4edadc7f92cd
 testsuite/tests/polykinds/T11248.hs | 43 +++++++++++++++++++++++++++++++++++++
 testsuite/tests/polykinds/T11249.hs | 40 ++++++++++++++++++++++++++++++++++
 testsuite/tests/polykinds/all.T     |  3 +++
 3 files changed, 86 insertions(+)

diff --git a/testsuite/tests/polykinds/T11248.hs b/testsuite/tests/polykinds/T11248.hs
new file mode 100644
index 0000000..e1c8fcc
--- /dev/null
+++ b/testsuite/tests/polykinds/T11248.hs
@@ -0,0 +1,43 @@
+{-# LANGUAGE DataKinds, TypeOperators, TypeFamilies,
+             KindSignatures, ConstraintKinds #-}
+
+module T11248 where
+
+import GHC.TypeLits
+
+type a / b = FDiv a b
+type a ** b = FMul a b
+
+type family FDiv a b where
+  FDiv 11648 128 = 91
+
+type family FMul a b where
+  FMul 64 91 = 5824
+
+type family FGCD a b where
+  FGCD 128 448 = 64
+  FGCD 128 5824 = 64
+
+type family FLCM a b where
+  FLCM 128 5824 = 11648
+
+data CT (m :: Nat) (m' :: Nat)
+type H0 = 128
+type H1 = 448
+type H0' = 11648
+type H1' = 5824
+
+main' = let x = undefined :: CT H0 H0'
+        in foo x :: CT H1 H1'
+
+foo x = bug x
+
+type Ctx2 e r s e' r' =
+  (e ~ FGCD r e', r' ~ FLCM r e', e ~ FGCD r s)
+
+type Ctx1 e r s e' r' =
+  (Ctx2 e r s e' r', e' ~ (e ** (r' / r)))
+
+bug :: (Ctx1 e r s e' r')
+  => CT r r' -> CT s s'
+bug = undefined
diff --git a/testsuite/tests/polykinds/T11249.hs b/testsuite/tests/polykinds/T11249.hs
new file mode 100644
index 0000000..7bc9d4f
--- /dev/null
+++ b/testsuite/tests/polykinds/T11249.hs
@@ -0,0 +1,40 @@
+{-# LANGUAGE DataKinds, TypeOperators, TypeFamilies,
+             KindSignatures, ConstraintKinds #-}
+
+module T11249 where
+
+import GHC.TypeLits
+
+type a / b = FDiv a b
+type a ** b = FMul a b
+
+type family FDiv a b where
+  FDiv 11648 128 = 91
+
+type family FMul a b where
+  FMul 64 91 = 5824
+
+type family FGCD a b where
+  FGCD 128 448 = 64
+  FGCD 128 5824 = 64
+
+type family FLCM a b where
+  FLCM 128 5824 = 11648
+
+data CT (m :: Nat) (m' :: Nat)
+type H0 = 128
+type H1 = 448
+type H0' = 11648
+type H1' = 5824
+
+main' = let x = undefined :: CT H0 H0'
+        in foo x :: CT H1 H1'
+
+foo x = bug x
+
+type Ctx2 e r s e' r' =
+  (e ~ FGCD r e', r' ~ FLCM r e', e ~ FGCD r s)
+
+bug :: (Ctx2 e r s e' r', e' ~ (e ** (FDiv r' r)))
+  => CT r r' -> CT s s'
+bug = undefined
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index d0aa124..fd7b216 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -127,3 +127,6 @@ test('T11142', normal, compile_fail, [''])
 test('SigTvKinds', normal, compile, [''])
 test('SigTvKinds2', expect_broken(11203), compile_fail, [''])
 test('T9017', normal, compile_fail, [''])
+test('T11249', normal, compile, [''])
+test('T11248', normal, compile, [''])
+


From git at git.haskell.org  Fri Dec 18 15:38:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 15:38:59 +0000 (UTC)
Subject: [commit: ghc] master: tcCheckSatisfiability: less aggressive
 superclass expansion (ff752a1)
Message-ID: <20151218153859.CE83F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff752a1a5eb69955c0e4fda8647f495409a2c384/ghc

>---------------------------------------------------------------

commit ff752a1a5eb69955c0e4fda8647f495409a2c384
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Fri Dec 18 15:34:17 2015 +0000

    tcCheckSatisfiability: less aggressive superclass expansion
    
    In the pattern-match check we are looking for a proof of
    *unsatisfiablity* among a bunch of givens.  The unsat-ness might be
    hidden in the superclasses, so we must expand them.  But in the common
    case where the constraints are satisfiable, we don't want to expand
    a recursive superclass forever.
    
    This is all a bit arbitrary, but then the whole question is
    undecidable anyway.
    
    The bug in Trac #10592 comment:12 was that I expanded superclasses
    forever.  This patch fixes it.


>---------------------------------------------------------------

ff752a1a5eb69955c0e4fda8647f495409a2c384
 compiler/typecheck/TcSimplify.hs                   |  54 +++++++---
 testsuite/tests/pmcheck/should_compile/T3927b.hs   |   3 +
 testsuite/tests/typecheck/should_compile/T10592.hs | 119 +++++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |   1 +
 4 files changed, 161 insertions(+), 16 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ff752a1a5eb69955c0e4fda8647f495409a2c384

From git at git.haskell.org  Fri Dec 18 17:33:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 17:33:24 +0000 (UTC)
Subject: [commit: ghc] master: SrcLoc: Eliminate constructors of RealSrcSpan
 (987426c)
Message-ID: <20151218173324.E6A293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/987426c04fdea33d9e02c2a195d6885248b77574/ghc

>---------------------------------------------------------------

commit 987426c04fdea33d9e02c2a195d6885248b77574
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 18 17:21:22 2015 +0100

    SrcLoc: Eliminate constructors of RealSrcSpan
    
    This type is occurs very often but previously had multiple, meaning it
    could not be unboxed. Even worse, these constructors didn't offer any
    compelling safety benefits. Thankfully, the type is abstract, so
    changing the representation to be a single-constructor type was quite
    straightforward.
    
    Reviewers: austin
    
    Subscribers: alanz, thomie, hvr
    
    Differential Revision: https://phabricator.haskell.org/D1657


>---------------------------------------------------------------

987426c04fdea33d9e02c2a195d6885248b77574
 compiler/basicTypes/SrcLoc.hs | 95 ++++++++++++++++++-------------------------
 1 file changed, 40 insertions(+), 55 deletions(-)

diff --git a/compiler/basicTypes/SrcLoc.hs b/compiler/basicTypes/SrcLoc.hs
index e171e70..524da78 100644
--- a/compiler/basicTypes/SrcLoc.hs
+++ b/compiler/basicTypes/SrcLoc.hs
@@ -240,7 +240,7 @@ instance Data SrcSpan where
 -}
 
 {- |
-A SrcSpan delimits a portion of a text file.  It could be represented
+A 'RealSrcSpan' delimits a portion of a text file.  It could be represented
 by a pair of (line,column) coordinates, but in fact we optimise
 slightly by using more compact representations for single-line and
 zero-length spans, both of which are quite common.
@@ -250,28 +250,17 @@ span.  That is, a span of (1,1)-(1,2) is one character long, and a
 span of (1,1)-(1,1) is zero characters long.
 -}
 data RealSrcSpan
-  = SrcSpanOneLine              -- a common case: a single line
-        { srcSpanFile     :: !FastString,
-          srcSpanLine     :: {-# UNPACK #-} !Int,
-          srcSpanSCol     :: {-# UNPACK #-} !Int,
-          srcSpanECol     :: {-# UNPACK #-} !Int
-        }
-
-  | SrcSpanMultiLine
+  = RealSrcSpan'
         { srcSpanFile     :: !FastString,
           srcSpanSLine    :: {-# UNPACK #-} !Int,
           srcSpanSCol     :: {-# UNPACK #-} !Int,
           srcSpanELine    :: {-# UNPACK #-} !Int,
           srcSpanECol     :: {-# UNPACK #-} !Int
         }
-
-  | SrcSpanPoint
-        { srcSpanFile     :: !FastString,
-          srcSpanLine     :: {-# UNPACK #-} !Int,
-          srcSpanCol      :: {-# UNPACK #-} !Int
-        }
   deriving (Eq, Typeable)
 
+-- | A 'SrcSpan' identifies either a specific portion of a text file
+-- or a human-readable description of a location.
 data SrcSpan =
     RealSrcSpan !RealSrcSpan
   | UnhelpfulSpan !FastString   -- Just a general indication
@@ -296,15 +285,11 @@ srcLocSpan (UnhelpfulLoc str) = UnhelpfulSpan str
 srcLocSpan (RealSrcLoc l) = RealSrcSpan (realSrcLocSpan l)
 
 realSrcLocSpan :: RealSrcLoc -> RealSrcSpan
-realSrcLocSpan (SrcLoc file line col) = SrcSpanPoint file line col
+realSrcLocSpan (SrcLoc file line col) = RealSrcSpan' file line col line col
 
 -- | Create a 'SrcSpan' between two points in a file
 mkRealSrcSpan :: RealSrcLoc -> RealSrcLoc -> RealSrcSpan
-mkRealSrcSpan loc1 loc2
-  | line1 == line2 = if col1 == col2
-                        then SrcSpanPoint file line1 col1
-                        else SrcSpanOneLine file line1 col1 col2
-  | otherwise      = SrcSpanMultiLine file line1 col1 line2 col2
+mkRealSrcSpan loc1 loc2 = RealSrcSpan' file line1 col1 line2 col2
   where
         line1 = srcLocLine loc1
         line2 = srcLocLine loc2
@@ -312,6 +297,16 @@ mkRealSrcSpan loc1 loc2
         col2 = srcLocCol loc2
         file = srcLocFile loc1
 
+-- | 'True' if the span is known to straddle only one line.
+isOneLineRealSpan :: RealSrcSpan -> Bool
+isOneLineRealSpan (RealSrcSpan' _ line1 _ line2 _)
+  = line1 == line2
+
+-- | 'True' if the span is a single point
+isPointRealSpan :: RealSrcSpan -> Bool
+isPointRealSpan (RealSrcSpan' _ line1 col1 line2 col2)
+  = line1 == line2 && col1 == col2
+
 -- | Create a 'SrcSpan' between two points in a file
 mkSrcSpan :: SrcLoc -> SrcLoc -> SrcSpan
 mkSrcSpan (UnhelpfulLoc str) _ = UnhelpfulSpan str
@@ -331,11 +326,7 @@ combineSrcSpans (RealSrcSpan span1) (RealSrcSpan span2)
 -- within both spans. Assumes the "file" part is the same in both inputs
 combineRealSrcSpans :: RealSrcSpan -> RealSrcSpan -> RealSrcSpan
 combineRealSrcSpans span1 span2
- = if line_start == line_end
-   then if col_start == col_end
-        then SrcSpanPoint     file line_start col_start
-        else SrcSpanOneLine   file line_start col_start col_end
-   else      SrcSpanMultiLine file line_start col_start line_end col_end
+  = RealSrcSpan' file line_start col_start line_end col_end
   where
     (line_start, col_start) = min (srcSpanStartLine span1, srcSpanStartCol span1)
                                   (srcSpanStartLine span2, srcSpanStartCol span2)
@@ -392,21 +383,10 @@ srcSpanEndLine :: RealSrcSpan -> Int
 srcSpanStartCol :: RealSrcSpan -> Int
 srcSpanEndCol :: RealSrcSpan -> Int
 
-srcSpanStartLine SrcSpanOneLine{ srcSpanLine=l } = l
-srcSpanStartLine SrcSpanMultiLine{ srcSpanSLine=l } = l
-srcSpanStartLine SrcSpanPoint{ srcSpanLine=l } = l
-
-srcSpanEndLine SrcSpanOneLine{ srcSpanLine=l } = l
-srcSpanEndLine SrcSpanMultiLine{ srcSpanELine=l } = l
-srcSpanEndLine SrcSpanPoint{ srcSpanLine=l } = l
-
-srcSpanStartCol SrcSpanOneLine{ srcSpanSCol=l } = l
-srcSpanStartCol SrcSpanMultiLine{ srcSpanSCol=l } = l
-srcSpanStartCol SrcSpanPoint{ srcSpanCol=l } = l
-
-srcSpanEndCol SrcSpanOneLine{ srcSpanECol=c } = c
-srcSpanEndCol SrcSpanMultiLine{ srcSpanECol=c } = c
-srcSpanEndCol SrcSpanPoint{ srcSpanCol=c } = c
+srcSpanStartLine RealSrcSpan'{ srcSpanSLine=l } = l
+srcSpanEndLine RealSrcSpan'{ srcSpanELine=l } = l
+srcSpanStartCol RealSrcSpan'{ srcSpanSCol=l } = l
+srcSpanEndCol RealSrcSpan'{ srcSpanECol=c } = c
 
 {-
 ************************************************************************
@@ -462,14 +442,17 @@ instance Show RealSrcLoc where
 
 -- Show is used by Lexer.x, because we derive Show for Token
 instance Show RealSrcSpan where
-  show (SrcSpanOneLine file l sc ec)
+  show span@(RealSrcSpan' file sl sc el ec)
+    | isPointRealSpan span
+    = "SrcSpanPoint " ++ show file ++ " " ++ intercalate " " (map show [sl,sc])
+
+    | isOneLineRealSpan span
     = "SrcSpanOneLine " ++ show file ++ " "
-                        ++ intercalate " " (map show [l,sc,ec])
-  show (SrcSpanMultiLine file sl sc el ec)
+                        ++ intercalate " " (map show [sl,sc,ec])
+
+    | otherwise
     = "SrcSpanMultiLine " ++ show file ++ " "
                           ++ intercalate " " (map show [sl,sc,el,ec])
-  show (SrcSpanPoint file l c)
-    = "SrcSpanPoint " ++ show file ++ " " ++ intercalate " " (map show [l,c])
 
 
 instance Outputable RealSrcSpan where
@@ -500,15 +483,22 @@ pprUserSpan _         (UnhelpfulSpan s) = ftext s
 pprUserSpan show_path (RealSrcSpan s)   = pprUserRealSpan show_path s
 
 pprUserRealSpan :: Bool -> RealSrcSpan -> SDoc
-pprUserRealSpan show_path (SrcSpanOneLine src_path line start_col end_col)
+pprUserRealSpan show_path span@(RealSrcSpan' src_path line col _ _)
+  | isPointRealSpan span
   = hcat [ ppWhen show_path (pprFastFilePath src_path <> colon)
          , int line <> colon
-         , int start_col
-         , ppUnless (end_col - start_col <= 1) (char '-' <> int (end_col - 1)) ]
+         , int col ]
+
+pprUserRealSpan show_path span@(RealSrcSpan' src_path line scol _ ecol)
+  | isOneLineRealSpan span
+  = hcat [ ppWhen show_path (pprFastFilePath src_path <> colon)
+         , int line <> colon
+         , int scol
+         , ppUnless (ecol - scol <= 1) (char '-' <> int (ecol - 1)) ]
             -- For single-character or point spans, we just
             -- output the starting column number
 
-pprUserRealSpan show_path (SrcSpanMultiLine src_path sline scol eline ecol)
+pprUserRealSpan show_path (RealSrcSpan' src_path sline scol eline ecol)
   = hcat [ ppWhen show_path (pprFastFilePath src_path <> colon)
          , parens (int sline <> comma <> int scol)
          , char '-'
@@ -516,11 +506,6 @@ pprUserRealSpan show_path (SrcSpanMultiLine src_path sline scol eline ecol)
  where
    ecol' = if ecol == 0 then ecol else ecol - 1
 
-pprUserRealSpan show_path (SrcSpanPoint src_path line col)
-  = hcat [ ppWhen show_path (pprFastFilePath src_path <> colon)
-         , int line <> colon
-         , int col ]
-
 {-
 ************************************************************************
 *                                                                      *


From git at git.haskell.org  Fri Dec 18 17:33:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 17:33:28 +0000 (UTC)
Subject: [commit: ghc] master: Add test for T11122 (d6b91ea)
Message-ID: <20151218173328.3ABC43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d6b91ea62e974969f203857deaa60f743e42513a/ghc

>---------------------------------------------------------------

commit d6b91ea62e974969f203857deaa60f743e42513a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 18 17:22:15 2015 +0100

    Add test for T11122
    
    Test Plan: validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1655
    
    GHC Trac Issues: #11122


>---------------------------------------------------------------

d6b91ea62e974969f203857deaa60f743e42513a
 testsuite/tests/partial-sigs/should_fail/T11122.hs | 28 ++++++++++++++++++++++
 .../tests/partial-sigs/should_fail/T11122.stderr   |  7 ++++++
 testsuite/tests/partial-sigs/should_fail/all.T     |  2 +-
 3 files changed, 36 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/partial-sigs/should_fail/T11122.hs b/testsuite/tests/partial-sigs/should_fail/T11122.hs
new file mode 100644
index 0000000..5cf104d
--- /dev/null
+++ b/testsuite/tests/partial-sigs/should_fail/T11122.hs
@@ -0,0 +1,28 @@
+{-# LANGUAGE NoMonomorphismRestriction #-}
+{-# LANGUAGE PartialTypeSignatures #-}
+
+module T11122 where
+
+data Parser a
+
+instance Functor Parser where
+  fmap = undefined
+
+many p = undefined
+
+digit = undefined
+
+parseTest = undefined
+
+--------------------------------------------
+
+parser :: Parser _
+--parser :: Parser Int
+parser = read <$> many digit
+
+data Wrapper = Wrapper Int deriving Show
+
+wrapperParser = Wrapper <$> parser
+
+main :: IO ()
+main = parseTest wrapperParser "0"
diff --git a/testsuite/tests/partial-sigs/should_fail/T11122.stderr b/testsuite/tests/partial-sigs/should_fail/T11122.stderr
new file mode 100644
index 0000000..57a74f9
--- /dev/null
+++ b/testsuite/tests/partial-sigs/should_fail/T11122.stderr
@@ -0,0 +1,7 @@
+
+T11122.hs:19:18: warning:
+    ? Found type wildcard ?_? standing for ?Int?
+    ? In the type signature:
+        parser :: Parser _
+    ? Relevant bindings include
+        parser :: Parser Int (bound at T11122.hs:21:1)
diff --git a/testsuite/tests/partial-sigs/should_fail/all.T b/testsuite/tests/partial-sigs/should_fail/all.T
index dbbe946..2cb65f0 100644
--- a/testsuite/tests/partial-sigs/should_fail/all.T
+++ b/testsuite/tests/partial-sigs/should_fail/all.T
@@ -60,4 +60,4 @@ test('WildcardInTypeSynonymRHS', normal, compile_fail, [''])
 test('T10615', normal, compile_fail, [''])
 test('T10045', normal, compile_fail, [''])
 test('T10999', normal, compile_fail, [''])
-
+test('T11122', normal, compile, [''])
\ No newline at end of file


From git at git.haskell.org  Fri Dec 18 17:33:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 17:33:30 +0000 (UTC)
Subject: [commit: ghc] master: ghc.cabal: Backpack directory no longer exists
 (4198b81)
Message-ID: <20151218173330.E07463A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4198b81488c300a52c9d60d3740a9d3b738e3ac9/ghc

>---------------------------------------------------------------

commit 4198b81488c300a52c9d60d3740a9d3b738e3ac9
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Fri Dec 18 17:22:39 2015 +0100

    ghc.cabal: Backpack directory no longer exists
    
    Reviewers: austin
    
    Subscribers: thomie, ezyang
    
    Differential Revision: https://phabricator.haskell.org/D1653


>---------------------------------------------------------------

4198b81488c300a52c9d60d3740a9d3b738e3ac9
 compiler/ghc.cabal.in | 1 -
 1 file changed, 1 deletion(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index fc81942..e816133 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -128,7 +128,6 @@ Library
         cbits/genSym.c
 
     hs-source-dirs:
-        backpack
         basicTypes
         cmm
         codeGen


From git at git.haskell.org  Fri Dec 18 17:41:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 17:41:27 +0000 (UTC)
Subject: [commit: ghc] master: LLVM backend: Show expected LLVM version in
 warnings/errors (0e9a331)
Message-ID: <20151218174127.1F9DE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0e9a331f25c89c6150a43d7d5d27ef5cb6e057ec/ghc

>---------------------------------------------------------------

commit 0e9a331f25c89c6150a43d7d5d27ef5cb6e057ec
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Fri Dec 18 12:21:47 2015 -0500

    LLVM backend: Show expected LLVM version in warnings/errors
    
    Summary:
    Before:
    
        [1 of 1] Compiling Main             ( Main.hs, Main.o )
        You are using a new version of LLVM that hasn't been tested yet!
        We will try though...
    
    After:
    
        [1 of 1] Compiling Main             ( Main.hs, Main.o )
        You are using an unsupported version of LLVM!
        Currently only 3.7 is supported.
        We will try though...
    
    Before:
    
        [1 of 1] Compiling Main             ( Main.hs, Main.o )
    
        <no location info>:
            Warning: Couldn't figure out LLVM version!
                     Make sure you have installed LLVM
        ghc: could not execute: opt
    
    After:
    
        [1 of 1] Compiling Main             ( Main.hs, Main.o )
    
        <no location info>: error:
            Warning: Couldn't figure out LLVM version!
                     Make sure you have installed LLVM 3.7
        ghc-stage1: could not execute: opt
    
    Reviewers: austin, rwbarton, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1658


>---------------------------------------------------------------

0e9a331f25c89c6150a43d7d5d27ef5cb6e057ec
 compiler/llvmGen/LlvmCodeGen.hs      | 3 +++
 compiler/llvmGen/LlvmCodeGen/Base.hs | 5 ++++-
 compiler/main/SysTools.hs            | 5 ++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/compiler/llvmGen/LlvmCodeGen.hs b/compiler/llvmGen/LlvmCodeGen.hs
index 3453484..3c63aa0 100644
--- a/compiler/llvmGen/LlvmCodeGen.hs
+++ b/compiler/llvmGen/LlvmCodeGen.hs
@@ -54,6 +54,9 @@ llvmCodeGen dflags h us cmm_stream
        let doWarn = wopt Opt_WarnUnsupportedLlvmVersion dflags
        when (ver /= supportedLlvmVersion && doWarn) $
            putMsg dflags (text "You are using an unsupported version of LLVM!"
+                            $+$ text ("Currently only " ++
+                                      llvmVersionStr supportedLlvmVersion ++
+                                      " is supported.")
                             $+$ text "We will try though...")
 
        -- run code generation
diff --git a/compiler/llvmGen/LlvmCodeGen/Base.hs b/compiler/llvmGen/LlvmCodeGen/Base.hs
index 3367cda..82c1eea 100644
--- a/compiler/llvmGen/LlvmCodeGen/Base.hs
+++ b/compiler/llvmGen/LlvmCodeGen/Base.hs
@@ -12,7 +12,7 @@ module LlvmCodeGen.Base (
         LiveGlobalRegs,
         LlvmUnresData, LlvmData, UnresLabel, UnresStatic,
 
-        LlvmVersion, supportedLlvmVersion,
+        LlvmVersion, supportedLlvmVersion, llvmVersionStr,
 
         LlvmM,
         runLlvm, liftStream, withClearVars, varLookup, varInsert,
@@ -184,6 +184,9 @@ type LlvmVersion = (Int, Int)
 supportedLlvmVersion :: LlvmVersion
 supportedLlvmVersion = sUPPORTED_LLVM_VERSION
 
+llvmVersionStr :: LlvmVersion -> String
+llvmVersionStr (major, minor) = show major ++ "." ++ show minor
+
 -- ----------------------------------------------------------------------------
 -- * Environment Handling
 --
diff --git a/compiler/main/SysTools.hs b/compiler/main/SysTools.hs
index c7ca4a6..4166b9b 100644
--- a/compiler/main/SysTools.hs
+++ b/compiler/main/SysTools.hs
@@ -66,6 +66,8 @@ import Util
 import DynFlags
 import Exception
 
+import LlvmCodeGen.Base (llvmVersionStr, supportedLlvmVersion)
+
 import Data.IORef
 import Control.Monad
 import System.Exit
@@ -653,7 +655,8 @@ figureLlvmVersion dflags = do
                 errorMsg dflags $ vcat
                     [ text "Warning:", nest 9 $
                           text "Couldn't figure out LLVM version!" $$
-                          text "Make sure you have installed LLVM"]
+                          text ("Make sure you have installed LLVM " ++
+                                llvmVersionStr supportedLlvmVersion) ]
                 return Nothing)
   return ver
 


From git at git.haskell.org  Fri Dec 18 21:12:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:12:51 +0000 (UTC)
Subject: [commit: ghc] master: Fix build for AArch64/Arm64 (e02a4c2)
Message-ID: <20151218211251.AAFF93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e02a4c2733df16bfb822a117af00598293cf886e/ghc

>---------------------------------------------------------------

commit e02a4c2733df16bfb822a117af00598293cf886e
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Dec 18 22:07:43 2015 +1100

    Fix build for AArch64/Arm64
    
    Test Plan: Build an AArch64 cross compiler.
    
    Reviewers: hvr, bgamari, austin
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1654


>---------------------------------------------------------------

e02a4c2733df16bfb822a117af00598293cf886e
 libraries/ghci/GHCi/InfoTable.hsc | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index c32f3a4..c3e20f5 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -57,6 +57,7 @@ funPtrToInt :: FunPtr a -> Int
 funPtrToInt (FunPtr a) = I## (addr2Int## a)
 
 data Arch = ArchSPARC | ArchPPC | ArchX86 | ArchX86_64 | ArchAlpha | ArchARM
+          | ArchARM64
  deriving Show
 
 platform :: Arch
@@ -73,6 +74,10 @@ platform =
        ArchAlpha
 #elif defined(arm_HOST_ARCH)
        ArchARM
+#elif defined(aarch64_HOST_ARCH)
+       ArchARM64
+#else
+#error Unknown architecture
 #endif
 
 mkJumpToAddr :: EntryFunPtr -> ItblCodes
@@ -176,6 +181,22 @@ mkJumpToAddr a = case platform of
                 , 0x11, 0xff, 0x2f, 0xe1
                 , byte0 w32, byte1 w32, byte2 w32, byte3 w32]
 
+    ArchARM64 { } ->
+        -- Generates:
+        --
+        --      ldr     x1, label
+        --      br      x1
+        -- label:
+        --      .quad <addr>
+        --
+        -- which looks like:
+        --     0:       58000041        ldr     x1, <label>
+        --     4:       d61f0020        br      x1
+       let w64 = fromIntegral (funPtrToInt a) :: Word64
+       in Right [ 0x58000041
+                , 0xd61f0020
+                , fromIntegral w64
+                , fromIntegral (w64 `shiftR` 32) ]
 
 byte0 :: (Integral w) => w -> Word8
 byte0 w = fromIntegral w


From git at git.haskell.org  Fri Dec 18 21:50:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:50:38 +0000 (UTC)
Subject: [commit: packages/terminfo] master: Bump version to 0.4.0.2. (55bc3f9)
Message-ID: <20151218215038.0F2D43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/55bc3f91e3cf819695fccb936e021766de9eaf3f

>---------------------------------------------------------------

commit 55bc3f91e3cf819695fccb936e021766de9eaf3f
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Nov 30 20:00:38 2015 -0800

    Bump version to 0.4.0.2.


>---------------------------------------------------------------

55bc3f91e3cf819695fccb936e021766de9eaf3f
 terminfo.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/terminfo.cabal b/terminfo.cabal
index 6cf69bf..2dfbee9 100644
--- a/terminfo.cabal
+++ b/terminfo.cabal
@@ -1,6 +1,6 @@
 Name:           terminfo
 Cabal-Version:  >=1.10
-Version:        0.4.0.1
+Version:        0.4.0.2
 Category:       User Interfaces
 License:        BSD3
 License-File:   LICENSE


From git at git.haskell.org  Fri Dec 18 21:50:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:50:40 +0000 (UTC)
Subject: [commit: packages/terminfo] master: Use set_curterm instead of
 peek/poking curterm directly. (9645504)
Message-ID: <20151218215040.137B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/96455041834b54f86482741d940a7941c53cd01e

>---------------------------------------------------------------

commit 96455041834b54f86482741d940a7941c53cd01e
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Mon Nov 30 23:28:27 2015 -0800

    Use set_curterm instead of peek/poking curterm directly.
    
    This fixes the build of GHC on openSUSE, which builds ncurses in "threaded"
    mode.  (Threaded ncurses hides the cur_term global from use).
    
    Patch originally by Scott Bahling <sbahling at suse.com>.
    
    We also mark set_cuterm as an "unsafe" FFI call since this change may cause
    it to be called more often.


>---------------------------------------------------------------

96455041834b54f86482741d940a7941c53cd01e
 System/Console/Terminfo/Base.hs | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/System/Console/Terminfo/Base.hs b/System/Console/Terminfo/Base.hs
index 1f60679..719bb65 100644
--- a/System/Console/Terminfo/Base.hs
+++ b/System/Console/Terminfo/Base.hs
@@ -63,8 +63,8 @@ import Data.Typeable
 data TERMINAL
 newtype Terminal = Terminal (ForeignPtr TERMINAL)
 
-foreign import ccall "&" cur_term :: Ptr (Ptr TERMINAL)
-foreign import ccall set_curterm :: Ptr TERMINAL -> IO (Ptr TERMINAL)
+-- Use "unsafe" to make set_curterm faster since it's called quite a bit.
+foreign import ccall unsafe set_curterm :: Ptr TERMINAL -> IO (Ptr TERMINAL)
 foreign import ccall "&" del_curterm :: FunPtr (Ptr TERMINAL -> IO ())
 
 foreign import ccall setupterm :: CString -> CInt -> Ptr CInt -> IO ()
@@ -73,19 +73,15 @@ foreign import ccall setupterm :: CString -> CInt -> Ptr CInt -> IO ()
 -- 
 -- Throws a 'SetupTermError' if the terminfo database could not be read.
 setupTerm :: String -> IO Terminal
-setupTerm term = bracket (peek cur_term) (poke cur_term) $ \_ -> 
+setupTerm term =
     withCString term $ \c_term ->
     with 0 $ \ret_ptr -> do
         -- NOTE: I believe that for the way we use terminfo
         -- (i.e. custom output function)
         -- this parameter does not affect anything.
         let stdOutput = 1
-        {-- Force ncurses to return a new struct rather than
-        a copy of the current one (which it would do if the
-        terminal names are the same).  This prevents problems
-        when calling del_term on a struct shared by more than one
-        Terminal. --}
-        poke cur_term nullPtr
+        -- Save the previous terminal to be restored after calling setupterm.
+        old_term <- set_curterm nullPtr
         -- Call setupterm and check the return value.
         setupterm c_term stdOutput ret_ptr
         ret <- peek ret_ptr
@@ -93,7 +89,7 @@ setupTerm term = bracket (peek cur_term) (poke cur_term) $ \_ ->
             then throwIO $ SetupTermError
                 $ "Couldn't look up terminfo entry " ++ show term
             else do
-                cterm <- peek cur_term
+                cterm <- set_curterm old_term
                 fmap Terminal $ newForeignPtr del_curterm cterm
 
 data SetupTermError = SetupTermError String
@@ -120,14 +116,10 @@ setupTermFromEnv = do
 -- TODO: this isn't really thread-safe...
 withCurTerm :: Terminal -> IO a -> IO a
 withCurTerm (Terminal term) f = withForeignPtr term $ \cterm -> do
-        old_term <- peek cur_term
-        if old_term /= cterm
-            then do
-                    _ <- set_curterm cterm
-                    x <- f
-                    _ <- set_curterm old_term
-                    return x
-            else f
+        old_term <- set_curterm cterm
+        x <- f
+        set_curterm old_term
+        return x
 
 
 ----------------------


From git at git.haskell.org  Fri Dec 18 21:50:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:50:42 +0000 (UTC)
Subject: [commit: packages/terminfo] master: Clean up some warnings from the
 set_curterm patch (140ca44)
Message-ID: <20151218215042.180853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

On branch  : master
Link       : http://git.haskell.org/packages/terminfo.git/commitdiff/140ca44db6fc734cfc0388e82f9e5270f31475d8

>---------------------------------------------------------------

commit 140ca44db6fc734cfc0388e82f9e5270f31475d8
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Fri Dec 18 11:07:56 2015 -0800

    Clean up some warnings from the set_curterm patch


>---------------------------------------------------------------

140ca44db6fc734cfc0388e82f9e5270f31475d8
 System/Console/Terminfo/Base.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/Console/Terminfo/Base.hs b/System/Console/Terminfo/Base.hs
index 719bb65..d2b262c 100644
--- a/System/Console/Terminfo/Base.hs
+++ b/System/Console/Terminfo/Base.hs
@@ -52,7 +52,7 @@ import Foreign.C
 import Foreign.ForeignPtr
 import Foreign.Ptr
 import Foreign.Marshal
-import Foreign.Storable (peek,poke)
+import Foreign.Storable (peek)
 import System.Environment (getEnv)
 import System.IO.Unsafe (unsafePerformIO)
 import System.IO
@@ -118,7 +118,7 @@ withCurTerm :: Terminal -> IO a -> IO a
 withCurTerm (Terminal term) f = withForeignPtr term $ \cterm -> do
         old_term <- set_curterm cterm
         x <- f
-        set_curterm old_term
+        _ <- set_curterm old_term
         return x
 
 


From git at git.haskell.org  Fri Dec 18 21:50:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:50:50 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Bump version to 0.7.2.2.
 (edae6ee)
Message-ID: <20151218215050.3CC3D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/edae6ee788d4c31059463c4cdb5b2007955a4a8b

>---------------------------------------------------------------

commit edae6ee788d4c31059463c4cdb5b2007955a4a8b
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Fri Dec 18 11:12:07 2015 -0800

    Bump version to 0.7.2.2.


>---------------------------------------------------------------

edae6ee788d4c31059463c4cdb5b2007955a4a8b
 haskeline.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/haskeline.cabal b/haskeline.cabal
index 508312b..7402b6d 100644
--- a/haskeline.cabal
+++ b/haskeline.cabal
@@ -1,6 +1,6 @@
 Name:           haskeline
 Cabal-Version:  >=1.10
-Version:        0.7.2.1
+Version:        0.7.2.2
 Category:       User Interfaces
 License:        BSD3
 License-File:   LICENSE


From git at git.haskell.org  Fri Dec 18 21:50:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:50:52 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Update Changelog. (2c69d65)
Message-ID: <20151218215052.4294D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/2c69d656e2ed163b20cdf4905ff398345d62f006

>---------------------------------------------------------------

commit 2c69d656e2ed163b20cdf4905ff398345d62f006
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Fri Dec 18 11:16:27 2015 -0800

    Update Changelog.


>---------------------------------------------------------------

2c69d656e2ed163b20cdf4905ff398345d62f006
 Changelog | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/Changelog b/Changelog
index 5cb7cc5..e559185 100644
--- a/Changelog
+++ b/Changelog
@@ -1,3 +1,10 @@
+Changed in version 0.7.2.2:
+   * Fix Linux to Windows cross-compile
+   * Canonicalize AMP instances to make the code more future proof
+   * Generalize constraints for InputT instances
+   * Bump upper bounds on base and transformers
+   * Make Haskeline `-Wtabs` clean
+
 Changed in version 0.7.2.1:
    * Fix build on Windows.
 


From git at git.haskell.org  Fri Dec 18 21:51:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:51:06 +0000 (UTC)
Subject: [commit: ghc] master: Update terminfo submodule to v0.4.0.2 release
 (9356393)
Message-ID: <20151218215106.E6F483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9356393d5844d4d2d4a565725de4e5c5e2a66f6c/ghc

>---------------------------------------------------------------

commit 9356393d5844d4d2d4a565725de4e5c5e2a66f6c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 22:14:04 2015 +0100

    Update terminfo submodule to v0.4.0.2 release
    
    This is the designated release to go with GHC 8.0.1
    
    /cc @judah


>---------------------------------------------------------------

9356393d5844d4d2d4a565725de4e5c5e2a66f6c
 libraries/terminfo | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/terminfo b/libraries/terminfo
index 15ca1cb..140ca44 160000
--- a/libraries/terminfo
+++ b/libraries/terminfo
@@ -1 +1 @@
-Subproject commit 15ca1cb3b1e1b0d410544abd69e7ffcf727fc970
+Subproject commit 140ca44db6fc734cfc0388e82f9e5270f31475d8


From git at git.haskell.org  Fri Dec 18 21:51:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:51:09 +0000 (UTC)
Subject: [commit: ghc] master: Update terminfo submodule to v0.7.2.2 release
 (97281b4)
Message-ID: <20151218215109.90E753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/97281b4605dac473458f144cbf6444b512e22e2a/ghc

>---------------------------------------------------------------

commit 97281b4605dac473458f144cbf6444b512e22e2a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 22:15:50 2015 +0100

    Update terminfo submodule to v0.7.2.2 release
    
    This is the designated release to go with GHC 8.0.1
    
    /cc @judah


>---------------------------------------------------------------

97281b4605dac473458f144cbf6444b512e22e2a
 libraries/haskeline | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index 8a017cc..2c69d65 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 8a017ccdd85a391fd0dfcd5310f7adbb07970233
+Subproject commit 2c69d656e2ed163b20cdf4905ff398345d62f006


From git at git.haskell.org  Fri Dec 18 21:51:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:51:36 +0000 (UTC)
Subject: [commit: packages/haskeline] tag '0.7.2.2' created
Message-ID: <20151218215136.C3B4B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

New tag    : 0.7.2.2
Referencing: 37ff8879960541f8405ac4e373d122519a472ffb

From git at git.haskell.org  Fri Dec 18 21:51:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 21:51:50 +0000 (UTC)
Subject: [commit: packages/terminfo] tag '0.4.0.2' created
Message-ID: <20151218215150.1BD8D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/terminfo

New tag    : 0.4.0.2
Referencing: 36bb86e5e4c2bddd0a4a942b7c7c5f66573474d9

From git at git.haskell.org  Fri Dec 18 22:07:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:11 +0000 (UTC)
Subject: [commit: packages/containers] branch 'strict-tuples' created
Message-ID: <20151218220711.EFB623A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : strict-tuples
Referencing: cd8d45fb8c4132a5bf56b140a40d9f37f04cfd56

From git at git.haskell.org  Fri Dec 18 22:07:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:13 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop-0.6' created
Message-ID: <20151218220713.EFBA03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop-0.6
Referencing: 7ab1c399726c5a4a562cff3f56017ff5852ac82e

From git at git.haskell.org  Fri Dec 18 22:07:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:15 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop' created
Message-ID: <20151218220715.F0ED13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop
Referencing: b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef

From git at git.haskell.org  Fri Dec 18 22:07:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:17 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop-0.6-questionable'
 created
Message-ID: <20151218220717.F1CBB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop-0.6-questionable
Referencing: 2bf686d3dd0706eef416590100f8d1ebaa3eb80b

From git at git.haskell.org  Fri Dec 18 22:07:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:19 +0000 (UTC)
Subject: [commit: packages/containers] branch 'zip-devel' created
Message-ID: <20151218220719.F2BC33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : zip-devel
Referencing: ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6

From git at git.haskell.org  Fri Dec 18 22:07:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:21 +0000 (UTC)
Subject: [commit: packages/containers] branch 'ghc-head' deleted
Message-ID: <20151218220721.F37E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

Deleted branch: ghc-head

From git at git.haskell.org  Fri Dec 18 22:07:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:24 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.7.0-release' created
Message-ID: <20151218220724.008B43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.7.0-release
Referencing: d06b845316672e4b6a123048702668c220acea03

From git at git.haskell.org  Fri Dec 18 22:07:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:26 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.6.2-release' created
Message-ID: <20151218220726.014F33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.6.2-release
Referencing: ab15b1f50d85199aebbe58c7e8efb7f3f1f09eda

From git at git.haskell.org  Fri Dec 18 22:07:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:28 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.6.3-release' created
Message-ID: <20151218220728.0266D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.6.3-release
Referencing: a401400fa89b2f942a2e2d22610c21259b45d016

From git at git.haskell.org  Fri Dec 18 22:07:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:30 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add IsList instances for OverloadedLists (0e99ba8)
Message-ID: <20151218220730.110003A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0e99ba8851f875c4b44631c7afad3b70e74842c2

>---------------------------------------------------------------

commit 0e99ba8851f875c4b44631c7afad3b70e74842c2
Author: Konstantine Rybnikov <k-bx at k-bx.com>
Date:   Sun Apr 13 22:27:39 2014 +0200

    Add IsList instances for OverloadedLists


>---------------------------------------------------------------

0e99ba8851f875c4b44631c7afad3b70e74842c2
 Data/IntMap/Base.hs | 16 +++++++++++++++-
 Data/IntSet/Base.hs | 13 +++++++++++++
 Data/Map/Base.hs    | 13 +++++++++++++
 Data/Set/Base.hs    | 13 +++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 34a263a..75b3ae9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -5,6 +5,10 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+{-# LANGUAGE ScopedTypeVariables #-}
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntMap.Base
@@ -231,6 +235,9 @@ import Data.StrictPair
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
                   DataType, mkDataType)
 import GHC.Exts (build)
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 #endif
 
@@ -1770,6 +1777,13 @@ fromSet f (IntSet.Tip kx bm) = buildTree f kx bm (IntSet.suffixBitMask + 1)
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance GHCExts.IsList (IntMap a) where
+  type Item (IntMap a) = (Key,a)
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the map to a list of key\/value pairs. Subject to list
 -- fusion.
 --
@@ -1907,7 +1921,7 @@ fromAscListWithKey f (x0 : xs0) = fromDistinctAscList (combineEq x0 xs0)
 --
 -- > fromDistinctAscList [(3,"b"), (5,"a")] == fromList [(3, "b"), (5, "a")]
 
-fromDistinctAscList :: [(Key,a)] -> IntMap a
+fromDistinctAscList :: forall a. [(Key,a)] -> IntMap a
 fromDistinctAscList []         = Nil
 fromDistinctAscList (z0 : zs0) = work z0 zs0 Nada
   where
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index be41db5..0063c3f 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntSet.Base
@@ -198,6 +201,9 @@ import Text.Read
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts (Int(..), build)
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import GHC.Prim (indexInt8OffAddr#)
 #endif
 
@@ -936,6 +942,13 @@ elems
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance GHCExts.IsList IntSet where
+  type Item IntSet = Key
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the set to a list of elements. Subject to list fusion.
 toList :: IntSet -> [Key]
 toList
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 6a93a73..69f8276 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Map.Base
@@ -278,6 +281,9 @@ import qualified Data.Set.Base as Set
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 import Data.Data
 #endif
@@ -1948,6 +1954,13 @@ fromSet f (Set.Bin sz x l r) = Bin sz x (f x) (fromSet f l) (fromSet f r)
   Lists
   use [foldlStrict] to reduce demand on the control-stack
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance (Ord k) => GHCExts.IsList (Map k v) where
+  type Item (Map k v) = (k,v)
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n*log n)/. Build a map from a list of key\/value pairs. See also 'fromAscList'.
 -- If the list contains more than one value for the same key, the last value
 -- for the key is retained.
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index f863d17..94372df 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Set.Base
@@ -194,6 +197,9 @@ import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 import Data.Data
 #endif
@@ -763,6 +769,13 @@ elems = toAscList
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance (Ord a) => GHCExts.IsList (Set a) where
+  type Item (Set a) = a
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the set to a list of elements. Subject to list fusion.
 toList :: Set a -> [a]
 toList = toAscList


From git at git.haskell.org  Fri Dec 18 22:07:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:32 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add LANGUAGE RoleAnnotations for ghc 7.8 (cb08a7e)
Message-ID: <20151218220732.197E43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cb08a7e06676d38f2f5deb35d0035429c1c10eb1

>---------------------------------------------------------------

commit cb08a7e06676d38f2f5deb35d0035429c1c10eb1
Author: Konstantine Rybnikov <k-bx at k-bx.com>
Date:   Sun Apr 13 23:52:57 2014 +0200

    Add LANGUAGE RoleAnnotations for ghc 7.8


>---------------------------------------------------------------

cb08a7e06676d38f2f5deb35d0035429c1c10eb1
 Data/Map/Base.hs | 3 +++
 Data/Set/Base.hs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 6a93a73..95f7b91 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE RoleAnnotations #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Map.Base
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index f863d17..da3b21d 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE RoleAnnotations #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Set.Base


From git at git.haskell.org  Fri Dec 18 22:07:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:34 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Merge pull request #42 from k-bx/add-role-annotations-lang
 (0098d41)
Message-ID: <20151218220734.21D1F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0098d41f0aa0460f96eb2251ac743bb7fa137a68

>---------------------------------------------------------------

commit 0098d41f0aa0460f96eb2251ac743bb7fa137a68
Merge: e787f05 cb08a7e
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 07:01:33 2014 +0100

    Merge pull request #42 from k-bx/add-role-annotations-lang
    
    Add LANGUAGE RoleAnnotations for ghc 7.8



>---------------------------------------------------------------

0098d41f0aa0460f96eb2251ac743bb7fa137a68
 Data/Map/Base.hs | 3 +++
 Data/Set/Base.hs | 3 +++
 2 files changed, 6 insertions(+)


From git at git.haskell.org  Fri Dec 18 22:07:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:36 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master, zip-devel: Merge language pragmas (bae098f)
Message-ID: <20151218220736.2C50F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bae098fb0a3994bc2b0ec3313004b40cd097ed8d

>---------------------------------------------------------------

commit bae098fb0a3994bc2b0ec3313004b40cd097ed8d
Merge: 0098d41 0e99ba8
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 08:20:44 2014 +0200

    Merge language pragmas



>---------------------------------------------------------------

bae098fb0a3994bc2b0ec3313004b40cd097ed8d
 Data/IntMap/Base.hs | 16 +++++++++++++++-
 Data/IntSet/Base.hs | 13 +++++++++++++
 Data/Map/Base.hs    | 11 +++++++++++
 Data/Set/Base.hs    | 11 +++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --cc Data/Map/Base.hs
index 95f7b91,69f8276..db9549f
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |
diff --cc Data/Set/Base.hs
index da3b21d,94372df..ffcdfd0
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |


From git at git.haskell.org  Fri Dec 18 22:07:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:38 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Don't have tests depend on library to avoid dep conflicts (53da0d5)
Message-ID: <20151218220738.33AC93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/53da0d55d8592d86772691322cc7eebae511e29e

>---------------------------------------------------------------

commit 53da0d55d8592d86772691322cc7eebae511e29e
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Wed Apr 23 08:50:44 2014 +0200

    Don't have tests depend on library to avoid dep conflicts


>---------------------------------------------------------------

53da0d55d8592d86772691322cc7eebae511e29e
 containers.cabal | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 8abca7a..640cb5e 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -211,14 +211,13 @@ Test-suite seq-properties
         test-framework-quickcheck2
 
 test-suite map-strictness-properties
-  hs-source-dirs: tests
+  hs-source-dirs: tests, .
   main-is: MapStrictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
     base,
     ChasingBottoms,
-    containers,
     QuickCheck >= 2.4.0.1,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
@@ -226,14 +225,13 @@ test-suite map-strictness-properties
   ghc-options: -Wall
 
 test-suite intmap-strictness-properties
-  hs-source-dirs: tests
+  hs-source-dirs: tests, .
   main-is: IntMapStrictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
     base,
     ChasingBottoms,
-    containers,
     QuickCheck >= 2.4.0.1,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9


From git at git.haskell.org  Fri Dec 18 22:07:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:40 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add missing test dependencies (c17cfaf)
Message-ID: <20151218220740.3BB223A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c17cfaf7996942ed305dc1db55ea82da40ed47e4

>---------------------------------------------------------------

commit c17cfaf7996942ed305dc1db55ea82da40ed47e4
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Wed Apr 23 09:25:40 2014 +0200

    Add missing test dependencies


>---------------------------------------------------------------

c17cfaf7996942ed305dc1db55ea82da40ed47e4
 containers.cabal | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 640cb5e..209589b 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -216,9 +216,12 @@ test-suite map-strictness-properties
   type: exitcode-stdio-1.0
 
   build-depends:
-    base,
+    array,
+    base >= 4.2 && < 5,
     ChasingBottoms,
+    deepseq >= 1.2 && < 1.4,
     QuickCheck >= 2.4.0.1,
+    ghc-prim,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
 
@@ -230,9 +233,12 @@ test-suite intmap-strictness-properties
   type: exitcode-stdio-1.0
 
   build-depends:
-    base,
+    array,
+    base >= 4.2 && < 5,
     ChasingBottoms,
+    deepseq >= 1.2 && < 1.4,
     QuickCheck >= 2.4.0.1,
+    ghc-prim,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
 


From git at git.haskell.org  Fri Dec 18 22:07:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:42 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add Travis-CI job control file (234896a)
Message-ID: <20151218220742.43A6D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/234896a2bb2c1f57f033b1f19f38ef039e99fe1e

>---------------------------------------------------------------

commit 234896a2bb2c1f57f033b1f19f38ef039e99fe1e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 22 22:48:36 2014 +0200

    Add Travis-CI job control file
    
    This builds and tests containers with GHC 7.0, 7.4, 7.6, 7.8, and GHC HEAD
    
    (Once haskell/cabal#1806 is fixed we can use CABALVER=1.20 w/ GHCVER=7.8.2)


>---------------------------------------------------------------

234896a2bb2c1f57f033b1f19f38ef039e99fe1e
 .travis.yml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..67d893c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+# NB: don't set `language: haskell` here
+
+# See also https://github.com/hvr/multi-ghc-travis for more information
+env:
+ - GHCVER=7.0.4 CABALVER=1.16
+ # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
+ # no package for earlier cabal versions in the PPA
+ - GHCVER=7.4.2 CABALVER=1.16
+ - GHCVER=7.6.3 CABALVER=1.16
+ - GHCVER=7.8.2 CABALVER=1.18
+ # NOTE: we can't use Cabal 1.20 yet due to
+ #  https://github.com/haskell/cabal/issues/1806
+ - GHCVER=head  CABALVER=1.18
+
+matrix:
+  allow_failures:
+   - env: GHCVER=head  CABALVER=1.18
+
+# Note: the distinction between `before_install` and `install` is not
+#       important.
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - cabal --version
+
+install:
+ - travis_retry cabal update
+ - cabal install --only-dependencies
+ # we need to install the test-suite deps manually as the cabal solver would
+ # otherwise complaing about cyclic deps
+ - cabal install 'test-framework >= 0.3.3' 'test-framework-quickcheck2 >= 0.2.9' 'QuickCheck >= 2.4.0.1' 'ChasingBottoms' 'HUnit' 'test-framework-hunit'
+
+# Here starts the actual work to be performed for the package under
+# test; any command which exits with a non-zero exit code causes the
+# build to fail.
+script:
+ # -v2 provides useful information for debugging
+ - cabal configure -v2 --enable-tests
+
+ # this builds all libraries and executables
+ # (including tests/benchmarks)
+ - cabal build
+ - cabal test
+
+ # tests that a source-distribution can be generated
+ - cabal sdist
+
+ # check that the generated source-distribution can be built & installed
+ - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
+   cd dist/;
+   if [ -f "$SRC_TGZ" ]; then
+      cabal install --force-reinstalls "$SRC_TGZ";
+   else
+      echo "expected '$SRC_TGZ' not found";
+      exit 1;
+   fi
+
+# EOF


From git at git.haskell.org  Fri Dec 18 22:07:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:44 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Markdownify and extend README (7d8360a)
Message-ID: <20151218220744.4B5D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7d8360ac1e3a484bae714b5253e287a0f77b80c3

>---------------------------------------------------------------

commit 7d8360ac1e3a484bae714b5253e287a0f77b80c3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Apr 23 12:42:06 2014 +0200

    Markdownify and extend README


>---------------------------------------------------------------

7d8360ac1e3a484bae714b5253e287a0f77b80c3
 README    |  6 ------
 README.md | 12 ++++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README b/README
deleted file mode 100644
index 1fb326b..0000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-POTENTIAL CONTRIBUTORS
-======================
-
-Please follow the guidelines outlined on the Haskell Wiki when proposing an API change.
-
-http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0eab2ca
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+The `containers` Package [![Build Status](https://travis-ci.org/haskell/containers.svg?branch=master)](https://travis-ci.org/haskell/containers)
+========================
+
+See [`containers` on Hackage](http://hackage.haskell.org/package/containers) for more information.
+
+
+Contributing
+------------
+
+For reporting bugs (and maybe even the respective fix), please use the [GitHub issue tracker](https://github.com/haskell/containers/issues).
+
+For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers) (but use the GitHub facilities instead of GHC's Trac for submitting patches).


From git at git.haskell.org  Fri Dec 18 22:07:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:46 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Try to use CABALVER=1.20 again (e5d74fa)
Message-ID: <20151218220746.5132C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e5d74fa883ef2d66511d12cdb62b9586abff14c5

>---------------------------------------------------------------

commit e5d74fa883ef2d66511d12cdb62b9586abff14c5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat May 3 17:45:13 2014 +0200

    Try to use CABALVER=1.20 again
    
    ...hoping that haskell/cabal#1806 has been resolved for good


>---------------------------------------------------------------

e5d74fa883ef2d66511d12cdb62b9586abff14c5
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67d893c..8af3116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,11 @@ env:
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.16
  - GHCVER=7.8.2 CABALVER=1.18
- # NOTE: we can't use Cabal 1.20 yet due to
- #  https://github.com/haskell/cabal/issues/1806
- - GHCVER=head  CABALVER=1.18
+ - GHCVER=head  CABALVER=1.20
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=1.18
+   - env: GHCVER=head  CABALVER=1.20
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.


From git at git.haskell.org  Fri Dec 18 22:07:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:48 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: tree: Fix imports for the Applicative/Monad change (c40e6dd)
Message-ID: <20151218220748.588913A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c40e6dd40861d788ee0cc337775d803d8907b6ff

>---------------------------------------------------------------

commit c40e6dd40861d788ee0cc337775d803d8907b6ff
Author: Austin Seipp <aseipp at pobox.com>
Date:   Mon May 12 07:31:59 2014 -0500

    tree: Fix imports for the Applicative/Monad change
    
    Due to various problems with orphans and cycles in base, while
    implementing the Applicative/Monad Proposal, Alternative joined
    MonadPlus in Control.Monad.
    
    A knock-on effect of this is that Control.Monad now exports 'empty',
    which conflicts with Data.Sequence in this case. Luckily the fix is
    actually quite easy: just restrict the imports to liftM, since that's
    all we use anyway.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


>---------------------------------------------------------------

c40e6dd40861d788ee0cc337775d803d8907b6ff
 Data/Tree.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index 56af20f..dab25c2 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -32,7 +32,7 @@ module Data.Tree(
     ) where
 
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad
+import Control.Monad (liftM)
 import Data.Monoid (Monoid(..))
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)


From git at git.haskell.org  Fri Dec 18 22:07:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:50 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Merge pull request #44 from thoughtpolice/amp (e84c5d2)
Message-ID: <20151218220750.605493A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e84c5d2145415cb0beacce0909a551ae5e28d396

>---------------------------------------------------------------

commit e84c5d2145415cb0beacce0909a551ae5e28d396
Merge: e5d74fa c40e6dd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon May 12 15:05:18 2014 +0200

    Merge pull request #44 from thoughtpolice/amp
    
    tree: Fix imports for the Applicative/Monad change



>---------------------------------------------------------------

e84c5d2145415cb0beacce0909a551ae5e28d396
 Data/Tree.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:07:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:52 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Added fixity declarations for member, notMember, union,
 and intersection. (3999b51)
Message-ID: <20151218220752.6AFD03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3999b512f5aa28a7b119a18b286a8485d1285319

>---------------------------------------------------------------

commit 3999b512f5aa28a7b119a18b286a8485d1285319
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.


>---------------------------------------------------------------

3999b512f5aa28a7b119a18b286a8485d1285319
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,6 +395,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -403,6 +405,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -818,6 +822,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -881,6 +887,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,10 +332,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -523,6 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -597,6 +602,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,6 +456,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -469,6 +471,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1230,6 +1234,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1350,6 +1356,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,6 +318,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -327,6 +329,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -578,6 +582,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -636,6 +642,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Fri Dec 18 22:07:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:54 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Fixed syntax of fixity declarations. (07ab0fa)
Message-ID: <20151218220754.75BDE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/07ab0fa052843dc8fd4c874876d03d8a71525f87

>---------------------------------------------------------------

commit 07ab0fa052843dc8fd4c874876d03d8a71525f87
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

07ab0fa052843dc8fd4c874876d03d8a71525f87
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..237aea8 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..5aee4ef 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..bc2fd47 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..d0533f5 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Fri Dec 18 22:07:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:56 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Revert "Fixed syntax of fixity declarations." (fa2c888)
Message-ID: <20151218220756.809D03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fa2c8880efd7adf81e33de72f1a38a0c2b31e90b

>---------------------------------------------------------------

commit fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Jul 22 17:09:30 2014 +0200

    Revert "Fixed syntax of fixity declarations."
    
    This reverts commit 07ab0fa052843dc8fd4c874876d03d8a71525f87.


>---------------------------------------------------------------

fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 237aea8..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 `member`
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 `union`
+infixl 5 union
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 5aee4ef..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 `union`
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index bc2fd47..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index d0533f5..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Fri Dec 18 22:07:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:07:58 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Revert "Added fixity declarations for member, notMember, union,
 and intersection." (3b1eee5)
Message-ID: <20151218220758.8B6423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3b1eee514581edcc51c3c4304087e2dff30e05cd

>---------------------------------------------------------------

commit 3b1eee514581edcc51c3c4304087e2dff30e05cd
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Jul 22 17:09:50 2014 +0200

    Revert "Added fixity declarations for member, notMember, union, and intersection."
    
    This reverts commit 3999b512f5aa28a7b119a18b286a8485d1285319.


>---------------------------------------------------------------

3b1eee514581edcc51c3c4304087e2dff30e05cd
 Data/IntMap/Base.hs | 8 --------
 Data/IntSet/Base.hs | 7 -------
 Data/Map/Base.hs    | 8 --------
 Data/Set/Base.hs    | 8 --------
 4 files changed, 31 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..75b3ae9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,8 +395,6 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
-
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -405,8 +403,6 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
-
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -822,8 +818,6 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
-
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -887,8 +881,6 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
-
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..0063c3f 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,14 +332,10 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
-
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
-
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -527,7 +523,6 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -602,8 +597,6 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
-
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..db9549f 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,8 +456,6 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
-
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -471,8 +469,6 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
-
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1234,8 +1230,6 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
-
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1356,8 +1350,6 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
-
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..ffcdfd0 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,8 +318,6 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
-
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -329,8 +327,6 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
-
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -582,8 +578,6 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
-
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -642,8 +636,6 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
-
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Fri Dec 18 22:08:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:00 +0000 (UTC)
Subject: [commit: packages/containers] develop: Added fixity declarations for
 member, notMember, union, and intersection. (4dd6e01)
Message-ID: <20151218220800.958813A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4dd6e01a78774de5e5dd6639b55a2902e610e0cc

>---------------------------------------------------------------

commit 4dd6e01a78774de5e5dd6639b55a2902e610e0cc
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.


>---------------------------------------------------------------

4dd6e01a78774de5e5dd6639b55a2902e610e0cc
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,6 +395,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -403,6 +405,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -818,6 +822,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -881,6 +887,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,10 +332,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -523,6 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -597,6 +602,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,6 +456,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -469,6 +471,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1230,6 +1234,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1350,6 +1356,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,6 +318,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -327,6 +329,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -578,6 +582,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -636,6 +642,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Fri Dec 18 22:08:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:02 +0000 (UTC)
Subject: [commit: packages/containers] develop: Fixed syntax of fixity
 declarations. (6ec9b1b)
Message-ID: <20151218220802.9F9993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f

>---------------------------------------------------------------

commit 6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..237aea8 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..5aee4ef 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..bc2fd47 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..d0533f5 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Fri Dec 18 22:08:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:04 +0000 (UTC)
Subject: [commit: packages/containers] develop: Merge branch 'selinger-master'
 into develop. (f8629a2)
Message-ID: <20151218220804.AA7F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f8629a228545896ed9133fd72ebbcf97336767da

>---------------------------------------------------------------

commit f8629a228545896ed9133fd72ebbcf97336767da
Merge: 3b1eee5 6ec9b1b
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Aug 8 11:06:49 2014 +0200

    Merge branch 'selinger-master' into develop.
    
    PVP: Major version bump is needed.



>---------------------------------------------------------------

f8629a228545896ed9133fd72ebbcf97336767da
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)


From git at git.haskell.org  Fri Dec 18 22:08:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:06 +0000 (UTC)
Subject: [commit: packages/containers] develop: Make types of the drawing
 functions more generic, i.e. Show s => Tree s instead of Tree String (2c85f08)
Message-ID: <20151218220806.B2F633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2c85f0823848ef7f70a27944bc4741c91ca1c0ef

>---------------------------------------------------------------

commit 2c85f0823848ef7f70a27944bc4741c91ca1c0ef
Author: jonasc <github at bcdf.eu>
Date:   Fri Aug 8 00:15:10 2014 +0200

    Make types of the drawing functions more generic, i.e. Show s => Tree s instead of Tree String


>---------------------------------------------------------------

2c85f0823848ef7f70a27944bc4741c91ca1c0ef
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index dab25c2..7cfba42 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -83,15 +83,15 @@ instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 
 -- | Neat 2-dimensional drawing of a tree.
-drawTree :: Tree String -> String
+drawTree :: Show a => Tree a -> String
 drawTree  = unlines . draw
 
 -- | Neat 2-dimensional drawing of a forest.
-drawForest :: Forest String -> String
+drawForest :: Show a => Forest a -> String
 drawForest  = unlines . map drawTree
 
-draw :: Tree String -> [String]
-draw (Node x ts0) = x : drawSubTrees ts0
+draw :: Show a => Tree a -> [String]
+draw (Node x ts0) = show x : drawSubTrees ts0
   where
     drawSubTrees [] = []
     drawSubTrees [t] =


From git at git.haskell.org  Fri Dec 18 22:08:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:08 +0000 (UTC)
Subject: [commit: packages/containers] develop: Merge branch 'jonasc-master'
 into develop (b44b6a7)
Message-ID: <20151218220808.BA8383A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef

>---------------------------------------------------------------

commit b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef
Merge: f8629a2 2c85f08
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Aug 8 11:07:42 2014 +0200

    Merge branch 'jonasc-master' into develop
    
    PVP: Major version bump is needed.



>---------------------------------------------------------------

b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:08:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:10 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use defensive `Data.Foldable` import (74f9b89)
Message-ID: <20151218220810.C18143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/74f9b89a542240e7ab510ee4fb73a4d46035b8ea

>---------------------------------------------------------------

commit 74f9b89a542240e7ab510ee4fb73a4d46035b8ea
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Sep 27 15:12:33 2014 +0200

    Use defensive `Data.Foldable` import
    
    With this `import`-style containers will compile warning free
    with existing GHC versions as well as GHC HEAD (in its current form)
    
    This change is also needed because `Data.Foldable` is planned to export
    `null` and `length` which will otherwise clash with `Data.Sequence`


>---------------------------------------------------------------

74f9b89a542240e7ab510ee4fb73a4d46035b8ea
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9bfd6f9..6bbebdb 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -149,7 +149,7 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-import Data.Foldable
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), foldl', toList)
 import Data.Traversable
 import Data.Typeable
 


From git at git.haskell.org  Fri Dec 18 22:08:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:12 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #54 from hvr/pr-foldable (085e1b8)
Message-ID: <20151218220812.C87463A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b

>---------------------------------------------------------------

commit 085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b
Merge: 3b1eee5 74f9b89
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Sep 28 12:45:42 2014 +0200

    Merge pull request #54 from hvr/pr-foldable
    
    Use defensive `Data.Foldable` import



>---------------------------------------------------------------

085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:08:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:14 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Move foldlStrict (defined 4 times) to Data.StrictFold. (27a5da9)
Message-ID: <20151218220814.D5CD73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/27a5da9e0a99b2df2cfb267eed2dae8167c746a2

>---------------------------------------------------------------

commit 27a5da9e0a99b2df2cfb267eed2dae8167c746a2
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 12 11:06:53 2014 +0200

    Move foldlStrict (defined 4 times) to Data.StrictFold.
    
    The foldlStrict is Data.List.foldl' which is always inlined, which
    allows more optimizations. Also, foldl' is not Haskell 98, although
    it is Haskell 2010.


>---------------------------------------------------------------

27a5da9e0a99b2df2cfb267eed2dae8167c746a2
 Data/IntMap/Base.hs   |  9 +--------
 Data/IntMap/Strict.hs |  1 +
 Data/IntSet/Base.hs   |  7 +------
 Data/Map/Base.hs      |  9 +--------
 Data/Map/Strict.hs    |  2 ++
 Data/Set/Base.hs      |  7 +------
 Data/StrictFold.hs    | 16 ++++++++++++++++
 containers.cabal      |  1 +
 8 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..8d04bfa 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -211,7 +211,6 @@ module Data.IntMap.Base (
     , shorter
     , branchMask
     , highestBitMask
-    , foldlStrict
     ) where
 
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
@@ -229,6 +228,7 @@ import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 import Data.BitUtil
 import Data.IntSet.Base (Key)
 import qualified Data.IntSet.Base as IntSet
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -2085,13 +2085,6 @@ branchMask p1 p2
   Utilities
 --------------------------------------------------------------------}
 
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
-
 -- | /O(1)/.  Decompose a map into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a map in parallel.
 --
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 2ca3707..f19682e 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -258,6 +258,7 @@ import Data.IntMap.Base hiding
 
 import Data.BitUtil
 import qualified Data.IntSet.Base as IntSet
+import Data.StrictFold
 import Data.StrictPair
 
 -- $strictness
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..c843d46 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -192,6 +192,7 @@ import Data.Word (Word)
 import Prelude hiding (filter, foldr, foldl, null, map)
 
 import Data.BitUtil
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -1491,12 +1492,6 @@ bitcount a0 x0 = go a0 x0
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
 
 -- | /O(1)/.  Decompose a set into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a set in parallel.
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..650e003 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -262,7 +262,6 @@ module Data.Map.Base (
     , glue
     , trim
     , trimLookupLo
-    , foldlStrict
     , MaybeS(..)
     , filterGt
     , filterLt
@@ -279,6 +278,7 @@ import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import qualified Data.Set.Base as Set
+import Data.StrictFold
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
@@ -2826,13 +2826,6 @@ validsize t
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
-
 
 -- | /O(1)/.  Decompose a map into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a map in parallel.
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 75a29c8..4e0d820 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -269,7 +269,9 @@ import Data.Map.Base hiding
     , updateMaxWithKey
     )
 import qualified Data.Set.Base as Set
+import Data.StrictFold
 import Data.StrictPair
+
 import Data.Bits (shiftL, shiftR)
 
 -- Use macros to define strictness of functions.  STRICT_x_OF_y
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..3a2c938 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -194,6 +194,7 @@ import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -1416,12 +1417,6 @@ bin x l r
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
 
 -- | /O(1)/.  Decompose a set into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a set in parallel.
diff --git a/Data/StrictFold.hs b/Data/StrictFold.hs
new file mode 100644
index 0000000..9c90a66
--- /dev/null
+++ b/Data/StrictFold.hs
@@ -0,0 +1,16 @@
+{-# LANGUAGE CPP #-}
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+{-# LANGUAGE Trustworthy #-}
+#endif
+module Data.StrictFold (foldlStrict) where
+
+-- | Same as regular 'Data.List.foldl'', but marked INLINE so that it is always
+-- inlined. This allows further optimization of the call to f, which can be
+-- optimized/specialised/inlined.
+
+foldlStrict :: (a -> b -> a) -> a -> [b] -> a
+foldlStrict f = go
+  where
+    go z []     = z
+    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
+{-# INLINE foldlStrict #-}
diff --git a/containers.cabal b/containers.cabal
index 209589b..a952a77 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -57,6 +57,7 @@ Library
         Data.IntSet.Base
         Data.Map.Base
         Data.Set.Base
+        Data.StrictFold
         Data.StrictPair
 
     include-dirs: include


From git at git.haskell.org  Fri Dec 18 22:08:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:18 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Fix subtle bug in binary search (46b3b9d)
Message-ID: <20151218220818.ECD0A3A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/46b3b9d4b34e761aa6f75335c717742bc89d922d

>---------------------------------------------------------------

commit 46b3b9d4b34e761aa6f75335c717742bc89d922d
Author: Josh Acay <cacay at cmu.edu>
Date:   Tue Oct 14 14:42:17 2014 -0400

    Fix subtle bug in binary search


>---------------------------------------------------------------

46b3b9d4b34e761aa6f75335c717742bc89d922d
 Data/Graph.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index c5cdf4b..65f3fb1 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -244,7 +244,7 @@ graphFromEdges edges0
                                    EQ -> Just mid
                                    GT -> findVertex (mid+1) b
                               where
-                                mid = (a + b) `div` 2
+                                mid = a + (b - a) `div` 2
 
 -------------------------------------------------------------------------
 --                                                                      -


From git at git.haskell.org  Fri Dec 18 22:08:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:20 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #58 from cacay/master (828b60d)
Message-ID: <20151218220820.F34BE3A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/828b60d394418132eb86993bbde29538b066aed8

>---------------------------------------------------------------

commit 828b60d394418132eb86993bbde29538b066aed8
Merge: 9cfe43a 46b3b9d
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Oct 14 21:52:28 2014 +0200

    Merge pull request #58 from cacay/master
    
    Fix bug in binary search



>---------------------------------------------------------------

828b60d394418132eb86993bbde29538b066aed8
 Data/Graph.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:08:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:16 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Move utilities (BitUtils, Strict{Fold,
 Pair}) to Utils directory. (9cfe43a)
Message-ID: <20151218220816.E50153A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9cfe43a9790f8c8511f93f380e7d7168bb1c1a88

>---------------------------------------------------------------

commit 9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 12 11:13:13 2014 +0200

    Move utilities (BitUtils,Strict{Fold,Pair}) to Utils directory.
    
    The Data directory was becoming a little too crowded.


>---------------------------------------------------------------

9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
 Data/IntMap/Base.hs            | 6 +++---
 Data/IntMap/Strict.hs          | 6 +++---
 Data/IntSet/Base.hs            | 6 +++---
 Data/Map/Base.hs               | 4 ++--
 Data/Map/Strict.hs             | 4 ++--
 Data/Set/Base.hs               | 4 ++--
 Data/{ => Utils}/BitUtil.hs    | 4 ++--
 Data/{ => Utils}/StrictFold.hs | 2 +-
 Data/{ => Utils}/StrictPair.hs | 2 +-
 containers.cabal               | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 8d04bfa..fec5abe 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -225,11 +225,11 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
-import Data.BitUtil
 import Data.IntSet.Base (Key)
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index f19682e..3a7dde8 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -256,10 +256,10 @@ import Data.IntMap.Base hiding
     , fromDistinctAscList
     )
 
-import Data.BitUtil
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 -- $strictness
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c843d46..309ab42 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -191,9 +191,9 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (filter, foldr, foldl, null, map)
 
-import Data.BitUtil
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix), DataType, mkDataType)
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 650e003..d1d8ffe 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -272,13 +272,13 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
 import Data.Monoid (Monoid(..))
-import Data.StrictPair
 import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import qualified Data.Set.Base as Set
-import Data.StrictFold
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 4e0d820..5f286b9 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -269,8 +269,8 @@ import Data.Map.Base hiding
     , updateMaxWithKey
     )
 import qualified Data.Set.Base as Set
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 import Data.Bits (shiftL, shiftR)
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 3a2c938..6c39a8e 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -194,8 +194,8 @@ import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/BitUtil.hs b/Data/Utils/BitUtil.hs
similarity index 97%
rename from Data/BitUtil.hs
rename to Data/Utils/BitUtil.hs
index 848bac1..bea078e 100644
--- a/Data/BitUtil.hs
+++ b/Data/Utils/BitUtil.hs
@@ -7,7 +7,7 @@
 #endif
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Data.BitUtil
+-- Module      :  Data.Utils.BitUtil
 -- Copyright   :  (c) Clark Gaebel 2012
 --                (c) Johan Tibel 2012
 -- License     :  BSD-style
@@ -16,7 +16,7 @@
 -- Portability :  portable
 -----------------------------------------------------------------------------
 
-module Data.BitUtil
+module Data.Utils.BitUtil
     ( highestBitMask
     , shiftLL
     , shiftRL
diff --git a/Data/StrictFold.hs b/Data/Utils/StrictFold.hs
similarity index 90%
rename from Data/StrictFold.hs
rename to Data/Utils/StrictFold.hs
index 9c90a66..953c9f1 100644
--- a/Data/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictFold (foldlStrict) where
+module Data.Utils.StrictFold (foldlStrict) where
 
 -- | Same as regular 'Data.List.foldl'', but marked INLINE so that it is always
 -- inlined. This allows further optimization of the call to f, which can be
diff --git a/Data/StrictPair.hs b/Data/Utils/StrictPair.hs
similarity index 77%
rename from Data/StrictPair.hs
rename to Data/Utils/StrictPair.hs
index 48609b3..6ae7ded 100644
--- a/Data/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictPair (StrictPair(..), toPair) where
+module Data.Utils.StrictPair (StrictPair(..), toPair) where
 
 -- | Same as regular Haskell pairs, but (x :*: _|_) = (_|_ :*: y) =
 -- _|_
diff --git a/containers.cabal b/containers.cabal
index a952a77..dcf36fd 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -52,13 +52,13 @@ Library
             Data.Sequence
             Data.Tree
     other-modules:
-        Data.BitUtil
         Data.IntMap.Base
         Data.IntSet.Base
         Data.Map.Base
         Data.Set.Base
-        Data.StrictFold
-        Data.StrictPair
+        Data.Utils.BitUtil
+        Data.Utils.StrictFold
+        Data.Utils.StrictPair
 
     include-dirs: include
 


From git at git.haskell.org  Fri Dec 18 22:08:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:23 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Minor documentation fix. (864ebff)
Message-ID: <20151218220823.071D43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/864ebff7995e7d4358475f8808f10329a832b78b

>---------------------------------------------------------------

commit 864ebff7995e7d4358475f8808f10329a832b78b
Author: strout <steve.trout at gmail.com>
Date:   Tue Oct 14 22:53:42 2014 -0500

    Minor documentation fix.
    
    Completed a sentence in maxView documentation.


>---------------------------------------------------------------

864ebff7995e7d4358475f8808f10329a832b78b
 Data/Map/Base.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index d1d8ffe..eafab03 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1171,6 +1171,7 @@ minView x   = Just (first snd $ deleteFindMin x)
 
 -- | /O(log n)/. Retrieves the value associated with maximal key of the
 -- map, and the map stripped of that element, or 'Nothing' if passed an
+-- empty map.
 --
 -- > maxView (fromList [(5,"a"), (3,"b")]) == Just ("a", singleton 3 "b")
 -- > maxView empty == Nothing


From git at git.haskell.org  Fri Dec 18 22:08:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:25 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #59 from strout/patch-1 (b9bd228)
Message-ID: <20151218220825.0EA803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e

>---------------------------------------------------------------

commit b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e
Merge: 828b60d 864ebff
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Oct 15 08:48:37 2014 +0200

    Merge pull request #59 from strout/patch-1
    
    Minor documentation fix.



>---------------------------------------------------------------

b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e
 Data/Map/Base.hs | 1 +
 1 file changed, 1 insertion(+)


From git at git.haskell.org  Fri Dec 18 22:08:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:27 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Define some new Foldable methods for containers (61b9066)
Message-ID: <20151218220827.199423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/61b9066d79ac346743dfe56425307e27e2e5d060

>---------------------------------------------------------------

commit 61b9066d79ac346743dfe56425307e27e2e5d060
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Oct 14 20:25:29 2014 +0200

    Define some new Foldable methods for containers
    
    This is a first attempt at addressing #56


>---------------------------------------------------------------

61b9066d79ac346743dfe56425307e27e2e5d060
 Data/IntMap/Base.hs | 15 +++++++++++++++
 Data/Map/Base.hs    | 15 +++++++++++++++
 Data/Sequence.hs    |  7 +++++++
 Data/Set/Base.hs    | 20 ++++++++++++++++++++
 Data/Tree.hs        |  7 +++++++
 5 files changed, 64 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index fec5abe..0de3e5b 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -320,6 +320,21 @@ instance Foldable.Foldable IntMap where
           go (Bin _ _ l r) = go l `mappend` go r
   {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+  foldl' = foldl'
+  {-# INLINE foldl' #-}
+  foldr' = foldr'
+  {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+  length = size
+  {-# INLINE length #-}
+  null   = null
+  {-# INLINE null #-}
+  toList = elems -- NB: Foldable.toList /= IntMap.toList
+  {-# INLINE toList #-}
+#endif
+
 instance Traversable IntMap where
     traverse f = traverseWithKey (\_ -> f)
     {-# INLINE traverse #-}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index d1d8ffe..d01367b 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2653,6 +2653,21 @@ instance Foldable.Foldable (Map k) where
           go (Bin _ _ v l r) = go l `mappend` (f v `mappend` go r)
   {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+  foldl' = foldl'
+  {-# INLINE foldl' #-}
+  foldr' = foldr'
+  {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+  length = size
+  {-# INLINE length #-}
+  null   = null
+  {-# INLINE null #-}
+  toList = elems -- NB: Foldable.toList /= Map.toList
+  {-# INLINE toList #-}
+#endif
+
 instance (NFData k, NFData a) => NFData (Map k a) where
     rnf Tip = ()
     rnf (Bin _ kx x l r) = rnf kx `seq` rnf x `seq` rnf l `seq` rnf r
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 6bbebdb..f1385f5 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -189,6 +189,13 @@ instance Foldable Seq where
     foldl1 f (Seq xs) = getElem (foldl1 f' xs)
       where f' (Elem x) (Elem y) = Elem (f x y)
 
+#if MIN_VERSION_base(4,8,0)
+    length = length
+    {-# INLINE length #-}
+    null   = null
+    {-# INLINE null #-}
+#endif
+
 instance Traversable Seq where
     traverse f (Seq xs) = Seq <$> traverse (traverse f) xs
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 6c39a8e..9260aeb 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -262,6 +262,26 @@ instance Foldable.Foldable Set where
             go (Bin _ k l r) = go l `mappend` (f k `mappend` go r)
     {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+    foldl' = foldl'
+    {-# INLINE foldl' #-}
+    foldr' = foldr'
+    {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+    length = size
+    {-# INLINE length #-}
+    null   = null
+    {-# INLINE null #-}
+    toList = toList
+    {-# INLINE toList #-}
+    minimum = findMin
+    {-# INLINE minimum #-}
+    maximum = findMax
+    {-# INLINE maximum #-}
+#endif
+
+
 #if __GLASGOW_HASKELL__
 
 {--------------------------------------------------------------------
diff --git a/Data/Tree.hs b/Data/Tree.hs
index dab25c2..2f18c68 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -79,6 +79,13 @@ instance Traversable Tree where
 instance Foldable Tree where
     foldMap f (Node x ts) = f x `mappend` foldMap (foldMap f) ts
 
+#if MIN_VERSION_base(4,8,0)
+    null _ = False
+    {-# INLINE null #-}
+    toList = flatten
+    {-# INLINE toList #-}
+#endif
+
 instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 


From git at git.haskell.org  Fri Dec 18 22:08:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:29 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Replace `MIN_VERSION_base_4_[57]_0` by `MIN_VERSION_base()`
 (3582252)
Message-ID: <20151218220829.212FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3582252bda944421c0a38c86684657e59dbe81be

>---------------------------------------------------------------

commit 3582252bda944421c0a38c86684657e59dbe81be
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Oct 16 22:35:13 2014 +0200

    Replace `MIN_VERSION_base_4_[57]_0` by `MIN_VERSION_base()`


>---------------------------------------------------------------

3582252bda944421c0a38c86684657e59dbe81be
 Data/IntSet/Base.hs | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 309ab42..c8e70f6 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -162,26 +162,6 @@ module Data.IntSet.Base (
     , bitmapOf
     ) where
 
--- We want to be able to compile without cabal. Nevertheless
--- #if defined(MIN_VERSION_base) && MIN_VERSION_base(4,5,0)
--- does not work, because if MIN_VERSION_base is undefined,
--- the last condition is syntactically wrong.
-#define MIN_VERSION_base_4_5_0 0
-#ifdef MIN_VERSION_base
-#if MIN_VERSION_base(4,5,0)
-#undef MIN_VERSION_base_4_5_0
-#define MIN_VERSION_base_4_5_0 1
-#endif
-#endif
-
-#define MIN_VERSION_base_4_7_0 0
-#ifdef MIN_VERSION_base
-#if MIN_VERSION_base(4,7,0)
-#undef MIN_VERSION_base_4_7_0
-#define MIN_VERSION_base_4_7_0 1
-#endif
-#endif
-
 import Control.DeepSeq (NFData)
 import Data.Bits
 import qualified Data.List as List
@@ -1228,7 +1208,7 @@ tip kx bm = Tip kx bm
 ----------------------------------------------------------------------}
 
 suffixBitMask :: Int
-#if MIN_VERSION_base_4_7_0
+#if MIN_VERSION_base(4,7,0)
 suffixBitMask = finiteBitSize (undefined::Word) - 1
 #else
 suffixBitMask = bitSize (undefined::Word) - 1
@@ -1479,7 +1459,7 @@ foldr'Bits prefix f z bm = let lb = lowestBitSet bm
 ----------------------------------------------------------------------}
 
 bitcount :: Int -> Word -> Int
-#if MIN_VERSION_base_4_5_0
+#if MIN_VERSION_base(4,5,0)
 bitcount a x = a + popCount x
 #else
 bitcount a0 x0 = go a0 x0


From git at git.haskell.org  Fri Dec 18 22:08:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:31 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #57 from hvr/pr-foldable (daf640e)
Message-ID: <20151218220831.2CBC13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/daf640ec6c0c189a6c570a1dff4e958e2fa8d697

>---------------------------------------------------------------

commit daf640ec6c0c189a6c570a1dff4e958e2fa8d697
Merge: b9bd228 3582252
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:24:41 2014 +0200

    Merge pull request #57 from hvr/pr-foldable
    
    Define some new Foldable methods for containers



>---------------------------------------------------------------

daf640ec6c0c189a6c570a1dff4e958e2fa8d697
 Data/IntMap/Base.hs | 15 +++++++++++++++
 Data/IntSet/Base.hs | 24 ++----------------------
 Data/Map/Base.hs    | 15 +++++++++++++++
 Data/Sequence.hs    |  7 +++++++
 Data/Set/Base.hs    | 20 ++++++++++++++++++++
 Data/Tree.hs        |  7 +++++++
 6 files changed, 66 insertions(+), 22 deletions(-)



From git at git.haskell.org  Fri Dec 18 22:08:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:33 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Provide default MIN_VERSION_base if not available. (0762786)
Message-ID: <20151218220833.394663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/076278627b6b3fda9522a9ca971f2467947527d6

>---------------------------------------------------------------

commit 076278627b6b3fda9522a9ca971f2467947527d6
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:43:09 2014 +0200

    Provide default MIN_VERSION_base if not available.
    
    After #56, we use MIN_VERSION_base in many places. We now provide
    trivial MIN_VERSION_base if not available to allow compiling without
    cabal.


>---------------------------------------------------------------

076278627b6b3fda9522a9ca971f2467947527d6
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 8 ++++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Sequence.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 Data/Tree.hs        | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 0de3e5b..8f2e32f 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -247,6 +247,14 @@ import Text.Read
 -- want the compilers to be compiled by as many compilers as possible.
 #define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 -- A "Nat" is a natural machine word (an unsigned Int)
 type Nat = Word
 
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c8e70f6..b6f8014 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -202,6 +202,14 @@ import GHC.Prim (indexInt8OffAddr#)
 #define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_3(fn) fn _ arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 infixl 9 \\{-This comment teaches CPP correct behaviour -}
 
 -- A "Nat" is a natural machine word (an unsigned Int)
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 72934e9..edcfdb7 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -299,6 +299,14 @@ import Data.Data
 #define STRICT_1_OF_4(fn) fn arg _ _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_4(fn) fn _ arg _ _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f1385f5..a2b4844 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -160,6 +160,14 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
 import Data.Data
 #endif
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 infixr 5 `consTree`
 infixl 5 `snocTree`
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 9260aeb..e676a6f 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -214,6 +214,14 @@ import Data.Data
 #define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_3(fn) fn _ arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
diff --git a/Data/Tree.hs b/Data/Tree.hs
index 2f18c68..c880213 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -45,6 +45,14 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Data (Data)
 #endif
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 -- | Multi-way trees, also known as /rose trees/.
 data Tree a = Node {
         rootLabel :: a,         -- ^ label value


From git at git.haskell.org  Fri Dec 18 22:08:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:35 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Remove RoleAnnotations extension from containers.cabal. (1d555a4)
Message-ID: <20151218220835.3F2CD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1d555a4d7d2b902808d73c2fad4314672241e81d

>---------------------------------------------------------------

commit 1d555a4d7d2b902808d73c2fad4314672241e81d
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:46:13 2014 +0200

    Remove RoleAnnotations extension from containers.cabal.
    
    We switch the language extensions in specific files. We only provide
    extensions for GHC pre 7.0, as it cannot enable extensions
    conditionally using CPP.


>---------------------------------------------------------------

1d555a4d7d2b902808d73c2fad4314672241e81d
 containers.cabal | 2 --
 1 file changed, 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index dcf36fd..815882e 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -64,8 +64,6 @@ Library
 
     if impl(ghc<7.0)
         extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
-    if impl(ghc >= 7.8)
-        extensions: RoleAnnotations
 
 -------------------
 -- T E S T I N G --


From git at git.haskell.org  Fri Dec 18 22:08:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:37 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Make Foldable.fold be INLINABLE without an argument. (398e466)
Message-ID: <20151218220837.4AB3E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/398e46672e498f83f28733f3a7a188651e9576b8

>---------------------------------------------------------------

commit 398e46672e498f83f28733f3a7a188651e9576b8
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 14:07:13 2014 +0200

    Make Foldable.fold be INLINABLE without an argument.


>---------------------------------------------------------------

398e46672e498f83f28733f3a7a188651e9576b8
 Data/IntMap/Base.hs | 2 +-
 Data/Map/Base.hs    | 2 +-
 Data/Set/Base.hs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 8f2e32f..c1b2f4d 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -313,7 +313,7 @@ instance Monoid (IntMap a) where
     mconcat = unions
 
 instance Foldable.Foldable IntMap where
-  fold t = go t
+  fold = go
     where go Nil = mempty
           go (Tip _ v) = v
           go (Bin _ _ l r) = go l `mappend` go r
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index edcfdb7..781ac3a 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2647,7 +2647,7 @@ instance Traversable (Map k) where
   {-# INLINE traverse #-}
 
 instance Foldable.Foldable (Map k) where
-  fold t = go t
+  fold = go
     where go Tip = mempty
           go (Bin 1 _ v _ _) = v
           go (Bin _ _ v l r) = go l `mappend` (v `mappend` go r)
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index e676a6f..67ade4e 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -255,7 +255,7 @@ instance Ord a => Monoid (Set a) where
     mconcat = unions
 
 instance Foldable.Foldable Set where
-    fold t = go t
+    fold = go
       where go Tip = mempty
             go (Bin 1 k _ _) = k
             go (Bin _ k l r) = go l `mappend` (k `mappend` go r)


From git at git.haskell.org  Fri Dec 18 22:08:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:39 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add Foldable.{elem, maximum, minimum, sum,
 product} specializations. (530fc76)
Message-ID: <20151218220839.548503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/530fc76bdd17089fcaaa655d66156abbc2092c2c

>---------------------------------------------------------------

commit 530fc76bdd17089fcaaa655d66156abbc2092c2c
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 14:07:42 2014 +0200

    Add Foldable.{elem,maximum,minimum,sum,product} specializations.
    
    Following #56, add specializations for other base-4.8 Foldable methods,
    using strict folds and shortcircuiting.
    
    The Set.elem uses only Eq a, so it runs in linear time.


>---------------------------------------------------------------

530fc76bdd17089fcaaa655d66156abbc2092c2c
 Data/IntMap/Base.hs | 30 ++++++++++++++++++++++++++++++
 Data/Map/Base.hs    | 25 +++++++++++++++++++++++++
 Data/Set/Base.hs    |  9 +++++++++
 3 files changed, 64 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index c1b2f4d..007e41e 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -341,6 +341,36 @@ instance Foldable.Foldable IntMap where
   {-# INLINE null #-}
   toList = elems -- NB: Foldable.toList /= IntMap.toList
   {-# INLINE toList #-}
+  elem = go
+    where STRICT_1_OF_2(go)
+          go _ Nil = False
+          go x (Tip _ y) = x == y
+          go x (Bin _ _ l r) = go x l || go x r
+  {-# INLINABLE elem #-}
+  maximum = start
+    where start Nil = error "IntMap.Foldable.maximum: called with empty map"
+          start (Tip _ y) = y
+          start (Bin _ _ l r) = go (start l) r
+
+          STRICT_1_OF_2(go)
+          go m Nil = m
+          go m (Tip _ y) = max m y
+          go m (Bin _ _ l r) = go (go m l) r
+  {-# INLINABLE maximum #-}
+  minimum = start
+    where start Nil = error "IntMap.Foldable.minimum: called with empty map"
+          start (Tip _ y) = y
+          start (Bin _ _ l r) = go (start l) r
+
+          STRICT_1_OF_2(go)
+          go m Nil = m
+          go m (Tip _ y) = min m y
+          go m (Bin _ _ l r) = go (go m l) r
+  {-# INLINABLE minimum #-}
+  sum = foldl' (+) 0
+  {-# INLINABLE sum #-}
+  product = foldl' (*) 1
+  {-# INLINABLE product #-}
 #endif
 
 instance Traversable IntMap where
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 781ac3a..de074f4 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2675,6 +2675,31 @@ instance Foldable.Foldable (Map k) where
   {-# INLINE null #-}
   toList = elems -- NB: Foldable.toList /= Map.toList
   {-# INLINE toList #-}
+  elem = go
+    where STRICT_1_OF_2(go)
+          go _ Tip = False
+          go x (Bin _ _ v l r) = x == v || go x l || go x r
+  {-# INLINABLE elem #-}
+  maximum = start
+    where start Tip = error "Map.Foldable.maximum: called with empty map"
+          start (Bin _ _ v l r) = go (go v l) r
+
+          STRICT_1_OF_2(go)
+          go m Tip = m
+          go m (Bin _ _ v l r) = go (go (max m v) l) r
+  {-# INLINABLE maximum #-}
+  minimum = start
+    where start Tip = error "Map.Foldable.minumum: called with empty map"
+          start (Bin _ _ v l r) = go (go v l) r
+
+          STRICT_1_OF_2(go)
+          go m Tip = m
+          go m (Bin _ _ v l r) = go (go (min m v) l) r
+  {-# INLINABLE minimum #-}
+  sum = foldl' (+) 0
+  {-# INLINABLE sum #-}
+  product = foldl' (*) 1
+  {-# INLINABLE product #-}
 #endif
 
 instance (NFData k, NFData a) => NFData (Map k a) where
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 67ade4e..7e792f4 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -283,10 +283,19 @@ instance Foldable.Foldable Set where
     {-# INLINE null #-}
     toList = toList
     {-# INLINE toList #-}
+    elem = go
+      where STRICT_1_OF_2(go)
+            go _ Tip = False
+            go x (Bin _ y l r) = x == y || go x l || go x r
+    {-# INLINABLE elem #-}
     minimum = findMin
     {-# INLINE minimum #-}
     maximum = findMax
     {-# INLINE maximum #-}
+    sum = foldl' (+) 0
+    {-# INLINABLE sum #-}
+    product = foldl' (*) 1
+    {-# INLINABLE product #-}
 #endif
 
 


From git at git.haskell.org  Fri Dec 18 22:08:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:41 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Force prefix and suffix before middle (7dfdc33)
Message-ID: <20151218220841.5C25C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7dfdc33f8cc740036cee5a5e94c5603722d6fd02

>---------------------------------------------------------------

commit 7dfdc33f8cc740036cee5a5e94c5603722d6fd02
Author: treeowl <David.Feuer at gmail.com>
Date:   Sat Nov 8 22:08:19 2014 -0500

    Force prefix and suffix before middle
    
    This should be slightly more efficient. Probably very slightly, but there doesn't seem to be a good reason not to.


>---------------------------------------------------------------

7dfdc33f8cc740036cee5a5e94c5603722d6fd02
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index a2b4844..1952b1c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -346,7 +346,7 @@ instance Traversable FingerTree where
 instance NFData a => NFData (FingerTree a) where
     rnf (Empty) = ()
     rnf (Single x) = rnf x
-    rnf (Deep _ pr m sf) = rnf pr `seq` rnf m `seq` rnf sf
+    rnf (Deep _ pr m sf) = rnf pr `seq` rnf sf `seq` rnf m
 
 {-# INLINE deep #-}
 deep            :: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> FingerTree a


From git at git.haskell.org  Fri Dec 18 22:08:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:43 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #61 from treeowl/master (f9c23af)
Message-ID: <20151218220843.643773A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f9c23af0c7396aaf457ce9916392c7f949b60384

>---------------------------------------------------------------

commit f9c23af0c7396aaf457ce9916392c7f949b60384
Merge: 530fc76 7dfdc33
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 9 07:11:13 2014 +0100

    Merge pull request #61 from treeowl/master
    
    Force prefix and suffix before middle



>---------------------------------------------------------------

f9c23af0c7396aaf457ce9916392c7f949b60384
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:08:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:45 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Tighten Safe Haskell bounds,
 fixes new warning in GHC 7.10. (245ef13)
Message-ID: <20151218220845.6D61A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/245ef135eb8701fcd139770e564f25e774d26422

>---------------------------------------------------------------

commit 245ef135eb8701fcd139770e564f25e774d26422
Author: David Terei <code at davidterei.com>
Date:   Wed Nov 12 18:19:51 2014 -0800

    Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.


>---------------------------------------------------------------

245ef135eb8701fcd139770e564f25e774d26422
 Data/IntMap.hs           | 2 +-
 Data/IntMap/Lazy.hs      | 2 +-
 Data/IntMap/Strict.hs    | 4 +++-
 Data/Utils/StrictFold.hs | 2 +-
 Data/Utils/StrictPair.hs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Data/IntMap.hs b/Data/IntMap.hs
index 29ca3f5..52b05c2 100644
--- a/Data/IntMap.hs
+++ b/Data/IntMap.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Lazy.hs b/Data/IntMap/Lazy.hs
index ab89e1a..62bf835 100644
--- a/Data/IntMap/Lazy.hs
+++ b/Data/IntMap/Lazy.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 3a7dde8..f1c363c 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
-#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
 -----------------------------------------------------------------------------
diff --git a/Data/Utils/StrictFold.hs b/Data/Utils/StrictFold.hs
index 953c9f1..b080e8a 100644
--- a/Data/Utils/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictFold (foldlStrict) where
 
diff --git a/Data/Utils/StrictPair.hs b/Data/Utils/StrictPair.hs
index 6ae7ded..0c01ca4 100644
--- a/Data/Utils/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictPair (StrictPair(..), toPair) where
 


From git at git.haskell.org  Fri Dec 18 22:08:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:47 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add support for `deepseq-1.4` (667cf94)
Message-ID: <20151218220847.751473A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/667cf94c6826738429485b806354d1e92136ba56

>---------------------------------------------------------------

commit 667cf94c6826738429485b806354d1e92136ba56
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 14 16:09:27 2014 +0100

    Add support for `deepseq-1.4`
    
    This change avoids relying on `rnf`'s default method implementation
    which has changed in `deepseq-1.4.0.0`


>---------------------------------------------------------------

667cf94c6826738429485b806354d1e92136ba56
 Data/IntSet/Base.hs |  4 ++--
 containers.cabal    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index b6f8014..6333eea 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -162,7 +162,7 @@ module Data.IntSet.Base (
     , bitmapOf
     ) where
 
-import Control.DeepSeq (NFData)
+import Control.DeepSeq (NFData(rnf))
 import Data.Bits
 import qualified Data.List as List
 import Data.Maybe (fromMaybe)
@@ -1099,7 +1099,7 @@ INSTANCE_TYPEABLE0(IntSet,intSetTc,"IntSet")
 -- The IntSet constructors consist only of strict fields of Ints and
 -- IntSets, thus the default NFData instance which evaluates to whnf
 -- should suffice
-instance NFData IntSet
+instance NFData IntSet where rnf x = seq x ()
 
 {--------------------------------------------------------------------
   Debugging
diff --git a/containers.cabal b/containers.cabal
index 815882e..050257c 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -31,7 +31,7 @@ source-repository head
     location: http://github.com/haskell/containers.git
 
 Library
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5
     if impl(ghc>=6.10)
         build-depends: ghc-prim
 
@@ -83,7 +83,7 @@ Test-suite map-lazy-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -100,7 +100,7 @@ Test-suite map-strict-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING -DSTRICT
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -117,7 +117,7 @@ Test-suite set-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -134,7 +134,7 @@ Test-suite intmap-lazy-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -151,7 +151,7 @@ Test-suite intmap-strict-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING -DSTRICT
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -168,7 +168,7 @@ Test-suite intset-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -185,7 +185,7 @@ Test-suite deprecated-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -200,7 +200,7 @@ Test-suite seq-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -218,7 +218,7 @@ test-suite map-strictness-properties
     array,
     base >= 4.2 && < 5,
     ChasingBottoms,
-    deepseq >= 1.2 && < 1.4,
+    deepseq >= 1.2 && < 1.5,
     QuickCheck >= 2.4.0.1,
     ghc-prim,
     test-framework >= 0.3.3,
@@ -235,7 +235,7 @@ test-suite intmap-strictness-properties
     array,
     base >= 4.2 && < 5,
     ChasingBottoms,
-    deepseq >= 1.2 && < 1.4,
+    deepseq >= 1.2 && < 1.5,
     QuickCheck >= 2.4.0.1,
     ghc-prim,
     test-framework >= 0.3.3,


From git at git.haskell.org  Fri Dec 18 22:08:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:49 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #65 from dterei/safe710fixes (09ae752)
Message-ID: <20151218220849.7BFA83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/09ae752eeffd06e24ffb4abeabcd6511dea0e68e

>---------------------------------------------------------------

commit 09ae752eeffd06e24ffb4abeabcd6511dea0e68e
Merge: f9c23af 245ef13
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 14 16:15:41 2014 +0100

    Merge pull request #65 from dterei/safe710fixes
    
    Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.



>---------------------------------------------------------------

09ae752eeffd06e24ffb4abeabcd6511dea0e68e
 Data/IntMap.hs           | 2 +-
 Data/IntMap/Lazy.hs      | 2 +-
 Data/IntMap/Strict.hs    | 4 +++-
 Data/Utils/StrictFold.hs | 2 +-
 Data/Utils/StrictPair.hs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:08:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:51 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #67 from hvr/pr-deepseq-14 (c802c36)
Message-ID: <20151218220851.841873A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c802c36dbed4b800d8c2131181f5af3db837aded

>---------------------------------------------------------------

commit c802c36dbed4b800d8c2131181f5af3db837aded
Merge: 09ae752 667cf94
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 14 16:27:16 2014 +0100

    Merge pull request #67 from hvr/pr-deepseq-14
    
    Add support for `deepseq-1.4`



>---------------------------------------------------------------

c802c36dbed4b800d8c2131181f5af3db837aded
 Data/IntSet/Base.hs |  4 ++--
 containers.cabal    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:08:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:53 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Improve Foldable methods (c4884ad)
Message-ID: <20151218220853.8C8DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c4884ad0d7310e62c48ebd23600d73230718ae45

>---------------------------------------------------------------

commit c4884ad0d7310e62c48ebd23600d73230718ae45
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Nov 17 17:48:10 2014 -0500

    Improve Foldable methods
    
    Define foldMap for Seq directly, instead of relying on the default
    based on foldr.
    
    Define length and null for ViewR directly, instead of relying on
    (inappropriate) defaults.


>---------------------------------------------------------------

c4884ad0d7310e62c48ebd23600d73230718ae45
 Data/Sequence.hs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1952b1c..0c2be04 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -149,7 +149,7 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), foldl', toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
 import Data.Traversable
 import Data.Typeable
 
@@ -188,6 +188,7 @@ instance Functor Seq where
 #endif
 
 instance Foldable Seq where
+    foldMap f (Seq xs) = foldMap (foldMap f) xs
     foldr f z (Seq xs) = foldr (flip (foldr f)) z xs
     foldl f z (Seq xs) = foldl (foldl f) z xs
 
@@ -310,6 +311,11 @@ instance Sized a => Sized (FingerTree a) where
     size (Deep v _ _ _)     = v
 
 instance Foldable FingerTree where
+    foldMap _ Empty = mempty
+    foldMap f (Single x) = f x
+    foldMap f (Deep _ pr m sf) =
+        foldMap f pr `mappend` (foldMap (foldMap f) m `mappend` foldMap f sf)
+
     foldr _ z Empty = z
     foldr f z (Single x) = x `f` z
     foldr f z (Deep _ pr m sf) =
@@ -388,6 +394,11 @@ data Digit a
 #endif
 
 instance Foldable Digit where
+    foldMap f (One a) = f a
+    foldMap f (Two a b) = f a `mappend` f b
+    foldMap f (Three a b c) = f a `mappend` (f b `mappend` f c)
+    foldMap f (Four a b c d) = f a `mappend` (f b `mappend` (f c `mappend` f d))
+
     foldr f z (One a) = a `f` z
     foldr f z (Two a b) = a `f` (b `f` z)
     foldr f z (Three a b c) = a `f` (b `f` (c `f` z))
@@ -458,6 +469,9 @@ data Node a
 #endif
 
 instance Foldable Node where
+    foldMap f (Node2 _ a b) = f a `mappend` f b
+    foldMap f (Node3 _ a b c) = f a `mappend` (f b `mappend` f c)
+
     foldr f z (Node2 _ a b) = a `f` (b `f` z)
     foldr f z (Node3 _ a b c) = a `f` (b `f` (c `f` z))
 
@@ -508,6 +522,7 @@ instance Functor Elem where
     fmap f (Elem x) = Elem (f x)
 
 instance Foldable Elem where
+    foldMap f (Elem x) = f x
     foldr f z (Elem x) = f x z
     foldl f z (Elem x) = f z x
 
@@ -1009,6 +1024,9 @@ instance Functor ViewR where
     fmap f (xs :> x)    = fmap f xs :> f x
 
 instance Foldable ViewR where
+    foldMap _ EmptyR = mempty
+    foldMap f (xs :> x) = foldMap f xs `mappend` f x
+
     foldr _ z EmptyR = z
     foldr f z (xs :> x) = foldr f (f x z) xs
 
@@ -1017,6 +1035,14 @@ instance Foldable ViewR where
 
     foldr1 _ EmptyR = error "foldr1: empty view"
     foldr1 f (xs :> x) = foldr f x xs
+#if MIN_VERSION_base(4,8,0)
+    -- The default definitions are sensible for ViewL, but not so much for
+    -- ViewR.
+    null EmptyR = True
+    null (_ :> _) = False
+
+    length = foldr' (\_ k -> k+1) 0
+#endif
 
 instance Traversable ViewR where
     traverse _ EmptyR       = pure EmptyR


From git at git.haskell.org  Fri Dec 18 22:08:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:55 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #68 from treeowl/foldmapseq (94fa013)
Message-ID: <20151218220855.94C233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/94fa01318f3a575eb3045956415827b582ac9fb8

>---------------------------------------------------------------

commit 94fa01318f3a575eb3045956415827b582ac9fb8
Merge: c802c36 c4884ad
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 10:31:01 2014 +0100

    Merge pull request #68 from treeowl/foldmapseq
    
    Improve Foldable methods



>---------------------------------------------------------------

94fa01318f3a575eb3045956415827b582ac9fb8
 Data/Sequence.hs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:08:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:57 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Implement fmap/coerce rules (ad24ce6)
Message-ID: <20151218220857.A2E043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88

>---------------------------------------------------------------

commit ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Nov 13 00:16:28 2014 -0500

    Implement fmap/coerce rules
    
    Implement fmap/coerce rules for Map, Sequence, and Tree. One concern:
    unfortunately, implementing the RULES forces the LANGUAGE to be turned
    from Safe to Trustworthy.  This is rather sad. An alternative would be
    to do this in another module, but orphan rules are not so lovely either.


>---------------------------------------------------------------

ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88
 Data/Map/Base.hs               | 24 +++++++++++++++++-------
 Data/Map/Strict.hs             | 19 ++++++++++++++++++-
 Data/Sequence.hs               | 27 ++++++++++++++++++++-------
 Data/Tree.hs                   | 29 ++++++++++++++++++++++-------
 tests-ghc/all.T                |  3 +++
 tests-ghc/mapcoercemap.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercemap.stdout  |  3 +++
 tests-ghc/mapcoerceseq.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoerceseq.stdout  |  3 +++
 tests-ghc/mapcoercesmap.hs     | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercesmap.stdout |  3 +++
 11 files changed, 164 insertions(+), 22 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88

From git at git.haskell.org  Fri Dec 18 22:08:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:08:59 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #66 from treeowl/seqfmapcoerce (e083f68)
Message-ID: <20151218220859.ADB273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e083f683d833d6ffd98b7b91f27c1e10a2cded97

>---------------------------------------------------------------

commit e083f683d833d6ffd98b7b91f27c1e10a2cded97
Merge: 94fa013 ad24ce6
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 14:50:46 2014 +0100

    Merge pull request #66 from treeowl/seqfmapcoerce
    
    Implement fmap/coerce rules



>---------------------------------------------------------------

e083f683d833d6ffd98b7b91f27c1e10a2cded97
 Data/Map/Base.hs               | 24 +++++++++++++++++-------
 Data/Map/Strict.hs             | 19 ++++++++++++++++++-
 Data/Sequence.hs               | 27 ++++++++++++++++++++-------
 Data/Tree.hs                   | 29 ++++++++++++++++++++++-------
 tests-ghc/all.T                |  3 +++
 tests-ghc/mapcoercemap.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercemap.stdout  |  3 +++
 tests-ghc/mapcoerceseq.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoerceseq.stdout  |  3 +++
 tests-ghc/mapcoercesmap.hs     | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercesmap.stdout |  3 +++
 11 files changed, 164 insertions(+), 22 deletions(-)

diff --cc Data/Sequence.hs
index 0c2be04,0bef765..1c4e143
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@@ -187,8 -189,18 +189,19 @@@ instance Functor Seq wher
      x <$ s = replicate (length s) x
  #endif
  
+ fmapSeq :: (a -> b) -> Seq a -> Seq b
+ fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
+ #if MIN_VERSION_base(4,8,0)
+ -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
+ -- well enough with RULES to do what we want.
+ {-# NOINLINE [1] fmapSeq #-}
+ {-# RULES
+ "fmapSeq/coerce" fmapSeq coerce = coerce
+  #-}
+ #endif
+ 
  instance Foldable Seq where
 +    foldMap f (Seq xs) = foldMap (foldMap f) xs
      foldr f z (Seq xs) = foldr (flip (foldr f)) z xs
      foldl f z (Seq xs) = foldl (foldl f) z xs
  


From git at git.haskell.org  Fri Dec 18 22:09:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:01 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add fmap/fmap rules (352c73d)
Message-ID: <20151218220901.BB3DB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/352c73dca04572fc843417518b9f5dd684c1792c

>---------------------------------------------------------------

commit 352c73dca04572fc843417518b9f5dd684c1792c
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Nov 18 09:41:29 2014 -0500

    Add fmap/fmap rules
    
    Specifically, fuse map, mapWithIndex, mapWithKey, etc., with each
    other.


>---------------------------------------------------------------

352c73dca04572fc843417518b9f5dd684c1792c
 Data/IntMap/Base.hs   | 19 +++++++++++++++++++
 Data/IntMap/Strict.hs | 19 +++++++++++++++++++
 Data/Map/Base.hs      | 19 ++++++++++++++++++-
 Data/Map/Strict.hs    | 24 +++++++++++++++++++++---
 Data/Sequence.hs      | 19 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 007e41e..3832e1c 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -1301,6 +1301,13 @@ map f t
       Tip k x     -> Tip k (f x)
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
+
 -- | /O(n)/. Map a function over all values in the map.
 --
 -- > let f key x = (show key) ++ ":" ++ x
@@ -1313,6 +1320,18 @@ mapWithKey f t
       Tip k x     -> Tip k (f k x)
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/.
 -- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index f1c363c..af44b2a 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -718,6 +718,13 @@ map f t
       Tip k x     -> Tip k $! f x
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
+
 -- | /O(n)/. Map a function over all values in the map.
 --
 -- > let f key x = (show key) ++ ":" ++ x
@@ -730,6 +737,18 @@ mapWithKey f t
       Tip k x     -> Tip k $! f k x
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/. The function @'mapAccum'@ threads an accumulating
 -- argument through the map in ascending order of keys.
 --
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 89b851e..3911125 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1662,10 +1662,15 @@ mapEitherWithKey f0 t0 = toPair $ go f0 t0
 map :: (a -> b) -> Map k a -> Map k b
 map _ Tip = Tip
 map f (Bin sx kx x l r) = Bin sx kx (f x) (map f l) (map f r)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] map #-}
 {-# RULES
 "map/coerce" map coerce = coerce
  #-}
@@ -1680,6 +1685,18 @@ mapWithKey :: (k -> a -> b) -> Map k a -> Map k b
 mapWithKey _ Tip = Tip
 mapWithKey f (Bin sx kx x l r) = Bin sx kx (f kx x) (mapWithKey f l) (mapWithKey f r)
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/.
 -- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 8c7ea0f..6255e91 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -935,10 +935,15 @@ mapEitherWithKey f0 t0 = toPair $ go f0 t0
 map :: (a -> b) -> Map k a -> Map k b
 map _ Tip = Tip
 map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f r)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] map #-}
 {-# RULES
 "mapSeq/coerce" map coerce = coerce
  #-}
@@ -951,8 +956,21 @@ map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f
 
 mapWithKey :: (k -> a -> b) -> Map k a -> Map k b
 mapWithKey _ Tip = Tip
-mapWithKey f (Bin sx kx x l r) = let x' = f kx x
-                                 in x' `seq` Bin sx kx x' (mapWithKey f l) (mapWithKey f r)
+mapWithKey f (Bin sx kx x l r) =
+  let x' = f kx x
+  in x' `seq` Bin sx kx x' (mapWithKey f l) (mapWithKey f r)
+
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
 
 -- | /O(n)/. The function 'mapAccum' threads an accumulating
 -- argument through the map in ascending order of keys.
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1c4e143..fe59172 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -191,10 +191,15 @@ instance Functor Seq where
 
 fmapSeq :: (a -> b) -> Seq a -> Seq b
 fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] fmapSeq #-}
+{-# RULES
+"fmapSeq/fmapSeq" forall f g xs . fmapSeq f (fmapSeq g xs) = fmapSeq (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] fmapSeq #-}
 {-# RULES
 "fmapSeq/coerce" fmapSeq coerce = coerce
  #-}
@@ -1265,6 +1270,18 @@ adjustDigit f i (Four a b c d)
 mapWithIndex :: (Int -> a -> b) -> Seq a -> Seq b
 mapWithIndex f xs = snd (mapAccumL' (\ i x -> (i + 1, f i x)) 0 xs)
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithIndex #-}
+{-# RULES
+"mapWithIndex/mapWithIndex" forall f g xs . mapWithIndex f (mapWithIndex g xs) =
+  mapWithIndex (\k a -> f k (g k a)) xs
+"mapWithIndex/fmapSeq" forall f g xs . mapWithIndex f (fmapSeq g xs) =
+  mapWithIndex (\k a -> f k (g a)) xs
+"fmapSeq/mapWithIndex" forall f g xs . fmapSeq f (mapWithIndex g xs) =
+  mapWithIndex (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.


From git at git.haskell.org  Fri Dec 18 22:09:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:03 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #69 from treeowl/fmapfmap (b2c1c79)
Message-ID: <20151218220903.C43183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b2c1c79893c4b112d98f82dccb006b7453dc4f21

>---------------------------------------------------------------

commit b2c1c79893c4b112d98f82dccb006b7453dc4f21
Merge: e083f68 352c73d
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 16:44:20 2014 +0100

    Merge pull request #69 from treeowl/fmapfmap
    
    Add fmap/fmap rules



>---------------------------------------------------------------

b2c1c79893c4b112d98f82dccb006b7453dc4f21
 Data/IntMap/Base.hs   | 19 +++++++++++++++++++
 Data/IntMap/Strict.hs | 19 +++++++++++++++++++
 Data/Map/Base.hs      | 19 ++++++++++++++++++-
 Data/Map/Strict.hs    | 24 +++++++++++++++++++++---
 Data/Sequence.hs      | 19 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 5 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:09:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:05 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Implement map/coerce for IntMap (ee3eb5f)
Message-ID: <20151218220905.CF8E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ee3eb5f19dbbd193e7c8b991c861f8568c7106d9

>---------------------------------------------------------------

commit ee3eb5f19dbbd193e7c8b991c861f8568c7106d9
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Nov 18 17:39:18 2014 -0500

    Implement map/coerce for IntMap
    
    I realized what I was doing with MIN_VERSION was kind of silly.
    The easy/sane thing to do is really to use __GLASGOW_HASKELL__
    for the coercion stuff.


>---------------------------------------------------------------

ee3eb5f19dbbd193e7c8b991c861f8568c7106d9
 Data/IntMap/Base.hs                                | 23 +++++++++++++++-------
 Data/IntMap/Strict.hs                              | 12 ++++++++---
 tests-ghc/all.T                                    |  2 ++
 tests-ghc/{mapcoercemap.hs => mapcoerceintmap.hs}  |  8 ++++----
 ...{mapcoercemap.stdout => mapcoerceintmap.stdout} |  0
 .../{mapcoercemap.hs => mapcoerceintmapstrict.hs}  | 14 ++++++-------
 ...emap.stdout => mapcoerceintmapstrict.hs.stdout} |  0
 7 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 3832e1c..d5fd75a 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -9,6 +9,13 @@
 #if __GLASGOW_HASKELL__ >= 708
 {-# LANGUAGE TypeFamilies #-}
 #endif
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntMap.Base
@@ -240,6 +247,9 @@ import qualified GHC.Exts as GHCExts
 #endif
 import Text.Read
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+import Data.Coerce
+#endif
 
 -- Use macros to define strictness of functions.
 -- STRICT_x_OF_y denotes an y-ary function strict in the x-th parameter.
@@ -247,13 +257,6 @@ import Text.Read
 -- want the compilers to be compiled by as many compilers as possible.
 #define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
 
--- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
--- Nevertheless, as a convenience, we also allow compiling without cabal by
--- defining trivial MIN_VERSION_base if needed.
-#ifndef MIN_VERSION_base
-#define MIN_VERSION_base(major1,major2,minor) 0
-#endif
-
 
 -- A "Nat" is a natural machine word (an unsigned Int)
 type Nat = Word
@@ -1307,6 +1310,12 @@ map f t
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not play well with RULES yet.
+{-# RULES
+"map/coerce" map coerce = coerce
+ #-}
+#endif
 
 -- | /O(n)/. Map a function over all values in the map.
 --
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index af44b2a..d7f45f7 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE CPP #-}
-#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 709
-{-# LANGUAGE Safe #-}
-#elif !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
 -----------------------------------------------------------------------------
@@ -262,6 +260,9 @@ import qualified Data.IntSet.Base as IntSet
 import Data.Utils.BitUtil
 import Data.Utils.StrictFold
 import Data.Utils.StrictPair
+#if __GLASGOW_HASKELL__ >= 709
+import Data.Coerce
+#endif
 
 -- $strictness
 --
@@ -724,6 +725,11 @@ map f t
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+{-# RULES
+"map/coerce" map coerce = coerce
+ #-}
+#endif
 
 -- | /O(n)/. Map a function over all values in the map.
 --
diff --git a/tests-ghc/all.T b/tests-ghc/all.T
index 6a8a339..eba1dcc 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/all.T
@@ -8,3 +8,5 @@ test('sequence001', normal, compile_and_run, ['-package containers'])
 test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
+test('mapcoerceintmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
+test('mapcoerceintmapstrict', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/mapcoerceintmap.hs
similarity index 76%
copy from tests-ghc/mapcoercemap.hs
copy to tests-ghc/mapcoerceintmap.hs
index 6dd336d..ded48c7 100644
--- a/tests-ghc/mapcoercemap.hs
+++ b/tests-ghc/mapcoerceintmap.hs
@@ -2,15 +2,15 @@
 
 import GHC.Exts hiding (fromList)
 import Unsafe.Coerce
-import Data.Map
+import Data.IntMap.Lazy
 
 newtype Age = Age Int
 
-fooAge :: Map Int Int -> Map Int Age
+fooAge :: IntMap Int -> IntMap Age
 fooAge = fmap Age
-fooCoerce :: Map Int Int -> Map Int Age
+fooCoerce :: IntMap Int -> IntMap Age
 fooCoerce = fmap coerce
-fooUnsafeCoerce :: Map Int Int -> Map Int Age
+fooUnsafeCoerce :: IntMap Int -> IntMap Age
 fooUnsafeCoerce = fmap unsafeCoerce
 
 same :: a -> b -> IO ()
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/mapcoerceintmap.stdout
similarity index 100%
copy from tests-ghc/mapcoercemap.stdout
copy to tests-ghc/mapcoerceintmap.stdout
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/mapcoerceintmapstrict.hs
similarity index 61%
copy from tests-ghc/mapcoercemap.hs
copy to tests-ghc/mapcoerceintmapstrict.hs
index 6dd336d..2e97004 100644
--- a/tests-ghc/mapcoercemap.hs
+++ b/tests-ghc/mapcoerceintmapstrict.hs
@@ -2,16 +2,16 @@
 
 import GHC.Exts hiding (fromList)
 import Unsafe.Coerce
-import Data.Map
+import Data.IntMap.Strict as IM
 
 newtype Age = Age Int
 
-fooAge :: Map Int Int -> Map Int Age
-fooAge = fmap Age
-fooCoerce :: Map Int Int -> Map Int Age
-fooCoerce = fmap coerce
-fooUnsafeCoerce :: Map Int Int -> Map Int Age
-fooUnsafeCoerce = fmap unsafeCoerce
+fooAge :: IntMap Int -> IntMap Age
+fooAge = IM.map Age
+fooCoerce :: IntMap Int -> IntMap Age
+fooCoerce = IM.map coerce
+fooUnsafeCoerce :: IntMap Int -> IntMap Age
+fooUnsafeCoerce = IM.map unsafeCoerce
 
 same :: a -> b -> IO ()
 same x y = case reallyUnsafePtrEquality# (unsafeCoerce x) y of
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/mapcoerceintmapstrict.hs.stdout
similarity index 100%
copy from tests-ghc/mapcoercemap.stdout
copy to tests-ghc/mapcoerceintmapstrict.hs.stdout


From git at git.haskell.org  Fri Dec 18 22:09:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:07 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Optimize *> and >> for Seq (22ef7de)
Message-ID: <20151218220907.D67823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0

>---------------------------------------------------------------

commit 22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Nov 19 15:14:01 2014 -0500

    Optimize *> and >> for Seq
    
    Based on a discussion with Ross Paterson, use a multiplication-
    by-doubling algorithm to improve asymptotic time and space
    performance.


>---------------------------------------------------------------

22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0
 Data/Sequence.hs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1c4e143..2cfa9c7 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -228,11 +228,13 @@ instance Monad Seq where
     return = singleton
     xs >>= f = foldl' add empty xs
       where add ys x = ys >< f x
+    (>>) = (*>)
 
 instance Applicative Seq where
     pure = singleton
     fs <*> xs = foldl' add empty fs
       where add ys f = ys >< fmap f xs
+    xs *> ys = replicateSeq (length xs) ys
 
 instance MonadPlus Seq where
     mzero = empty
@@ -655,6 +657,19 @@ replicateM n x
   | n >= 0      = unwrapMonad (replicateA n (WrapMonad x))
   | otherwise   = error "replicateM takes a nonnegative integer argument"
 
+-- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
+replicateSeq :: Int -> Seq a -> Seq a
+replicateSeq n xs
+  | n < 0     = error "replicateSeq takes a nonnegative integer argument"
+  | n == 0    = empty
+  | otherwise = go n xs
+  where
+    -- Invariant: k >= 1
+    go 1 xs = xs
+    go k xs | even k    = kxs
+            | otherwise = xs >< kxs
+            where kxs = go (k `quot` 2) $! (xs >< xs)
+
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.
 (<|)            :: a -> Seq a -> Seq a


From git at git.haskell.org  Fri Dec 18 22:09:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:09 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #71 from treeowl/fmapcoerceintmap (bcebc7a)
Message-ID: <20151218220909.E189B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bcebc7af8d347d6229836847cd09ce6971dd6db4

>---------------------------------------------------------------

commit bcebc7af8d347d6229836847cd09ce6971dd6db4
Merge: b2c1c79 ee3eb5f
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 07:56:17 2014 +0100

    Merge pull request #71 from treeowl/fmapcoerceintmap
    
    Implement map/coerce for IntMap



>---------------------------------------------------------------

bcebc7af8d347d6229836847cd09ce6971dd6db4
 Data/IntMap/Base.hs                                | 23 +++++++++++++++-------
 Data/IntMap/Strict.hs                              | 12 ++++++++---
 tests-ghc/all.T                                    |  2 ++
 tests-ghc/{mapcoercemap.hs => mapcoerceintmap.hs}  |  8 ++++----
 ...{mapcoercemap.stdout => mapcoerceintmap.stdout} |  0
 .../{mapcoercemap.hs => mapcoerceintmapstrict.hs}  | 14 ++++++-------
 ...emap.stdout => mapcoerceintmapstrict.hs.stdout} |  0
 7 files changed, 38 insertions(+), 21 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:09:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:11 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #72 from treeowl/then (dde7a53)
Message-ID: <20151218220911.E84543A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/dde7a531b506096ae32b358c2dc83f3edac91ec2

>---------------------------------------------------------------

commit dde7a531b506096ae32b358c2dc83f3edac91ec2
Merge: bcebc7a 22ef7de
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 08:06:03 2014 +0100

    Merge pull request #72 from treeowl/then
    
    Optimize *> and >> for Seq



>---------------------------------------------------------------

dde7a531b506096ae32b358c2dc83f3edac91ec2
 Data/Sequence.hs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)



From git at git.haskell.org  Fri Dec 18 22:09:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:13 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use GHC version for coercion rules (8da46db)
Message-ID: <20151218220913.F26703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/8da46dbc4598062397c6a6b684f7bae9931f3d80

>---------------------------------------------------------------

commit 8da46dbc4598062397c6a6b684f7bae9931f3d80
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Nov 21 10:14:38 2014 -0500

    Use GHC version for coercion rules
    
    Using the library version didn't make much sense, especially since the
    tests-ghc tests had to switch on compiler version anyway, but also
    because compiling without cabal would prevent the code from being used.
    The conditional fake MIN_VERSION_base definition should probably stay up
    top where I moved it, though, in case someone needs to use it to adjust
    imports or exports in the future--the top seems an inherently better
    place for that.


>---------------------------------------------------------------

8da46dbc4598062397c6a6b684f7bae9931f3d80
 Data/Map/Base.hs   | 7 +++----
 Data/Map/Strict.hs | 7 +++----
 Data/Sequence.hs   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 3911125..e582e16 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -294,7 +294,7 @@ import qualified GHC.Exts as GHCExts
 import Text.Read
 import Data.Data
 #endif
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -1668,9 +1668,8 @@ map f (Bin sx kx x l r) = Bin sx kx (f x) (map f l) (map f r)
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "map/coerce" map coerce = coerce
  #-}
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 6255e91..88f494e 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -279,7 +279,7 @@ import Data.Utils.StrictFold
 import Data.Utils.StrictPair
 
 import Data.Bits (shiftL, shiftR)
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -941,9 +941,8 @@ map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "mapSeq/coerce" map coerce = coerce
  #-}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 331ac30..4799056 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -165,7 +165,7 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
 #endif
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -197,9 +197,8 @@ fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
 "fmapSeq/fmapSeq" forall f g xs . fmapSeq f (fmapSeq g xs) = fmapSeq (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "fmapSeq/coerce" fmapSeq coerce = coerce
  #-}


From git at git.haskell.org  Fri Dec 18 22:09:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:16 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #75 from treeowl/coerce-version (ddf12fd)
Message-ID: <20151218220916.069C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ddf12fd51a0611cba8250bdbde9fdcbb66211b1d

>---------------------------------------------------------------

commit ddf12fd51a0611cba8250bdbde9fdcbb66211b1d
Merge: dde7a53 8da46db
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 18:50:11 2014 +0100

    Merge pull request #75 from treeowl/coerce-version
    
    Use GHC version for coercion rules



>---------------------------------------------------------------

ddf12fd51a0611cba8250bdbde9fdcbb66211b1d
 Data/Map/Base.hs   | 7 +++----
 Data/Map/Strict.hs | 7 +++----
 Data/Sequence.hs   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:09:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:18 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use Data.Functor.Identity (bd7b470)
Message-ID: <20151218220918.0DDAA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bd7b470abda94c486c784fd7d6c69dd91e0ae2be

>---------------------------------------------------------------

commit bd7b470abda94c486c784fd7d6c69dd91e0ae2be
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Nov 21 11:25:58 2014 -0500

    Use Data.Functor.Identity
    
    This has just entered base, and includes some optimizations that may or
    may not be relevant. For older versions, don't bother making Identity a
    Monad instance--it's not exported, and that instance is never used.
    Make applicativeTree slightly more readable.


>---------------------------------------------------------------

bd7b470abda94c486c784fd7d6c69dd91e0ae2be
 Data/Sequence.hs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4799056..4e37dbf 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -168,6 +168,9 @@ import Data.Data
 #if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
+#if MIN_VERSION_base(4,8,0)
+import Data.Functor.Identity (Identity(..))
+#endif
 
 
 infixr 5 `consTree`
@@ -554,19 +557,16 @@ instance NFData a => NFData (Elem a) where
 -------------------------------------------------------
 -- Applicative construction
 -------------------------------------------------------
+#if !MIN_VERSION_base(4,8,0)
+newtype Identity a = Identity {runIdentity :: a}
 
-newtype Id a = Id {runId :: a}
-
-instance Functor Id where
-    fmap f (Id x) = Id (f x)
-
-instance Monad Id where
-    return = Id
-    m >>= k = k (runId m)
+instance Functor Identity where
+    fmap f (Identity x) = Identity (f x)
 
-instance Applicative Id where
-    pure = return
-    (<*>) = ap
+instance Applicative Identity where
+    pure = Identity
+    Identity f <*> Identity x = Identity (f x)
+#endif
 
 -- | This is essentially a clone of Control.Monad.State.Strict.
 newtype State s a = State {runState :: s -> (s, a)}
@@ -598,13 +598,13 @@ mapAccumL' f s t = runState (traverse (State . flip f) t) s
 -- specified.  This is a generalization of 'replicateA', which itself
 -- is a generalization of many Data.Sequence methods.
 {-# SPECIALIZE applicativeTree :: Int -> Int -> State s a -> State s (FingerTree a) #-}
-{-# SPECIALIZE applicativeTree :: Int -> Int -> Id a -> Id (FingerTree a) #-}
--- Special note: the Id specialization automatically does node sharing,
+{-# SPECIALIZE applicativeTree :: Int -> Int -> Identity a -> Identity (FingerTree a) #-}
+-- Special note: the Identity specialization automatically does node sharing,
 -- reducing memory usage of the resulting tree to /O(log n)/.
 applicativeTree :: Applicative f => Int -> Int -> f a -> f (FingerTree a)
 applicativeTree n mSize m = mSize `seq` case n of
     0 -> pure Empty
-    1 -> liftA Single m
+    1 -> fmap Single m
     2 -> deepA one emptyTree one
     3 -> deepA two emptyTree one
     4 -> deepA two emptyTree two
@@ -612,12 +612,12 @@ applicativeTree n mSize m = mSize `seq` case n of
     6 -> deepA three emptyTree three
     7 -> deepA four emptyTree three
     8 -> deepA four emptyTree four
-    _ -> let (q, r) = n `quotRem` 3 in q `seq` case r of
-        0 -> deepA three (applicativeTree (q - 2) mSize' n3) three
-        1 -> deepA four (applicativeTree (q - 2) mSize' n3) three
-        _ -> deepA four (applicativeTree (q - 2) mSize' n3) four
+    _ -> case n `quotRem` 3 of
+           (q,0) -> deepA three (applicativeTree (q - 2) mSize' n3) three
+           (q,1) -> deepA four  (applicativeTree (q - 2) mSize' n3) three
+           (q,_) -> deepA four  (applicativeTree (q - 2) mSize' n3) four
   where
-    one = liftA One m
+    one = fmap One m
     two = liftA2 Two m m
     three = liftA3 Three m m m
     four = liftA3 Four m m m <*> m
@@ -641,7 +641,7 @@ singleton x     =  Seq (Single (Elem x))
 -- | /O(log n)/. @replicate n x@ is a sequence consisting of @n@ copies of @x at .
 replicate       :: Int -> a -> Seq a
 replicate n x
-  | n >= 0      = runId (replicateA n (Id x))
+  | n >= 0      = runIdentity (replicateA n (Identity x))
   | otherwise   = error "replicate takes a nonnegative integer argument"
 
 -- | 'replicateA' is an 'Applicative' version of 'replicate', and makes


From git at git.haskell.org  Fri Dec 18 22:09:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:22 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make index middle-lazy (aedfe3f)
Message-ID: <20151218220922.1E2B23A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/aedfe3f327f781484ec6fb4718156919791c4979

>---------------------------------------------------------------

commit aedfe3f327f781484ec6fb4718156919791c4979
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sun Nov 23 15:36:39 2014 -0500

    Make index middle-lazy
    
    `index` should not descend the finger tree spine unless it needs
    to.


>---------------------------------------------------------------

aedfe3f327f781484ec6fb4718156919791c4979
 Data/Sequence.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4e37dbf..511cad9 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1159,14 +1159,14 @@ data Place a = Place {-# UNPACK #-} !Int a
 lookupTree :: Sized a => Int -> FingerTree a -> Place a
 lookupTree _ Empty = error "lookupTree of empty tree"
 lookupTree i (Single x) = Place i x
-lookupTree i (Deep _ pr m sf)
+lookupTree i (Deep totalSize pr m sf)
   | i < spr     =  lookupDigit i pr
   | i < spm     =  case lookupTree (i - spr) m of
                    Place i' xs -> lookupNode i' xs
   | otherwise   =  lookupDigit (i - spm) sf
   where
     spr     = size pr
-    spm     = spr + size m
+    spm     = totalSize - size sf
 
 {-# SPECIALIZE lookupNode :: Int -> Node (Elem a) -> Place (Elem a) #-}
 {-# SPECIALIZE lookupNode :: Int -> Node (Node a) -> Place (Node a) #-}


From git at git.haskell.org  Fri Dec 18 22:09:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:24 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #80 from treeowl/fix-index (e1e75b8)
Message-ID: <20151218220924.253D73A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e1e75b83e3f4bd4bf4031d01d3cec56428c2be33

>---------------------------------------------------------------

commit e1e75b83e3f4bd4bf4031d01d3cec56428c2be33
Merge: c138008 aedfe3f
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 23 23:05:14 2014 +0100

    Merge pull request #80 from treeowl/fix-index
    
    Make index middle-lazy



>---------------------------------------------------------------

e1e75b83e3f4bd4bf4031d01d3cec56428c2be33
 Data/Sequence.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:09:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:20 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #76 from treeowl/identity (c138008)
Message-ID: <20151218220920.15C043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c1380089319e24ce1373b6cd0a027f7447b45d32

>---------------------------------------------------------------

commit c1380089319e24ce1373b6cd0a027f7447b45d32
Merge: ddf12fd bd7b470
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 19:56:10 2014 +0100

    Merge pull request #76 from treeowl/identity
    
    Use Data.Functor.Identity



>---------------------------------------------------------------

c1380089319e24ce1373b6cd0a027f7447b45d32
 Data/Sequence.hs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:09:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:26 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add an IsList instance for Data.Sequence.Seq (1931ecf)
Message-ID: <20151218220926.2D6443A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1931ecf7da3d4e4ead4bd1ef5f5ed07807893339

>---------------------------------------------------------------

commit 1931ecf7da3d4e4ead4bd1ef5f5ed07807893339
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 17:16:39 2014 -0500

    Add an IsList instance for Data.Sequence.Seq


>---------------------------------------------------------------

1931ecf7da3d4e4ead4bd1ef5f5ed07807893339
 Data/Sequence.hs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 511cad9..757f677 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -5,6 +5,9 @@
 #if __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
 -- Nevertheless, as a convenience, we also allow compiling without cabal by
 -- defining trivial MIN_VERSION_base if needed.
@@ -171,7 +174,9 @@ import Data.Coerce
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif
-
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts
+#endif
 
 infixr 5 `consTree`
 infixl 5 `snocTree`
@@ -1655,6 +1660,13 @@ findIndicesR p xs = foldlWithIndex g [] xs
 fromList        :: [a] -> Seq a
 fromList        =  Data.List.foldl' (|>) empty
 
+#if __GLASGOW_HASKELL__ >= 708
+instance GHC.Exts.IsList (Seq a) where
+    type Item (Seq a) = a
+    fromList = fromList
+    toList = toList
+#endif
+
 ------------------------------------------------------------------------
 -- Reverse
 ------------------------------------------------------------------------


From git at git.haskell.org  Fri Dec 18 22:09:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:28 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #85 from treeowl/islist (cd5a854)
Message-ID: <20151218220928.3518E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cd5a854691c34dbea4a7fddd166095b7d2f0b3e0

>---------------------------------------------------------------

commit cd5a854691c34dbea4a7fddd166095b7d2f0b3e0
Merge: e1e75b8 1931ecf
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 4 10:01:51 2014 +0100

    Merge pull request #85 from treeowl/islist
    
    Add an IsList instance for Data.Sequence.Seq



>---------------------------------------------------------------

cd5a854691c34dbea4a7fddd166095b7d2f0b3e0
 Data/Sequence.hs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:09:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:30 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make version-appropriate Foldable imports (39e9ee9)
Message-ID: <20151218220930.3CCDF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/39e9ee9992269eb2ad3a9b7e608457c6d1a92b04

>---------------------------------------------------------------

commit 39e9ee9992269eb2ad3a9b7e608457c6d1a92b04
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 4 10:59:22 2014 -0500

    Make version-appropriate Foldable imports
    
    foldl' and foldr' moved into the Foldable class, then toList.
    This gets rid of a warning about the imports.


>---------------------------------------------------------------

39e9ee9992269eb2ad3a9b7e608457c6d1a92b04
 Data/Sequence.hs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 511cad9..88faf62 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -155,7 +155,15 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
+#if MIN_VERSION_base(4,8,0)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
+#else
+#if MIN_VERSION_base(4,6,0)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr'), toList)
+#else
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
+#endif
+#endif
 import Data.Traversable
 import Data.Typeable
 


From git at git.haskell.org  Fri Dec 18 22:09:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:32 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #86 from treeowl/foldableimports (f22d14b)
Message-ID: <20151218220932.446683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f22d14b56e2c70d6525436a178912c7010bd5169

>---------------------------------------------------------------

commit f22d14b56e2c70d6525436a178912c7010bd5169
Merge: cd5a854 39e9ee9
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Dec 5 07:12:40 2014 +0100

    Merge pull request #86 from treeowl/foldableimports
    
    Make version-appropriate Foldable imports



>---------------------------------------------------------------

f22d14b56e2c70d6525436a178912c7010bd5169
 Data/Sequence.hs | 8 ++++++++
 1 file changed, 8 insertions(+)



From git at git.haskell.org  Fri Dec 18 22:09:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:34 +0000 (UTC)
Subject: [commit: packages/containers]
 develop-0.6,develop-0.6-questionable,master,zip-devel: Specialize
 splitTraverse; strictify pair splitting (7e6d75f)
Message-ID: <20151218220934.4BFAD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285

>---------------------------------------------------------------

commit 7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 13:27:41 2014 -0500

    Specialize splitTraverse; strictify pair splitting
    
    Explicitly specialize `splitTraverse` functions to the necessary types.
    This has no immediate performance impact, but makes it clearer what the
    functions are about. Make splitting pairs a bit stricter; we don't need
    that much laziness.


>---------------------------------------------------------------

7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 10d3a92..9955584 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1726,14 +1726,18 @@ instance Splittable (Seq a) where
     splitState = splitAt
 
 instance (Splittable a, Splittable b) => Splittable (a, b) where
-    splitState i (a, b) = ((al, bl), (ar, br))
+    splitState i (a, b) = (al `seq` bl `seq` (al, bl), ar `seq` br `seq` (ar, br))
       where
         (al, ar) = splitState i a
         (bl, br) = splitState i b
 
+{-# SPECIALIZE splitTraverseSeq :: (Seq x -> a -> b) -> Seq x -> Seq a -> Seq b #-}
+{-# SPECIALIZE splitTraverseSeq :: ((Seq x, Seq y) -> a -> b) -> (Seq x, Seq y) -> Seq a -> Seq b #-}
 splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b
 splitTraverseSeq f s (Seq xs) = Seq $ splitTraverseTree (\s' (Elem a) -> Elem (f s' a)) s xs
 
+{-# SPECIALIZE splitTraverseTree :: (Seq x -> Elem y -> b) -> Seq x -> FingerTree (Elem y) -> FingerTree b #-}
+{-# SPECIALIZE splitTraverseTree :: (Seq x -> Node y -> b) -> Seq x -> FingerTree (Node y) -> FingerTree b #-}
 splitTraverseTree :: (Sized a, Splittable s) => (s -> a -> b) -> s -> FingerTree a -> FingerTree b
 splitTraverseTree _f _s Empty = Empty
 splitTraverseTree f s (Single xs) = Single $ f s xs
@@ -1742,6 +1746,8 @@ splitTraverseTree f s (Deep n pr m sf) = Deep n (splitTraverseDigit f prs pr) (s
     (prs, r) = splitState (size pr) s
     (ms, sfs) = splitState (n - size pr - size sf) r
 
+{-# SPECIALIZE splitTraverseDigit :: (Seq x -> Elem y -> b) -> Seq x -> Digit (Elem y) -> Digit b #-}
+{-# SPECIALIZE splitTraverseDigit :: (Seq x -> Node y -> b) -> Seq x -> Digit (Node y) -> Digit b #-}
 splitTraverseDigit :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Digit a -> Digit b
 splitTraverseDigit f s (One a) = One (f s a)
 splitTraverseDigit f s (Two a b) = Two (f first a) (f second b)
@@ -1757,6 +1763,8 @@ splitTraverseDigit f s (Four a b c d) = Four (f first a) (f second b) (f third c
     (middle, fourth) = splitState (size b + size c) s'
     (second, third) = splitState (size b) middle
 
+{-# SPECIALIZE splitTraverseNode :: (Seq x -> Elem y -> b) -> Seq x -> Node (Elem y) -> Node b #-}
+{-# SPECIALIZE splitTraverseNode :: (Seq x -> Node y -> b) -> Seq x -> Node (Node y) -> Node b #-}
 splitTraverseNode :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Node a -> Node b
 splitTraverseNode f s (Node2 ns a b) = Node2 ns (f first a) (f second b)
   where


From git at git.haskell.org  Fri Dec 18 22:09:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:36 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make zipWith faster (31e1234)
Message-ID: <20151218220936.53F503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/31e1234435ae734bbf3d33a79e9cce89d06ac738

>---------------------------------------------------------------

commit 31e1234435ae734bbf3d33a79e9cce89d06ac738
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Dec 2 17:09:49 2014 -0500

    Make zipWith faster
    
    Make `zipWith` build its result with the structure of its first
    argument, splitting up its second argument as it goes. This allows
    fast random access to the elements of the results immediately,
    without having to build large portions of the structure. It also
    seems to be slightly faster than the old implementation when the
    entire result is used, presumably by avoiding rebalancing costs.
    I believe most of this code will also help implement a fast
    `(<*>)`.
    
    Use the same approach to implement `zipWith3` and `zipWith4`.
    
    Clean up a couple warnings.
    
    Many thanks to Carter Schonwald for suggesting that I use the
    structure of the first sequence to structure the result, and for
    helping me come up with the splitTraverse approach.
    
    Benchmarks:
    
    Zipping two 100000 element lists and extracting the 50000th element
    takes about 11.4ms with the new implementation, as opposed to 88ms with
    the old. Zipping two 10000 element sequences and forcing the result to
    normal form takes 4.0ms now rather than 19.7ms. The indexing gains show
    up for even very short sequences, but the new implementation really
    starts to look good once the size gets to around 1000--presumably it
    handles cache effects better than the old one. Note that the naive
    approach of converting sequences to lists, zipping them, and then
    converting back, actually works very well for forcing short sequences to
    normal form, even better than the new implementation. But it starts to
    lose a lot of ground by the time the size gets to around 10000, and its
    performance on the indexing tests is bad.


>---------------------------------------------------------------

31e1234435ae734bbf3d33a79e9cce89d06ac738
 Data/Sequence.hs | 106 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 92 insertions(+), 14 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b54f1e6..10d3a92 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -676,10 +676,10 @@ replicateM n x
 
 -- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
 replicateSeq :: Int -> Seq a -> Seq a
-replicateSeq n xs
+replicateSeq n s
   | n < 0     = error "replicateSeq takes a nonnegative integer argument"
   | n == 0    = empty
-  | otherwise = go n xs
+  | otherwise = go n s
   where
     -- Invariant: k >= 1
     go 1 xs = xs
@@ -1703,6 +1703,75 @@ reverseNode f (Node2 s a b) = Node2 s (f b) (f a)
 reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 
 ------------------------------------------------------------------------
+-- Traversing with splittable "state"
+------------------------------------------------------------------------
+
+-- For zipping, and probably also for (<*>), it is useful to build a result by
+-- traversing a sequence while splitting up something else.  For zipping, we
+-- traverse the first sequence while splitting up the second [and third [and
+-- fourth]]. For fs <*> xs, we expect soon to traverse
+--
+-- > replicate (length fs * length xs) ()
+--
+-- while splitting something essentially equivalent to
+--
+-- > fmap (\f -> fmap f xs) fs
+--
+-- David Feuer, with excellent guidance from Carter Schonwald, December 2014
+
+class Splittable s where
+    splitState :: Int -> s -> (s,s)
+
+instance Splittable (Seq a) where
+    splitState = splitAt
+
+instance (Splittable a, Splittable b) => Splittable (a, b) where
+    splitState i (a, b) = ((al, bl), (ar, br))
+      where
+        (al, ar) = splitState i a
+        (bl, br) = splitState i b
+
+splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b
+splitTraverseSeq f s (Seq xs) = Seq $ splitTraverseTree (\s' (Elem a) -> Elem (f s' a)) s xs
+
+splitTraverseTree :: (Sized a, Splittable s) => (s -> a -> b) -> s -> FingerTree a -> FingerTree b
+splitTraverseTree _f _s Empty = Empty
+splitTraverseTree f s (Single xs) = Single $ f s xs
+splitTraverseTree f s (Deep n pr m sf) = Deep n (splitTraverseDigit f prs pr) (splitTraverseTree (splitTraverseNode f) ms m) (splitTraverseDigit f sfs sf)
+  where
+    (prs, r) = splitState (size pr) s
+    (ms, sfs) = splitState (n - size pr - size sf) r
+
+splitTraverseDigit :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Digit a -> Digit b
+splitTraverseDigit f s (One a) = One (f s a)
+splitTraverseDigit f s (Two a b) = Two (f first a) (f second b)
+  where
+    (first, second) = splitState (size a) s
+splitTraverseDigit f s (Three a b c) = Three (f first a) (f second b) (f third c)
+  where
+    (first, r) = splitState (size a) s
+    (second, third) = splitState (size b) r
+splitTraverseDigit f s (Four a b c d) = Four (f first a) (f second b) (f third c) (f fourth d)
+  where
+    (first, s') = splitState (size a) s
+    (middle, fourth) = splitState (size b + size c) s'
+    (second, third) = splitState (size b) middle
+
+splitTraverseNode :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Node a -> Node b
+splitTraverseNode f s (Node2 ns a b) = Node2 ns (f first a) (f second b)
+  where
+    (first, second) = splitState (size a) s
+splitTraverseNode f s (Node3 ns a b c) = Node3 ns (f first a) (f second b) (f third c)
+  where
+    (first, r) = splitState (size a) s
+    (second, third) = splitState (size b) r
+
+getSingleton :: Seq a -> a
+getSingleton (Seq (Single (Elem a))) = a
+getSingleton (Seq Empty) = error "getSingleton: Empty"
+getSingleton _ = error "getSingleton: Not a singleton."
+
+------------------------------------------------------------------------
 -- Zipping
 ------------------------------------------------------------------------
 
@@ -1717,17 +1786,11 @@ zip = zipWith (,)
 -- For example, @zipWith (+)@ is applied to two sequences to take the
 -- sequence of corresponding sums.
 zipWith :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith f xs ys
-  | length xs <= length ys      = zipWith' f xs ys
-  | otherwise                   = zipWith' (flip f) ys xs
-
--- like 'zipWith', but assumes length xs <= length ys
-zipWith' :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith' f xs ys = snd (mapAccumL k ys xs)
+zipWith f s1 s2 = splitTraverseSeq (\s a -> f a (getSingleton s)) s2' s1'
   where
-    k kys x = case viewl kys of
-           (z :< zs) -> (zs, f x z)
-           EmptyL    -> error "zipWith': unexpected EmptyL"
+    minLen = min (length s1) (length s2)
+    s1' = take minLen s1
+    s2' = take minLen s2
 
 -- | /O(min(n1,n2,n3))/.  'zip3' takes three sequences and returns a
 -- sequence of triples, analogous to 'zip'.
@@ -1738,7 +1801,14 @@ zip3 = zipWith3 (,,)
 -- three elements, as well as three sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith3 :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
-zipWith3 f s1 s2 s3 = zipWith ($) (zipWith f s1 s2) s3
+zipWith3 f s1 s2 s3 = splitTraverseSeq (\s a ->
+    case s of
+      (b, c) -> f a (getSingleton b) (getSingleton c)) (s2', s3') s1'
+  where
+    minLen = minimum [length s1, length s2, length s3]
+    s1' = take minLen s1
+    s2' = take minLen s2
+    s3' = take minLen s3
 
 -- | /O(min(n1,n2,n3,n4))/.  'zip4' takes four sequences and returns a
 -- sequence of quadruples, analogous to 'zip'.
@@ -1749,7 +1819,15 @@ zip4 = zipWith4 (,,,)
 -- four elements, as well as four sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith4 :: (a -> b -> c -> d -> e) -> Seq a -> Seq b -> Seq c -> Seq d -> Seq e
-zipWith4 f s1 s2 s3 s4 = zipWith ($) (zipWith ($) (zipWith f s1 s2) s3) s4
+zipWith4 f s1 s2 s3 s4 = splitTraverseSeq (\s a ->
+    case s of
+      (b, (c, d)) -> f a (getSingleton b) (getSingleton c) (getSingleton d)) (s2', (s3', s4')) s1'
+  where
+    minLen = minimum [length s1, length s2, length s3, length s4]
+    s1' = take minLen s1
+    s2' = take minLen s2
+    s3' = take minLen s3
+    s4' = take minLen s4
 
 ------------------------------------------------------------------------
 -- Sorting


From git at git.haskell.org  Fri Dec 18 22:09:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:38 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add zip benchmarks (cdf173f)
Message-ID: <20151218220938.5BE273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cdf173f4cb1f792a4ac54b939bf197c214abcd43

>---------------------------------------------------------------

commit cdf173f4cb1f792a4ac54b939bf197c214abcd43
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 12:31:45 2014 -0500

    Add zip benchmarks


>---------------------------------------------------------------

cdf173f4cb1f792a4ac54b939bf197c214abcd43
 benchmarks/Sequence.hs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8c18582..ccaca6c 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -20,10 +20,16 @@ main = do
         r1000 = rlist 1000
     rnf [r10, r100, r1000] `seq` return ()
     defaultMain
-        [ bench "splitAt/append 10" $ nf (shuffle r10) s10
-        , bench "splitAt/append 100" $ nf (shuffle r100) s100
-        , bench "splitAt/append 1000" $ nf (shuffle r1000) s1000
-        ]
+      [ bgroup "splitAt/append"
+         [ bench "10" $ nf (shuffle r10) s10
+         , bench "100" $ nf (shuffle r100) s100
+         , bench "1000" $ nf (shuffle r1000) s1000
+         ]
+      , bgroup "zip"
+         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
+         , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
+         , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
+         ] ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Fri Dec 18 22:09:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:40 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Nix the Splittable class;
 add fromFunction (4abaee4)
Message-ID: <20151218220940.65D853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4abaee4c2edadc13413a78848c6eea0558ec06c8

>---------------------------------------------------------------

commit 4abaee4c2edadc13413a78848c6eea0558ec06c8
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 00:23:44 2014 -0500

    Nix the Splittable class; add fromFunction
    
    Also export splitTraverse, and write mapWithIndex using
    a hand-unboxed mapWithIndex#.


>---------------------------------------------------------------

4abaee4c2edadc13413a78848c6eea0558ec06c8
 Data/Sequence.hs | 220 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 142 insertions(+), 78 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4abaee4c2edadc13413a78848c6eea0558ec06c8

From git at git.haskell.org  Fri Dec 18 22:09:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:42 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add comments explaining the splitting traversal (c0e8c7d)
Message-ID: <20151218220942.6CFAF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c0e8c7d9e135527a188c5a932cab1e96c11c1de5

>---------------------------------------------------------------

commit c0e8c7d9e135527a188c5a932cab1e96c11c1de5
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 4 11:50:20 2014 -0500

    Add comments explaining the splitting traversal
    
    Why it's a good idea, how it works, and what the benchmarks
    say.


>---------------------------------------------------------------

c0e8c7d9e135527a188c5a932cab1e96c11c1de5
 Data/Sequence.hs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9955584..212c926 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -128,6 +128,7 @@ module Data.Sequence (
     foldlWithIndex, -- :: (b -> Int -> a -> b) -> b -> Seq a -> b
     foldrWithIndex, -- :: (Int -> a -> b -> b) -> b -> Seq a -> b
     -- * Transformations
+    genSplitTraverseSeq,
     mapWithIndex,   -- :: (Int -> a -> b) -> Seq a -> Seq b
     reverse,        -- :: Seq a -> Seq a
     -- ** Zips
@@ -1709,7 +1710,7 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- For zipping, and probably also for (<*>), it is useful to build a result by
 -- traversing a sequence while splitting up something else.  For zipping, we
 -- traverse the first sequence while splitting up the second [and third [and
--- fourth]]. For fs <*> xs, we expect soon to traverse
+-- fourth]]. For fs <*> xs, we hope to traverse
 --
 -- > replicate (length fs * length xs) ()
 --
@@ -1717,6 +1718,51 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 --
 -- > fmap (\f -> fmap f xs) fs
 --
+-- What makes all this crazy code a good idea:
+--
+-- Suppose we zip together two sequences of the same length:
+--
+-- zs = zip xs ys
+--
+-- We want to get reasonably fast indexing into zs immediately, rather than
+-- needing to construct the entire thing first, as the previous implementation
+-- required. The first aspect is that we build the result "outside-in" or
+-- "top-down", rather than left to right. That gives us access to both ends
+-- quickly. But that's not enough, by itself, to give immediate access to the
+-- center of zs. For that, we need to be able to skip over larger segments of
+-- zs, delaying their construction until we actually need them. The way we do
+-- this is to traverse xs, while splitting up ys according to the structure of
+-- xs. If we have a Deep _ pr m sf, we split ys into three pieces, and hand off
+-- one piece to the prefix, one to the middle, and one to the suffix of the
+-- result. The key point is that we don't need to actually do anything further
+-- with those pieces until we actually need them; the computations to split
+-- them up further and zip them with their matching pieces can be delayed until
+-- they're actually needed. We do the same thing for Digits (splitting into
+-- between one and four pieces) and Nodes (splitting into two or three). The
+-- ultimate result is that we can index, or split at, any location in zs in
+-- O(log(min{i,n-i})) time *immediately*, with only a constant-factor slowdown
+-- as thunks are forced along the path.
+--
+-- Benchmark info, and alternatives:
+--
+-- The old zipping code used mapAccumL to traverse the first sequence while
+-- cutting down the second sequence one piece at a time.
+--
+-- An alternative way to express that basic idea is to convert both sequences
+-- to lists, zip the lists, and then convert the result back to a sequence.
+-- I'll call this the "listy" implementation.
+--
+-- I benchmarked two operations: Each started by zipping two sequences
+-- constructed with replicate and/or fromList. The first would then immediately
+-- index into the result. The second would apply deepseq to force the entire
+-- result.  The new implementation worked much better than either of the others
+-- on the immediate indexing test, as expected. It also worked better than the
+-- old implementation for all the deepseq tests. For short sequences, the listy
+-- implementation outperformed all the others on the deepseq test. However, the
+-- splitting implementation caught up and surpassed it once the sequences grew
+-- long enough. It seems likely that by avoiding rebuilding, it interacts
+-- better with the cache hierarchy.
+--
 -- David Feuer, with excellent guidance from Carter Schonwald, December 2014
 
 class Splittable s where
@@ -1731,6 +1777,16 @@ instance (Splittable a, Splittable b) => Splittable (a, b) where
         (al, ar) = splitState i a
         (bl, br) = splitState i b
 
+data GenSplittable s = GenSplittable s (Int -> s -> (s,s))
+instance Splittable (GenSplittable s) where
+    splitState i (GenSplittable s spl) = (GenSplittable l spl, GenSplittable r spl)
+      where
+        (l,r) = spl i s
+
+{-# INLINE genSplitTraverseSeq #-}
+genSplitTraverseSeq :: (Int -> s -> (s, s)) -> (s -> a -> b) -> s -> Seq a -> Seq b
+genSplitTraverseSeq spl f s = splitTraverseSeq (\(GenSplittable s _) -> f s) (GenSplittable s spl)
+
 {-# SPECIALIZE splitTraverseSeq :: (Seq x -> a -> b) -> Seq x -> Seq a -> Seq b #-}
 {-# SPECIALIZE splitTraverseSeq :: ((Seq x, Seq y) -> a -> b) -> (Seq x, Seq y) -> Seq a -> Seq b #-}
 splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b


From git at git.haskell.org  Fri Dec 18 22:09:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:44 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Make <*> fast (73c06d4)
Message-ID: <20151218220944.74E0E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/73c06d4421aaca2dc3c06d07d452d3e8f586ecf4

>---------------------------------------------------------------

commit 73c06d4421aaca2dc3c06d07d452d3e8f586ecf4
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 18:46:49 2014 -0500

    Make <*> fast
    
    Use the `splitTraverse` mechanism to implement `<*>` with optimal
    incremental performance. Stop exporting `splitTraverse`.
    
    Many thanks to Joachim Breitner for writing the splitting code for
    this.


>---------------------------------------------------------------

73c06d4421aaca2dc3c06d07d452d3e8f586ecf4
 Data/Sequence.hs | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9e78ce1..f7d551c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -133,7 +133,6 @@ module Data.Sequence (
     -- * Transformations
     mapWithIndex,   -- :: (Int -> a -> b) -> Seq a -> Seq b
     reverse,        -- :: Seq a -> Seq a
-    splitTraverse,  -- :: (Int -> s -> (s, s)) -> (s -> a -> b) -> s -> Seq a -> Seq b
     -- ** Zips
     zip,            -- :: Seq a -> Seq b -> Seq (a, b)
     zipWith,        -- :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
@@ -257,10 +256,65 @@ instance Monad Seq where
 
 instance Applicative Seq where
     pure = singleton
-    fs <*> xs = foldl' add empty fs
-      where add ys f = ys >< fmap f xs
+
+    Seq Empty <*> _ = empty
+    _ <*> Seq Empty = empty
+    Seq (Single (Elem f)) <*> xs = fmap f xs
+    fs <*> Seq (Single (Elem x)) = fmap ($x) fs
+    fs <*> xs = splitTraverse splitCPs
+                              (\s _ -> uncurry ($) (getSingletonCPs s))
+                              (createCPs fs xs)
+                              (replicate (length fs * length xs) ())
+
     xs *> ys = replicateSeq (length xs) ys
 
+-- The splitCPs code below, for splitting ragged-ended Cartesian products,
+-- was generously provided by Joachim Breitner.
+
+data CPs x y =
+      CPs (Seq x)
+          (Seq y)
+          {-# UNPACK #-} !Int {- beginning column -}
+          {-# UNPACK #-} !Int {- last column -}
+    | SingleCPs x (Seq y)
+#ifdef TESTING
+    deriving Show
+#endif
+
+-- Note: The total length of CPs xs ys fc lc  is
+-- (length xs - 1) * length ys - fc + lc + 1
+
+-- Create a non-trivial Cps given two sequences
+createCPs :: Seq x -> Seq y -> CPs x y
+createCPs xs ys = CPs xs ys 0 (length ys - 1)
+
+-- Smart constructor
+mkCPs :: Seq x -> Seq y -> Int -> Int -> CPs x y
+mkCPs (Seq (Single (Elem x))) ys fc lc = SingleCPs x (drop fc $ take (lc+1) ys)
+mkCPs xs ys fc lc = CPs xs ys fc lc
+
+splitCPs:: Int -> CPs x y -> (CPs x y, CPs x y)
+splitCPs n (SingleCPs x ys)
+    = ( SingleCPs x ys1, SingleCPs x ys2 )
+  where (ys1, ys2) = splitAt n ys
+splitCPs n (CPs xs ys fc lc)
+    = ( mkCPs (take r_end xs)   ys fc      c_end
+      , mkCPs (drop r_begin xs) ys c_begin lc
+      )
+  where
+    -- Coordinates of the beginning of the second chunk
+    (r_begin,  -- number of rows that do not go into the second chunk
+     c_begin) = (n + fc) `quotRem` length ys
+
+    -- Coordinates of the end of the first chunk
+    r_end | c_begin == 0 = r_begin     -- cut nicely along rows, keep the other rows
+          | otherwise    = r_begin + 1 -- we need to keep one row in both chunks
+    c_end = (c_begin - 1 + length ys) `rem` length ys
+
+getSingletonCPs :: CPs x y -> (x, y)
+getSingletonCPs (SingleCPs x ys) = (x, getSingleton ys)
+getSingletonCPs _ = error "getSingletonCPs: Not a singleton"
+
 instance MonadPlus Seq where
     mzero = empty
     mplus = (><)
@@ -1370,7 +1424,6 @@ mapWithIndex# f (Seq xs) = Seq $ mapWithIndexTree# (\s (Elem a) -> Elem (f s a))
       !(I# sb) = size b
       !sPsa = s +# sa
       !sPsab = sPsa +# sb
-      
 #endif
 
 -- | /O(n)/. Convert a given sequence length and a function representing that


From git at git.haskell.org  Fri Dec 18 22:09:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:46 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Update benchmark running
 script to new Criterion options. (83f32bc)
Message-ID: <20151218220946.7B3313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/83f32bcf58a43dfec32a4151d2f677635da7e5cd

>---------------------------------------------------------------

commit 83f32bcf58a43dfec32a4151d2f677635da7e5cd
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 14:57:04 2014 +0100

    Update benchmark running script to new Criterion options.


>---------------------------------------------------------------

83f32bcf58a43dfec32a4151d2f677635da7e5cd
 benchmarks/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 1539a2a..ff45493 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,7 +4,7 @@ bench-%: %.hs force
 	ghc -O2 -DTESTING $< -i../$(TOP) -o $@ -outputdir tmp -rtsopts
 
 bench-%.csv: bench-%
-	./bench-$* $(BENCHMARK) -v -u bench-$*.csv
+	./bench-$* $(BENCHMARK) -v 2 --csv bench-$*.csv
 
 .PHONY: force clean veryclean
 force:


From git at git.haskell.org  Fri Dec 18 22:09:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:48 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Add simple fromFunction
 benchmark. (fc87eee)
Message-ID: <20151218220948.830633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fc87eeefa5907559b2669a16baed03db79f82981

>---------------------------------------------------------------

commit fc87eeefa5907559b2669a16baed03db79f82981
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 14:57:24 2014 +0100

    Add simple fromFunction benchmark.


>---------------------------------------------------------------

fc87eeefa5907559b2669a16baed03db79f82981
 benchmarks/Sequence.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index ccaca6c..58e1114 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -29,7 +29,13 @@ main = do
          [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
          , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
          , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
-         ] ]
+         ]
+      , bgroup "fromFunction"
+         [ bench "ix10000/5000" $ nf (\size -> S.fromFunction size id `S.index` (size `div` 2)) 10000
+         , bench "nf100" $ nf (\size -> S.fromFunction size id) 100
+         , bench "nf10000" $ nf (\size -> S.fromFunction size id) 10000
+         ]
+      ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Fri Dec 18 22:09:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:50 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Add simple mapWithIndex
 benchmark. (0f3ac0b)
Message-ID: <20151218220950.891303A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0f3ac0b3e48f49e5565b692f2abcb2219895d145

>---------------------------------------------------------------

commit 0f3ac0b3e48f49e5565b692f2abcb2219895d145
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 15:43:09 2014 +0100

    Add simple mapWithIndex benchmark.


>---------------------------------------------------------------

0f3ac0b3e48f49e5565b692f2abcb2219895d145
 benchmarks/Sequence.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 58e1114..5ae2cd3 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -12,7 +12,8 @@ main = do
     let s10 = S.fromList [1..10] :: S.Seq Int
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
-    rnf [s10, s100, s1000] `seq` return ()
+        s10000 = S.fromList [1..10000] :: S.Seq Int
+    rnf [s10, s100, s1000, s10000] `seq` return ()
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
@@ -35,6 +36,11 @@ main = do
          , bench "nf100" $ nf (\size -> S.fromFunction size id) 100
          , bench "nf10000" $ nf (\size -> S.fromFunction size id) 10000
          ]
+      , bgroup "mapWithIndex"
+         [ bench "ix10000/5000" $ nf (S.mapWithIndex (+)) s10000
+         , bench "nf100" $ nf (S.mapWithIndex (+)) s100
+         , bench "nf10000" $ nf (S.mapWithIndex (+)) s10000
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Fri Dec 18 22:09:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:52 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Direct implementation of
 fromFunction. (ce7f531)
Message-ID: <20151218220952.916343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6

>---------------------------------------------------------------

commit ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 16:16:59 2014 +0100

    Direct implementation of fromFunction.
    
    We avoid using Four Digit, so that elements can be added to the
    new Seq without forcing a large rebuild.


>---------------------------------------------------------------

ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6
 Data/Sequence.hs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f7d551c..4f7eb86 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1429,7 +1429,28 @@ mapWithIndex# f (Seq xs) = Seq $ mapWithIndexTree# (\s (Elem a) -> Elem (f s a))
 -- | /O(n)/. Convert a given sequence length and a function representing that
 -- sequence into a sequence.
 fromFunction :: Int -> (Int -> a) -> Seq a
-fromFunction len f = mapWithIndex (\i _ -> f i) (replicate len ())
+fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with negative len"
+                   | len == 0 = empty
+                   | otherwise = Seq $ create (Elem . f) 1 0 len
+ where
+  create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
+  create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = case trees of
+    1 -> Single $ b i
+    2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
+    3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
+    4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
+    5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
+    6 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
+    _ -> case trees `quotRem` 3 of
+      (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
+                         (Two (b (i+(2+3*(trees'-1))*s)) (b (i+(3+3*(trees'-1))*s)))
+      (trees',2) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-1))
+                         (Two (b (i+(3+3*(trees'-1))*s)) (b (i+(4+3*(trees'-1))*s)))
+      (trees',0) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-2))
+                         (Three (b (i+(3+3*(trees'-2))*s)) (b (i+(4+3*(trees'-2))*s)) (b (i+(5+3*(trees'-2))*s)))
 
 -- Splitting
 


From git at git.haskell.org  Fri Dec 18 22:09:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:54 +0000 (UTC)
Subject: [commit: packages/containers]
 develop-0.6,develop-0.6-questionable,master: Nix the Splittable class;
 add fromFunction (41cc152)
Message-ID: <20151218220954.9970A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/41cc1523f99cecfd93efed16abab28eebd873abb

>---------------------------------------------------------------

commit 41cc1523f99cecfd93efed16abab28eebd873abb
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 00:23:44 2014 -0500

    Nix the Splittable class; add fromFunction
    
    Write mapWithIndex using
    a hand-unboxed mapWithIndex#.
    
    Make `split` strict, and add an internal strict `splitAt'`. This
    helps `zipWith` a little.


>---------------------------------------------------------------

41cc1523f99cecfd93efed16abab28eebd873abb
 Data/Sequence.hs | 249 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 167 insertions(+), 82 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 41cc1523f99cecfd93efed16abab28eebd873abb

From git at git.haskell.org  Fri Dec 18 22:09:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:56 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Simplify zipWith3 and zipWith4 to reduce code size (58f3597)
Message-ID: <20151218220956.A20C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/58f359787438f18dc7fbfe25f115654bd28ac94b

>---------------------------------------------------------------

commit 58f359787438f18dc7fbfe25f115654bd28ac94b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 10 18:33:27 2014 -0500

    Simplify zipWith3 and zipWith4 to reduce code size
    
    The performance impact isn't worth the code blowup.
    
    Also, fix a bug in `fromFunction`.


>---------------------------------------------------------------

58f359787438f18dc7fbfe25f115654bd28ac94b
 Data/Sequence.hs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 29a19b3..62d76b3 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1382,7 +1382,7 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
     3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
     4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
     5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
-    6 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
+    6 -> Deep (6*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
     _ -> case trees `quotRem` 3 of
       (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
                          (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
@@ -1937,12 +1937,16 @@ zip = zipWith (,)
 -- For example, @zipWith (+)@ is applied to two sequences to take the
 -- sequence of corresponding sums.
 zipWith :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith f s1 s2 = splitMap splitAt' (\s a -> f a (getSingleton s)) s2' s1'
+zipWith f s1 s2 = zipWith' f s1' s2'
   where
     minLen = min (length s1) (length s2)
     s1' = take minLen s1
     s2' = take minLen s2
 
+-- | A version of zipWith that assumes the sequences have the same length.
+zipWith' :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
+zipWith' f s1 s2 = splitMap splitAt' (\s a -> f a (getSingleton s)) s2 s1
+
 -- | /O(min(n1,n2,n3))/.  'zip3' takes three sequences and returns a
 -- sequence of triples, analogous to 'zip'.
 zip3 :: Seq a -> Seq b -> Seq c -> Seq (a,b,c)
@@ -1952,14 +1956,16 @@ zip3 = zipWith3 (,,)
 -- three elements, as well as three sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith3 :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
-zipWith3 f s1 s2 s3 = splitMap (\i (s,t) -> case (splitAt' i s, splitAt' i t) of ((s', s''), (t', t'')) -> ((s',t'),(s'',t'')))
-    (\(b,c) a -> f a (getSingleton b) (getSingleton c)) (s2',s3') s1'
+zipWith3 f s1 s2 s3 = zipWith' ($) (zipWith' f s1' s2') s3'
   where
     minLen = minimum [length s1, length s2, length s3]
     s1' = take minLen s1
     s2' = take minLen s2
     s3' = take minLen s3
 
+zipWith3' :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
+zipWith3' f s1 s2 s3 = zipWith' ($) (zipWith' f s1 s2) s3
+
 -- | /O(min(n1,n2,n3,n4))/.  'zip4' takes four sequences and returns a
 -- sequence of quadruples, analogous to 'zip'.
 zip4 :: Seq a -> Seq b -> Seq c -> Seq d -> Seq (a,b,c,d)
@@ -1969,8 +1975,7 @@ zip4 = zipWith4 (,,,)
 -- four elements, as well as four sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith4 :: (a -> b -> c -> d -> e) -> Seq a -> Seq b -> Seq c -> Seq d -> Seq e
-zipWith4 f s1 s2 s3 s4 = splitMap (\i (s,t,u) -> case (splitAt' i s, splitAt' i t, splitAt' i u) of ((s',s''),(t',t''),(u',u'')) -> ((s',t',u'),(s'',t'',u'')))
-  (\(b, c, d) a -> f a (getSingleton b) (getSingleton c) (getSingleton d)) (s2',s3',s4') s1'
+zipWith4 f s1 s2 s3 s4 = zipWith' ($) (zipWith3' f s1' s2' s3') s4'
   where
     minLen = minimum [length s1, length s2, length s3, length s4]
     s1' = take minLen s1


From git at git.haskell.org  Fri Dec 18 22:09:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:09:58 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Revert the fromFunction shallowing (d8c9008)
Message-ID: <20151218220958.AA1103A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d8c90085755397b0180a349385fdd1b1820ae1aa

>---------------------------------------------------------------

commit d8c90085755397b0180a349385fdd1b1820ae1aa
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 11 21:21:38 2014 -0500

    Revert the fromFunction shallowing
    
    I don't actually know whether we want it shallower or "safer".
    Make `fromFunction` easier to read.


>---------------------------------------------------------------

d8c90085755397b0180a349385fdd1b1820ae1aa
 Data/Sequence.hs | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 62d76b3..f3fbbe7 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1374,25 +1374,29 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 #else
                    | otherwise = Seq $ create (Elem . f) 1 0 len
 #endif
- where
-  create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
-  create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
-    1 -> Single $ b i
-    2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
-    3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
-    4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
-    5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
-    6 -> Deep (6*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
-    _ -> case trees `quotRem` 3 of
-      (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
-                         (Two (b (i+(2+3*(trees'-1))*s)) (b (i+(3+3*(trees'-1))*s)))
-      (trees',2) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-1))
-                         (Two (b (i+(3+3*(trees'-1))*s)) (b (i+(4+3*(trees'-1))*s)))
-      (trees',0) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-2))
-                         (Three (b (i+(3+3*(trees'-2))*s)) (b (i+(4+3*(trees'-2))*s)) (b (i+(5+3*(trees'-2))*s)))
+  where
+    create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
+    create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
+       1 -> Single $ b i
+       2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
+       3 -> Deep (3*s) (createTwo b s i) Empty (One (b (i+2*s)))
+       4 -> Deep (4*s) (createTwo b s i) Empty (createTwo b s (i+2*s))
+       5 -> Deep (5*s) (createThree b s i) Empty (createTwo b s (i+3*s))
+       6 -> Deep (6*s) (createThree b s i) Empty (createThree b s (i+3*s))
+       _ -> case trees `quotRem` 3 of
+           (trees', 1) -> Deep (trees*s) (createTwo b s i)
+                              (create mb (3*s) (i+2*s) (trees'-1))
+                              (createTwo b s (i+(2+3*(trees'-1))*s))
+           (trees', 2) -> Deep (trees*s) (createThree b s i)
+                              (create mb (3*s) (i+3*s) (trees'-1))
+                              (createTwo b s (i+(3+3*(trees'-1))*s))
+           (trees', 0) -> Deep (trees*s) (createThree b s i)
+                              (create mb (3*s) (i+3*s) (trees'-2))
+                              (createThree b s (i+(3+3*(trees'-2))*s))
+      where
+        createTwo b s i = Two (b i) (b (i + s))
+        createThree b s i = Three (b i) (b (i + s)) (b (i + s + s))
+        mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
 
 -- Splitting
 


From git at git.haskell.org  Fri Dec 18 22:10:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:00 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Rename strictness tests to match other test names. (7e42d81)
Message-ID: <20151218221000.B10B33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7e42d81350aac6db1aa52180572a117e67b168b3

>---------------------------------------------------------------

commit 7e42d81350aac6db1aa52180572a117e67b168b3
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 15:56:15 2014 +0100

    Rename strictness tests to match other test names.


>---------------------------------------------------------------

7e42d81350aac6db1aa52180572a117e67b168b3
 containers.cabal                                    | 4 ++--
 tests/{IntMapStrictness.hs => intmap-strictness.hs} | 0
 tests/{MapStrictness.hs => map-strictness.hs}       | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 050257c..ae7e247 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -211,7 +211,7 @@ Test-suite seq-properties
 
 test-suite map-strictness-properties
   hs-source-dirs: tests, .
-  main-is: MapStrictness.hs
+  main-is: map-strictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
@@ -228,7 +228,7 @@ test-suite map-strictness-properties
 
 test-suite intmap-strictness-properties
   hs-source-dirs: tests, .
-  main-is: IntMapStrictness.hs
+  main-is: intmap-strictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
diff --git a/tests/IntMapStrictness.hs b/tests/intmap-strictness.hs
similarity index 100%
rename from tests/IntMapStrictness.hs
rename to tests/intmap-strictness.hs
diff --git a/tests/MapStrictness.hs b/tests/map-strictness.hs
similarity index 100%
rename from tests/MapStrictness.hs
rename to tests/map-strictness.hs


From git at git.haskell.org  Fri Dec 18 22:10:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:02 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use pre-evaluated sequences in benchmarks. (999851e)
Message-ID: <20151218221002.B81233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/999851e33acde2db08b06cf8d0331f37bbeb3c0b

>---------------------------------------------------------------

commit 999851e33acde2db08b06cf8d0331f37bbeb3c0b
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:26:42 2014 +0100

    Use pre-evaluated sequences in benchmarks.


>---------------------------------------------------------------

999851e33acde2db08b06cf8d0331f37bbeb3c0b
 benchmarks/Sequence.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index ccaca6c..8fd1fcf 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -12,13 +12,20 @@ main = do
     let s10 = S.fromList [1..10] :: S.Seq Int
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
-    rnf [s10, s100, s1000] `seq` return ()
+        s10000 = S.fromList [1..10000] :: S.Seq Int
+    rnf [s10, s100, s1000, s10000] `seq` return ()
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
         r100 = rlist 100
         r1000 = rlist 1000
-    rnf [r10, r100, r1000] `seq` return ()
+        r10000 = rlist 10000
+    rnf [r10, r100, r1000, r10000] `seq` return ()
+    let u10 = S.replicate 10 () :: S.Seq ()
+        u100 = S.replicate 100 () :: S.Seq ()
+        u1000 = S.replicate 1000 () :: S.Seq ()
+        u10000 = S.replicate 10000 () :: S.Seq ()
+    rnf [u10, u100, u1000, u10000] `seq` return ()
     defaultMain
       [ bgroup "splitAt/append"
          [ bench "10" $ nf (shuffle r10) s10
@@ -26,9 +33,9 @@ main = do
          , bench "1000" $ nf (shuffle r1000) s1000
          ]
       , bgroup "zip"
-         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
-         , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
-         , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
+         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (s10000, u10000)
+         , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
+         , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
          ] ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Fri Dec 18 22:10:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:04 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Update URL of the fingertree paper. (7ffc123)
Message-ID: <20151218221004.BFEB13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7ffc123000d82a676a23e0ce5e916a871598610f

>---------------------------------------------------------------

commit 7ffc123000d82a676a23e0ce5e916a871598610f
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:40:11 2014 +0100

    Update URL of the fingertree paper.


>---------------------------------------------------------------

7ffc123000d82a676a23e0ce5e916a871598610f
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f3fbbe7..9f3f543 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -40,7 +40,7 @@
 --    * Ralf Hinze and Ross Paterson,
 --      \"Finger trees: a simple general-purpose data structure\",
 --      /Journal of Functional Programming/ 16:2 (2006) pp 197-217.
---      <http://www.soi.city.ac.uk/~ross/papers/FingerTree.html>
+--      <http://staff.city.ac.uk/~ross/papers/FingerTree.html>
 --
 -- /Note/: Many of these operations have the same names as similar
 -- operations on lists in the "Prelude".  The ambiguity may be resolved


From git at git.haskell.org  Fri Dec 18 22:10:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:06 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add test for fromFunction. (61eeeec)
Message-ID: <20151218221006.C76DF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/61eeeec856e39108ba3d5cb4251b249acc782305

>---------------------------------------------------------------

commit 61eeeec856e39108ba3d5cb4251b249acc782305
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:49:49 2014 +0100

    Add test for fromFunction.


>---------------------------------------------------------------

61eeeec856e39108ba3d5cb4251b249acc782305
 tests/seq-properties.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 74b2e9c..14d5a5f 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -36,6 +36,7 @@ main = defaultMain
        , testProperty "(|>)" prop_snoc
        , testProperty "(><)" prop_append
        , testProperty "fromList" prop_fromList
+       , testProperty "fromFunction" prop_fromFunction
        , testProperty "replicate" prop_replicate
        , testProperty "replicateA" prop_replicateA
        , testProperty "replicateM" prop_replicateM
@@ -270,6 +271,10 @@ prop_fromList :: [A] -> Bool
 prop_fromList xs =
     toList' (fromList xs) ~= xs
 
+prop_fromFunction :: [A] -> Bool
+prop_fromFunction xs =
+    toList' (fromFunction (Prelude.length xs) (xs!!)) ~= xs
+
 -- ** Repetition
 
 prop_replicate :: NonNegative Int -> A -> Bool


From git at git.haskell.org  Fri Dec 18 22:10:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:08 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Fix warnings. (610ebfb)
Message-ID: <20151218221008.CF85A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/610ebfbe4eecfb04886ed87691aeb65869ee0445

>---------------------------------------------------------------

commit 610ebfbe4eecfb04886ed87691aeb65869ee0445
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 07:41:55 2014 +0100

    Fix warnings.


>---------------------------------------------------------------

610ebfbe4eecfb04886ed87691aeb65869ee0445
 Data/Sequence.hs | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9f3f543..d85cab6 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -164,9 +164,9 @@ import Data.Functor (Functor(..))
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
 #else
 #if MIN_VERSION_base(4,6,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr'), toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl'), toList)
 #else
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', toList)
 #endif
 #endif
 import Data.Traversable
@@ -180,6 +180,7 @@ import Data.Data
 #endif
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
+import qualified GHC.Exts
 #define COERCE coerce
 #else
 #ifdef __GLASGOW_HASKELL__
@@ -192,9 +193,6 @@ import qualified Unsafe.Coerce
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif
-#ifdef __GLASGOW_HASKELL__
-import qualified GHC.Exts
-#endif
 
 infixr 5 `consTree`
 infixl 5 `snocTree`
@@ -246,6 +244,8 @@ instance Foldable Seq where
     {-# INLINE length #-}
     null   = null
     {-# INLINE null #-}
+    toList   = toList
+    {-# INLINE toList #-}
 #endif
 
 instance Traversable Seq where
@@ -611,10 +611,6 @@ instance Applicative (State s) where
 execState :: State s a -> s -> a
 execState m x = snd (runState m x)
 
--- | A helper method: a strict version of mapAccumL.
-mapAccumL' :: Traversable t => (a -> b -> (a, c)) -> a -> t b -> (a, t c)
-mapAccumL' f s t = runState (traverse (State . flip f) t) s
-
 -- | 'applicativeTree' takes an Applicative-wrapped construction of a
 -- piece of a FingerTree, assumed to always have the same size (which
 -- is put in the second argument), and replicates it as many times as
@@ -1305,12 +1301,12 @@ adjustDigit f i (Four a b c d)
 -- function that also depends on the element's index, and applies it to every
 -- element in the sequence.
 mapWithIndex :: (Int -> a -> b) -> Seq a -> Seq b
-mapWithIndex f (Seq xs) = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f s a)) 0 xs
+mapWithIndex f' (Seq xs') = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f' s a)) 0 xs'
  where
   {-# SPECIALIZE mapWithIndexTree :: (Int -> Elem y -> b) -> Int -> FingerTree (Elem y) -> FingerTree b #-}
   {-# SPECIALIZE mapWithIndexTree :: (Int -> Node y -> b) -> Int -> FingerTree (Node y) -> FingerTree b #-}
   mapWithIndexTree :: Sized a => (Int -> a -> b) -> Int -> FingerTree a -> FingerTree b
-  mapWithIndexTree _f s Empty = s `seq` Empty
+  mapWithIndexTree _ s Empty = s `seq` Empty
   mapWithIndexTree f s (Single xs) = Single $ f s xs
   mapWithIndexTree f s (Deep n pr m sf) = sPspr `seq` sPsprm `seq`
           Deep n
@@ -1379,23 +1375,23 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
     create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
        1 -> Single $ b i
        2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
-       3 -> Deep (3*s) (createTwo b s i) Empty (One (b (i+2*s)))
-       4 -> Deep (4*s) (createTwo b s i) Empty (createTwo b s (i+2*s))
-       5 -> Deep (5*s) (createThree b s i) Empty (createTwo b s (i+3*s))
-       6 -> Deep (6*s) (createThree b s i) Empty (createThree b s (i+3*s))
+       3 -> Deep (3*s) (createTwo i) Empty (One (b (i+2*s)))
+       4 -> Deep (4*s) (createTwo i) Empty (createTwo (i+2*s))
+       5 -> Deep (5*s) (createThree i) Empty (createTwo (i+3*s))
+       6 -> Deep (6*s) (createThree i) Empty (createThree (i+3*s))
        _ -> case trees `quotRem` 3 of
-           (trees', 1) -> Deep (trees*s) (createTwo b s i)
+           (trees', 1) -> Deep (trees*s) (createTwo i)
                               (create mb (3*s) (i+2*s) (trees'-1))
-                              (createTwo b s (i+(2+3*(trees'-1))*s))
-           (trees', 2) -> Deep (trees*s) (createThree b s i)
+                              (createTwo (i+(2+3*(trees'-1))*s))
+           (trees', 2) -> Deep (trees*s) (createThree i)
                               (create mb (3*s) (i+3*s) (trees'-1))
-                              (createTwo b s (i+(3+3*(trees'-1))*s))
-           (trees', 0) -> Deep (trees*s) (createThree b s i)
+                              (createTwo (i+(3+3*(trees'-1))*s))
+           (trees', _) -> Deep (trees*s) (createThree i)
                               (create mb (3*s) (i+3*s) (trees'-2))
-                              (createThree b s (i+(3+3*(trees'-2))*s))
+                              (createThree (i+(3+3*(trees'-2))*s))
       where
-        createTwo b s i = Two (b i) (b (i + s))
-        createThree b s i = Three (b i) (b (i + s)) (b (i + s + s))
+        createTwo j = Two (b j) (b (j + s))
+        createThree j = Three (b j) (b (j + s)) (b (j + 2*s))
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
 
 -- Splitting
@@ -1884,8 +1880,8 @@ splitMap splt' = go
   {-# SPECIALIZE splitMapTree :: (Int -> s -> (s,s)) -> (s -> Elem y -> b) -> s -> FingerTree (Elem y) -> FingerTree b #-}
   {-# SPECIALIZE splitMapTree :: (Int -> s -> (s,s)) -> (s -> Node y -> b) -> s -> FingerTree (Node y) -> FingerTree b #-}
   splitMapTree :: Sized a => (Int -> s -> (s,s)) -> (s -> a -> b) -> s -> FingerTree a -> FingerTree b
-  splitMapTree splt _f _s Empty = Empty
-  splitMapTree splt f s (Single xs) = Single $ f s xs
+  splitMapTree _    _ _ Empty = Empty
+  splitMapTree _    f s (Single xs) = Single $ f s xs
   splitMapTree splt f s (Deep n pr m sf) = Deep n (splitMapDigit splt f prs pr) (splitMapTree splt (splitMapNode splt f) ms m) (splitMapDigit splt f sfs sf)
     where
       (prs, r) = splt (size pr) s
@@ -1894,7 +1890,7 @@ splitMap splt' = go
   {-# SPECIALIZE splitMapDigit :: (Int -> s -> (s,s)) -> (s -> Elem y -> b) -> s -> Digit (Elem y) -> Digit b #-}
   {-# SPECIALIZE splitMapDigit :: (Int -> s -> (s,s)) -> (s -> Node y -> b) -> s -> Digit (Node y) -> Digit b #-}
   splitMapDigit :: Sized a => (Int -> s -> (s,s)) -> (s -> a -> b) -> s -> Digit a -> Digit b
-  splitMapDigit splt f s (One a) = One (f s a)
+  splitMapDigit _    f s (One a) = One (f s a)
   splitMapDigit splt f s (Two a b) = Two (f first a) (f second b)
     where
       (first, second) = splt (size a) s


From git at git.haskell.org  Fri Dec 18 22:10:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:10 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Make sure the helper functions are inlined. (3e60f3a)
Message-ID: <20151218221010.D61113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3e60f3aa337ddf670a3f20586353c539f6b49eb4

>---------------------------------------------------------------

commit 3e60f3aa337ddf670a3f20586353c539f6b49eb4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 08:15:42 2014 +0100

    Make sure the helper functions are inlined.


>---------------------------------------------------------------

3e60f3aa337ddf670a3f20586353c539f6b49eb4
 Data/Sequence.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index d85cab6..fa80b3f 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1391,8 +1391,11 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
                               (createThree (i+(3+3*(trees'-2))*s))
       where
         createTwo j = Two (b j) (b (j + s))
+        {-# INLINE createTwo #-}
         createThree j = Three (b j) (b (j + s)) (b (j + 2*s))
+        {-# INLINE createThree #-}
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
+        {-# INLINE mb #-}
 
 -- Splitting
 


From git at git.haskell.org  Fri Dec 18 22:10:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:12 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Move the closing parent to a separate line. (97599c0)
Message-ID: <20151218221012.DC35A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/97599c082e5388551d2f8f767045b807194083fa

>---------------------------------------------------------------

commit 97599c082e5388551d2f8f767045b807194083fa
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 08:24:34 2014 +0100

    Move the closing parent to a separate line.


>---------------------------------------------------------------

97599c082e5388551d2f8f767045b807194083fa
 benchmarks/Sequence.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8fd1fcf..8bc2d74 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -36,7 +36,8 @@ main = do
          [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (s10000, u10000)
          , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
          , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
-         ] ]
+         ]
+      ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Fri Dec 18 22:10:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:14 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Remove unsafeCoerce, use only coerce on GHC 7.8 and later. (b38f240)
Message-ID: <20151218221014.E3DE03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b38f240ab4bec53c5f5800cc1b621a00b4604b2d

>---------------------------------------------------------------

commit b38f240ab4bec53c5f5800cc1b621a00b4604b2d
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 09:02:37 2014 +0100

    Remove unsafeCoerce, use only coerce on GHC 7.8 and later.
    
    Also, move the conditional compilation to a local where definition.
    
    On my GHC 7.6.3, there is no heap allocation in the cmm in fromFunction
    for the (Elem . f) closure, so there is no penalty of not using `coerce`.
    Nevertheless, GHC 7.8.3 and GHC-head (15 Dec 2014) do heap-allocate
    trivial closure for (Elem . f), so `coerce` helps.
    
    Back to GHC 7.6.3, I found that the following does not allocate in
    GHC 7.6.3:
      newtype Elem a = Elem a
      elemMap :: Int -> (Int -> b) -> [Elem b]
      elemMap s f = go (Elem . f) 0
       where go :: (Int -> b) -> Int -> [b]
             go f i | i >= s = []
                    | otherwise = f i : go f (i+1)
    Nevertheless, the following does heap-allocate trivial closure for f:
      newtype Elem a = Elem a
      elemMap :: [Int] -> (Int -> b) -> [Elem b]
      elemMap xs f = go (Elem . f) xs
       where go :: (Int -> b) -> [Int] -> [b]
             go f [] = []
             go f (x:xs) = f x : go f xs
    I am not sure what the difference is, but the current fromFunction
    does not allocate too (on 7.6.3).


>---------------------------------------------------------------

b38f240ab4bec53c5f5800cc1b621a00b4604b2d
 Data/Sequence.hs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index fa80b3f..4c281fc 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -181,14 +181,7 @@ import Data.Data
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
 import qualified GHC.Exts
-#define COERCE coerce
 #else
-#ifdef __GLASGOW_HASKELL__
-import qualified Unsafe.Coerce
--- Note that by compiling this file with GHC 7.8 or later, we prove that
--- it is safe to use COERCE with earlier GHC versions.
-#define COERCE Unsafe.Coerce.unsafeCoerce
-#endif
 #endif
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
@@ -1365,11 +1358,7 @@ mapWithIndex f' (Seq xs') = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f' s a)
 fromFunction :: Int -> (Int -> a) -> Seq a
 fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with negative len"
                    | len == 0 = empty
-#ifdef __GLASGOW_HASKELL__
-                   | otherwise = Seq $ create (COERCE f) 1 0 len
-#else
-                   | otherwise = Seq $ create (Elem . f) 1 0 len
-#endif
+                   | otherwise = Seq $ create (lift_elem f) 1 0 len
   where
     create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
     create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
@@ -1397,6 +1386,14 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
         {-# INLINE mb #-}
 
+    lift_elem :: (Int -> a) -> (Int -> Elem a)
+#if __GLASGOW_HASKELL__ >= 708
+    lift_elem g = coerce g
+#else
+    lift_elem g = Elem . g
+#endif
+    {-# INLINE lift_elem #-}
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.


From git at git.haskell.org  Fri Dec 18 22:10:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:16 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add simple fromFunction benchmarks. (a556ef2)
Message-ID: <20151218221016.EACFD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a556ef225952c27731a00b24b6417b6a057507ce

>---------------------------------------------------------------

commit a556ef225952c27731a00b24b6417b6a057507ce
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 14:47:20 2014 +0100

    Add simple fromFunction benchmarks.


>---------------------------------------------------------------

a556ef225952c27731a00b24b6417b6a057507ce
 benchmarks/Sequence.hs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8bc2d74..b6b82fa 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -37,6 +37,13 @@ main = do
          , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
          , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
          ]
+      , bgroup "fromFunction"
+         [ bench "ix10000/5000" $ nf (\s -> S.fromFunction s (+1) `S.index` (s `div` 2)) 10000
+         , bench "nf10" $ nf (\s -> S.fromFunction s (+1)) 10
+         , bench "nf100" $ nf (\s -> S.fromFunction s (+1)) 100
+         , bench "nf1000" $ nf (\s -> S.fromFunction s (+1)) 1000
+         , bench "nf10000" $ nf (\s -> S.fromFunction s (+1)) 10000
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Fri Dec 18 22:10:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:18 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use a top-down version of fromList (51a1f7c)
Message-ID: <20151218221019.002533A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/51a1f7c6670058ed4feefd1ef86170ddef173e63

>---------------------------------------------------------------

commit 51a1f7c6670058ed4feefd1ef86170ddef173e63
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Dec 9 14:56:53 2014 -0500

    Use a top-down version of fromList
    
    Ross Paterson came up with a version of fromList that avoids the
    tree rebuilding inherent in the `(|>)`-based approach. This
    version is somewhat strictified and rearranged. It reduces
    allocation substantially over the old version. Mutator time goes
    down too, but for some reason GC time rises to match it.


>---------------------------------------------------------------

51a1f7c6670058ed4feefd1ef86170ddef173e63
 Data/Sequence.hs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4c281fc..651dd5e 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1752,11 +1752,34 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- Lists
 ------------------------------------------------------------------------
 
+-- The implementation below, by Ross Paterson, avoids the rebuilding
+-- the previous (|>)-based implementation suffered from.
+
 -- | /O(n)/. Create a sequence from a finite list of elements.
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList        =  Data.List.foldl' (|>) empty
+fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
+  where
+    {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
+    {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
+    mkTree :: (Sized a) => Int -> [a] -> FingerTree a
+    mkTree s [] = s `seq` Empty
+    mkTree s [x1] = s `seq` Single x1
+    mkTree s [x1, x2] = Deep (2*s) (One x1) Empty (One x2)
+    mkTree s [x1, x2, x3] = Deep (3*s) (One x1) Empty (Two x2 x3)
+    mkTree s (x1:x2:x3:xs) = s `seq` case getNodes (3*s) xs of
+                                       (ns, sf) -> m `seq` deep' (Three x1 x2 x3) m sf
+                                           where m = mkTree (3*s) ns
+
+    deep' pr@(Three x1 _ _) m sf = Deep (3*size x1 + size m + size sf) pr m sf
+    
+    getNodes :: Int -> [a] -> ([Node a], Digit a)
+    getNodes s [x1] = s `seq` ([], One x1)
+    getNodes s [x1, x2] = s `seq` ([], Two x1 x2)
+    getNodes s [x1, x2, x3] = s `seq` ([], Three x1 x2 x3)
+    getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
+       where (ns, d) = getNodes s xs
 
 #if __GLASGOW_HASKELL__ >= 708
 instance GHC.Exts.IsList (Seq a) where


From git at git.haskell.org  Fri Dec 18 22:10:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:21 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Remove trailing whitespace. (a1d613b)
Message-ID: <20151218221021.071633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a1d613b50c2e0e15e01159ab2fa1b377a49e2a38

>---------------------------------------------------------------

commit a1d613b50c2e0e15e01159ab2fa1b377a49e2a38
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:30:58 2014 +0100

    Remove trailing whitespace.


>---------------------------------------------------------------

a1d613b50c2e0e15e01159ab2fa1b377a49e2a38
 Data/Sequence.hs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Fri Dec 18 22:10:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:23 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use coerce for [a]->[Elem a] convertion in fromList. (9b37d5a)
Message-ID: <20151218221023.0F9083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9b37d5a262e8070abce1f51d4913d9312a630acd

>---------------------------------------------------------------

commit 9b37d5a262e8070abce1f51d4913d9312a630acd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:37:18 2014 +0100

    Use coerce for [a]->[Elem a] convertion in fromList.


>---------------------------------------------------------------

9b37d5a262e8070abce1f51d4913d9312a630acd
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1b6dea2..71ded95 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1759,7 +1759,7 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
+fromList xs = Seq $ mkTree 1 $ map_elem xs
   where
     {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
     {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
@@ -1781,6 +1781,14 @@ fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
     getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
        where (ns, d) = getNodes s xs
 
+    map_elem :: [a] -> [Elem a]
+#if __GLASGOW_HASKELL__ >= 708
+    map_elem xs = coerce xs
+#else
+    map_elem xs = Data.List.map Elem xs
+#endif
+    {-# INLINE map_elem #-}
+
 #if __GLASGOW_HASKELL__ >= 708
 instance GHC.Exts.IsList (Seq a) where
     type Item (Seq a) = a


From git at git.haskell.org  Fri Dec 18 22:10:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:25 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Comment various conditional imports. (9df67f5)
Message-ID: <20151218221025.17BF43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9df67f5121ef14c865b4fae9db96aebf083dfb6c

>---------------------------------------------------------------

commit 9df67f5121ef14c865b4fae9db96aebf083dfb6c
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:57:20 2014 +0100

    Comment various conditional imports.


>---------------------------------------------------------------

9df67f5121ef14c865b4fae9db96aebf083dfb6c
 Data/Sequence.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 71ded95..2e8f84c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -172,17 +172,22 @@ import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', t
 import Data.Traversable
 import Data.Typeable
 
+-- GHC specific stuff
 #ifdef __GLASGOW_HASKELL__
 import GHC.Exts (build)
 import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
 #endif
+
+-- Coercion on GHC 7.8+
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
 import qualified GHC.Exts
 #else
 #endif
+
+-- Identity functor on base 4.8 (GHC 7.10+)
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif


From git at git.haskell.org  Fri Dec 18 22:10:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:27 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add Data.Sequence.fromArray. (52ba9e5)
Message-ID: <20151218221027.1F85D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/52ba9e5d9c85d4bd11236c1e43b4847a50a3b771

>---------------------------------------------------------------

commit 52ba9e5d9c85d4bd11236c1e43b4847a50a3b771
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:58:46 2014 +0100

    Add Data.Sequence.fromArray.
    
    Sugested by David Feuer in #88.
    
    The implementation on GHC uses GHC.Arr module and is considerably faster
    than on non-GHC compilers.


>---------------------------------------------------------------

52ba9e5d9c85d4bd11236c1e43b4847a50a3b771
 Data/Sequence.hs        | 19 +++++++++++++++++++
 tests/seq-properties.hs |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 2e8f84c..690a9fe 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -62,6 +62,7 @@ module Data.Sequence (
     (><),           -- :: Seq a -> Seq a -> Seq a
     fromList,       -- :: [a] -> Seq a
     fromFunction,   -- :: Int -> (Int -> a) -> Seq a
+    fromArray,      -- :: Ix i => Array i a -> Seq a
     -- ** Repetition
     replicate,      -- :: Int -> a -> Seq a
     replicateA,     -- :: Applicative f => Int -> f a -> f (Seq a)
@@ -180,6 +181,13 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
 import Data.Data
 #endif
 
+-- Array stuff, with GHC.Arr on GHC
+import Data.Array (Ix, Array)
+import qualified Data.Array
+#ifdef __GLASGOW_HASKELL__
+import qualified GHC.Arr
+#endif
+
 -- Coercion on GHC 7.8+
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
@@ -1399,6 +1407,17 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 #endif
     {-# INLINE lift_elem #-}
 
+-- | /O(n)/. Create a sequence consisting of the elements of an 'Array'.
+-- Note that the resulting sequence elements may be evaluated lazily (as on GHC),
+-- so you must force the entire structure to be sure that the original array
+-- can be garbage-collected.
+fromArray :: Ix i => Array i a -> Seq a
+#ifdef __GLASGOW_HASKELL__
+fromArray a = fromFunction (GHC.Arr.numElements a) (GHC.Arr.unsafeAt a)
+#else
+fromArray a = fromList2 (Data.Array.rangeSize (Data.Array.bounds a)) (Data.Array.elems a)
+#endif
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.
diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 14d5a5f..a64e66d 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -2,6 +2,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
+import Data.Array (listArray)
 import Data.Foldable (Foldable(..), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
@@ -37,6 +38,7 @@ main = defaultMain
        , testProperty "(><)" prop_append
        , testProperty "fromList" prop_fromList
        , testProperty "fromFunction" prop_fromFunction
+       , testProperty "fromArray" prop_fromArray
        , testProperty "replicate" prop_replicate
        , testProperty "replicateA" prop_replicateA
        , testProperty "replicateM" prop_replicateM
@@ -275,6 +277,10 @@ prop_fromFunction :: [A] -> Bool
 prop_fromFunction xs =
     toList' (fromFunction (Prelude.length xs) (xs!!)) ~= xs
 
+prop_fromArray :: [A] -> Bool
+prop_fromArray xs =
+    toList' (fromArray (listArray (42, 42+Prelude.length xs-1) xs)) ~= xs
+
 -- ** Repetition
 
 prop_replicate :: NonNegative Int -> A -> Bool


From git at git.haskell.org  Fri Dec 18 22:10:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:29 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6: Make types of the drawing
 functions more generic, i.e. Show s => Tree s instead of Tree String (7ab1c39)
Message-ID: <20151218221029.267733A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7ab1c399726c5a4a562cff3f56017ff5852ac82e

>---------------------------------------------------------------

commit 7ab1c399726c5a4a562cff3f56017ff5852ac82e
Author: jonasc <github at bcdf.eu>
Date:   Fri Aug 8 00:15:10 2014 +0200

    Make types of the drawing functions more generic, i.e. Show s => Tree s instead of Tree String


>---------------------------------------------------------------

7ab1c399726c5a4a562cff3f56017ff5852ac82e
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index 57a4324..1642c3b 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -113,15 +113,15 @@ instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 
 -- | Neat 2-dimensional drawing of a tree.
-drawTree :: Tree String -> String
+drawTree :: Show a => Tree a -> String
 drawTree  = unlines . draw
 
 -- | Neat 2-dimensional drawing of a forest.
-drawForest :: Forest String -> String
+drawForest :: Show a => Forest a -> String
 drawForest  = unlines . map drawTree
 
-draw :: Tree String -> [String]
-draw (Node x ts0) = x : drawSubTrees ts0
+draw :: Show a => Tree a -> [String]
+draw (Node x ts0) = show x : drawSubTrees ts0
   where
     drawSubTrees [] = []
     drawSubTrees [t] =


From git at git.haskell.org  Fri Dec 18 22:10:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:31 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6-questionable: Added fixity
 declarations for member, notMember, union, and intersection. (de85ae9)
Message-ID: <20151218221031.31C483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6-questionable
Link       : http://git.haskell.org/packages/containers.git/commitdiff/de85ae9eccb84284873d419c899743a85bd4e66a

>---------------------------------------------------------------

commit de85ae9eccb84284873d419c899743a85bd4e66a
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.
    
    Milan Straka: It is quite unlikely that this ever gets merged, as it can
    cause build failures (it broke the testing suite for example) and offers
    in my opinion little benefit.


>---------------------------------------------------------------

de85ae9eccb84284873d419c899743a85bd4e66a
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index d5fd75a..2a912d9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -451,6 +451,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -459,6 +461,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -874,6 +878,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -937,6 +943,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 6333eea..f2dfb90 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -321,10 +321,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -512,6 +516,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -586,6 +591,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index e582e16..92ff096 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -466,6 +466,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -479,6 +481,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1241,6 +1245,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1361,6 +1367,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 7e792f4..0c4f62b 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -356,6 +356,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -365,6 +367,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -616,6 +620,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -674,6 +680,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Fri Dec 18 22:10:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:33 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6-questionable: Fixed syntax
 of fixity declarations. (2bf686d)
Message-ID: <20151218221033.3C20E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6-questionable
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2bf686d3dd0706eef416590100f8d1ebaa3eb80b

>---------------------------------------------------------------

commit 2bf686d3dd0706eef416590100f8d1ebaa3eb80b
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

2bf686d3dd0706eef416590100f8d1ebaa3eb80b
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 2a912d9..8afb60c 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -451,7 +451,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -461,7 +461,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -878,7 +878,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -943,7 +943,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index f2dfb90..bd78790 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -321,13 +321,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -516,7 +516,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -591,7 +591,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 92ff096..ae291c7 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -466,7 +466,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -481,7 +481,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1245,7 +1245,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1367,7 +1367,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 0c4f62b..732e973 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -356,7 +356,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -367,7 +367,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -620,7 +620,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -680,7 +680,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Fri Dec 18 22:10:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:35 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.0
 (b9e4e22)
Message-ID: <20151218221035.438CD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b9e4e22d6e37150dcf5c04e4c4beabfba5342576

>---------------------------------------------------------------

commit b9e4e22d6e37150dcf5c04e4c4beabfba5342576
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Dec 15 19:57:52 2014 +0100

    Bump version number to 0.5.6.0


>---------------------------------------------------------------

b9e4e22d6e37150dcf5c04e4c4beabfba5342576
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index ae7e247..bbf5913 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.5.1
+version: 0.5.6.0
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Fri Dec 18 22:10:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:37 +0000 (UTC)
Subject: [commit: packages/containers] master: Add Ross Paterson to 2014
 copyright statement (302d6b4)
Message-ID: <20151218221037.4AE2B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/302d6b4839702ce6e18fd1908240b920efb1b04a

>---------------------------------------------------------------

commit 302d6b4839702ce6e18fd1908240b920efb1b04a
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Dec 15 15:54:22 2014 -0500

    Add Ross Paterson to 2014 copyright statement
    
    He wrote the first draft of the new `fromList` code.


>---------------------------------------------------------------

302d6b4839702ce6e18fd1908240b920efb1b04a
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 690a9fe..9a23f77 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -19,7 +19,7 @@
 -- Module      :  Data.Sequence
 -- Copyright   :  (c) Ross Paterson 2005
 --                (c) Louis Wasserman 2009
---                (c) David Feuer and Milan Straka 2014
+--                (c) David Feuer, Ross Paterson, and Milan Straka 2014
 -- License     :  BSD-style
 -- Maintainer  :  libraries at haskell.org
 -- Stability   :  experimental


From git at git.haskell.org  Fri Dec 18 22:10:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:39 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #97 from
 treeowl/add-credit (33e65be)
Message-ID: <20151218221039.51BCD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/33e65bea1713e1720857fb1c1f982631b872913f

>---------------------------------------------------------------

commit 33e65bea1713e1720857fb1c1f982631b872913f
Merge: b9e4e22 302d6b4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 22:01:23 2014 +0100

    Merge pull request #97 from treeowl/add-credit
    
    Add Ross Paterson to 2014 copyright statement



>---------------------------------------------------------------

33e65bea1713e1720857fb1c1f982631b872913f
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:10:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:41 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix warnings. (2bdc5f3)
Message-ID: <20151218221041.59FFF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd

>---------------------------------------------------------------

commit 2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 22:47:28 2014 +0100

    Fix warnings.
    
    In getNodes, pass (a, [a]) instead of an [a] which we know is nonempty.
    This way we do not have to create void pattern-match case for empty
    list.
    
    Also use STRICT_x_OF_y macros instead of `seq`-ing in every
    pattern-match case.


>---------------------------------------------------------------

2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd
 Data/Sequence.hs | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9a23f77..1f19c62 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -183,7 +183,6 @@ import Data.Data
 
 -- Array stuff, with GHC.Arr on GHC
 import Data.Array (Ix, Array)
-import qualified Data.Array
 #ifdef __GLASGOW_HASKELL__
 import qualified GHC.Arr
 #endif
@@ -200,6 +199,15 @@ import qualified GHC.Exts
 import Data.Functor.Identity (Identity(..))
 #endif
 
+
+-- Use macros to define strictness of functions.
+-- STRICT_x_OF_y denotes an y-ary function strict in the x-th parameter.
+-- We do not use BangPatterns, because they are not in any standard and we
+-- want the compilers to be compiled by as many compilers as possible.
+#define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
+#define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
+
+
 infixr 5 `consTree`
 infixl 5 `snocTree`
 
@@ -1783,27 +1791,27 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList xs = Seq $ mkTree 1 $ map_elem xs
+fromList = Seq . mkTree 1 . map_elem
   where
     {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
     {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
     mkTree :: (Sized a) => Int -> [a] -> FingerTree a
-    mkTree s [] = s `seq` Empty
-    mkTree s [x1] = s `seq` Single x1
+    STRICT_1_OF_2(mkTree)
+    mkTree _ [] = Empty
+    mkTree _ [x1] = Single x1
     mkTree s [x1, x2] = Deep (2*s) (One x1) Empty (One x2)
     mkTree s [x1, x2, x3] = Deep (3*s) (One x1) Empty (Two x2 x3)
-    mkTree s (x1:x2:x3:xs) = s `seq` case getNodes (3*s) xs of
-                                       (ns, sf) -> m `seq` deep' (Three x1 x2 x3) m sf
-                                           where m = mkTree (3*s) ns
-
-    deep' pr@(Three x1 _ _) m sf = Deep (3*size x1 + size m + size sf) pr m sf
-
-    getNodes :: Int -> [a] -> ([Node a], Digit a)
-    getNodes s [x1] = s `seq` ([], One x1)
-    getNodes s [x1, x2] = s `seq` ([], Two x1 x2)
-    getNodes s [x1, x2, x3] = s `seq` ([], Three x1 x2 x3)
-    getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
-       where (ns, d) = getNodes s xs
+    mkTree s (x1:x2:x3:x4:xs) = case getNodes (3*s) x4 xs of
+      (ns, sf) -> case mkTree (3*s) ns of
+        m -> m `seq` Deep (3*size x1 + size m + size sf) (Three x1 x2 x3) m sf
+
+    getNodes :: Int -> a -> [a] -> ([Node a], Digit a)
+    STRICT_1_OF_3(getNodes)
+    getNodes _ x1 [] = ([], One x1)
+    getNodes _ x1 [x2] = ([], Two x1 x2)
+    getNodes _ x1 [x2, x3] = ([], Three x1 x2 x3)
+    getNodes s x1 (x2:x3:x4:xs) = (Node3 s x1 x2 x3:ns, d)
+       where (ns, d) = getNodes s x4 xs
 
     map_elem :: [a] -> [Elem a]
 #if __GLASGOW_HASKELL__ >= 708


From git at git.haskell.org  Fri Dec 18 22:10:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:43 +0000 (UTC)
Subject: [commit: packages/containers] master: Nuke include/Typeable.h,
 create include/containers.h instead. (b3257c8)
Message-ID: <20151218221043.6F7CC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b3257c8b59a9f4dec03be19b6d2cd7a562691e04

>---------------------------------------------------------------

commit b3257c8b59a9f4dec03be19b6d2cd7a562691e04
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 23:48:18 2014 +0100

    Nuke include/Typeable.h, create include/containers.h instead.
    
    The "Typeable.h" collides with the header of same name in base.
    
    The new "containers.h" is now used in every Haskell source.
    It contains more stuff used across the containers codebase:
    - INSTANCE_TYPEABLE[0-2] (was in Typeable.h)
    - include MachDeps on __GLASGOW_HASKELL__ to define WORD_SIZE_IN_BITS
    - define STRICT_x_OF_y macros
    - define MIN_VERSION_base if not defined by cabal (during cabal-less build)


>---------------------------------------------------------------

b3257c8b59a9f4dec03be19b6d2cd7a562691e04
 Data/Graph.hs            |  3 +++
 Data/IntMap.hs           |  3 +++
 Data/IntMap/Base.hs      | 15 ++---------
 Data/IntMap/Lazy.hs      |  3 +++
 Data/IntMap/Strict.hs    |  3 +++
 Data/IntSet.hs           |  3 +++
 Data/IntSet/Base.hs      | 25 +++----------------
 Data/Map.hs              |  3 +++
 Data/Map/Base.hs         | 20 +++------------
 Data/Map/Lazy.hs         |  3 +++
 Data/Map/Strict.hs       | 23 ++++-------------
 Data/Sequence.hs         | 18 +++-----------
 Data/Set.hs              |  3 +++
 Data/Set/Base.hs         | 19 +++-----------
 Data/Tree.hs             |  9 ++-----
 Data/Utils/BitUtil.hs    |  8 +++---
 Data/Utils/StrictFold.hs |  3 +++
 Data/Utils/StrictPair.hs |  3 +++
 containers.cabal         |  2 +-
 include/Typeable.h       | 65 ------------------------------------------------
 include/containers.h     | 61 +++++++++++++++++++++++++++++++++++++++++++++
 21 files changed, 116 insertions(+), 179 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b3257c8b59a9f4dec03be19b6d2cd7a562691e04

From git at git.haskell.org  Fri Dec 18 22:10:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:45 +0000 (UTC)
Subject: [commit: packages/containers] master: Add the include dir also to
 tests. (040309f)
Message-ID: <20151218221045.764C83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/040309f6915306cc7aa7da02f144fe026e4fb6fe

>---------------------------------------------------------------

commit 040309f6915306cc7aa7da02f144fe026e4fb6fe
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 00:24:50 2014 +0100

    Add the include dir also to tests.
    
    This worked with Typeable because Typeable from `base` instead of
    `containers` was used.


>---------------------------------------------------------------

040309f6915306cc7aa7da02f144fe026e4fb6fe
 containers.cabal | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/containers.cabal b/containers.cabal
index afd2e34..6c77693 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -85,6 +85,7 @@ Test-suite map-lazy-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -102,6 +103,7 @@ Test-suite map-strict-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -119,6 +121,7 @@ Test-suite set-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -136,6 +139,7 @@ Test-suite intmap-lazy-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -153,6 +157,7 @@ Test-suite intmap-strict-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -170,6 +175,7 @@ Test-suite intset-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -187,6 +193,7 @@ Test-suite deprecated-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -202,6 +209,7 @@ Test-suite seq-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -225,6 +233,7 @@ test-suite map-strictness-properties
     test-framework-quickcheck2 >= 0.2.9
 
   ghc-options: -Wall
+  include-dirs: include
 
 test-suite intmap-strictness-properties
   hs-source-dirs: tests, .
@@ -242,3 +251,4 @@ test-suite intmap-strictness-properties
     test-framework-quickcheck2 >= 0.2.9
 
   ghc-options: -Wall
+  include-dirs: include


From git at git.haskell.org  Fri Dec 18 22:10:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:47 +0000 (UTC)
Subject: [commit: packages/containers] master: Disable coercion tests for the
 time being. (bc74f91)
Message-ID: <20151218221047.7EF4A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bc74f915a5c223ae976290161b1b2f4ef7ea5b41

>---------------------------------------------------------------

commit bc74f915a5c223ae976290161b1b2f4ef7ea5b41
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 09:38:16 2014 +0100

    Disable coercion tests for the time being.


>---------------------------------------------------------------

bc74f915a5c223ae976290161b1b2f4ef7ea5b41
 tests-ghc/all.T                                            | 5 -----
 tests-ghc/unreliable/README                                | 2 ++
 tests-ghc/{all.T => unreliable/coerce_tests}               | 7 -------
 tests-ghc/{ => unreliable}/mapcoerceintmap.hs              | 0
 tests-ghc/{ => unreliable}/mapcoerceintmap.stdout          | 0
 tests-ghc/{ => unreliable}/mapcoerceintmapstrict.hs        | 0
 tests-ghc/{ => unreliable}/mapcoerceintmapstrict.hs.stdout | 0
 tests-ghc/{ => unreliable}/mapcoercemap.hs                 | 0
 tests-ghc/{ => unreliable}/mapcoercemap.stdout             | 0
 tests-ghc/{ => unreliable}/mapcoerceseq.hs                 | 0
 tests-ghc/{ => unreliable}/mapcoerceseq.stdout             | 0
 tests-ghc/{ => unreliable}/mapcoercesmap.hs                | 0
 tests-ghc/{ => unreliable}/mapcoercesmap.stdout            | 0
 13 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests-ghc/all.T b/tests-ghc/all.T
index eba1dcc..b7887dc 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/all.T
@@ -5,8 +5,3 @@ test('datamap001', normal, compile_and_run, ['-package containers'])
 test('datamap002', normal, compile_and_run, ['-package containers'])
 test('dataintset001', normal, compile_and_run, ['-package containers'])
 test('sequence001', normal, compile_and_run, ['-package containers'])
-test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoerceintmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoerceintmapstrict', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/unreliable/README b/tests-ghc/unreliable/README
new file mode 100644
index 0000000..23240fe
--- /dev/null
+++ b/tests-ghc/unreliable/README
@@ -0,0 +1,2 @@
+These coerce tests depend on whether RULES are fired or not,
+so adding them to general GHC suite might cause testing failures.
diff --git a/tests-ghc/all.T b/tests-ghc/unreliable/coerce_tests
similarity index 55%
copy from tests-ghc/all.T
copy to tests-ghc/unreliable/coerce_tests
index eba1dcc..5cc72d0 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/unreliable/coerce_tests
@@ -1,10 +1,3 @@
-# This is a test script for use with GHC's testsuite framework, see
-# http://darcs.haskell.org/testsuite
-
-test('datamap001', normal, compile_and_run, ['-package containers'])
-test('datamap002', normal, compile_and_run, ['-package containers'])
-test('dataintset001', normal, compile_and_run, ['-package containers'])
-test('sequence001', normal, compile_and_run, ['-package containers'])
 test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/mapcoerceintmap.hs b/tests-ghc/unreliable/mapcoerceintmap.hs
similarity index 100%
rename from tests-ghc/mapcoerceintmap.hs
rename to tests-ghc/unreliable/mapcoerceintmap.hs
diff --git a/tests-ghc/mapcoerceintmap.stdout b/tests-ghc/unreliable/mapcoerceintmap.stdout
similarity index 100%
rename from tests-ghc/mapcoerceintmap.stdout
rename to tests-ghc/unreliable/mapcoerceintmap.stdout
diff --git a/tests-ghc/mapcoerceintmapstrict.hs b/tests-ghc/unreliable/mapcoerceintmapstrict.hs
similarity index 100%
rename from tests-ghc/mapcoerceintmapstrict.hs
rename to tests-ghc/unreliable/mapcoerceintmapstrict.hs
diff --git a/tests-ghc/mapcoerceintmapstrict.hs.stdout b/tests-ghc/unreliable/mapcoerceintmapstrict.hs.stdout
similarity index 100%
rename from tests-ghc/mapcoerceintmapstrict.hs.stdout
rename to tests-ghc/unreliable/mapcoerceintmapstrict.hs.stdout
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/unreliable/mapcoercemap.hs
similarity index 100%
rename from tests-ghc/mapcoercemap.hs
rename to tests-ghc/unreliable/mapcoercemap.hs
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/unreliable/mapcoercemap.stdout
similarity index 100%
rename from tests-ghc/mapcoercemap.stdout
rename to tests-ghc/unreliable/mapcoercemap.stdout
diff --git a/tests-ghc/mapcoerceseq.hs b/tests-ghc/unreliable/mapcoerceseq.hs
similarity index 100%
rename from tests-ghc/mapcoerceseq.hs
rename to tests-ghc/unreliable/mapcoerceseq.hs
diff --git a/tests-ghc/mapcoerceseq.stdout b/tests-ghc/unreliable/mapcoerceseq.stdout
similarity index 100%
rename from tests-ghc/mapcoerceseq.stdout
rename to tests-ghc/unreliable/mapcoerceseq.stdout
diff --git a/tests-ghc/mapcoercesmap.hs b/tests-ghc/unreliable/mapcoercesmap.hs
similarity index 100%
rename from tests-ghc/mapcoercesmap.hs
rename to tests-ghc/unreliable/mapcoercesmap.hs
diff --git a/tests-ghc/mapcoercesmap.stdout b/tests-ghc/unreliable/mapcoercesmap.stdout
similarity index 100%
rename from tests-ghc/mapcoercesmap.stdout
rename to tests-ghc/unreliable/mapcoercesmap.stdout


From git at git.haskell.org  Fri Dec 18 22:10:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:49 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove circular `toList`
 definition. (446e295)
Message-ID: <20151218221049.86E9C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/446e295ee0db08bb10f6e5dca6f930669b565ffc

>---------------------------------------------------------------

commit 446e295ee0db08bb10f6e5dca6f930669b565ffc
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 11:11:07 2014 +0100

    Remove circular `toList` definition.
    
    When writing this, I assumed we have explicit `toList` as we have in
    other containers. We do not have `toList`, and even if we did, the code
    would not compile, as the two `toList`s (ours and `Foldable`) would
    collide.


>---------------------------------------------------------------

446e295ee0db08bb10f6e5dca6f930669b565ffc
 Data/Sequence.hs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 800ec46..b540978 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -247,8 +247,6 @@ instance Foldable Seq where
     {-# INLINE length #-}
     null   = null
     {-# INLINE null #-}
-    toList   = toList
-    {-# INLINE toList #-}
 #endif
 
 instance Traversable Seq where


From git at git.haskell.org  Fri Dec 18 22:10:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:51 +0000 (UTC)
Subject: [commit: packages/containers] master: Import only used class methods
 of Foldable. (6b026a7)
Message-ID: <20151218221051.8DDE73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6b026a7a730569d21b27ad2a8c18961cd8662a35

>---------------------------------------------------------------

commit 6b026a7a730569d21b27ad2a8c18961cd8662a35
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:12:37 2014 +0100

    Import only used class methods of Foldable.
    
    On GHC 7.8, the Foldable class contains also null and length, which
    conflicts with Data.Sequence{null,length}.


>---------------------------------------------------------------

6b026a7a730569d21b27ad2a8c18961cd8662a35
 tests/seq-properties.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index a64e66d..4cf0876 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -3,7 +3,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
 import Data.Array (listArray)
-import Data.Foldable (Foldable(..), toList, all, sum)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
 import Data.Monoid (Monoid(..))


From git at git.haskell.org  Fri Dec 18 22:10:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:53 +0000 (UTC)
Subject: [commit: packages/containers] master: It is perfectly fine to import
 class methods... (d288dc7)
Message-ID: <20151218221053.961B23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d288dc750949e476af221a832dea8d8c053808a4

>---------------------------------------------------------------

commit d288dc750949e476af221a832dea8d8c053808a4
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:16:20 2014 +0100

    It is perfectly fine to import class methods...
    
    ...without specifying the class, see Haskell 2010 5.2.1.
    That allows us to get rid of some conditional includes.
    
    Nevetheless, we still conditionally include foldr', as we do not
    use it for base <4.8.


>---------------------------------------------------------------

d288dc750949e476af221a832dea8d8c053808a4
 Data/Sequence.hs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b540978..7d31f79 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -158,14 +158,9 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-#if MIN_VERSION_base(4,8,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
-#else
-#if MIN_VERSION_base(4,6,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl'), toList)
-#else
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', toList)
-#endif
+#if MIN_VERSION_base(4,8,0)
+import Data.Foldable (foldr')
 #endif
 import Data.Traversable
 import Data.Typeable


From git at git.haskell.org  Fri Dec 18 22:10:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:55 +0000 (UTC)
Subject: [commit: packages/containers] master: Add forgotten foldMap to the
 imports. (4a6bbb1)
Message-ID: <20151218221055.9D68D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4a6bbb14e6d982825235a521510afd55c565cc59

>---------------------------------------------------------------

commit 4a6bbb14e6d982825235a521510afd55c565cc59
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:32:23 2014 +0100

    Add forgotten foldMap to the imports.
    
    The foldMap is in Prelude on base 4.8, that is why I missed it.


>---------------------------------------------------------------

4a6bbb14e6d982825235a521510afd55c565cc59
 tests/seq-properties.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 4cf0876..4f4f468 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -3,7 +3,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
 import Data.Array (listArray)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), toList, all, sum)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
 import Data.Monoid (Monoid(..))


From git at git.haskell.org  Fri Dec 18 22:10:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:57 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.1
 (ddf4e4a)
Message-ID: <20151218221057.A44B63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ddf4e4a7abbfb81161251437a6a5bbe8167a7cde

>---------------------------------------------------------------

commit ddf4e4a7abbfb81161251437a6a5bbe8167a7cde
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:41:17 2014 +0100

    Bump version number to 0.5.6.1


>---------------------------------------------------------------

ddf4e4a7abbfb81161251437a6a5bbe8167a7cde
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 6c77693..169507a 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.0
+version: 0.5.6.1
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Fri Dec 18 22:10:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:10:59 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix efficiency claim for
 zipWith. (107ec12)
Message-ID: <20151218221059.AB5D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/107ec12d17aa98d8fd552276b81a94fe6f44224b

>---------------------------------------------------------------

commit 107ec12d17aa98d8fd552276b81a94fe6f44224b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 11:19:53 2014 -0500

    Fix efficiency claim for zipWith.


>---------------------------------------------------------------

107ec12d17aa98d8fd552276b81a94fe6f44224b
 Data/Sequence.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7d31f79..7675698 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1872,9 +1872,9 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- them up further and zip them with their matching pieces can be delayed until
 -- they're actually needed. We do the same thing for Digits (splitting into
 -- between one and four pieces) and Nodes (splitting into two or three). The
--- ultimate result is that we can index, or split at, any location in zs in
--- O(log(min{i,n-i})) time *immediately*, with only a constant-factor slowdown
--- as thunks are forced along the path.
+-- ultimate result is that we can index into, or split at, any location in zs
+-- in O((log(min{i,n-i}))^2) time *immediately*, while still being able to
+-- force all the thunks in O(n) time.
 --
 -- Benchmark info, and alternatives:
 --


From git at git.haskell.org  Fri Dec 18 22:11:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:01 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #101 from
 treeowl/zipdocfix (314f798)
Message-ID: <20151218221101.B45763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/314f7983819861c68e77f0f5798c86812b23fa39

>---------------------------------------------------------------

commit 314f7983819861c68e77f0f5798c86812b23fa39
Merge: ddf4e4a 107ec12
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 18 22:59:51 2014 +0100

    Merge pull request #101 from treeowl/zipdocfix
    
    Fix efficiency claim for zipWith.



>---------------------------------------------------------------

314f7983819861c68e77f0f5798c86812b23fa39
 Data/Sequence.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:03 +0000 (UTC)
Subject: [commit: packages/containers] master: Use fromList2 to implement
 fromListN in IsList (ace8f7f)
Message-ID: <20151218221103.BB8273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ace8f7fd88e5458a8401804e32a2d921d653fdfa

>---------------------------------------------------------------

commit ace8f7fd88e5458a8401804e32a2d921d653fdfa
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Dec 19 15:09:03 2014 -0500

    Use fromList2 to implement fromListN in IsList


>---------------------------------------------------------------

ace8f7fd88e5458a8401804e32a2d921d653fdfa
 Data/Sequence.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7d31f79..b216b12 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1806,6 +1806,7 @@ fromList = Seq . mkTree 1 . map_elem
 instance GHC.Exts.IsList (Seq a) where
     type Item (Seq a) = a
     fromList = fromList
+    fromListN = fromList2
     toList = toList
 #endif
 


From git at git.haskell.org  Fri Dec 18 22:11:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:05 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix Arbitrary instance for
 FingerTree (0086aa7)
Message-ID: <20151218221105.C1A953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0086aa753795237cec28be6d2a261708eb7dacf6

>---------------------------------------------------------------

commit 0086aa753795237cec28be6d2a261708eb7dacf6
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Fri Dec 19 23:24:20 2014 +0000

    Fix Arbitrary instance for FingerTree
    
    The previous version never generated deep trees containing Empty.
    Also tweaked the size handling so that the tree size is closer to the
    specified size (though it can still run over a bit).


>---------------------------------------------------------------

0086aa753795237cec28be6d2a261708eb7dacf6
 tests/seq-properties.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 4f4f468..def17b3 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -112,7 +112,15 @@ instance (Arbitrary a, Sized a) => Arbitrary (FingerTree a) where
         arb :: (Arbitrary a, Sized a) => Int -> Gen (FingerTree a)
         arb 0 = return Empty
         arb 1 = Single <$> arbitrary
-        arb n = deep <$> arbitrary <*> arb (n `div` 2) <*> arbitrary
+        arb n = do
+            pr <- arbitrary
+            sf <- arbitrary
+            let n_pr = Prelude.length (toList pr)
+            let n_sf = Prelude.length (toList sf)
+            -- adding n `div` 7 ensures that n_m >= 0, and makes more Singles
+            let n_m = max (n `div` 7) ((n - n_pr - n_sf) `div` 3)
+            m <- arb n_m
+            return $ deep pr m sf
 
     shrink (Deep _ (One a) Empty (One b)) = [Single a, Single b]
     shrink (Deep _ pr m sf) =


From git at git.haskell.org  Fri Dec 18 22:11:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:07 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #108 from
 RossPaterson/master (54c3603)
Message-ID: <20151218221107.C9B423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/54c36030839949659b9dd4d12b6e92ec22698d40

>---------------------------------------------------------------

commit 54c36030839949659b9dd4d12b6e92ec22698d40
Merge: 314f798 0086aa7
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 00:50:39 2014 +0100

    Merge pull request #108 from RossPaterson/master
    
    Fix Arbitrary instance for FingerTree



>---------------------------------------------------------------

54c36030839949659b9dd4d12b6e92ec22698d40
 tests/seq-properties.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:11:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:09 +0000 (UTC)
Subject: [commit: packages/containers] master: Add tests for Applicative and
 Monad instances (0decaa1)
Message-ID: <20151218221109.D078B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0decaa120039ff4bafbfd4cc62306925a2c31475

>---------------------------------------------------------------

commit 0decaa120039ff4bafbfd4cc62306925a2c31475
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 12:44:57 2014 -0500

    Add tests for Applicative and Monad instances
    
    Unfortunately, these tests are rather slow, so I hid them behind
    a SLOW_TESTS macro. I don't know nearly enough about cabal to know
    how to arrange for tests to be run conditionally, so hopefully
    someone else can set that up properly.


>---------------------------------------------------------------

0decaa120039ff4bafbfd4cc62306925a2c31475
 tests/seq-properties.hs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index def17b3..2b4774d 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -17,6 +17,9 @@ import qualified Prelude
 import qualified Data.List
 import Test.QuickCheck hiding ((><))
 import Test.QuickCheck.Poly
+#ifdef SLOW_TESTS
+import Test.QuickCheck.Function
+#endif
 import Test.Framework
 import Test.Framework.Providers.QuickCheck2
 
@@ -93,6 +96,11 @@ main = defaultMain
        , testProperty "zipWith3" prop_zipWith3
        , testProperty "zip4" prop_zip4
        , testProperty "zipWith4" prop_zipWith4
+#ifdef SLOW_TESTS
+       , testProperty "<*>" prop_ap
+       , testProperty "*>" prop_then
+       , testProperty ">>=" prop_bind
+#endif
        ]
 
 ------------------------------------------------------------------------
@@ -588,6 +596,26 @@ prop_zipWith4 xs ys zs ts =
     toList' (zipWith4 f xs ys zs ts) ~= Data.List.zipWith4 f (toList xs) (toList ys) (toList zs) (toList ts)
   where f = (,,,)
 
+-- Applicative operations
+
+#ifdef SLOW_TESTS
+prop_ap :: Seq A -> Seq B -> Bool
+prop_ap xs ys =
+    toList' ((,) <$> xs <*> ys) ~= ( (,) <$> toList xs <*> toList ys )
+
+prop_then :: Seq A -> Seq B -> Bool
+prop_then xs ys =
+    toList' (xs *> ys) ~= (toList xs *> toList ys)
+#endif
+
+-- Monad operations
+
+#ifdef SLOW_TESTS
+prop_bind :: Seq A -> Fun A (Seq B) -> Bool
+prop_bind xs (Fun _ f) =
+    toList' (xs >>= f) ~= (toList xs >>= toList . f)
+#endif
+
 -- Simple test monad
 
 data M a = Action Int a


From git at git.haskell.org  Fri Dec 18 22:11:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:11 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove CPP (b2b55b0)
Message-ID: <20151218221111.D78BE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b2b55b01aa985bb190a3f1580bf55eb2c83eb18f

>---------------------------------------------------------------

commit b2b55b01aa985bb190a3f1580bf55eb2c83eb18f
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Dec 19 23:49:35 2014 -0500

    Remove CPP


>---------------------------------------------------------------

b2b55b01aa985bb190a3f1580bf55eb2c83eb18f
 tests/seq-properties.hs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 2b4774d..880d772 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -17,9 +17,7 @@ import qualified Prelude
 import qualified Data.List
 import Test.QuickCheck hiding ((><))
 import Test.QuickCheck.Poly
-#ifdef SLOW_TESTS
 import Test.QuickCheck.Function
-#endif
 import Test.Framework
 import Test.Framework.Providers.QuickCheck2
 
@@ -96,11 +94,9 @@ main = defaultMain
        , testProperty "zipWith3" prop_zipWith3
        , testProperty "zip4" prop_zip4
        , testProperty "zipWith4" prop_zipWith4
-#ifdef SLOW_TESTS
        , testProperty "<*>" prop_ap
        , testProperty "*>" prop_then
        , testProperty ">>=" prop_bind
-#endif
        ]
 
 ------------------------------------------------------------------------
@@ -598,7 +594,6 @@ prop_zipWith4 xs ys zs ts =
 
 -- Applicative operations
 
-#ifdef SLOW_TESTS
 prop_ap :: Seq A -> Seq B -> Bool
 prop_ap xs ys =
     toList' ((,) <$> xs <*> ys) ~= ( (,) <$> toList xs <*> toList ys )
@@ -606,15 +601,12 @@ prop_ap xs ys =
 prop_then :: Seq A -> Seq B -> Bool
 prop_then xs ys =
     toList' (xs *> ys) ~= (toList xs *> toList ys)
-#endif
 
 -- Monad operations
 
-#ifdef SLOW_TESTS
 prop_bind :: Seq A -> Fun A (Seq B) -> Bool
 prop_bind xs (Fun _ f) =
     toList' (xs >>= f) ~= (toList xs >>= toList . f)
-#endif
 
 -- Simple test monad
 


From git at git.haskell.org  Fri Dec 18 22:11:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:13 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #102 from
 treeowl/validation (5482318)
Message-ID: <20151218221113.DE62A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5482318831df6f67bb3dffca98dfc72d1dcefc7a

>---------------------------------------------------------------

commit 5482318831df6f67bb3dffca98dfc72d1dcefc7a
Merge: 54c3603 b2b55b0
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 12:59:45 2014 +0100

    Merge pull request #102 from treeowl/validation
    
    Add tests for Applicative and Monad instances



>---------------------------------------------------------------

5482318831df6f67bb3dffca98dfc72d1dcefc7a
 tests/seq-properties.hs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)


From git at git.haskell.org  Fri Dec 18 22:11:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:15 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #107 from
 treeowl/fromListN (ae97ceb)
Message-ID: <20151218221115.E782F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ae97ceb44766fb5e78f23670e09a20a9625b0963

>---------------------------------------------------------------

commit ae97ceb44766fb5e78f23670e09a20a9625b0963
Merge: 5482318 ace8f7f
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 13:06:44 2014 +0100

    Merge pull request #107 from treeowl/fromListN
    
    Use fromList2 to implement fromListN in IsList



>---------------------------------------------------------------

ae97ceb44766fb5e78f23670e09a20a9625b0963
 Data/Sequence.hs | 1 +
 1 file changed, 1 insertion(+)



From git at git.haskell.org  Fri Dec 18 22:11:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:17 +0000 (UTC)
Subject: [commit: packages/containers] master: Reimplement `<*>` (38b1b81)
Message-ID: <20151218221117.F06A33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/38b1b81c8b5536525d0daad9bd8ee9821a3fb929

>---------------------------------------------------------------

commit 38b1b81c8b5536525d0daad9bd8ee9821a3fb929
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 16:31:10 2014 -0500

    Reimplement `<*>`
    
    Use `coerce` for the `Functor` instance of `Elem`
    
    Using `fmap = coerce` for `Elem` speeds up `<*>` by somewhere
    around 20%.
    
    Benchmark results:
    
    OLD:
    
    benchmarking <*>/ix1000/500000
    time                 11.47 ms   (11.37 ms .. 11.59 ms)
                         0.999 R?   (0.998 R? .. 1.000 R?)
    mean                 11.61 ms   (11.52 ms .. 11.73 ms)
    std dev              279.9 ?s   (209.5 ?s .. 385.6 ?s)
    
    benchmarking <*>/nf100/2500/rep
    time                 8.530 ms   (8.499 ms .. 8.568 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 8.511 ms   (8.498 ms .. 8.528 ms)
    std dev              40.40 ?s   (28.55 ?s .. 63.84 ?s)
    
    benchmarking <*>/nf100/2500/ff
    time                 27.13 ms   (26.16 ms .. 28.70 ms)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 26.49 ms   (26.29 ms .. 27.43 ms)
    std dev              697.1 ?s   (153.0 ?s .. 1.443 ms)
    
    benchmarking <*>/nf500/500/rep
    time                 8.421 ms   (8.331 ms .. 8.491 ms)
                         0.991 R?   (0.967 R? .. 1.000 R?)
    mean                 8.518 ms   (8.417 ms .. 9.003 ms)
    std dev              529.9 ?s   (40.37 ?s .. 1.176 ms)
    variance introduced by outliers: 32% (moderately inflated)
    
    benchmarking <*>/nf500/500/ff
    time                 33.71 ms   (33.58 ms .. 33.86 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 33.69 ms   (33.62 ms .. 33.76 ms)
    std dev              150.0 ?s   (119.0 ?s .. 191.0 ?s)
    
    benchmarking <*>/nf2500/100/rep
    time                 8.390 ms   (8.259 ms .. 8.456 ms)
                         0.997 R?   (0.992 R? .. 1.000 R?)
    mean                 8.544 ms   (8.441 ms .. 8.798 ms)
    std dev              402.6 ?s   (21.25 ?s .. 714.9 ?s)
    variance introduced by outliers: 23% (moderately inflated)
    
    benchmarking <*>/nf2500/100/ff
    time                 53.69 ms   (53.33 ms .. 54.08 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 53.59 ms   (53.38 ms .. 53.75 ms)
    std dev              341.2 ?s   (231.7 ?s .. 473.9 ?s)
    
    NEW
    
    benchmarking <*>/ix1000/500000
    time                 2.688 ?s   (2.607 ?s .. 2.798 ?s)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 2.632 ?s   (2.607 ?s .. 2.715 ?s)
    std dev              129.9 ns   (65.93 ns .. 242.8 ns)
    variance introduced by outliers: 64% (severely inflated)
    
    benchmarking <*>/nf100/2500/rep
    time                 8.371 ms   (8.064 ms .. 8.535 ms)
                         0.983 R?   (0.947 R? .. 1.000 R?)
    mean                 8.822 ms   (8.590 ms .. 9.463 ms)
    std dev              991.2 ?s   (381.3 ?s .. 1.809 ms)
    variance introduced by outliers: 61% (severely inflated)
    
    benchmarking <*>/nf100/2500/ff
    time                 22.84 ms   (22.74 ms .. 22.94 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 22.78 ms   (22.71 ms .. 22.86 ms)
    std dev              183.3 ?s   (116.3 ?s .. 291.3 ?s)
    
    benchmarking <*>/nf500/500/rep
    time                 8.320 ms   (8.102 ms .. 8.514 ms)
                         0.995 R?   (0.990 R? .. 0.999 R?)
    mean                 8.902 ms   (8.675 ms .. 9.407 ms)
    std dev              952.4 ?s   (435.5 ?s .. 1.672 ms)
    variance introduced by outliers: 58% (severely inflated)
    
    benchmarking <*>/nf500/500/ff
    time                 24.50 ms   (24.41 ms .. 24.58 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 24.44 ms   (24.41 ms .. 24.48 ms)
    std dev              75.08 ?s   (50.16 ?s .. 111.3 ?s)
    
    benchmarking <*>/nf2500/100/rep
    time                 8.419 ms   (8.366 ms .. 8.458 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 8.571 ms   (8.525 ms .. 8.670 ms)
    std dev              179.5 ?s   (112.0 ?s .. 278.1 ?s)
    
    benchmarking <*>/nf2500/100/ff
    time                 24.14 ms   (24.07 ms .. 24.26 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 24.11 ms   (24.07 ms .. 24.17 ms)
    std dev              103.8 ?s   (68.34 ?s .. 142.0 ?s)


>---------------------------------------------------------------

38b1b81c8b5536525d0daad9bd8ee9821a3fb929
 Data/Sequence.hs | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 258 insertions(+), 3 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 38b1b81c8b5536525d0daad9bd8ee9821a3fb929

From git at git.haskell.org  Fri Dec 18 22:11:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:20 +0000 (UTC)
Subject: [commit: packages/containers] master: Add Applicative benchmarks
 (8b47db3)
Message-ID: <20151218221120.03B913A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/8b47db3af79c31fe5434e95143242a2ef3e1e184

>---------------------------------------------------------------

commit 8b47db3af79c31fe5434e95143242a2ef3e1e184
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 20 15:02:05 2014 -0500

    Add Applicative benchmarks


>---------------------------------------------------------------

8b47db3af79c31fe5434e95143242a2ef3e1e184
 benchmarks/Sequence.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index b6b82fa..a152c3b 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -1,6 +1,7 @@
 -- > ghc -DTESTING --make -O2 -fforce-recomp -i.. Sequence.hs
 module Main where
 
+import Control.Applicative
 import Control.DeepSeq
 import Criterion.Main
 import Data.List (foldl')
@@ -44,6 +45,22 @@ main = do
          , bench "nf1000" $ nf (\s -> S.fromFunction s (+1)) 1000
          , bench "nf10000" $ nf (\s -> S.fromFunction s (+1)) 10000
          ]
+      , bgroup "<*>"
+         [ bench "ix1000/500000" $
+              nf (\s -> ((+) <$> s <*> s) `S.index` (S.length s `div` 2)) (S.fromFunction 1000 (+1))
+         , bench "nf100/2500/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (100,2500)
+         , bench "nf100/2500/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (100,2500)
+         , bench "nf500/500/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (500,500)
+         , bench "nf500/500/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (500,500)
+         , bench "nf2500/100/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (2500,100)
+         , bench "nf2500/100/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (2500,100)
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Fri Dec 18 22:11:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:22 +0000 (UTC)
Subject: [commit: packages/containers] master: Exploit some invariants
 (41b7cb4)
Message-ID: <20151218221122.0BB9B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/41b7cb48a1f61911651fc4ea40ac552332de9e96

>---------------------------------------------------------------

commit 41b7cb48a1f61911651fc4ea40ac552332de9e96
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Sun Dec 21 16:37:11 2014 +0100

    Exploit some invariants
    
    Consequently, get rid of ApState.
    
    This speeds up the immediate-indexing test substantially:
    
    Old:
    
    benchmarking <*>/ix1000/500000
    time                 2.688 ?s   (2.607 ?s .. 2.798 ?s)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 2.632 ?s   (2.607 ?s .. 2.715 ?s)
    std dev              129.9 ns   (65.93 ns .. 242.8 ns)
    variance introduced by outliers: 64% (severely inflated)
    
    New:
    
    benchmarking <*>/ix1000/500000
    time                 1.410 ?s   (1.402 ?s .. 1.417 ?s)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 1.417 ?s   (1.411 ?s .. 1.425 ?s)
    std dev              21.45 ns   (16.80 ns .. 31.73 ns)
    variance introduced by outliers: 14% (moderately inflated)


>---------------------------------------------------------------

41b7cb48a1f61911651fc4ea40ac552332de9e96
 Data/Sequence.hs | 120 ++++++++++++++++++++++---------------------------------
 1 file changed, 47 insertions(+), 73 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7a2de82..0a64c3e 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -277,7 +277,7 @@ apShort :: Seq (a -> b) -> Seq a -> Seq b
 apShort (Seq fs) xs = Seq $ case toList xs of
             [a,b] -> ap2FT fs (a,b)
             [a,b,c] -> ap3FT fs (a,b,c)
-            _ -> error "apShort: not 2-6"
+            _ -> error "apShort: not 2-3"
 
 ap2FT :: FingerTree (Elem (a->b)) -> (a,a) -> FingerTree (Elem b)
 ap2FT fs (x,y) = Deep (size fs * 2)
@@ -298,104 +298,85 @@ ap3FT fs (x,y,z) = Deep (size fs * 3)
 -- <*> when the length of each argument is at least four.
 apty :: Seq (a -> b) -> Seq a -> Seq b
 apty (Seq fs) (Seq xs at Deep{}) = Seq $
-    runApState (fmap firstf) (fmap lastf) fmap fs' (ApState xs' xs' xs')
+    Deep (s' * size fs)
+         (fmap (fmap firstf) pr')
+         (aptyMiddle (fmap firstf) (fmap lastf) fmap fs' xs')
+         (fmap (fmap lastf) sf')
   where
     (Elem firstf, fs', Elem lastf) = trimTree fs
-    xs' = rigidify xs
+    xs'@(Deep s' pr' _m' sf') = rigidify xs
 apty _ _ = error "apty: expects a Deep constructor"
 
-data ApState a = ApState (FingerTree a) (FingerTree a) (FingerTree a)
-
--- | 'runApState' uses three copies of the @xs@ tree to produce the @fs<*>xs@
--- tree. It pulls left digits off the left tree, right digits off the right tree,
--- and squashes down the other four digits. Once it gets to the bottom, it turns
--- the middle tree into a 2-3 tree, applies 'mapMulFT' to produce the main body,
--- and glues all the pieces together.
-runApState
+-- | 'aptyMiddle' does most of the hard work of computing @fs<*>xs at .
+-- It produces the center part of a finger tree, with a prefix corresponding
+-- to the prefix of @xs@ and a suffix corresponding to the suffix of @xs@
+-- omitted; the missing suffix and prefix are added by the caller.
+-- For the recursive call, it squashes the prefix and the suffix into
+-- the center tree. Once it gets to the bottom, it turns the tree into
+-- a 2-3 tree, applies 'mapMulFT' to produce the main body, and glues all
+-- the pieces together.
+aptyMiddle
   :: Sized c =>
      (c -> d)
      -> (c -> d)
      -> ((a -> b) -> c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState c
-     -> FingerTree d
+     -> FingerTree c
+     -> FingerTree (Node d)
 -- Not at the bottom yet
-runApState firstf
+aptyMiddle firstf
            lastf
            map23
            fs
-           (ApState
-              (Deep sl
-                    prl
-                    (Deep sml prml mml sfml)
-                    sfl)
-              (Deep sm
-                    prm
-                    (Deep _smm prmm mmm sfmm)
-                    sfm)
-              (Deep sr
-                    prr
-                    (Deep smr prmr mmr sfmr)
-                    sfr))
-    = Deep (sl + sr + sm * size fs)
-           (fmap firstf prl)
-           (runApState (fmap firstf)
+           (Deep s pr (Deep sm prm mm sfm) sf)
+    = Deep (sm + s * (size fs + 1)) -- note: sm = s - size pr - size sf
+           (fmap (fmap firstf) prm)
+           (aptyMiddle (fmap firstf)
                        (fmap lastf)
                        (\f -> fmap (map23 f))
                        fs
-                       nextState)
-           (fmap lastf sfr)
-     where nextState =
-             ApState
-               (Deep (sml + size sfl) prml mml (squashR sfml sfl))
-               (Deep sm (squashL prm prmm) mmm (squashR sfmm sfm))
-               (Deep (smr + size prr) (squashL prr prmr) mmr sfmr)
+                       (Deep s (squashL pr prm) mm (squashR sfm sf)))
+           (fmap (fmap lastf) sfm)
 
 -- At the bottom
-runApState firstf
+aptyMiddle firstf
            lastf
            map23
            fs
-           (ApState
-              (Deep sl prl ml sfl)
-              (Deep sm prm mm sfm)
-              (Deep sr prr mr sfr))
-      = Deep (sl + sr + sm * size fs)
-             (fmap firstf prl)
-             ((fmap (fmap firstf) ml `snocTree` fmap firstf (digitToNode sfl))
-              `appendTree0` middle `appendTree0`
-              (fmap lastf (digitToNode prr) `consTree`  fmap (fmap lastf) mr))
-             (fmap lastf sfr)
-    where middle = case trimTree $ mapMulFT sm (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
+           (Deep s pr m sf)
+      = (fmap (fmap firstf) m `snocTree` fmap firstf (digitToNode sf))
+        `appendTree0` middle `appendTree0`
+        (fmap lastf (digitToNode pr) `consTree`  fmap (fmap lastf) m)
+    where middle = case trimTree $ mapMulFT s (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
                      (firstMapped, restMapped, lastMapped) ->
                         Deep (size firstMapped + size restMapped + size lastMapped)
                              (nodeToDigit firstMapped) restMapped (nodeToDigit lastMapped)
-          converted = case mm of
-                                    Empty -> Node2 sm lconv rconv
-                                    Single q -> Node3 sm lconv q rconv
-                                    Deep{} -> error "runApState: a tree is shallower than the middle tree"
-          lconv = digitToNode prm
-          rconv = digitToNode sfm
+          converted = case m of
+                                    Empty -> Node2 s lconv rconv
+                                    Single q -> Node3 s lconv q rconv
+                                    Deep{} -> error "aptyMiddle: impossible"
+          lconv = digitToNode pr
+          rconv = digitToNode sf
 
-runApState _ _ _ _ _ = error "runApState: ApState must hold Deep finger trees of the same depth"
+aptyMiddle _ _ _ _ _ = error "aptyMiddle: expected Deep finger tree"
 
 {-# SPECIALIZE
- runApState
+ aptyMiddle
   :: (Node c -> d)
      -> (Node c -> d)
      -> ((a -> b) -> Node c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState (Node c)
-     -> FingerTree d
+     -> FingerTree (Node c)
+     -> FingerTree (Node d)
  #-}
 {-# SPECIALIZE
- runApState
+ aptyMiddle
   :: (Elem c -> d)
      -> (Elem c -> d)
      -> ((a -> b) -> Elem c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState (Elem c)
-     -> FingerTree d
+     -> FingerTree (Elem c)
+     -> FingerTree (Node d)
  #-}
 
 digitToNode :: Sized a => Digit a -> Node a
@@ -2096,16 +2077,9 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- Mapping with a splittable value
 ------------------------------------------------------------------------
 
--- For zipping, and probably also for (<*>), it is useful to build a result by
+-- For zipping, it is useful to build a result by
 -- traversing a sequence while splitting up something else.  For zipping, we
--- traverse the first sequence while splitting up the second [and third [and
--- fourth]]. For fs <*> xs, we hope to traverse
---
--- > replicate (length fs * length xs) ()
---
--- while splitting something essentially equivalent to
---
--- > fmap (\f -> fmap f xs) fs
+-- traverse the first sequence while splitting up the second.
 --
 -- What makes all this crazy code a good idea:
 --
@@ -2129,8 +2103,8 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- they're actually needed. We do the same thing for Digits (splitting into
 -- between one and four pieces) and Nodes (splitting into two or three). The
 -- ultimate result is that we can index into, or split at, any location in zs
--- in O((log(min{i,n-i}))^2) time *immediately*, while still being able to
--- force all the thunks in O(n) time.
+-- in polylogarithmic time *immediately*, while still being able to force all
+-- the thunks in O(n) time.
 --
 -- Benchmark info, and alternatives:
 --


From git at git.haskell.org  Fri Dec 18 22:11:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:24 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #104 from
 treeowl/ap (2546efe)
Message-ID: <20151218221124.12ACF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2546efeadaca6c078b5ddc23557af71fd3d6966d

>---------------------------------------------------------------

commit 2546efeadaca6c078b5ddc23557af71fd3d6966d
Merge: ae97ceb 41b7cb4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 11:13:16 2014 +0100

    Merge pull request #104 from treeowl/ap
    
    Make <*> fast



>---------------------------------------------------------------

2546efeadaca6c078b5ddc23557af71fd3d6966d
 Data/Sequence.hs       | 257 ++++++++++++++++++++++++++++++++++++++++++++++---
 benchmarks/Sequence.hs |  17 ++++
 2 files changed, 260 insertions(+), 14 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:26 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.2
 (924fafe)
Message-ID: <20151218221126.1AEC93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/924fafe1030301ee1d62d7acd576e86b50251157

>---------------------------------------------------------------

commit 924fafe1030301ee1d62d7acd576e86b50251157
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 11:54:05 2014 +0100

    Bump version number to 0.5.6.2


>---------------------------------------------------------------

924fafe1030301ee1d62d7acd576e86b50251157
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 169507a..c5d7523 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.1
+version: 0.5.6.2
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Fri Dec 18 22:11:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:28 +0000 (UTC)
Subject: [commit: packages/containers] master: update benchmarks Makefile
 (5f9af63)
Message-ID: <20151218221128.211E43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f9af637de232236abf1890f1e05a3df4421ef15

>---------------------------------------------------------------

commit 5f9af637de232236abf1890f1e05a3df4421ef15
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Sun Dec 21 21:01:11 2014 +0100

    update benchmarks Makefile


>---------------------------------------------------------------

5f9af637de232236abf1890f1e05a3df4421ef15
 benchmarks/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 1539a2a..aacccef 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,10 +1,12 @@
 all:
 
 bench-%: %.hs force
-	ghc -O2 -DTESTING $< -i../$(TOP) -o $@ -outputdir tmp -rtsopts
+	ghc -O2 -DTESTING $< -I../include -i../$(TOP) -o $@ -outputdir tmp -rtsopts
+
+.PRECIOUS: bench-%
 
 bench-%.csv: bench-%
-	./bench-$* $(BENCHMARK) -v -u bench-$*.csv
+	./bench-$* "$(BENCHMARK)" -v1 --csv bench-$*.csv
 
 .PHONY: force clean veryclean
 force:


From git at git.haskell.org  Fri Dec 18 22:11:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:30 +0000 (UTC)
Subject: [commit: packages/containers] master: update benchmarks to work with
 criterion-1.0 (5364bea)
Message-ID: <20151218221130.280743A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5364beaa69609ba3c0868cec4380b9c36105b740

>---------------------------------------------------------------

commit 5364beaa69609ba3c0868cec4380b9c36105b740
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Mon Dec 22 17:08:21 2014 +0100

    update benchmarks to work with criterion-1.0


>---------------------------------------------------------------

5364beaa69609ba3c0868cec4380b9c36105b740
 benchmarks/IntMap.hs   | 6 ++----
 benchmarks/IntSet.hs   | 6 ++----
 benchmarks/Map.hs      | 6 ++----
 benchmarks/Sequence.hs | 7 ++++---
 benchmarks/Set.hs      | 6 ++----
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/benchmarks/IntMap.hs b/benchmarks/IntMap.hs
index 87465a7..38104c0 100644
--- a/benchmarks/IntMap.hs
+++ b/benchmarks/IntMap.hs
@@ -4,7 +4,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.IntMap as M
@@ -13,9 +12,8 @@ import Prelude hiding (lookup)
 
 main = do
     let m = M.fromAscList elems :: M.IntMap Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [m])
+    evaluate $ rnf [m]
+    defaultMain
         [ bench "lookup" $ whnf (lookup keys) m
         , bench "insert" $ whnf (ins elems) M.empty
         , bench "insertWith empty" $ whnf (insWith elems) M.empty
diff --git a/benchmarks/IntSet.hs b/benchmarks/IntSet.hs
index 7c16c91..a768a32 100644
--- a/benchmarks/IntSet.hs
+++ b/benchmarks/IntSet.hs
@@ -5,7 +5,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.IntSet as S
@@ -14,9 +13,8 @@ main = do
     let s = S.fromAscList elems :: S.IntSet
         s_even = S.fromAscList elems_even :: S.IntSet
         s_odd = S.fromAscList elems_odd :: S.IntSet
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [s, s_even, s_odd])
+    evaluate $ rnf [s, s_even, s_odd]
+    defaultMain
         [ bench "member" $ whnf (member elems) s
         , bench "insert" $ whnf (ins elems) S.empty
         , bench "map" $ whnf (S.map (+ 1)) s
diff --git a/benchmarks/Map.hs b/benchmarks/Map.hs
index d0d539a..60e7ace 100644
--- a/benchmarks/Map.hs
+++ b/benchmarks/Map.hs
@@ -4,7 +4,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Map as M
@@ -15,9 +14,8 @@ main = do
     let m = M.fromAscList elems :: M.Map Int Int
         m_even = M.fromAscList elems_even :: M.Map Int Int
         m_odd = M.fromAscList elems_odd :: M.Map Int Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [m, m_even, m_odd])
+    evaluate $ rnf [m, m_even, m_odd]
+    defaultMain
         [ bench "lookup absent" $ whnf (lookup evens) m_odd
         , bench "lookup present" $ whnf (lookup evens) m_even
         , bench "insert absent" $ whnf (ins elems_even) m_odd
diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index a152c3b..7ccede9 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -3,6 +3,7 @@ module Main where
 
 import Control.Applicative
 import Control.DeepSeq
+import Control.Exception (evaluate)
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Sequence as S
@@ -14,19 +15,19 @@ main = do
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
         s10000 = S.fromList [1..10000] :: S.Seq Int
-    rnf [s10, s100, s1000, s10000] `seq` return ()
+    evaluate $ rnf [s10, s100, s1000, s10000]
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
         r100 = rlist 100
         r1000 = rlist 1000
         r10000 = rlist 10000
-    rnf [r10, r100, r1000, r10000] `seq` return ()
+    evaluate $ rnf [r10, r100, r1000, r10000]
     let u10 = S.replicate 10 () :: S.Seq ()
         u100 = S.replicate 100 () :: S.Seq ()
         u1000 = S.replicate 1000 () :: S.Seq ()
         u10000 = S.replicate 10000 () :: S.Seq ()
-    rnf [u10, u100, u1000, u10000] `seq` return ()
+    evaluate $ rnf [u10, u100, u1000, u10000]
     defaultMain
       [ bgroup "splitAt/append"
          [ bench "10" $ nf (shuffle r10) s10
diff --git a/benchmarks/Set.hs b/benchmarks/Set.hs
index e21001c..3a6e8aa 100644
--- a/benchmarks/Set.hs
+++ b/benchmarks/Set.hs
@@ -6,7 +6,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Set as S
@@ -15,9 +14,8 @@ main = do
     let s = S.fromAscList elems :: S.Set Int
         s_even = S.fromAscList elems_even :: S.Set Int
         s_odd = S.fromAscList elems_odd :: S.Set Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [s, s_even, s_odd])
+    evaluate $ rnf [s, s_even, s_odd]
+    defaultMain
         [ bench "member" $ whnf (member elems) s
         , bench "insert" $ whnf (ins elems) S.empty
         , bench "map" $ whnf (S.map (+ 1)) s


From git at git.haskell.org  Fri Dec 18 22:11:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:32 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #110 from
 int-e/bench (55f65cd)
Message-ID: <20151218221132.30D093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/55f65cddc15bb30149795de2c5498e428381f2d2

>---------------------------------------------------------------

commit 55f65cddc15bb30149795de2c5498e428381f2d2
Merge: 924fafe 5364bea
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 17:56:05 2014 +0100

    Merge pull request #110 from int-e/bench
    
    update benchmarks for criterion-1.0



>---------------------------------------------------------------

55f65cddc15bb30149795de2c5498e428381f2d2
 benchmarks/IntMap.hs   | 6 ++----
 benchmarks/IntSet.hs   | 6 ++----
 benchmarks/Makefile    | 6 ++++--
 benchmarks/Map.hs      | 6 ++----
 benchmarks/Sequence.hs | 7 ++++---
 benchmarks/Set.hs      | 6 ++----
 6 files changed, 16 insertions(+), 21 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:34 +0000 (UTC)
Subject: [commit: packages/containers] master: Make applicativeTree aim for
 safe digits (1e962fc)
Message-ID: <20151218221134.398B13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1e962fc2772008512509955316fb4d6eab2766e3

>---------------------------------------------------------------

commit 1e962fc2772008512509955316fb4d6eab2766e3
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 24 22:03:29 2014 -0500

    Make applicativeTree aim for safe digits
    
    As previously discussed, this gives the tree more flexibility and
    matches what other functions do.


>---------------------------------------------------------------

1e962fc2772008512509955316fb4d6eab2766e3
 Data/Sequence.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..c256a53 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -856,17 +856,14 @@ applicativeTree n mSize m = mSize `seq` case n of
     4 -> deepA two emptyTree two
     5 -> deepA three emptyTree two
     6 -> deepA three emptyTree three
-    7 -> deepA four emptyTree three
-    8 -> deepA four emptyTree four
     _ -> case n `quotRem` 3 of
            (q,0) -> deepA three (applicativeTree (q - 2) mSize' n3) three
-           (q,1) -> deepA four  (applicativeTree (q - 2) mSize' n3) three
-           (q,_) -> deepA four  (applicativeTree (q - 2) mSize' n3) four
+           (q,1) -> deepA two (applicativeTree (q - 1) mSize' n3) two
+           (q,_) -> deepA three (applicativeTree (q - 1) mSize' n3) two
   where
     one = fmap One m
     two = liftA2 Two m m
     three = liftA3 Three m m m
-    four = liftA3 Four m m m <*> m
     deepA = liftA3 (Deep (n * mSize))
     mSize' = 3 * mSize
     n3 = liftA3 (Node3 mSize') m m m
@@ -2335,7 +2332,7 @@ unstableSortBy cmp (Seq xs) =
         toPQ cmp (\ (Elem x) -> PQueue x Nil) xs
 
 -- | fromList2, given a list and its length, constructs a completely
--- balanced Seq whose elements are that list using the applicativeTree
+-- balanced Seq whose elements are that list using the replicateA
 -- generalization.
 fromList2 :: Int -> [a] -> Seq a
 fromList2 n = execState (replicateA n (State ht))


From git at git.haskell.org  Fri Dec 18 22:11:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:36 +0000 (UTC)
Subject: [commit: packages/containers] master: Clean up <*> development
 artifacts (f1e0f8e)
Message-ID: <20151218221136.40DF23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830

>---------------------------------------------------------------

commit f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 27 21:35:36 2014 -0500

    Clean up <*> development artifacts
    
    Some silly remnants of my thought process remained in the code.
    Remove them.


>---------------------------------------------------------------

f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830
 Data/Sequence.hs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..34504f5 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -338,15 +338,18 @@ aptyMiddle firstf
                        (Deep s (squashL pr prm) mm (squashR sfm sf)))
            (fmap (fmap lastf) sfm)
 
--- At the bottom
+-- At the bottom. Note that these appendTree0 calls are very cheap, because in
+-- each case, one of the arguments is guaranteed to be Empty or Single.
 aptyMiddle firstf
            lastf
            map23
            fs
            (Deep s pr m sf)
-      = (fmap (fmap firstf) m `snocTree` fmap firstf (digitToNode sf))
-        `appendTree0` middle `appendTree0`
-        (fmap lastf (digitToNode pr) `consTree`  fmap (fmap lastf) m)
+      = fmap (fmap firstf) m `appendTree0`
+        ((fmap firstf (digitToNode sf)
+            `consTree` middle)
+            `snocTree` fmap lastf (digitToNode pr))
+        `appendTree0`  fmap (fmap lastf) m
     where middle = case trimTree $ mapMulFT s (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
                      (firstMapped, restMapped, lastMapped) ->
                         Deep (size firstMapped + size restMapped + size lastMapped)
@@ -469,17 +472,16 @@ rigidify Single{} = error "rigidify: singleton"
 -- | /O(log n)/ (incremental) Rejigger a finger tree so the digits are all ones
 -- and twos.
 thin :: Sized a => FingerTree a -> FingerTree a
--- Note that 'thin' may call itself at most once before passing the job on to
--- 'thin12'. 'thin12' will produce a 'Deep' constructor immediately before
--- calling 'thin'.
+-- Note that 'thin12' will produce a 'Deep' constructor immediately before
+-- recursively calling 'thin'.
 thin Empty = Empty
 thin (Single a) = Single a
 thin t@(Deep s pr m sf) =
   case pr of
     One{} -> thin12 t
     Two{} -> thin12 t
-    Three a b c  -> thin $ Deep s (One a) (node2 b c `consTree` m) sf
-    Four a b c d -> thin $ Deep s (Two a b) (node2 c d `consTree` m) sf
+    Three a b c  -> thin12 $ Deep s (One a) (node2 b c `consTree` m) sf
+    Four a b c d -> thin12 $ Deep s (Two a b) (node2 c d `consTree` m) sf
 
 thin12 :: Sized a => FingerTree a -> FingerTree a
 thin12 (Deep s pr m sf at One{}) = Deep s pr (thin m) sf


From git at git.haskell.org  Fri Dec 18 22:11:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:38 +0000 (UTC)
Subject: [commit: packages/containers] master: Make `-Wall`-clean for
 base-4.8.0.0 (71f53cb)
Message-ID: <20151218221138.4C93D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f

>---------------------------------------------------------------

commit 71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 28 09:36:44 2014 +0100

    Make `-Wall`-clean for base-4.8.0.0


>---------------------------------------------------------------

71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
 Data/Graph.hs       |  2 ++
 Data/IntMap/Base.hs | 11 ++++++++---
 Data/IntSet/Base.hs |  4 +++-
 Data/Map/Base.hs    |  9 +++++++--
 Data/Sequence.hs    |  3 +++
 Data/Set/Base.hs    |  2 ++
 Data/Tree.hs        | 13 +++++++++----
 7 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index 5f2bc15..c02b3e3 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -75,7 +75,9 @@ import qualified Data.IntSet as Set
 import Data.Tree (Tree(Node), Forest)
 
 -- std interfaces
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.DeepSeq (NFData(rnf))
 import Data.Maybe
 import Data.Array
diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index d25cb9e..e15ed76 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,16 +216,21 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+import Data.Word (Word)
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (liftM)
 import Data.Bits
 import qualified Data.Foldable as Foldable
 import Data.Maybe (fromMaybe)
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
-import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import Data.IntSet.Base (Key)
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 6ddd0fb..c89bd18 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -169,9 +169,11 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits
 import qualified Data.List as List
 import Data.Maybe (fromMaybe)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
-import Data.Typeable
 import Data.Word (Word)
+#endif
+import Data.Typeable
 import Prelude hiding (filter, foldr, foldl, null, map)
 
 import Data.Utils.BitUtil
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 815e54b..965a258 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,12 +270,17 @@ module Data.Map.Base (
     , filterLt
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(..), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..6b11266 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -147,6 +147,9 @@ module Data.Sequence (
 
 import Prelude hiding (
     Functor(..),
+#if MIN_VERSION_base(4,8,0)
+    Applicative, foldMap, Monoid,
+#endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
     takeWhile, dropWhile, iterate, reverse, filter, mapM, sum, all)
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 0dbc569..e1ebad3 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -192,7 +192,9 @@ module Data.Set.Base (
 import Prelude hiding (filter,foldl,foldr,null,map)
 import qualified Data.List as List
 import Data.Bits (shiftL, shiftR)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
+#endif
 import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
diff --git a/Data/Tree.hs b/Data/Tree.hs
index 4ee935b..abc9902 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -34,13 +34,19 @@ module Data.Tree(
     unfoldTreeM_BF, unfoldForestM_BF,
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+import Data.Foldable (toList)
+#else
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad (liftM)
+import Data.Foldable (Foldable(foldMap), toList)
 import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
+import Control.Monad (liftM)
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)
-import Data.Foldable (Foldable(foldMap), toList)
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
@@ -52,7 +58,6 @@ import Data.Data (Data)
 import Data.Coerce
 #endif
 
-
 -- | Multi-way trees, also known as /rose trees/.
 data Tree a = Node {
         rootLabel :: a,         -- ^ label value


From git at git.haskell.org  Fri Dec 18 22:11:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:40 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #119 from
 hvr/pr-base48 (a4df7f3)
Message-ID: <20151218221140.572423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a4df7f35d859634f321c05f574e268a1c47792be

>---------------------------------------------------------------

commit a4df7f35d859634f321c05f574e268a1c47792be
Merge: 55f65cd 71f53cb
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:42:22 2014 +0100

    Merge pull request #119 from hvr/pr-base48
    
    Make `-Wall`-clean for base-4.8.0.0



>---------------------------------------------------------------

a4df7f35d859634f321c05f574e268a1c47792be
 Data/Graph.hs       |  2 ++
 Data/IntMap/Base.hs | 11 ++++++++---
 Data/IntSet/Base.hs |  4 +++-
 Data/Map/Base.hs    |  9 +++++++--
 Data/Sequence.hs    |  3 +++
 Data/Set/Base.hs    |  2 ++
 Data/Tree.hs        | 13 +++++++++----
 7 files changed, 34 insertions(+), 10 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:42 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #116 from
 treeowl/balanceReplicate (e0cfb50)
Message-ID: <20151218221142.606943A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e0cfb504ce356f75e59ca2b392dee3f93eae0e4b

>---------------------------------------------------------------

commit e0cfb504ce356f75e59ca2b392dee3f93eae0e4b
Merge: a4df7f3 1e962fc
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:49:36 2014 +0100

    Merge pull request #116 from treeowl/balanceReplicate
    
    Make applicativeTree aim for safe digits



>---------------------------------------------------------------

e0cfb504ce356f75e59ca2b392dee3f93eae0e4b
 Data/Sequence.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)



From git at git.haskell.org  Fri Dec 18 22:11:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:44 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #118 from
 treeowl/apcleanup (202e2f2)
Message-ID: <20151218221144.6913B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/202e2f2a28d1d914d19e177bc4b6e64597cf62f2

>---------------------------------------------------------------

commit 202e2f2a28d1d914d19e177bc4b6e64597cf62f2
Merge: e0cfb50 f1e0f8e
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:55:09 2014 +0100

    Merge pull request #118 from treeowl/apcleanup
    
    Clean up <*> development artifacts



>---------------------------------------------------------------

202e2f2a28d1d914d19e177bc4b6e64597cf62f2
 Data/Sequence.hs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)



From git at git.haskell.org  Fri Dec 18 22:11:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:46 +0000 (UTC)
Subject: [commit: packages/containers] master: Add warning about Seq size.
 (74afe96)
Message-ID: <20151218221146.726E13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/74afe969cc792ab30715f6ad7399bddb492a1b66

>---------------------------------------------------------------

commit 74afe969cc792ab30715f6ad7399bddb492a1b66
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 31 01:24:48 2014 -0500

    Add warning about Seq size.


>---------------------------------------------------------------

74afe969cc792ab30715f6ad7399bddb492a1b66
 Data/Map.hs        |  4 ++++
 Data/Map/Lazy.hs   |  4 ++++
 Data/Map/Strict.hs |  4 ++++
 Data/Sequence.hs   | 14 +++++++++++---
 Data/Set.hs        |  4 ++++
 Data/Set/Base.hs   |  4 ++++
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Data/Map.hs b/Data/Map.hs
index 1281f2f..e4af46a 100644
--- a/Data/Map.hs
+++ b/Data/Map.hs
@@ -45,6 +45,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 -----------------------------------------------------------------------------
diff --git a/Data/Map/Lazy.hs b/Data/Map/Lazy.hs
index 2705de5..17fa6fe 100644
--- a/Data/Map/Lazy.hs
+++ b/Data/Map/Lazy.hs
@@ -44,6 +44,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 -----------------------------------------------------------------------------
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 7309041..623b1df 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -44,6 +44,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 --
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 11f1880..21c54d3 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -16,7 +16,8 @@
 -- Module      :  Data.Sequence
 -- Copyright   :  (c) Ross Paterson 2005
 --                (c) Louis Wasserman 2009
---                (c) David Feuer, Ross Paterson, and Milan Straka 2014
+--                (c) Bertram Felgenhauer, David Feuer, Ross Paterson, and
+--                    Milan Straka 2014
 -- License     :  BSD-style
 -- Maintainer  :  libraries at haskell.org
 -- Stability   :  experimental
@@ -29,7 +30,7 @@
 --
 -- An amortized running time is given for each operation, with /n/ referring
 -- to the length of the sequence and /i/ being the integral index used by
--- some operations.  These bounds hold even in a persistent (shared) setting.
+-- some operations. These bounds hold even in a persistent (shared) setting.
 --
 -- The implementation uses 2-3 finger trees annotated with sizes,
 -- as described in section 4.2 of
@@ -40,9 +41,16 @@
 --      <http://staff.city.ac.uk/~ross/papers/FingerTree.html>
 --
 -- /Note/: Many of these operations have the same names as similar
--- operations on lists in the "Prelude".  The ambiguity may be resolved
+-- operations on lists in the "Prelude". The ambiguity may be resolved
 -- using either qualification or the @hiding@ clause.
 --
+-- /Warning/: The size of a 'Seq' must not exceed @maxBound::Int at .  Violation
+-- of this condition is not detected and if the size limit is exceeded, the
+-- behaviour of the sequence is undefined.  This is unlikely to occur in most
+-- applications, but some care may be required when using '><', '<*>', '*>', or
+-- '>>', particularly repeatedly and particularly in combination with
+-- 'replicate' or 'fromFunction'.
+--
 -----------------------------------------------------------------------------
 
 module Data.Sequence (
diff --git a/Data/Set.hs b/Data/Set.hs
index 37366fe..fd8c8b9 100644
--- a/Data/Set.hs
+++ b/Data/Set.hs
@@ -38,6 +38,10 @@
 -- 'union' or 'insert'.  Of course, left-biasing can only be observed
 -- when equality is an equivalence relation instead of structural
 -- equality.
+--
+-- /Warning/: The size of the set must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
 -----------------------------------------------------------------------------
 
 module Data.Set (
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index e1ebad3..616d0eb 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -45,6 +45,10 @@
 -- 'union' or 'insert'.  Of course, left-biasing can only be observed
 -- when equality is an equivalence relation instead of structural
 -- equality.
+--
+-- /Warning/: The size of the set must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
 -----------------------------------------------------------------------------
 
 -- [Note: Using INLINABLE]


From git at git.haskell.org  Fri Dec 18 22:11:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:48 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #122 from
 treeowl/dangerdoc (d5f5582)
Message-ID: <20151218221148.7C68F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d5f5582709630c2a40ef998ffd727b8f739534df

>---------------------------------------------------------------

commit d5f5582709630c2a40ef998ffd727b8f739534df
Merge: 202e2f2 74afe96
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Jan 4 22:16:07 2015 +0100

    Merge pull request #122 from treeowl/dangerdoc
    
    Add warning about Seq size.



>---------------------------------------------------------------

d5f5582709630c2a40ef998ffd727b8f739534df
 Data/Map.hs        |  4 ++++
 Data/Map/Lazy.hs   |  4 ++++
 Data/Map/Strict.hs |  4 ++++
 Data/Sequence.hs   | 14 +++++++++++---
 Data/Set.hs        |  4 ++++
 Data/Set/Base.hs   |  4 ++++
 6 files changed, 31 insertions(+), 3 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:50 +0000 (UTC)
Subject: [commit: packages/containers] master: Add unnecessary call in
 fromArray to make (Ix i) constraint look needed. (6004065)
Message-ID: <20151218221150.843E03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6004065c646a578fee51c8b6a35fb20514579507

>---------------------------------------------------------------

commit 6004065c646a578fee51c8b6a35fb20514579507
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Jan 10 14:25:35 2015 +0100

    Add unnecessary call in fromArray to make (Ix i) constraint look needed.


>---------------------------------------------------------------

6004065c646a578fee51c8b6a35fb20514579507
 Data/Sequence.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 21c54d3..b62b16a 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -186,6 +186,7 @@ import Data.Data
 
 -- Array stuff, with GHC.Arr on GHC
 import Data.Array (Ix, Array)
+import qualified Data.Array
 #ifdef __GLASGOW_HASKELL__
 import qualified GHC.Arr
 #endif
@@ -1649,6 +1650,10 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 fromArray :: Ix i => Array i a -> Seq a
 #ifdef __GLASGOW_HASKELL__
 fromArray a = fromFunction (GHC.Arr.numElements a) (GHC.Arr.unsafeAt a)
+ where
+  -- The following definition uses (Ix i) constraing, which is needed for the
+  -- other fromArray definition.
+  _ = Data.Array.rangeSize (Data.Array.bounds a)
 #else
 fromArray a = fromList2 (Data.Array.rangeSize (Data.Array.bounds a)) (Data.Array.elems a)
 #endif


From git at git.haskell.org  Fri Dec 18 22:11:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:52 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove unnecessary (Sized *)
 constraints. (5f519e6)
Message-ID: <20151218221152.8B7813A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f519e641aa7099c0dc6b12d3df08920e8496d04

>---------------------------------------------------------------

commit 5f519e641aa7099c0dc6b12d3df08920e8496d04
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Jan 10 14:29:34 2015 +0100

    Remove unnecessary (Sized *) constraints.


>---------------------------------------------------------------

5f519e641aa7099c0dc6b12d3df08920e8496d04
 Data/Sequence.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b62b16a..491dd6d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -640,13 +640,13 @@ deep            :: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> Finge
 deep pr m sf    =  Deep (size pr + size m + size sf) pr m sf
 
 {-# INLINE pullL #-}
-pullL :: Sized a => Int -> FingerTree (Node a) -> Digit a -> FingerTree a
+pullL :: Int -> FingerTree (Node a) -> Digit a -> FingerTree a
 pullL s m sf = case viewLTree m of
     Nothing2        -> digitToTree' s sf
     Just2 pr m'     -> Deep s (nodeToDigit pr) m' sf
 
 {-# INLINE pullR #-}
-pullR :: Sized a => Int -> Digit a -> FingerTree (Node a) -> FingerTree a
+pullR :: Int -> Digit a -> FingerTree (Node a) -> FingerTree a
 pullR s pr m = case viewRTree m of
     Nothing2        -> digitToTree' s pr
     Just2 m' sf     -> Deep s pr m' (nodeToDigit sf)
@@ -1840,7 +1840,7 @@ initsNode (Node3 s a b c) = Node3 s (One a) (Two a b) (Three a b c)
 {-# SPECIALIZE tailsTree :: (FingerTree (Node a) -> Node b) -> FingerTree (Node a) -> FingerTree (Node b) #-}
 -- | Given a function to apply to tails of a tree, applies that function
 -- to every tail of the specified tree.
-tailsTree :: (Sized a, Sized b) => (FingerTree a -> b) -> FingerTree a -> FingerTree b
+tailsTree :: Sized a => (FingerTree a -> b) -> FingerTree a -> FingerTree b
 tailsTree _ Empty = Empty
 tailsTree f (Single x) = Single (f (Single x))
 tailsTree f (Deep n pr m sf) =
@@ -1855,7 +1855,7 @@ tailsTree f (Deep n pr m sf) =
 {-# SPECIALIZE initsTree :: (FingerTree (Node a) -> Node b) -> FingerTree (Node a) -> FingerTree (Node b) #-}
 -- | Given a function to apply to inits of a tree, applies that function
 -- to every init of the specified tree.
-initsTree :: (Sized a, Sized b) => (FingerTree a -> b) -> FingerTree a -> FingerTree b
+initsTree :: Sized a => (FingerTree a -> b) -> FingerTree a -> FingerTree b
 initsTree _ Empty = Empty
 initsTree f (Single x) = Single (f (Single x))
 initsTree f (Deep n pr m sf) =


From git at git.haskell.org  Fri Dec 18 22:11:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:54 +0000 (UTC)
Subject: [commit: packages/containers] master: Update .travis.yml per hvr's
 advice (d1c257a)
Message-ID: <20151218221154.92D713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d1c257aa1385ebe6801a296e5b5decfb3b6e84f3

>---------------------------------------------------------------

commit d1c257aa1385ebe6801a296e5b5decfb3b6e84f3
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Jan 14 22:47:19 2015 -0500

    Update .travis.yml per hvr's advice
    
    We want it to be able to build with 7.10 and head.


>---------------------------------------------------------------

d1c257aa1385ebe6801a296e5b5decfb3b6e84f3
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8af3116..9505f69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,13 @@ env:
  # no package for earlier cabal versions in the PPA
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.16
- - GHCVER=7.8.2 CABALVER=1.18
- - GHCVER=head  CABALVER=1.20
+ - GHCVER=7.8.4 CABALVER=1.18
+ - GHCVER=7.10.1 CABALVER=1.22
+ - GHCVER=head CABALVER=head
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=1.20
+   - env: GHCVER=head CABALVER=head
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.


From git at git.haskell.org  Fri Dec 18 22:11:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:56 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #132 from
 treeowl/travis-update (25c3fee)
Message-ID: <20151218221156.98F773A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/25c3fee44aa39b17ac3e74382591260c5edce1fa

>---------------------------------------------------------------

commit 25c3fee44aa39b17ac3e74382591260c5edce1fa
Merge: 5f519e6 d1c257a
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Jan 15 12:26:15 2015 +0100

    Merge pull request #132 from treeowl/travis-update
    
    Update .travis.yml per hvr's advice



>---------------------------------------------------------------

25c3fee44aa39b17ac3e74382591260c5edce1fa
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:11:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:11:58 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.3
 (fabde6b)
Message-ID: <20151218221158.9FB7C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fabde6b6381e459a49dee4ba1ac8b96848348542

>---------------------------------------------------------------

commit fabde6b6381e459a49dee4ba1ac8b96848348542
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Jan 15 12:41:01 2015 +0100

    Bump version number to 0.5.6.3


>---------------------------------------------------------------

fabde6b6381e459a49dee4ba1ac8b96848348542
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index c5d7523..d7db653 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.2
+version: 0.5.6.3
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Fri Dec 18 22:12:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:00 +0000 (UTC)
Subject: [commit: packages/containers] master: Improve MIN_VERSION_base
 fall-back (3dddb04)
Message-ID: <20151218221200.A6EAE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f

>---------------------------------------------------------------

commit 3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Jan 16 13:51:06 2015 -0500

    Improve MIN_VERSION_base fall-back
    
    Guess the base library version based on `__GLASGOW_HASKELL__`
    when compiling without Cabal.


>---------------------------------------------------------------

3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f
 include/containers.h | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/containers.h b/include/containers.h
index ea895d1..b075799 100644
--- a/include/containers.h
+++ b/include/containers.h
@@ -51,11 +51,30 @@
 /*
  * We use cabal-generated MIN_VERSION_base to adapt to changes of base.
  * Nevertheless, as a convenience, we also allow compiling without cabal by
- * defining trivial MIN_VERSION_base if needed.
+ * defining an approximate MIN_VERSION_base if needed. The alternative version
+ * guesses the version of base using the version of GHC. This is usually
+ * sufficiently accurate. However, it completely ignores minor version numbers,
+ * and it makes the assumption that a pre-release version of GHC will ship with
+ * base libraries with the same version numbers as the final release. This
+ * assumption is violated in certain stages of GHC development, but in practice
+ * this should very rarely matter, and will not affect any released version.
  */
 #ifndef MIN_VERSION_base
-#define MIN_VERSION_base(major1,major2,minor) 0
+#if __GLASGOW_HASKELL__ >= 709
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=8)))
+#elif __GLASGOW_HASKELL__ >= 707
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=7)))
+#elif __GLASGOW_HASKELL__ >= 705
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=6)))
+#elif __GLASGOW_HASKELL__ >= 703
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=5)))
+#elif __GLASGOW_HASKELL__ >= 701
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=4)))
+#elif __GLASGOW_HASKELL__ >= 700
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=3)))
+#else
+#define MIN_VERSION_base(major1,major2,minor) (0)
 #endif
+#endif // MIN_VERSION_base was not defined
 
-
-#endif
+#endif // This file was already included


From git at git.haskell.org  Fri Dec 18 22:12:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:02 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #133 from
 treeowl/minversionbase (414bd0e)
Message-ID: <20151218221202.ADBCD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/414bd0e566a7025d24678bee556f610b1f5637f5

>---------------------------------------------------------------

commit 414bd0e566a7025d24678bee556f610b1f5637f5
Merge: fabde6b 3dddb04
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Jan 19 09:49:31 2015 +0100

    Merge pull request #133 from treeowl/minversionbase
    
    Improve MIN_VERSION_base fall-back



>---------------------------------------------------------------

414bd0e566a7025d24678bee556f610b1f5637f5
 include/containers.h | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:12:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:04 +0000 (UTC)
Subject: [commit: packages/containers] master: typo in the doc for
 Data.Map.Base (72448b3)
Message-ID: <20151218221204.BA3623A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/72448b3272fd758ea3613f984f192c6a99ec7982

>---------------------------------------------------------------

commit 72448b3272fd758ea3613f984f192c6a99ec7982
Author: G. Allais <guillaume.allais at ens-lyon.org>
Date:   Thu Feb 19 21:29:53 2015 +0000

    typo in the doc for Data.Map.Base


>---------------------------------------------------------------

72448b3272fd758ea3613f984f192c6a99ec7982
 Data/Map/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 965a258..fccd6e0 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1689,7 +1689,7 @@ mapWithKey f (Bin sx kx x l r) = Bin sx kx (f kx x) (mapWithKey f l) (mapWithKey
 #endif
 
 -- | /O(n)/.
--- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
+-- @'traverseWithKey' f m == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
 -- function also has access to the key associated with a value.
 --


From git at git.haskell.org  Fri Dec 18 22:12:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:06 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #139 from
 gallais/patch-1 (3fafcf9)
Message-ID: <20151218221206.BEF403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3fafcf96417473492fc411924c5c79d15440e76b

>---------------------------------------------------------------

commit 3fafcf96417473492fc411924c5c79d15440e76b
Merge: 414bd0e 72448b3
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Feb 20 06:00:59 2015 +0100

    Merge pull request #139 from gallais/patch-1
    
    typo in the doc for Data.Map.Base



>---------------------------------------------------------------

3fafcf96417473492fc411924c5c79d15440e76b
 Data/Map/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:12:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:08 +0000 (UTC)
Subject: [commit: packages/containers] master: Update the API
 changes/enhancements guide. (c0a076d)
Message-ID: <20151218221208.C5C933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c0a076d4b3d48481fc7dc7a4aed9b3c57260c327

>---------------------------------------------------------------

commit c0a076d4b3d48481fc7dc7a4aed9b3c57260c327
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Mar 6 23:15:51 2015 +0100

    Update the API changes/enhancements guide.
    
    Fix link to Library submission guide and also explictly mention the
    discussion on libraries at haskell.org mailing list.


>---------------------------------------------------------------

c0a076d4b3d48481fc7dc7a4aed9b3c57260c327
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0eab2ca..de90d35 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@ Contributing
 
 For reporting bugs (and maybe even the respective fix), please use the [GitHub issue tracker](https://github.com/haskell/containers/issues).
 
-For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers) (but use the GitHub facilities instead of GHC's Trac for submitting patches).
+For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](https://wiki.haskell.org/Library_submissions#Guide_to_proposers). Especially note that all API changes/enhancements should be discussed on libraries at haskell.org mailing list.


From git at git.haskell.org  Fri Dec 18 22:12:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:10 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove comments after #endif.
 (dade165)
Message-ID: <20151218221210.CC95C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/dade1658363660395c0f00b951cfcd71acee5b8c

>---------------------------------------------------------------

commit dade1658363660395c0f00b951cfcd71acee5b8c
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Mar 10 23:08:17 2015 +0100

    Remove comments after #endif.
    
    They cause a lot of compilation warnings.


>---------------------------------------------------------------

dade1658363660395c0f00b951cfcd71acee5b8c
 include/containers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/containers.h b/include/containers.h
index b075799..89f82d2 100644
--- a/include/containers.h
+++ b/include/containers.h
@@ -75,6 +75,6 @@
 #else
 #define MIN_VERSION_base(major1,major2,minor) (0)
 #endif
-#endif // MIN_VERSION_base was not defined
+#endif
 
-#endif // This file was already included
+#endif


From git at git.haskell.org  Fri Dec 18 22:12:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:12 +0000 (UTC)
Subject: [commit: packages/containers] master: Improve *> (c2b2048)
Message-ID: <20151218221212.D5BD03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c2b20485f22202dc7227ef00ae28d706c8df8d4d

>---------------------------------------------------------------

commit c2b20485f22202dc7227ef00ae28d706c8df8d4d
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 19:57:49 2015 -0400

    Improve *>
    
    Use `applicativeTree` and techniques from `<*>` to make `*>`
    share as much as possible and offer immediate access with correct
    time bounds.


>---------------------------------------------------------------

c2b20485f22202dc7227ef00ae28d706c8df8d4d
 Data/Sequence.hs | 89 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 14 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9de2228..91c62d8 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -271,13 +271,13 @@ instance Monad Seq where
 
 instance Applicative Seq where
     pure = singleton
-    xs *> ys = replicateSeq (length xs) ys
+    xs *> ys = cycleN (length xs) ys
 
-    fs <*> xs = case viewl fs of
+    fs <*> xs@(Seq xsFT) = case viewl fs of
       EmptyL -> empty
       firstf :< fs' -> case viewr fs' of
         EmptyR -> fmap firstf xs
-        Seq fs''FT :> lastf -> case (rigidify . (\(Seq a) -> a)) xs of
+        Seq fs''FT :> lastf -> case rigidify xsFT of
              RigidEmpty -> empty
              RigidOne (Elem x) -> fmap ($x) fs
              RigidTwo (Elem x1) (Elem x2) ->
@@ -933,18 +933,79 @@ replicateM n x
   | n >= 0      = unwrapMonad (replicateA n (WrapMonad x))
   | otherwise   = error "replicateM takes a nonnegative integer argument"
 
--- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
-replicateSeq :: Int -> Seq a -> Seq a
-replicateSeq n s
-  | n < 0     = error "replicateSeq takes a nonnegative integer argument"
+-- | @'cycleN' n xs@ concatenates @n@ copies of @xs at .
+cycleN :: Int -> Seq a -> Seq a
+cycleN n xs
+  | n < 0     = error "cycleN takes a nonnegative integer argument"
   | n == 0    = empty
-  | otherwise = go n s
-  where
-    -- Invariant: k >= 1
-    go 1 xs = xs
-    go k xs | even k    = kxs
-            | otherwise = xs >< kxs
-            where kxs = go (k `quot` 2) $! (xs >< xs)
+  | n == 1    = xs
+cycleN n (Seq xsFT) = case rigidify xsFT of
+             RigidEmpty -> empty
+             RigidOne (Elem x) -> replicate n x
+             RigidTwo x1 x2 -> Seq $
+               Deep (n*2) pair
+                    (runIdentity $ applicativeTree (n-2) 2 (Identity (node2 x1 x2)))
+                    pair
+               where pair = Two x1 x2
+             RigidThree x1 x2 x3 -> Seq $
+               Deep (n*3) triple
+                    (runIdentity $ applicativeTree (n-2) 3 (Identity (node3 x1 x2 x3)))
+                    triple
+               where triple = Three x1 x2 x3
+             RigidFull r@(Rigid s pr _m sf) -> Seq $
+                   Deep (n*s)
+                        (nodeToDigit pr)
+                        (cycleNMiddle (n-2) r)
+                        (nodeToDigit sf)
+
+cycleNMiddle
+  :: Sized c => Int
+     -> Rigid c
+     -> FingerTree (Node c)
+
+STRICT_1_OF_2(cycleNMiddle)
+
+-- Not at the bottom yet
+
+cycleNMiddle n
+           (Rigid s pr (DeepTh sm prm mm sfm) sf)
+    = Deep (sm + s * (n + 1)) -- note: sm = s - size pr - size sf
+           (digit12ToDigit prm)
+           (cycleNMiddle n
+                       (Rigid s (squashL pr prm) mm (squashR sfm sf)))
+           (digit12ToDigit sfm)
+
+-- At the bottom
+
+cycleNMiddle n
+           (Rigid s pr EmptyTh sf)
+     = deep
+            (One sf)
+            (runIdentity $ applicativeTree n s (Identity converted))
+            (One pr)
+   where converted = node2 pr sf
+
+cycleNMiddle n
+           (Rigid s pr (SingleTh q) sf)
+     = deep
+            (Two q sf)
+            (runIdentity $ applicativeTree n s (Identity converted))
+            (Two pr q)
+   where converted = node3 pr q sf
+
+{-# SPECIALIZE
+ cycleNMiddle
+  :: Int
+     -> Rigid (Node c)
+     -> FingerTree (Node (Node c))
+ #-}
+{-# SPECIALIZE
+ cycleNMiddle
+  :: Int
+     -> Rigid (Elem c)
+     -> FingerTree (Node (Elem c))
+ #-}
+
 
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.


From git at git.haskell.org  Fri Dec 18 22:12:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:14 +0000 (UTC)
Subject: [commit: packages/containers] master: Clean up <*> some more (3a177c7)
Message-ID: <20151218221214.DE99C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3a177c7610201ed14f7de3142f3e1285c55c73bb

>---------------------------------------------------------------

commit 3a177c7610201ed14f7de3142f3e1285c55c73bb
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 11:30:10 2015 -0400

    Clean up <*> some more
    
    1. Remove all partial functions and all "impossible" errors.
    
    2. Simplify the way the sequence pieces are put together at the
    bottom.
    
    The immediate-indexing `<*>` test improves from 1.44 microseconds
    to 1.24 microseconds. The other `<*>` tests improve very slightly.


>---------------------------------------------------------------

3a177c7610201ed14f7de3142f3e1285c55c73bb
 Data/Sequence.hs | 269 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 141 insertions(+), 128 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3a177c7610201ed14f7de3142f3e1285c55c73bb

From git at git.haskell.org  Fri Dec 18 22:12:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:16 +0000 (UTC)
Subject: [commit: packages/containers] master: Add header to bench-cmp.sh.
 (f6930e6)
Message-ID: <20151218221216.E54513A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f6930e698853c46d2ed56ece4602fe88fc6e27bf

>---------------------------------------------------------------

commit f6930e698853c46d2ed56ece4602fe88fc6e27bf
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 10:33:47 2015 +0100

    Add header to bench-cmp.sh.
    
    Also remove the less command, it can be easily added manually.


>---------------------------------------------------------------

f6930e698853c46d2ed56ece4602fe88fc6e27bf
 benchmarks/bench-cmp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/bench-cmp.sh b/benchmarks/bench-cmp.sh
index 157b578..32f2b9c 100755
--- a/benchmarks/bench-cmp.sh
+++ b/benchmarks/bench-cmp.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./bench-cmp.pl "$@" | column -nts\; | less -SR
+(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -nts\;


From git at git.haskell.org  Fri Dec 18 22:12:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:18 +0000 (UTC)
Subject: [commit: packages/containers] master: Make rigidify non-recursive
 (2562a65)
Message-ID: <20151218221218.EF43B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2562a659d8ca66cf7c0e814fc0e7f354a8261a42

>---------------------------------------------------------------

commit 2562a659d8ca66cf7c0e814fc0e7f354a8261a42
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 22:42:28 2015 -0400

    Make rigidify non-recursive
    
    `rigidify` would previously call itself at most once before
    producing a constructor. This made it somewhat hard to see that it
    had no infinite loops, and increased the number of tests required.
    
    Improve internal documentation.
    
    Rename the small immediate indexing benchmark to make some kind
    of sense. Add more and better immediate indexing benchmarks.
    
    Benchmarks:
    
    <*>/ix500/1000^2      -13.81%  1.40e-06
    <*>/ix500000/1000^2   -38.91%  5.14e-06
    <*>/ixBIG             -17.96%  1.61e-05
    <*>/nf100/2500/rep     +0.23%  8.58e-03
    <*>/nf100/2500/ff      -1.82%  2.37e-02
    <*>/nf500/500/rep      +0.01%  8.48e-03
    <*>/nf500/500/ff       -0.94%  2.46e-02
    <*>/nf2500/100/rep     -0.46%  8.53e-03
    <*>/nf2500/100/ff      -1.22%  2.45e-02


>---------------------------------------------------------------

2562a659d8ca66cf7c0e814fc0e7f354a8261a42
 Data/Sequence.hs       | 108 +++++++++++++++++++++++++------------------------
 benchmarks/Sequence.hs |   7 +++-
 2 files changed, 61 insertions(+), 54 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2562a659d8ca66cf7c0e814fc0e7f354a8261a42

From git at git.haskell.org  Fri Dec 18 22:12:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:21 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove Debian-specific -n
 column option. (98a4d50)
Message-ID: <20151218221221.02C3A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/98a4d503442b8a309de8bb09936272ee08249898

>---------------------------------------------------------------

commit 98a4d503442b8a309de8bb09936272ee08249898
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 15:41:22 2015 +0100

    Remove Debian-specific -n column option.
    
    It is not needed anyway here.


>---------------------------------------------------------------

98a4d503442b8a309de8bb09936272ee08249898
 benchmarks/bench-cmp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/bench-cmp.sh b/benchmarks/bench-cmp.sh
index 32f2b9c..b72d0d0 100755
--- a/benchmarks/bench-cmp.sh
+++ b/benchmarks/bench-cmp.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -nts\;
+(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -ts\;


From git at git.haskell.org  Fri Dec 18 22:12:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:23 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #141 from
 treeowl/newapbottomtry (1d3156b)
Message-ID: <20151218221223.09FB53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30

>---------------------------------------------------------------

commit 1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30
Merge: 98a4d50 2562a65
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 15:50:08 2015 +0100

    Merge pull request #141 from treeowl/newapbottomtry
    
    Clean up <*> some more



>---------------------------------------------------------------

1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30
 Data/Sequence.hs       | 414 +++++++++++++++++++++++++++++--------------------
 benchmarks/Sequence.hs |   7 +-
 2 files changed, 251 insertions(+), 170 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:12:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:25 +0000 (UTC)
Subject: [commit: packages/containers] master: Minor typo fix in Data.Set.Base
 (6297b7b)
Message-ID: <20151218221225.10F243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6297b7bad0a78c34c7336c74c69b1a0f9d7f3691

>---------------------------------------------------------------

commit 6297b7bad0a78c34c7336c74c69b1a0f9d7f3691
Author: Louis Wasserman <wasserman.louis at gmail.com>
Date:   Wed Mar 11 10:31:58 2015 -0700

    Minor typo fix in Data.Set.Base


>---------------------------------------------------------------

6297b7bad0a78c34c7336c74c69b1a0f9d7f3691
 Data/Set/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 616d0eb..02eb82c 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -853,7 +853,7 @@ foldlFB = foldl
 
 -- | /O(n*log n)/. Create a set from a list of elements.
 --
--- If the elemens are ordered, linear-time implementation is used,
+-- If the elements are ordered, a linear-time implementation is used,
 -- with the performance equal to 'fromDistinctAscList'.
 
 -- For some reason, when 'singleton' is used in fromList or in


From git at git.haskell.org  Fri Dec 18 22:12:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:27 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #142 from
 lowasser/patch-1 (08ca8ab)
Message-ID: <20151218221227.1909B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9

>---------------------------------------------------------------

commit 08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9
Merge: 1d3156b 6297b7b
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 22:23:39 2015 +0100

    Merge pull request #142 from lowasser/patch-1
    
    Minor typo fix in Data.Set.Base



>---------------------------------------------------------------

08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9
 Data/Set/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:12:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:29 +0000 (UTC)
Subject: [commit: packages/containers] master: Add IsString instance (7615e42)
Message-ID: <20151218221229.2053A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7615e4238cd7968d4abc27539974afe9b0b5024b

>---------------------------------------------------------------

commit 7615e4238cd7968d4abc27539974afe9b0b5024b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sun Mar 15 21:27:31 2015 -0400

    Add IsString instance
    
    Add `instance IsString (Seq Char)` when compiling with GHC.


>---------------------------------------------------------------

7615e4238cd7968d4abc27539974afe9b0b5024b
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index db333c3..c06931b 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__
-{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE FlexibleInstances #-}
 #endif
 #if __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
@@ -182,6 +184,7 @@ import GHC.Exts (build)
 import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
+import Data.String (IsString(..))
 #endif
 
 -- Array stuff, with GHC.Arr on GHC
@@ -2137,6 +2140,11 @@ instance GHC.Exts.IsList (Seq a) where
     toList = toList
 #endif
 
+#ifdef __GLASGOW_HASKELL__
+instance IsString (Seq Char) where
+    fromString = fromList
+#endif
+
 ------------------------------------------------------------------------
 -- Reverse
 ------------------------------------------------------------------------


From git at git.haskell.org  Fri Dec 18 22:12:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:31 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #147 from
 treeowl/IsString (10f0a88)
Message-ID: <20151218221231.290EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/10f0a88088f0cdf5ea660c3340424cce4d34cecd

>---------------------------------------------------------------

commit 10f0a88088f0cdf5ea660c3340424cce4d34cecd
Merge: 08ca8ab 7615e42
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Mar 16 16:02:26 2015 +0100

    Merge pull request #147 from treeowl/IsString
    
    Add IsString instance



>---------------------------------------------------------------

10f0a88088f0cdf5ea660c3340424cce4d34cecd
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:12:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:33 +0000 (UTC)
Subject: [commit: packages/containers] master: Removed unnecessary strictness
 in IntSet.foldl accumulator. (bdd7b33)
Message-ID: <20151218221233.314E63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bdd7b3378ebd218d935b62fdf980f76fd7d98a4b

>---------------------------------------------------------------

commit bdd7b3378ebd218d935b62fdf980f76fd7d98a4b
Author: Anton Dubovik <gunner.kade at gmail.com>
Date:   Fri May 15 00:45:50 2015 +0300

    Removed unnecessary strictness in IntSet.foldl accumulator.


>---------------------------------------------------------------

bdd7b3378ebd218d935b62fdf980f76fd7d98a4b
 Data/IntSet/Base.hs        |  1 -
 containers.cabal           | 18 ++++++++++++++++++
 tests/intset-strictness.hs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c89bd18..3dc473c 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -882,7 +882,6 @@ foldl f z = \t ->      -- Use lambda t to be inlinable with two arguments only.
                         | otherwise -> go (go z l) r
             _ -> go z t
   where
-    STRICT_1_OF_2(go)
     go z' Nil           = z'
     go z' (Tip kx bm)   = foldlBits kx f z' bm
     go z' (Bin _ _ l r) = go (go z' l) r
diff --git a/containers.cabal b/containers.cabal
index d7db653..6f4baaf 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -252,3 +252,21 @@ test-suite intmap-strictness-properties
 
   ghc-options: -Wall
   include-dirs: include
+
+test-suite intset-strictness-properties
+  hs-source-dirs: tests, .
+  main-is: intset-strictness.hs
+  type: exitcode-stdio-1.0
+
+  build-depends:
+    array,
+    base >= 4.2 && < 5,
+    ChasingBottoms,
+    deepseq >= 1.2 && < 1.5,
+    QuickCheck >= 2.4.0.1,
+    ghc-prim,
+    test-framework >= 0.3.3,
+    test-framework-quickcheck2 >= 0.2.9
+
+  ghc-options: -Wall
+  include-dirs: include
diff --git a/tests/intset-strictness.hs b/tests/intset-strictness.hs
new file mode 100644
index 0000000..b7c4097
--- /dev/null
+++ b/tests/intset-strictness.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE FlexibleInstances, GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Main (main) where
+
+import Prelude hiding (foldl)
+
+import Test.ChasingBottoms.IsBottom
+import Test.Framework (Test, defaultMain, testGroup)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
+
+import Data.IntSet
+
+------------------------------------------------------------------------
+-- * Properties
+
+------------------------------------------------------------------------
+-- ** Lazy module
+
+pFoldlAccLazy :: Int -> Bool
+pFoldlAccLazy k =
+  isn'tBottom $ foldl (\_ x -> x) (bottom :: Int) (singleton k)
+
+------------------------------------------------------------------------
+-- * Test list
+
+tests :: [Test]
+tests =
+    [
+    -- Basic interface
+      testGroup "IntSet"
+      [ testProperty "foldl is lazy in accumulator" pFoldlAccLazy
+      ]
+    ]
+
+------------------------------------------------------------------------
+-- * Test harness
+
+main :: IO ()
+main = defaultMain tests
+
+------------------------------------------------------------------------
+-- * Utilities
+
+isn'tBottom :: a -> Bool
+isn'tBottom = not . isBottom


From git at git.haskell.org  Fri Dec 18 22:12:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:35 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #156 from
 adubovik/master (77e94c8)
Message-ID: <20151218221235.3A25F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/77e94c8966c24b65b2736bf84e3a2f7072e1c1b4

>---------------------------------------------------------------

commit 77e94c8966c24b65b2736bf84e3a2f7072e1c1b4
Merge: 10f0a88 bdd7b33
Author: Milan Straka <fox at ucw.cz>
Date:   Tue May 19 23:28:27 2015 +0200

    Merge pull request #156 from adubovik/master
    
    Removed unnecessary strictness in IntSet.foldl accumulator.



>---------------------------------------------------------------

77e94c8966c24b65b2736bf84e3a2f7072e1c1b4
 Data/IntSet/Base.hs        |  1 -
 containers.cabal           | 18 ++++++++++++++++++
 tests/intset-strictness.hs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)


From git at git.haskell.org  Fri Dec 18 22:12:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:37 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix copy-paste typos. (32df5aa)
Message-ID: <20151218221237.426C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/32df5aa4bc89111d2baf912df742df7324889920

>---------------------------------------------------------------

commit 32df5aa4bc89111d2baf912df742df7324889920
Author: Milan Straka <fox at ucw.cz>
Date:   Tue May 19 23:32:51 2015 +0200

    Fix copy-paste typos.


>---------------------------------------------------------------

32df5aa4bc89111d2baf912df742df7324889920
 Data/Map/Base.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index fccd6e0..41c3611 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -80,7 +80,7 @@
 
 -- [Note: Local 'go' functions and capturing]
 -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- As opposed to IntMap, when 'go' function captures an argument, increased
+-- As opposed to Map, when 'go' function captures an argument, increased
 -- heap-allocation can occur: sometimes in a polymorphic function, the 'go'
 -- floats out of its enclosing function and then it heap-allocates the
 -- dictionary and the argument. Maybe it floats out too late and strictness
@@ -1413,7 +1413,7 @@ intersectionWithKey f t1 t2 = mergeWithKey (\k x1 x2 -> Just $ f k x1 x2) (const
 -- > myIntersectionWithKey f m1 m2 = mergeWithKey (\k x1 x2 -> Just (f k x1 x2)) (const empty) (const empty) m1 m2
 --
 -- When calling @'mergeWithKey' combine only1 only2@, a function combining two
--- 'IntMap's is created, such that
+-- 'Map's is created, such that
 --
 -- * if a key is present in both maps, it is passed with both corresponding
 --   values to the @combine@ function. Depending on the result, the key is either


From git at git.haskell.org  Fri Dec 18 22:12:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:39 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix wrong complexity of
 IntMap.alter. (4634081)
Message-ID: <20151218221239.4990E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4634081498663590925938663c0223d5e02eb8ff

>---------------------------------------------------------------

commit 4634081498663590925938663c0223d5e02eb8ff
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Aug 26 14:11:49 2015 +0200

    Fix wrong complexity of IntMap.alter.
    
    This resolves #165.


>---------------------------------------------------------------

4634081498663590925938663c0223d5e02eb8ff
 Data/IntMap/Strict.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 48ce1be..5165de0 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -505,7 +505,7 @@ updateLookupWithKey f0 k0 t0 = k0 `seq` toPair $ go f0 k0 t0
 
 
 
--- | /O(log n)/. The expression (@'alter' f k map@) alters the value @x@ at @k@, or absence thereof.
+-- | /O(min(n,W))/. The expression (@'alter' f k map@) alters the value @x@ at @k@, or absence thereof.
 -- 'alter' can be used to insert, delete, or update a value in an 'IntMap'.
 -- In short : @'lookup' k ('alter' f k m) = f ('lookup' k m)@.
 alter :: (Maybe a -> Maybe a) -> Key -> IntMap a -> IntMap a


From git at git.haskell.org  Fri Dec 18 22:12:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:41 +0000 (UTC)
Subject: [commit: packages/containers] master: canonicalise Monad instances
 (318bca7)
Message-ID: <20151218221241.519B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/318bca71efa8eecf0e67c1da97eb2fca73da182e

>---------------------------------------------------------------

commit 318bca71efa8eecf0e67c1da97eb2fca73da182e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:25:42 2015 +0100

    canonicalise Monad instances


>---------------------------------------------------------------

318bca71efa8eecf0e67c1da97eb2fca73da182e
 Data/Graph.hs    | 2 +-
 Data/Sequence.hs | 7 ++++---
 Data/Tree.hs     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index c02b3e3..71d82c8 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -295,7 +295,7 @@ chop (Node v ts : us)
 newtype SetM s a = SetM { runSetM :: STArray s Vertex Bool -> ST s a }
 
 instance Monad (SetM s) where
-    return x     = SetM $ const (return x)
+    return = pure
     {-# INLINE return #-}
     SetM v >>= f = SetM $ \s -> do { x <- v s; runSetM (f x) s }
     {-# INLINE (>>=) #-}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index c06931b..8fc2baf 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -267,7 +267,7 @@ instance NFData a => NFData (Seq a) where
     rnf (Seq xs) = rnf xs
 
 instance Monad Seq where
-    return = singleton
+    return = pure
     xs >>= f = foldl' add empty xs
       where add ys x = ys >< f x
     (>>) = (*>)
@@ -861,12 +861,13 @@ instance Functor (State s) where
 instance Monad (State s) where
     {-# INLINE return #-}
     {-# INLINE (>>=) #-}
-    return x = State $ \ s -> (s, x)
+    return = pure
     m >>= k = State $ \ s -> case runState m s of
         (s', x) -> runState (k x) s'
 
 instance Applicative (State s) where
-    pure = return
+    {-# INLINE pure #-}
+    pure x = State $ \ s -> (s, x)
     (<*>) = ap
 
 execState :: State s a -> s -> a
diff --git a/Data/Tree.hs b/Data/Tree.hs
index abc9902..c1b9d34 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -92,7 +92,7 @@ instance Applicative Tree where
         Node (f x) (map (f <$>) txs ++ map (<*> tx) tfs)
 
 instance Monad Tree where
-    return x = Node x []
+    return = pure
     Node x ts >>= f = Node x' (ts' ++ map (>>= f) ts)
       where Node x' ts' = f x
 


From git at git.haskell.org  Fri Dec 18 22:12:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:43 +0000 (UTC)
Subject: [commit: packages/containers] master: Make `-Wall` clean (5f232df)
Message-ID: <20151218221243.5BC4C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f232df9781bc66dfd6e8aecc59c63e937df660d

>---------------------------------------------------------------

commit 5f232df9781bc66dfd6e8aecc59c63e937df660d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:37:20 2015 +0100

    Make `-Wall` clean
    
    Get rid of left-over redundant-import warnings from the last minute
    AMP-changes that occured in GHC 7.10


>---------------------------------------------------------------

5f232df9781bc66dfd6e8aecc59c63e937df660d
 Data/IntMap/Base.hs | 4 +---
 Data/Map/Base.hs    | 4 +---
 Data/Sequence.hs    | 2 +-
 Data/Tree.hs        | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index e15ed76..0a840f5 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,9 +216,7 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 41c3611..569b602 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,9 +270,7 @@ module Data.Map.Base (
     , filterLt
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(..), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 8fc2baf..bb86c95 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -158,7 +158,7 @@ module Data.Sequence (
 import Prelude hiding (
     Functor(..),
 #if MIN_VERSION_base(4,8,0)
-    Applicative, foldMap, Monoid,
+    Applicative, (<$>), foldMap, Monoid,
 #endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
diff --git a/Data/Tree.hs b/Data/Tree.hs
index c1b9d34..a6f64f9 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -35,7 +35,6 @@ module Data.Tree(
     ) where
 
 #if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
 import Data.Foldable (toList)
 #else
 import Control.Applicative (Applicative(..), (<$>))


From git at git.haskell.org  Fri Dec 18 22:12:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:45 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove redundant constraints
 (e024991)
Message-ID: <20151218221245.63E143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e02499103d1c4e95f5f57c7e6571f8e3040712ca

>---------------------------------------------------------------

commit e02499103d1c4e95f5f57c7e6571f8e3040712ca
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:45:50 2015 +0100

    Remove redundant constraints
    
    GHC HEAD warns about those:
    
    ```
    Data/Sequence.hs:432:12: warning:
        ? Redundant constraint: Sized a
        ? In the type signature for:
               squashL :: Sized a =>
                          Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
    
    Data/Sequence.hs:437:12: warning:
        ? Redundant constraint: Sized a
        ? In the type signature for:
               squashR :: Sized a =>
                          Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
    ```


>---------------------------------------------------------------

e02499103d1c4e95f5f57c7e6571f8e3040712ca
 Data/Sequence.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index bb86c95..6b42841 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -357,8 +357,7 @@ type Digit23 a = Node a
 -- class, but as it is we have to build up 'map23' explicitly through the
 -- recursion.
 aptyMiddle
-  :: Sized c =>
-     (c -> d)
+  :: (c -> d)
      -> (c -> d)
      -> ((a -> b) -> c -> d)
      -> FingerTree (Elem (a -> b))
@@ -429,12 +428,12 @@ digit12ToDigit (One12 a) = One a
 digit12ToDigit (Two12 a b) = Two a b
 
 -- Squash the first argument down onto the left side of the second.
-squashL :: Sized a => Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
+squashL :: Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
 squashL m (One12 n) = node2 m n
 squashL m (Two12 n1 n2) = node3 m n1 n2
 
 -- Squash the second argument down onto the right side of the first
-squashR :: Sized a => Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
+squashR :: Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
 squashR (One12 n) m = node2 n m
 squashR (Two12 n1 n2) m = node3 n1 n2 m
 
@@ -965,7 +964,7 @@ cycleN n (Seq xsFT) = case rigidify xsFT of
                         (nodeToDigit sf)
 
 cycleNMiddle
-  :: Sized c => Int
+  :: Int
      -> Rigid c
      -> FingerTree (Node c)
 


From git at git.haskell.org  Fri Dec 18 22:12:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:47 +0000 (UTC)
Subject: [commit: packages/containers] master: Drop seemingly ineffective
 SPECIALISE pragmas (2e3802f)
Message-ID: <20151218221247.6D2023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2e3802f1aa8eb8c5769b6f00697048485cb9abb2

>---------------------------------------------------------------

commit 2e3802f1aa8eb8c5769b6f00697048485cb9abb2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:49:03 2015 +0100

    Drop seemingly ineffective SPECIALISE pragmas
    
    GHC HEAD warns about these:
    
    ```
    Data/Sequence.hs:407:1: warning:
        SPECIALISE pragma for non-overloaded function ?aptyMiddle?
    
    Data/Sequence.hs:416:1: warning:
        SPECIALISE pragma for non-overloaded function ?aptyMiddle?
    
    Data/Sequence.hs:1001:1: warning:
        SPECIALISE pragma for non-overloaded function ?cycleNMiddle?
    
    Data/Sequence.hs:1007:1: warning:
        SPECIALISE pragma for non-overloaded function ?cycleNMiddle?
    ```


>---------------------------------------------------------------

2e3802f1aa8eb8c5769b6f00697048485cb9abb2
 Data/Sequence.hs | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 6b42841..089b292 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -404,25 +404,6 @@ aptyMiddle firstf
             (Two (fmap lastf pr) (fmap lastf q))
    where converted = node3 pr q sf
 
-{-# SPECIALIZE
- aptyMiddle
-  :: (Node c -> d)
-     -> (Node c -> d)
-     -> ((a -> b) -> Node c -> d)
-     -> FingerTree (Elem (a -> b))
-     -> Rigid (Node c)
-     -> FingerTree (Node d)
- #-}
-{-# SPECIALIZE
- aptyMiddle
-  :: (Elem c -> d)
-     -> (Elem c -> d)
-     -> ((a -> b) -> Elem c -> d)
-     -> FingerTree (Elem (a -> b))
-     -> Rigid (Elem c)
-     -> FingerTree (Node d)
- #-}
-
 digit12ToDigit :: Digit12 a -> Digit a
 digit12ToDigit (One12 a) = One a
 digit12ToDigit (Two12 a b) = Two a b
@@ -998,19 +979,6 @@ cycleNMiddle n
             (Two pr q)
    where converted = node3 pr q sf
 
-{-# SPECIALIZE
- cycleNMiddle
-  :: Int
-     -> Rigid (Node c)
-     -> FingerTree (Node (Node c))
- #-}
-{-# SPECIALIZE
- cycleNMiddle
-  :: Int
-     -> Rigid (Elem c)
-     -> FingerTree (Node (Elem c))
- #-}
-
 
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.


From git at git.haskell.org  Fri Dec 18 22:12:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:49 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #168 from
 hvr/pr/minor-cleanups (94d1638)
Message-ID: <20151218221249.764F33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/94d163808b0cc7facdd31de781b79839b1934546

>---------------------------------------------------------------

commit 94d163808b0cc7facdd31de781b79839b1934546
Merge: 4634081 5f232df
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Nov 25 09:30:03 2015 +0100

    Merge pull request #168 from hvr/pr/minor-cleanups
    
    Minor cleanups



>---------------------------------------------------------------

94d163808b0cc7facdd31de781b79839b1934546
 Data/Graph.hs       | 2 +-
 Data/IntMap/Base.hs | 4 +---
 Data/Map/Base.hs    | 4 +---
 Data/Sequence.hs    | 9 +++++----
 Data/Tree.hs        | 3 +--
 5 files changed, 9 insertions(+), 13 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:12:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:51 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #169 from
 hvr/pr/ghc-head-wall-clean (ce65000)
Message-ID: <20151218221251.7DF943A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ce65000b92c71da6ae2bea664c13ba855bbe2d1d

>---------------------------------------------------------------

commit ce65000b92c71da6ae2bea664c13ba855bbe2d1d
Merge: 94d1638 2e3802f
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Nov 25 09:31:26 2015 +0100

    Merge pull request #169 from hvr/pr/ghc-head-wall-clean
    
    GHC HEAD -Wall cleanups



>---------------------------------------------------------------

ce65000b92c71da6ae2bea664c13ba855bbe2d1d
 Data/Sequence.hs | 41 ++++-------------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:12:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:53 +0000 (UTC)
Subject: [commit: packages/containers] master: Define Semigroup instances for
 base>=4.9 (e0cfcea)
Message-ID: <20151218221253.8B2A73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e0cfceaf3b8d410343151bdc57f527515ecc94b5

>---------------------------------------------------------------

commit e0cfceaf3b8d410343151bdc57f527515ecc94b5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 28 22:13:54 2015 +0100

    Define Semigroup instances for base>=4.9
    
    See https://github.com/ekmett/semigroups/issues/56 for more details


>---------------------------------------------------------------

e0cfceaf3b8d410343151bdc57f527515ecc94b5
 Data/IntMap/Base.hs | 13 ++++++++++++-
 Data/IntSet/Base.hs | 13 ++++++++++++-
 Data/Map/Base.hs    | 13 ++++++++++++-
 Data/Sequence.hs    | 10 ++++++++++
 Data/Set/Base.hs    | 14 +++++++++++++-
 5 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 0a840f5..e22c46b 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -222,6 +222,9 @@ import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
 import Data.Word (Word)
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (liftM)
@@ -305,8 +308,16 @@ infixl 9 \\{-This comment teaches CPP correct behaviour -}
 
 instance Monoid (IntMap a) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Semigroup (IntMap a) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 instance Foldable.Foldable IntMap where
   fold = go
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 3dc473c..3df44cb 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -173,6 +173,9 @@ import Data.Maybe (fromMaybe)
 import Data.Monoid (Monoid(..))
 import Data.Word (Word)
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 import Data.Typeable
 import Prelude hiding (filter, foldr, foldl, null, map)
 
@@ -247,8 +250,16 @@ type Key    = Int
 
 instance Monoid IntSet where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Semigroup IntSet where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 #if __GLASGOW_HASKELL__
 
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 569b602..5d80efe 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -275,6 +275,9 @@ import Control.Applicative (Applicative(..), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 
 import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
@@ -340,8 +343,16 @@ type role Map nominal representational
 
 instance (Ord k) => Monoid (Map k v) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance (Ord k) => Semigroup (Map k v) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 #if __GLASGOW_HASKELL__
 
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 089b292..447688d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -175,6 +175,9 @@ import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', t
 #if MIN_VERSION_base(4,8,0)
 import Data.Foldable (foldr')
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>)))
+#endif
 import Data.Traversable
 import Data.Typeable
 
@@ -543,7 +546,14 @@ instance Read a => Read (Seq a) where
 
 instance Monoid (Seq a) where
     mempty = empty
+#if !(MIN_VERSION_base(4,9,0))
     mappend = (><)
+#else
+    mappend = (<>)
+
+instance Semigroup (Seq a) where
+    (<>)    = (><)
+#endif
 
 INSTANCE_TYPEABLE1(Seq,seqTc,"Seq")
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 02eb82c..01c343a 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -199,6 +199,9 @@ import Data.Bits (shiftL, shiftR)
 #if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
@@ -245,8 +248,17 @@ type role Set nominal
 
 instance Ord a => Monoid (Set a) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Ord a => Semigroup (Set a) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
+
 
 instance Foldable.Foldable Set where
     fold = go


From git at git.haskell.org  Fri Dec 18 22:12:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:55 +0000 (UTC)
Subject: [commit: packages/containers] master: Rename local binding to avoid
 clash with `(<>)` (f9e530a)
Message-ID: <20151218221255.92D403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f9e530ab014bbb78411d7f7660dcd4e78502dea4

>---------------------------------------------------------------

commit f9e530ab014bbb78411d7f7660dcd4e78502dea4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 28 22:14:16 2015 +0100

    Rename local binding to avoid clash with `(<>)`


>---------------------------------------------------------------

f9e530ab014bbb78411d7f7660dcd4e78502dea4
 Data/Sequence.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 447688d..c3a1e1d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -2459,28 +2459,28 @@ unrollPQ cmp = unrollPQ'
   where
     {-# INLINE unrollPQ' #-}
     unrollPQ' (PQueue x ts) = x:mergePQs0 ts
-    (<>) = mergePQ cmp
+    (<+>) = mergePQ cmp
     mergePQs0 Nil = []
     mergePQs0 (t :& Nil) = unrollPQ' t
-    mergePQs0 (t1 :& t2 :& ts) = mergePQs (t1 <> t2) ts
+    mergePQs0 (t1 :& t2 :& ts) = mergePQs (t1 <+> t2) ts
     mergePQs t ts = t `seq` case ts of
         Nil             -> unrollPQ' t
-        t1 :& Nil       -> unrollPQ' (t <> t1)
-        t1 :& t2 :& ts' -> mergePQs (t <> (t1 <> t2)) ts'
+        t1 :& Nil       -> unrollPQ' (t <+> t1)
+        t1 :& t2 :& ts' -> mergePQs (t <+> (t1 <+> t2)) ts'
 
 -- | 'toPQ', given an ordering function and a mechanism for queueifying
 -- elements, converts a 'FingerTree' to a 'PQueue'.
 toPQ :: (e -> e -> Ordering) -> (a -> PQueue e) -> FingerTree a -> Maybe (PQueue e)
 toPQ _ _ Empty = Nothing
 toPQ _ f (Single x) = Just (f x)
-toPQ cmp f (Deep _ pr m sf) = Just (maybe (pr' <> sf') ((pr' <> sf') <>) (toPQ cmp fNode m))
+toPQ cmp f (Deep _ pr m sf) = Just (maybe (pr' <+> sf') ((pr' <+> sf') <+>) (toPQ cmp fNode m))
   where
     fDigit digit = case fmap f digit of
         One a           -> a
-        Two a b         -> a <> b
-        Three a b c     -> a <> b <> c
-        Four a b c d    -> (a <> b) <> (c <> d)
-    (<>) = mergePQ cmp
+        Two a b         -> a <+> b
+        Three a b c     -> a <+> b <+> c
+        Four a b c d    -> (a <+> b) <+> (c <+> d)
+    (<+>) = mergePQ cmp
     fNode = fDigit . nodeToDigit
     pr' = fDigit pr
     sf' = fDigit sf


From git at git.haskell.org  Fri Dec 18 22:12:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:57 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #171 from
 hvr/pr/semigroups (6405653)
Message-ID: <20151218221257.9BFE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6405653480afa675eec804616547b8625244bc7c

>---------------------------------------------------------------

commit 6405653480afa675eec804616547b8625244bc7c
Merge: ce65000 f9e530a
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 29 13:24:03 2015 +0100

    Merge pull request #171 from hvr/pr/semigroups
    
    Semigroup instances



>---------------------------------------------------------------

6405653480afa675eec804616547b8625244bc7c
 Data/IntMap/Base.hs | 13 ++++++++++++-
 Data/IntSet/Base.hs | 13 ++++++++++++-
 Data/Map/Base.hs    | 13 ++++++++++++-
 Data/Sequence.hs    | 28 +++++++++++++++++++---------
 Data/Set/Base.hs    | 14 +++++++++++++-
 5 files changed, 68 insertions(+), 13 deletions(-)


From git at git.haskell.org  Fri Dec 18 22:12:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 18 Dec 2015 22:12:59 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version to v0.5.7.0.
 (d86ba69)
Message-ID: <20151218221259.A2FF03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d86ba69819e716d9ee021cf3b34ba7244f2e1649

>---------------------------------------------------------------

commit d86ba69819e716d9ee021cf3b34ba7244f2e1649
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 17 20:35:04 2015 +0100

    Bump version to v0.5.7.0.


>---------------------------------------------------------------

d86ba69819e716d9ee021cf3b34ba7244f2e1649
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 6f4baaf..281ced4 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.3
+version: 0.5.7.0
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sat Dec 19 00:05:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 00:05:23 +0000 (UTC)
Subject: [commit: ghc] master: Build system: fix 'make sdist' (ccc5a1a)
Message-ID: <20151219000523.746693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ccc5a1a28ca49392f8c7a56b231007476aa5efa8/ghc

>---------------------------------------------------------------

commit ccc5a1a28ca49392f8c7a56b231007476aa5efa8
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Dec 19 01:01:30 2015 +0100

    Build system: fix 'make sdist'
    
    This was broken in 4905b83a2d448c65ccced385343d4e8124548a3b.
    
    libraries/ghci/ghc.mk gets created by ./boot.


>---------------------------------------------------------------

ccc5a1a28ca49392f8c7a56b231007476aa5efa8
 ghc.mk                | 2 +-
 libraries/ghci/ghc.mk | 5 -----
 2 files changed, 1 insertion(+), 6 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index ba9aead..1bd5415 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1155,7 +1155,7 @@ SRC_DIST_TESTSUITE_TARBALL        = $(SRC_DIST_ROOT)/$(SRC_DIST_TESTSUITE_NAME).
 # Files to include in source distributions
 #
 SRC_DIST_GHC_DIRS = mk rules docs distrib bindisttest libffi includes \
-    utils docs rts compiler ghc driver libraries libffi-tarballs
+    utils docs rts compiler ghc driver libraries libffi-tarballs iserv
 SRC_DIST_GHC_FILES += \
     configure.ac config.guess config.sub configure \
     aclocal.m4 README.md ANNOUNCE HACKING.md INSTALL.md LICENSE Makefile \
diff --git a/libraries/ghci/ghc.mk b/libraries/ghci/ghc.mk
deleted file mode 100644
index dc6a891..0000000
--- a/libraries/ghci/ghc.mk
+++ /dev/null
@@ -1,5 +0,0 @@
-libraries/ghci_PACKAGE = ghci
-libraries/ghci_dist-install_GROUP = libraries
-$(if $(filter ghci,$(PACKAGES_STAGE0)),$(eval $(call build-package,libraries/ghci,dist-boot,0)))
-$(if $(filter ghci,$(PACKAGES_STAGE1)),$(eval $(call build-package,libraries/ghci,dist-install,1)))
-$(if $(filter ghci,$(PACKAGES_STAGE2)),$(eval $(call build-package,libraries/ghci,dist-install,2)))


From git at git.haskell.org  Sat Dec 19 00:08:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 00:08:11 +0000 (UTC)
Subject: [commit: ghc] master: Update .mailmap [skip ci] (d1416c3)
Message-ID: <20151219000811.752043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d1416c372575d12c401d384d6f46ef1b1297301a/ghc

>---------------------------------------------------------------

commit d1416c372575d12c401d384d6f46ef1b1297301a
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 18 03:34:42 2015 +0100

    Update .mailmap [skip ci]


>---------------------------------------------------------------

d1416c372575d12c401d384d6f46ef1b1297301a
 .mailmap | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index fca1f62..4c52474 100644
--- a/.mailmap
+++ b/.mailmap
@@ -27,12 +27,14 @@ Austin Seipp            <austin at well-typed.com>             <as at hacks.yi.org>
 Austin Seipp            <austin at well-typed.com>             <as at nijoruj.org>
 Austin Seipp            <austin at well-typed.com>             <aseipp at pobox.com>
 Austin Seipp            <austin at well-typed.com>             <mad.one at gmail.com>
+Bartosz Nitka           <niteria at gmail.com>                 <bnitka at fb.com>
 Bas van Dijk            <v.dijk.bas at gmail.com>              basvandijk at home.nl <unknown>
 Bas van Dijk            <v.dijk.bas at gmail.com>              v.dijk.bas at gmail.com <unknown>
 Ben Chan                <usrbincc at yahoo.com>                # See Note [usrbincc].
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at panda.(none)>
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at panda1.milkyway>
 Ben Gamari              <bgamari.foss at gmail.com>            <ben at smart-cactus.org>
+Ben Gamari              <bgamari.foss at gmail.com>            <ben at well-typed.com>
 Ben Lippmeier           <benl at ouroborus.net>
 Ben Lippmeier           <benl at ouroborus.net>                <Ben.Lippmeier at anu.edu.au>
 Ben Lippmeier           <benl at ouroborus.net>                Ben.Lippmeier.anu.edu.au <unknown>
@@ -80,6 +82,7 @@ David Waern             <davve at dtek.chalmers.se>            davve at dtek.chalmers.
 Dimitrios Vytiniotis    <dimitris at microsoft.com>
 Dimitrios Vytiniotis    <dimitris at microsoft.com>            <dimitris at MSRC-1361792.europe.corp.microsoft.com>
 Dimitrios Vytiniotis    <dimitris at microsoft.com>            dimitris at microsoft.com <unknown>
+Divam Narula            <dfordivam at gmail.com>               # https://www.linkedin.com/in/dfordivam
 Don Stewart             <dons at galois.com>                   <dons at cse.unsw.edu.au>
 Don Stewart             <dons at galois.com>                   dons <unknown>
 Don Stewart             <dons at galois.com>                   dons at cse.unsw.edu.au <unknown>
@@ -90,6 +93,7 @@ Duncan Coutts           <duncan at well-typed.com>             <duncan at community.ha
 Duncan Coutts           <duncan at well-typed.com>             <duncan at haskell.org>
 Edward Z. Yang          <ezyang at cs.stanford.edu>            <ezyang at mit.edu>
 Evan Hauck              <khyperia at live.com>
+Fumiaki Kinoshita       <fumiexcel at gmail.com>
 Gabor Pali              <pali.gabor at gmail.com>              <pgj at FreeBSD.org>
 Gabriele Keller         <keller at cse.unsw.edu.au>            keller <unknown>
 Gabriele Keller         <keller at cse.unsw.edu.au>            keller at .cse.unsw.edu.au <unknown>
@@ -162,9 +166,11 @@ Marc Weber              <marco-oweber at gmx.de>               marco-oweber at gmx.de
 Marcin 'Qrczak' Kowalczyk <qrczak at knm.org.pl>               qrczak <unknown>
 Marco T?lio Gontijo e Silva <marcot at marcot.eti.br>
 Marco T?lio Gontijo e Silva <marcot at marcot.eti.br>          <marcot at debian.org>
-Markus Gro?er           <markus.grosser at tum.de>
 Marios Titas            <redneb at gmx.com>                    <geopoul at gmail.com>
+Markus Gro?er           <markus.grosser at tum.de>
 Matt Chapman            <matthewc at cse.unsw.edu.au>          matthewc <unknown>
+Matthew Farkas-Dyck     <strake888 at gmail.com>
+Matthew Farkas-Dyck     <strake888 at gmail.com>               <mfdyck at google.com>
 Matthias Kilian         <kili at outback.escape.de>            kili at outback.escape.de <unknown>
 Michael D. Adams        <t-madams at microsoft.com>            <adamsmd at cs.indiana.edu>
 Michael Weber           <michaelw at debian.org>               michaelw <unknown>
@@ -195,6 +201,8 @@ Rob Ennals              <rob at ennals.org>                    rje <unknown> # SPJ'
 Roman Leshchinskiy      <rl at cse.unsw.edu.au>                rl at cse.unsw.edu.au <unknown>
 Ross Paterson           <ross at soi.city.ac.uk>               ross <unknown>
 Ryan Lortie             <desrt at desrt.ca>                    desrt <unknown>
+Ryan Scott              <ryan.gl.scott at gmail.com>
+Ryan Scott              <ryan.gl.scott at gmail.com>           <ryan.gl.scott at ku.edu>
 Sam Anklesaria          <amsay at amsay.net>
 Sam Anklesaria          <amsay at amsay.net>                   amsay at amsay.net <unknown>
 Sean Seefried           <sean.seefried at gmail.com>           sseefried <unknown>
@@ -230,6 +238,7 @@ Stephen Blackheath      <stephen at blacksapphire.com>         <oversensitive.pasto
 Sungwoo Park            <gla at postech.ac.kr>                 gla <unknown> # https://ghc.haskell.org/trac/ghc/wiki/TeamGHC
 Sven Panne              <sven.panne at aedion.de>              panne <unknown>
 Sven Panne              <sven.panne at aedion.de>              sven.panne at aedion.de <unknown>
+Sylvain Henry           <hsyl20 at gmail.com>
 S?bastien Carlier       <sebc at posse42.net>                  sebc <unknown>
 Thorkil Naur            <naur at post11.tele.dk>               naur at post11.tele.dk <unknown>
 Tibor Erdesz            <erdeszt at gmail.com>


From git at git.haskell.org  Sat Dec 19 00:38:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 00:38:50 +0000 (UTC)
Subject: [commit: hsc2hs] master: Add alignment to hsc2hs template (d9c13cb)
Message-ID: <20151219003850.731783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hsc2hs

On branch  : master
Link       : http://git.haskell.org/hsc2hs.git/commitdiff/d9c13cb8f5be89a030783d758fcf7c077351c6a9

>---------------------------------------------------------------

commit d9c13cb8f5be89a030783d758fcf7c077351c6a9
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Sat Dec 19 01:31:24 2015 +0100

    Add alignment to hsc2hs template
    
    Previously, calculating alignment values was commonly done by defining a
    custom macro via `#let`:
    
    ```
    (y__); }, y__)
    ```
    
    Not only is this tedious, but it also doesn't work in cross-compilation
    mode (see #10272). It makes sense to define this in `hsc2hs` for symmetry
    with `#size`, `#poke`, `#peek`, etc., as well as to make it easier to
    cross-compile `.hsc` files.
    
    Fixes #4340.
    
    Reviewed By: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1436
    
    GHC Trac Issues: #4340, #10272


>---------------------------------------------------------------

d9c13cb8f5be89a030783d758fcf7c077351c6a9
 CrossCodegen.hs  | 7 +++++++
 DirectCodegen.hs | 2 +-
 template-hsc.h   | 3 +++
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CrossCodegen.hs b/CrossCodegen.hs
index 30bb438..7b26dc7 100644
--- a/CrossCodegen.hs
+++ b/CrossCodegen.hs
@@ -217,6 +217,8 @@ outputSpecial output (z at ZCursor {zCursor=Special pos@(SourcePos file line)  key
        "const" -> outputConst value show
        "offset" -> outputConst ("offsetof(" ++ value ++ ")") (\i -> "(" ++ show i ++ ")")
        "size" -> outputConst ("sizeof(" ++ value ++ ")") (\i -> "(" ++ show i ++ ")")
+       "alignment" -> outputConst (alignment value)
+                                  (\i -> "(" ++ show i ++ ")")
        "peek" -> outputConst ("offsetof(" ++ value ++ ")")
                              (\i -> "(\\hsc_ptr -> peekByteOff hsc_ptr " ++ show i ++ ")")
        "poke" -> outputConst ("offsetof(" ++ value ++ ")")
@@ -281,6 +283,7 @@ outValidityCheck s@(Special pos key value) uniq =
        "const" -> checkValidConst value
        "offset" -> checkValidConst ("offsetof(" ++ value ++ ")")
        "size" -> checkValidConst ("sizeof(" ++ value ++ ")")
+       "alignment" -> checkValidConst (alignment value)
        "peek" -> checkValidConst ("offsetof(" ++ value ++ ")")
        "poke" -> checkValidConst ("offsetof(" ++ value ++ ")")
        "ptr" -> checkValidConst ("offsetof(" ++ value ++ ")")
@@ -439,6 +442,10 @@ stringify = go False . dropWhile isSpace
                     then ' ' : x : go False xs
                     else x : go False xs
 
+-- For #{alignment} codegen; mimic's template-hsc.h's hsc_alignment
+alignment :: String -> String
+alignment t = "offsetof(struct {char x__; " ++ t ++ " (y__); }, y__)"
+
 computeEnum :: ZCursor Token -> TestMonad String
 computeEnum z@(ZCursor (Special _ _ enumText) _ _) =
     case parseEnum enumText of
diff --git a/DirectCodegen.hs b/DirectCodegen.hs
index c6f428d..37564ee 100644
--- a/DirectCodegen.hs
+++ b/DirectCodegen.hs
@@ -54,7 +54,7 @@ outputDirect config outName outDir outBase name toks = do
 
     when (cCrossSafe config) $
         forM_ specials (\ (SourcePos file line,key,_) ->
-            when (not $ key `elem` ["const","offset","size","peek","poke","ptr",
+            when (not $ key `elem` ["const","offset","size","alignment","peek","poke","ptr",
                                     "type","enum","error","warning","include","define","undef",
                                     "if","ifdef","ifndef", "elif","else","endif"]) $
              die (file ++ ":" ++ show line ++ " directive \"" ++ key ++ "\" is not safe for cross-compilation"))
diff --git a/template-hsc.h b/template-hsc.h
index b27faee..edc90c2 100644
--- a/template-hsc.h
+++ b/template-hsc.h
@@ -85,6 +85,9 @@ void *hsc_stdout(void);
 #define hsc_size(t...) \
     hsc_printf("(%ld)", (long) sizeof(t));
 
+#define hsc_alignment(t...) \
+    hsc_printf("(%ld)", (long) offsetof(struct {char x__; t (y__); }, y__));
+
 #define hsc_enum(t, f, print_name, x)                   \
     print_name;                                         \
     hsc_printf (" :: %s\n", #t);                        \


From git at git.haskell.org  Sat Dec 19 01:12:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 01:12:17 +0000 (UTC)
Subject: [commit: ghc] master: Bump hsc2hs submodule (5431273)
Message-ID: <20151219011217.AD4283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/543127388e8c82bce53b09e904a7ed8562badd22/ghc

>---------------------------------------------------------------

commit 543127388e8c82bce53b09e904a7ed8562badd22
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 19 01:45:51 2015 +0100

    Bump hsc2hs submodule
    
    Fixes #4340


>---------------------------------------------------------------

543127388e8c82bce53b09e904a7ed8562badd22
 utils/hsc2hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/hsc2hs b/utils/hsc2hs
index bb205d8..d9c13cb 160000
--- a/utils/hsc2hs
+++ b/utils/hsc2hs
@@ -1 +1 @@
-Subproject commit bb205d806c1368e483edde288cbf8ed2cfca2ba6
+Subproject commit d9c13cb8f5be89a030783d758fcf7c077351c6a9


From git at git.haskell.org  Sat Dec 19 07:34:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 07:34:40 +0000 (UTC)
Subject: [commit: ghc] master: fix typo (b2670fc)
Message-ID: <20151219073440.21BF63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b2670fc47754288224b825a3308b92642ccf7e73/ghc

>---------------------------------------------------------------

commit b2670fc47754288224b825a3308b92642ccf7e73
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Dec 18 23:59:59 2015 +0100

    fix typo
    
    [skip-ci]


>---------------------------------------------------------------

b2670fc47754288224b825a3308b92642ccf7e73
 libraries/base/Debug/Trace.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/base/Debug/Trace.hs b/libraries/base/Debug/Trace.hs
index 653dcab..40475d3 100644
--- a/libraries/base/Debug/Trace.hs
+++ b/libraries/base/Debug/Trace.hs
@@ -188,7 +188,7 @@ traceShowM = traceM . show
 -- available.
 --
 -- In the current GHC implementation, the call stack is only
--- availble if the program was compiled with @-prof@; otherwise
+-- available if the program was compiled with @-prof@; otherwise
 -- 'traceStack' behaves exactly like 'trace'.  Entries in the call
 -- stack correspond to @SCC@ annotations, so it is a good idea to use
 -- @-fprof-auto@ or @-fprof-auto-calls@ to add SCC annotations automatically.


From git at git.haskell.org  Sat Dec 19 10:13:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 10:13:11 +0000 (UTC)
Subject: [commit: ghc] master: Documentation,
 tests for hsc2hs's new #alignment macro (2cc5b60)
Message-ID: <20151219101311.81E0B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2cc5b607df27e702541985f7c4c987806c4ec2a1/ghc

>---------------------------------------------------------------

commit 2cc5b607df27e702541985f7c4c987806c4ec2a1
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Sat Dec 19 11:09:52 2015 +0100

    Documentation, tests for hsc2hs's new #alignment macro
    
    Adds two tests (one for Trac #4340 and one for Trac #10272), as well as
    advice on how to fix your code if `hsc2hs` emits warnings with GHC 8.0
    due to a redefinition of `#alignment`. (I also put the advice in the
    [GHC 8.0 Migration
    Guide](https://ghc.haskell.org/trac/ghc/wiki/Migration/8.0).)
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1663
    
    GHC Trac Issues: #4340, #10272


>---------------------------------------------------------------

2cc5b607df27e702541985f7c4c987806c4ec2a1
 .gitignore                                         |  1 +
 docs/users_guide/7.12.1-notes.rst                  | 26 ++++++++++++++++++++++
 docs/users_guide/utils.rst                         |  4 ++++
 testsuite/tests/hsc2hs/Makefile                    | 12 ++++++++++
 testsuite/tests/hsc2hs/T10272.h                    | 12 ++++++++++
 testsuite/tests/hsc2hs/T10272.hsc                  |  6 +++++
 .../T4262.stdout => hsc2hs/T10272.stdout}          |  0
 testsuite/tests/hsc2hs/T4340.hsc                   |  8 +++++++
 .../T4262.stdout => hsc2hs/T4340.stdout}           |  0
 testsuite/tests/hsc2hs/all.T                       | 10 +++++++++
 10 files changed, 79 insertions(+)

diff --git a/.gitignore b/.gitignore
index ae23fbb..bb69e91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -126,6 +126,7 @@ _darcs/
 /libraries/frames.html
 /libraries/ghc-boot/GNUmakefile
 /libraries/ghc-boot/ghc.mk
+/libraries/ghci/ghc.mk
 /libraries/haddock-util.js
 /libraries/hslogo-16.png
 /libraries/index-frames.html
diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 749f7af..d443a0a 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -321,6 +321,32 @@ Package system
 
 -  TODO FIXME.
 
+hsc2hs
+~~~~~~
+
+-  ``hsc2hs`` now supports the ``#alignment`` macro, which can be used to
+    calculate the alignment of a struct in bytes. Previously, ``#alignment``
+    had to be implemented manually via a ``#let`` directive, e.g., ::
+
+      #let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+
+    As a result, if you have the above directive in your code, it will now emit
+    a warning when compiled with GHC 8.0. ::
+
+      Module.hsc:24:0: warning: "hsc_alignment" redefined [enabled by default]
+      In file included from dist/build/Module_hsc_make.c:1:0:
+      /path/to/ghc/lib/template-hsc.h:88:0: note: this is the location of the previous definition
+       #define hsc_alignment(t...) \
+       ^
+
+    To make your code free of warnings on GHC 8.0 and still support earlier
+    versions, surround the directive with a pragma checking for the right GHC
+    version. ::
+
+      #if __GLASGOW_HASKELL__ < 800
+      #let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+      #endif
+
 Libraries
 ---------
 
diff --git a/docs/users_guide/utils.rst b/docs/users_guide/utils.rst
index 9c1237d..f490bfa 100644
--- a/docs/users_guide/utils.rst
+++ b/docs/users_guide/utils.rst
@@ -224,6 +224,10 @@ Meanings of specific keywords:
     Computes the size, in bytes, of ``struct_type``. It will have type
     ``Int``.
 
+``#alignment ?struct_type?``
+    Computes the alignment, in bytes, of ``struct_type``. It will have type
+    ``Int``.
+
 ``#enum ?type?, ?constructor?, ?value?, ?value?, ...``
     A shortcut for multiple definitions which use ``#const``. Each
     ``value`` is a name of a C integer constant, e.g. enumeration value.
diff --git a/testsuite/tests/hsc2hs/Makefile b/testsuite/tests/hsc2hs/Makefile
index ec16b16..54fa5ad 100644
--- a/testsuite/tests/hsc2hs/Makefile
+++ b/testsuite/tests/hsc2hs/Makefile
@@ -28,3 +28,15 @@ hsc2hs004:
 T3837:
 	LANG=C '$(HSC2HS)' $@.hsc
 	'$(TEST_HC)' $(TEST_HC_OPTS) -c $@.hs
+
+.PHONY: T4340
+T4340:
+	'$(HSC2HS)' $@.hsc
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@
+	./$@
+
+.PHONY: T10272
+T10272:
+	'$(HSC2HS)' --cross-compile $@.hsc
+	'$(TEST_HC)' $(TEST_HC_OPTS) -v0 --make $@
+	./$@
diff --git a/testsuite/tests/hsc2hs/T10272.h b/testsuite/tests/hsc2hs/T10272.h
new file mode 100644
index 0000000..6d8142d
--- /dev/null
+++ b/testsuite/tests/hsc2hs/T10272.h
@@ -0,0 +1,12 @@
+#ifndef _T10272_H_
+#define _T10272_H_
+
+#include <stdint.h>
+
+typedef struct {
+  uint8_t  a;
+  uint64_t b;
+  uint16_t c;
+} eight;
+
+#endif
diff --git a/testsuite/tests/hsc2hs/T10272.hsc b/testsuite/tests/hsc2hs/T10272.hsc
new file mode 100644
index 0000000..c4ff6d1
--- /dev/null
+++ b/testsuite/tests/hsc2hs/T10272.hsc
@@ -0,0 +1,6 @@
+module Main where
+
+#include "T10272.h"
+
+main :: IO ()
+main = print #{alignment eight}
diff --git a/testsuite/tests/concurrent/should_run/T4262.stdout b/testsuite/tests/hsc2hs/T10272.stdout
similarity index 100%
copy from testsuite/tests/concurrent/should_run/T4262.stdout
copy to testsuite/tests/hsc2hs/T10272.stdout
diff --git a/testsuite/tests/hsc2hs/T4340.hsc b/testsuite/tests/hsc2hs/T4340.hsc
new file mode 100644
index 0000000..5ae9e2a
--- /dev/null
+++ b/testsuite/tests/hsc2hs/T4340.hsc
@@ -0,0 +1,8 @@
+module Main where
+
+#include <stdint.h>
+
+#def typedef struct { uint8_t a; uint64_t b; uint16_t c; } eight;
+
+main :: IO ()
+main = print #{alignment eight}
diff --git a/testsuite/tests/concurrent/should_run/T4262.stdout b/testsuite/tests/hsc2hs/T4340.stdout
similarity index 100%
copy from testsuite/tests/concurrent/should_run/T4262.stdout
copy to testsuite/tests/hsc2hs/T4340.stdout
diff --git a/testsuite/tests/hsc2hs/all.T b/testsuite/tests/hsc2hs/all.T
index b095791..d4fc69d 100644
--- a/testsuite/tests/hsc2hs/all.T
+++ b/testsuite/tests/hsc2hs/all.T
@@ -25,3 +25,13 @@ test('T3837',
      run_command,
      ['$MAKE -s --no-print-directory T3837'])
 
+test('T4340',
+     [extra_clean(['T4340.hs', 'T4340_hsc_make.c',
+                   'T4340_hsc.c', 'T4340_hsc.h'])],
+     run_command,
+     ['$MAKE -s --no-print-directory T4340'])
+
+test('T10272',
+     [extra_clean(['T10272.hs', 'T10272_hsc_make.c'])],
+     run_command,
+     ['$MAKE -s --no-print-directory T10272'])


From git at git.haskell.org  Sat Dec 19 10:13:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 10:13:14 +0000 (UTC)
Subject: [commit: ghc] master: Add -Nmax<n> RTS feature (#10728) (b028384)
Message-ID: <20151219101314.2AB6B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b02838405b00bcdeebb44da0a7a9562cd7fda66b/ghc

>---------------------------------------------------------------

commit b02838405b00bcdeebb44da0a7a9562cd7fda66b
Author: MarcelineVQ <matthewnhyatt at gmail.com>
Date:   Sat Dec 19 11:10:54 2015 +0100

    Add -Nmax<n> RTS feature (#10728)
    
    Added maximum core use based on processors
    -Nmax<x> chooses the minimum of processor count or x
    Added documentation.
    
    Reviewed By: simonmar, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1650


>---------------------------------------------------------------

b02838405b00bcdeebb44da0a7a9562cd7fda66b
 docs/users_guide/using-concurrent.rst |  8 +++++++-
 rts/RtsFlags.c                        | 17 +++++++++++++----
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/using-concurrent.rst b/docs/users_guide/using-concurrent.rst
index c00a294..2621afc 100644
--- a/docs/users_guide/using-concurrent.rst
+++ b/docs/users_guide/using-concurrent.rst
@@ -107,11 +107,14 @@ RTS options for SMP parallelism
 
 There are two ways to run a program on multiple processors: call
 ``Control.Concurrent.setNumCapabilities`` from your program, or use the
-RTS ``-N`` option.
+RTS ``-N`` options.
 
 ``-N?x?``
+``-Nmax?x?``
+
     .. index::
        single: -N?x?; RTS option
+       single: -Nmax(x); RTS option
 
     Use ?x? simultaneous threads when running the program.
 
@@ -133,6 +136,9 @@ RTS ``-N`` option.
     value of ?x? itself based on how many processors are in your
     machine.
 
+    With Nmax?x?, i.e. ``+RTS -Nmax3 -RTS``, the runtime will choose at
+    most (x), also limited by the number of processors on the system.
+
     Be careful when using all the processors in your machine: if some of
     your processors are in use by other programs, this can actually harm
     performance rather than improve it.
diff --git a/rts/RtsFlags.c b/rts/RtsFlags.c
index 9457279..bd60591 100644
--- a/rts/RtsFlags.c
+++ b/rts/RtsFlags.c
@@ -391,8 +391,9 @@ usage_text[] = {
 "",
 #endif /* DEBUG */
 #if defined(THREADED_RTS) && !defined(NOSMP)
-"  -N[<n>]   Use <n> processors (default: 1, -N alone determines",
-"            the number of processors to use automatically)",
+"  -N[<n>]    Use <n> processors (default: 1, -N alone determines",
+"             the number of processors to use automatically)",
+"  -Nmax[<n>] Use up to n processors automatically",
 "  -qg[<n>]  Use parallel GC only for generations >= <n>",
 "            (default: 0, -qg alone turns off parallel GC)",
 "  -qb[<n>]  Use load-balancing in the parallel GC only for generations >= <n>",
@@ -1041,13 +1042,21 @@ error = rtsTrue;
                 } else {
                     int nNodes;
                     OPTION_SAFE; /* but see extra checks below... */
-                    nNodes = strtol(rts_argv[arg]+2, (char **) NULL, 10);
+
+                    // <=n feature request ticket #10728
+                    if (strncmp("max", &rts_argv[arg][2], 3) == 0) {
+                      int proc = (int)getNumberOfProcessors();
+                      nNodes = strtol(rts_argv[arg]+5, (char **) NULL, 10);
+                      if (nNodes > proc) { nNodes = proc; }
+                    } else {
+                      nNodes = strtol(rts_argv[arg]+2, (char **) NULL, 10);
+                    }
                     if (nNodes <= 0) {
                       errorBelch("bad value for -N");
                       error = rtsTrue;
                     }
                     if (rtsOptsEnabled == RtsOptsSafeOnly &&
-                        nNodes > (int)getNumberOfProcessors()) {
+                      nNodes > (int)getNumberOfProcessors()) {
                       errorRtsOptsDisabled("Using large values for -N is not allowed by default. %s");
                       stg_exit(EXIT_FAILURE);
                     }


From git at git.haskell.org  Sat Dec 19 16:02:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 16:02:27 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Added a new flag (-guard-reasoning={simple,
 try, try-quiet, do}) (7e21605)
Message-ID: <20151219160227.710313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/7e216050ce0366a1d2c2a971db457a5d49f60e8a/ghc

>---------------------------------------------------------------

commit 7e216050ce0366a1d2c2a971db457a5d49f60e8a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Dec 19 17:02:36 2015 +0100

    Added a new flag (-guard-reasoning={simple,try,try-quiet,do})
    
    Options:
    ~~~~~~~~
      simple    : Like old times (see only `otherwise`)
      try       : Default: If guards>20, bail. Issue waring below.
      try-quiet : If too many guards, skip check, issue no warning
      do        : Run the check fully (but may use up all resources)
    
    Warning:
    ~~~~~~~~
    Pattern match checking omitted for an equation for `opt_trans_rule'
    because it may be non-performant (too many guards)
    Use: -guard-reasoning=simple
           for a more efficient (but less expressive) pattern guard checking
         -guard-reasoning=try-quiet
           to suppress this warning for inefficiently checked matches
         -guard-reasoning=do
           to fully check the match (may run out of memory)
    
    If the guards are too many, the suggested strategy is the following:
    
    1) First try -guard-reasoning=simple. The simple version of the checker
       may still be able to emit the correct warnings.
    
    2) If you still get some warnings but you are confident that there
       shouldn't be any, try -guard-reasoning=do.
    
    3) If the compilation takes too long but you are sure that your match
       is exhaustive and nothing is redundant, you can either:
       * Disable the check for matches with many guards with
         -guard-reasoning=try-quiet (useful if you compile with -Werror) or
       * Do nothing, just keep the warning as a reminder.
    
    With the current state of GHC, the above warning is emitted only for:
    
    libraries/base/Foreign/C/Error.hs:472:5:      function `errType'
    compiler/nativeGen/Dwarf/Constants.hs:170:18: (case expression)
    compiler/ghci/RtClosureInspect.hs:497:4:      function `rep'
    (And would have been for compiler/types/OptCoercion.hs, for which the
    check is currently disabled)
    
    Note that for Error.hs, Constants.hs and RtClosureInspect.hs we can
    safely enable "-guard-reasoning=do". For OptCoercion.hs the full
    check takes forever to complete (and uses up all the memory) but with
    "-guard-reasoning=simple" we can both have it checked and in reasonable
    time.
    
    ("-guard-reasoning=do" not enabled in Error.hs because it is in a
    submodule. Left it to the library maintainer)


>---------------------------------------------------------------

7e216050ce0366a1d2c2a971db457a5d49f60e8a
 compiler/deSugar/Check.hs             | 84 ++++++++++++++++++++++++++++++-----
 compiler/deSugar/Match.hs             | 37 ++++++++++++---
 compiler/ghci/RtClosureInspect.hs     |  3 ++
 compiler/main/DynFlags.hs             | 20 +++++++++
 compiler/nativeGen/Dwarf/Constants.hs |  4 ++
 compiler/types/OptCoercion.hs         |  5 ++-
 6 files changed, 136 insertions(+), 17 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7e216050ce0366a1d2c2a971db457a5d49f60e8a

From git at git.haskell.org  Sat Dec 19 17:17:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 17:17:18 +0000 (UTC)
Subject: [commit: ghc] master: Add sparc64 a known architecture (Ticket
 #11211) (59de6e8)
Message-ID: <20151219171718.15EA03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/59de6e84ff022ddca540724ab1aa0577c6aa2363/ghc

>---------------------------------------------------------------

commit 59de6e84ff022ddca540724ab1aa0577c6aa2363
Author: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
Date:   Sat Dec 19 10:39:25 2015 +0100

    Add sparc64 a known architecture (Ticket #11211)
    
    Explicitly pass "--no-relax" on ArchSPARC64
    (as ArchSPARC does) where gcc's default specs
    set "-mrelax" which conflicts with "-Wl,-r".
    
    Known architecture will also help extending
    sparc NCG support 64-bit ABI.
    
    Signed-off-by: John Paul Adrian Glaubitz <glaubitz at physik.fu-berlin.de>
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

59de6e84ff022ddca540724ab1aa0577c6aa2363
 aclocal.m4                                         | 5 ++++-
 compiler/main/DriverPipeline.hs                    | 3 ++-
 compiler/nativeGen/AsmCodeGen.hs                   | 1 +
 compiler/nativeGen/RegAlloc/Graph/TrivColorable.hs | 4 ++++
 compiler/nativeGen/RegAlloc/Linear/FreeRegs.hs     | 1 +
 compiler/nativeGen/RegAlloc/Linear/Main.hs         | 1 +
 compiler/nativeGen/TargetReg.hs                    | 5 +++++
 compiler/utils/Platform.hs                         | 1 +
 8 files changed, 19 insertions(+), 2 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 59de6e84ff022ddca540724ab1aa0577c6aa2363

From git at git.haskell.org  Sat Dec 19 18:03:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 18:03:58 +0000 (UTC)
Subject: [commit: ghc] master: Make ghc-boot Hackage-ready (7b8a822)
Message-ID: <20151219180358.E3A163A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7b8a8222e8f0ac1059b57cfba25294b6d55d1d65/ghc

>---------------------------------------------------------------

commit 7b8a8222e8f0ac1059b57cfba25294b6d55d1d65
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 19:02:15 2015 +0100

    Make ghc-boot Hackage-ready
    
    GHC 7.8 / base-4.7 is the oldest GHC/base version compatible with this
    package, so let's declare this properly in the cabal file.


>---------------------------------------------------------------

7b8a8222e8f0ac1059b57cfba25294b6d55d1d65
 libraries/ghc-boot/GHC/Serialized.hs |  2 +-
 libraries/ghc-boot/changelog.md      |  5 +++++
 libraries/ghc-boot/ghc-boot.cabal    | 20 +++++++++-----------
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/libraries/ghc-boot/GHC/Serialized.hs b/libraries/ghc-boot/GHC/Serialized.hs
index 39fa6a7..fbb9684 100644
--- a/libraries/ghc-boot/GHC/Serialized.hs
+++ b/libraries/ghc-boot/GHC/Serialized.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables #-}
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
 
 --
diff --git a/libraries/ghc-boot/changelog.md b/libraries/ghc-boot/changelog.md
new file mode 100644
index 0000000..f429a84
--- /dev/null
+++ b/libraries/ghc-boot/changelog.md
@@ -0,0 +1,5 @@
+## 0.0.0.0  *Feb 2016*
+
+  * Bundled with GHC 7.10.1
+
+  * Initial version
diff --git a/libraries/ghc-boot/ghc-boot.cabal b/libraries/ghc-boot/ghc-boot.cabal
index 4439153..f9516b6 100644
--- a/libraries/ghc-boot/ghc-boot.cabal
+++ b/libraries/ghc-boot/ghc-boot.cabal
@@ -1,8 +1,10 @@
 name:           ghc-boot
 version:        0.0.0.0
 license:        BSD3
+license-file:   LICENSE
+category:       GHC
 maintainer:     ghc-devs at haskell.org
-bug-reports:    glasgow-haskell-bugs at haskell.org
+bug-reports:    https://ghc.haskell.org/trac/ghc/newticket
 synopsis:       Shared functionality between GHC and its boot libraries
 description:    This library is shared between GHC, ghc-pkg, and other boot
                 libraries.
@@ -18,6 +20,7 @@ description:    This library is shared between GHC, ghc-pkg, and other boot
                 and program do not have to depend on Cabal.
 cabal-version:  >=1.10
 build-type:     Simple
+extra-source-files: changelog.md
 
 source-repository head
     type:     git
@@ -26,12 +29,7 @@ source-repository head
 
 Library
     default-language: Haskell2010
-    other-extensions:
-            GeneralizedNewtypeDeriving
-            RecordWildCards
-            StandaloneDeriving
-            Trustworthy
-            TypeSynonymInstances
+    other-extensions: DeriveGeneric, RankNTypes, ScopedTypeVariables
 
     exposed-modules:
             GHC.Lexeme
@@ -39,9 +37,9 @@ Library
             GHC.LanguageExtensions
             GHC.Serialized
 
-    build-depends: base       >= 4   && < 5,
+    build-depends: base       >= 4.7 && < 4.10,
                    binary     == 0.8.*,
-                   bytestring >= 0.9 && < 1,
-                   directory  >= 1   && < 1.3,
-                   filepath
+                   bytestring == 0.10.*,
+                   directory  == 1.2.*,
+                   filepath   >= 1.3 && < 1.5
 


From git at git.haskell.org  Sat Dec 19 19:11:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 19:11:40 +0000 (UTC)
Subject: [commit: ghc] master: Fix typo in 7b8a8222e8f0 (64b6a76)
Message-ID: <20151219191140.ABAA13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/64b6a7606530c2073de6f812d517132fff2aad5f/ghc

>---------------------------------------------------------------

commit 64b6a7606530c2073de6f812d517132fff2aad5f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 19:34:16 2015 +0100

    Fix typo in 7b8a8222e8f0
    
    [skip ci]


>---------------------------------------------------------------

64b6a7606530c2073de6f812d517132fff2aad5f
 libraries/ghc-boot/changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/ghc-boot/changelog.md b/libraries/ghc-boot/changelog.md
index f429a84..e0b4d69 100644
--- a/libraries/ghc-boot/changelog.md
+++ b/libraries/ghc-boot/changelog.md
@@ -1,5 +1,5 @@
 ## 0.0.0.0  *Feb 2016*
 
-  * Bundled with GHC 7.10.1
+  * Bundled with GHC 8.0.1
 
   * Initial version


From git at git.haskell.org  Sat Dec 19 19:11:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 19:11:43 +0000 (UTC)
Subject: [commit: ghc] master: First pass at cleaning up ghci.cabal (d8c8902)
Message-ID: <20151219191143.97C0F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d8c890263cea273bac6d3cffa7525d8ba49acb5d/ghc

>---------------------------------------------------------------

commit d8c890263cea273bac6d3cffa7525d8ba49acb5d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 19:35:31 2015 +0100

    First pass at cleaning up ghci.cabal
    
    This prepares the meta-data of the new `ghci` package for Hackage


>---------------------------------------------------------------

d8c890263cea273bac6d3cffa7525d8ba49acb5d
 libraries/ghci/GHCi/CreateBCO.hs          |  1 -
 libraries/{ghc-boot => ghci}/changelog.md |  2 +-
 libraries/ghci/ghci.cabal                 | 99 +++++++++++++++++++------------
 3 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/libraries/ghci/GHCi/CreateBCO.hs b/libraries/ghci/GHCi/CreateBCO.hs
index 026e3ea..6a9b79a 100644
--- a/libraries/ghci/GHCi/CreateBCO.hs
+++ b/libraries/ghci/GHCi/CreateBCO.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE FlexibleInstances #-}
 {-# LANGUAGE BangPatterns #-}
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE MagicHash #-}
 {-# LANGUAGE UnboxedTuples #-}
 {-# LANGUAGE RecordWildCards #-}
diff --git a/libraries/ghc-boot/changelog.md b/libraries/ghci/changelog.md
similarity index 68%
copy from libraries/ghc-boot/changelog.md
copy to libraries/ghci/changelog.md
index e0b4d69..3775eda 100644
--- a/libraries/ghc-boot/changelog.md
+++ b/libraries/ghci/changelog.md
@@ -1,4 +1,4 @@
-## 0.0.0.0  *Feb 2016*
+## 8.0.1  *Feb 2016*
 
   * Bundled with GHC 8.0.1
 
diff --git a/libraries/ghci/ghci.cabal b/libraries/ghci/ghci.cabal
index 9e2f045..39eb7da 100644
--- a/libraries/ghci/ghci.cabal
+++ b/libraries/ghci/ghci.cabal
@@ -1,41 +1,66 @@
-Name: ghci
-Version: 0.0
-Copyright: XXX
-License: BSD3
--- XXX License-File: LICENSE
-Author: XXX
-Maintainer: XXX
-Synopsis: XXX
-Description:
+name:           ghci
+version:        0
+license:        BSD3
+license-file:   LICENSE
+category:       GHC
+maintainer:     ghc-devs at haskell.org
+bug-reports:    https://ghc.haskell.org/trac/ghc/newticket
+synopsis:       XXX
+description:
         XXX
-Category: Development
-build-type: Simple
-cabal-version: >=1.10
+cabal-version:  >=1.10
+build-type:     Simple
+extra-source-files: changelog.md
 
-Library
-    Default-Language: Haskell2010
-    Exposed-Modules: GHCi.Message,
-                     GHCi.ResolvedBCO,
-                     GHCi.RemoteTypes,
-                     GHCi.ObjLink,
-                     GHCi.CreateBCO,
-                     GHCi.FFI,
-                     GHCi.InfoTable,
-                     GHCi.Run,
-                     GHCi.Signals,
-                     GHCi.TH,
-                     GHCi.TH.Binary,
-                     SizedSeq
-    Build-Depends: base       >= 4   && < 5,
-                   binary     >= 0.7 && < 0.9,
-                   bytestring >= 0.10 && < 0.11,
-                   containers >= 0.5 && < 0.6,
-                   deepseq    >= 1.4 && < 1.5,
-                   filepath   >= 1.4 && < 1.5,
-                   ghc-boot,
-                   array      >= 0.5 && < 0.6,
-                   template-haskell >= 2.11 && < 2.12,
-                   transformers >= 0.4 && < 0.6
+source-repository head
+    type:     git
+    location: http://git.haskell.org/ghc.git
+    subdir:   libraries/ghci
+
+library
+    default-language: Haskell2010
+    other-extensions:
+        BangPatterns
+        CPP
+        DeriveGeneric
+        ExistentialQuantification
+        FlexibleInstances
+        GADTs
+        GeneralizedNewtypeDeriving
+        InstanceSigs
+        MagicHash
+        MultiParamTypeClasses
+        RecordWildCards
+        ScopedTypeVariables
+        StandaloneDeriving
+        TupleSections
+        UnboxedTuples
+
+    exposed-modules:
+        GHCi.Message,
+        GHCi.ResolvedBCO,
+        GHCi.RemoteTypes,
+        GHCi.ObjLink,
+        GHCi.CreateBCO,
+        GHCi.FFI,
+        GHCi.InfoTable,
+        GHCi.Run,
+        GHCi.Signals,
+        GHCi.TH,
+        GHCi.TH.Binary,
+        SizedSeq
+
+    Build-Depends:
+        array            == 0.5.*,
+        base             == 4.9.*,
+        binary           == 0.8.*,
+        bytestring       == 0.10.*,
+        containers       == 0.5.*,
+        deepseq          == 1.4.*,
+        filepath         == 1.4.*,
+        ghc-boot         == 0.0.*,
+        template-haskell == 2.11.*,
+        transformers     == 0.5.*
 
     if !os(windows)
-       Build-Depends: unix >= 2.7 && < 2.8
+        Build-Depends: unix == 2.7.*


From git at git.haskell.org  Sat Dec 19 22:13:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 19 Dec 2015 22:13:44 +0000 (UTC)
Subject: [commit: ghc] master: Fix two occurences of `x86_HOST_ARCH` (34eaf2b)
Message-ID: <20151219221344.216A73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34eaf2b8d699c49ba367f26840052c8c9aa031b1/ghc

>---------------------------------------------------------------

commit 34eaf2b8d699c49ba367f26840052c8c9aa031b1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 23:13:11 2015 +0100

    Fix two occurences of `x86_HOST_ARCH`
    
    The proper name for the define is `i386_HOST_ARCH`
    
    One was introduced back in 2011 via
    035b8ebb5405efbcbfd3474821a877add1feca1e / #4914
    and the other one more recently via
    4905b83a2d448c65ccced385343d4e8124548a3b
    
    We may want to add some validation to catch such typos early on...
    
    Reviewed By: erikd
    
    Differential Revision: https://phabricator.haskell.org/D1664


>---------------------------------------------------------------

34eaf2b8d699c49ba367f26840052c8c9aa031b1
 libraries/ghci/GHCi/InfoTable.hsc | 2 +-
 rts/RtsUtils.c                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index c3e20f5..34604ea 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -66,7 +66,7 @@ platform =
        ArchSparc
 #elif defined(powerpc_HOST_ARCH)
        ArchPPC
-#elif defined(x86_HOST_ARCH)
+#elif defined(i386_HOST_ARCH)
        ArchX86
 #elif defined(x86_64_HOST_ARCH)
        ArchX86_64
diff --git a/rts/RtsUtils.c b/rts/RtsUtils.c
index ddf5a1f..72e19a0 100644
--- a/rts/RtsUtils.c
+++ b/rts/RtsUtils.c
@@ -319,7 +319,7 @@ int rts_isDynamic(void)
 // Used for detecting a non-empty FPU stack on x86 (see #4914)
 void checkFPUStack(void)
 {
-#ifdef x86_HOST_ARCH
+#ifdef i386_HOST_ARCH
     static unsigned char buf[108];
     asm("FSAVE %0":"=m" (buf));
 


From git at git.haskell.org  Sun Dec 20 07:45:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:24 +0000 (UTC)
Subject: [commit: packages/time] branch 'ghc-7.8' created
Message-ID: <20151220074524.A1B573A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

New branch : ghc-7.8
Referencing: adafac26307cffab0be20c126385ab161c259237

From git at git.haskell.org  Sun Dec 20 07:45:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:26 +0000 (UTC)
Subject: [commit: packages/time] branch 'ghc-head' deleted
Message-ID: <20151220074526.A27923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

Deleted branch: ghc-head

From git at git.haskell.org  Sun Dec 20 07:45:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:28 +0000 (UTC)
Subject: [commit: packages/time] branch 'ezyang-scrap' deleted
Message-ID: <20151220074528.A342A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

Deleted branch: ezyang-scrap

From git at git.haskell.org  Sun Dec 20 07:45:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:30 +0000 (UTC)
Subject: [commit: packages/time] tag 'time-1.5.0.1-release' created
Message-ID: <20151220074530.A46743A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

New tag    : time-1.5.0.1-release
Referencing: 02aa59816ac87af9623752937ce2cb6ddbd7eb98

From git at git.haskell.org  Sun Dec 20 07:45:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:32 +0000 (UTC)
Subject: [commit: packages/time] tag 'time-1.6-release' created
Message-ID: <20151220074532.A58203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

New tag    : time-1.6-release
Referencing: 098185968c31dfbc27ebd548460795b72b1ea274

From git at git.haskell.org  Sun Dec 20 07:45:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:34 +0000 (UTC)
Subject: [commit: packages/time] master: initial revision,
 including draft of Clock and outlines of TAI and Calendar (239f07b)
Message-ID: <20151220074534.B3EA33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/239f07b42ef31a05b9b3894dc656620c8699cc9b

>---------------------------------------------------------------

commit 239f07b42ef31a05b9b3894dc656620c8699cc9b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Feb 22 21:19:59 2005 -0800

    initial revision, including draft of Clock and outlines of TAI and Calendar
    
    darcs-hash:20050223051959-ac6dd-ea6ff7c56b81deaffc2584a3a196a8e6262805d9


>---------------------------------------------------------------

239f07b42ef31a05b9b3894dc656620c8699cc9b
 Makefile                |  30 +++++++++++++
 System/Time/Calendar.hs |  61 +++++++++++++++++++++++++
 System/Time/Clock.hs    | 116 ++++++++++++++++++++++++++++++++++++++++++++++++
 System/Time/TAI.hs      |  33 ++++++++++++++
 TestTime.hs             |  11 +++++
 5 files changed, 251 insertions(+)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..4a6709f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,30 @@
+default: TestTime.run
+
+#TestTime: TestTime.o System/Time/Clock.o System/Time/TAI.o System/Time/Calendar.o
+TestTime: TestTime.o System/Time/Clock.o
+	ghc $^ -o $@
+
+
+clean:
+	rm -f TestTime *.o *.hi System/Time/*.o System/Time/*.hi Makefile.bak
+
+
+%.run: %
+	./$<
+
+%.hi: %.o
+	@:
+
+%.o: %.hs
+	ghc -c $< -o $@
+
+depend: TestTime.hs System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
+	ghc -M $^
+# DO NOT DELETE: Beginning of Haskell dependencies
+TestTime.o : TestTime.hs
+TestTime.o : ./System/Time/Clock.hi
+System/Time/Clock.o : System/Time/Clock.hs
+System/Time/TAI.o : System/Time/TAI.hs
+System/Time/TAI.o : System/Time/Clock.hi
+System/Time/Calendar.o : System/Time/Calendar.hs
+# DO NOT DELETE: End of Haskell dependencies
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
new file mode 100644
index 0000000..944f4fb
--- /dev/null
+++ b/System/Time/Calendar.hs
@@ -0,0 +1,61 @@
+module System.Time.Calendar
+(
+	-- time zones
+	TimeZone,
+
+	-- getting the locale time zone
+
+	-- converting times to Gregorian "calendrical" format
+	TimeOfDay,CalendarDay,CalendarTime
+
+	-- calendrical arithmetic
+    -- e.g. "one month after March 31st"
+
+	-- parsing and showing dates and times
+) where
+
+-- | count of minutes
+newtype TimeZone = MkTimeZone Int deriving (Eq,Ord,Num)
+
+
+data TimeOfDay = TimeOfDay
+{
+	todHour    :: Int,
+	todMin     :: Int,
+	todSec     :: Int,
+	todPicosec :: Integer
+} deriving (Eq,Ord)
+
+instance Show TimeOfDay where
+	show (TimeOfDay h m s ps) = 
+
+data CalendarDay = CalendarDay
+{
+	cdYear    :: Integer,
+	cdMonth   :: Int,
+	cdDay     :: Int
+} deriving (Eq,Ord)
+
+data CalendarTime = CalendarTime
+{
+	ctDay    :: CalendarDay,
+	ctTime   :: TimeOfDay
+} deriving (Eq,Ord)
+
+
+
+-- ((365 * 3 + 366) * 24 + 365 * 4) * 3 + (365 * 3 + 366) * 25
+dayToCalendar :: ModJulianDay -> CalendarDay
+dayToCalendar mjd = let
+	a = mjd + 2000	-- ?
+	quadcent = a / 146097
+	b = a % 146097
+	cent = min (b / 36524) 3
+	...to be continued
+
+
+utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
+
+calendarToUTC :: TimeZone -> CalendarTime -> UTCTime
+
+
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
new file mode 100644
index 0000000..386c920
--- /dev/null
+++ b/System/Time/Clock.hs
@@ -0,0 +1,116 @@
+{-# OPTIONS -ffi #-}
+
+module System.Time.Clock
+(
+	-- Modified Julian days and dates (for UT1)
+	ModJulianDay,ModJulianDate,
+
+	-- absolute time intervals
+	DiffTime,timeToSISeconds,siSecondsToTime,
+
+	-- UTC arithmetic
+	UTCTime(..),UTCDiffTime,utcTimeToUTCSeconds,utcSecondsToUTCTime,
+
+	-- getting the current UTC time
+	getCurrentTime
+) where
+
+import Foreign
+import Foreign.C
+
+-- | standard Julian count of Earth days
+type ModJulianDay = Integer
+
+-- | standard Julian dates for UT1, 1 = 1 day
+type ModJulianDate = Rational
+
+secondPicoseconds :: (Num a) => a
+secondPicoseconds = 1000000000000
+
+newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Show)
+
+timeToSIPicoseconds :: DiffTime -> Integer
+timeToSIPicoseconds (MkDiffTime ps) = ps
+
+siPicosecondsToTime :: Integer -> DiffTime
+siPicosecondsToTime = MkDiffTime
+
+timeToSISeconds :: (Fractional a) => DiffTime -> a
+timeToSISeconds t = fromRational ((toRational (timeToSIPicoseconds t)) / (toRational secondPicoseconds));
+
+siSecondsToTime :: (Real a) => a -> DiffTime
+siSecondsToTime t = siPicosecondsToTime (round ((toRational t) * secondPicoseconds))
+
+data UTCTime = UTCTime {
+	utctDay :: ModJulianDay,
+	utctDayTime :: DiffTime
+}
+
+newtype UTCDiffTime = MkUTCDiffTime Integer
+
+utcTimeToUTCPicoseconds :: UTCDiffTime -> Integer
+utcTimeToUTCPicoseconds (MkUTCDiffTime ps) = ps
+
+utcPicosecondsToUTCTime :: Integer -> UTCDiffTime
+utcPicosecondsToUTCTime = MkUTCDiffTime
+
+utcTimeToUTCSeconds :: (Fractional a) => UTCDiffTime -> a
+utcTimeToUTCSeconds t = fromRational ((toRational (utcTimeToUTCPicoseconds t)) / (toRational secondPicoseconds))
+
+utcSecondsToUTCTime :: (Real a) => a -> UTCDiffTime
+utcSecondsToUTCTime t = utcPicosecondsToUTCTime (round ((toRational t) * secondPicoseconds))
+
+posixDaySeconds :: (Num a) => a
+posixDaySeconds = 86400
+
+posixDayPicoseconds :: Integer
+posixDayPicoseconds = posixDaySeconds * secondPicoseconds
+
+unixEpochMJD :: ModJulianDay
+unixEpochMJD = 40587
+
+posixPicosecondsToUTCTime :: Integer -> UTCTime
+posixPicosecondsToUTCTime i = let
+	(d,t) = divMod i posixDayPicoseconds
+ in UTCTime (d + unixEpochMJD) (siPicosecondsToTime t)
+
+utcTimeToPOSIXPicoseconds :: UTCTime -> Integer
+utcTimeToPOSIXPicoseconds (UTCTime d t) =
+ ((d - unixEpochMJD) * posixDayPicoseconds) + min posixDayPicoseconds (timeToSIPicoseconds t)
+
+addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
+addUTCTime x t = posixPicosecondsToUTCTime ((utcTimeToUTCPicoseconds x) + (utcTimeToPOSIXPicoseconds t))
+
+diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
+diffUTCTime a b = utcPicosecondsToUTCTime ((utcTimeToPOSIXPicoseconds a) - (utcTimeToPOSIXPicoseconds b))
+
+
+-- Get current time
+
+data CTimeval = MkCTimeval CLong CLong
+
+ctimevalToPosixPicoseconds :: CTimeval -> Integer
+ctimevalToPosixPicoseconds (MkCTimeval s mus) = ((fromIntegral s) * 1000000 + (fromIntegral mus)) * 1000000
+
+instance Storable CTimeval where
+	sizeOf _ = (sizeOf (undefined :: CLong)) * 2
+	alignment _ = alignment (undefined :: CLong)
+	peek p = do
+		s   <- peekElemOff (castPtr p) 0
+		mus <- peekElemOff (castPtr p) 1
+		return (MkCTimeval s mus)
+	poke p (MkCTimeval s mus) = do
+		pokeElemOff (castPtr p) 0 s
+		pokeElemOff (castPtr p) 1 mus
+
+foreign import ccall unsafe "sys/time.h gettimeofday" gettimeofday :: Ptr CTimeval -> Ptr () -> IO CInt
+
+getCurrentTime :: IO UTCTime
+getCurrentTime = with (MkCTimeval 0 0) (\ptval -> do
+	result <- gettimeofday ptval nullPtr
+	if (result == 0)
+	 then do
+	 	tval <- peek ptval
+	 	return (posixPicosecondsToUTCTime (ctimevalToPosixPicoseconds tval))
+	 else fail ("error in gettimeofday: " ++ (show result))
+	)
diff --git a/System/Time/TAI.hs b/System/Time/TAI.hs
new file mode 100644
index 0000000..fb5df5a
--- /dev/null
+++ b/System/Time/TAI.hs
@@ -0,0 +1,33 @@
+-- | most people won't need this module
+module System.Time.TAI
+(
+	-- TAI arithmetic
+	AbsoluteTime,addAbsoluteTime,diffAbsoluteTime,
+
+	-- leap-second table type
+	LeapSecondTable,
+
+	-- conversion between UTC and TAI with table
+	utcDayLength,utcToTAITime,taiToUTCTime
+) where
+
+import System.Time.Clock
+
+-- | TAI
+type AbsoluteTime = MkAbsoluteTime Integer
+
+addAbsoluteTime :: DiffTime -> AbsoluteTime -> AbsoluteTime
+
+diffAbsoluteTime :: AbsoluteTime -> AbsoluteTime -> DiffTime
+
+-- | TAI - UTC during this day
+type LeapSecondTable = ModJulianDay -> Int
+
+utcDayLength :: LeapSecondTable -> ModJulianDay -> DiffTime
+utcDayLength table day = siSecondsToTime (86400 + (table (day + 1)) - (table day))
+
+utcToTAITime :: LeapSecondTable -> UTCTime -> TAITime
+utcToTAITime table (UTCTime day dtime) = siSecondsToTime (table day) + 
+
+taiToUTCTime :: LeapSecondTable -> TAITime -> UTCTime
+
diff --git a/TestTime.hs b/TestTime.hs
new file mode 100644
index 0000000..77dff58
--- /dev/null
+++ b/TestTime.hs
@@ -0,0 +1,11 @@
+module Main where
+
+import System.Time.Clock
+--import System.Time.TAI
+--import System.Time.Calendar
+
+main :: IO ()
+main = do
+	now <- getCurrentTime
+	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
+--	putStrLn (show (utcToCalendar (60 * -8) now))


From git at git.haskell.org  Sun Dec 20 07:45:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:36 +0000 (UTC)
Subject: [commit: packages/time] master: make diff times instances of Num
 (7339f64)
Message-ID: <20151220074536.B82C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7339f6490cd349867b5cb93d8a59f31a4a92c9cd

>---------------------------------------------------------------

commit 7339f6490cd349867b5cb93d8a59f31a4a92c9cd
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 23 02:28:59 2005 -0800

    make diff times instances of Num
    
    darcs-hash:20050223102859-ac6dd-24d8169a3ff6da7e55dc008515c04dc56e5e902d


>---------------------------------------------------------------

7339f6490cd349867b5cb93d8a59f31a4a92c9cd
 System/Time/Clock.hs | 36 +++++++++++++++---------------------
 1 file changed, 15 insertions(+), 21 deletions(-)

diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 386c920..628a627 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi #-}
+{-# OPTIONS -ffi -fglasgow-exts #-}
 
 module System.Time.Clock
 (
@@ -27,38 +27,32 @@ type ModJulianDate = Rational
 secondPicoseconds :: (Num a) => a
 secondPicoseconds = 1000000000000
 
-newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Show)
+newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
 
-timeToSIPicoseconds :: DiffTime -> Integer
-timeToSIPicoseconds (MkDiffTime ps) = ps
-
-siPicosecondsToTime :: Integer -> DiffTime
-siPicosecondsToTime = MkDiffTime
+instance Show DiffTime where
+	show (MkDiffTime t) = (show t) ++ "ps"
 
 timeToSISeconds :: (Fractional a) => DiffTime -> a
-timeToSISeconds t = fromRational ((toRational (timeToSIPicoseconds t)) / (toRational secondPicoseconds));
+timeToSISeconds t = fromRational ((toRational t) / (toRational secondPicoseconds));
 
 siSecondsToTime :: (Real a) => a -> DiffTime
-siSecondsToTime t = siPicosecondsToTime (round ((toRational t) * secondPicoseconds))
+siSecondsToTime t = fromInteger (round ((toRational t) * secondPicoseconds))
 
 data UTCTime = UTCTime {
 	utctDay :: ModJulianDay,
 	utctDayTime :: DiffTime
 }
 
-newtype UTCDiffTime = MkUTCDiffTime Integer
-
-utcTimeToUTCPicoseconds :: UTCDiffTime -> Integer
-utcTimeToUTCPicoseconds (MkUTCDiffTime ps) = ps
+newtype UTCDiffTime = MkUTCDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
 
-utcPicosecondsToUTCTime :: Integer -> UTCDiffTime
-utcPicosecondsToUTCTime = MkUTCDiffTime
+instance Show UTCDiffTime where
+	show (MkUTCDiffTime t) = (show t) ++ "ps"
 
 utcTimeToUTCSeconds :: (Fractional a) => UTCDiffTime -> a
-utcTimeToUTCSeconds t = fromRational ((toRational (utcTimeToUTCPicoseconds t)) / (toRational secondPicoseconds))
+utcTimeToUTCSeconds t = fromRational ((toRational t) / (toRational secondPicoseconds))
 
 utcSecondsToUTCTime :: (Real a) => a -> UTCDiffTime
-utcSecondsToUTCTime t = utcPicosecondsToUTCTime (round ((toRational t) * secondPicoseconds))
+utcSecondsToUTCTime t = fromInteger (round ((toRational t) * secondPicoseconds))
 
 posixDaySeconds :: (Num a) => a
 posixDaySeconds = 86400
@@ -72,17 +66,17 @@ unixEpochMJD = 40587
 posixPicosecondsToUTCTime :: Integer -> UTCTime
 posixPicosecondsToUTCTime i = let
 	(d,t) = divMod i posixDayPicoseconds
- in UTCTime (d + unixEpochMJD) (siPicosecondsToTime t)
+ in UTCTime (d + unixEpochMJD) (fromInteger t)
 
 utcTimeToPOSIXPicoseconds :: UTCTime -> Integer
 utcTimeToPOSIXPicoseconds (UTCTime d t) =
- ((d - unixEpochMJD) * posixDayPicoseconds) + min posixDayPicoseconds (timeToSIPicoseconds t)
+ ((d - unixEpochMJD) * posixDayPicoseconds) + min posixDayPicoseconds (toInteger t)
 
 addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
-addUTCTime x t = posixPicosecondsToUTCTime ((utcTimeToUTCPicoseconds x) + (utcTimeToPOSIXPicoseconds t))
+addUTCTime x t = posixPicosecondsToUTCTime ((toInteger x) + (utcTimeToPOSIXPicoseconds t))
 
 diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
-diffUTCTime a b = utcPicosecondsToUTCTime ((utcTimeToPOSIXPicoseconds a) - (utcTimeToPOSIXPicoseconds b))
+diffUTCTime a b = fromInteger ((utcTimeToPOSIXPicoseconds a) - (utcTimeToPOSIXPicoseconds b))
 
 
 -- Get current time


From git at git.haskell.org  Sun Dec 20 07:45:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:38 +0000 (UTC)
Subject: [commit: packages/time] master: export addUTCTime and diffUTCTime
 (3dfb0c3)
Message-ID: <20151220074538.BFBD23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3dfb0c35e8d9936bfab73a57a07bd1fcf5a70d04

>---------------------------------------------------------------

commit 3dfb0c35e8d9936bfab73a57a07bd1fcf5a70d04
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 23 02:35:17 2005 -0800

    export addUTCTime and diffUTCTime
    
    darcs-hash:20050223103517-ac6dd-7c644aba8ebbe04a96df851aef01d33e1692adfc


>---------------------------------------------------------------

3dfb0c35e8d9936bfab73a57a07bd1fcf5a70d04
 System/Time/Clock.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 628a627..9f59a8c 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -10,6 +10,7 @@ module System.Time.Clock
 
 	-- UTC arithmetic
 	UTCTime(..),UTCDiffTime,utcTimeToUTCSeconds,utcSecondsToUTCTime,
+	addUTCTime,diffUTCTime,
 
 	-- getting the current UTC time
 	getCurrentTime


From git at git.haskell.org  Sun Dec 20 07:45:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:40 +0000 (UTC)
Subject: [commit: packages/time] master: get TAI to compile (cf576d3)
Message-ID: <20151220074540.C6DF23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cf576d323e605122b337c64327ca047c999c7454

>---------------------------------------------------------------

commit cf576d323e605122b337c64327ca047c999c7454
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 23 02:48:25 2005 -0800

    get TAI to compile
    
    darcs-hash:20050223104825-ac6dd-0a3e7a4109ecca08fb312f83deca2257b815310e


>---------------------------------------------------------------

cf576d323e605122b337c64327ca047c999c7454
 System/Time/TAI.hs | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/System/Time/TAI.hs b/System/Time/TAI.hs
index fb5df5a..501f817 100644
--- a/System/Time/TAI.hs
+++ b/System/Time/TAI.hs
@@ -13,21 +13,24 @@ module System.Time.TAI
 
 import System.Time.Clock
 
--- | TAI
-type AbsoluteTime = MkAbsoluteTime Integer
+-- | TAI as DiffTime from epoch
+newtype AbsoluteTime = MkAbsoluteTime DiffTime deriving (Eq,Ord)
 
 addAbsoluteTime :: DiffTime -> AbsoluteTime -> AbsoluteTime
+addAbsoluteTime t (MkAbsoluteTime a) = MkAbsoluteTime (t + a)
 
 diffAbsoluteTime :: AbsoluteTime -> AbsoluteTime -> DiffTime
+diffAbsoluteTime (MkAbsoluteTime a) (MkAbsoluteTime b) = a - b
 
 -- | TAI - UTC during this day
-type LeapSecondTable = ModJulianDay -> Int
+type LeapSecondTable = ModJulianDay -> Integer
 
 utcDayLength :: LeapSecondTable -> ModJulianDay -> DiffTime
 utcDayLength table day = siSecondsToTime (86400 + (table (day + 1)) - (table day))
 
-utcToTAITime :: LeapSecondTable -> UTCTime -> TAITime
-utcToTAITime table (UTCTime day dtime) = siSecondsToTime (table day) + 
-
-taiToUTCTime :: LeapSecondTable -> TAITime -> UTCTime
+utcToTAITime :: LeapSecondTable -> UTCTime -> AbsoluteTime
+utcToTAITime table (UTCTime day dtime) = MkAbsoluteTime
+	((siSecondsToTime (day * 86400 + (table day))) + dtime)
 
+taiToUTCTime :: LeapSecondTable -> AbsoluteTime -> UTCTime
+taiToUTCTime table (MkAbsoluteTime t) = undefined


From git at git.haskell.org  Sun Dec 20 07:45:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:42 +0000 (UTC)
Subject: [commit: packages/time] master: clean up Makefile (cc4d5c2)
Message-ID: <20151220074542.CCB953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cc4d5c2ee1bcfc224d98a5f41054b511c5b52cfc

>---------------------------------------------------------------

commit cc4d5c2ee1bcfc224d98a5f41054b511c5b52cfc
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 23 02:58:07 2005 -0800

    clean up Makefile
    
    darcs-hash:20050223105807-ac6dd-7d333afe8a9804e06faab7a6bebf8e07ee435d9c


>---------------------------------------------------------------

cc4d5c2ee1bcfc224d98a5f41054b511c5b52cfc
 Makefile    | 18 +++++++++++++-----
 TestTime.hs |  2 +-
 2 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 4a6709f..502873c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,12 +1,19 @@
 default: TestTime.run
 
-#TestTime: TestTime.o System/Time/Clock.o System/Time/TAI.o System/Time/Calendar.o
-TestTime: TestTime.o System/Time/Clock.o
+# SRCS = System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
+SRCS = System/Time/Clock.hs System/Time/TAI.hs
+
+TestTime: TestTime.o $(patsubst %.hs,%.o,$(SRCS))
 	ghc $^ -o $@
 
 
 clean:
-	rm -f TestTime *.o *.hi System/Time/*.o System/Time/*.hi Makefile.bak
+	rm -f TestTime *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+
+
+doc: $(SRCS)
+	mkdir -p $@
+	haddock -h -o $@ $^
 
 
 %.run: %
@@ -18,13 +25,14 @@ clean:
 %.o: %.hs
 	ghc -c $< -o $@
 
-depend: TestTime.hs System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
+depend: TestTime.hs $(SRCS)
 	ghc -M $^
+
 # DO NOT DELETE: Beginning of Haskell dependencies
 TestTime.o : TestTime.hs
+TestTime.o : ./System/Time/TAI.hi
 TestTime.o : ./System/Time/Clock.hi
 System/Time/Clock.o : System/Time/Clock.hs
 System/Time/TAI.o : System/Time/TAI.hs
 System/Time/TAI.o : System/Time/Clock.hi
-System/Time/Calendar.o : System/Time/Calendar.hs
 # DO NOT DELETE: End of Haskell dependencies
diff --git a/TestTime.hs b/TestTime.hs
index 77dff58..9f7339b 100644
--- a/TestTime.hs
+++ b/TestTime.hs
@@ -1,7 +1,7 @@
 module Main where
 
 import System.Time.Clock
---import System.Time.TAI
+import System.Time.TAI
 --import System.Time.Calendar
 
 main :: IO ()


From git at git.haskell.org  Sun Dec 20 07:45:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:44 +0000 (UTC)
Subject: [commit: packages/time] master: get Calendar to compile,
 make TestTime a proper test,
 create CurrentTime to show the current time (d00d4f9)
Message-ID: <20151220074544.D4E9D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d00d4f9cbc5a05f0447ed3af9f940766641117cc

>---------------------------------------------------------------

commit d00d4f9cbc5a05f0447ed3af9f940766641117cc
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Mar 1 20:54:55 2005 -0800

    get Calendar to compile, make TestTime a proper test, create CurrentTime to show the current time
    
    darcs-hash:20050302045455-ac6dd-61bc2b00b1cbb7f174c701b8776f73b837d5cf0f


>---------------------------------------------------------------

d00d4f9cbc5a05f0447ed3af9f940766641117cc
 TestTime.hs => CurrentTime.hs |   2 +-
 Makefile                      |  24 +-
 System/Time/Calendar.hs       |  71 +++-
 TestTime.hs                   |  31 +-
 TestTime.ref                  | 754 ++++++++++++++++++++++++++++++++++++++++++
 5 files changed, 857 insertions(+), 25 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d00d4f9cbc5a05f0447ed3af9f940766641117cc

From git at git.haskell.org  Sun Dec 20 07:45:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:46 +0000 (UTC)
Subject: [commit: packages/time] master: more haddock comments,
 timezone conversion functions (3ad0923)
Message-ID: <20151220074546.DB1B63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3ad0923af5407c1bb45d6ca6ce8ba8d6614598a8

>---------------------------------------------------------------

commit 3ad0923af5407c1bb45d6ca6ce8ba8d6614598a8
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Mar 2 02:53:53 2005 -0800

    more haddock comments, timezone conversion functions
    
    darcs-hash:20050302105353-ac6dd-7e0a4765b0845ddc199bfb01fd74cb35c77fbe47


>---------------------------------------------------------------

3ad0923af5407c1bb45d6ca6ce8ba8d6614598a8
 System/Time/Calendar.hs | 22 +++++++++++++++++-----
 System/Time/Clock.hs    | 11 +++++++++--
 2 files changed, 26 insertions(+), 7 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 725398c..fa55f5a 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -1,7 +1,7 @@
 module System.Time.Calendar
 (
 	-- time zones
-	TimeZone,
+	TimeZone,timezoneToMinutes,minutesToTimezone,
 
 	-- getting the locale time zone
 
@@ -19,9 +19,14 @@ import System.Time.Clock
 import Data.Char
 
 -- | count of minutes
-newtype TimeZone = MkTimeZone Int deriving (Eq,Ord)
+newtype TimeZone = MkTimeZone {
+	timezoneToMinutes :: Int
+} deriving (Eq,Ord)
 
+minutesToTimezone :: Int -> TimeZone
+minutesToTimezone = MkTimeZone
 
+-- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
 data TimeOfDay = TimeOfDay {
 	todHour    :: Int,
 	todMin     :: Int,
@@ -47,6 +52,7 @@ showpicodecimal i = '.':(showFraction 100000000000 i)
 instance Show TimeOfDay where
 	show (TimeOfDay h m s ps) = (show2 h) ++ ":" ++ (show2 m) ++ ":" ++ (show2 s) ++ (showpicodecimal ps)
 
+-- | a year, month and day aggregate, suitable for the Gregorian calendar
 data CalendarDay = CalendarDay {
 	cdYear    :: Integer,
 	cdMonth   :: Int,
@@ -56,6 +62,7 @@ data CalendarDay = CalendarDay {
 instance Show CalendarDay where
 	show (CalendarDay y m d) = (if y > 0 then show y else (show (1 - y) ++ "BCE")) ++ "-" ++ (show2 m) ++ "-" ++ (show2 d)
 
+-- | straightforward date and time aggregate
 data CalendarTime = CalendarTime {
 	ctDay    :: CalendarDay,
 	ctTime   :: TimeOfDay
@@ -83,12 +90,17 @@ findMonthDay :: [Int] -> Int -> (Int,Int)
 findMonthDay (n:ns) yd | yd > n = (\(m,d) -> (m + 1,d)) (findMonthDay ns (yd - n))
 findMonthDay _ yd = (1,yd)
 
+
+months :: Bool -> [Int]
+months isleap = 
+	[31,if isleap then 29 else 28,31,30,31,30,31,31,30,31,30,31]
+	--J        F                   M  A  M  J  J  A  S  O  N  D
+
+-- | name the given day according to the Gregorian calendar
 dayToCalendar :: ModJulianDay -> CalendarDay
 dayToCalendar mjd = CalendarDay year month day where
 	(year,yd,isleap) = dayToYearDay mjd
-	(month,day) = findMonthDay
-		[31,if isleap then 29 else 28,31,30,31,30,31,31,30,31,30,31] yd
-		--J       F                   M  A  M  J  J  A  S  O  N  D
+	(month,day) = findMonthDay (months isleap) yd
 
 
 utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 9f59a8c..5a4825f 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -19,15 +19,17 @@ module System.Time.Clock
 import Foreign
 import Foreign.C
 
--- | standard Julian count of Earth days
+-- | standard Modified Julian Day, a count of Earth days
 type ModJulianDay = Integer
 
--- | standard Julian dates for UT1, 1 = 1 day
+-- | standard Modified Julian Date to represent UT1, 1 = 1 day
 type ModJulianDate = Rational
 
+-- | the number of picoseconds in a second
 secondPicoseconds :: (Num a) => a
 secondPicoseconds = 1000000000000
 
+-- | a length of time
 newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
 
 instance Show DiffTime where
@@ -39,11 +41,15 @@ timeToSISeconds t = fromRational ((toRational t) / (toRational secondPicoseconds
 siSecondsToTime :: (Real a) => a -> DiffTime
 siSecondsToTime t = fromInteger (round ((toRational t) * secondPicoseconds))
 
+-- | time in UTC
 data UTCTime = UTCTime {
+	-- | the day
 	utctDay :: ModJulianDay,
+	-- | the time from midnight, 0 <= t < 61s (because of leap-seconds)
 	utctDayTime :: DiffTime
 }
 
+-- | a length of time for UTC, ignoring leap-seconds
 newtype UTCDiffTime = MkUTCDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
 
 instance Show UTCDiffTime where
@@ -100,6 +106,7 @@ instance Storable CTimeval where
 
 foreign import ccall unsafe "sys/time.h gettimeofday" gettimeofday :: Ptr CTimeval -> Ptr () -> IO CInt
 
+-- | get the current time
 getCurrentTime :: IO UTCTime
 getCurrentTime = with (MkCTimeval 0 0) (\ptval -> do
 	result <- gettimeofday ptval nullPtr


From git at git.haskell.org  Sun Dec 20 07:45:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:48 +0000 (UTC)
Subject: [commit: packages/time] master: add dayToCalendar function,
 with test (266f005)
Message-ID: <20151220074548.E261E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/266f0057ecca2b00449eb0c631c6d9507b8281af

>---------------------------------------------------------------

commit 266f0057ecca2b00449eb0c631c6d9507b8281af
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Mar 2 03:12:18 2005 -0800

    add dayToCalendar function, with test
    
    darcs-hash:20050302111218-ac6dd-2efd1ae180bcf6b419cbab3f1a1876c5ed7b55c4


>---------------------------------------------------------------

266f0057ecca2b00449eb0c631c6d9507b8281af
 System/Time/Calendar.hs | 12 +++++++++++-
 TestTime.hs             |  6 +++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index fa55f5a..a3b9e5a 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -7,7 +7,7 @@ module System.Time.Calendar
 
 	-- converting times to Gregorian "calendrical" format
 	TimeOfDay,CalendarDay,CalendarTime,
-	dayToCalendar
+	dayToCalendar,calendarToDay
 
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
@@ -102,6 +102,16 @@ dayToCalendar mjd = CalendarDay year month day where
 	(year,yd,isleap) = dayToYearDay mjd
 	(month,day) = findMonthDay (months isleap) yd
 
+-- | find out which day a given Gregorian calendar day is
+calendarToDay :: CalendarDay -> ModJulianDay
+-- formula from <http://en.wikipedia.org/wiki/Julian_Day>
+calendarToDay (CalendarDay year month day) =
+	(fromIntegral day) + (div (153 * m + 2) 5) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678882 where
+	month' = fromIntegral month
+	a = div (14 - month') 12
+	y = year - a
+	m = month' + (12 * a) - 3
+
 
 utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
 utcToCalendar tz utc = undefined
diff --git a/TestTime.hs b/TestTime.hs
index d724f89..af9ceec 100644
--- a/TestTime.hs
+++ b/TestTime.hs
@@ -5,7 +5,11 @@ import System.Time.TAI
 import System.Time.Calendar
 
 showCal :: ModJulianDay -> IO ()
-showCal d = putStrLn ((show d) ++ "=" ++ show (dayToCalendar d))
+showCal d = do
+	let cal = dayToCalendar d
+	let d' = calendarToDay cal
+	putStr ((show d) ++ "=" ++ show (dayToCalendar d))
+	putStrLn (if d == d' then "" else "=" ++ (show d') ++ "!")
 
 for :: (Monad m) => (a -> m ()) -> [a] -> m ()
 for _ [] = return ()


From git at git.haskell.org  Sun Dec 20 07:45:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:50 +0000 (UTC)
Subject: [commit: packages/time] master: more calendar functions,
 plus test for UTC - Calendar conversion (70e1b39)
Message-ID: <20151220074550.E924C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/70e1b39e22c8b19ab1d8bfa128c63256f8d84a9f

>---------------------------------------------------------------

commit 70e1b39e22c8b19ab1d8bfa128c63256f8d84a9f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Mar 3 22:24:46 2005 -0800

    more calendar functions, plus test for UTC - Calendar conversion
    
    darcs-hash:20050304062446-ac6dd-51e7118d9d1d7e194bb7b0734a76ec9a3a0ebb88


>---------------------------------------------------------------

70e1b39e22c8b19ab1d8bfa128c63256f8d84a9f
 CurrentTime.hs          |  5 ++++-
 System/Time/Calendar.hs | 58 ++++++++++++++++++++++++++++++++++++++++++++-----
 System/Time/Clock.hs    |  5 ++++-
 TestTime.hs             | 21 ++++++++++++++++++
 TestTime.ref            |  6 +++++
 5 files changed, 88 insertions(+), 7 deletions(-)

diff --git a/CurrentTime.hs b/CurrentTime.hs
index aebfd6a..19e46c1 100644
--- a/CurrentTime.hs
+++ b/CurrentTime.hs
@@ -4,8 +4,11 @@ import System.Time.Clock
 import System.Time.TAI
 import System.Time.Calendar
 
+myzone :: TimeZone
+myzone = hoursToTimezone (- 8)
+
 main :: IO ()
 main = do
 	now <- getCurrentTime
 	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
---	putStrLn (show (utcToCalendar (60 * -8) now))
+	putStrLn (show (utcToCalendar myzone now))
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index a3b9e5a..60312e8 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -1,13 +1,16 @@
 module System.Time.Calendar
 (
 	-- time zones
-	TimeZone,timezoneToMinutes,minutesToTimezone,
+	TimeZone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
 
 	-- converting times to Gregorian "calendrical" format
-	TimeOfDay,CalendarDay,CalendarTime,
-	dayToCalendar,calendarToDay
+	TimeOfDay(..),CalendarDay(..),CalendarTime(..),
+	dayToCalendar,calendarToDay,
+	utcToLocalTimeOfDay,localToUTCTimeOfDay,
+	timeToTimeOfDay,timeOfDayToTime,
+	utcToCalendar,calendarToUTC
 
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
@@ -26,6 +29,13 @@ newtype TimeZone = MkTimeZone {
 minutesToTimezone :: Int -> TimeZone
 minutesToTimezone = MkTimeZone
 
+hoursToTimezone :: Int -> TimeZone
+hoursToTimezone i = minutesToTimezone (60 * i)
+
+-- | The UTC time zone
+utc :: TimeZone
+utc = minutesToTimezone 0
+
 -- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
 data TimeOfDay = TimeOfDay {
 	todHour    :: Int,
@@ -112,11 +122,49 @@ calendarToDay (CalendarDay year month day) =
 	y = year - a
 	m = month' + (12 * a) - 3
 
+-- | convert a ToD in UTC to a ToD in some timezone, together with a day adjustment
+utcToLocalTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
+utcToLocalTimeOfDay (MkTimeZone tz) (TimeOfDay h m s p) = (fromIntegral (div h' 24),TimeOfDay (mod h' 60) (mod m' 60) s p) where
+	m' = m + tz
+	h' = h + (div m' 60)
+
+-- | convert a ToD in some timezone to a ToD in UTC, together with a day adjustment
+localToUTCTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
+localToUTCTimeOfDay (MkTimeZone tz) = utcToLocalTimeOfDay (MkTimeZone (negate tz))
+
+-- note: this is also in System.Time.Clock.
+posixDaySeconds :: (Num a) => a
+posixDaySeconds = 86400
+
+posixDay :: DiffTime
+posixDay = siSecondsToTime posixDaySeconds
+
+-- | get a TimeOfDay given a time since midnight
+-- | time more than 24h will be converted to leap-seconds
+timeToTimeOfDay :: DiffTime -> TimeOfDay
+timeToTimeOfDay dt | dt >= posixDay = TimeOfDay 23 59 (60 + s) p where
+	offset = dt - posixDay
+	s = fromIntegral (div offset siSecond)
+	p = fromIntegral (mod offset siSecond)
+timeToTimeOfDay dt = TimeOfDay (fromInteger h) (fromInteger m) (fromInteger s) p where
+	p = fromIntegral (mod dt siSecond)
+	s' = fromIntegral (div dt siSecond)
+	s = mod s' 60
+	m' = div s' 60
+	m = mod m' 60
+	h = div m' 60
+
+-- | find out how much time since midnight a given TimeOfDay is
+timeOfDayToTime :: TimeOfDay -> DiffTime
+timeOfDayToTime (TimeOfDay h m s ps) = (((fromIntegral h) * 60 + (fromIntegral m)) * 60 + (fromIntegral s)) * siSecond + (fromIntegral ps)
 
 utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
-utcToCalendar tz utc = undefined
+utcToCalendar tz (UTCTime day dt) = CalendarTime (dayToCalendar (day + i)) tod where
+	(i,tod) = utcToLocalTimeOfDay tz (timeToTimeOfDay dt)
 
 calendarToUTC :: TimeZone -> CalendarTime -> UTCTime
-calendarToUTC tz cal = undefined
+calendarToUTC tz (CalendarTime cday tod) = UTCTime (day + i) (timeOfDayToTime todUTC) where
+	day = calendarToDay cday
+	(i,todUTC) = localToUTCTimeOfDay tz tod
 
 
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 5a4825f..bfc7379 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -6,7 +6,7 @@ module System.Time.Clock
 	ModJulianDay,ModJulianDate,
 
 	-- absolute time intervals
-	DiffTime,timeToSISeconds,siSecondsToTime,
+	DiffTime,siSecond,timeToSISeconds,siSecondsToTime,
 
 	-- UTC arithmetic
 	UTCTime(..),UTCDiffTime,utcTimeToUTCSeconds,utcSecondsToUTCTime,
@@ -35,6 +35,9 @@ newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
 instance Show DiffTime where
 	show (MkDiffTime t) = (show t) ++ "ps"
 
+siSecond :: DiffTime
+siSecond = secondPicoseconds
+
 timeToSISeconds :: (Fractional a) => DiffTime -> a
 timeToSISeconds t = fromRational ((toRational t) / (toRational secondPicoseconds));
 
diff --git a/TestTime.hs b/TestTime.hs
index af9ceec..104801e 100644
--- a/TestTime.hs
+++ b/TestTime.hs
@@ -11,10 +11,22 @@ showCal d = do
 	putStr ((show d) ++ "=" ++ show (dayToCalendar d))
 	putStrLn (if d == d' then "" else "=" ++ (show d') ++ "!")
 
+showUTCTime :: UTCTime -> String
+showUTCTime (UTCTime d t) =  show d ++ "," ++ show t
+
 for :: (Monad m) => (a -> m ()) -> [a] -> m ()
 for _ [] = return ()
 for f (x:xs) = f x >> for f xs
 
+myzone :: TimeZone
+myzone = hoursToTimezone (- 8)
+
+leapSec1998Cal :: CalendarTime
+leapSec1998Cal = CalendarTime (CalendarDay 1998 12 31) (TimeOfDay 23 59 60 500000000000)
+
+leapSec1998 :: UTCTime
+leapSec1998 = calendarToUTC utc leapSec1998Cal
+
 main :: IO ()
 main = do
 	showCal 0	
@@ -36,3 +48,12 @@ main = do
 	showCal 51604
 	-- years 2000 and 2001, plus some slop
 	for showCal [51540..52280]
+	--
+	putStrLn ""
+	showCal 51178
+	putStrLn (show leapSec1998Cal)
+	putStrLn (showUTCTime leapSec1998)
+	let lsMineCal = utcToCalendar myzone leapSec1998
+	putStrLn (show lsMineCal)
+	let lsMine = calendarToUTC myzone lsMineCal
+	putStrLn (showUTCTime lsMine)
diff --git a/TestTime.ref b/TestTime.ref
index c589a5d..ebe832a 100644
--- a/TestTime.ref
+++ b/TestTime.ref
@@ -752,3 +752,9 @@
 52278=2002-01-04
 52279=2002-01-05
 52280=2002-01-06
+
+51178=1998-12-31
+1998-12-31 23:59:60.5
+51178,86400500000000000ps
+1998-12-31 15:59:60.5
+51178,86400500000000000ps


From git at git.haskell.org  Sun Dec 20 07:45:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:52 +0000 (UTC)
Subject: [commit: packages/time] master: UT1 calendar functions,
 with test (49c8b0d)
Message-ID: <20151220074552.F00703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/49c8b0dd832c81ebe74516fa479bf131708e4e3b

>---------------------------------------------------------------

commit 49c8b0dd832c81ebe74516fa479bf131708e4e3b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Mar 7 15:17:45 2005 -0800

    UT1 calendar functions, with test
    
    darcs-hash:20050307231745-ac6dd-24178425239c3be3a07adedddb2914b3af72353e


>---------------------------------------------------------------

49c8b0dd832c81ebe74516fa479bf131708e4e3b
 System/Time/Calendar.hs | 26 +++++++++++++++++++--
 TestTime.hs             | 61 ++++++++++++++++++++++++++++++++++---------------
 TestTime.ref            |  7 ++++++
 3 files changed, 74 insertions(+), 20 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 60312e8..cb1862b 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -5,12 +5,17 @@ module System.Time.Calendar
 
 	-- getting the locale time zone
 
-	-- converting times to Gregorian "calendrical" format
+	-- Gregorian "calendrical" format
 	TimeOfDay(..),CalendarDay(..),CalendarTime(..),
 	dayToCalendar,calendarToDay,
+
+	-- converting UTC times to Gregorian "calendrical" format
 	utcToLocalTimeOfDay,localToUTCTimeOfDay,
 	timeToTimeOfDay,timeOfDayToTime,
-	utcToCalendar,calendarToUTC
+	utcToCalendar,calendarToUTC,
+
+	-- converting UT1 times to Gregorian "calendrical" format
+	ut1ToCalendar,calendarToUT1
 
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
@@ -167,4 +172,21 @@ calendarToUTC tz (CalendarTime cday tod) = UTCTime (day + i) (timeOfDayToTime to
 	day = calendarToDay cday
 	(i,todUTC) = localToUTCTimeOfDay tz tod
 
+-- | get a TimeOfDay given the fraction of a day since midnight
+dayFractionToTimeOfDay :: Rational -> TimeOfDay
+dayFractionToTimeOfDay df = timeToTimeOfDay (siSecondsToTime (round (df * posixDaySeconds)))
+
+-- | 1st arg is observation meridian in degrees, positive is East
+ut1ToCalendar :: Rational -> ModJulianDate -> CalendarTime
+ut1ToCalendar long date = CalendarTime (dayToCalendar localDay) (dayFractionToTimeOfDay localToDOffset) where
+	localTime = date + long / 360 :: Rational
+	localDay = floor localTime
+	localToDOffset = localTime - (fromIntegral localDay)
+
+-- | get the fraction of a day since midnight given a TimeOfDay
+timeOfDayToDayFraction :: TimeOfDay -> Rational
+timeOfDayToDayFraction tod = timeToSISeconds (timeOfDayToTime tod) / posixDaySeconds
 	
+-- | 1st arg is observation meridian in degrees, positive is East
+calendarToUT1 :: Rational -> CalendarTime -> ModJulianDate
+calendarToUT1 long (CalendarTime cday tod) = (fromIntegral (calendarToDay cday)) + (timeOfDayToDayFraction tod) - (long / 360)
diff --git a/TestTime.hs b/TestTime.hs
index 104801e..d2c47cb 100644
--- a/TestTime.hs
+++ b/TestTime.hs
@@ -11,24 +11,9 @@ showCal d = do
 	putStr ((show d) ++ "=" ++ show (dayToCalendar d))
 	putStrLn (if d == d' then "" else "=" ++ (show d') ++ "!")
 
-showUTCTime :: UTCTime -> String
-showUTCTime (UTCTime d t) =  show d ++ "," ++ show t
-
-for :: (Monad m) => (a -> m ()) -> [a] -> m ()
-for _ [] = return ()
-for f (x:xs) = f x >> for f xs
 
-myzone :: TimeZone
-myzone = hoursToTimezone (- 8)
-
-leapSec1998Cal :: CalendarTime
-leapSec1998Cal = CalendarTime (CalendarDay 1998 12 31) (TimeOfDay 23 59 60 500000000000)
-
-leapSec1998 :: UTCTime
-leapSec1998 = calendarToUTC utc leapSec1998Cal
-
-main :: IO ()
-main = do
+testCal :: IO ()
+testCal = do
 	showCal 0	
 	showCal 40000
 	showCal 50000
@@ -48,7 +33,25 @@ main = do
 	showCal 51604
 	-- years 2000 and 2001, plus some slop
 	for showCal [51540..52280]	
-	--
+
+showUTCTime :: UTCTime -> String
+showUTCTime (UTCTime d t) =  show d ++ "," ++ show t
+
+for :: (Monad m) => (a -> m ()) -> [a] -> m ()
+for _ [] = return ()
+for f (x:xs) = f x >> for f xs
+
+myzone :: TimeZone
+myzone = hoursToTimezone (- 8)
+
+leapSec1998Cal :: CalendarTime
+leapSec1998Cal = CalendarTime (CalendarDay 1998 12 31) (TimeOfDay 23 59 60 500000000000)
+
+leapSec1998 :: UTCTime
+leapSec1998 = calendarToUTC utc leapSec1998Cal
+
+testUTC :: IO ()
+testUTC = do
 	putStrLn ""
 	showCal 51178
 	putStrLn (show leapSec1998Cal)
@@ -57,3 +60,25 @@ main = do
 	putStrLn (show lsMineCal)
 	let lsMine = calendarToUTC myzone lsMineCal
 	putStrLn (showUTCTime lsMine)
+
+neglong :: Rational
+neglong = -120
+
+poslong :: Rational
+poslong = 120
+
+testUT1 :: IO ()
+testUT1 = do
+	putStrLn ""
+	putStrLn (show (ut1ToCalendar 0 51604.0))
+	putStrLn (show (ut1ToCalendar 0 51604.5))
+	putStrLn (show (ut1ToCalendar neglong 51604.0))
+	putStrLn (show (ut1ToCalendar neglong 51604.5))
+	putStrLn (show (ut1ToCalendar poslong 51604.0))
+	putStrLn (show (ut1ToCalendar poslong 51604.5))
+
+main :: IO ()
+main = do
+	testCal
+	testUTC
+	testUT1
diff --git a/TestTime.ref b/TestTime.ref
index ebe832a..0d8e12b 100644
--- a/TestTime.ref
+++ b/TestTime.ref
@@ -758,3 +758,10 @@
 51178,86400500000000000ps
 1998-12-31 15:59:60.5
 51178,86400500000000000ps
+
+2000-03-01 00:00:00
+2000-03-01 12:00:00
+2000-02-29 16:00:00
+2000-03-01 04:00:00
+2000-03-01 08:00:00
+2000-03-01 20:00:00


From git at git.haskell.org  Sun Dec 20 07:45:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:55 +0000 (UTC)
Subject: [commit: packages/time] master: clean up Makefile (b1c2cb6)
Message-ID: <20151220074555.02ACD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b1c2cb692a509647df3cc13e51aae4876dab9146

>---------------------------------------------------------------

commit b1c2cb692a509647df3cc13e51aae4876dab9146
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Mar 7 15:47:36 2005 -0800

    clean up Makefile
    
    darcs-hash:20050307234736-ac6dd-66591efb772cae81fb9bd808041e77c25388a881


>---------------------------------------------------------------

b1c2cb692a509647df3cc13e51aae4876dab9146
 Makefile | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index e957529..f96ab63 100644
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,26 @@
-default: CurrentTime.run TestTime.diff
+default: CurrentTime.run TestTime.diff doc
 
 SRCS = System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
 
-TestTime: TestTime.o $(patsubst %.hs,%.o,$(SRCS))
+TestTime: TestTime.o libTimeLib.a
 	ghc $^ -o $@
 
-CurrentTime: CurrentTime.o $(patsubst %.hs,%.o,$(SRCS))
+CurrentTime: CurrentTime.o libTimeLib.a
 	ghc $^ -o $@
 
+libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS))
+	rm -f $@
+	ar cru $@ $^
+	ranlib $@
 
 clean:
-	rm -f TestTime *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+	rm -rf TestTime doc haddock *.out *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
 
+doc: haddock/index.html
 
-doc: $(SRCS)
-	mkdir -p $@
-	haddock -h -o $@ $^
+haddock/index.html: $(SRCS)
+	mkdir -p haddock
+	haddock -h -o haddock $^
 
 %.diff: %.ref %.out
 	diff -u $^


From git at git.haskell.org  Sun Dec 20 07:45:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:57 +0000 (UTC)
Subject: [commit: packages/time] master: remove -fglasgow-exts,
 add -Wall -Werror to all library modules (8ae7ab8)
Message-ID: <20151220074557.08B593A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8ae7ab80ed7deb4e07ed2f6ddf1ce52620f3df35

>---------------------------------------------------------------

commit 8ae7ab80ed7deb4e07ed2f6ddf1ce52620f3df35
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Mar 7 17:40:33 2005 -0800

    remove -fglasgow-exts, add -Wall -Werror to all library modules
    
    darcs-hash:20050308014033-ac6dd-7894f665c98a12862a4af7de8f1eb49e2342aa26


>---------------------------------------------------------------

8ae7ab80ed7deb4e07ed2f6ddf1ce52620f3df35
 System/Time/Calendar.hs |  8 ++++---
 System/Time/Clock.hs    | 62 +++++++++++++++++++++++++++++++++++++++++++++----
 System/Time/TAI.hs      |  4 +++-
 3 files changed, 65 insertions(+), 9 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index cb1862b..552f215 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS -Wall -Werror #-}
+
 module System.Time.Calendar
 (
 	-- time zones
@@ -57,7 +59,7 @@ show2 i = let
 	_ -> s
 
 showFraction :: Integer -> Integer -> String
-showFraction d 0 = ""
+showFraction _ 0 = ""
 showFraction d i = (chr (fromInteger (48 + (div i d)))):showFraction (div d 10) (mod i d)
 
 showpicodecimal :: Integer -> String
@@ -138,7 +140,7 @@ localToUTCTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
 localToUTCTimeOfDay (MkTimeZone tz) = utcToLocalTimeOfDay (MkTimeZone (negate tz))
 
 -- note: this is also in System.Time.Clock.
-posixDaySeconds :: (Num a) => a
+posixDaySeconds :: Rational
 posixDaySeconds = 86400
 
 posixDay :: DiffTime
@@ -174,7 +176,7 @@ calendarToUTC tz (CalendarTime cday tod) = UTCTime (day + i) (timeOfDayToTime to
 
 -- | get a TimeOfDay given the fraction of a day since midnight
 dayFractionToTimeOfDay :: Rational -> TimeOfDay
-dayFractionToTimeOfDay df = timeToTimeOfDay (siSecondsToTime (round (df * posixDaySeconds)))
+dayFractionToTimeOfDay df = timeToTimeOfDay (siSecondsToTime (round (df * posixDaySeconds) :: Integer))
 
 -- | 1st arg is observation meridian in degrees, positive is East
 ut1ToCalendar :: Rational -> ModJulianDate -> CalendarTime
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index bfc7379..63540d6 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -fglasgow-exts #-}
+{-# OPTIONS -ffi -Wall -Werror #-}
 
 module System.Time.Clock
 (
@@ -30,16 +30,42 @@ secondPicoseconds :: (Num a) => a
 secondPicoseconds = 1000000000000
 
 -- | a length of time
-newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
+newtype DiffTime = MkDiffTime Integer deriving (Eq,Ord,Enum)
 
 instance Show DiffTime where
 	show (MkDiffTime t) = (show t) ++ "ps"
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Num DiffTime where
+	(MkDiffTime a) + (MkDiffTime b) = MkDiffTime (a + b)
+	(MkDiffTime a) - (MkDiffTime b) = MkDiffTime (a - b)
+	(MkDiffTime a) * (MkDiffTime b) = MkDiffTime (a * b)
+	negate (MkDiffTime a) = MkDiffTime (negate a)
+	abs (MkDiffTime a) = MkDiffTime (abs a)
+	signum (MkDiffTime a) = MkDiffTime (signum a)
+	fromInteger i = MkDiffTime (fromInteger i)
+
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Real DiffTime where
+	toRational (MkDiffTime a) = toRational a
+
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Integral DiffTime where
+	quot (MkDiffTime a) (MkDiffTime b) = MkDiffTime (quot a b)
+	rem (MkDiffTime a) (MkDiffTime b) = MkDiffTime (rem a b)
+	div (MkDiffTime a) (MkDiffTime b) = MkDiffTime (div a b)
+	mod (MkDiffTime a) (MkDiffTime b) = MkDiffTime (mod a b)
+	quotRem (MkDiffTime a) (MkDiffTime b) = (MkDiffTime p,MkDiffTime q) where
+		(p,q) = quotRem a b
+	divMod (MkDiffTime a) (MkDiffTime b) = (MkDiffTime p,MkDiffTime q) where
+		(p,q) = divMod a b
+	toInteger (MkDiffTime a) = toInteger a
+
 siSecond :: DiffTime
 siSecond = secondPicoseconds
 
 timeToSISeconds :: (Fractional a) => DiffTime -> a
-timeToSISeconds t = fromRational ((toRational t) / (toRational secondPicoseconds));
+timeToSISeconds t = fromRational ((toRational t) / secondPicoseconds);
 
 siSecondsToTime :: (Real a) => a -> DiffTime
 siSecondsToTime t = fromInteger (round ((toRational t) * secondPicoseconds))
@@ -53,13 +79,39 @@ data UTCTime = UTCTime {
 }
 
 -- | a length of time for UTC, ignoring leap-seconds
-newtype UTCDiffTime = MkUTCDiffTime Integer deriving (Eq,Ord,Num,Enum,Real,Integral)
+newtype UTCDiffTime = MkUTCDiffTime Integer deriving (Eq,Ord,Enum)
 
 instance Show UTCDiffTime where
 	show (MkUTCDiffTime t) = (show t) ++ "ps"
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Num UTCDiffTime where
+	(MkUTCDiffTime a) + (MkUTCDiffTime b) = MkUTCDiffTime (a + b)
+	(MkUTCDiffTime a) - (MkUTCDiffTime b) = MkUTCDiffTime (a - b)
+	(MkUTCDiffTime a) * (MkUTCDiffTime b) = MkUTCDiffTime (a * b)
+	negate (MkUTCDiffTime a) = MkUTCDiffTime (negate a)
+	abs (MkUTCDiffTime a) = MkUTCDiffTime (abs a)
+	signum (MkUTCDiffTime a) = MkUTCDiffTime (signum a)
+	fromInteger i = MkUTCDiffTime (fromInteger i)
+
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Real UTCDiffTime where
+	toRational (MkUTCDiffTime a) = toRational a
+
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Integral UTCDiffTime where
+	quot (MkUTCDiffTime a) (MkUTCDiffTime b) = MkUTCDiffTime (quot a b)
+	rem (MkUTCDiffTime a) (MkUTCDiffTime b) = MkUTCDiffTime (rem a b)
+	div (MkUTCDiffTime a) (MkUTCDiffTime b) = MkUTCDiffTime (div a b)
+	mod (MkUTCDiffTime a) (MkUTCDiffTime b) = MkUTCDiffTime (mod a b)
+	quotRem (MkUTCDiffTime a) (MkUTCDiffTime b) = (MkUTCDiffTime p,MkUTCDiffTime q) where
+		(p,q) = quotRem a b
+	divMod (MkUTCDiffTime a) (MkUTCDiffTime b) = (MkUTCDiffTime p,MkUTCDiffTime q) where
+		(p,q) = divMod a b
+	toInteger (MkUTCDiffTime a) = toInteger a
+
 utcTimeToUTCSeconds :: (Fractional a) => UTCDiffTime -> a
-utcTimeToUTCSeconds t = fromRational ((toRational t) / (toRational secondPicoseconds))
+utcTimeToUTCSeconds t = fromRational ((toRational t) / secondPicoseconds)
 
 utcSecondsToUTCTime :: (Real a) => a -> UTCDiffTime
 utcSecondsToUTCTime t = fromInteger (round ((toRational t) * secondPicoseconds))
diff --git a/System/Time/TAI.hs b/System/Time/TAI.hs
index 501f817..0b85db8 100644
--- a/System/Time/TAI.hs
+++ b/System/Time/TAI.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS -Wall -Werror #-}
+
 -- | most people won't need this module
 module System.Time.TAI
 (
@@ -33,4 +35,4 @@ utcToTAITime table (UTCTime day dtime) = MkAbsoluteTime
 	((siSecondsToTime (day * 86400 + (table day))) + dtime)
 
 taiToUTCTime :: LeapSecondTable -> AbsoluteTime -> UTCTime
-taiToUTCTime table (MkAbsoluteTime t) = undefined
+taiToUTCTime table (MkAbsoluteTime t) = undefined table t


From git at git.haskell.org  Sun Dec 20 07:45:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:45:59 +0000 (UTC)
Subject: [commit: packages/time] master: new Data.Fixed module with test,
 move System.Time.* to Fixed arithmetic (fd8f5d0)
Message-ID: <20151220074559.122303A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/fd8f5d0cfe55fbf4e4bfd36c594ee80e65704b98

>---------------------------------------------------------------

commit fd8f5d0cfe55fbf4e4bfd36c594ee80e65704b98
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Mar 9 01:07:08 2005 -0800

    new Data.Fixed module with test, move System.Time.* to Fixed arithmetic
    
    darcs-hash:20050309090708-ac6dd-967511e90aa27f86370e163ff42ee30950b27250


>---------------------------------------------------------------

fd8f5d0cfe55fbf4e4bfd36c594ee80e65704b98
 Data/Fixed.hs           | 118 ++++++++++++++++++++++++++++++++++++++++++++++++
 Makefile                |  17 +++++--
 System/Time/Calendar.hs |  50 ++++++++------------
 System/Time/Clock.hs    |  94 +++++++++++++-------------------------
 System/Time/TAI.hs      |   5 +-
 TestFixed.hs            |  23 ++++++++++
 TestFixed.ref           |  72 +++++++++++++++++++++++++++++
 TestTime.hs             |   2 +-
 TestTime.ref            |   4 +-
 9 files changed, 284 insertions(+), 101 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc fd8f5d0cfe55fbf4e4bfd36c594ee80e65704b98

From git at git.haskell.org  Sun Dec 20 07:46:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:01 +0000 (UTC)
Subject: [commit: packages/time] master: use realToFrac (dfadfd1)
Message-ID: <20151220074601.195073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/dfadfd12a18f2fec5bdd56e47c847a9fcfb79cb2

>---------------------------------------------------------------

commit dfadfd12a18f2fec5bdd56e47c847a9fcfb79cb2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Mar 20 22:31:44 2005 -0800

    use realToFrac
    
    darcs-hash:20050321063144-ac6dd-a67fc28e4d4dfcabaf93e5863c79e8697254d5e5


>---------------------------------------------------------------

dfadfd12a18f2fec5bdd56e47c847a9fcfb79cb2
 Data/Fixed.hs           |  6 +-----
 System/Time/Calendar.hs | 12 ++++++------
 System/Time/Clock.hs    |  8 ++++----
 System/Time/TAI.hs      |  5 ++---
 4 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/Data/Fixed.hs b/Data/Fixed.hs
index 7e90374..971a39b 100644
--- a/Data/Fixed.hs
+++ b/Data/Fixed.hs
@@ -2,7 +2,7 @@
 
 module Data.Fixed
 (
-	fromReal,div',mod',divMod',
+	div',mod',divMod',
 
 	Fixed,HasResolution(..),
 	showFixed,
@@ -10,10 +10,6 @@ module Data.Fixed
 	E12,Pico
 ) where
 
--- | similar idea to "fromIntegral"
-fromReal :: (Real a,Fractional b) => a -> b
-fromReal = fromRational . toRational
-
 -- | like "div", but with a more useful type
 div' :: (Real a,Integral b) => a -> a -> b
 div' n d = floor ((toRational n) / (toRational d))
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 9c434f6..5cc646a 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -127,7 +127,7 @@ calendarToDay (CalendarDay year month day) =
 
 -- | convert a ToD in UTC to a ToD in some timezone, together with a day adjustment
 utcToLocalTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
-utcToLocalTimeOfDay (MkTimeZone tz) (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 60) (mod m' 60) s) where
+utcToLocalTimeOfDay (MkTimeZone tz) (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 24) (mod m' 60) s) where
 	m' = m + tz
 	h' = h + (div m' 60)
 
@@ -141,9 +141,9 @@ posixDay = fromInteger 86400
 -- | get a TimeOfDay given a time since midnight
 -- | time more than 24h will be converted to leap-seconds
 timeToTimeOfDay :: DiffTime -> TimeOfDay
-timeToTimeOfDay dt | dt >= posixDay = TimeOfDay 23 59 (60 + (fromReal (dt - posixDay)))
+timeToTimeOfDay dt | dt >= posixDay = TimeOfDay 23 59 (60 + (realToFrac (dt - posixDay)))
 timeToTimeOfDay dt = TimeOfDay (fromInteger h) (fromInteger m) s where
-	s' = fromReal dt
+	s' = realToFrac dt
 	s = mod' s' 60
 	m' = div' s' 60
 	m = mod' m' 60
@@ -151,7 +151,7 @@ timeToTimeOfDay dt = TimeOfDay (fromInteger h) (fromInteger m) s where
 
 -- | find out how much time since midnight a given TimeOfDay is
 timeOfDayToTime :: TimeOfDay -> DiffTime
-timeOfDayToTime (TimeOfDay h m s) = ((fromIntegral h) * 60 + (fromIntegral m)) * 60 + (fromReal s)
+timeOfDayToTime (TimeOfDay h m s) = ((fromIntegral h) * 60 + (fromIntegral m)) * 60 + (realToFrac s)
 
 -- | show a UTC time in a given time zone as a CalendarTime
 utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
@@ -166,7 +166,7 @@ calendarToUTC tz (CalendarTime cday tod) = UTCTime (day + i) (timeOfDayToTime to
 
 -- | get a TimeOfDay given the fraction of a day since midnight
 dayFractionToTimeOfDay :: Rational -> TimeOfDay
-dayFractionToTimeOfDay df = timeToTimeOfDay (fromReal (df * 86400))
+dayFractionToTimeOfDay df = timeToTimeOfDay (realToFrac (df * 86400))
 
 -- | 1st arg is observation meridian in degrees, positive is East
 ut1ToCalendar :: Rational -> ModJulianDate -> CalendarTime
@@ -177,7 +177,7 @@ ut1ToCalendar long date = CalendarTime (dayToCalendar localDay) (dayFractionToTi
 
 -- | get the fraction of a day since midnight given a TimeOfDay
 timeOfDayToDayFraction :: TimeOfDay -> Rational
-timeOfDayToDayFraction tod = fromReal (timeOfDayToTime tod / posixDay)
+timeOfDayToDayFraction tod = realToFrac (timeOfDayToTime tod / posixDay)
 	
 -- | 1st arg is observation meridian in degrees, positive is East
 calendarToUT1 :: Rational -> CalendarTime -> ModJulianDate
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 73b9bf3..c13fb61 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -97,18 +97,18 @@ unixEpochMJD = 40587
 posixSecondsToUTCTime :: Pico -> UTCTime
 posixSecondsToUTCTime i = let
 	(d,t) = divMod' i posixDaySeconds
- in UTCTime (d + unixEpochMJD) (fromReal t)
+ in UTCTime (d + unixEpochMJD) (realToFrac t)
 
 utcTimeToPOSIXSeconds :: UTCTime -> Pico
 utcTimeToPOSIXSeconds (UTCTime d t) =
- (fromInteger (d - unixEpochMJD) * posixDaySeconds) + min posixDaySeconds (fromReal t)
+ (fromInteger (d - unixEpochMJD) * posixDaySeconds) + min posixDaySeconds (realToFrac t)
 
 
 addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
-addUTCTime x t = posixSecondsToUTCTime ((fromReal x) + (utcTimeToPOSIXSeconds t))
+addUTCTime x t = posixSecondsToUTCTime ((realToFrac x) + (utcTimeToPOSIXSeconds t))
 
 diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
-diffUTCTime a b = fromReal ((utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b))
+diffUTCTime a b = realToFrac ((utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b))
 
 
 -- Get current time
diff --git a/System/Time/TAI.hs b/System/Time/TAI.hs
index b21daa6..8cd7315 100644
--- a/System/Time/TAI.hs
+++ b/System/Time/TAI.hs
@@ -14,7 +14,6 @@ module System.Time.TAI
 ) where
 
 import System.Time.Clock
-import Data.Fixed
 
 -- | TAI as DiffTime from epoch
 newtype AbsoluteTime = MkAbsoluteTime DiffTime deriving (Eq,Ord)
@@ -29,11 +28,11 @@ diffAbsoluteTime (MkAbsoluteTime a) (MkAbsoluteTime b) = a - b
 type LeapSecondTable = ModJulianDay -> Integer
 
 utcDayLength :: LeapSecondTable -> ModJulianDay -> DiffTime
-utcDayLength table day = fromReal (86400 + (table (day + 1)) - (table day))
+utcDayLength table day = realToFrac (86400 + (table (day + 1)) - (table day))
 
 utcToTAITime :: LeapSecondTable -> UTCTime -> AbsoluteTime
 utcToTAITime table (UTCTime day dtime) = MkAbsoluteTime
-	((fromReal (day * 86400 + (table day))) + dtime)
+	((realToFrac (day * 86400 + (table day))) + dtime)
 
 taiToUTCTime :: LeapSecondTable -> AbsoluteTime -> UTCTime
 taiToUTCTime table (MkAbsoluteTime t) = undefined table t


From git at git.haskell.org  Sun Dec 20 07:46:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:03 +0000 (UTC)
Subject: [commit: packages/time] master: getCurrentTimezone,
 with test (cb6d14e)
Message-ID: <20151220074603.1F79D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cb6d14eea0baae5259775481c8b7cc0b584b1219

>---------------------------------------------------------------

commit cb6d14eea0baae5259775481c8b7cc0b584b1219
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Mar 20 22:37:22 2005 -0800

    getCurrentTimezone, with test
    
    darcs-hash:20050321063722-ac6dd-9792ff0e686b52fa1c9770058f77e6614445f6fb


>---------------------------------------------------------------

cb6d14eea0baae5259775481c8b7cc0b584b1219
 CurrentTime.hs          |  6 +++---
 Makefile                |  5 ++++-
 System/Time/Calendar.hs | 16 +++++++++++++++-
 timestuff.c             | 11 +++++++++++
 timestuff.h             |  1 +
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/CurrentTime.hs b/CurrentTime.hs
index 19e46c1..770699d 100644
--- a/CurrentTime.hs
+++ b/CurrentTime.hs
@@ -4,11 +4,11 @@ import System.Time.Clock
 import System.Time.TAI
 import System.Time.Calendar
 
-myzone :: TimeZone
-myzone = hoursToTimezone (- 8)
-
 main :: IO ()
 main = do
 	now <- getCurrentTime
 	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
+	putStrLn (show (utcToCalendar utc now))
+	myzone <- getCurrentTimezone
+	putStrLn ("timezone minutes: " ++ show (timezoneToMinutes myzone))
 	putStrLn (show (utcToCalendar myzone now))
diff --git a/Makefile b/Makefile
index 82f4d8a..e29aaa5 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,10 @@ TestTime: TestTime.o libTimeLib.a
 CurrentTime: CurrentTime.o libTimeLib.a
 	ghc $^ -o $@
 
-libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS))
+timestuff.o: timestuff.c timestuff.h
+	gcc -o $@ -c $<
+
+libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS)) timestuff.o
 	rm -f $@
 	ar cru $@ $^
 	ranlib $@
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 5cc646a..683e017 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -Wall -Werror #-}
+{-# OPTIONS -ffi -Wall -Werror #-}
 
 module System.Time.Calendar
 (
@@ -6,6 +6,7 @@ module System.Time.Calendar
 	TimeZone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
+	getCurrentTimezone,
 
 	-- Gregorian "calendrical" format
 	TimeOfDay(..),CalendarDay(..),CalendarTime(..),
@@ -29,6 +30,9 @@ import System.Time.Clock
 import Data.Fixed
 import Data.Char
 
+import Foreign
+import Foreign.C
+
 -- | count of minutes
 newtype TimeZone = MkTimeZone {
 	timezoneToMinutes :: Int
@@ -44,6 +48,16 @@ hoursToTimezone i = minutesToTimezone (60 * i)
 utc :: TimeZone
 utc = minutesToTimezone 0
 
+foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: IO CLong
+
+-- | Get the current time-zone
+getCurrentTimezone :: IO TimeZone
+getCurrentTimezone = do
+	secs <- get_current_timezone_seconds
+	case secs of
+		0x80000000 -> fail "localtime_r failed"
+		_ -> return (minutesToTimezone (div (fromIntegral secs) 60))
+
 -- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
 data TimeOfDay = TimeOfDay {
 	todHour    :: Int,
diff --git a/timestuff.c b/timestuff.c
new file mode 100644
index 0000000..79139bd
--- /dev/null
+++ b/timestuff.c
@@ -0,0 +1,11 @@
+#include <sys/time.h>
+
+long int get_current_timezone_seconds ()
+{
+	time_t t = 0;
+	struct tm tmd;
+	struct tm* ptm = localtime_r(&t,&tmd);
+	if (ptm)
+		return ptm -> tm_gmtoff;
+	else return 0x80000000;
+}
diff --git a/timestuff.h b/timestuff.h
new file mode 100644
index 0000000..f58c0f1
--- /dev/null
+++ b/timestuff.h
@@ -0,0 +1 @@
+long int get_current_timezone_seconds ();


From git at git.haskell.org  Sun Dec 20 07:46:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:05 +0000 (UTC)
Subject: [commit: packages/time] master: fix Enums to conform with Haskell 98
 (and GHC 6.4) (59ab29a)
Message-ID: <20151220074605.25B1A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/59ab29ace05cdab48bb25566f31f56d443c5fc53

>---------------------------------------------------------------

commit 59ab29ace05cdab48bb25566f31f56d443c5fc53
Author: ashley <ashley at semantic.org>
Date:   Tue Apr 12 00:02:57 2005 -0700

    fix Enums to conform with Haskell 98 (and GHC 6.4)
    
    darcs-hash:20050412070257-ca2d0-fc71ddb95a4c9ca4f6c77e5a90020d194bd814c7


>---------------------------------------------------------------

59ab29ace05cdab48bb25566f31f56d443c5fc53
 Data/Fixed.hs        | 12 +++++++++++-
 System/Time/Clock.hs | 24 ++++++++++++++++++++++--
 2 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/Data/Fixed.hs b/Data/Fixed.hs
index 971a39b..697c460 100644
--- a/Data/Fixed.hs
+++ b/Data/Fixed.hs
@@ -24,7 +24,7 @@ mod' :: (Real a) => a -> a -> a
 mod' n d = n - (fromInteger f) * d where
 	f = div' n d
 
-newtype Fixed a = MkFixed Integer deriving (Eq,Ord,Enum)
+newtype Fixed a = MkFixed Integer deriving (Eq,Ord)
 
 class HasResolution a where
 	resolution :: a -> Integer
@@ -40,6 +40,16 @@ withType foo = foo undefined
 withResolution :: (HasResolution a) => (Integer -> f a) -> f a
 withResolution foo = withType (foo . resolution)
 
+instance Enum (Fixed a) where
+	succ (MkFixed a) = MkFixed (succ a)
+	pred (MkFixed a) = MkFixed (pred a)
+	toEnum = MkFixed . toEnum
+	fromEnum (MkFixed a) = fromEnum a
+	enumFrom (MkFixed a) = fmap MkFixed (enumFrom a)
+	enumFromThen (MkFixed a) (MkFixed b) = fmap MkFixed (enumFromThen a b)
+	enumFromTo (MkFixed a) (MkFixed b) = fmap MkFixed (enumFromTo a b)
+	enumFromThenTo (MkFixed a) (MkFixed b) (MkFixed c) = fmap MkFixed (enumFromThenTo a b c)
+
 instance (HasResolution a) => Num (Fixed a) where
 	(MkFixed a) + (MkFixed b) = MkFixed (a + b)
 	(MkFixed a) - (MkFixed b) = MkFixed (a - b)
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index c13fb61..44192b5 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -28,7 +28,17 @@ type ModJulianDay = Integer
 type ModJulianDate = Rational
 
 -- | a length of time
-newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord,Enum)
+newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord)
+
+instance Enum DiffTime where
+	succ (MkDiffTime a) = MkDiffTime (succ a)
+	pred (MkDiffTime a) = MkDiffTime (pred a)
+	toEnum = MkDiffTime . toEnum
+	fromEnum (MkDiffTime a) = fromEnum a
+	enumFrom (MkDiffTime a) = fmap MkDiffTime (enumFrom a)
+	enumFromThen (MkDiffTime a) (MkDiffTime b) = fmap MkDiffTime (enumFromThen a b)
+	enumFromTo (MkDiffTime a) (MkDiffTime b) = fmap MkDiffTime (enumFromTo a b)
+	enumFromThenTo (MkDiffTime a) (MkDiffTime b) (MkDiffTime c) = fmap MkDiffTime (enumFromThenTo a b c)
 
 instance Show DiffTime where
 	show (MkDiffTime t) = (showFixed True t) ++ "s"
@@ -62,7 +72,17 @@ data UTCTime = UTCTime {
 }
 
 -- | a length of time for UTC, ignoring leap-seconds
-newtype UTCDiffTime = MkUTCDiffTime Pico deriving (Eq,Ord,Enum)
+newtype UTCDiffTime = MkUTCDiffTime Pico deriving (Eq,Ord)
+
+instance Enum UTCDiffTime where
+	succ (MkUTCDiffTime a) = MkUTCDiffTime (succ a)
+	pred (MkUTCDiffTime a) = MkUTCDiffTime (pred a)
+	toEnum = MkUTCDiffTime . toEnum
+	fromEnum (MkUTCDiffTime a) = fromEnum a
+	enumFrom (MkUTCDiffTime a) = fmap MkUTCDiffTime (enumFrom a)
+	enumFromThen (MkUTCDiffTime a) (MkUTCDiffTime b) = fmap MkUTCDiffTime (enumFromThen a b)
+	enumFromTo (MkUTCDiffTime a) (MkUTCDiffTime b) = fmap MkUTCDiffTime (enumFromTo a b)
+	enumFromThenTo (MkUTCDiffTime a) (MkUTCDiffTime b) (MkUTCDiffTime c) = fmap MkUTCDiffTime (enumFromThenTo a b c)
 
 instance Show UTCDiffTime where
 	show (MkUTCDiffTime t) = (showFixed True t) ++ "s"


From git at git.haskell.org  Sun Dec 20 07:46:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:07 +0000 (UTC)
Subject: [commit: packages/time] master: use correct time C header (0d51531)
Message-ID: <20151220074607.2CCE03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0d515313859d601ec4049d971316af1cb944928e

>---------------------------------------------------------------

commit 0d515313859d601ec4049d971316af1cb944928e
Author: ashley <ashley at semantic.org>
Date:   Tue Apr 12 00:06:58 2005 -0700

    use correct time C header
    
    darcs-hash:20050412070658-ca2d0-13155e99611adfa2e008de3b0461fde925a6b602


>---------------------------------------------------------------

0d515313859d601ec4049d971316af1cb944928e
 timestuff.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/timestuff.c b/timestuff.c
index 79139bd..24c6983 100644
--- a/timestuff.c
+++ b/timestuff.c
@@ -1,4 +1,4 @@
-#include <sys/time.h>
+#include <time.h>
 
 long int get_current_timezone_seconds ()
 {


From git at git.haskell.org  Sun Dec 20 07:46:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:09 +0000 (UTC)
Subject: [commit: packages/time] master: Makefile to clean properly (0a170a3)
Message-ID: <20151220074609.3490D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0a170a3e84eb34fdf317328e341431536b554fda

>---------------------------------------------------------------

commit 0a170a3e84eb34fdf317328e341431536b554fda
Author: ashley <ashley at semantic.org>
Date:   Thu Apr 14 00:46:18 2005 -0700

    Makefile to clean properly
    
    darcs-hash:20050414074618-ca2d0-6b5b46879ec6f176b24a30adf5aa9c699f61de06


>---------------------------------------------------------------

0a170a3e84eb34fdf317328e341431536b554fda
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e29aaa5..3a69e06 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@ libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS)) timestuff.o
 	ranlib $@
 
 clean:
-	rm -rf TestTime TestFixed doc haddock *.out *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+	rm -rf CurrentTime TestTime TestFixed doc haddock *.out *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
 
 doc: haddock/index.html
 


From git at git.haskell.org  Sun Dec 20 07:46:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:11 +0000 (UTC)
Subject: [commit: packages/time] master: convert to Cabal (a352b22)
Message-ID: <20151220074611.3B46D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a352b227681d42a535e6644688fb01a27c4793f6

>---------------------------------------------------------------

commit a352b227681d42a535e6644688fb01a27c4793f6
Author: ashley <ashley at semantic.org>
Date:   Thu Apr 14 00:47:06 2005 -0700

    convert to Cabal
    
    darcs-hash:20050414074706-ca2d0-8991cfdebe2d192385f7bc175995e0c0d5e1f750


>---------------------------------------------------------------

a352b227681d42a535e6644688fb01a27c4793f6
 Setup.hs      |  2 ++
 TimeLib.cabal | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/Setup.hs b/Setup.hs
new file mode 100644
index 0000000..9a994af
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,2 @@
+import Distribution.Simple
+main = defaultMain
diff --git a/TimeLib.cabal b/TimeLib.cabal
new file mode 100644
index 0000000..d7a8089
--- /dev/null
+++ b/TimeLib.cabal
@@ -0,0 +1,15 @@
+Name:		TimeLib
+Version:	0.1
+Stability:	Alpha
+-- unsure of best license
+License:	AllRightsReserved
+Author:		Ashley Yakeley
+Maintainer:	<ashley at semantic.org>
+Homepage:
+Category:
+Build-Depends:	base
+Synopsis:	a new time library
+Exposed-modules:	Data.Fixed, System.Time.Clock, System.Time.TAI, System.Time.Calendar
+Extensions:	ForeignFunctionInterface
+C-Sources:	timestuff.c
+


From git at git.haskell.org  Sun Dec 20 07:46:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:13 +0000 (UTC)
Subject: [commit: packages/time] master: time-zone test (3317848)
Message-ID: <20151220074613.411CD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3317848eb12ef6881bd02614dd3baf1fd9664f1e

>---------------------------------------------------------------

commit 3317848eb12ef6881bd02614dd3baf1fd9664f1e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Apr 26 00:48:29 2005 -0700

    time-zone test
    
    darcs-hash:20050426074829-ac6dd-bb8e92544838e18afe1ec6020e8fb145cfaa56e7


>---------------------------------------------------------------

3317848eb12ef6881bd02614dd3baf1fd9664f1e
 Makefile                | 12 ++++++++++--
 System/Time/Calendar.hs |  4 ++++
 TimeZone.hs             |  9 +++++++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 3a69e06..44f6935 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-default: TestFixed.diff CurrentTime.run TestTime.diff doc
+default: TestFixed.diff CurrentTime.run TestTime.diff TimeZone.diff doc
 
 SRCS = Data/Fixed.hs System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
 
@@ -11,6 +11,12 @@ TestTime: TestTime.o libTimeLib.a
 CurrentTime: CurrentTime.o libTimeLib.a
 	ghc $^ -o $@
 
+TimeZone: TimeZone.o libTimeLib.a
+	ghc $^ -o $@
+
+TimeZone.ref: FORCE
+	date +%z > $@
+
 timestuff.o: timestuff.c timestuff.h
 	gcc -o $@ -c $<
 
@@ -20,7 +26,7 @@ libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS)) timestuff.o
 	ranlib $@
 
 clean:
-	rm -rf CurrentTime TestTime TestFixed doc haddock *.out *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+	rm -rf TimeZone TimeZone.ref CurrentTime TestTime TestFixed doc haddock *.out *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
 
 doc: haddock/index.html
 
@@ -43,6 +49,8 @@ haddock/index.html: $(SRCS)
 %.o: %.hs
 	ghc -c $< -o $@
 
+FORCE:
+
 .SECONDARY:
 
 depend: TestFixed.hs CurrentTime.hs TestTime.hs $(SRCS)
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 683e017..ca10a6e 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -44,6 +44,10 @@ minutesToTimezone = MkTimeZone
 hoursToTimezone :: Int -> TimeZone
 hoursToTimezone i = minutesToTimezone (60 * i)
 
+instance Show TimeZone where
+	show (MkTimeZone t) | t < 0 = '-':(show (MkTimeZone (negate t)))
+	show (MkTimeZone t) = (show2 (div t 60)) ++ (show2 (mod t 60))
+
 -- | The UTC time zone
 utc :: TimeZone
 utc = minutesToTimezone 0
diff --git a/TimeZone.hs b/TimeZone.hs
new file mode 100644
index 0000000..3d8b8bc
--- /dev/null
+++ b/TimeZone.hs
@@ -0,0 +1,9 @@
+module Main where
+
+import System.Time.Clock
+import System.Time.Calendar
+
+main :: IO ()
+main = do
+	zone <- getCurrentTimezone
+	putStrLn (show zone)


From git at git.haskell.org  Sun Dec 20 07:46:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:15 +0000 (UTC)
Subject: [commit: packages/time] master: correct time-zone handling (066e6ee)
Message-ID: <20151220074615.488643A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/066e6ee153ebb020a34f27a23c0db05f433fc5ef

>---------------------------------------------------------------

commit 066e6ee153ebb020a34f27a23c0db05f433fc5ef
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Apr 27 01:47:46 2005 -0700

    correct time-zone handling
    
    darcs-hash:20050427084746-ac6dd-6fe841a9a26be8954affc8cc42e5f080e4b355a2


>---------------------------------------------------------------

066e6ee153ebb020a34f27a23c0db05f433fc5ef
 CurrentTime.hs          |  2 +-
 System/Time/Calendar.hs | 17 ++++++++++++-----
 System/Time/Clock.hs    | 35 ++++++++++++++++++++++++-----------
 TimeLib.cabal           |  1 -
 timestuff.c             |  5 ++---
 timestuff.h             |  4 +++-
 6 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/CurrentTime.hs b/CurrentTime.hs
index 770699d..62c88e5 100644
--- a/CurrentTime.hs
+++ b/CurrentTime.hs
@@ -10,5 +10,5 @@ main = do
 	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
 	putStrLn (show (utcToCalendar utc now))
 	myzone <- getCurrentTimezone
-	putStrLn ("timezone minutes: " ++ show (timezoneToMinutes myzone))
+	putStrLn ("timezone: " ++ show myzone)
 	putStrLn (show (utcToCalendar myzone now))
diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index ca10a6e..58f38a3 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -52,16 +52,23 @@ instance Show TimeZone where
 utc :: TimeZone
 utc = minutesToTimezone 0
 
-foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: IO CLong
+foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> IO CLong
 
--- | Get the current time-zone
-getCurrentTimezone :: IO TimeZone
-getCurrentTimezone = do
-	secs <- get_current_timezone_seconds
+posixToCTime :: POSIXTime -> CTime
+posixToCTime  = floor
+
+-- | Get the local time-zone for a given time (varying as per summertime adjustments)
+getTimezone :: UTCTime -> IO TimeZone
+getTimezone time = do
+	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time))
 	case secs of
 		0x80000000 -> fail "localtime_r failed"
 		_ -> return (minutesToTimezone (div (fromIntegral secs) 60))
 
+-- | Get the current time-zone
+getCurrentTimezone :: IO TimeZone
+getCurrentTimezone = getCurrentTime >>= getTimezone
+
 -- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
 data TimeOfDay = TimeOfDay {
 	todHour    :: Int,
diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 44192b5..2683841 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -13,7 +13,10 @@ module System.Time.Clock
 	addUTCTime,diffUTCTime,
 
 	-- getting the current UTC time
-	getCurrentTime
+	getCurrentTime,
+	
+	-- needed by System.Time.Calendar to talk to the Unix API
+	POSIXTime,posixSecondsToUTCTime,utcTimeToPOSIXSeconds
 ) where
 
 import Data.Fixed
@@ -107,36 +110,46 @@ instance Fractional UTCDiffTime where
 	recip (MkUTCDiffTime a) = MkUTCDiffTime (recip a)
 	fromRational r = MkUTCDiffTime (fromRational r)
 
-posixDaySeconds :: Pico
-posixDaySeconds = 86400
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance RealFrac UTCDiffTime where
+	properFraction (MkUTCDiffTime a) = (i,MkUTCDiffTime f) where
+		(i,f) = properFraction a
+	truncate (MkUTCDiffTime a) = truncate a
+	round (MkUTCDiffTime a) = round a
+	ceiling (MkUTCDiffTime a) = ceiling a
+	floor (MkUTCDiffTime a) = floor a
+
+posixDay :: UTCDiffTime
+posixDay = 86400
 
 unixEpochMJD :: ModJulianDay
 unixEpochMJD = 40587
 
+type POSIXTime = UTCDiffTime
 
-posixSecondsToUTCTime :: Pico -> UTCTime
+posixSecondsToUTCTime :: POSIXTime -> UTCTime
 posixSecondsToUTCTime i = let
-	(d,t) = divMod' i posixDaySeconds
+	(d,t) = divMod' i posixDay
  in UTCTime (d + unixEpochMJD) (realToFrac t)
 
-utcTimeToPOSIXSeconds :: UTCTime -> Pico
+utcTimeToPOSIXSeconds :: UTCTime -> POSIXTime
 utcTimeToPOSIXSeconds (UTCTime d t) =
- (fromInteger (d - unixEpochMJD) * posixDaySeconds) + min posixDaySeconds (realToFrac t)
+ (fromInteger (d - unixEpochMJD) * posixDay) + min posixDay (realToFrac t)
 
 
 addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
-addUTCTime x t = posixSecondsToUTCTime ((realToFrac x) + (utcTimeToPOSIXSeconds t))
+addUTCTime x t = posixSecondsToUTCTime (x + (utcTimeToPOSIXSeconds t))
 
 diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
-diffUTCTime a b = realToFrac ((utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b))
+diffUTCTime a b = (utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b)
 
 
 -- Get current time
 
 data CTimeval = MkCTimeval CLong CLong
 
-ctimevalToPosixSeconds :: CTimeval -> Pico
-ctimevalToPosixSeconds (MkCTimeval s mus) = ((fromIntegral s) + (fromIntegral mus) / 1000000)
+ctimevalToPosixSeconds :: CTimeval -> POSIXTime
+ctimevalToPosixSeconds (MkCTimeval s mus) = (fromIntegral s) + (fromIntegral mus) / 1000000
 
 instance Storable CTimeval where
 	sizeOf _ = (sizeOf (undefined :: CLong)) * 2
diff --git a/TimeLib.cabal b/TimeLib.cabal
index d7a8089..f609ac4 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,4 +12,3 @@ Synopsis:	a new time library
 Exposed-modules:	Data.Fixed, System.Time.Clock, System.Time.TAI, System.Time.Calendar
 Extensions:	ForeignFunctionInterface
 C-Sources:	timestuff.c
-
diff --git a/timestuff.c b/timestuff.c
index 24c6983..92d9fbe 100644
--- a/timestuff.c
+++ b/timestuff.c
@@ -1,8 +1,7 @@
-#include <time.h>
+#include "timestuff.h"
 
-long int get_current_timezone_seconds ()
+long int get_current_timezone_seconds (time_t t)
 {
-	time_t t = 0;
 	struct tm tmd;
 	struct tm* ptm = localtime_r(&t,&tmd);
 	if (ptm)
diff --git a/timestuff.h b/timestuff.h
index f58c0f1..534ee67 100644
--- a/timestuff.h
+++ b/timestuff.h
@@ -1 +1,3 @@
-long int get_current_timezone_seconds ();
+#include <time.h>
+
+long int get_current_timezone_seconds (time_t);


From git at git.haskell.org  Sun Dec 20 07:46:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:17 +0000 (UTC)
Subject: [commit: packages/time] master: fix posixToCTime for compile on 6.4
 (81468e1)
Message-ID: <20151220074617.4DA1E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/81468e1dd2fe06e43bdd5368f9861b5b0c541435

>---------------------------------------------------------------

commit 81468e1dd2fe06e43bdd5368f9861b5b0c541435
Author: ashley <ashley at semantic.org>
Date:   Wed Apr 27 23:02:29 2005 -0700

    fix posixToCTime for compile on 6.4
    
    darcs-hash:20050428060229-ca2d0-86daee65c2a063f72be81d04c32aa3efed47180b


>---------------------------------------------------------------

81468e1dd2fe06e43bdd5368f9861b5b0c541435
 System/Time/Calendar.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 58f38a3..97c6bac 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -55,7 +55,7 @@ utc = minutesToTimezone 0
 foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> IO CLong
 
 posixToCTime :: POSIXTime -> CTime
-posixToCTime  = floor
+posixToCTime  = fromInteger . floor
 
 -- | Get the local time-zone for a given time (varying as per summertime adjustments)
 getTimezone :: UTCTime -> IO TimeZone


From git at git.haskell.org  Sun Dec 20 07:46:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:19 +0000 (UTC)
Subject: [commit: packages/time] master: expose getTimeZone (51caf03)
Message-ID: <20151220074619.5462B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/51caf0365ac20cfb829cedb18364e6891186325e

>---------------------------------------------------------------

commit 51caf0365ac20cfb829cedb18364e6891186325e
Author: ashley <ashley at semantic.org>
Date:   Wed Apr 27 23:03:04 2005 -0700

    expose getTimeZone
    
    darcs-hash:20050428060304-ca2d0-462560f690d4a8d591fc61dcf9eacdf91618b663


>---------------------------------------------------------------

51caf0365ac20cfb829cedb18364e6891186325e
 System/Time/Calendar.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 97c6bac..828a664 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -6,7 +6,7 @@ module System.Time.Calendar
 	TimeZone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
-	getCurrentTimezone,
+	getTimezone,getCurrentTimezone,
 
 	-- Gregorian "calendrical" format
 	TimeOfDay(..),CalendarDay(..),CalendarTime(..),


From git at git.haskell.org  Sun Dec 20 07:46:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:21 +0000 (UTC)
Subject: [commit: packages/time] master: rename id to Timezone (126e42f)
Message-ID: <20151220074621.5ABA33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/126e42f0147dc3738fb5116ea1ee0062ecc91e88

>---------------------------------------------------------------

commit 126e42f0147dc3738fb5116ea1ee0062ecc91e88
Author: ashley <ashley at semantic.org>
Date:   Wed Apr 27 23:03:31 2005 -0700

    rename id to Timezone
    
    darcs-hash:20050428060331-ca2d0-3076a294d8177816b619226e48304a9b093c8cd5


>---------------------------------------------------------------

126e42f0147dc3738fb5116ea1ee0062ecc91e88
 System/Time/Calendar.hs | 34 +++++++++++++++++-----------------
 TestTime.hs             |  2 +-
 2 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 828a664..c5aea12 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -3,7 +3,7 @@
 module System.Time.Calendar
 (
 	-- time zones
-	TimeZone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
+	Timezone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
 	getTimezone,getCurrentTimezone,
@@ -34,22 +34,22 @@ import Foreign
 import Foreign.C
 
 -- | count of minutes
-newtype TimeZone = MkTimeZone {
+newtype Timezone = MkTimezone {
 	timezoneToMinutes :: Int
 } deriving (Eq,Ord)
 
-minutesToTimezone :: Int -> TimeZone
-minutesToTimezone = MkTimeZone
+minutesToTimezone :: Int -> Timezone
+minutesToTimezone = MkTimezone
 
-hoursToTimezone :: Int -> TimeZone
+hoursToTimezone :: Int -> Timezone
 hoursToTimezone i = minutesToTimezone (60 * i)
 
-instance Show TimeZone where
-	show (MkTimeZone t) | t < 0 = '-':(show (MkTimeZone (negate t)))
-	show (MkTimeZone t) = (show2 (div t 60)) ++ (show2 (mod t 60))
+instance Show Timezone where
+	show (MkTimezone t) | t < 0 = '-':(show (MkTimezone (negate t)))
+	show (MkTimezone t) = (show2 (div t 60)) ++ (show2 (mod t 60))
 
 -- | The UTC time zone
-utc :: TimeZone
+utc :: Timezone
 utc = minutesToTimezone 0
 
 foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> IO CLong
@@ -58,7 +58,7 @@ posixToCTime :: POSIXTime -> CTime
 posixToCTime  = fromInteger . floor
 
 -- | Get the local time-zone for a given time (varying as per summertime adjustments)
-getTimezone :: UTCTime -> IO TimeZone
+getTimezone :: UTCTime -> IO Timezone
 getTimezone time = do
 	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time))
 	case secs of
@@ -66,7 +66,7 @@ getTimezone time = do
 		_ -> return (minutesToTimezone (div (fromIntegral secs) 60))
 
 -- | Get the current time-zone
-getCurrentTimezone :: IO TimeZone
+getCurrentTimezone :: IO Timezone
 getCurrentTimezone = getCurrentTime >>= getTimezone
 
 -- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
@@ -151,14 +151,14 @@ calendarToDay (CalendarDay year month day) =
 	m = month' + (12 * a) - 3
 
 -- | convert a ToD in UTC to a ToD in some timezone, together with a day adjustment
-utcToLocalTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
-utcToLocalTimeOfDay (MkTimeZone tz) (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 24) (mod m' 60) s) where
+utcToLocalTimeOfDay :: Timezone -> TimeOfDay -> (Integer,TimeOfDay)
+utcToLocalTimeOfDay (MkTimezone tz) (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 24) (mod m' 60) s) where
 	m' = m + tz
 	h' = h + (div m' 60)
 
 -- | convert a ToD in some timezone to a ToD in UTC, together with a day adjustment
-localToUTCTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
-localToUTCTimeOfDay (MkTimeZone tz) = utcToLocalTimeOfDay (MkTimeZone (negate tz))
+localToUTCTimeOfDay :: Timezone -> TimeOfDay -> (Integer,TimeOfDay)
+localToUTCTimeOfDay (MkTimezone tz) = utcToLocalTimeOfDay (MkTimezone (negate tz))
 
 posixDay :: DiffTime
 posixDay = fromInteger 86400
@@ -179,12 +179,12 @@ timeOfDayToTime :: TimeOfDay -> DiffTime
 timeOfDayToTime (TimeOfDay h m s) = ((fromIntegral h) * 60 + (fromIntegral m)) * 60 + (realToFrac s)
 
 -- | show a UTC time in a given time zone as a CalendarTime
-utcToCalendar :: TimeZone -> UTCTime -> CalendarTime
+utcToCalendar :: Timezone -> UTCTime -> CalendarTime
 utcToCalendar tz (UTCTime day dt) = CalendarTime (dayToCalendar (day + i)) tod where
 	(i,tod) = utcToLocalTimeOfDay tz (timeToTimeOfDay dt)
 
 -- | find out what UTC time a given CalendarTime in a given time zone is
-calendarToUTC :: TimeZone -> CalendarTime -> UTCTime
+calendarToUTC :: Timezone -> CalendarTime -> UTCTime
 calendarToUTC tz (CalendarTime cday tod) = UTCTime (day + i) (timeOfDayToTime todUTC) where
 	day = calendarToDay cday
 	(i,todUTC) = localToUTCTimeOfDay tz tod
diff --git a/TestTime.hs b/TestTime.hs
index e4a2712..83d2141 100644
--- a/TestTime.hs
+++ b/TestTime.hs
@@ -41,7 +41,7 @@ for :: (Monad m) => (a -> m ()) -> [a] -> m ()
 for _ [] = return ()
 for f (x:xs) = f x >> for f xs
 
-myzone :: TimeZone
+myzone :: Timezone
 myzone = hoursToTimezone (- 8)
 
 leapSec1998Cal :: CalendarTime


From git at git.haskell.org  Sun Dec 20 07:46:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:23 +0000 (UTC)
Subject: [commit: packages/time] master: midnight and midday (5564e25)
Message-ID: <20151220074623.619083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5564e2557b48670109ae4ef8bc3cd1c72793ecf8

>---------------------------------------------------------------

commit 5564e2557b48670109ae4ef8bc3cd1c72793ecf8
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Apr 28 02:45:26 2005 -0700

    midnight and midday
    
    darcs-hash:20050428094526-ac6dd-6f5c7b8db227357b86d1f1c71d1e119404c7e985


>---------------------------------------------------------------

5564e2557b48670109ae4ef8bc3cd1c72793ecf8
 System/Time/Calendar.hs | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index c5aea12..fa91928 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -8,8 +8,11 @@ module System.Time.Calendar
 	-- getting the locale time zone
 	getTimezone,getCurrentTimezone,
 
+	-- TimeOfDay
+	TimeOfDay(..),midnight,midday,
+
 	-- Gregorian "calendrical" format
-	TimeOfDay(..),CalendarDay(..),CalendarTime(..),
+	CalendarDay(..),CalendarTime(..),
 	dayToCalendar,calendarToDay,
 
 	-- converting UTC times to Gregorian "calendrical" format
@@ -76,6 +79,12 @@ data TimeOfDay = TimeOfDay {
 	todSec     :: Pico
 } deriving (Eq,Ord)
 
+midnight :: TimeOfDay
+midnight = TimeOfDay 0 0 0
+
+midday :: TimeOfDay
+midday = TimeOfDay 12 0 0
+
 show2 :: Int -> String
 show2 i = let
 	s = show i in


From git at git.haskell.org  Sun Dec 20 07:46:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:25 +0000 (UTC)
Subject: [commit: packages/time] master: Eq and Ord instances for UTCTime
 (2ba76c8)
Message-ID: <20151220074625.68D853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2ba76c8d8b27054af0ed3d6e84117d4669315998

>---------------------------------------------------------------

commit 2ba76c8d8b27054af0ed3d6e84117d4669315998
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Apr 28 02:52:24 2005 -0700

    Eq and Ord instances for UTCTime
    
    darcs-hash:20050428095224-ac6dd-7134a7acb637c0b575d82a6d1e96fab36e834c5a


>---------------------------------------------------------------

2ba76c8d8b27054af0ed3d6e84117d4669315998
 System/Time/Clock.hs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index 2683841..5cb946e 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -74,6 +74,14 @@ data UTCTime = UTCTime {
 	utctDayTime :: DiffTime
 }
 
+instance Eq UTCTime where
+	(UTCTime da ta) == (UTCTime db tb) = (da == db) && (ta == tb)
+
+instance Ord UTCTime where
+	compare (UTCTime da ta) (UTCTime db tb) = case (compare da db) of
+		EQ -> compare ta tb
+		cmp -> cmp
+
 -- | a length of time for UTC, ignoring leap-seconds
 newtype UTCDiffTime = MkUTCDiffTime Pico deriving (Eq,Ord)
 


From git at git.haskell.org  Sun Dec 20 07:46:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:27 +0000 (UTC)
Subject: [commit: packages/time] master: add ShowDST test program (445ae81)
Message-ID: <20151220074627.6FDBF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/445ae81631df6ed4ab222f104783cddd2d3e4737

>---------------------------------------------------------------

commit 445ae81631df6ed4ab222f104783cddd2d3e4737
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Apr 28 03:12:16 2005 -0700

    add ShowDST test program
    
    darcs-hash:20050428101216-ac6dd-b195b5ad2f9d60f5ad650762d377d465f535a991


>---------------------------------------------------------------

445ae81631df6ed4ab222f104783cddd2d3e4737
 Makefile   |  7 ++++++-
 ShowDST.hs | 42 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 44f6935..46f48b9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-default: TestFixed.diff CurrentTime.run TestTime.diff TimeZone.diff doc
+default: test doc CurrentTime.run ShowDST.run
 
 SRCS = Data/Fixed.hs System/Time/Clock.hs System/Time/TAI.hs System/Time/Calendar.hs
 
@@ -11,6 +11,9 @@ TestTime: TestTime.o libTimeLib.a
 CurrentTime: CurrentTime.o libTimeLib.a
 	ghc $^ -o $@
 
+ShowDST: ShowDST.o libTimeLib.a
+	ghc $^ -o $@
+
 TimeZone: TimeZone.o libTimeLib.a
 	ghc $^ -o $@
 
@@ -25,6 +28,8 @@ libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS)) timestuff.o
 	ar cru $@ $^
 	ranlib $@
 
+test: TestFixed.diff TestTime.diff TimeZone.diff
+
 clean:
 	rm -rf TimeZone TimeZone.ref CurrentTime TestTime TestFixed doc haddock *.out *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
 
diff --git a/ShowDST.hs b/ShowDST.hs
new file mode 100644
index 0000000..7b2dda1
--- /dev/null
+++ b/ShowDST.hs
@@ -0,0 +1,42 @@
+module Main where
+
+import System.Time.Clock
+import System.Time.Calendar
+
+monthBeginning :: Timezone -> Integer -> Int -> UTCTime
+monthBeginning zone year month = calendarToUTC zone
+	(CalendarTime (CalendarDay year month 1) midnight)
+
+findTransition :: UTCTime -> UTCTime -> IO [(UTCTime,Timezone,Timezone)]
+findTransition a b = do
+	za <- getTimezone a
+	zb <- getTimezone b
+	if za == zb then return [] else do
+		let c = addUTCTime ((diffUTCTime b a) / 2) a
+		if a == c then return [(b,za,zb)] else do
+			tp <- findTransition a c
+			tq <- findTransition c b
+			return (tp ++ tq)
+
+showZoneTime :: Timezone -> UTCTime -> String
+showZoneTime zone time = (show (utcToCalendar zone time)) ++ " " ++ (show zone)
+
+showTransition :: (UTCTime,Timezone,Timezone) -> String
+showTransition (time,zone1,zone2) = (showZoneTime zone1 time) ++ " => " ++ (showZoneTime zone2 time)
+
+main :: IO ()
+main = do
+	now <- getCurrentTime
+	zone <- getTimezone now
+	let year = cdYear (ctDay (utcToCalendar zone now))
+	putStrLn ("DST adjustments for " ++ show year ++ ":")
+	let t0 = monthBeginning zone year 1
+	let t1 = monthBeginning zone year 4
+	let t2 = monthBeginning zone year 7
+	let t3 = monthBeginning zone year 10
+	let t4 = monthBeginning zone (year + 1) 1
+	tr1 <- findTransition t0 t1
+	tr2 <- findTransition t1 t2
+	tr3 <- findTransition t2 t3
+	tr4 <- findTransition t3 t4
+	mapM_ (putStrLn . showTransition) (tr1 ++ tr2 ++ tr3 ++ tr4)


From git at git.haskell.org  Sun Dec 20 07:46:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:29 +0000 (UTC)
Subject: [commit: packages/time] master: generalise calendar type,
 split Calendar module (78c7468)
Message-ID: <20151220074629.789C13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/78c7468a65657014621c6a1e8b2e0d38750c62db

>---------------------------------------------------------------

commit 78c7468a65657014621c6a1e8b2e0d38750c62db
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Apr 28 23:15:53 2005 -0700

    generalise calendar type, split Calendar module
    
    darcs-hash:20050429061553-ac6dd-1248b0405e1e0913b6bbf3c9abafeca5ef95f31d


>---------------------------------------------------------------

78c7468a65657014621c6a1e8b2e0d38750c62db
 CurrentTime.hs                    |   4 +-
 Makefile                          |  33 +++++-
 ShowDST.hs                        |   4 +-
 System/Time/Calendar.hs           | 222 ++------------------------------------
 System/Time/Calendar/Calendar.hs  |  64 +++++++++++
 System/Time/Calendar/Gregorian.hs |  61 +++++++++++
 System/Time/Calendar/Private.hs   |  17 +++
 System/Time/Calendar/TimeOfDay.hs |  69 ++++++++++++
 System/Time/Calendar/Timezone.hs  |  54 ++++++++++
 TestTime.hs                       |  22 ++--
 TimeLib.cabal                     |   3 +-
 11 files changed, 320 insertions(+), 233 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 78c7468a65657014621c6a1e8b2e0d38750c62db

From git at git.haskell.org  Sun Dec 20 07:46:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:31 +0000 (UTC)
Subject: [commit: packages/time] master: first attempt at formatting (with
 failing test) (2678bff)
Message-ID: <20151220074631.81BC93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2678bff94d02f6b646ce73392af6ce59d2af8aa6

>---------------------------------------------------------------

commit 2678bff94d02f6b646ce73392af6ce59d2af8aa6
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 1 01:35:54 2005 -0700

    first attempt at formatting (with failing test)
    
    darcs-hash:20050501083554-ac6dd-bd83ee2a88e471f1e5e1a828d6de6bd9e5447b7b


>---------------------------------------------------------------

2678bff94d02f6b646ce73392af6ce59d2af8aa6
 Makefile                          | 40 ++++++++++++++++----------
 System/Time/Calendar.hs           |  2 ++
 System/Time/Calendar/Calendar.hs  | 17 ++++++++---
 System/Time/Calendar/Format.hs    | 21 ++++++++++++++
 System/Time/Calendar/Gregorian.hs | 50 ++++++++++++++++++++++++++++++---
 System/Time/Calendar/Private.hs   | 13 +++++++++
 System/Time/Calendar/TimeOfDay.hs | 21 ++++++++++----
 System/Time/Calendar/Timezone.hs  | 16 +++++++----
 System/Time/Clock.hs              |  2 +-
 TestFormat.hs                     | 59 +++++++++++++++++++++++++++++++++++++++
 TestFormatStuff.c                 | 14 ++++++++++
 TestFormatStuff.h                 |  6 ++++
 TestTime.hs                       | 10 ++-----
 TimeLib.cabal                     |  2 +-
 14 files changed, 231 insertions(+), 42 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2678bff94d02f6b646ce73392af6ce59d2af8aa6

From git at git.haskell.org  Sun Dec 20 07:46:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:33 +0000 (UTC)
Subject: [commit: packages/time] master: add DST field to Timezone (471f5ea)
Message-ID: <20151220074633.882BB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/471f5ea9c67160d9740c63e6aab87a9b72c72747

>---------------------------------------------------------------

commit 471f5ea9c67160d9740c63e6aab87a9b72c72747
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 1 02:05:11 2005 -0700

    add DST field to Timezone
    
    darcs-hash:20050501090511-ac6dd-7dfe69ea72cee8b3fe4bd070dd0a1065fdd30280


>---------------------------------------------------------------

471f5ea9c67160d9740c63e6aab87a9b72c72747
 System/Time/Calendar/TimeOfDay.hs |  4 ++--
 System/Time/Calendar/Timezone.hs  | 24 ++++++++++++++----------
 TestFormat.hs                     |  6 +++---
 timestuff.c                       |  5 ++++-
 timestuff.h                       |  2 +-
 5 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/System/Time/Calendar/TimeOfDay.hs b/System/Time/Calendar/TimeOfDay.hs
index d71c334..17cdc93 100644
--- a/System/Time/Calendar/TimeOfDay.hs
+++ b/System/Time/Calendar/TimeOfDay.hs
@@ -46,12 +46,12 @@ instance FormatTime TimeOfDay where
 -- | convert a ToD in UTC to a ToD in some timezone, together with a day adjustment
 utcToLocalTimeOfDay :: Timezone -> TimeOfDay -> (Integer,TimeOfDay)
 utcToLocalTimeOfDay zone (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 24) (mod m' 60) s) where
-	m' = m + timezoneToMinutes zone
+	m' = m + timezoneMinutes zone
 	h' = h + (div m' 60)
 
 -- | convert a ToD in some timezone to a ToD in UTC, together with a day adjustment
 localToUTCTimeOfDay :: Timezone -> TimeOfDay -> (Integer,TimeOfDay)
-localToUTCTimeOfDay zone = utcToLocalTimeOfDay (minutesToTimezone (negate (timezoneToMinutes zone)))
+localToUTCTimeOfDay zone = utcToLocalTimeOfDay (minutesToTimezone (negate (timezoneMinutes zone)))
 
 posixDay :: DiffTime
 posixDay = fromInteger 86400
diff --git a/System/Time/Calendar/Timezone.hs b/System/Time/Calendar/Timezone.hs
index acfcad0..87defcd 100644
--- a/System/Time/Calendar/Timezone.hs
+++ b/System/Time/Calendar/Timezone.hs
@@ -3,7 +3,7 @@
 module System.Time.Calendar.Timezone
 (
 	-- time zones
-	Timezone,timezoneToMinutes,minutesToTimezone,hoursToTimezone,utc,
+	Timezone(..),minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
 	getTimezone,getCurrentTimezone
@@ -17,12 +17,13 @@ import Foreign
 import Foreign.C
 
 -- | count of minutes
-newtype Timezone = MkTimezone {
-	timezoneToMinutes :: Int
+data Timezone = MkTimezone {
+	timezoneDST :: Bool,
+	timezoneMinutes :: Int
 } deriving (Eq,Ord)
 
 minutesToTimezone :: Int -> Timezone
-minutesToTimezone = MkTimezone
+minutesToTimezone = MkTimezone False
 
 hoursToTimezone :: Int -> Timezone
 hoursToTimezone i = minutesToTimezone (60 * i)
@@ -31,8 +32,8 @@ showT :: Int -> String
 showT t = (show2 (div t 60)) ++ (show2 (mod t 60))
 
 instance Show Timezone where
-	show (MkTimezone t) | t < 0 = '-':(showT (negate t))
-	show (MkTimezone t) = '+':(showT t)
+	show (MkTimezone _ t) | t < 0 = '-':(showT (negate t))
+	show (MkTimezone _ t) = '+':(showT t)
 
 instance FormatTime Timezone where
 	formatCharacter _ 'z' zone = Just (show zone)
@@ -42,18 +43,21 @@ instance FormatTime Timezone where
 utc :: Timezone
 utc = minutesToTimezone 0
 
-foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> IO CLong
+foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> Ptr CInt -> IO CLong
 
 posixToCTime :: POSIXTime -> CTime
 posixToCTime  = fromInteger . floor
 
 -- | Get the local time-zone for a given time (varying as per summertime adjustments)
 getTimezone :: UTCTime -> IO Timezone
-getTimezone time = do
-	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time))
+getTimezone time = with 0 (\pdst -> do
+	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time)) pdst
 	case secs of
 		0x80000000 -> fail "localtime_r failed"
-		_ -> return (minutesToTimezone (div (fromIntegral secs) 60))
+		_ -> do
+			dst <- peek pdst
+			return (MkTimezone (dst == 1) (div (fromIntegral secs) 60))
+	)
 
 -- | Get the current time-zone
 getCurrentTimezone :: IO Timezone
diff --git a/TestFormat.hs b/TestFormat.hs
index 6675884..4d7f800 100644
--- a/TestFormat.hs
+++ b/TestFormat.hs
@@ -26,11 +26,11 @@ withBuffer n f = withArray (replicate n 0) (\buffer -> do
 
 unixFormatTime :: String -> Timezone -> UTCTime -> IO String
 unixFormatTime fmt zone time = withCString fmt (\pfmt ->
-		withBuffer 100 (\buffer -> format_time buffer 100 pfmt 0 (fromIntegral (timezoneToMinutes zone * 60)) (fromInteger (truncate (utcTimeToPOSIXSeconds time))))
+		withBuffer 100 (\buffer -> format_time buffer 100 pfmt (if timezoneDST zone then 1 else 0) (fromIntegral (timezoneMinutes zone * 60)) (fromInteger (truncate (utcTimeToPOSIXSeconds time))))
 		)
 
 locale :: TimeLocale
-locale = defaultTimeLocale
+locale = defaultTimeLocale {dateTimeFmt = "%a %b %e %H:%M:%S %Y"}
 
 zones :: [Timezone]
 zones = [utc,hoursToTimezone (- 7)]
@@ -46,7 +46,7 @@ times = [baseTime1,addUTCTime posixDay baseTime1,addUTCTime (2 * posixDay) baseT
 
 -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html
 chars :: [Char]
-chars = "aAbBcCdDehHIjmMnprRStTuUVwWxXyYZ%"
+chars = "aAbBcCdDehHIjmMnprRStTuUVwWxXyYzZ%"
 
 main :: IO ()
 main = mapM_ (\char -> let fmt = '%':char:[] in mapM_ (\time -> mapM_ (\zone -> let
diff --git a/timestuff.c b/timestuff.c
index 92d9fbe..6968a9d 100644
--- a/timestuff.c
+++ b/timestuff.c
@@ -1,10 +1,13 @@
 #include "timestuff.h"
 
-long int get_current_timezone_seconds (time_t t)
+long int get_current_timezone_seconds (time_t t,int* dst)
 {
 	struct tm tmd;
 	struct tm* ptm = localtime_r(&t,&tmd);
 	if (ptm)
+	{
+		*dst = ptm -> tm_isdst;
 		return ptm -> tm_gmtoff;
+	}
 	else return 0x80000000;
 }
diff --git a/timestuff.h b/timestuff.h
index 534ee67..6eaf614 100644
--- a/timestuff.h
+++ b/timestuff.h
@@ -1,3 +1,3 @@
 #include <time.h>
 
-long int get_current_timezone_seconds (time_t);
+long int get_current_timezone_seconds (time_t,int* dst);


From git at git.haskell.org  Sun Dec 20 07:46:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:35 +0000 (UTC)
Subject: [commit: packages/time] master: add GNU and other extensions to
 formatting (ce92c0a)
Message-ID: <20151220074635.8F7F03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ce92c0a6f8d88ab2f1aa6de6dce271b1d790ce1b

>---------------------------------------------------------------

commit ce92c0a6f8d88ab2f1aa6de6dce271b1d790ce1b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 1 05:08:16 2005 -0700

    add GNU and other extensions to formatting
    
    darcs-hash:20050501120816-ac6dd-b30e46bc30c5fae816095c2f154ea9cb5ee3c3f8


>---------------------------------------------------------------

ce92c0a6f8d88ab2f1aa6de6dce271b1d790ce1b
 System/Time/Calendar/Gregorian.hs | 12 +++++++++---
 System/Time/Calendar/TimeOfDay.hs |  7 ++++++-
 TestFormat.hs                     |  3 ++-
 3 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/System/Time/Calendar/Gregorian.hs b/System/Time/Calendar/Gregorian.hs
index 3d0dcce..b10c509 100644
--- a/System/Time/Calendar/Gregorian.hs
+++ b/System/Time/Calendar/Gregorian.hs
@@ -39,8 +39,11 @@ weekNumber day = (div (dayOfYear day) 7) + 1
 weekNumber' :: ModJulianDay -> Int
 weekNumber' day = (div (dayOfYear day) 7) + 1
 
-weekNumber'' :: ModJulianDay -> Int
-weekNumber'' day = (div (dayOfYear day) 7) + 1
+isoWeekFormat :: ModJulianDay -> (Integer,Int,Int)
+isoWeekFormat day = (y,div k 7,fromInteger (mod day 7) + 1) where
+	(year,yd,_) = dayToYearDay day
+	k = yd -- WRONG
+	y = year -- WRONG
 
 instance FormatTime GregorianDay where
 	formatCharacter locale 'a' day = Just (snd ((wDays locale) !! (weekDay (calendarToDay day))))
@@ -51,12 +54,15 @@ instance FormatTime GregorianDay where
 	formatCharacter _ 'd' (GregorianDay _ _ d) = Just (show2 d)
 	formatCharacter locale 'D' day = Just (formatTime locale "%m/%d/%y" day)
 	formatCharacter _ 'e' (GregorianDay _ _ d) = Just (show2Space d)
+	formatCharacter locale 'F' day = Just (formatTime locale "%Y-%m-%d" day)
+	formatCharacter _ 'g' day = let (y,_,_) = isoWeekFormat (calendarToDay day) in Just (show2 (fromInteger (mod y 100)))
+	formatCharacter _ 'G' day = let (y,_,_) = isoWeekFormat (calendarToDay day) in Just (show y)
 	formatCharacter locale 'h' (GregorianDay _ m _) = Just (snd ((months locale) !! (m - 1)))
 	formatCharacter _ 'j' day = Just (show3 (dayOfYear (calendarToDay day)))
 	formatCharacter _ 'm' (GregorianDay _ m _) = Just (show2 m)
 	formatCharacter _ 'u' day = Just (show (weekDay' (calendarToDay day)))
 	formatCharacter _ 'U' day = Just (show2 (weekNumber (calendarToDay day)))
-	formatCharacter _ 'V' day = Just (show2 (weekNumber'' (calendarToDay day)))
+	formatCharacter _ 'V' day = let (_,n,_) = isoWeekFormat (calendarToDay day) in Just (show2 n)
 	formatCharacter _ 'w' day = Just (show (weekDay (calendarToDay day)))
 	formatCharacter _ 'W' day = Just (show2 (weekNumber' (calendarToDay day)))
 	formatCharacter locale 'x' day = Just (formatTime locale (dateFmt locale) day)
diff --git a/System/Time/Calendar/TimeOfDay.hs b/System/Time/Calendar/TimeOfDay.hs
index 17cdc93..ba1c891 100644
--- a/System/Time/Calendar/TimeOfDay.hs
+++ b/System/Time/Calendar/TimeOfDay.hs
@@ -12,9 +12,11 @@ import System.Time.Calendar.Timezone
 import System.Time.Calendar.Format
 import System.Time.Calendar.Private
 import System.Time.Clock
-import System.Locale
 import Data.Fixed
 
+import System.Locale
+import Data.Char
+
 -- | time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day
 data TimeOfDay = TimeOfDay {
 	todHour    :: Int,
@@ -34,8 +36,11 @@ instance Show TimeOfDay where
 instance FormatTime TimeOfDay where
 	formatCharacter _ 'H' (TimeOfDay h _ _) = Just (show2 h)
 	formatCharacter _ 'I' (TimeOfDay h _ _) = Just (show2 ((mod (h - 1) 12) + 1))
+	formatCharacter _ 'k' (TimeOfDay h _ _) = Just (show2Space h)
+	formatCharacter _ 'l' (TimeOfDay h _ _) = Just (show2Space ((mod (h - 1) 12) + 1))
 	formatCharacter _ 'M' (TimeOfDay _ m _) = Just (show2 m)
 	formatCharacter locale 'p' (TimeOfDay h _ _) = Just ((if h < 12 then fst else snd) (amPm locale))
+	formatCharacter locale 'P' (TimeOfDay h _ _) = Just (map toLower ((if h < 12 then fst else snd) (amPm locale)))
 	formatCharacter locale 'r' time = Just (formatTime locale (time12Fmt locale) time)
 	formatCharacter locale 'R' time = Just (formatTime locale "%H:%M" time)
 	formatCharacter _ 'S' (TimeOfDay _ _ s) = Just (show2Fixed s)
diff --git a/TestFormat.hs b/TestFormat.hs
index 4d7f800..8534c77 100644
--- a/TestFormat.hs
+++ b/TestFormat.hs
@@ -45,8 +45,9 @@ times :: [UTCTime]
 times = [baseTime1,addUTCTime posixDay baseTime1,addUTCTime (2 * posixDay) baseTime1]
 
 -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html
+-- plus FgGklPsz
 chars :: [Char]
-chars = "aAbBcCdDehHIjmMnprRStTuUVwWxXyYzZ%"
+chars = "aAbBcCdDeFgGhHIjklmMnpPrRsStTuUVwWxXyYzZ%"
 
 main :: IO ()
 main = mapM_ (\char -> let fmt = '%':char:[] in mapM_ (\time -> mapM_ (\zone -> let


From git at git.haskell.org  Sun Dec 20 07:46:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:37 +0000 (UTC)
Subject: [commit: packages/time] master: generalise types with classes,
 introduce zoned time (1c076bc)
Message-ID: <20151220074637.96B543A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1c076bc2e6ad37b2ae5b282aed23327079c38515

>---------------------------------------------------------------

commit 1c076bc2e6ad37b2ae5b282aed23327079c38515
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 2 04:09:40 2005 -0700

    generalise types with classes, introduce zoned time
    
    darcs-hash:20050502110940-ac6dd-e290f92541cf1b0119110b49889535312f931af7


>---------------------------------------------------------------

1c076bc2e6ad37b2ae5b282aed23327079c38515
 CurrentTime.hs                    |  4 +-
 ShowDST.hs                        |  6 +--
 System/Time/Calendar/Calendar.hs  | 95 +++++++++++++++++++++++----------------
 System/Time/Calendar/Gregorian.hs | 35 ++++++++-------
 TestFormat.hs                     |  4 +-
 TestTime.hs                       | 24 +++++-----
 6 files changed, 95 insertions(+), 73 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1c076bc2e6ad37b2ae5b282aed23327079c38515

From git at git.haskell.org  Sun Dec 20 07:46:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:39 +0000 (UTC)
Subject: [commit: packages/time] master: fix for Makefile (86fca98)
Message-ID: <20151220074639.9CDAD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/86fca98754ee7a052b61dafbcac863b0abf4eac0

>---------------------------------------------------------------

commit 86fca98754ee7a052b61dafbcac863b0abf4eac0
Author: ashley <ashley at semantic.org>
Date:   Mon May 2 15:33:00 2005 -0700

    fix for Makefile
    
    darcs-hash:20050502223300-ca2d0-85d0e358de00b9468f419c2a43a87f1ad8498d5c


>---------------------------------------------------------------

86fca98754ee7a052b61dafbcac863b0abf4eac0
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index b269e58..878f7e4 100644
--- a/Makefile
+++ b/Makefile
@@ -81,6 +81,8 @@ depend: $(SRCS)
 
 TestTime.o TestFormat.o CurrentTime.o ShowDST.o TimeZone.o: $(patsubst %.hs,%.hi,$(SRCS))
 
+TestFixed.o: Data/Fixed.hi
+
 # DO NOT DELETE: Beginning of Haskell dependencies
 System/Time/Calendar/Format.o : System/Time/Calendar/Format.hs
 Data/Fixed.o : Data/Fixed.hs


From git at git.haskell.org  Sun Dec 20 07:46:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:41 +0000 (UTC)
Subject: [commit: packages/time] master: add %s format option to ZonedTime
 (18b9d5a)
Message-ID: <20151220074641.A2FB03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/18b9d5aea26a1701d120f0003fbae80b3739a577

>---------------------------------------------------------------

commit 18b9d5aea26a1701d120f0003fbae80b3739a577
Author: ashley <ashley at semantic.org>
Date:   Wed May 4 01:15:17 2005 -0700

    add %s format option to ZonedTime
    
    darcs-hash:20050504081517-ca2d0-1e7afb6180a65e6451b094468b1ae503acc8469b


>---------------------------------------------------------------

18b9d5aea26a1701d120f0003fbae80b3739a577
 System/Time/Calendar/Calendar.hs | 3 ++-
 TestFormat.hs                    | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/System/Time/Calendar/Calendar.hs b/System/Time/Calendar/Calendar.hs
index c0bc502..9283094 100644
--- a/System/Time/Calendar/Calendar.hs
+++ b/System/Time/Calendar/Calendar.hs
@@ -85,6 +85,7 @@ decodeUTC (ZonedTime t zone) = decodeLocalUTC zone t
 instance (Show t) => Show (ZonedTime t) where
 	show (ZonedTime t zone) = show t ++ " " ++ show zone
 
-instance (FormatTime t) => FormatTime (ZonedTime t) where
+instance (FormatTime t,LocalTimeEncoding t) => FormatTime (ZonedTime t) where
+	formatCharacter _ 's' zt = Just (show (truncate (utcTimeToPOSIXSeconds (decodeUTC zt)) :: Integer))
 	formatCharacter locale c (ZonedTime t zone) = 
 		melse (formatCharacter locale c t) (formatCharacter locale c zone)
diff --git a/TestFormat.hs b/TestFormat.hs
index 34c9892..e3f2728 100644
--- a/TestFormat.hs
+++ b/TestFormat.hs
@@ -38,11 +38,14 @@ zones = [utc,hoursToTimezone (- 7)]
 posixDay :: UTCDiffTime
 posixDay = 86400
 
+baseTime0 :: UTCTime
+baseTime0 = decodeLocalUTC utc (CalendarTime (GregorianDay 1970 01 01) midnight)
+
 baseTime1 :: UTCTime
 baseTime1 = decodeLocalUTC utc (CalendarTime (GregorianDay 2005 05 01) midnight)
 
 times :: [UTCTime]
-times = [baseTime1,addUTCTime posixDay baseTime1,addUTCTime (2 * posixDay) baseTime1]
+times = [baseTime0,baseTime1,addUTCTime posixDay baseTime1,addUTCTime (2 * posixDay) baseTime1]
 
 -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html
 -- plus FgGklPsz
@@ -56,5 +59,5 @@ main = mapM_ (\char -> let fmt = '%':char:[] in mapM_ (\time -> mapM_ (\zone ->
 	in do
 		unixText <- unixFormatTime fmt zone time
 		if haskellText == unixText then return () else
-			putStrLn ("Mismatch with " ++ fmt ++ " for " ++ (show ctime) ++ " " ++ (show zone) ++ ": UNIX says \"" ++ unixText ++ "\", TimeLib says \"" ++ haskellText ++ "\".")
+			putStrLn ("Mismatch with " ++ fmt ++ " for " ++ (show ctime) ++ ": UNIX says \"" ++ unixText ++ "\", TimeLib says \"" ++ haskellText ++ "\".")
 	) zones) times) chars


From git at git.haskell.org  Sun Dec 20 07:46:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:43 +0000 (UTC)
Subject: [commit: packages/time] master: add name to Timezone (d028ced)
Message-ID: <20151220074643.A9C253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d028cedc35e60de0e111a5c4318f0c41c46db52e

>---------------------------------------------------------------

commit d028cedc35e60de0e111a5c4318f0c41c46db52e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 4 04:16:42 2005 -0700

    add name to Timezone
    
    darcs-hash:20050504111642-ac6dd-aeb9239e546e584e7f6d027e7b3a70b87ea793f8


>---------------------------------------------------------------

d028cedc35e60de0e111a5c4318f0c41c46db52e
 System/Time/Calendar/Timezone.hs | 24 ++++++++++++++----------
 TestFormat.hs                    | 13 +++++++++----
 TestFormatStuff.c                |  3 ++-
 TestFormatStuff.h                |  2 +-
 timestuff.c                      |  3 ++-
 timestuff.h                      |  2 +-
 6 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/System/Time/Calendar/Timezone.hs b/System/Time/Calendar/Timezone.hs
index 87defcd..ec003dc 100644
--- a/System/Time/Calendar/Timezone.hs
+++ b/System/Time/Calendar/Timezone.hs
@@ -18,12 +18,13 @@ import Foreign.C
 
 -- | count of minutes
 data Timezone = MkTimezone {
+	timezoneMinutes :: Int,
 	timezoneDST :: Bool,
-	timezoneMinutes :: Int
+	timezoneName :: String
 } deriving (Eq,Ord)
 
 minutesToTimezone :: Int -> Timezone
-minutesToTimezone = MkTimezone False
+minutesToTimezone m = MkTimezone m False ""
 
 hoursToTimezone :: Int -> Timezone
 hoursToTimezone i = minutesToTimezone (60 * i)
@@ -32,32 +33,35 @@ showT :: Int -> String
 showT t = (show2 (div t 60)) ++ (show2 (mod t 60))
 
 instance Show Timezone where
-	show (MkTimezone _ t) | t < 0 = '-':(showT (negate t))
-	show (MkTimezone _ t) = '+':(showT t)
+	show (MkTimezone t _ _) | t < 0 = '-':(showT (negate t))
+	show (MkTimezone t _ _) = '+':(showT t)
 
 instance FormatTime Timezone where
 	formatCharacter _ 'z' zone = Just (show zone)
+	formatCharacter _ 'Z' (MkTimezone _ _ name) = Just name
 	formatCharacter _ _ _ = Nothing
 
 -- | The UTC time zone
 utc :: Timezone
-utc = minutesToTimezone 0
+utc = MkTimezone 0 False "UTC"
 
-foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> Ptr CInt -> IO CLong
+foreign import ccall unsafe "timestuff.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> Ptr CInt -> Ptr CString -> IO CLong
 
 posixToCTime :: POSIXTime -> CTime
 posixToCTime  = fromInteger . floor
 
 -- | Get the local time-zone for a given time (varying as per summertime adjustments)
 getTimezone :: UTCTime -> IO Timezone
-getTimezone time = with 0 (\pdst -> do
-	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time)) pdst
+getTimezone time = with 0 (\pdst -> with nullPtr (\pcname -> do
+	secs <- get_current_timezone_seconds (posixToCTime (utcTimeToPOSIXSeconds time)) pdst pcname
 	case secs of
 		0x80000000 -> fail "localtime_r failed"
 		_ -> do
 			dst <- peek pdst
-			return (MkTimezone (dst == 1) (div (fromIntegral secs) 60))
-	)
+			cname <- peek pcname
+			name <- peekCString cname
+			return (MkTimezone (div (fromIntegral secs) 60) (dst == 1) name)
+	))
 
 -- | Get the current time-zone
 getCurrentTimezone :: IO Timezone
diff --git a/TestFormat.hs b/TestFormat.hs
index e3f2728..21a84f7 100644
--- a/TestFormat.hs
+++ b/TestFormat.hs
@@ -16,7 +16,7 @@ import Foreign.C
 	int isdst,int gmtoff,time_t t);
 -}
 
-foreign import ccall unsafe "TestFormatStuff.h format_time" format_time :: CString -> CSize -> CString -> CInt -> CInt -> CTime -> IO CSize
+foreign import ccall unsafe "TestFormatStuff.h format_time" format_time :: CString -> CSize -> CString -> CInt -> CInt -> CString -> CTime -> IO CSize
 
 withBuffer :: Int -> (CString -> IO CSize) -> IO String
 withBuffer n f = withArray (replicate n 0) (\buffer -> do
@@ -25,9 +25,14 @@ withBuffer n f = withArray (replicate n 0) (\buffer -> do
 		)
 
 unixFormatTime :: String -> Timezone -> UTCTime -> IO String
-unixFormatTime fmt zone time = withCString fmt (\pfmt ->
-		withBuffer 100 (\buffer -> format_time buffer 100 pfmt (if timezoneDST zone then 1 else 0) (fromIntegral (timezoneMinutes zone * 60)) (fromInteger (truncate (utcTimeToPOSIXSeconds time))))
-		)
+unixFormatTime fmt zone time = withCString fmt (\pfmt -> withCString (timezoneName zone) (\pzonename ->
+		withBuffer 100 (\buffer -> format_time buffer 100 pfmt
+				(if timezoneDST zone then 1 else 0)
+				(fromIntegral (timezoneMinutes zone * 60))
+				pzonename
+				(fromInteger (truncate (utcTimeToPOSIXSeconds time)))
+			)
+		))
 
 locale :: TimeLocale
 locale = defaultTimeLocale {dateTimeFmt = "%a %b %e %H:%M:%S %Y"}
diff --git a/TestFormatStuff.c b/TestFormatStuff.c
index 8450fb5..8d314ba 100644
--- a/TestFormatStuff.c
+++ b/TestFormatStuff.c
@@ -3,12 +3,13 @@
 size_t format_time (
 	char* buffer, size_t maxsize,
 	const char* format,
-	int isdst,int gmtoff,time_t t)
+	int isdst,int gmtoff,char* zonename,time_t t)
 {
 	t += gmtoff;
 	struct tm tmd;
 	gmtime_r(&t,&tmd);
 	tmd.tm_isdst = isdst;
 	tmd.tm_gmtoff = gmtoff;
+	tmd.tm_zone = zonename;
 	return strftime(buffer,maxsize,format,&tmd);
 }
diff --git a/TestFormatStuff.h b/TestFormatStuff.h
index 5f9e853..f2f7175 100644
--- a/TestFormatStuff.h
+++ b/TestFormatStuff.h
@@ -3,4 +3,4 @@
 size_t format_time (
 	char *s, size_t maxsize,
 	const char *format,
-	int isdst,int gmtoff,time_t t);
+	int isdst,int gmtoff,char* zonename,time_t t);
diff --git a/timestuff.c b/timestuff.c
index 6968a9d..386616e 100644
--- a/timestuff.c
+++ b/timestuff.c
@@ -1,12 +1,13 @@
 #include "timestuff.h"
 
-long int get_current_timezone_seconds (time_t t,int* dst)
+long int get_current_timezone_seconds (time_t t,int* dst,char** name)
 {
 	struct tm tmd;
 	struct tm* ptm = localtime_r(&t,&tmd);
 	if (ptm)
 	{
 		*dst = ptm -> tm_isdst;
+		*name = ptm -> tm_zone;
 		return ptm -> tm_gmtoff;
 	}
 	else return 0x80000000;
diff --git a/timestuff.h b/timestuff.h
index 6eaf614..936cd84 100644
--- a/timestuff.h
+++ b/timestuff.h
@@ -1,3 +1,3 @@
 #include <time.h>
 
-long int get_current_timezone_seconds (time_t,int* dst);
+long int get_current_timezone_seconds (time_t,int* dst,char** name);


From git at git.haskell.org  Sun Dec 20 07:46:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:45 +0000 (UTC)
Subject: [commit: packages/time] master: build/test target fiddling in
 Makefile (1c01493)
Message-ID: <20151220074645.AF7AA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1c01493fa23ff52673863e7cc4f42f01f2859c73

>---------------------------------------------------------------

commit 1c01493fa23ff52673863e7cc4f42f01f2859c73
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu May 5 00:17:36 2005 -0700

    build/test target fiddling in Makefile
    
    darcs-hash:20050505071736-ac6dd-71984598fc9b9282614217eaf645e2e81fcc2a9c


>---------------------------------------------------------------

1c01493fa23ff52673863e7cc4f42f01f2859c73
 Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 878f7e4..14c6e54 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,6 @@
-default: test doc CurrentTime.run ShowDST.run
+default: build doc CurrentTime.run ShowDST.run test
+
+build: $(patsubst %.hs,%.hi,$(SRCS)) libTimeLib.a
 
 SRCS = Data/Fixed.hs \
 	System/Time/Clock.hs \


From git at git.haskell.org  Sun Dec 20 07:46:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:47 +0000 (UTC)
Subject: [commit: packages/time] master: better type for formatCharacter
 (a55e303)
Message-ID: <20151220074647.B73853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a55e3039dfa75c7d6dc7e079b869b5eeaf345ba2

>---------------------------------------------------------------

commit a55e3039dfa75c7d6dc7e079b869b5eeaf345ba2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu May 5 00:18:49 2005 -0700

    better type for formatCharacter
    
    darcs-hash:20050505071849-ac6dd-6a0365ab76ba8bb976eb8ea8537416db492a3230


>---------------------------------------------------------------

a55e3039dfa75c7d6dc7e079b869b5eeaf345ba2
 System/Time/Calendar/Calendar.hs  | 22 ++++++++++---------
 System/Time/Calendar/Format.hs    |  6 ++---
 System/Time/Calendar/Gregorian.hs | 46 +++++++++++++++++++--------------------
 System/Time/Calendar/TimeOfDay.hs | 26 +++++++++++-----------
 System/Time/Calendar/Timezone.hs  | 16 +++++++++-----
 TimeZone.hs                       |  2 +-
 6 files changed, 62 insertions(+), 56 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a55e3039dfa75c7d6dc7e079b869b5eeaf345ba2

From git at git.haskell.org  Sun Dec 20 07:46:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:49 +0000 (UTC)
Subject: [commit: packages/time] master: separate tests into dir,
 new ISOWeek and YearDay modules, pull Format code into module,
 new ConvertBack test (ffc5046)
Message-ID: <20151220074649.C26AE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ffc504663a608ba94a8242b505f39a9ba7e2eff5

>---------------------------------------------------------------

commit ffc504663a608ba94a8242b505f39a9ba7e2eff5
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 18:39:22 2005 -0700

    separate tests into dir, new ISOWeek and YearDay modules, pull Format code into module, new ConvertBack test
    
    darcs-hash:20050508013922-ac6dd-3a0e7a0e7248b710906427343fe829c0085ca815


>---------------------------------------------------------------

ffc504663a608ba94a8242b505f39a9ba7e2eff5
 Makefile                                    |  66 ++++++---------
 System/Time/Calendar.hs                     |  10 ++-
 System/Time/Calendar/Calendar.hs            |  22 +----
 System/Time/Calendar/Format.hs              | 119 ++++++++++++++++++++++++++++
 System/Time/Calendar/Gregorian.hs           |  70 +---------------
 System/Time/Calendar/ISOWeek.hs             |  36 +++++++++
 System/Time/Calendar/Private.hs             |   6 ++
 System/Time/Calendar/TimeOfDay.hs           |  19 -----
 System/Time/Calendar/Timezone.hs            |   7 +-
 System/Time/Calendar/YearDay.hs             |  36 +++++++++
 TimeLib.cabal                               |   2 +-
 test/ConvertBack.hs                         |  20 +++++
 CurrentTime.hs => test/CurrentTime.hs       |   0
 test/Makefile                               |  59 ++++++++++++++
 ShowDST.hs => test/ShowDST.hs               |   0
 TestFixed.hs => test/TestFixed.hs           |   0
 TestFixed.ref => test/TestFixed.ref         |   0
 TestFormat.hs => test/TestFormat.hs         |  47 ++++++++---
 TestFormatStuff.c => test/TestFormatStuff.c |   0
 TestFormatStuff.h => test/TestFormatStuff.h |   0
 TestTime.hs => test/TestTime.hs             |   0
 TestTime.ref => test/TestTime.ref           |   0
 TimeZone.hs => test/TimeZone.hs             |   0
 23 files changed, 352 insertions(+), 167 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ffc504663a608ba94a8242b505f39a9ba7e2eff5

From git at git.haskell.org  Sun Dec 20 07:46:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:51 +0000 (UTC)
Subject: [commit: packages/time] master: Clock documentation (622d6b5)
Message-ID: <20151220074651.C8E603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/622d6b52d402996282c403d7497215f42b117d13

>---------------------------------------------------------------

commit 622d6b52d402996282c403d7497215f42b117d13
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 8 05:10:59 2005 -0700

    Clock documentation
    
    darcs-hash:20050508121059-ac6dd-912229bbc27e18aea3168073d4976f46e7b97aa3


>---------------------------------------------------------------

622d6b52d402996282c403d7497215f42b117d13
 System/Time/Clock.hs | 41 ++++++++++++++++++++++++++++-------------
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/System/Time/Clock.hs b/System/Time/Clock.hs
index ae29dd1..5f809f1 100644
--- a/System/Time/Clock.hs
+++ b/System/Time/Clock.hs
@@ -1,21 +1,29 @@
 {-# OPTIONS -ffi -Wall -Werror #-}
 
+-- | Types and functions for UTC and UT1
 module System.Time.Clock
 (
-	-- Modified Julian days and dates (for UT1)
+	-- * Universal Time
+	-- | Time as measured by the earth.
 	ModJulianDay,ModJulianDate,
 
-	-- absolute time intervals
+	-- * Absolute intervals
 	DiffTime,
 
-	-- UTC arithmetic
+	-- * UTC
+	-- | UTC is time as measured by a clock, corrected to keep pace with the earth by adding or removing
+	-- occasional seconds, known as \"leap seconds\".
+	-- These corrections are not predictable and are announced with six month's notice.
+	-- No table of these corrections is provided, as any program compiled with it would become
+	-- out of date in six months.
 	UTCTime(..),UTCDiffTime,
 	addUTCTime,diffUTCTime,
 
-	-- getting the current UTC time
+	-- * Current time
 	getCurrentTime,
 	
-	-- needed by System.Time.Calendar to talk to the Unix API
+	-- * POSIX time
+	-- | This is needed by System.Time.Calendar to talk to the Unix API.
 	POSIXTime,posixSecondsToUTCTime,utcTimeToPOSIXSeconds
 ) where
 
@@ -24,13 +32,14 @@ import Data.Fixed
 import Foreign
 import Foreign.C
 
--- | standard Modified Julian Day, a count of Earth days
+-- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17.
 type ModJulianDay = Integer
 
--- | standard Modified Julian Date to represent UT1, 1 = 1 day
+-- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
+-- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles.
 type ModJulianDate = Rational
 
--- | a length of time
+-- | This is a length of time, as measured by a clock.
 newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord)
 
 instance Enum DiffTime where
@@ -66,11 +75,13 @@ instance Fractional DiffTime where
 	recip (MkDiffTime a) = MkDiffTime (recip a)
 	fromRational r = MkDiffTime (fromRational r)
 
--- | time in UTC
+-- | This is the simplest representation of UTC.
+-- It consists of the day number, and a time offset from midnight.
+-- Note that if a day has a leap second added to it, it will have 86401 seconds.
 data UTCTime = UTCTime {
 	-- | the day
 	utctDay :: ModJulianDay,
-	-- | the time from midnight, 0 <= t < 61s (because of leap-seconds)
+	-- | the time from midnight, 0 <= t < 86401s (because of leap-seconds)
 	utctDayTime :: DiffTime
 }
 
@@ -82,7 +93,10 @@ instance Ord UTCTime where
 		EQ -> compare ta tb
 		cmp -> cmp
 
--- | a length of time for UTC, ignoring leap-seconds
+-- | This is a length of time, as measured by UTC.
+-- It ignores leap-seconds, so it's not necessarily a fixed amount of clock time.
+-- For instance, 23:00 UTC + 2 hours of UTCDiffTime = 01:00 UTC (+ 1 day),
+-- regardless of whether a leap-second intervened.
 newtype UTCDiffTime = MkUTCDiffTime Pico deriving (Eq,Ord)
 
 instance Enum UTCDiffTime where
@@ -144,10 +158,11 @@ utcTimeToPOSIXSeconds :: UTCTime -> POSIXTime
 utcTimeToPOSIXSeconds (UTCTime d t) =
  (fromInteger (d - unixEpochMJD) * posixDay) + min posixDay (realToFrac t)
 
-
+-- | addUTCTime a b = a + b
 addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
 addUTCTime x t = posixSecondsToUTCTime (x + (utcTimeToPOSIXSeconds t))
 
+-- | diffUTCTime a b = a - b
 diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
 diffUTCTime a b = (utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b)
 
@@ -172,7 +187,7 @@ instance Storable CTimeval where
 
 foreign import ccall unsafe "time.h gettimeofday" gettimeofday :: Ptr CTimeval -> Ptr () -> IO CInt
 
--- | get the current time
+-- | Get the current UTC time from the system clock.
 getCurrentTime :: IO UTCTime
 getCurrentTime = with (MkCTimeval 0 0) (\ptval -> do
 	result <- gettimeofday ptval nullPtr


From git at git.haskell.org  Sun Dec 20 07:46:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:53 +0000 (UTC)
Subject: [commit: packages/time] master: TAI documentation (0782592)
Message-ID: <20151220074653.CEB1E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/07825921e2e187d56a1e0838ea35d13d733ffb66

>---------------------------------------------------------------

commit 07825921e2e187d56a1e0838ea35d13d733ffb66
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 8 21:08:36 2005 -0700

    TAI documentation
    
    darcs-hash:20050509040836-ac6dd-189305d5b41c695936e994099c0f6b0f5f952fbf


>---------------------------------------------------------------

07825921e2e187d56a1e0838ea35d13d733ffb66
 System/Time/TAI.hs | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/System/Time/TAI.hs b/System/Time/TAI.hs
index 8cd7315..f78eab0 100644
--- a/System/Time/TAI.hs
+++ b/System/Time/TAI.hs
@@ -1,10 +1,10 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- | most people won't need this module
+-- | TAI and leap-second tables for converting to UTC: most people won't need this module.
 module System.Time.TAI
 (
 	-- TAI arithmetic
-	AbsoluteTime,addAbsoluteTime,diffAbsoluteTime,
+	AbsoluteTime,taiEpoch,addAbsoluteTime,diffAbsoluteTime,
 
 	-- leap-second table type
 	LeapSecondTable,
@@ -15,16 +15,24 @@ module System.Time.TAI
 
 import System.Time.Clock
 
--- | TAI as DiffTime from epoch
+-- | AbsoluteTime is TAI, time as measured by a clock.
 newtype AbsoluteTime = MkAbsoluteTime DiffTime deriving (Eq,Ord)
 
+-- | The epoch of TAI, which is 
+taiEpoch :: AbsoluteTime
+taiEpoch = MkAbsoluteTime 0
+
+-- | addAbsoluteTime a b = a + b
 addAbsoluteTime :: DiffTime -> AbsoluteTime -> AbsoluteTime
 addAbsoluteTime t (MkAbsoluteTime a) = MkAbsoluteTime (t + a)
 
+-- | diffAbsoluteTime a b = a - b
 diffAbsoluteTime :: AbsoluteTime -> AbsoluteTime -> DiffTime
 diffAbsoluteTime (MkAbsoluteTime a) (MkAbsoluteTime b) = a - b
 
--- | TAI - UTC during this day
+-- | TAI - UTC during this day.
+-- No table is provided, as any program compiled with it would become
+-- out of date in six months.
 type LeapSecondTable = ModJulianDay -> Integer
 
 utcDayLength :: LeapSecondTable -> ModJulianDay -> DiffTime
@@ -35,4 +43,4 @@ utcToTAITime table (UTCTime day dtime) = MkAbsoluteTime
 	((realToFrac (day * 86400 + (table day))) + dtime)
 
 taiToUTCTime :: LeapSecondTable -> AbsoluteTime -> UTCTime
-taiToUTCTime table (MkAbsoluteTime t) = undefined table t
+taiToUTCTime table (MkAbsoluteTime t) = undefined table t -- WRONG


From git at git.haskell.org  Sun Dec 20 07:46:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:55 +0000 (UTC)
Subject: [commit: packages/time] master: test in Makefile (e12e45e)
Message-ID: <20151220074655.D61C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e12e45e5f42c7a8c1ec29576d4d9014edbf5d7cd

>---------------------------------------------------------------

commit e12e45e5f42c7a8c1ec29576d4d9014edbf5d7cd
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 8 21:12:05 2005 -0700

    test in Makefile
    
    darcs-hash:20050509041205-ac6dd-5390ff04e98e6c097dedbafd1a1c72833014de83


>---------------------------------------------------------------

e12e45e5f42c7a8c1ec29576d4d9014edbf5d7cd
 Makefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Makefile b/Makefile
index e94c52d..c6c6b0b 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,9 @@ default: build doc
 
 build: $(patsubst %.hs,%.hi,$(SRCS)) libTimeLib.a
 
+test: build
+	cd test && make
+
 SRCS = Data/Fixed.hs \
 	System/Time/Clock.hs \
 	System/Time/TAI.hs \


From git at git.haskell.org  Sun Dec 20 07:46:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:57 +0000 (UTC)
Subject: [commit: packages/time] master: fix decodeDay in ISOWeek,
 with improved ConvertBack test (899a104)
Message-ID: <20151220074657.DCBA33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/899a1047cf6940d1378dcc6efac9b987152ddae9

>---------------------------------------------------------------

commit 899a1047cf6940d1378dcc6efac9b987152ddae9
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 8 21:37:46 2005 -0700

    fix decodeDay in ISOWeek, with improved ConvertBack test
    
    darcs-hash:20050509043746-ac6dd-de2745bf5dcba79c8a2e1600b9e9d2a4564d9ae7


>---------------------------------------------------------------

899a1047cf6940d1378dcc6efac9b987152ddae9
 System/Time/Calendar/ISOWeek.hs |  5 +++--
 test/ConvertBack.hs             | 25 ++++++++++++++++++-------
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/System/Time/Calendar/ISOWeek.hs b/System/Time/Calendar/ISOWeek.hs
index 9126ac9..e6412e4 100644
--- a/System/Time/Calendar/ISOWeek.hs
+++ b/System/Time/Calendar/ISOWeek.hs
@@ -21,7 +21,7 @@ instance DayEncoding ISOWeek where
 		(YearDay y0 yd) = encodeDay mjd
 		d = mjd + 2
 		foo :: Integer -> Integer
-		foo y = bar (decodeDay (YearDay y 4) + 2)
+		foo y = bar (decodeDay (YearDay y 6))
 		bar k = (div d 7) - (div k 7)
 		w0 = bar (d - (toInteger yd) + 4)
 		(y1,w1) = if w0 == -1
@@ -32,5 +32,6 @@ instance DayEncoding ISOWeek where
 				else (y0,w0)
 			else (y0,w0)
 
-	decodeDay (ISOWeek _ _ _) = undefined -- WRONG
+	decodeDay (ISOWeek y w d) = k - (mod k 7) + (toInteger ((w * 7) + d)) - 10 where
+		k = decodeDay (YearDay y 6)
 	maybeDecodeDay = Just . decodeDay -- WRONG
diff --git a/test/ConvertBack.hs b/test/ConvertBack.hs
index da3bf3e..5b4968d 100644
--- a/test/ConvertBack.hs
+++ b/test/ConvertBack.hs
@@ -5,16 +5,27 @@ module Main where
 import System.Time.Calendar
 import System.Time.Clock
 
-checkDay :: ModJulianDay -> IO ()
-checkDay day = do
-	let st = encodeDay day :: YearDay
+checkDay :: (DayEncoding t,Show t) => t -> ModJulianDay -> IO ()
+checkDay t day = do
+	let st = encodeDay' t day
 	let day' = decodeDay st
 	if day /= day'
-	 then putStrLn ((show day) ++ " -> " ++ (show st) ++ " -> " ++ (show day'))
+	 then putStrLn ((show day) ++ " -> " ++ (show st) ++ " -> " ++ (show day') ++ " (diff " ++ (show (day' - day)) ++ ")")
 	 else return ()
+	where
+		encodeDay' :: (DayEncoding t,Show t) => t -> ModJulianDay -> t
+		encodeDay' _ = encodeDay
 
+checkers :: [ModJulianDay -> IO ()]
+checkers = [
+	checkDay (undefined :: YearDay),
+	checkDay (undefined :: ISOWeek),
+	checkDay (undefined :: GregorianDay)
+	]
+
+days :: [ModJulianDay]
+days = [50000..50200] ++
+	(fmap (\year -> (decodeDay (GregorianDay year 1 4))) [1980..2000])
 
 main :: IO ()
-main = do
-	mapM_ checkDay [50000..50200]
-	mapM_ (\year -> checkDay (decodeDay (GregorianDay year 1 4))) [1980..2000]
+main = mapM_ (\ch -> mapM_ ch days) checkers


From git at git.haskell.org  Sun Dec 20 07:46:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:46:59 +0000 (UTC)
Subject: [commit: packages/time] master: remove maybeDecodeDay (7ece834)
Message-ID: <20151220074659.E45B33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7ece8344e900e08a360e85c610f3160303f47887

>---------------------------------------------------------------

commit 7ece8344e900e08a360e85c610f3160303f47887
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 9 01:24:16 2005 -0700

    remove maybeDecodeDay
    
    darcs-hash:20050509082416-ac6dd-891eb8f17253072739f7852627b2a9de76a855c0


>---------------------------------------------------------------

7ece8344e900e08a360e85c610f3160303f47887
 System/Time/Calendar/Calendar.hs  | 4 ----
 System/Time/Calendar/Gregorian.hs | 1 -
 System/Time/Calendar/ISOWeek.hs   | 1 -
 System/Time/Calendar/YearDay.hs   | 2 --
 4 files changed, 8 deletions(-)

diff --git a/System/Time/Calendar/Calendar.hs b/System/Time/Calendar/Calendar.hs
index 060e43a..77f30d2 100644
--- a/System/Time/Calendar/Calendar.hs
+++ b/System/Time/Calendar/Calendar.hs
@@ -14,19 +14,15 @@ module System.Time.Calendar.Calendar
 import System.Time.Calendar.TimeOfDay
 import System.Time.Calendar.Timezone
 import System.Time.Clock
-import Data.Maybe
 
 class (Eq d) => DayEncoding d where
 	-- | name the given day according to the calendar
 	encodeDay :: ModJulianDay -> d
 	-- | find out which day a given calendar day is
-	maybeDecodeDay :: d -> Maybe ModJulianDay
 	decodeDay :: d -> ModJulianDay
-	decodeDay day = fromMaybe (error "invalid day") (maybeDecodeDay day)
 
 instance DayEncoding ModJulianDay where
 	encodeDay = id
-	maybeDecodeDay = Just
 	decodeDay = id
 
 class (Eq t) => LocalTimeEncoding t where
diff --git a/System/Time/Calendar/Gregorian.hs b/System/Time/Calendar/Gregorian.hs
index 4422ce1..fa9b89c 100644
--- a/System/Time/Calendar/Gregorian.hs
+++ b/System/Time/Calendar/Gregorian.hs
@@ -47,4 +47,3 @@ instance DayEncoding GregorianDay where
 		a = div (14 - month') 12
 		y = year - a
 		m = month' + (12 * a) - 3
-	maybeDecodeDay = Just . decodeDay -- WRONG
diff --git a/System/Time/Calendar/ISOWeek.hs b/System/Time/Calendar/ISOWeek.hs
index e6412e4..2390f01 100644
--- a/System/Time/Calendar/ISOWeek.hs
+++ b/System/Time/Calendar/ISOWeek.hs
@@ -34,4 +34,3 @@ instance DayEncoding ISOWeek where
 
 	decodeDay (ISOWeek y w d) = k - (mod k 7) + (toInteger ((w * 7) + d)) - 10 where
 		k = decodeDay (YearDay y 6)
-	maybeDecodeDay = Just . decodeDay -- WRONG
diff --git a/System/Time/Calendar/YearDay.hs b/System/Time/Calendar/YearDay.hs
index d9ecf53..556c913 100644
--- a/System/Time/Calendar/YearDay.hs
+++ b/System/Time/Calendar/YearDay.hs
@@ -29,8 +29,6 @@ instance DayEncoding YearDay where
 	decodeDay (YearDay year day) =
 		(fromIntegral day) + (div (1532) 5) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678882 where
 		y = year - 1
-	maybeDecodeDay t@(YearDay year day) | (day >= 1) && (day <= if isLeapYear year then 366 else 365) = Just (decodeDay t)
-	maybeDecodeDay _ = Nothing
 
 isLeapYear :: Integer -> Bool
 isLeapYear year = (mod year 4 == 0) && ((mod year 400 == 0) || not (mod year 100 == 0))


From git at git.haskell.org  Sun Dec 20 07:47:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:01 +0000 (UTC)
Subject: [commit: packages/time] master: fix week-based formatting chars,
 with more testing (f61178d)
Message-ID: <20151220074701.EA30B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f61178de5671ebf0006c0a9500f2b0f0d84da152

>---------------------------------------------------------------

commit f61178de5671ebf0006c0a9500f2b0f0d84da152
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue May 10 03:33:55 2005 -0700

    fix week-based formatting chars, with more testing
    
    darcs-hash:20050510103355-ac6dd-319f78ca2b58fb5a381a9882cfa9727f3bfa465d


>---------------------------------------------------------------

f61178de5671ebf0006c0a9500f2b0f0d84da152
 System/Time/Calendar/Format.hs | 13 ++++++++-----
 test/TestFormat.hs             | 14 ++++++--------
 2 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/System/Time/Calendar/Format.hs b/System/Time/Calendar/Format.hs
index eba951f..a3f08d3 100644
--- a/System/Time/Calendar/Format.hs
+++ b/System/Time/Calendar/Format.hs
@@ -79,14 +79,17 @@ weekDay day = fromInteger (mod (day + 3) 7)
 weekDay' :: ModJulianDay -> Int
 weekDay' day = weekDay (day - 1) + 1
 
-dayOfYear :: ModJulianDay -> Int
-dayOfYear = ydDay . encodeDay
-
 weekNumber :: ModJulianDay -> Int
-weekNumber day = (div (dayOfYear day) 7) + 1
+weekNumber mjd = fromInteger ((div d 7) - (div k 7)) where
+	yd = ydDay (encodeDay mjd)
+	d = mjd + 3
+	k = d - (toInteger yd)
 
 weekNumber' :: ModJulianDay -> Int
-weekNumber' day = (div (dayOfYear day) 7) + 1
+weekNumber' mjd = fromInteger ((div d 7) - (div k 7)) where
+	yd = ydDay (encodeDay mjd)
+	d = mjd + 2
+	k = d - (toInteger yd)
 
 instance FormatTime ModJulianDay where
 	-- Aggregate
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index 651df97..89ed600 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -65,7 +65,8 @@ getYearP4 :: Integer -> UTCTime
 getYearP4 year = decodeLocalUTC utc (CalendarTime (GregorianDay year 12 31) midnight)
 
 times :: [UTCTime]
-times = [baseTime0] ++ (fmap getDay [0..23])
+times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
+	(fmap getYearP1 [1980..2000]) ++ (fmap getYearP2 [1980..2000]) ++ (fmap getYearP3 [1980..2000]) ++ (fmap getYearP4 [1980..2000])
 
 compareFormat :: String -> Timezone -> UTCTime -> IO ()
 compareFormat fmt zone time = let
@@ -83,11 +84,8 @@ compareFormat fmt zone time = let
 chars :: [Char]
 chars = "aAbBcCdDeFgGhHIjklmMnprRStTuUVwWxXyYzZ%"
 
+formats :: [String]
+formats =  ["%G-W%V-%u","%U-%w","%W-%u"] ++ (fmap (\char -> '%':char:[]) chars)
+
 main :: IO ()
-main = do
-	mapM_ (\day -> compareFormat "%G-W%V-%u" utc (getDay day)) [0..100]
-	mapM_ (\year -> compareFormat "%G-W%V-%u" utc (getYearP1 year)) [1980..2000]
-	mapM_ (\year -> compareFormat "%G-W%V-%u" utc (getYearP2 year)) [1980..2000]
-	mapM_ (\year -> compareFormat "%G-W%V-%u" utc (getYearP3 year)) [1980..2000]
-	mapM_ (\year -> compareFormat "%G-W%V-%u" utc (getYearP4 year)) [1980..2000]
-	mapM_ (\char -> let fmt = '%':char:[] in mapM_ (\time -> mapM_ (\zone -> compareFormat fmt zone time) zones) times) chars
+main = mapM_ (\fmt -> mapM_ (\time -> mapM_ (\zone -> compareFormat fmt zone time) zones) times) formats


From git at git.haskell.org  Sun Dec 20 07:47:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:03 +0000 (UTC)
Subject: [commit: packages/time] master: organise week functions (73c160c)
Message-ID: <20151220074703.F26043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/73c160cf9cb8289b041389470d38afaacbd31387

>---------------------------------------------------------------

commit 73c160cf9cb8289b041389470d38afaacbd31387
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue May 10 04:03:21 2005 -0700

    organise week functions
    
    darcs-hash:20050510110321-ac6dd-405622ed76952493da885fb866043a8d247ac06c


>---------------------------------------------------------------

73c160cf9cb8289b041389470d38afaacbd31387
 Makefile                        |  1 +
 System/Time/Calendar/Format.hs  | 28 +++++-----------------------
 System/Time/Calendar/YearDay.hs | 19 +++++++++++++++++++
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/Makefile b/Makefile
index c6c6b0b..36a93b7 100644
--- a/Makefile
+++ b/Makefile
@@ -82,6 +82,7 @@ System/Time/Calendar/Calendar.o : System/Time/Clock.hi
 System/Time/Calendar/Calendar.o : System/Time/Calendar/Timezone.hi
 System/Time/Calendar/Calendar.o : System/Time/Calendar/TimeOfDay.hi
 System/Time/Calendar/YearDay.o : System/Time/Calendar/YearDay.hs
+System/Time/Calendar/YearDay.o : System/Time/Clock.hi
 System/Time/Calendar/YearDay.o : System/Time/Calendar/Private.hi
 System/Time/Calendar/YearDay.o : System/Time/Calendar/Calendar.hi
 System/Time/Calendar/Gregorian.o : System/Time/Calendar/Gregorian.hs
diff --git a/System/Time/Calendar/Format.hs b/System/Time/Calendar/Format.hs
index a3f08d3..398c4c0 100644
--- a/System/Time/Calendar/Format.hs
+++ b/System/Time/Calendar/Format.hs
@@ -73,24 +73,6 @@ instance FormatTime Timezone where
 	formatCharacter 'Z' = Just (\_ -> timezoneName)
 	formatCharacter _ = Nothing
 
-weekDay :: ModJulianDay -> Int
-weekDay day = fromInteger (mod (day + 3) 7)
-
-weekDay' :: ModJulianDay -> Int
-weekDay' day = weekDay (day - 1) + 1
-
-weekNumber :: ModJulianDay -> Int
-weekNumber mjd = fromInteger ((div d 7) - (div k 7)) where
-	yd = ydDay (encodeDay mjd)
-	d = mjd + 3
-	k = d - (toInteger yd)
-
-weekNumber' :: ModJulianDay -> Int
-weekNumber' mjd = fromInteger ((div d 7) - (div k 7)) where
-	yd = ydDay (encodeDay mjd)
-	d = mjd + 2
-	k = d - (toInteger yd)
-
 instance FormatTime ModJulianDay where
 	-- Aggregate
 	formatCharacter 'D' = Just (\locale -> formatTime locale "%m/%d/%y")
@@ -119,11 +101,11 @@ instance FormatTime ModJulianDay where
 	formatCharacter 'u' = Just (\_ -> show . isowDay . encodeDay)
 
 	-- Day of week
-	formatCharacter 'a' = Just (\locale -> snd . ((wDays locale) !!) . weekDay)
-	formatCharacter 'A' = Just (\locale -> fst . ((wDays locale) !!) . weekDay)
-	formatCharacter 'U' = Just (\_ -> show2 . weekNumber)
-	formatCharacter 'w' = Just (\_ -> show . weekDay)
-	formatCharacter 'W' = Just (\_ -> show2 . weekNumber')
+	formatCharacter 'a' = Just (\locale -> snd . ((wDays locale) !!) . snd . sundayStartWeek)
+	formatCharacter 'A' = Just (\locale -> fst . ((wDays locale) !!) . snd . sundayStartWeek)
+	formatCharacter 'U' = Just (\_ -> show2 . fst . sundayStartWeek)
+	formatCharacter 'w' = Just (\_ -> show . snd . sundayStartWeek)
+	formatCharacter 'W' = Just (\_ -> show2 . fst . mondayStartWeek)
 	
 	-- Default
 	formatCharacter _   = Nothing
diff --git a/System/Time/Calendar/YearDay.hs b/System/Time/Calendar/YearDay.hs
index 556c913..2c120eb 100644
--- a/System/Time/Calendar/YearDay.hs
+++ b/System/Time/Calendar/YearDay.hs
@@ -4,6 +4,7 @@ module System.Time.Calendar.YearDay where
 
 import System.Time.Calendar.Calendar
 import System.Time.Calendar.Private
+import System.Time.Clock
 
 -- | ISO 8601 Ordinal Date
 data YearDay = YearDay {
@@ -32,3 +33,21 @@ instance DayEncoding YearDay where
 
 isLeapYear :: Integer -> Bool
 isLeapYear year = (mod year 4 == 0) && ((mod year 400 == 0) || not (mod year 100 == 0))
+
+-- | Get the number of the Monday-starting week in the year and the day of the week.
+-- The first Monday is the first day of week 1, any earlier days in the year are week 0 (as \"%W\" in formatTime).
+-- Monday is 1, Sunday is 7 (as \"%u\" in formatTime).
+mondayStartWeek :: ModJulianDay -> (Int,Int)
+mondayStartWeek mjd =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7) + 1) where
+	yd = ydDay (encodeDay mjd)
+	d = mjd + 2
+	k = d - (toInteger yd)
+
+-- | Get the number of the Sunday-starting week in the year and the day of the week.
+-- The first Sunday is the first day of week 1, any earlier days in the year are week 0 (as \"%U\" in formatTime).
+-- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+sundayStartWeek :: ModJulianDay -> (Int,Int)
+sundayStartWeek mjd =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7)) where
+	yd = ydDay (encodeDay mjd)
+	d = mjd + 3
+	k = d - (toInteger yd)


From git at git.haskell.org  Sun Dec 20 07:47:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:06 +0000 (UTC)
Subject: [commit: packages/time] master: clean up some type names,
 more doc (23be1cb)
Message-ID: <20151220074706.07A9B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/23be1cbc6f4656788094ab2356f4ebe80f81f9ec

>---------------------------------------------------------------

commit 23be1cbc6f4656788094ab2356f4ebe80f81f9ec
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 11 02:02:36 2005 -0700

    clean up some type names, more doc
    
    darcs-hash:20050511090236-ac6dd-933871a97e6db2b7c089579ec25f4016211be440


>---------------------------------------------------------------

23be1cbc6f4656788094ab2356f4ebe80f81f9ec
 System/Time/Calendar/Calendar.hs  | 35 +++++++++++++++++++++--------------
 System/Time/Calendar/Format.hs    | 24 ++++++++++++------------
 System/Time/Calendar/Gregorian.hs | 10 +++++-----
 System/Time/Calendar/TimeOfDay.hs | 16 ++++++++--------
 test/ShowDST.hs                   |  4 ++--
 test/TestFormat.hs                | 12 ++++++------
 test/TestTime.hs                  |  2 +-
 7 files changed, 55 insertions(+), 48 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 23be1cbc6f4656788094ab2356f4ebe80f81f9ec

From git at git.haskell.org  Sun Dec 20 07:47:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:08 +0000 (UTC)
Subject: [commit: packages/time] master: CalendarTime synonym with convenience
 functions (f853253)
Message-ID: <20151220074708.0E0153A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f8532533d788c272d59278286c021eab2b973744

>---------------------------------------------------------------

commit f8532533d788c272d59278286c021eab2b973744
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 11 02:30:27 2005 -0700

    CalendarTime synonym with convenience functions
    
    darcs-hash:20050511093027-ac6dd-4336dabf134f48c15b0b922d4ee54d11567b7975


>---------------------------------------------------------------

f8532533d788c272d59278286c021eab2b973744
 System/Time/Calendar.hs           | 39 ++++++++++++++++++++++++++++++++++++++-
 System/Time/Calendar/Gregorian.hs |  7 +------
 test/CurrentTime.hs               |  5 ++---
 test/ShowDST.hs                   |  4 ++--
 test/TestFormat.hs                |  2 +-
 test/TestTime.hs                  | 16 ++++++++--------
 6 files changed, 52 insertions(+), 21 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 9b5d890..4b848e5 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -8,9 +8,13 @@ module System.Time.Calendar
 	module System.Time.Calendar.YearDay,
 	module System.Time.Calendar.Gregorian,
 	module System.Time.Calendar.ISOWeek,
-	module System.Time.Calendar.Format
+	module System.Time.Calendar.Format,
+	module System.Time.Calendar
 ) where
 
+import Data.Fixed
+import System.Time.Clock
+
 import System.Time.Calendar.Timezone
 import System.Time.Calendar.TimeOfDay
 import System.Time.Calendar.Calendar
@@ -18,3 +22,36 @@ import System.Time.Calendar.YearDay
 import System.Time.Calendar.Gregorian
 import System.Time.Calendar.ISOWeek
 import System.Time.Calendar.Format
+
+type CalendarTime = ZonedTime (DayAndTime GregorianDay)
+
+calendarTime :: Timezone -> Integer -> Int -> Int -> Int -> Int -> Pico -> CalendarTime
+calendarTime zone year month day hour minute second = 
+	ZonedTime (DayAndTime (GregorianDay year month day) (TimeOfDay hour minute second)) zone
+
+ctZone :: CalendarTime -> Timezone
+ctZone = ztZone
+
+ctYear :: CalendarTime -> Integer
+ctYear = gregYear . dtDay . ztTime
+
+ctMonth :: CalendarTime -> Int
+ctMonth = gregMonth . dtDay . ztTime
+
+ctDay :: CalendarTime -> Int
+ctDay = gregDay . dtDay . ztTime
+
+ctHour :: CalendarTime -> Int
+ctHour = todHour . dtTime . ztTime
+
+ctMin :: CalendarTime -> Int
+ctMin = todMin . dtTime . ztTime
+
+ctSec :: CalendarTime -> Pico
+ctSec = todSec . dtTime . ztTime
+
+getCalendarTime :: IO CalendarTime
+getCalendarTime = do
+	t <- getCurrentTime
+	zone <- getTimezone t
+	return (encodeUTC zone t)
diff --git a/System/Time/Calendar/Gregorian.hs b/System/Time/Calendar/Gregorian.hs
index 77f389d..3e986bd 100644
--- a/System/Time/Calendar/Gregorian.hs
+++ b/System/Time/Calendar/Gregorian.hs
@@ -2,7 +2,7 @@
 
 module System.Time.Calendar.Gregorian
 (
-	GregorianDay(..),GregorianTime,ZonedGregorianTime
+	GregorianDay(..)
 
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
@@ -19,10 +19,6 @@ data GregorianDay = GregorianDay {
 	gregDay     :: Int
 } deriving (Eq,Ord)
 
-type GregorianTime = DayAndTime GregorianDay
-
-type ZonedGregorianTime = ZonedTime (DayAndTime GregorianDay)
-
 instance Show GregorianDay where
 	show (GregorianDay y m d) = (if y > 0 then show y else (show (1 - y) ++ "BCE")) ++ "-" ++ (show2 m) ++ "-" ++ (show2 d)
 
@@ -30,7 +26,6 @@ findMonthDay :: [Int] -> Int -> (Int,Int)
 findMonthDay (n:ns) yd | yd > n = (\(m,d) -> (m + 1,d)) (findMonthDay ns (yd - n))
 findMonthDay _ yd = (1,yd)
 
-
 monthLengths :: Bool -> [Int]
 monthLengths isleap = 
 	[31,if isleap then 29 else 28,31,30,31,30,31,31,30,31,30,31]
diff --git a/test/CurrentTime.hs b/test/CurrentTime.hs
index 2bb3f11..ae00fae 100644
--- a/test/CurrentTime.hs
+++ b/test/CurrentTime.hs
@@ -8,7 +8,6 @@ main :: IO ()
 main = do
 	now <- getCurrentTime
 	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
-	putStrLn (show (encodeLocalUTC utc now :: GregorianTime))
+	putStrLn (show (encodeUTC utc now :: CalendarTime))
 	myzone <- getCurrentTimezone
-	putStrLn ("timezone: " ++ show myzone)
-	putStrLn (show (encodeLocalUTC myzone now :: GregorianTime))
+	putStrLn (show (encodeUTC myzone now :: CalendarTime))
diff --git a/test/ShowDST.hs b/test/ShowDST.hs
index 655beca..a061060 100644
--- a/test/ShowDST.hs
+++ b/test/ShowDST.hs
@@ -19,7 +19,7 @@ findTransition a b = do
 			return (tp ++ tq)
 
 showZoneTime :: Timezone -> UTCTime -> String
-showZoneTime zone time = (show (encodeLocalUTC zone time :: GregorianTime)) ++ " " ++ (show zone)
+showZoneTime zone time = show (encodeUTC zone time :: CalendarTime)
 
 showTransition :: (UTCTime,Timezone,Timezone) -> String
 showTransition (time,zone1,zone2) = (showZoneTime zone1 time) ++ " => " ++ (showZoneTime zone2 time)
@@ -28,7 +28,7 @@ main :: IO ()
 main = do
 	now <- getCurrentTime
 	zone <- getTimezone now
-	let year = cdYear (dtDay (encodeLocalUTC zone now))
+	let year = gregYear (dtDay (encodeLocalUTC zone now))
 	putStrLn ("DST adjustments for " ++ show year ++ ":")
 	let t0 = monthBeginning zone year 1
 	let t1 = monthBeginning zone year 4
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index fbb1b7d..d4a7675 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -70,7 +70,7 @@ times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
 
 compareFormat :: String -> Timezone -> UTCTime -> IO ()
 compareFormat fmt zone time = let
-		ctime = encodeUTC zone time :: ZonedGregorianTime
+		ctime = encodeUTC zone time :: CalendarTime
 		haskellText = formatTime locale fmt ctime
 	in do
 		unixText <- unixFormatTime fmt zone time
diff --git a/test/TestTime.hs b/test/TestTime.hs
index 13a1ead..908ad88 100644
--- a/test/TestTime.hs
+++ b/test/TestTime.hs
@@ -40,7 +40,7 @@ showUTCTime (UTCTime d t) =  show d ++ "," ++ show t
 myzone :: Timezone
 myzone = hoursToTimezone (- 8)
 
-leapSec1998Cal :: GregorianTime
+leapSec1998Cal :: DayAndTime GregorianDay
 leapSec1998Cal = DayAndTime (GregorianDay 1998 12 31) (TimeOfDay 23 59 60.5)
 
 leapSec1998 :: UTCTime
@@ -52,7 +52,7 @@ testUTC = do
 	showCal 51178
 	putStrLn (show leapSec1998Cal)
 	putStrLn (showUTCTime leapSec1998)
-	let lsMineCal = encodeLocalUTC myzone leapSec1998 :: GregorianTime
+	let lsMineCal = encodeLocalUTC myzone leapSec1998 :: DayAndTime GregorianDay
 	putStrLn (show lsMineCal)
 	let lsMine = decodeLocalUTC myzone lsMineCal
 	putStrLn (showUTCTime lsMine)
@@ -66,12 +66,12 @@ poslong = 120
 testUT1 :: IO ()
 testUT1 = do
 	putStrLn ""
-	putStrLn (show (encodeLocalUT1 0 51604.0 :: GregorianTime))
-	putStrLn (show (encodeLocalUT1 0 51604.5 :: GregorianTime))
-	putStrLn (show (encodeLocalUT1 neglong 51604.0 :: GregorianTime))
-	putStrLn (show (encodeLocalUT1 neglong 51604.5 :: GregorianTime))
-	putStrLn (show (encodeLocalUT1 poslong 51604.0 :: GregorianTime))
-	putStrLn (show (encodeLocalUT1 poslong 51604.5 :: GregorianTime))
+	putStrLn (show (encodeLocalUT1 0 51604.0 :: DayAndTime GregorianDay))
+	putStrLn (show (encodeLocalUT1 0 51604.5 :: DayAndTime GregorianDay))
+	putStrLn (show (encodeLocalUT1 neglong 51604.0 :: DayAndTime GregorianDay))
+	putStrLn (show (encodeLocalUT1 neglong 51604.5 :: DayAndTime GregorianDay))
+	putStrLn (show (encodeLocalUT1 poslong 51604.0 :: DayAndTime GregorianDay))
+	putStrLn (show (encodeLocalUT1 poslong 51604.5 :: DayAndTime GregorianDay))
 
 main :: IO ()
 main = do


From git at git.haskell.org  Sun Dec 20 07:47:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:10 +0000 (UTC)
Subject: [commit: packages/time] master: better tz for test (865557b)
Message-ID: <20151220074710.14C7A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/865557b3d37b3cba48ed1c4d4f12128f19c7f28f

>---------------------------------------------------------------

commit 865557b3d37b3cba48ed1c4d4f12128f19c7f28f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 11 22:50:47 2005 -0700

    better tz for test
    
    darcs-hash:20050512055047-ac6dd-1f4486d8b5ca0fa95be731b31b603535bb5695cc


>---------------------------------------------------------------

865557b3d37b3cba48ed1c4d4f12128f19c7f28f
 test/TestFormat.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index d4a7675..a273448 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -38,7 +38,7 @@ locale :: TimeLocale
 locale = defaultTimeLocale {dateTimeFmt = "%a %b %e %H:%M:%S %Y"}
 
 zones :: [Timezone]
-zones = [utc,hoursToTimezone (- 7)]
+zones = [utc,MkTimezone 87 True "Fenwickian Daylight Time"]
 
 posixDay :: UTCDiffTime
 posixDay = 86400


From git at git.haskell.org  Sun Dec 20 07:47:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:12 +0000 (UTC)
Subject: [commit: packages/time] master: better C type for name param (7a52230)
Message-ID: <20151220074712.1B0253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7a522300362bccc114014743d3e0d6b2823fa252

>---------------------------------------------------------------

commit 7a522300362bccc114014743d3e0d6b2823fa252
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 11 22:55:54 2005 -0700

    better C type for name param
    
    darcs-hash:20050512055554-ac6dd-5dd656b851561c2626a5a62eaef9600aeab35490


>---------------------------------------------------------------

7a522300362bccc114014743d3e0d6b2823fa252
 timestuff.c | 2 +-
 timestuff.h | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/timestuff.c b/timestuff.c
index 386616e..0fdbd9e 100644
--- a/timestuff.c
+++ b/timestuff.c
@@ -1,6 +1,6 @@
 #include "timestuff.h"
 
-long int get_current_timezone_seconds (time_t t,int* dst,char** name)
+long int get_current_timezone_seconds (time_t t,int* dst,char const* * name)
 {
 	struct tm tmd;
 	struct tm* ptm = localtime_r(&t,&tmd);
diff --git a/timestuff.h b/timestuff.h
index 936cd84..c161fc9 100644
--- a/timestuff.h
+++ b/timestuff.h
@@ -1,3 +1,3 @@
 #include <time.h>
 
-long int get_current_timezone_seconds (time_t,int* dst,char** name);
+long int get_current_timezone_seconds (time_t,int* dst,char const* * name);


From git at git.haskell.org  Sun Dec 20 07:47:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:14 +0000 (UTC)
Subject: [commit: packages/time] master: XCode 2.0 project (1ecbd6c)
Message-ID: <20151220074714.229723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1ecbd6c347b20e978149947e4623a62dd662193e

>---------------------------------------------------------------

commit 1ecbd6c347b20e978149947e4623a62dd662193e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 16 01:36:36 2005 -0700

    XCode 2.0 project
    
    darcs-hash:20050516083636-ac6dd-b6506418cfe358e9e64528fc691c54bd5e56fac3


>---------------------------------------------------------------

1ecbd6c347b20e978149947e4623a62dd662193e
 Makefile                      |   7 +-
 TimeLib.xcode/project.pbxproj | 259 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 265 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 36a93b7..fe5e66d 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
-default: build doc
+default: build
 
 build: $(patsubst %.hs,%.hi,$(SRCS)) libTimeLib.a
 
 test: build
 	cd test && make
 
+cleantest: build
+	cd test && make clean
+
 SRCS = Data/Fixed.hs \
 	System/Time/Clock.hs \
 	System/Time/TAI.hs \
@@ -54,6 +57,8 @@ FORCE:
 
 .SECONDARY:
 
+.PHONY: default build test doc clean
+
 depend: $(SRCS)
 	ghc -M $^
 
diff --git a/TimeLib.xcode/project.pbxproj b/TimeLib.xcode/project.pbxproj
new file mode 100644
index 0000000..8a889aa
--- /dev/null
+++ b/TimeLib.xcode/project.pbxproj
@@ -0,0 +1,259 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 39;
+	objects = {
+		AB01DCEA083747B1003C9EF7 = {
+			children = (
+				AB01DCF508374807003C9EF7,
+				AB01DCF908374808003C9EF7,
+				AB01DCF808374808003C9EF7,
+				AB01DD0008374848003C9EF7,
+				AB35747F08386FCD00B5F897,
+			);
+			isa = PBXGroup;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCEC083747B1003C9EF7 = {
+			buildSettings = {
+				COPY_PHASE_STRIP = NO;
+			};
+			isa = PBXBuildStyle;
+			name = Development;
+		};
+		AB01DCED083747B1003C9EF7 = {
+			buildSettings = {
+				COPY_PHASE_STRIP = YES;
+			};
+			isa = PBXBuildStyle;
+			name = Deployment;
+		};
+		AB01DCEE083747B1003C9EF7 = {
+			buildSettings = {
+			};
+			buildStyles = (
+				AB01DCEC083747B1003C9EF7,
+				AB01DCED083747B1003C9EF7,
+			);
+			hasScannedForEncodings = 0;
+			isa = PBXProject;
+			mainGroup = AB01DCEA083747B1003C9EF7;
+			projectDirPath = "";
+			targets = (
+				AB01DD2108374A56003C9EF7,
+				AB3571F5083759B20059BD19,
+			);
+		};
+		AB01DCF508374807003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.make;
+			path = Makefile;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCF608374808003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Setup.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCF708374808003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = TimeLib.cabal;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCF808374808003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = timestuff.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCF908374808003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = timestuff.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCFC08374838003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Calendar.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCFD08374838003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Clock.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DCFE08374838003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TAI.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD0008374848003C9EF7 = {
+			children = (
+				AB01DCFD08374838003C9EF7,
+				AB01DCFE08374838003C9EF7,
+				AB01DD0D083748C0003C9EF7,
+				AB01DCFC08374838003C9EF7,
+			);
+			isa = PBXGroup;
+			name = Time;
+			path = System/Time;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD0D083748C0003C9EF7 = {
+			children = (
+				AB01DD16083748EC003C9EF7,
+				AB01DD18083748EC003C9EF7,
+				AB01DD17083748EC003C9EF7,
+				AB01DD12083748EC003C9EF7,
+				AB01DD19083748EC003C9EF7,
+				AB01DD14083748EC003C9EF7,
+				AB01DD15083748EC003C9EF7,
+				AB01DD13083748EC003C9EF7,
+			);
+			isa = PBXGroup;
+			path = Calendar;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD12083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Calendar.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD13083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Format.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD14083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Gregorian.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD15083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = ISOWeek.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD16083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Private.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD17083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TimeOfDay.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD18083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Timezone.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD19083748EC003C9EF7 = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = YearDay.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		AB01DD2108374A56003C9EF7 = {
+			buildArgumentsString = "$(ACTION)";
+			buildPhases = (
+			);
+			buildSettings = {
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = Untitled;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			buildToolPath = /usr/bin/make;
+			dependencies = (
+			);
+			isa = PBXLegacyTarget;
+			name = Build;
+			passBuildSettingsInEnvironment = 1;
+			productName = Untitled;
+		};
+		AB3571F5083759B20059BD19 = {
+			buildArgumentsString = "$(ACTION)test";
+			buildPhases = (
+			);
+			buildSettings = {
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = Test;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			buildToolPath = /usr/bin/make;
+			dependencies = (
+			);
+			isa = PBXLegacyTarget;
+			name = Test;
+			passBuildSettingsInEnvironment = 1;
+			productName = Test;
+		};
+		AB35747F08386FCD00B5F897 = {
+			children = (
+				AB01DCF708374808003C9EF7,
+				AB01DCF608374808003C9EF7,
+			);
+			isa = PBXGroup;
+			name = Cabal;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+	};
+	rootObject = AB01DCEE083747B1003C9EF7;
+}


From git at git.haskell.org  Sun Dec 20 07:47:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:16 +0000 (UTC)
Subject: [commit: packages/time] master: clean up XCode project & makefile
 (0bb6871)
Message-ID: <20151220074716.29A063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0bb687137246fa43f8fe42f3720463e2f105a9ac

>---------------------------------------------------------------

commit 0bb687137246fa43f8fe42f3720463e2f105a9ac
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 18 01:13:06 2005 -0700

    clean up XCode project & makefile
    
    darcs-hash:20050518081306-ac6dd-2b83dc54af7951b3697bbf75aff9c2d05195992c


>---------------------------------------------------------------

0bb687137246fa43f8fe42f3720463e2f105a9ac
 Makefile                      |  13 ++-
 TimeLib.xcode/project.pbxproj | 217 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 225 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index fe5e66d..442f354 100644
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,11 @@
-default: build
+default: build test doc
 
 build: $(patsubst %.hs,%.hi,$(SRCS)) libTimeLib.a
 
 test: build
 	cd test && make
 
-cleantest: build
+cleantest:
 	cd test && make clean
 
 SRCS = Data/Fixed.hs \
@@ -29,8 +29,13 @@ libTimeLib.a: $(patsubst %.hs,%.o,$(SRCS)) timestuff.o
 	ar cru $@ $^
 	ranlib $@
 
-clean:
-	rm -rf doc haddock *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+cleanbuild:
+	rm -rf *.a *.o *.hi $(patsubst %.hs,%.o,$(SRCS)) $(patsubst %.hs,%.hi,$(SRCS)) Makefile.bak
+
+cleandoc:
+	rm -rf doc haddock
+
+clean: cleandoc cleantest cleanbuild
 
 doc: haddock/index.html
 
diff --git a/TimeLib.xcode/project.pbxproj b/TimeLib.xcode/project.pbxproj
index 8a889aa..c2742eb 100644
--- a/TimeLib.xcode/project.pbxproj
+++ b/TimeLib.xcode/project.pbxproj
@@ -10,8 +10,10 @@
 				AB01DCF508374807003C9EF7,
 				AB01DCF908374808003C9EF7,
 				AB01DCF808374808003C9EF7,
+				ABFA25DC0839F8C90096540C,
 				AB01DD0008374848003C9EF7,
 				AB35747F08386FCD00B5F897,
+				ABFA25EC0839F9FD0096540C,
 			);
 			isa = PBXGroup;
 			refType = 4;
@@ -45,6 +47,8 @@
 			targets = (
 				AB01DD2108374A56003C9EF7,
 				AB3571F5083759B20059BD19,
+				ABFA25E20839F9310096540C,
+				ABFA25E50839F99F0096540C,
 			);
 		};
 		AB01DCF508374807003C9EF7 = {
@@ -205,7 +209,7 @@
 			sourceTree = "<group>";
 		};
 		AB01DD2108374A56003C9EF7 = {
-			buildArgumentsString = "$(ACTION)";
+			buildArgumentsString = "$(ACTION)build";
 			buildPhases = (
 			);
 			buildSettings = {
@@ -254,6 +258,217 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
+		ABFA25DC0839F8C90096540C = {
+			children = (
+				ABFA25DF0839F8F70096540C,
+			);
+			isa = PBXGroup;
+			path = Data;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA25DF0839F8F70096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = Fixed.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA25E20839F9310096540C = {
+			buildArgumentsString = "$(ACTION)doc";
+			buildPhases = (
+			);
+			buildSettings = {
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = Untitled;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			buildToolPath = /usr/bin/make;
+			dependencies = (
+			);
+			isa = PBXLegacyTarget;
+			name = Documentation;
+			passBuildSettingsInEnvironment = 1;
+			productName = Untitled;
+		};
+		ABFA25E50839F99F0096540C = {
+			buildPhases = (
+			);
+			buildSettings = {
+				OPTIMIZATION_CFLAGS = "";
+				OTHER_CFLAGS = "";
+				OTHER_LDFLAGS = "";
+				OTHER_REZFLAGS = "";
+				PRODUCT_NAME = Everything;
+				SECTORDER_FLAGS = "";
+				WARNING_CFLAGS = "-Wmost -Wno-four-char-constants -Wno-unknown-pragmas";
+			};
+			dependencies = (
+				ABFA25E90839F9AF0096540C,
+				ABFA25EB0839F9B10096540C,
+				ABFA25E70839F9AD0096540C,
+			);
+			isa = PBXAggregateTarget;
+			name = Everything;
+			productName = Everything;
+		};
+		ABFA25E60839F9AD0096540C = {
+			containerPortal = AB01DCEE083747B1003C9EF7;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = ABFA25E20839F9310096540C;
+			remoteInfo = Documentation;
+		};
+		ABFA25E70839F9AD0096540C = {
+			isa = PBXTargetDependency;
+			target = ABFA25E20839F9310096540C;
+			targetProxy = ABFA25E60839F9AD0096540C;
+		};
+		ABFA25E80839F9AF0096540C = {
+			containerPortal = AB01DCEE083747B1003C9EF7;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = AB01DD2108374A56003C9EF7;
+			remoteInfo = Build;
+		};
+		ABFA25E90839F9AF0096540C = {
+			isa = PBXTargetDependency;
+			target = AB01DD2108374A56003C9EF7;
+			targetProxy = ABFA25E80839F9AF0096540C;
+		};
+		ABFA25EA0839F9B10096540C = {
+			containerPortal = AB01DCEE083747B1003C9EF7;
+			isa = PBXContainerItemProxy;
+			proxyType = 1;
+			remoteGlobalIDString = AB3571F5083759B20059BD19;
+			remoteInfo = Test;
+		};
+		ABFA25EB0839F9B10096540C = {
+			isa = PBXTargetDependency;
+			target = AB3571F5083759B20059BD19;
+			targetProxy = ABFA25EA0839F9B10096540C;
+		};
+		ABFA25EC0839F9FD0096540C = {
+			children = (
+				ABFA2623083B28C00096540C,
+				ABFA2624083B28C00096540C,
+				ABFA2625083B28C00096540C,
+				ABFA2626083B28C00096540C,
+				ABFA2627083B28C00096540C,
+				ABFA2628083B28C00096540C,
+				ABFA2629083B28C00096540C,
+				ABFA262A083B28C00096540C,
+				ABFA262B083B28C00096540C,
+				ABFA262C083B28C00096540C,
+				ABFA262D083B28C00096540C,
+				ABFA262E083B28C00096540C,
+			);
+			isa = PBXGroup;
+			name = Test;
+			path = test;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2623083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = ConvertBack.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2624083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = CurrentTime.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2625083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.make;
+			path = Makefile;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2626083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = ShowDST.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2627083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TestFixed.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2628083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = TestFixed.ref;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA2629083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TestFormat.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA262A083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.c;
+			path = TestFormatStuff.c;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA262B083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.c.h;
+			path = TestFormatStuff.h;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA262C083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TestTime.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA262D083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text;
+			path = TestTime.ref;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA262E083B28C00096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = sourcecode.haskell;
+			path = TimeZone.hs;
+			refType = 4;
+			sourceTree = "<group>";
+		};
 	};
 	rootObject = AB01DCEE083747B1003C9EF7;
 }


From git at git.haskell.org  Sun Dec 20 07:47:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:18 +0000 (UTC)
Subject: [commit: packages/time] master: hide submodules in Haddock docs
 (e128961)
Message-ID: <20151220074718.3011B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e1289618cca447ca7348da0d032b1dd0dc2f5a84

>---------------------------------------------------------------

commit e1289618cca447ca7348da0d032b1dd0dc2f5a84
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 18 01:14:23 2005 -0700

    hide submodules in Haddock docs
    
    darcs-hash:20050518081423-ac6dd-76ee3e4f8b6b1ee8e55235367594fb52d321a4ee


>---------------------------------------------------------------

e1289618cca447ca7348da0d032b1dd0dc2f5a84
 System/Time/Calendar.hs           | 1 +
 System/Time/Calendar/Calendar.hs  | 2 ++
 System/Time/Calendar/Format.hs    | 8 +++++++-
 System/Time/Calendar/Gregorian.hs | 2 ++
 System/Time/Calendar/ISOWeek.hs   | 7 ++++++-
 System/Time/Calendar/Private.hs   | 1 +
 System/Time/Calendar/TimeOfDay.hs | 2 ++
 System/Time/Calendar/Timezone.hs  | 3 ++-
 System/Time/Calendar/YearDay.hs   | 7 ++++++-
 9 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/System/Time/Calendar.hs b/System/Time/Calendar.hs
index 4b848e5..7035149 100644
--- a/System/Time/Calendar.hs
+++ b/System/Time/Calendar.hs
@@ -9,6 +9,7 @@ module System.Time.Calendar
 	module System.Time.Calendar.Gregorian,
 	module System.Time.Calendar.ISOWeek,
 	module System.Time.Calendar.Format,
+	-- * CalendarTime
 	module System.Time.Calendar
 ) where
 
diff --git a/System/Time/Calendar/Calendar.hs b/System/Time/Calendar/Calendar.hs
index f15890d..cc4e0c3 100644
--- a/System/Time/Calendar/Calendar.hs
+++ b/System/Time/Calendar/Calendar.hs
@@ -1,7 +1,9 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- #hide
 module System.Time.Calendar.Calendar
 (
+	-- * Classes
 	-- "Calendrical" format
 	DayAndTime(..),DayEncoding(..),
 
diff --git a/System/Time/Calendar/Format.hs b/System/Time/Calendar/Format.hs
index db63090..e81312a 100644
--- a/System/Time/Calendar/Format.hs
+++ b/System/Time/Calendar/Format.hs
@@ -1,6 +1,12 @@
 {-# OPTIONS -Wall -Werror #-}
 
-module System.Time.Calendar.Format where
+
+-- #hide
+module System.Time.Calendar.Format
+	(
+	-- * UNIX-style formatting
+	module System.Time.Calendar.Format
+	) where
 
 import System.Time.Calendar.ISOWeek
 import System.Time.Calendar.Gregorian
diff --git a/System/Time/Calendar/Gregorian.hs b/System/Time/Calendar/Gregorian.hs
index 3e986bd..d4cced7 100644
--- a/System/Time/Calendar/Gregorian.hs
+++ b/System/Time/Calendar/Gregorian.hs
@@ -1,7 +1,9 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- #hide
 module System.Time.Calendar.Gregorian
 (
+	-- * Gregorian calendar
 	GregorianDay(..)
 
 	-- calendrical arithmetic
diff --git a/System/Time/Calendar/ISOWeek.hs b/System/Time/Calendar/ISOWeek.hs
index 2390f01..eb03a39 100644
--- a/System/Time/Calendar/ISOWeek.hs
+++ b/System/Time/Calendar/ISOWeek.hs
@@ -1,6 +1,11 @@
 {-# OPTIONS -Wall -Werror #-}
 
-module System.Time.Calendar.ISOWeek where
+-- #hide
+module System.Time.Calendar.ISOWeek
+	(
+	-- * ISO Week calendar
+	module System.Time.Calendar.ISOWeek
+	) where
 
 import System.Time.Calendar.YearDay
 import System.Time.Calendar.Calendar
diff --git a/System/Time/Calendar/Private.hs b/System/Time/Calendar/Private.hs
index db63216..17d2322 100644
--- a/System/Time/Calendar/Private.hs
+++ b/System/Time/Calendar/Private.hs
@@ -1,5 +1,6 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- #hide
 module System.Time.Calendar.Private where
 
 import Data.Fixed
diff --git a/System/Time/Calendar/TimeOfDay.hs b/System/Time/Calendar/TimeOfDay.hs
index bf04e78..9bd8213 100644
--- a/System/Time/Calendar/TimeOfDay.hs
+++ b/System/Time/Calendar/TimeOfDay.hs
@@ -1,7 +1,9 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- #hide
 module System.Time.Calendar.TimeOfDay
 (
+	-- * Time of day
 	TimeOfDay(..),midnight,midday,
 	utcToLocalTimeOfDay,localToUTCTimeOfDay,
 	timeToTimeOfDay,timeOfDayToTime,
diff --git a/System/Time/Calendar/Timezone.hs b/System/Time/Calendar/Timezone.hs
index dc836ca..fc2423d 100644
--- a/System/Time/Calendar/Timezone.hs
+++ b/System/Time/Calendar/Timezone.hs
@@ -1,8 +1,9 @@
 {-# OPTIONS -ffi -Wall -Werror #-}
 
+-- #hide
 module System.Time.Calendar.Timezone
 (
-	-- time zones
+	-- * Time zones
 	Timezone(..),timezoneOffsetString,minutesToTimezone,hoursToTimezone,utc,
 
 	-- getting the locale time zone
diff --git a/System/Time/Calendar/YearDay.hs b/System/Time/Calendar/YearDay.hs
index 2c120eb..49e3c58 100644
--- a/System/Time/Calendar/YearDay.hs
+++ b/System/Time/Calendar/YearDay.hs
@@ -1,6 +1,11 @@
 {-# OPTIONS -Wall -Werror #-}
 
-module System.Time.Calendar.YearDay where
+-- #hide
+module System.Time.Calendar.YearDay
+	(
+	-- * Year and day format
+	module System.Time.Calendar.YearDay
+	) where
 
 import System.Time.Calendar.Calendar
 import System.Time.Calendar.Private


From git at git.haskell.org  Sun Dec 20 07:47:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:20 +0000 (UTC)
Subject: [commit: packages/time] master: use "time" for package name (f323ece)
Message-ID: <20151220074720.36C0C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f323ece469852fd50fc1b7edfe4bbe455a7d23ee

>---------------------------------------------------------------

commit f323ece469852fd50fc1b7edfe4bbe455a7d23ee
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 22 17:16:50 2005 -0700

    use "time" for package name
    
    darcs-hash:20050523001650-ac6dd-2b3762d875eedb504f71b92ceb3c39b95edaa914


>---------------------------------------------------------------

f323ece469852fd50fc1b7edfe4bbe455a7d23ee
 TimeLib.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index a4d5a21..60895d0 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -1,4 +1,4 @@
-Name:		TimeLib
+Name:		time
 Version:	0.1
 Stability:	Alpha
 -- unsure of best license


From git at git.haskell.org  Sun Dec 20 07:47:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:22 +0000 (UTC)
Subject: [commit: packages/time] master: put doc index in project (c2214f5)
Message-ID: <20151220074722.3D5243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c2214f530199aecbf47cf9ac0e6ed3bb3271f67e

>---------------------------------------------------------------

commit c2214f530199aecbf47cf9ac0e6ed3bb3271f67e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun May 22 17:17:27 2005 -0700

    put doc index in project
    
    darcs-hash:20050523001727-ac6dd-0718ea889354fccce1f2cecf75a80494a0dbe211


>---------------------------------------------------------------

c2214f530199aecbf47cf9ac0e6ed3bb3271f67e
 TimeLib.xcode/project.pbxproj | 32 +++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/TimeLib.xcode/project.pbxproj b/TimeLib.xcode/project.pbxproj
index c2742eb..4e18e68 100644
--- a/TimeLib.xcode/project.pbxproj
+++ b/TimeLib.xcode/project.pbxproj
@@ -14,6 +14,7 @@
 				AB01DD0008374848003C9EF7,
 				AB35747F08386FCD00B5F897,
 				ABFA25EC0839F9FD0096540C,
+				ABFA264B083C8AA40096540C,
 			);
 			isa = PBXGroup;
 			refType = 4;
@@ -299,7 +300,6 @@
 			buildPhases = (
 			);
 			buildSettings = {
-				OPTIMIZATION_CFLAGS = "";
 				OTHER_CFLAGS = "";
 				OTHER_LDFLAGS = "";
 				OTHER_REZFLAGS = "";
@@ -354,18 +354,18 @@
 		};
 		ABFA25EC0839F9FD0096540C = {
 			children = (
-				ABFA2623083B28C00096540C,
-				ABFA2624083B28C00096540C,
 				ABFA2625083B28C00096540C,
-				ABFA2626083B28C00096540C,
 				ABFA2627083B28C00096540C,
 				ABFA2628083B28C00096540C,
-				ABFA2629083B28C00096540C,
-				ABFA262A083B28C00096540C,
-				ABFA262B083B28C00096540C,
+				ABFA2624083B28C00096540C,
+				ABFA2626083B28C00096540C,
+				ABFA2623083B28C00096540C,
 				ABFA262C083B28C00096540C,
 				ABFA262D083B28C00096540C,
 				ABFA262E083B28C00096540C,
+				ABFA262B083B28C00096540C,
+				ABFA262A083B28C00096540C,
+				ABFA2629083B28C00096540C,
 			);
 			isa = PBXGroup;
 			name = Test;
@@ -469,6 +469,24 @@
 			refType = 4;
 			sourceTree = "<group>";
 		};
+		ABFA2649083BF6210096540C = {
+			fileEncoding = 4;
+			isa = PBXFileReference;
+			lastKnownFileType = text.html;
+			path = index.html;
+			refType = 4;
+			sourceTree = "<group>";
+		};
+		ABFA264B083C8AA40096540C = {
+			children = (
+				ABFA2649083BF6210096540C,
+			);
+			isa = PBXGroup;
+			name = "Target Doc";
+			path = haddock;
+			refType = 4;
+			sourceTree = "<group>";
+		};
 	};
 	rootObject = AB01DCEE083747B1003C9EF7;
 }


From git at git.haskell.org  Sun Dec 20 07:47:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:24 +0000 (UTC)
Subject: [commit: packages/time] master: split up System.Time.Clock (462818f)
Message-ID: <20151220074724.474023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/462818f7aa1ffca64aa0d4346979e2fb52f48f0d

>---------------------------------------------------------------

commit 462818f7aa1ffca64aa0d4346979e2fb52f48f0d
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jul 3 17:15:58 2005 -0700

    split up System.Time.Clock
    
    darcs-hash:20050704001558-ac6dd-53cb216f3d097415d6d85bffe4e23cadc8266435


>---------------------------------------------------------------

462818f7aa1ffca64aa0d4346979e2fb52f48f0d
 Makefile                               |  21 +++-
 System/Time/Calendar/Format.hs         |   1 +
 System/Time/Calendar/Timezone.hs       |   1 +
 System/Time/Clock.hs                   | 200 ++-------------------------------
 System/Time/Clock/POSIX.hs             |  11 ++
 System/Time/Clock/Scale.hs             |  57 ++++++++++
 System/Time/{Clock.hs => Clock/UTC.hs} |  97 +---------------
 TimeLib.xcode/project.pbxproj          |  79 +++++++++++++
 test/TestFormat.hs                     |   4 +-
 9 files changed, 182 insertions(+), 289 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 462818f7aa1ffca64aa0d4346979e2fb52f48f0d

From git at git.haskell.org  Sun Dec 20 07:47:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:26 +0000 (UTC)
Subject: [commit: packages/time] master: migrate to XCode 2.1 (64d9973)
Message-ID: <20151220074726.4FBFA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/64d997335afcb2b4334eb035f2739bc81a4f45b8

>---------------------------------------------------------------

commit 64d997335afcb2b4334eb035f2739bc81a4f45b8
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jul 3 17:21:10 2005 -0700

    migrate to XCode 2.1
    
    darcs-hash:20050704002110-ac6dd-06b1bdc0aefafb58e05bc7ca7bc82da13dd8c902


>---------------------------------------------------------------

64d997335afcb2b4334eb035f2739bc81a4f45b8
 TimeLib.xcode/project.pbxproj     | 571 ------------------------------
 TimeLib.xcodeproj/project.pbxproj | 709 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 709 insertions(+), 571 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 64d997335afcb2b4334eb035f2739bc81a4f45b8

From git at git.haskell.org  Sun Dec 20 07:47:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:28 +0000 (UTC)
Subject: [commit: packages/time] master: use BSD license (02e4b6b)
Message-ID: <20151220074728.56C9D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/02e4b6bcacc7d6c6a92ece300e8a89b684c206ca

>---------------------------------------------------------------

commit 02e4b6bcacc7d6c6a92ece300e8a89b684c206ca
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jul 3 20:41:14 2005 -0700

    use BSD license
    
    darcs-hash:20050704034114-ac6dd-3e117fba8fe901eae07dbbf7462eb350e1a38931


>---------------------------------------------------------------

02e4b6bcacc7d6c6a92ece300e8a89b684c206ca
 LICENSE       | 10 ++++++++++
 TimeLib.cabal |  4 ++--
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..17f1f27
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,10 @@
+TimeLib is Copyright (c) Ashley Yakeley, 2004-2005.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+- Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+- Neither name of the copyright holders nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/TimeLib.cabal b/TimeLib.cabal
index 60895d0..c4b6a45 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -1,8 +1,8 @@
 Name:		time
 Version:	0.1
 Stability:	Alpha
--- unsure of best license
-License:	AllRightsReserved
+License:	BSD3
+License-File:	LICENSE
 Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:


From git at git.haskell.org  Sun Dec 20 07:47:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:30 +0000 (UTC)
Subject: [commit: packages/time] master: fix cabal file private mods (1a29bf0)
Message-ID: <20151220074730.5FF723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1a29bf0d401182730710d0f13d3985980b2a7012

>---------------------------------------------------------------

commit 1a29bf0d401182730710d0f13d3985980b2a7012
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jul 4 16:25:13 2005 -0700

    fix cabal file private mods
    
    darcs-hash:20050704232513-ac6dd-b41a00c8152f74b5551fa51fb7eeb3c19b405783


>---------------------------------------------------------------

1a29bf0d401182730710d0f13d3985980b2a7012
 TimeLib.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index c4b6a45..06ce2d7 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,4 +12,4 @@ Synopsis:	a new time library
 Exposed-modules:	Data.Fixed, System.Time.Clock, System.Time.TAI, System.Time.Calendar.Timezone, System.Time.Calendar.TimeOfDay, System.Time.Calendar.Calendar, System.Time.Calendar.Gregorian, System.Time.Calendar.ISOWeek, System.Time.Calendar.Format, System.Time.Calendar
 Extensions:	ForeignFunctionInterface
 C-Sources:	timestuff.c
-Other-modules:	System.Time.Calendar.Private
+Other-modules:	System.Time.Calendar.Private, System.Time.Clock.Scale, System.Time.Clock.UTC, System.Time.Clock.POSIX, System.Time.Clock.Current


From git at git.haskell.org  Sun Dec 20 07:47:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:32 +0000 (UTC)
Subject: [commit: packages/time] master: add missing Current file (bcb1ac3)
Message-ID: <20151220074732.661483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/bcb1ac36593fe40e822f89c8800641bbb1c0c3ae

>---------------------------------------------------------------

commit bcb1ac36593fe40e822f89c8800641bbb1c0c3ae
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jul 4 16:27:49 2005 -0700

    add missing Current file
    
    darcs-hash:20050704232749-ac6dd-643f88f66a58d3c45c317cac5d85ef31b471fbb0


>---------------------------------------------------------------

bcb1ac36593fe40e822f89c8800641bbb1c0c3ae
 System/Time/Clock/Current.hs | 42 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 42 insertions(+)

diff --git a/System/Time/Clock/Current.hs b/System/Time/Clock/Current.hs
new file mode 100644
index 0000000..66f4809
--- /dev/null
+++ b/System/Time/Clock/Current.hs
@@ -0,0 +1,42 @@
+{-# OPTIONS -ffi -Wall -Werror #-}
+
+-- #hide
+module System.Time.Clock.Current
+(
+	-- * Current time
+	getCurrentTime,
+) where
+
+import System.Time.Clock.UTC
+
+import Foreign
+import Foreign.C
+
+data CTimeval = MkCTimeval CLong CLong
+
+ctimevalToPosixSeconds :: CTimeval -> POSIXTime
+ctimevalToPosixSeconds (MkCTimeval s mus) = (fromIntegral s) + (fromIntegral mus) / 1000000
+
+instance Storable CTimeval where
+	sizeOf _ = (sizeOf (undefined :: CLong)) * 2
+	alignment _ = alignment (undefined :: CLong)
+	peek p = do
+		s   <- peekElemOff (castPtr p) 0
+		mus <- peekElemOff (castPtr p) 1
+		return (MkCTimeval s mus)
+	poke p (MkCTimeval s mus) = do
+		pokeElemOff (castPtr p) 0 s
+		pokeElemOff (castPtr p) 1 mus
+
+foreign import ccall unsafe "time.h gettimeofday" gettimeofday :: Ptr CTimeval -> Ptr () -> IO CInt
+
+-- | Get the current UTC time from the system clock.
+getCurrentTime :: IO UTCTime
+getCurrentTime = with (MkCTimeval 0 0) (\ptval -> do
+	result <- gettimeofday ptval nullPtr
+	if (result == 0)
+	 then do
+	 	tval <- peek ptval
+	 	return (posixSecondsToUTCTime (ctimevalToPosixSeconds tval))
+	 else fail ("error in gettimeofday: " ++ (show result))
+	)


From git at git.haskell.org  Sun Dec 20 07:47:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:34 +0000 (UTC)
Subject: [commit: packages/time] master: fix exposed/hidden module lists in
 cabal file (53e4437)
Message-ID: <20151220074734.6D2AF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/53e4437d8a8d6ae470579eb4282a0384f4f6d381

>---------------------------------------------------------------

commit 53e4437d8a8d6ae470579eb4282a0384f4f6d381
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Jul 7 01:37:32 2005 -0700

    fix exposed/hidden module lists in cabal file
    
    darcs-hash:20050707083732-ac6dd-992773e72a12d14203e5decdb323b0e88219f2a2


>---------------------------------------------------------------

53e4437d8a8d6ae470579eb4282a0384f4f6d381
 TimeLib.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index 06ce2d7..903907c 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -9,7 +9,7 @@ Homepage:
 Category:
 Build-Depends:	base
 Synopsis:	a new time library
-Exposed-modules:	Data.Fixed, System.Time.Clock, System.Time.TAI, System.Time.Calendar.Timezone, System.Time.Calendar.TimeOfDay, System.Time.Calendar.Calendar, System.Time.Calendar.Gregorian, System.Time.Calendar.ISOWeek, System.Time.Calendar.Format, System.Time.Calendar
+Exposed-modules:	Data.Fixed, System.Time.Clock, System.Time.TAI,  System.Time.Calendar
 Extensions:	ForeignFunctionInterface
 C-Sources:	timestuff.c
-Other-modules:	System.Time.Calendar.Private, System.Time.Clock.Scale, System.Time.Clock.UTC, System.Time.Clock.POSIX, System.Time.Clock.Current
+Other-modules:	System.Time.Clock.Scale, System.Time.Clock.UTC, System.Time.Clock.POSIX, System.Time.Clock.Current, System.Time.Calendar.Private, System.Time.Calendar.Timezone, System.Time.Calendar.TimeOfDay, System.Time.Calendar.Calendar, System.Time.Calendar.Gregorian, System.Time.Calendar.ISOWeek, System.Time.Calendar.Format, System.Time.Calendar.YearDay


From git at git.haskell.org  Sun Dec 20 07:47:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:36 +0000 (UTC)
Subject: [commit: packages/time] master: difftime doc seconds (cdfb558)
Message-ID: <20151220074736.73F8F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cdfb558a851f8e91658a066692d711b484047f18

>---------------------------------------------------------------

commit cdfb558a851f8e91658a066692d711b484047f18
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Jul 8 04:28:21 2005 -0700

    difftime doc seconds
    
    darcs-hash:20050708112821-ac6dd-ce19449da430dad80f8cb0375be757416fc495bf


>---------------------------------------------------------------

cdfb558a851f8e91658a066692d711b484047f18
 System/Time/Clock/Scale.hs | 2 ++
 System/Time/Clock/UTC.hs   | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/System/Time/Clock/Scale.hs b/System/Time/Clock/Scale.hs
index 3150dbc..2cb56e7 100644
--- a/System/Time/Clock/Scale.hs
+++ b/System/Time/Clock/Scale.hs
@@ -21,6 +21,8 @@ type ModJulianDay = Integer
 type ModJulianDate = Rational
 
 -- | This is a length of time, as measured by a clock.
+-- Conversion functions will treat it as seconds.
+-- It has an accuracy of 10^-12 s.
 newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord)
 
 instance Enum DiffTime where
diff --git a/System/Time/Clock/UTC.hs b/System/Time/Clock/UTC.hs
index 3c59fdd..1cdf8d2 100644
--- a/System/Time/Clock/UTC.hs
+++ b/System/Time/Clock/UTC.hs
@@ -39,6 +39,8 @@ instance Ord UTCTime where
 		cmp -> cmp
 
 -- | This is a length of time, as measured by UTC.
+-- Conversion functions will treat it as seconds.
+-- It has an accuracy of 10^-12 s.
 -- It ignores leap-seconds, so it's not necessarily a fixed amount of clock time.
 -- For instance, 23:00 UTC + 2 hours of UTCDiffTime = 01:00 UTC (+ 1 day),
 -- regardless of whether a leap-second intervened.


From git at git.haskell.org  Sun Dec 20 07:47:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:38 +0000 (UTC)
Subject: [commit: packages/time] master: rename ISOWeek to ISOWeekDay (3ccb9bf)
Message-ID: <20151220074738.7CAD33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3ccb9bf252051f8207e2726c51d843bc2e0457da

>---------------------------------------------------------------

commit 3ccb9bf252051f8207e2726c51d843bc2e0457da
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Jul 8 04:29:01 2005 -0700

    rename ISOWeek to ISOWeekDay
    
    darcs-hash:20050708112901-ac6dd-0a17d5e4667c94e263e72102946669ee9ae85fbe


>---------------------------------------------------------------

3ccb9bf252051f8207e2726c51d843bc2e0457da
 Makefile                                           | 14 +++++++-------
 System/Time/Calendar.hs                            |  4 ++--
 System/Time/Calendar/Format.hs                     |  6 +++---
 System/Time/Calendar/{ISOWeek.hs => ISOWeekDay.hs} | 16 ++++++++--------
 TimeLib.cabal                                      |  2 +-
 TimeLib.xcodeproj/project.pbxproj                  |  4 ++--
 test/ConvertBack.hs                                |  2 +-
 7 files changed, 24 insertions(+), 24 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3ccb9bf252051f8207e2726c51d843bc2e0457da

From git at git.haskell.org  Sun Dec 20 07:47:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:40 +0000 (UTC)
Subject: [commit: packages/time] master: Separate out DayEncoding into Days.hs
 (0fdf95f)
Message-ID: <20151220074740.85C073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0fdf95fc5443c0fde004ce4b78714149c6bcad49

>---------------------------------------------------------------

commit 0fdf95fc5443c0fde004ce4b78714149c6bcad49
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jul 10 05:03:45 2005 -0700

    Separate out DayEncoding into Days.hs
    
    darcs-hash:20050710120345-ac6dd-59f2e7e97354dd8b99ee92c3d5aebac00ce2b806


>---------------------------------------------------------------

0fdf95fc5443c0fde004ce4b78714149c6bcad49
 Makefile                           | 42 ++++++++++++++++++++++----------------
 System/Time/Calendar.hs            | 14 +++++++------
 System/Time/Calendar/Calendar.hs   | 15 ++------------
 System/Time/Calendar/Days.hs       | 22 ++++++++++++++++++++
 System/Time/Calendar/Format.hs     |  1 +
 System/Time/Calendar/Gregorian.hs  |  2 +-
 System/Time/Calendar/ISOWeekDay.hs |  2 +-
 System/Time/Calendar/YearDay.hs    |  2 +-
 TimeLib.cabal                      | 23 ++++++++++++++++++---
 TimeLib.xcodeproj/project.pbxproj  | 10 +++++----
 10 files changed, 86 insertions(+), 47 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0fdf95fc5443c0fde004ce4b78714149c6bcad49

From git at git.haskell.org  Sun Dec 20 07:47:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:42 +0000 (UTC)
Subject: [commit: packages/time] master: Major simplification of calendar
 types (3cec8f8)
Message-ID: <20151220074742.8EB793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3cec8f830b4bf234ccc317bd44aedb5baad2f50b

>---------------------------------------------------------------

commit 3cec8f830b4bf234ccc317bd44aedb5baad2f50b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Aug 3 17:51:41 2005 -0700

    Major simplification of calendar types
    
    darcs-hash:20050804005141-ac6dd-b0b617b54ea958834c74238d9096231534661cc8


>---------------------------------------------------------------

3cec8f830b4bf234ccc317bd44aedb5baad2f50b
 Makefile                           |  9 ++---
 System/Time/Calendar.hs            | 12 ++----
 System/Time/Calendar/Calendar.hs   | 75 ++++++++++++++++++++------------------
 System/Time/Calendar/Days.hs       | 53 +++++++++++++++++++++------
 System/Time/Calendar/Format.hs     | 49 ++++++++++---------------
 System/Time/Calendar/Gregorian.hs  | 39 ++++++++++----------
 System/Time/Calendar/ISOWeekDay.hs | 45 ++++++++++-------------
 System/Time/Calendar/YearDay.hs    | 61 +++++++++++++++----------------
 System/Time/Clock/Scale.hs         |  8 ++--
 System/Time/Clock/UTC.hs           | 11 +++---
 System/Time/TAI.hs                 |  9 +++--
 TimeLib.xcodeproj/project.pbxproj  |  4 +-
 test/ConvertBack.hs                | 26 ++++++-------
 test/CurrentTime.hs                |  4 +-
 test/ShowDST.hs                    |  6 +--
 test/TestFormat.hs                 | 14 +++----
 test/TestTime.hs                   | 33 +++++++++--------
 17 files changed, 232 insertions(+), 226 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3cec8f830b4bf234ccc317bd44aedb5baad2f50b

From git at git.haskell.org  Sun Dec 20 07:47:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:44 +0000 (UTC)
Subject: [commit: packages/time] master: move from System to Data (64ab015)
Message-ID: <20151220074744.9A6763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/64ab015da821a8b9a43721683be81c8dae4e319b

>---------------------------------------------------------------

commit 64ab015da821a8b9a43721683be81c8dae4e319b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Aug 3 21:56:18 2005 -0700

    move from System to Data
    
    darcs-hash:20050804045618-ac6dd-17cb2c59d50efd7409c0cad1a5a6afbfafffdb19


>---------------------------------------------------------------

64ab015da821a8b9a43721683be81c8dae4e319b
 {System => Data}/Time/Calendar.hs            |  40 +++----
 {System => Data}/Time/Calendar/Calendar.hs   |  12 +-
 {System => Data}/Time/Calendar/Days.hs       |   2 +-
 {System => Data}/Time/Calendar/Format.hs     |  24 ++--
 {System => Data}/Time/Calendar/Gregorian.hs  |   8 +-
 {System => Data}/Time/Calendar/ISOWeekDay.hs |  10 +-
 {System => Data}/Time/Calendar/Private.hs    |   2 +-
 {System => Data}/Time/Calendar/TimeOfDay.hs  |   8 +-
 {System => Data}/Time/Calendar/Timezone.hs   |   8 +-
 {System => Data}/Time/Calendar/YearDay.hs    |   8 +-
 Data/Time/Clock.hs                           |  13 +++
 {System => Data}/Time/Clock/Current.hs       |   4 +-
 {System => Data}/Time/Clock/POSIX.hs         |   4 +-
 {System => Data}/Time/Clock/Scale.hs         |   2 +-
 {System => Data}/Time/Clock/UTC.hs           |   6 +-
 {System => Data}/Time/TAI.hs                 |   6 +-
 Makefile                                     | 164 +++++++++++++--------------
 System/Time/Clock.hs                         |  13 ---
 TimeLib.cabal                                |  32 +++---
 TimeLib.xcodeproj/project.pbxproj            |   5 +-
 test/ConvertBack.hs                          |   2 +-
 test/CurrentTime.hs                          |   6 +-
 test/ShowDST.hs                              |   4 +-
 test/TestFormat.hs                           |   6 +-
 test/TestTime.hs                             |   4 +-
 test/TimeZone.hs                             |   4 +-
 26 files changed, 198 insertions(+), 199 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 64ab015da821a8b9a43721683be81c8dae4e319b

From git at git.haskell.org  Sun Dec 20 07:47:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:46 +0000 (UTC)
Subject: [commit: packages/time] master: correct showing of years before 1000
 CE, with test (869ebcc)
Message-ID: <20151220074746.A54B53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/869ebcc990f261502b5121373cbd6c689ac6e954

>---------------------------------------------------------------

commit 869ebcc990f261502b5121373cbd6c689ac6e954
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Aug 3 23:27:38 2005 -0700

    correct showing of years before 1000 CE, with test
    
    darcs-hash:20050804062738-ac6dd-b4c6228b0b4847944ef83f880cfa977035c1ea5c


>---------------------------------------------------------------

869ebcc990f261502b5121373cbd6c689ac6e954
 Data/Time/Calendar/Format.hs     |    6 +-
 Data/Time/Calendar/Gregorian.hs  |    2 +-
 Data/Time/Calendar/ISOWeekDay.hs |    2 +-
 Data/Time/Calendar/Private.hs    |   17 +-
 Data/Time/Calendar/YearDay.hs    |    2 +-
 test/TestTime.hs                 |    9 +-
 test/TestTime.ref                | 1612 ++++++++++++++++++++------------------
 7 files changed, 884 insertions(+), 766 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 869ebcc990f261502b5121373cbd6c689ac6e954

From git at git.haskell.org  Sun Dec 20 07:47:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:48 +0000 (UTC)
Subject: [commit: packages/time] master: clip incorrect values in converters,
 with tests (b107508)
Message-ID: <20151220074748.AEFFF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b107508b2e78edf6ba7b42b5e9cbd6247ed1dc7c

>---------------------------------------------------------------

commit b107508b2e78edf6ba7b42b5e9cbd6247ed1dc7c
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Aug 5 23:01:28 2005 -0700

    clip incorrect values in converters, with tests
    
    darcs-hash:20050806060128-ac6dd-bbc8cb9b16607d205fcf9b10a927e23c33a971e1


>---------------------------------------------------------------

b107508b2e78edf6ba7b42b5e9cbd6247ed1dc7c
 Data/Time/Calendar/Gregorian.hs   |  10 +-
 Data/Time/Calendar/ISOWeekDay.hs  |  13 +-
 Data/Time/Calendar/Private.hs     |   5 +
 Data/Time/Calendar/YearDay.hs     |   2 +-
 TimeLib.xcodeproj/project.pbxproj |   8 +
 test/ClipDates.hs                 |  24 ++
 test/ClipDates.ref                | 561 ++++++++++++++++++++++++++++++++++++++
 test/LongWeekYears.hs             |  17 ++
 test/LongWeekYears.ref            | 150 ++++++++++
 test/Makefile                     |   8 +-
 10 files changed, 787 insertions(+), 11 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b107508b2e78edf6ba7b42b5e9cbd6247ed1dc7c

From git at git.haskell.org  Sun Dec 20 07:47:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:50 +0000 (UTC)
Subject: [commit: packages/time] master: new gregorianMonthLength function
 (cfab0ea)
Message-ID: <20151220074750.B539A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cfab0ea8c8107f76745a3bde61519b6bdd46c539

>---------------------------------------------------------------

commit cfab0ea8c8107f76745a3bde61519b6bdd46c539
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 13:38:12 2005 -0700

    new gregorianMonthLength function
    
    darcs-hash:20050806203812-ac6dd-9110023cbd93ef6501f65be4439cac6093c372c9


>---------------------------------------------------------------

cfab0ea8c8107f76745a3bde61519b6bdd46c539
 Data/Time/Calendar/Gregorian.hs | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/Data/Time/Calendar/Gregorian.hs b/Data/Time/Calendar/Gregorian.hs
index 74b1435..9e83440 100644
--- a/Data/Time/Calendar/Gregorian.hs
+++ b/Data/Time/Calendar/Gregorian.hs
@@ -4,7 +4,7 @@
 module Data.Time.Calendar.Gregorian
 (
 	-- * Gregorian calendar
-	gregorian,fromGregorian,showGregorian
+	gregorian,fromGregorian,showGregorian,gregorianMonthLength
 
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
@@ -22,13 +22,13 @@ gregorian date = (year,month,day) where
 fromGregorian :: Integer -> Int -> Int -> Date
 -- formula from <http://en.wikipedia.org/wiki/Julian_Day>
 fromGregorian year month day = ModJulianDay
-	((fromIntegral (clip 1 monthLength day)) + (div (153 * m + 2) 5) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678882) where
+	(day' + (div (153 * m + 2) 5) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678882) where
 	month' = clip 1 12 month
 	month'' = fromIntegral month'
 	a = div (14 - month'') 12
 	y = year - a
 	m = month'' + (12 * a) - 3
-	monthLength = (monthLengths (isLeapYear year)) !! (month' - 1)
+	day' = fromIntegral (clip 1 (gregorianMonthLength' year month') day)
 
 showGregorian :: Date -> String
 showGregorian date = (show4 y) ++ "-" ++ (show2 m) ++ "-" ++ (show2 d) where
@@ -38,6 +38,13 @@ findMonthDay :: [Int] -> Int -> (Int,Int)
 findMonthDay (n:ns) yd | yd > n = (\(m,d) -> (m + 1,d)) (findMonthDay ns (yd - n))
 findMonthDay _ yd = (1,yd)
 
+gregorianMonthLength' :: Integer -> Int -> Int
+gregorianMonthLength' year month' = (monthLengths (isLeapYear year)) !! (month' - 1)
+
+-- | The number of days in a given month according to the proleptic Gregorian calendar. First argument is year, second is month.
+gregorianMonthLength :: Integer -> Int -> Int
+gregorianMonthLength year month = gregorianMonthLength' year (clip 1 12 month)
+
 monthLengths :: Bool -> [Int]
 monthLengths isleap = 
 	[31,if isleap then 29 else 28,31,30,31,30,31,31,30,31,30,31]


From git at git.haskell.org  Sun Dec 20 07:47:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:52 +0000 (UTC)
Subject: [commit: packages/time] master: conversion documentation (c2ff391)
Message-ID: <20151220074752.BCF4F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c2ff391a8786ebeba2e6574634ddc7d70e039822

>---------------------------------------------------------------

commit c2ff391a8786ebeba2e6574634ddc7d70e039822
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 13:42:34 2005 -0700

    conversion documentation
    
    darcs-hash:20050806204234-ac6dd-6b698b3ab0328723f4da2ca9f22000b8792cbee8


>---------------------------------------------------------------

c2ff391a8786ebeba2e6574634ddc7d70e039822
 Data/Time/Calendar/Gregorian.hs  | 4 ++++
 Data/Time/Calendar/ISOWeekDay.hs | 7 ++++++-
 Data/Time/Calendar/YearDay.hs    | 7 ++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Calendar/Gregorian.hs b/Data/Time/Calendar/Gregorian.hs
index 9e83440..3312b29 100644
--- a/Data/Time/Calendar/Gregorian.hs
+++ b/Data/Time/Calendar/Gregorian.hs
@@ -14,11 +14,14 @@ import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
+-- | convert to proleptic Gregorian calendar. First element of result is year, second month number (1-12), third day (1-31).
 gregorian :: Date -> (Integer,Int,Int)
 gregorian date = (year,month,day) where
 	(year,yd) = yearAndDay date
 	(month,day) = findMonthDay (monthLengths (isLeapYear year)) yd
 
+-- | convert from proleptic Gregorian calendar. First argument is year, second month number (1-12), third day (1-31).
+-- Invalid values will be clipped to the correct range, month first, then day.
 fromGregorian :: Integer -> Int -> Int -> Date
 -- formula from <http://en.wikipedia.org/wiki/Julian_Day>
 fromGregorian year month day = ModJulianDay
@@ -30,6 +33,7 @@ fromGregorian year month day = ModJulianDay
 	m = month'' + (12 * a) - 3
 	day' = fromIntegral (clip 1 (gregorianMonthLength' year month') day)
 
+-- | show in ISO 8601 format (yyyy-mm-dd)
 showGregorian :: Date -> String
 showGregorian date = (show4 y) ++ "-" ++ (show2 m) ++ "-" ++ (show2 d) where
 	(y,m,d) = gregorian date
diff --git a/Data/Time/Calendar/ISOWeekDay.hs b/Data/Time/Calendar/ISOWeekDay.hs
index 2dbd7e9..0c23495 100644
--- a/Data/Time/Calendar/ISOWeekDay.hs
+++ b/Data/Time/Calendar/ISOWeekDay.hs
@@ -3,7 +3,7 @@
 -- #hide
 module Data.Time.Calendar.ISOWeekDay
 	(
-	-- * ISO Week calendar
+	-- * ISO 8601 Week calendar
 	module Data.Time.Calendar.ISOWeekDay
 	) where
 
@@ -11,6 +11,9 @@ import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
+-- | convert to ISO 8601 Week format. First element of result is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
+-- Note that "Week" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
+-- The first week of a year is the first week to contain at least four days in the corresponding Gregorian year.
 isoWeekDay :: Date -> (Integer,Int,Int)
 isoWeekDay date@(ModJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d 7) + 1) where
 	(y0,yd) = yearAndDay date
@@ -27,6 +30,7 @@ isoWeekDay date@(ModJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d
 			else (y0,w0)
 		else (y0,w0)
 
+-- | convert from ISO 8601 Week format. First argument is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
 fromISOWeekDay :: Integer -> Int -> Int -> Date
 fromISOWeekDay y w d = ModJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if longYear then 53 else 52) w) * 7) + (clip 1 7 d))) - 10) where
 		k = getModJulianDay (fromYearAndDay y 6)
@@ -34,6 +38,7 @@ fromISOWeekDay y w d = ModJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if lo
 			(_,53,_) -> True
 			_ -> False
 
+-- | show in ISO 8601 Week format as yyyy-Www-dd (e.g. 
 showISOWeekDay :: Date -> String
 showISOWeekDay date = (show4 y) ++ "-W" ++ (show2 w) ++ "-" ++ (show d) where
 	(y,w,d) = isoWeekDay date
diff --git a/Data/Time/Calendar/YearDay.hs b/Data/Time/Calendar/YearDay.hs
index 6b8790a..68fe0da 100644
--- a/Data/Time/Calendar/YearDay.hs
+++ b/Data/Time/Calendar/YearDay.hs
@@ -10,6 +10,8 @@ module Data.Time.Calendar.YearDay
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
+-- | convert to ISO 8601 Ordinal Date format. First element of result is year (proleptic Gregoran calendar),
+-- second is the day of the year, with 1 for Jan 1, and 365 (or 366 in leap years) for Dec 31.
 yearAndDay :: Date -> (Integer,Int)
 yearAndDay (ModJulianDay mjd) = (year,yd) where
 	a = mjd + 678575
@@ -23,16 +25,19 @@ yearAndDay (ModJulianDay mjd) = (year,yd) where
 	yd = fromInteger (d - (y * 365) + 1)
 	year = quadcent * 400 + cent * 100 + quad * 4 + y + 1
 
+-- | convert from ISO 8601 Ordinal Date format.
+-- Invalid day numbers will be clipped to the correct range (1 to 365 or 366).
 fromYearAndDay :: Integer -> Int -> Date
 fromYearAndDay year day = ModJulianDay mjd where
 	y = year - 1
 	mjd = (fromIntegral (clip 1 (if isLeapYear year then 366 else 365) day)) + (div (1532) 5) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678882
 
--- | ISO 8601 Ordinal Date
+-- | show in ISO 8601 Ordinal Date format (yyyy-ddd)
 showYearAndDay :: Date -> String
 showYearAndDay date = (show4 y) ++ "-" ++ (show3 d) where
 	(y,d) = yearAndDay date
 
+-- | Is this year a leap year according to the propleptic Gregorian calendar?
 isLeapYear :: Integer -> Bool
 isLeapYear year = (mod year 4 == 0) && ((mod year 400 == 0) || not (mod year 100 == 0))
 


From git at git.haskell.org  Sun Dec 20 07:47:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:54 +0000 (UTC)
Subject: [commit: packages/time] master: more time doc (8cea925)
Message-ID: <20151220074754.C35BD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8cea925e57e0498cab65f7d92e1aef6fc84e1d07

>---------------------------------------------------------------

commit 8cea925e57e0498cab65f7d92e1aef6fc84e1d07
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 14:03:50 2005 -0700

    more time doc
    
    darcs-hash:20050806210350-ac6dd-137bddea624190e5df0f8db7b5eaf47662da1d26


>---------------------------------------------------------------

8cea925e57e0498cab65f7d92e1aef6fc84e1d07
 Data/Time/Calendar/ISOWeekDay.hs | 3 ++-
 Data/Time/Calendar/TimeOfDay.hs  | 6 ++++++
 Data/Time/Calendar/Timezone.hs   | 8 +++++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Calendar/ISOWeekDay.hs b/Data/Time/Calendar/ISOWeekDay.hs
index 0c23495..ea6522b 100644
--- a/Data/Time/Calendar/ISOWeekDay.hs
+++ b/Data/Time/Calendar/ISOWeekDay.hs
@@ -30,7 +30,8 @@ isoWeekDay date@(ModJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d
 			else (y0,w0)
 		else (y0,w0)
 
--- | convert from ISO 8601 Week format. First argument is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
+-- | convert from ISO 8601 Week format. First argument is year, second week number (1-52 or 53), third day of week (1 for Monday to 7 for Sunday).
+-- Invalid week and day values will be clipped to the correct range.
 fromISOWeekDay :: Integer -> Int -> Int -> Date
 fromISOWeekDay y w d = ModJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if longYear then 53 else 52) w) * 7) + (clip 1 7 d))) - 10) where
 		k = getModJulianDay (fromYearAndDay y 6)
diff --git a/Data/Time/Calendar/TimeOfDay.hs b/Data/Time/Calendar/TimeOfDay.hs
index b064048..c8598c2 100644
--- a/Data/Time/Calendar/TimeOfDay.hs
+++ b/Data/Time/Calendar/TimeOfDay.hs
@@ -17,14 +17,20 @@ import Data.Fixed
 
 -- | Time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day.
 data TimeOfDay = TimeOfDay {
+	-- | range 0 - 23
 	todHour    :: Int,
+	-- | range 0 - 59
 	todMin     :: Int,
+	-- | Note that 0 <= todSec < 61, accomodating leap seconds.
+	-- Any local minute may have a leap second, since leap seconds happen in all zones simultaneously
 	todSec     :: Pico
 } deriving (Eq,Ord)
 
+-- | Hour zero
 midnight :: TimeOfDay
 midnight = TimeOfDay 0 0 0
 
+-- | Hour twelve
 midday :: TimeOfDay
 midday = TimeOfDay 12 0 0
 
diff --git a/Data/Time/Calendar/Timezone.hs b/Data/Time/Calendar/Timezone.hs
index 525b91b..f2b3ea6 100644
--- a/Data/Time/Calendar/Timezone.hs
+++ b/Data/Time/Calendar/Timezone.hs
@@ -18,22 +18,28 @@ import Data.Time.Clock.POSIX
 import Foreign
 import Foreign.C
 
--- | count of minutes
+-- | A Timezone is a whole number of minutes offset from UTC, together with a name and a "just for summer" flag.
 data Timezone = MkTimezone {
+	-- | The number of minutes offset from UTC. Positive means local time will be later in the day than UTC.
 	timezoneMinutes :: Int,
+	-- | Is this time zone just persisting for the summer?
 	timezoneDST :: Bool,
+	-- | The name of the zone, typically a three- or four-letter acronym.
 	timezoneName :: String
 } deriving (Eq,Ord)
 
+-- | Create a nameless non-summer timezone for this number of minutes
 minutesToTimezone :: Int -> Timezone
 minutesToTimezone m = MkTimezone m False ""
 
+-- | Create a nameless non-summer timezone for this number of hours
 hoursToTimezone :: Int -> Timezone
 hoursToTimezone i = minutesToTimezone (60 * i)
 
 showT :: Int -> String
 showT t = (show2 (div t 60)) ++ (show2 (mod t 60))
 
+-- | Text representing the offset of this timezone, such as \"-0800\" or \"+0400\" (like %z in formatTime)
 timezoneOffsetString :: Timezone -> String
 timezoneOffsetString (MkTimezone t _ _) | t < 0 = '-':(showT (negate t))
 timezoneOffsetString (MkTimezone t _ _) = '+':(showT t)


From git at git.haskell.org  Sun Dec 20 07:47:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:56 +0000 (UTC)
Subject: [commit: packages/time] master: rename names in
 Data.Time.Calendar.Calendar (f35dd9e)
Message-ID: <20151220074756.CB6353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f35dd9eab042ed2dc568555ffb131b1b8a08d264

>---------------------------------------------------------------

commit f35dd9eab042ed2dc568555ffb131b1b8a08d264
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 14:38:39 2005 -0700

    rename names in Data.Time.Calendar.Calendar
    
    darcs-hash:20050806213839-ac6dd-24d6c932075fefea6d82a558b809686ce68757bb


>---------------------------------------------------------------

f35dd9eab042ed2dc568555ffb131b1b8a08d264
 Data/Time/Calendar.hs          | 12 +++++-----
 Data/Time/Calendar/Calendar.hs | 52 +++++++++++++++++++++---------------------
 Data/Time/Calendar/Format.hs   | 12 +++++-----
 test/CurrentTime.hs            |  4 ++--
 test/ShowDST.hs                |  8 +++----
 test/TestFormat.hs             | 14 ++++++------
 test/TestTime.hs               | 22 +++++++++---------
 7 files changed, 62 insertions(+), 62 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f35dd9eab042ed2dc568555ffb131b1b8a08d264

From git at git.haskell.org  Sun Dec 20 07:47:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:47:58 +0000 (UTC)
Subject: [commit: packages/time] master: reorg modules with new LocalTime hier
 (ce92c8a)
Message-ID: <20151220074758.D69173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ce92c8a5ab39a42df4742655bd8d544e1d376e4c

>---------------------------------------------------------------

commit ce92c8a5ab39a42df4742655bd8d544e1d376e4c
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 15:46:20 2005 -0700

    reorg modules with new LocalTime hier
    
    darcs-hash:20050806224620-ac6dd-662c819750a100ceb819d242dac41751d74c0154


>---------------------------------------------------------------

ce92c8a5ab39a42df4742655bd8d544e1d376e4c
 Data/Time/Calendar.hs                              | 44 +------------
 Data/Time/{Calendar => LocalTime}/Format.hs        | 10 +--
 .../Calendar.hs => LocalTime/LocalTime.hs}         | 11 ++--
 Data/Time/{Calendar => LocalTime}/TimeOfDay.hs     |  4 +-
 Data/Time/{Calendar => LocalTime}/Timezone.hs      |  2 +-
 Makefile                                           | 77 ++++++++++++----------
 TimeLib.xcodeproj/project.pbxproj                  | 18 ++++-
 test/CurrentTime.hs                                |  6 +-
 test/ShowDST.hs                                    |  5 +-
 test/TestFixed.hs                                  |  2 +
 test/TestFormat.hs                                 |  3 +-
 test/TestTime.hs                                   |  3 +-
 test/TimeZone.hs                                   |  5 +-
 13 files changed, 84 insertions(+), 106 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ce92c8a5ab39a42df4742655bd8d544e1d376e4c

From git at git.haskell.org  Sun Dec 20 07:48:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:00 +0000 (UTC)
Subject: [commit: packages/time] master: Timezone -> TimeZone (3db5c8e)
Message-ID: <20151220074800.E1D0D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3db5c8e08b16fd9d39dd829787c3a8d659f7d371

>---------------------------------------------------------------

commit 3db5c8e08b16fd9d39dd829787c3a8d659f7d371
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 16:16:46 2005 -0700

    Timezone -> TimeZone
    
    darcs-hash:20050806231646-ac6dd-d82ec74508635fa1210768b6ae3a6e0ae360602c


>---------------------------------------------------------------

3db5c8e08b16fd9d39dd829787c3a8d659f7d371
 Data/Time/LocalTime/Format.hs                    |  8 ++--
 Data/Time/LocalTime/LocalTime.hs                 | 14 +++----
 Data/Time/LocalTime/TimeOfDay.hs                 | 10 ++---
 Data/Time/LocalTime/{Timezone.hs => TimeZone.hs} | 50 ++++++++++++------------
 Makefile                                         | 18 ++++-----
 TimeLib.xcodeproj/project.pbxproj                |  4 +-
 test/CurrentTime.hs                              |  2 +-
 test/ShowDST.hs                                  | 14 +++----
 test/TestFormat.hs                               | 14 +++----
 test/TestTime.hs                                 |  4 +-
 test/TimeZone.hs                                 |  4 +-
 11 files changed, 71 insertions(+), 71 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3db5c8e08b16fd9d39dd829787c3a8d659f7d371

From git at git.haskell.org  Sun Dec 20 07:48:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:02 +0000 (UTC)
Subject: [commit: packages/time] master: fix TimeLib.cabal (aba753e)
Message-ID: <20151220074802.E82B63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/aba753e95dbc55cf87493fb05960bba36841e83f

>---------------------------------------------------------------

commit aba753e95dbc55cf87493fb05960bba36841e83f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 16:25:16 2005 -0700

    fix TimeLib.cabal
    
    darcs-hash:20050806232516-ac6dd-75b60635df2f90092b75e60e72ae17fc9e47e5ff


>---------------------------------------------------------------

aba753e95dbc55cf87493fb05960bba36841e83f
 TimeLib.cabal | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index 42ad145..ec8e9ad 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -11,22 +11,24 @@ Build-Depends:	base
 Synopsis:	a new time library
 Exposed-modules:
 	Data.Fixed,
+	Data.Time.Calendar,
 	Data.Time.Clock,
 	Data.Time.TAI,
-	Data.Time.Calendar
+	Data.Time.LocalTime,
+	Data.Time
 Extensions:	ForeignFunctionInterface
 C-Sources:	timestuff.c
 Other-modules:
-	Data.Time.Clock.Scale,
-	Data.Time.Clock.UTC,
-	Data.Time.Clock.POSIX,
-	Data.Time.Clock.Current,
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,
-	Data.Time.Calendar.Calendar,
+	Data.Time.Calendar.YearDay,
 	Data.Time.Calendar.Gregorian,
 	Data.Time.Calendar.ISOWeekDay,
-	Data.Time.Calendar.Format,
-	Data.Time.Calendar.YearDay,
-	Data.Time.Calendar.Timezone,
-	Data.Time.Calendar.TimeOfDay
+	Data.Time.Clock.Scale,
+	Data.Time.Clock.UTC,
+	Data.Time.Clock.POSIX,
+	Data.Time.Clock.Current,
+	Data.Time.LocalTime.TimeZone,
+	Data.Time.LocalTime.TimeOfDay,
+	Data.Time.LocalTime.LocalTime,
+	Data.Time.LocalTime.Format


From git at git.haskell.org  Sun Dec 20 07:48:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:04 +0000 (UTC)
Subject: [commit: packages/time] master: tiny doc fix (e2b7e0f)
Message-ID: <20151220074804.EE3F93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e2b7e0f591aef5258142d3c739579b46c01efe8e

>---------------------------------------------------------------

commit e2b7e0f591aef5258142d3c739579b46c01efe8e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 21:15:05 2005 -0700

    tiny doc fix
    
    darcs-hash:20050807041505-ac6dd-5ab2844a54039f56f193821ca76a567683bacff9


>---------------------------------------------------------------

e2b7e0f591aef5258142d3c739579b46c01efe8e
 Data/Time/LocalTime/TimeZone.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index f784e8e..b9a8978 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -18,7 +18,7 @@ import Data.Time.Clock.POSIX
 import Foreign
 import Foreign.C
 
--- | A TimeZone is a whole number of minutes offset from UTC, together with a name and a "just for summer" flag.
+-- | A TimeZone is a whole number of minutes offset from UTC, together with a name and a \"just for summer\" flag.
 data TimeZone = TimeZone {
 	-- | The number of minutes offset from UTC. Positive means local time will be later in the day than UTC.
 	timeZoneMinutes :: Int,


From git at git.haskell.org  Sun Dec 20 07:48:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:07 +0000 (UTC)
Subject: [commit: packages/time] master: rename to-converter functions
 (f783b6b)
Message-ID: <20151220074807.0132B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f783b6b6042d26c7ac76763f5020e244dd9198c4

>---------------------------------------------------------------

commit f783b6b6042d26c7ac76763f5020e244dd9198c4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 21:24:37 2005 -0700

    rename to-converter functions
    
    darcs-hash:20050807042437-ac6dd-5ab571d0bdb5d64ffd32ba244050f48734dfe313


>---------------------------------------------------------------

f783b6b6042d26c7ac76763f5020e244dd9198c4
 Data/Time/Calendar/Gregorian.hs  | 10 +++++-----
 Data/Time/Calendar/ISOWeekDay.hs | 10 +++++-----
 Data/Time/Calendar/YearDay.hs    | 10 +++++-----
 Data/Time/LocalTime/Format.hs    | 28 ++++++++++++++--------------
 test/ConvertBack.hs              |  6 +++---
 test/LongWeekYears.hs            |  2 +-
 test/ShowDST.hs                  |  2 +-
 test/TestTime.hs                 |  2 +-
 8 files changed, 35 insertions(+), 35 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f783b6b6042d26c7ac76763f5020e244dd9198c4

From git at git.haskell.org  Sun Dec 20 07:48:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:09 +0000 (UTC)
Subject: [commit: packages/time] master: rename Date to Day (9c5fedd)
Message-ID: <20151220074809.08ACF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9c5fedd97c9b3b9119f0b6c6aa302c361c7c8222

>---------------------------------------------------------------

commit 9c5fedd97c9b3b9119f0b6c6aa302c361c7c8222
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Aug 6 22:05:37 2005 -0700

    rename Date to Day
    
    darcs-hash:20050807050537-ac6dd-a7752f2f5fb0d5a80c5a9e16439635f62d7c3699


>---------------------------------------------------------------

9c5fedd97c9b3b9119f0b6c6aa302c361c7c8222
 Data/Time/Calendar/Days.hs       | 68 ++++++++++++++++++++--------------------
 Data/Time/Calendar/Gregorian.hs  | 10 +++---
 Data/Time/Calendar/ISOWeekDay.hs | 14 ++++-----
 Data/Time/Calendar/YearDay.hs    | 24 +++++++-------
 Data/Time/Clock/UTC.hs           | 10 +++---
 Data/Time/LocalTime/Format.hs    |  2 +-
 Data/Time/LocalTime/LocalTime.hs | 10 +++---
 Data/Time/TAI.hs                 |  8 ++---
 test/ConvertBack.hs              | 10 +++---
 test/TestTime.hs                 |  6 ++--
 10 files changed, 81 insertions(+), 81 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9c5fedd97c9b3b9119f0b6c6aa302c361c7c8222

From git at git.haskell.org  Sun Dec 20 07:48:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:11 +0000 (UTC)
Subject: [commit: packages/time] master: reorder modules in Makefile (bbbc983)
Message-ID: <20151220074811.0F4B63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/bbbc983c7cc720e9c9d1a5fa60b4761359b29600

>---------------------------------------------------------------

commit bbbc983c7cc720e9c9d1a5fa60b4761359b29600
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 01:27:33 2005 -0700

    reorder modules in Makefile
    
    darcs-hash:20050807082733-ac6dd-52df8b71fa34fa635f3c55ac1b3bdab293234355


>---------------------------------------------------------------

bbbc983c7cc720e9c9d1a5fa60b4761359b29600
 Data/Time/LocalTime/TimeOfDay.hs |  2 +-
 Makefile                         | 46 ++++++++++++++++++++--------------------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index d59919c..a4646cf 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -51,7 +51,7 @@ posixDay :: DiffTime
 posixDay = fromInteger 86400
 
 -- | Get a TimeOfDay given a time since midnight.
--- | Time more than 24h will be converted to leap-seconds.
+-- Time more than 24h will be converted to leap-seconds.
 timeToTimeOfDay :: DiffTime -> TimeOfDay
 timeToTimeOfDay dt | dt >= posixDay = TimeOfDay 23 59 (60 + (realToFrac (dt - posixDay)))
 timeToTimeOfDay dt = TimeOfDay (fromInteger h) (fromInteger m) s where
diff --git a/Makefile b/Makefile
index cdee40c..95d5dc7 100644
--- a/Makefile
+++ b/Makefile
@@ -9,18 +9,18 @@ cleantest:
 	cd test && make clean
 
 SRCS = Data/Fixed.hs \
-	Data/Time/Clock/Scale.hs \
-	Data/Time/Clock/UTC.hs \
-	Data/Time/Clock/POSIX.hs \
-	Data/Time/Clock/Current.hs \
-	Data/Time/Clock.hs \
-	Data/Time/TAI.hs \
 	Data/Time/Calendar/Private.hs \
 	Data/Time/Calendar/Days.hs \
 	Data/Time/Calendar/YearDay.hs \
 	Data/Time/Calendar/Gregorian.hs \
 	Data/Time/Calendar/ISOWeekDay.hs \
 	Data/Time/Calendar.hs \
+	Data/Time/Clock/Scale.hs \
+	Data/Time/Clock/UTC.hs \
+	Data/Time/Clock/POSIX.hs \
+	Data/Time/Clock/Current.hs \
+	Data/Time/Clock.hs \
+	Data/Time/TAI.hs \
 	Data/Time/LocalTime/TimeZone.hs \
 	Data/Time/LocalTime/TimeOfDay.hs \
 	Data/Time/LocalTime/LocalTime.hs \
@@ -81,23 +81,6 @@ TestFixed.o: Data/Fixed.hi
 # DO NOT DELETE: Beginning of Haskell dependencies
 Data/Time/Calendar/Days.o : Data/Time/Calendar/Days.hs
 Data/Fixed.o : Data/Fixed.hs
-Data/Time/Clock/Scale.o : Data/Time/Clock/Scale.hs
-Data/Time/Clock/Scale.o : Data/Fixed.hi
-Data/Time/Clock/UTC.o : Data/Time/Clock/UTC.hs
-Data/Time/Clock/UTC.o : Data/Fixed.hi
-Data/Time/Clock/UTC.o : Data/Time/Clock/Scale.hi
-Data/Time/Clock/UTC.o : Data/Time/Calendar/Days.hi
-Data/Time/Clock/POSIX.o : Data/Time/Clock/POSIX.hs
-Data/Time/Clock/POSIX.o : Data/Time/Clock/UTC.hi
-Data/Time/Clock/Current.o : Data/Time/Clock/Current.hs
-Data/Time/Clock/Current.o : Data/Time/Clock/UTC.hi
-Data/Time/Clock.o : Data/Time/Clock.hs
-Data/Time/Clock.o : Data/Time/Clock/Current.hi
-Data/Time/Clock.o : Data/Time/Clock/UTC.hi
-Data/Time/Clock.o : Data/Time/Clock/Scale.hi
-Data/Time/TAI.o : Data/Time/TAI.hs
-Data/Time/TAI.o : Data/Time/Clock.hi
-Data/Time/TAI.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/Private.o : Data/Time/Calendar/Private.hs
 Data/Time/Calendar/Private.o : Data/Fixed.hi
 Data/Time/Calendar/YearDay.o : Data/Time/Calendar/YearDay.hs
@@ -116,6 +99,23 @@ Data/Time/Calendar.o : Data/Time/Calendar/ISOWeekDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
 Data/Time/Calendar.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
+Data/Time/Clock/Scale.o : Data/Time/Clock/Scale.hs
+Data/Time/Clock/Scale.o : Data/Fixed.hi
+Data/Time/Clock/UTC.o : Data/Time/Clock/UTC.hs
+Data/Time/Clock/UTC.o : Data/Fixed.hi
+Data/Time/Clock/UTC.o : Data/Time/Clock/Scale.hi
+Data/Time/Clock/UTC.o : Data/Time/Calendar/Days.hi
+Data/Time/Clock/POSIX.o : Data/Time/Clock/POSIX.hs
+Data/Time/Clock/POSIX.o : Data/Time/Clock/UTC.hi
+Data/Time/Clock/Current.o : Data/Time/Clock/Current.hs
+Data/Time/Clock/Current.o : Data/Time/Clock/UTC.hi
+Data/Time/Clock.o : Data/Time/Clock.hs
+Data/Time/Clock.o : Data/Time/Clock/Current.hi
+Data/Time/Clock.o : Data/Time/Clock/UTC.hi
+Data/Time/Clock.o : Data/Time/Clock/Scale.hi
+Data/Time/TAI.o : Data/Time/TAI.hs
+Data/Time/TAI.o : Data/Time/Clock.hi
+Data/Time/TAI.o : Data/Time/Calendar/Days.hi
 Data/Time/LocalTime/TimeZone.o : Data/Time/LocalTime/TimeZone.hs
 Data/Time/LocalTime/TimeZone.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/TimeZone.o : Data/Time/Clock.hi


From git at git.haskell.org  Sun Dec 20 07:48:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:13 +0000 (UTC)
Subject: [commit: packages/time] master: add months (with test) (853190e)
Message-ID: <20151220074813.17EC03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/853190edc59e02e2b3bb8e1510372003c1931a11

>---------------------------------------------------------------

commit 853190edc59e02e2b3bb8e1510372003c1931a11
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 01:51:39 2005 -0700

    add months (with test)
    
    darcs-hash:20050807085139-ac6dd-824564aeeffc6bfc7c57e76de6d2b1b3d653b293


>---------------------------------------------------------------

853190edc59e02e2b3bb8e1510372003c1931a11
 Data/Time/Calendar/Days.hs        |   4 +-
 Data/Time/Calendar/Gregorian.hs   |  41 ++++++-
 Data/Time/Clock/UTC.hs            |   2 +-
 Data/Time/LocalTime/LocalTime.hs  |   4 +-
 Data/Time/TAI.hs                  |   4 +-
 TimeLib.xcodeproj/project.pbxproj |   4 +
 test/AddDays.hs                   |  42 +++++++
 test/AddDays.ref                  | 245 ++++++++++++++++++++++++++++++++++++++
 test/Makefile                     |   5 +-
 9 files changed, 337 insertions(+), 14 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 853190edc59e02e2b3bb8e1510372003c1931a11

From git at git.haskell.org  Sun Dec 20 07:48:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:15 +0000 (UTC)
Subject: [commit: packages/time] master: clean up deps (957955c)
Message-ID: <20151220074815.1E2993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/957955cbe73528d64b1ea8ba588ccda5dc799698

>---------------------------------------------------------------

commit 957955cbe73528d64b1ea8ba588ccda5dc799698
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 01:59:59 2005 -0700

    clean up deps
    
    darcs-hash:20050807085959-ac6dd-d8e24b7b295204e276192302ff914792aec6e12c


>---------------------------------------------------------------

957955cbe73528d64b1ea8ba588ccda5dc799698
 Data/Time/LocalTime/Format.hs    | 5 +----
 Data/Time/LocalTime/LocalTime.hs | 3 +--
 Makefile                         | 8 ++------
 3 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 75cd91b..9e3385a 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -11,10 +11,7 @@ module Data.Time.LocalTime.Format
 import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
-import Data.Time.Calendar.ISOWeekDay
-import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.YearDay
-import Data.Time.Calendar.Days
+import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index cbfb0d8..541a47b 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -14,8 +14,7 @@ module Data.Time.LocalTime.LocalTime
 
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
-import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.Days
+import Data.Time.Calendar
 import Data.Time.Clock
 
 -- | A simple day and time aggregate, where the day is of the specified parameter,
diff --git a/Makefile b/Makefile
index 95d5dc7..218b096 100644
--- a/Makefile
+++ b/Makefile
@@ -127,18 +127,14 @@ Data/Time/LocalTime/TimeOfDay.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/TimeOfDay.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/LocalTime.hs
 Data/Time/LocalTime/LocalTime.o : Data/Time/Clock.hi
-Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar/Days.hi
-Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar/Gregorian.hi
+Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/Format.hs
 Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/Private.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/Days.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/YearDay.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/Gregorian.hi
-Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISOWeekDay.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/LocalTime.hi


From git at git.haskell.org  Sun Dec 20 07:48:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:17 +0000 (UTC)
Subject: [commit: packages/time] master: rename ISOWeekDay to ISO8601Week
 (8723c5f)
Message-ID: <20151220074817.2752E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8723c5f86424ee1d4c2d4b442fc10cda6ea58275

>---------------------------------------------------------------

commit 8723c5f86424ee1d4c2d4b442fc10cda6ea58275
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 02:04:57 2005 -0700

    rename ISOWeekDay to ISO8601Week
    
    darcs-hash:20050807090457-ac6dd-413246f167e57da7cb93e7c975091f949f97f8a6


>---------------------------------------------------------------

8723c5f86424ee1d4c2d4b442fc10cda6ea58275
 Data/Time/Calendar.hs                                |  4 ++--
 Data/Time/Calendar/{ISOWeekDay.hs => ISO8601Week.hs} | 20 ++++++++++----------
 Data/Time/LocalTime/Format.hs                        |  8 ++++----
 Makefile                                             | 12 ++++++------
 TimeLib.cabal                                        |  2 +-
 TimeLib.xcodeproj/project.pbxproj                    |  4 ++--
 test/ClipDates.hs                                    |  2 +-
 test/ConvertBack.hs                                  |  2 +-
 test/LongWeekYears.hs                                |  2 +-
 test/TestTime.hs                                     |  2 +-
 10 files changed, 29 insertions(+), 29 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8723c5f86424ee1d4c2d4b442fc10cda6ea58275

From git at git.haskell.org  Sun Dec 20 07:48:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:19 +0000 (UTC)
Subject: [commit: packages/time] master: utcToLocalZonedTime (5f330c5)
Message-ID: <20151220074819.2E5183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5f330c5e312131d4fe5abce8fadb79b69601dfd8

>---------------------------------------------------------------

commit 5f330c5e312131d4fe5abce8fadb79b69601dfd8
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 15:36:19 2005 -0700

    utcToLocalZonedTime
    
    darcs-hash:20050807223619-ac6dd-e7ba5a92ce87e506014e37539f2b14952f5b47b1


>---------------------------------------------------------------

5f330c5e312131d4fe5abce8fadb79b69601dfd8
 Data/Time/LocalTime/LocalTime.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 541a47b..9d718ee 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -9,7 +9,7 @@ module Data.Time.LocalTime.LocalTime
 	-- converting UTC and UT1 times to LocalTime
 	utcToLocalTime,localTimeToUTC,ut1ToLocalTime,localTimeToUT1,
 	
-	ZonedTime(..),zonedTimeFromUTC,ztUTC,getZonedTime
+	ZonedTime(..),zonedTimeFromUTC,ztUTC,getZonedTime,utcToLocalZonedTime
 ) where
 
 import Data.Time.LocalTime.TimeOfDay
@@ -70,3 +70,9 @@ getZonedTime = do
 	t <- getCurrentTime
 	zone <- getTimeZone t
 	return (zonedTimeFromUTC zone t)
+
+-- |
+utcToLocalZonedTime :: UTCTime -> IO ZonedTime
+utcToLocalZonedTime t = do
+	zone <- getTimeZone t
+	return (zonedTimeFromUTC zone t)


From git at git.haskell.org  Sun Dec 20 07:48:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:21 +0000 (UTC)
Subject: [commit: packages/time] master: rename UTCDiffTime to NominalDiffTime
 (6a21693)
Message-ID: <20151220074821.348DB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/6a216935f0b21b7f5546cfd8a2844042b5053dbf

>---------------------------------------------------------------

commit 6a216935f0b21b7f5546cfd8a2844042b5053dbf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 7 15:40:56 2005 -0700

    rename UTCDiffTime to NominalDiffTime
    
    darcs-hash:20050807224056-ac6dd-2a810f3e5a80c5585e6a0d2678e8729d29c1ed9b


>---------------------------------------------------------------

6a216935f0b21b7f5546cfd8a2844042b5053dbf
 Data/Time/Clock.hs     |  2 +-
 Data/Time/Clock/UTC.hs | 76 +++++++++++++++++++++++++-------------------------
 2 files changed, 39 insertions(+), 39 deletions(-)

diff --git a/Data/Time/Clock.hs b/Data/Time/Clock.hs
index 9235296..3b736b7 100644
--- a/Data/Time/Clock.hs
+++ b/Data/Time/Clock.hs
@@ -9,5 +9,5 @@ module Data.Time.Clock
 ) where
 
 import Data.Time.Clock.Scale
-import Data.Time.Clock.UTC(UTCTime(..),UTCDiffTime,addUTCTime,diffUTCTime)
+import Data.Time.Clock.UTC(UTCTime(..),NominalDiffTime,addUTCTime,diffUTCTime)
 import Data.Time.Clock.Current
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 8b937e3..d1ca38d 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -9,7 +9,7 @@ module Data.Time.Clock.UTC
 	-- These corrections are not predictable and are announced with six month's notice.
 	-- No table of these corrections is provided, as any program compiled with it would become
 	-- out of date in six months.
-	UTCTime(..),UTCDiffTime,
+	UTCTime(..),NominalDiffTime,
 	addUTCTime,diffUTCTime,
 	
 	-- * POSIX time
@@ -43,59 +43,59 @@ instance Ord UTCTime where
 -- Conversion functions will treat it as seconds.
 -- It has an accuracy of 10^-12 s.
 -- It ignores leap-seconds, so it's not necessarily a fixed amount of clock time.
--- For instance, 23:00 UTC + 2 hours of UTCDiffTime = 01:00 UTC (+ 1 day),
+-- For instance, 23:00 UTC + 2 hours of NominalDiffTime = 01:00 UTC (+ 1 day),
 -- regardless of whether a leap-second intervened.
-newtype UTCDiffTime = MkUTCDiffTime Pico deriving (Eq,Ord)
+newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord)
 
-instance Enum UTCDiffTime where
-	succ (MkUTCDiffTime a) = MkUTCDiffTime (succ a)
-	pred (MkUTCDiffTime a) = MkUTCDiffTime (pred a)
-	toEnum = MkUTCDiffTime . toEnum
-	fromEnum (MkUTCDiffTime a) = fromEnum a
-	enumFrom (MkUTCDiffTime a) = fmap MkUTCDiffTime (enumFrom a)
-	enumFromThen (MkUTCDiffTime a) (MkUTCDiffTime b) = fmap MkUTCDiffTime (enumFromThen a b)
-	enumFromTo (MkUTCDiffTime a) (MkUTCDiffTime b) = fmap MkUTCDiffTime (enumFromTo a b)
-	enumFromThenTo (MkUTCDiffTime a) (MkUTCDiffTime b) (MkUTCDiffTime c) = fmap MkUTCDiffTime (enumFromThenTo a b c)
+instance Enum NominalDiffTime where
+	succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)
+	pred (MkNominalDiffTime a) = MkNominalDiffTime (pred a)
+	toEnum = MkNominalDiffTime . toEnum
+	fromEnum (MkNominalDiffTime a) = fromEnum a
+	enumFrom (MkNominalDiffTime a) = fmap MkNominalDiffTime (enumFrom a)
+	enumFromThen (MkNominalDiffTime a) (MkNominalDiffTime b) = fmap MkNominalDiffTime (enumFromThen a b)
+	enumFromTo (MkNominalDiffTime a) (MkNominalDiffTime b) = fmap MkNominalDiffTime (enumFromTo a b)
+	enumFromThenTo (MkNominalDiffTime a) (MkNominalDiffTime b) (MkNominalDiffTime c) = fmap MkNominalDiffTime (enumFromThenTo a b c)
 
-instance Show UTCDiffTime where
-	show (MkUTCDiffTime t) = (showFixed True t) ++ "s"
+instance Show NominalDiffTime where
+	show (MkNominalDiffTime t) = (showFixed True t) ++ "s"
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance Num UTCDiffTime where
-	(MkUTCDiffTime a) + (MkUTCDiffTime b) = MkUTCDiffTime (a + b)
-	(MkUTCDiffTime a) - (MkUTCDiffTime b) = MkUTCDiffTime (a - b)
-	(MkUTCDiffTime a) * (MkUTCDiffTime b) = MkUTCDiffTime (a * b)
-	negate (MkUTCDiffTime a) = MkUTCDiffTime (negate a)
-	abs (MkUTCDiffTime a) = MkUTCDiffTime (abs a)
-	signum (MkUTCDiffTime a) = MkUTCDiffTime (signum a)
-	fromInteger i = MkUTCDiffTime (fromInteger i)
+instance Num NominalDiffTime where
+	(MkNominalDiffTime a) + (MkNominalDiffTime b) = MkNominalDiffTime (a + b)
+	(MkNominalDiffTime a) - (MkNominalDiffTime b) = MkNominalDiffTime (a - b)
+	(MkNominalDiffTime a) * (MkNominalDiffTime b) = MkNominalDiffTime (a * b)
+	negate (MkNominalDiffTime a) = MkNominalDiffTime (negate a)
+	abs (MkNominalDiffTime a) = MkNominalDiffTime (abs a)
+	signum (MkNominalDiffTime a) = MkNominalDiffTime (signum a)
+	fromInteger i = MkNominalDiffTime (fromInteger i)
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance Real UTCDiffTime where
-	toRational (MkUTCDiffTime a) = toRational a
+instance Real NominalDiffTime where
+	toRational (MkNominalDiffTime a) = toRational a
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance Fractional UTCDiffTime where
-	(MkUTCDiffTime a) / (MkUTCDiffTime b) = MkUTCDiffTime (a / b)
-	recip (MkUTCDiffTime a) = MkUTCDiffTime (recip a)
-	fromRational r = MkUTCDiffTime (fromRational r)
+instance Fractional NominalDiffTime where
+	(MkNominalDiffTime a) / (MkNominalDiffTime b) = MkNominalDiffTime (a / b)
+	recip (MkNominalDiffTime a) = MkNominalDiffTime (recip a)
+	fromRational r = MkNominalDiffTime (fromRational r)
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance RealFrac UTCDiffTime where
-	properFraction (MkUTCDiffTime a) = (i,MkUTCDiffTime f) where
+instance RealFrac NominalDiffTime where
+	properFraction (MkNominalDiffTime a) = (i,MkNominalDiffTime f) where
 		(i,f) = properFraction a
-	truncate (MkUTCDiffTime a) = truncate a
-	round (MkUTCDiffTime a) = round a
-	ceiling (MkUTCDiffTime a) = ceiling a
-	floor (MkUTCDiffTime a) = floor a
+	truncate (MkNominalDiffTime a) = truncate a
+	round (MkNominalDiffTime a) = round a
+	ceiling (MkNominalDiffTime a) = ceiling a
+	floor (MkNominalDiffTime a) = floor a
 
-posixDay :: UTCDiffTime
+posixDay :: NominalDiffTime
 posixDay = 86400
 
 unixEpochMJD :: Day
 unixEpochMJD = ModifiedJulianDay 40587
 
-type POSIXTime = UTCDiffTime
+type POSIXTime = NominalDiffTime
 
 posixSecondsToUTCTime :: POSIXTime -> UTCTime
 posixSecondsToUTCTime i = let
@@ -107,9 +107,9 @@ utcTimeToPOSIXSeconds (UTCTime d t) =
  (fromInteger (diffDays d unixEpochMJD) * posixDay) + min posixDay (realToFrac t)
 
 -- | addUTCTime a b = a + b
-addUTCTime :: UTCDiffTime -> UTCTime -> UTCTime
+addUTCTime :: NominalDiffTime -> UTCTime -> UTCTime
 addUTCTime x t = posixSecondsToUTCTime (x + (utcTimeToPOSIXSeconds t))
 
 -- | diffUTCTime a b = a - b
-diffUTCTime :: UTCTime -> UTCTime -> UTCDiffTime
+diffUTCTime :: UTCTime -> UTCTime -> NominalDiffTime
 diffUTCTime a b = (utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b)


From git at git.haskell.org  Sun Dec 20 07:48:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:23 +0000 (UTC)
Subject: [commit: packages/time] master: use cases (as test) (68e172c)
Message-ID: <20151220074823.3D99D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/68e172c2fb6f6c2374edd3e759fb68499cb38e51

>---------------------------------------------------------------

commit 68e172c2fb6f6c2374edd3e759fb68499cb38e51
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Aug 8 01:16:52 2005 -0700

    use cases (as test)
    
    darcs-hash:20050808081652-ac6dd-a158d7e515bb01a942d39803b9eb5251db29ac9b


>---------------------------------------------------------------

68e172c2fb6f6c2374edd3e759fb68499cb38e51
 TimeLib.xcodeproj/project.pbxproj |  2 +
 test/Makefile                     |  5 ++-
 test/UseCases.lhs                 | 82 +++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 1 deletion(-)

diff --git a/TimeLib.xcodeproj/project.pbxproj b/TimeLib.xcodeproj/project.pbxproj
index f4f5ca6..89c8c9b 100644
--- a/TimeLib.xcodeproj/project.pbxproj
+++ b/TimeLib.xcodeproj/project.pbxproj
@@ -108,6 +108,7 @@
 		AB2666F108A572520059DEC0 /* Time.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = Time.hs; sourceTree = "<group>"; };
 		AB26682008A5FF0D0059DEC0 /* AddDays.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = AddDays.hs; sourceTree = "<group>"; };
 		AB26682108A5FF0D0059DEC0 /* AddDays.ref */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = AddDays.ref; sourceTree = "<group>"; };
+		AB26689F08A6D7290059DEC0 /* UseCases.lhs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell.literate; path = UseCases.lhs; sourceTree = "<group>"; };
 		ABD6783F084167B900CF37C0 /* POSIX.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = POSIX.hs; sourceTree = "<group>"; };
 		ABD67840084167D100CF37C0 /* Current.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = Current.hs; sourceTree = "<group>"; };
 		ABD67841084168B700CF37C0 /* UTC.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = UTC.hs; sourceTree = "<group>"; };
@@ -231,6 +232,7 @@
 				ABFA262B083B28C00096540C /* TestFormatStuff.h */,
 				ABFA262A083B28C00096540C /* TestFormatStuff.c */,
 				ABFA2629083B28C00096540C /* TestFormat.hs */,
+				AB26689F08A6D7290059DEC0 /* UseCases.lhs */,
 			);
 			name = Test;
 			path = test;
diff --git a/test/Makefile b/test/Makefile
index 3e8fddd..034e2f4 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -36,7 +36,7 @@ TimeZone: TimeZone.o ../libTimeLib.a
 TimeZone.ref: FORCE
 	date +%z > $@
 
-test: TestFixed.diff ConvertBack.diff0 TestTime.diff LongWeekYears.diff ClipDates.diff AddDays.diff TimeZone.diff TestFormat.diff0
+test: TestFixed.diff ConvertBack.diff0 TestTime.diff LongWeekYears.diff ClipDates.diff AddDays.diff TimeZone.diff TestFormat.diff0 UseCases.o
 
 clean:
 	rm -rf ConvertBack TimeZone TimeZone.ref CurrentTime TestTime TestFixed ShowDST TestFormat *.out *.o *.hi Makefile.bak
@@ -59,6 +59,9 @@ clean:
 %.o: %.hs
 	ghc -i.. -c $< -o $@
 
+%.o: %.lhs
+	ghc -i.. -c $< -o $@
+
 FORCE:
 
 .SECONDARY:
diff --git a/test/UseCases.lhs b/test/UseCases.lhs
new file mode 100644
index 0000000..3db8834
--- /dev/null
+++ b/test/UseCases.lhs
@@ -0,0 +1,82 @@
+> module UseCases where
+> import Data.Time
+> import System.Locale
+
+
+From Brian Smith:
+<http://www.haskell.org/pipermail/libraries/2005-July/004060.html>
+
+Use cases (primarily taken from real-world corporate IT applications I have 
+developed) :
+
+* What is the equivalent (or closest aproximation) of the SQL DateTime type 
+(date and time without any timezone information)? What is the equivalent of 
+the SQL Date type (date without any timezone information)?
+
+> type SQLDateTime = LocalTime
+> type SQLDate = Day
+
+* The user enters a date as "7/4/2005." How do I determine if this date is 
+before or after July 1st of this year?
+
+TODO: Parsing
+
+* How do I present the date "July 1st of this year" to the user in M/D/YYYY 
+format?
+
+> july1st = do
+>    now <- getZonedTime
+>    let (thisYear,_,_) = toGregorian (localDay (ztLocalTime now))
+>    let day = fromGregorian thisYear 7 1
+>    return (formatTime defaultTimeLocale "%m/%d/%Y" day)
+
+This actually gives "07/01/2005" rather than "7/1/2005".
+ISSUE: Should I make additional %-codes for this?
+
+
+* How do I truncate a datetime to midnight of the same day? How do I 
+truncate a date to the first of the month? How do I truncate a date to the 
+first day of the year it occurred in?
+
+> truncateToMidnight (LocalTime day _) = (LocalTime day midnight)
+
+> truncateToFirstOfMonth day = fromGregorian y m 1 where
+>    (y,m,_) = toGregorian day
+
+> truncateToJan1st day = fromYearAndDay y 1 where
+>    (y,_) = toYearAndDay day
+
+* Given a date X, how do I find the last day of the month that X occurs in. 
+For example, If X is July 4th, 2005, then I want the result to be July 31st, 
+2005. If X is Februrary 5, then I want the result to be Februrary 28 for 
+non-leap-years and February 29 for leap years.
+
+> lastDayOfMonth day = fromGregorian y m (gregorianMonthLength y m) where
+>    (y,m,_) = toGregorian day
+
+* The user enters a time T with no date, e.g. "17:30". How do I merge this 
+time onto a date D (e.g. July 4, 2005), so that the result has is a datetime 
+with date D and the time T (July 4, 2005 at 17:30).
+
+> mergeDateAndTime = LocalTime
+
+* Given two datetimes T1, T2, how do I determine if they are on the same 
+date?
+
+> sameDay (LocalTime d1 _) (LocalTime d2 _) = d1 == d2
+
+
+From Simon Marlow:
+<http://www.haskell.org/pipermail/libraries/2005-July/004066.html>
+
+I just had a little look around, mainly at System.Time.Calendar.  I
+think the structure is rather complicated - I wanted to find out how to
+get a CalendarTime for "this time tomorrow", and ended up with this:
+
+*System.Time.Calendar> let c' =
+c{ztTime=zttime{dtDay=dtday{gregDay=day+1}}} where { zttime = ztTime c;
+dtday = dtDay zttime; day = gregDay dtday }
+
+> thisTimeTomorrow (ZonedTime (LocalTime day tod) zone) = (ZonedTime (LocalTime (addDays 1 day) tod) zone)
+
+


From git at git.haskell.org  Sun Dec 20 07:48:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:25 +0000 (UTC)
Subject: [commit: packages/time] master: add missing file (70544be)
Message-ID: <20151220074825.447433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/70544be1f29f912a032c1ba364b343d621faaa03

>---------------------------------------------------------------

commit 70544be1f29f912a032c1ba364b343d621faaa03
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Aug 8 01:44:55 2005 -0700

    add missing file
    
    darcs-hash:20050808084455-ac6dd-f30c61c5f69f22ce1764c10640dec0e564a68d01


>---------------------------------------------------------------

70544be1f29f912a032c1ba364b343d621faaa03
 Data/Time/LocalTime.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Data/Time/LocalTime.hs b/Data/Time/LocalTime.hs
new file mode 100644
index 0000000..553a409
--- /dev/null
+++ b/Data/Time/LocalTime.hs
@@ -0,0 +1,14 @@
+{-# OPTIONS -Wall -Werror #-}
+
+module Data.Time.LocalTime
+(
+	module Data.Time.LocalTime.TimeZone,
+	module Data.Time.LocalTime.TimeOfDay,
+	module Data.Time.LocalTime.LocalTime,
+	module Data.Time.LocalTime.Format
+) where
+
+import Data.Time.LocalTime.TimeZone
+import Data.Time.LocalTime.TimeOfDay
+import Data.Time.LocalTime.LocalTime
+import Data.Time.LocalTime.Format


From git at git.haskell.org  Sun Dec 20 07:48:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:27 +0000 (UTC)
Subject: [commit: packages/time] master: add missing file (e3f3a03)
Message-ID: <20151220074827.4AF053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e3f3a0377025ebf746274e31f0651138350fa6d1

>---------------------------------------------------------------

commit e3f3a0377025ebf746274e31f0651138350fa6d1
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Aug 8 01:45:48 2005 -0700

    add missing file
    
    darcs-hash:20050808084548-ac6dd-ed5644c971cd295aeb8602214cacbe198fc0e4e8


>---------------------------------------------------------------

e3f3a0377025ebf746274e31f0651138350fa6d1
 Data/Time.hs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/Data/Time.hs b/Data/Time.hs
new file mode 100644
index 0000000..65926cd
--- /dev/null
+++ b/Data/Time.hs
@@ -0,0 +1,12 @@
+{-# OPTIONS -Wall -Werror #-}
+
+module Data.Time
+(
+	module Data.Time.Calendar,
+	module Data.Time.Clock,
+	module Data.Time.LocalTime
+) where
+
+import Data.Time.Calendar
+import Data.Time.Clock
+import Data.Time.LocalTime


From git at git.haskell.org  Sun Dec 20 07:48:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:29 +0000 (UTC)
Subject: [commit: packages/time] master: get taiToUTCTime working (with test)
 (db06886)
Message-ID: <20151220074829.556AD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/db06886a8ffce339c0abb82c5d64aede7adaec8a

>---------------------------------------------------------------

commit db06886a8ffce339c0abb82c5d64aede7adaec8a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 30 21:19:09 2005 -0800

    get taiToUTCTime working (with test)
    
    darcs-hash:20051031051909-ac6dd-d6c3e23dfd9d8af47176829d9b08ee53bd087ff8


>---------------------------------------------------------------

db06886a8ffce339c0abb82c5d64aede7adaec8a
 Data/Time/TAI.hs                  | 90 ++++++++++++++++++++++++++++++++++++---
 Makefile                          |  8 ++--
 TimeLib.xcodeproj/project.pbxproj |  8 +++-
 test/Makefile                     |  5 ++-
 test/TestParseDAT.hs              | 65 ++++++++++++++++++++++++++++
 test/TestParseDAT.ref             | 90 +++++++++++++++++++++++++++++++++++++++
 test/tai-utc.dat                  | 37 ++++++++++++++++
 7 files changed, 293 insertions(+), 10 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc db06886a8ffce339c0abb82c5d64aede7adaec8a

From git at git.haskell.org  Sun Dec 20 07:48:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:31 +0000 (UTC)
Subject: [commit: packages/time] master: comments (cae9a55)
Message-ID: <20151220074831.5D0653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cae9a559b5e04cf6a909e50a849701ef1a4b9ee9

>---------------------------------------------------------------

commit cae9a559b5e04cf6a909e50a849701ef1a4b9ee9
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 30 21:20:38 2005 -0800

    comments
    
    darcs-hash:20051031052038-ac6dd-53d86650e4a39607f63fa4512d559cad30995bcf


>---------------------------------------------------------------

cae9a559b5e04cf6a909e50a849701ef1a4b9ee9
 Data/Fixed.hs          | 6 +++---
 Data/Time/Clock/UTC.hs | 3 +++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Data/Fixed.hs b/Data/Fixed.hs
index 697c460..919862b 100644
--- a/Data/Fixed.hs
+++ b/Data/Fixed.hs
@@ -10,16 +10,16 @@ module Data.Fixed
 	E12,Pico
 ) where
 
--- | like "div", but with a more useful type
+-- | generalisation of 'div' to any instance of Real
 div' :: (Real a,Integral b) => a -> a -> b
 div' n d = floor ((toRational n) / (toRational d))
 
--- | like "divMod", but with a more useful type
+-- | generalisation of 'divMod' to any instance of Real
 divMod' :: (Real a,Integral b) => a -> a -> (b,a)
 divMod' n d = (f,n - (fromIntegral f) * d) where
 	f = div' n d
 
--- | like "mod", but with a more useful type
+-- | generalisation of 'mod' to any instance of Real
 mod' :: (Real a) => a -> a -> a
 mod' n d = n - (fromInteger f) * d where
 	f = div' n d
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index d1ca38d..282ee4f 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -9,6 +9,9 @@ module Data.Time.Clock.UTC
 	-- These corrections are not predictable and are announced with six month's notice.
 	-- No table of these corrections is provided, as any program compiled with it would become
 	-- out of date in six months.
+	-- 
+	-- If you don't care about leap seconds, use UTCTime and NominalDiffTime for your clock calculations,
+	-- and you'll be fine.
 	UTCTime(..),NominalDiffTime,
 	addUTCTime,diffUTCTime,
 	


From git at git.haskell.org  Sun Dec 20 07:48:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:33 +0000 (UTC)
Subject: [commit: packages/time] master: set cabal to 0.2 (e1f3f24)
Message-ID: <20151220074833.634CF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e1f3f243b389395f4d50d992c2500c3815a9eb25

>---------------------------------------------------------------

commit e1f3f243b389395f4d50d992c2500c3815a9eb25
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 30 22:06:47 2005 -0800

    set cabal to 0.2
    
    darcs-hash:20051031060647-ac6dd-cae6ed88711bc94a8feeb11d2968b766ae0ce53b


>---------------------------------------------------------------

e1f3f243b389395f4d50d992c2500c3815a9eb25
 TimeLib.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index dc74660..7713452 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -1,6 +1,6 @@
 Name:		time
-Version:	0.1
-Stability:	Alpha
+Version:	0.2
+Stability:	Beta
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley


From git at git.haskell.org  Sun Dec 20 07:48:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:35 +0000 (UTC)
Subject: [commit: packages/time] master: instance Show UTCTime (c03ad77)
Message-ID: <20151220074835.69DB33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c03ad77480823c2e9c4cc919192a65052448ee57

>---------------------------------------------------------------

commit c03ad77480823c2e9c4cc919192a65052448ee57
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Nov 1 23:48:56 2005 -0800

    instance Show UTCTime
    
    darcs-hash:20051102074856-ac6dd-034566ea08d12d2e6bbd34390e1a7cfd7a69cac4


>---------------------------------------------------------------

c03ad77480823c2e9c4cc919192a65052448ee57
 Data/Time/LocalTime/LocalTime.hs | 3 +++
 test/TestParseDAT.hs             | 7 ++-----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 9d718ee..1ac0f1f 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -65,6 +65,9 @@ ztUTC (ZonedTime t zone) = localTimeToUTC zone t
 instance Show ZonedTime where
 	show (ZonedTime t zone) = show t ++ " " ++ show zone
 
+instance Show UTCTime where
+	show t = show (zonedTimeFromUTC utc t)
+
 getZonedTime :: IO ZonedTime
 getZonedTime = do
 	t <- getCurrentTime
diff --git a/test/TestParseDAT.hs b/test/TestParseDAT.hs
index 48104ca..2f53fab 100644
--- a/test/TestParseDAT.hs
+++ b/test/TestParseDAT.hs
@@ -46,9 +46,6 @@ times =
 	fmap (LocalTime (fromGregorian 1999 01 01)) tods ++
 	fmap (LocalTime (fromGregorian 1999 01 02)) tods
 
-showUTC :: UTCTime -> String
-showUTC t = show (zonedTimeFromUTC utc t)
-
 main :: IO ()
 main = do
 	h <- openFile "tai-utc.dat" ReadMode
@@ -60,6 +57,6 @@ main = do
 		let taiTime = utcToTAITime lst utcTime
 		let utcTime' = taiToUTCTime lst taiTime
 		if utcTime == utcTime'
-		 then putStrLn ((showUTC utcTime) ++ " == " ++ (show taiTime))
-		 else putStrLn ("correction: " ++ (showUTC utcTime) ++ " -> " ++ (show taiTime) ++ " -> " ++ (showUTC utcTime'))
+		 then putStrLn ((show utcTime) ++ " == " ++ (show taiTime))
+		 else putStrLn ("correction: " ++ (show utcTime) ++ " -> " ++ (show taiTime) ++ " -> " ++ (show utcTime'))
 		) times


From git at git.haskell.org  Sun Dec 20 07:48:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:37 +0000 (UTC)
Subject: [commit: packages/time] master: more sensible identifer names
 (acc1fc8)
Message-ID: <20151220074837.70DD13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/acc1fc8124f9dbdb740c76a543421ba47ab1d456

>---------------------------------------------------------------

commit acc1fc8124f9dbdb740c76a543421ba47ab1d456
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Nov 12 17:45:46 2005 -0800

    more sensible identifer names
    
    darcs-hash:20051113014546-ac6dd-27e3b85dc58a1c0cef8b1611e17415887cc4ecc8


>---------------------------------------------------------------

acc1fc8124f9dbdb740c76a543421ba47ab1d456
 Data/Time/LocalTime/Format.hs    |  4 ++--
 Data/Time/LocalTime/LocalTime.hs | 16 ++++++++--------
 test/CurrentTime.hs              |  4 ++--
 test/ShowDST.hs                  |  2 +-
 test/TestFormat.hs               |  2 +-
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 3976658..ccb72e9 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -66,7 +66,7 @@ instance FormatTime TimeOfDay where
 	formatCharacter _   = Nothing
 
 instance FormatTime ZonedTime where
-	formatCharacter 's' = Just (\_ zt -> show (truncate (utcTimeToPOSIXSeconds (ztUTC zt)) :: Integer))
+	formatCharacter 's' = Just (\_ zt -> show (truncate (utcTimeToPOSIXSeconds (zonedTimeToUTC zt)) :: Integer))
 	formatCharacter c = case (formatCharacter c) of
 		Just f -> Just (\locale dt -> f locale (ztLocalTime dt))
 		Nothing -> case (formatCharacter c) of
@@ -116,4 +116,4 @@ instance FormatTime Day where
 	formatCharacter _   = Nothing
 
 instance FormatTime UTCTime where
-	formatCharacter c = fmap (\f locale t -> f locale (zonedTimeFromUTC utc t)) (formatCharacter c)
+	formatCharacter c = fmap (\f locale t -> f locale (utcToZonedTime utc t)) (formatCharacter c)
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 1ac0f1f..6cb0d49 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -9,7 +9,7 @@ module Data.Time.LocalTime.LocalTime
 	-- converting UTC and UT1 times to LocalTime
 	utcToLocalTime,localTimeToUTC,ut1ToLocalTime,localTimeToUT1,
 	
-	ZonedTime(..),zonedTimeFromUTC,ztUTC,getZonedTime,utcToLocalZonedTime
+	ZonedTime(..),utcToZonedTime,zonedTimeToUTC,getZonedTime,utcToLocalZonedTime
 ) where
 
 import Data.Time.LocalTime.TimeOfDay
@@ -56,26 +56,26 @@ data ZonedTime = ZonedTime {
 	ztZone :: TimeZone
 }
 
-zonedTimeFromUTC :: TimeZone -> UTCTime -> ZonedTime
-zonedTimeFromUTC zone time = ZonedTime (utcToLocalTime zone time) zone
+utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime
+utcToZonedTime zone time = ZonedTime (utcToLocalTime zone time) zone
 
-ztUTC :: ZonedTime -> UTCTime
-ztUTC (ZonedTime t zone) = localTimeToUTC zone t
+zonedTimeToUTC :: ZonedTime -> UTCTime
+zonedTimeToUTC (ZonedTime t zone) = localTimeToUTC zone t
 
 instance Show ZonedTime where
 	show (ZonedTime t zone) = show t ++ " " ++ show zone
 
 instance Show UTCTime where
-	show t = show (zonedTimeFromUTC utc t)
+	show t = show (utcToZonedTime utc t)
 
 getZonedTime :: IO ZonedTime
 getZonedTime = do
 	t <- getCurrentTime
 	zone <- getTimeZone t
-	return (zonedTimeFromUTC zone t)
+	return (utcToZonedTime zone t)
 
 -- |
 utcToLocalZonedTime :: UTCTime -> IO ZonedTime
 utcToLocalZonedTime t = do
 	zone <- getTimeZone t
-	return (zonedTimeFromUTC zone t)
+	return (utcToZonedTime zone t)
diff --git a/test/CurrentTime.hs b/test/CurrentTime.hs
index b0970f0..464e643 100644
--- a/test/CurrentTime.hs
+++ b/test/CurrentTime.hs
@@ -8,6 +8,6 @@ main :: IO ()
 main = do
 	now <- getCurrentTime
 	putStrLn (show (utctDay now) ++ "," ++ show (utctDayTime now))
-	putStrLn (show (zonedTimeFromUTC utc now :: ZonedTime))
+	putStrLn (show (utcToZonedTime utc now :: ZonedTime))
 	myzone <- getCurrentTimeZone
-	putStrLn (show (zonedTimeFromUTC myzone now :: ZonedTime))
+	putStrLn (show (utcToZonedTime myzone now :: ZonedTime))
diff --git a/test/ShowDST.hs b/test/ShowDST.hs
index ed1a92f..fa7dbda 100644
--- a/test/ShowDST.hs
+++ b/test/ShowDST.hs
@@ -20,7 +20,7 @@ findTransition a b = do
 			return (tp ++ tq)
 
 showZoneTime :: TimeZone -> UTCTime -> String
-showZoneTime zone time = show (zonedTimeFromUTC zone time)
+showZoneTime zone time = show (utcToZonedTime zone time)
 
 showTransition :: (UTCTime,TimeZone,TimeZone) -> String
 showTransition (time,zone1,zone2) = (showZoneTime zone1 time) ++ " => " ++ (showZoneTime zone2 time)
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index b4d1e70..1529dee 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -67,7 +67,7 @@ times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
 
 compareFormat :: String -> TimeZone -> UTCTime -> IO ()
 compareFormat fmt zone time = let
-		ctime = zonedTimeFromUTC zone time
+		ctime = utcToZonedTime zone time
 		haskellText = formatTime locale fmt ctime
 	in do
 		unixText <- unixFormatTime fmt zone time


From git at git.haskell.org  Sun Dec 20 07:48:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:39 +0000 (UTC)
Subject: [commit: packages/time] master: version 0.2.1 (68b10d9)
Message-ID: <20151220074839.772933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/68b10d91802ebe97804eac22b08770e460c2c4f4

>---------------------------------------------------------------

commit 68b10d91802ebe97804eac22b08770e460c2c4f4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Nov 12 17:50:15 2005 -0800

    version 0.2.1
    
    darcs-hash:20051113015015-ac6dd-97e5fc55cc5d13ef0b24c75c160dfb3def05d7bb


>---------------------------------------------------------------

68b10d91802ebe97804eac22b08770e460c2c4f4
 TimeLib.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index 7713452..820035a 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	0.2
+Version:	0.2.1
 Stability:	Beta
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:48:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:41 +0000 (UTC)
Subject: [commit: packages/time] master: ZonedTime id names (e0937c8)
Message-ID: <20151220074841.7D9B63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e0937c846ffaa0958d821cd2b5b040e364e5a7db

>---------------------------------------------------------------

commit e0937c846ffaa0958d821cd2b5b040e364e5a7db
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Nov 12 17:54:19 2005 -0800

    ZonedTime id names
    
    darcs-hash:20051113015419-ac6dd-d0f1b11eb888e9535372340ec3b4f3a38c36bd80


>---------------------------------------------------------------

e0937c846ffaa0958d821cd2b5b040e364e5a7db
 Data/Time/LocalTime/Format.hs    | 4 ++--
 Data/Time/LocalTime/LocalTime.hs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index ccb72e9..8457086 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -68,9 +68,9 @@ instance FormatTime TimeOfDay where
 instance FormatTime ZonedTime where
 	formatCharacter 's' = Just (\_ zt -> show (truncate (utcTimeToPOSIXSeconds (zonedTimeToUTC zt)) :: Integer))
 	formatCharacter c = case (formatCharacter c) of
-		Just f -> Just (\locale dt -> f locale (ztLocalTime dt))
+		Just f -> Just (\locale dt -> f locale (zonedTimeToLocalTime dt))
 		Nothing -> case (formatCharacter c) of
-			Just f -> Just (\locale dt -> f locale (ztZone dt))
+			Just f -> Just (\locale dt -> f locale (zonedTimeZone dt))
 			Nothing -> Nothing
 
 instance FormatTime TimeZone where
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 6cb0d49..c902bb6 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -52,8 +52,8 @@ localTimeToUT1 long (LocalTime (ModifiedJulianDay localMJD) tod) = ModJulianDate
 
 -- | A local time together with a TimeZone.
 data ZonedTime = ZonedTime {
-	ztLocalTime :: LocalTime,
-	ztZone :: TimeZone
+	zonedTimeToLocalTime :: LocalTime,
+	zonedTimeZone :: TimeZone
 }
 
 utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime


From git at git.haskell.org  Sun Dec 20 07:48:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:43 +0000 (UTC)
Subject: [commit: packages/time] master: new MonthDay module (f4e177d)
Message-ID: <20151220074843.89FAC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f4e177df657acec49e90ee1fd1443827fb08e5ae

>---------------------------------------------------------------

commit f4e177df657acec49e90ee1fd1443827fb08e5ae
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 13 03:11:58 2005 -0800

    new MonthDay module
    
    darcs-hash:20051113111158-ac6dd-0bbbd8a48c559aa87e0ec57128af814e83ee7396


>---------------------------------------------------------------

f4e177df657acec49e90ee1fd1443827fb08e5ae
 Data/Time/Calendar.hs             |   2 +
 Data/Time/Calendar/Gregorian.hs   |  24 +-
 Data/Time/Calendar/MonthDay.hs    |  41 +++
 Makefile                          |   5 +
 TimeLib.cabal                     |   1 +
 TimeLib.xcodeproj/project.pbxproj |   6 +
 test/Makefile                     |  16 +-
 test/TestMonthDay.hs              |  20 +
 test/TestMonthDay.ref             | 746 ++++++++++++++++++++++++++++++++++++++
 9 files changed, 840 insertions(+), 21 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f4e177df657acec49e90ee1fd1443827fb08e5ae

From git at git.haskell.org  Sun Dec 20 07:48:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:45 +0000 (UTC)
Subject: [commit: packages/time] master: Julian and Easter calendars (869b07f)
Message-ID: <20151220074845.965283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/869b07fbd86304b5ef9ac67cf398b7bbd232f663

>---------------------------------------------------------------

commit 869b07fbd86304b5ef9ac67cf398b7bbd232f663
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Nov 14 01:42:01 2005 -0800

    Julian and Easter calendars
    
    darcs-hash:20051114094201-ac6dd-a131f426e1d19bdf05a559ee6a110c9e9740b4c4


>---------------------------------------------------------------

869b07fbd86304b5ef9ac67cf398b7bbd232f663
 Data/Time/Calendar/Easter.hs        | 38 +++++++++++++++++++++
 Data/Time/Calendar/Julian.hs        | 68 +++++++++++++++++++++++++++++++++++++
 Data/Time/Calendar/JulianYearDay.hs | 38 +++++++++++++++++++++
 Data/Time/Calendar/YearDay.hs       |  2 +-
 Makefile                            | 14 ++++++++
 TimeLib.cabal                       |  3 ++
 TimeLib.xcodeproj/project.pbxproj   | 14 ++++++++
 test/ConvertBack.hs                 |  4 ++-
 test/Makefile                       |  8 +++++
 test/TestCalendars.hs               | 28 +++++++++++++++
 test/TestCalendars.ref              |  4 +++
 test/TestEaster.hs                  | 23 +++++++++++++
 test/TestEaster.ref                 | 57 +++++++++++++++++++++++++++++++
 13 files changed, 299 insertions(+), 2 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 869b07fbd86304b5ef9ac67cf398b7bbd232f663

From git at git.haskell.org  Sun Dec 20 07:48:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:47 +0000 (UTC)
Subject: [commit: packages/time] master: move ISO8601Week to separate module
 space (b802476)
Message-ID: <20151220074847.9E08C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b802476ee193ac4616eb35945069fd9007aa39c6

>---------------------------------------------------------------

commit b802476ee193ac4616eb35945069fd9007aa39c6
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Nov 14 01:49:03 2005 -0800

    move ISO8601Week to separate module space
    
    darcs-hash:20051114094903-ac6dd-606f84f89b9ef911bddbed72ef80778b57d4a586


>---------------------------------------------------------------

b802476ee193ac4616eb35945069fd9007aa39c6
 Data/Time/Calendar.hs             |  4 +---
 Data/Time/Calendar/ISO8601Week.hs |  7 +------
 Data/Time/LocalTime/Format.hs     |  2 +-
 Makefile                          | 10 +++++-----
 TimeLib.cabal                     |  2 +-
 test/ClipDates.hs                 |  1 +
 test/ConvertBack.hs               |  1 +
 test/LongWeekYears.hs             |  1 +
 test/TestCalendars.hs             |  1 +
 test/TestTime.hs                  |  1 +
 10 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
index 8cf43ce..db87917 100644
--- a/Data/Time/Calendar.hs
+++ b/Data/Time/Calendar.hs
@@ -5,12 +5,10 @@ module Data.Time.Calendar
 	module Data.Time.Calendar.Days,
 	module Data.Time.Calendar.YearDay,
 	module Data.Time.Calendar.MonthDay,
-	module Data.Time.Calendar.Gregorian,
-	module Data.Time.Calendar.ISO8601Week
+	module Data.Time.Calendar.Gregorian
 ) where
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.MonthDay
 import Data.Time.Calendar.Gregorian
-import Data.Time.Calendar.ISO8601Week
diff --git a/Data/Time/Calendar/ISO8601Week.hs b/Data/Time/Calendar/ISO8601Week.hs
index 8a9e61f..88e8e3e 100644
--- a/Data/Time/Calendar/ISO8601Week.hs
+++ b/Data/Time/Calendar/ISO8601Week.hs
@@ -1,11 +1,6 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
-module Data.Time.Calendar.ISO8601Week
-	(
-	-- * ISO 8601 Week calendar
-	module Data.Time.Calendar.ISO8601Week
-	) where
+module Data.Time.Calendar.ISO8601Week where
 
 import Data.Time.Calendar.YearDay
 import Data.Time.Calendar.Days
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 8457086..3fbbe0e 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -1,6 +1,5 @@
 {-# OPTIONS -Wall -Werror #-}
 
-
 -- #hide
 module Data.Time.LocalTime.Format
 	(
@@ -11,6 +10,7 @@ module Data.Time.LocalTime.Format
 import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
diff --git a/Makefile b/Makefile
index 9bfdf0c..b387425 100644
--- a/Makefile
+++ b/Makefile
@@ -97,16 +97,15 @@ Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/Private.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/MonthDay.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Days.hi
-Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar.hs
-Data/Time/Calendar.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
 Data/Time/Calendar.o : Data/Time/Calendar/MonthDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Days.hi
+Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/JulianYearDay.hs
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/Private.hi
 Data/Time/Calendar/JulianYearDay.o : Data/Time/Calendar/Days.hi
@@ -151,6 +150,7 @@ Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/LocalTime.hi
diff --git a/TimeLib.cabal b/TimeLib.cabal
index b10cb7c..16a43c7 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,6 +12,7 @@ Synopsis:	a new time library
 Exposed-modules:
 	Data.Fixed,
 	Data.Time.Calendar,
+	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.Julian,
 	Data.Time.Calendar.Easter,
 	Data.Time.Clock,
@@ -26,7 +27,6 @@ Other-modules:
 	Data.Time.Calendar.YearDay,
 	Data.Time.Calendar.MonthDay,
 	Data.Time.Calendar.Gregorian,
-	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.JulianYearDay,
 	Data.Time.Clock.Scale,
 	Data.Time.Clock.UTC,
diff --git a/test/ClipDates.hs b/test/ClipDates.hs
index f9abb6c..cd0fe9c 100644
--- a/test/ClipDates.hs
+++ b/test/ClipDates.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 import Control.Monad
 
diff --git a/test/ConvertBack.hs b/test/ConvertBack.hs
index 7f3ea1e..76dda86 100644
--- a/test/ConvertBack.hs
+++ b/test/ConvertBack.hs
@@ -3,6 +3,7 @@
 module Main where
 
 import Data.Time.Calendar.Julian
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 checkDay :: (Show t) => (Day -> t) -> (t -> Day) -> Day -> IO ()
diff --git a/test/LongWeekYears.hs b/test/LongWeekYears.hs
index 3715b6d..674e8c6 100644
--- a/test/LongWeekYears.hs
+++ b/test/LongWeekYears.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 longYear :: Integer -> Bool
diff --git a/test/TestCalendars.hs b/test/TestCalendars.hs
index 3dd935a..d463b3a 100644
--- a/test/TestCalendars.hs
+++ b/test/TestCalendars.hs
@@ -3,6 +3,7 @@
 module Main where
 
 import Data.Time.Calendar.Julian
+import Data.Time.Calendar.ISO8601Week
 import Data.Time.Calendar
 
 showers :: [(String,Day -> String)]
diff --git a/test/TestTime.hs b/test/TestTime.hs
index 2870026..f95c4ca 100644
--- a/test/TestTime.hs
+++ b/test/TestTime.hs
@@ -2,6 +2,7 @@
 
 module Main where
 
+import Data.Time.Calendar.ISO8601Week
 import Data.Time
 
 showCal :: Integer -> IO ()


From git at git.haskell.org  Sun Dec 20 07:48:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:49 +0000 (UTC)
Subject: [commit: packages/time] master: fix identifier in UseCases.lhs
 (0e3dd85)
Message-ID: <20151220074849.A3A483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0e3dd8527b87f54d00deb8fba9806c6c49e844e4

>---------------------------------------------------------------

commit 0e3dd8527b87f54d00deb8fba9806c6c49e844e4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Nov 14 01:50:01 2005 -0800

    fix identifier in UseCases.lhs
    
    darcs-hash:20051114095001-ac6dd-9bd1aba492639cb8de6f1b14f98ef2f7fc70a414


>---------------------------------------------------------------

0e3dd8527b87f54d00deb8fba9806c6c49e844e4
 test/UseCases.lhs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/UseCases.lhs b/test/UseCases.lhs
index 3db8834..dff4af1 100644
--- a/test/UseCases.lhs
+++ b/test/UseCases.lhs
@@ -26,7 +26,7 @@ format?
 
 > july1st = do
 >    now <- getZonedTime
->    let (thisYear,_,_) = toGregorian (localDay (ztLocalTime now))
+>    let (thisYear,_,_) = toGregorian (localDay (zonedTimeToLocalTime now))
 >    let day = fromGregorian thisYear 7 1
 >    return (formatTime defaultTimeLocale "%m/%d/%Y" day)
 


From git at git.haskell.org  Sun Dec 20 07:48:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:51 +0000 (UTC)
Subject: [commit: packages/time] master: move out MonthDay and YearDay
 (6f8d525)
Message-ID: <20151220074851.AA9763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/6f8d525b72b83b9e7d6ae9a6a54412772827f04e

>---------------------------------------------------------------

commit 6f8d525b72b83b9e7d6ae9a6a54412772827f04e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 27 19:15:30 2005 -0800

    move out MonthDay and YearDay
    
    darcs-hash:20051128031530-ac6dd-3f85b81566d7460fb2faa21f0783f11b4421cf62


>---------------------------------------------------------------

6f8d525b72b83b9e7d6ae9a6a54412772827f04e
 Data/Time/Calendar.hs             | 4 ----
 Data/Time/Calendar/ISO8601Week.hs | 2 +-
 Data/Time/Calendar/MonthDay.hs    | 2 --
 Data/Time/Calendar/YearDay.hs     | 7 +------
 Data/Time/LocalTime/Format.hs     | 1 +
 Makefile                          | 3 +--
 TimeLib.cabal                     | 4 ++--
 7 files changed, 6 insertions(+), 17 deletions(-)

diff --git a/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
index db87917..30dd9bf 100644
--- a/Data/Time/Calendar.hs
+++ b/Data/Time/Calendar.hs
@@ -3,12 +3,8 @@
 module Data.Time.Calendar
 (
 	module Data.Time.Calendar.Days,
-	module Data.Time.Calendar.YearDay,
-	module Data.Time.Calendar.MonthDay,
 	module Data.Time.Calendar.Gregorian
 ) where
 
 import Data.Time.Calendar.Days
-import Data.Time.Calendar.YearDay
-import Data.Time.Calendar.MonthDay
 import Data.Time.Calendar.Gregorian
diff --git a/Data/Time/Calendar/ISO8601Week.hs b/Data/Time/Calendar/ISO8601Week.hs
index 88e8e3e..59e082a 100644
--- a/Data/Time/Calendar/ISO8601Week.hs
+++ b/Data/Time/Calendar/ISO8601Week.hs
@@ -7,7 +7,7 @@ import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
 -- | convert to ISO 8601 Week format. First element of result is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
--- Note that "Week" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
+-- Note that \"Week\" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
 -- The first week of a year is the first week to contain at least four days in the corresponding Gregorian year.
 toISO8601Week :: Day -> (Integer,Int,Int)
 toISO8601Week date@(ModifiedJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d 7) + 1) where
diff --git a/Data/Time/Calendar/MonthDay.hs b/Data/Time/Calendar/MonthDay.hs
index 5f15d7d..ac0c4d3 100644
--- a/Data/Time/Calendar/MonthDay.hs
+++ b/Data/Time/Calendar/MonthDay.hs
@@ -1,9 +1,7 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
 module Data.Time.Calendar.MonthDay
 	(
-	-- * Month and day format
 	monthAndDayToDayOfYear,dayOfYearToMonthAndDay,monthLength
 	) where
 
diff --git a/Data/Time/Calendar/YearDay.hs b/Data/Time/Calendar/YearDay.hs
index f860810..f8673cc 100644
--- a/Data/Time/Calendar/YearDay.hs
+++ b/Data/Time/Calendar/YearDay.hs
@@ -1,11 +1,6 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
-module Data.Time.Calendar.YearDay
-	(
-	-- * Year and day format
-	module Data.Time.Calendar.YearDay
-	) where
+module Data.Time.Calendar.YearDay where
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 3fbbe0e..c459796 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -11,6 +11,7 @@ import Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar.ISO8601Week
+import Data.Time.Calendar.YearDay
 import Data.Time.Calendar
 import Data.Time.Calendar.Private
 import Data.Time.Clock
diff --git a/Makefile b/Makefile
index b387425..30e47b9 100644
--- a/Makefile
+++ b/Makefile
@@ -99,8 +99,6 @@ Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar/Gregorian.o : Data/Time/Calendar/MonthDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar.hs
 Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
-Data/Time/Calendar.o : Data/Time/Calendar/MonthDay.hi
-Data/Time/Calendar.o : Data/Time/Calendar/YearDay.hi
 Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/ISO8601Week.hs
 Data/Time/Calendar/ISO8601Week.o : Data/Time/Calendar/Private.hi
@@ -150,6 +148,7 @@ Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar.hi
+Data/Time/LocalTime/Format.o : Data/Time/Calendar/YearDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/Calendar/ISO8601Week.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
diff --git a/TimeLib.cabal b/TimeLib.cabal
index 16a43c7..828074e 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -12,6 +12,8 @@ Synopsis:	a new time library
 Exposed-modules:
 	Data.Fixed,
 	Data.Time.Calendar,
+	Data.Time.Calendar.MonthDay,
+	Data.Time.Calendar.YearDay,
 	Data.Time.Calendar.ISO8601Week,
 	Data.Time.Calendar.Julian,
 	Data.Time.Calendar.Easter,
@@ -24,8 +26,6 @@ C-Sources:	timestuff.c
 Other-modules:
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,
-	Data.Time.Calendar.YearDay,
-	Data.Time.Calendar.MonthDay,
 	Data.Time.Calendar.Gregorian,
 	Data.Time.Calendar.JulianYearDay,
 	Data.Time.Clock.Scale,


From git at git.haskell.org  Sun Dec 20 07:48:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:53 +0000 (UTC)
Subject: [commit: packages/time] master: fix tests;
 rename ISO 8601 modules (be389b5)
Message-ID: <20151220074853.B59053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/be389b5fa0e1fb037903c464139386ae87935cb2

>---------------------------------------------------------------

commit be389b5fa0e1fb037903c464139386ae87935cb2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 27 20:06:14 2005 -0800

    fix tests; rename ISO 8601 modules
    
    darcs-hash:20051128040614-ac6dd-83a5a6ba7fa4764ae4e9b8cfea18401f260f3aeb


>---------------------------------------------------------------

be389b5fa0e1fb037903c464139386ae87935cb2
 Data/Time/Calendar/Gregorian.hs                    |  2 +-
 Data/Time/Calendar/{YearDay.hs => OrdinalDate.hs}  |  2 +-
 Data/Time/Calendar/{ISO8601Week.hs => WeekDate.hs} |  4 ++--
 Data/Time/LocalTime/Format.hs                      |  4 ++--
 Makefile                                           | 24 +++++++++++-----------
 TimeLib.cabal                                      |  4 ++--
 TimeLib.xcodeproj/project.pbxproj                  |  8 ++++----
 test/ClipDates.hs                                  |  3 ++-
 test/ConvertBack.hs                                |  3 ++-
 test/LongWeekYears.hs                              |  3 ++-
 test/TestCalendars.hs                              |  2 +-
 test/TestMonthDay.hs                               |  2 +-
 test/TestTime.hs                                   |  3 ++-
 test/UseCases.lhs                                  |  1 +
 14 files changed, 35 insertions(+), 30 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc be389b5fa0e1fb037903c464139386ae87935cb2

From git at git.haskell.org  Sun Dec 20 07:48:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:55 +0000 (UTC)
Subject: [commit: packages/time] master: more sensible WeekDate and
 OrdinalDate names (4752044)
Message-ID: <20151220074855.BDCC33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/47520443fcfea4a54bd3e894584e7c1d998d9534

>---------------------------------------------------------------

commit 47520443fcfea4a54bd3e894584e7c1d998d9534
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 27 20:40:59 2005 -0800

    more sensible WeekDate and OrdinalDate names
    
    darcs-hash:20051128044059-ac6dd-0840e1a031d533a71fb5e438f1e3d6bcaa67ee5a


>---------------------------------------------------------------

47520443fcfea4a54bd3e894584e7c1d998d9534
 Data/Time/Calendar/Gregorian.hs   |  4 ++--
 Data/Time/Calendar/OrdinalDate.hs | 18 +++++++++---------
 Data/Time/Calendar/WeekDate.hs    | 22 +++++++++++-----------
 Data/Time/LocalTime/Format.hs     | 16 ++++++++--------
 test/ClipDates.hs                 |  4 ++--
 test/ConvertBack.hs               |  4 ++--
 test/LongWeekYears.hs             |  2 +-
 test/Makefile                     |  3 ++-
 test/TestCalendars.hs             |  2 +-
 test/TestTime.hs                  |  2 +-
 test/UseCases.lhs                 |  4 ++--
 11 files changed, 41 insertions(+), 40 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 47520443fcfea4a54bd3e894584e7c1d998d9534

From git at git.haskell.org  Sun Dec 20 07:48:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:57 +0000 (UTC)
Subject: [commit: packages/time] master: version 0.3 (90f8854)
Message-ID: <20151220074857.C50BE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/90f8854bf4c9ae3c59c425ea9b9bdaf6eff39bfe

>---------------------------------------------------------------

commit 90f8854bf4c9ae3c59c425ea9b9bdaf6eff39bfe
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 27 20:41:54 2005 -0800

    version 0.3
    
    darcs-hash:20051128044154-ac6dd-7cc2b0fc15533e050ef0dd5838501b1030940f6e


>---------------------------------------------------------------

90f8854bf4c9ae3c59c425ea9b9bdaf6eff39bfe
 TimeLib.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TimeLib.cabal b/TimeLib.cabal
index d8af9e5..2bdac30 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	0.2.1
+Version:	0.3
 Stability:	Beta
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:48:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:48:59 +0000 (UTC)
Subject: [commit: packages/time] master: haddock comments for formatTime and
 others (8573895)
Message-ID: <20151220074859.CB7C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/85738953ad2b075730cf79de9c557dc42f095504

>---------------------------------------------------------------

commit 85738953ad2b075730cf79de9c557dc42f095504
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Dec 17 14:10:53 2005 -0800

    haddock comments for formatTime and others
    
    darcs-hash:20051217221053-ac6dd-21a6dfbffaf15cc895532249c0b8a9cd451a97ca


>---------------------------------------------------------------

85738953ad2b075730cf79de9c557dc42f095504
 Data/Time/Calendar/OrdinalDate.hs |  7 +--
 Data/Time/Calendar/WeekDate.hs    |  7 +--
 Data/Time/LocalTime/Format.hs     | 95 ++++++++++++++++++++++++++++++++++++++-
 3 files changed, 102 insertions(+), 7 deletions(-)

diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index 94a1bfa..7c2099a 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -1,11 +1,12 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- | ISO 8601 Ordinal Date format
 module Data.Time.Calendar.OrdinalDate where
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
--- | convert to ISO 8601 Ordinal Day format. First element of result is year (proleptic Gregoran calendar),
+-- | convert to ISO 8601 Ordinal Date format. First element of result is year (proleptic Gregoran calendar),
 -- second is the day of the year, with 1 for Jan 1, and 365 (or 366 in leap years) for Dec 31.
 toOrdinalDate :: Day -> (Integer,Int)
 toOrdinalDate (ModifiedJulianDay mjd) = (year,yd) where
@@ -20,14 +21,14 @@ toOrdinalDate (ModifiedJulianDay mjd) = (year,yd) where
 	yd = fromInteger (d - (y * 365) + 1)
 	year = quadcent * 400 + cent * 100 + quad * 4 + y + 1
 
--- | convert from ISO 8601 Ordinal Day format.
+-- | convert from ISO 8601 Ordinal Date format.
 -- Invalid day numbers will be clipped to the correct range (1 to 365 or 366).
 fromOrdinalDate :: Integer -> Int -> Day
 fromOrdinalDate year day = ModifiedJulianDay mjd where
 	y = year - 1
 	mjd = (fromIntegral (clip 1 (if isLeapYear year then 366 else 365) day)) + (365 * y) + (div y 4) - (div y 100) + (div y 400) - 678576
 
--- | show in ISO 8601 Ordinal Day format (yyyy-ddd)
+-- | show in ISO 8601 Ordinal Date format (yyyy-ddd)
 showOrdinalDate :: Day -> String
 showOrdinalDate date = (show4 y) ++ "-" ++ (show3 d) where
 	(y,d) = toOrdinalDate date
diff --git a/Data/Time/Calendar/WeekDate.hs b/Data/Time/Calendar/WeekDate.hs
index 1d4ebe5..a186ca9 100644
--- a/Data/Time/Calendar/WeekDate.hs
+++ b/Data/Time/Calendar/WeekDate.hs
@@ -1,12 +1,13 @@
 {-# OPTIONS -Wall -Werror #-}
 
+-- | ISO 8601 Week Date format
 module Data.Time.Calendar.WeekDate where
 
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
--- | convert to ISO 8601 Week format. First element of result is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
+-- | convert to ISO 8601 Week Date format. First element of result is year, second week number (1-53), third day of week (1 for Monday to 7 for Sunday).
 -- Note that \"Week\" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
 -- The first week of a year is the first week to contain at least four days in the corresponding Gregorian year.
 toWeekDate :: Day -> (Integer,Int,Int)
@@ -25,7 +26,7 @@ toWeekDate date@(ModifiedJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (
 			else (y0,w0)
 		else (y0,w0)
 
--- | convert from ISO 8601 Week format. First argument is year, second week number (1-52 or 53), third day of week (1 for Monday to 7 for Sunday).
+-- | convert from ISO 8601 Week Date format. First argument is year, second week number (1-52 or 53), third day of week (1 for Monday to 7 for Sunday).
 -- Invalid week and day values will be clipped to the correct range.
 fromWeekDate :: Integer -> Int -> Int -> Day
 fromWeekDate y w d = ModifiedJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if longYear then 53 else 52) w) * 7) + (clip 1 7 d))) - 10) where
@@ -34,7 +35,7 @@ fromWeekDate y w d = ModifiedJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if
 			(_,53,_) -> True
 			_ -> False
 
--- | show in ISO 8601 Week format as yyyy-Www-dd (e.g. 
+-- | show in ISO 8601 Week Date format as yyyy-Www-dd (e.g. 
 showWeekDate :: Day -> String
 showWeekDate date = (show4 y) ++ "-W" ++ (show2 w) ++ "-" ++ (show d) where
 	(y,w,d) = toWeekDate date
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 4f36f33..9564868 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -25,6 +25,99 @@ import Data.Char
 class FormatTime t where
 	formatCharacter :: Char -> Maybe (TimeLocale -> t -> String)
 
+-- | Substitute various time-related information for each %-code in the string, as per 'formatCharacter'.
+--
+-- For all types (note these three are done here, not by 'formatCharacter'):
+--
+-- [@%%@] @%@
+--
+-- [@%t@] tab
+--
+-- [@%n@] newline
+--
+-- For TimeZone (and ZonedTime and UTCTime):
+--
+-- [@%z@] timezone offset
+--
+-- [@%Z@] timezone name
+--
+-- For LocalTime (and ZonedTime and UTCTime):
+--
+-- [@%c@] as 'dateTimeFmt' @locale@ (e.g. @%a %b %e %H:%M:%S %Z %Y@)
+--
+-- For TimeOfDay (and LocalTime and ZonedTime and UTCTime):
+--
+-- [@%R@] same as @%H:%M@
+--
+-- [@%T@] same as @%H:%M:%S@
+--
+-- [@%X@] as 'timeFmt' @locale@ (e.g. @%H:%M:%S@)
+--
+-- [@%r@] as 'time12Fmt' @locale@ (e.g. @%I:%M:%S %p@)
+--
+-- [@%P@] day half from ('amPm' @locale@), converted to lowercase, @am@, @pm@
+--
+-- [@%p@] day half from ('amPm' @locale@), @AM@, @PM@
+--
+-- [@%H@] hour, 24-hour, leading 0 as needed, @00@ - @23@
+--
+-- [@%I@] hour, 12-hour, leading 0 as needed, @01@ - @12@
+--
+-- [@%k@] hour, 24-hour, leading space as needed, @ 0@ - @23@
+--
+-- [@%l@] hour, 12-hour, leading space as needed, @ 1@ - @12@
+--
+-- [@%M@] minute, @00@ - @59@
+--
+-- [@%S@] second with decimal part if not an integer, @00@ - @60.999999999999@
+--
+-- For UTCTime and ZonedTime:
+--
+-- [@%s@] number of seconds since the Unix epoch
+--
+-- For Day (and LocalTime and ZonedTime and UTCTime):
+--
+-- [@%D@] same as @%m\/%d\/%y@
+--
+-- [@%F@] same as @%Y-%m-%d@
+--
+-- [@%x@] as 'dateFmt' @locale@ (e.g. @%m\/%d\/%y@)
+--
+-- [@%Y@] year
+--
+-- [@%y@] last two digits of year, @00@ - @99@
+--
+-- [@%C@] century (being the first two digits of the year), @00@ - @99@
+--
+-- [@%B@] month name, long form ('fst' from 'months' @locale@), @January@ - @December@
+--
+-- [@%b@, @%h@] month name, short form ('snd' from 'months' @locale@), @Jan@ - @Dec@
+--
+-- [@%m@] month of year, leading 0 as needed, @01@ - @12@
+--
+-- [@%d@] day of month, leading 0 as needed, @01@ - @31@
+--
+-- [@%e@] day of month, leading space as needed,  @ 1@ - @31@
+--
+-- [@%j@] day of year for Ordinal Date format, @001@ - @366@
+--
+-- [@%G@] year for Week Date format
+--
+-- [@%g@] last two digits of year for Week Date format, @00@ - @99@
+--
+-- [@%V@] week for Week Date format, @01@ - @53@
+--
+-- [@%u@] day for Week Date format, @1@ - @7@
+--
+-- [@%a@] day of week, short form ('snd' from 'wDays' @locale@), @Sun@ - @Sat@
+--
+-- [@%A@] day of week, long form ('fst' from 'wDays' @locale@), @Sunday@ - @Saturday@
+--
+-- [@%U@] week number of year, where weeks start on Sunday (as 'sundayStartWeek'), @01@ - @53@
+--
+-- [@%w@] day of week number, @0@ (= Sunday) - @6@ (= Saturday)
+--
+-- [@%W@] week number of year, where weeks start on Monday (as 'mondayStartWeek'), @01@ - @53@
 formatTime :: (FormatTime t) => TimeLocale -> String -> t -> String
 formatTime _ [] _ = ""
 formatTime locale ('%':c:cs) t = (formatChar c) ++ (formatTime locale cs t) where
@@ -100,7 +193,7 @@ instance FormatTime Day where
 	-- Day of Year
 	formatCharacter 'j' = Just (\_ -> show3 . snd . toOrdinalDate)
 
-	-- ISOWeekDay
+	-- ISO 8601 Week Date
 	formatCharacter 'G' = Just (\_ -> show . (\(y,_,_) -> y) . toWeekDate)
 	formatCharacter 'g' = Just (\_ -> show2 . mod100 . (\(y,_,_) -> y) . toWeekDate)
 	formatCharacter 'V' = Just (\_ -> show2 . (\(_,w,_) -> w) . toWeekDate)


From git at git.haskell.org  Sun Dec 20 07:49:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:01 +0000 (UTC)
Subject: [commit: packages/time] master: move Data.Time.TAI to
 Data.Time.Clock.TAI (f99b7a1)
Message-ID: <20151220074901.D3A5B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f99b7a1d1f143053a1443b43663f2f34c9fc83a1

>---------------------------------------------------------------

commit f99b7a1d1f143053a1443b43663f2f34c9fc83a1
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Dec 17 14:19:51 2005 -0800

    move Data.Time.TAI to Data.Time.Clock.TAI
    
    darcs-hash:20051217221951-ac6dd-98191cd696896f70ab9883e60043ab442885518d


>---------------------------------------------------------------

f99b7a1d1f143053a1443b43663f2f34c9fc83a1
 Data/Time/{ => Clock}/TAI.hs      |  2 +-
 Makefile                          | 12 ++++++------
 TimeLib.cabal                     |  2 +-
 TimeLib.xcodeproj/project.pbxproj |  2 +-
 test/TestParseDAT.hs              |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Data/Time/TAI.hs b/Data/Time/Clock/TAI.hs
similarity index 99%
rename from Data/Time/TAI.hs
rename to Data/Time/Clock/TAI.hs
index 23d3c08..00cebd5 100644
--- a/Data/Time/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -Wall -Werror #-}
 
 -- | TAI and leap-second tables for converting to UTC: most people won't need this module.
-module Data.Time.TAI
+module Data.Time.Clock.TAI
 (
 	-- TAI arithmetic
 	AbsoluteTime,taiEpoch,addAbsoluteTime,diffAbsoluteTime,
diff --git a/Makefile b/Makefile
index 15f4aae..f4960f2 100644
--- a/Makefile
+++ b/Makefile
@@ -23,8 +23,8 @@ SRCS = Data/Fixed.hs \
 	Data/Time/Clock/UTC.hs \
 	Data/Time/Clock/POSIX.hs \
 	Data/Time/Clock/Current.hs \
+	Data/Time/Clock/TAI.hs \
 	Data/Time/Clock.hs \
-	Data/Time/TAI.hs \
 	Data/Time/LocalTime/TimeZone.hs \
 	Data/Time/LocalTime/TimeOfDay.hs \
 	Data/Time/LocalTime/LocalTime.hs \
@@ -158,11 +158,11 @@ Data/Time/LocalTime.o : Data/Time/LocalTime/Format.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/LocalTime.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/TimeZone.hi
-Data/Time/TAI.o : Data/Time/TAI.hs
-Data/Time/TAI.o : Data/Fixed.hi
-Data/Time/TAI.o : Data/Time/Clock.hi
-Data/Time/TAI.o : Data/Time/Calendar/Days.hi
-Data/Time/TAI.o : Data/Time/LocalTime.hi
+Data/Time/Clock/TAI.o : Data/Time/Clock/TAI.hs
+Data/Time/Clock/TAI.o : Data/Fixed.hi
+Data/Time/Clock/TAI.o : Data/Time/Clock.hi
+Data/Time/Clock/TAI.o : Data/Time/Calendar/Days.hi
+Data/Time/Clock/TAI.o : Data/Time/LocalTime.hi
 Data/Time.o : Data/Time.hs
 Data/Time.o : Data/Time/LocalTime.hi
 Data/Time.o : Data/Time/Clock.hi
diff --git a/TimeLib.cabal b/TimeLib.cabal
index 2bdac30..04c1d97 100644
--- a/TimeLib.cabal
+++ b/TimeLib.cabal
@@ -18,7 +18,7 @@ Exposed-modules:
 	Data.Time.Calendar.Julian,
 	Data.Time.Calendar.Easter,
 	Data.Time.Clock,
-	Data.Time.TAI,
+	Data.Time.Clock.TAI,
 	Data.Time.LocalTime,
 	Data.Time
 Extensions:	ForeignFunctionInterface
diff --git a/TimeLib.xcodeproj/project.pbxproj b/TimeLib.xcodeproj/project.pbxproj
index a3e6a24..e382c8e 100644
--- a/TimeLib.xcodeproj/project.pbxproj
+++ b/TimeLib.xcodeproj/project.pbxproj
@@ -166,7 +166,6 @@
 				AB01DCFD08374838003C9EF7 /* Clock.hs */,
 				AB2666A808A56FE30059DEC0 /* LocalTime */,
 				AB2666E808A571460059DEC0 /* LocalTime.hs */,
-				AB01DCFE08374838003C9EF7 /* TAI.hs */,
 			);
 			path = Time;
 			sourceTree = "<group>";
@@ -214,6 +213,7 @@
 				ABD67841084168B700CF37C0 /* UTC.hs */,
 				ABD6783F084167B900CF37C0 /* POSIX.hs */,
 				ABD67840084167D100CF37C0 /* Current.hs */,
+				AB01DCFE08374838003C9EF7 /* TAI.hs */,
 			);
 			path = Clock;
 			sourceTree = "<group>";
diff --git a/test/TestParseDAT.hs b/test/TestParseDAT.hs
index 2f53fab..ee56d49 100644
--- a/test/TestParseDAT.hs
+++ b/test/TestParseDAT.hs
@@ -3,7 +3,7 @@
 module Main where
 
 import Data.Time
-import Data.Time.TAI
+import Data.Time.Clock.TAI
 import System.IO
 
 hSafeGetContents :: Handle -> IO String


From git at git.haskell.org  Sun Dec 20 07:49:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:03 +0000 (UTC)
Subject: [commit: packages/time] master: sort out POSIX module mess (4bfc389)
Message-ID: <20151220074903.DD7A93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4bfc389bd98e0a25f2033dd53b3f77733c932e45

>---------------------------------------------------------------

commit 4bfc389bd98e0a25f2033dd53b3f77733c932e45
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Dec 17 15:20:41 2005 -0800

    sort out POSIX module mess
    
    darcs-hash:20051217232041-ac6dd-3796054df5e794cec4e432cc2a9b192ac0f0df5e


>---------------------------------------------------------------

4bfc389bd98e0a25f2033dd53b3f77733c932e45
 Data/Time/Clock.hs                          | 13 +++++++---
 Data/Time/Clock/{Current.hs => CTimeval.hs} | 21 ++++------------
 Data/Time/Clock/POSIX.hs                    | 38 ++++++++++++++++++++++++++---
 Data/Time/Clock/UTC.hs                      | 32 +-----------------------
 Data/Time/LocalTime/TimeOfDay.hs            |  8 +++---
 Makefile                                    | 15 +++++++++---
 TimeLib.cabal                               |  5 ++--
 TimeLib.xcodeproj/project.pbxproj           |  6 +++--
 test/TestFormat.hs                          |  2 +-
 9 files changed, 73 insertions(+), 67 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4bfc389bd98e0a25f2033dd53b3f77733c932e45

From git at git.haskell.org  Sun Dec 20 07:49:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:05 +0000 (UTC)
Subject: [commit: packages/time] master: Big Split into separate fixed and
 time packages (f82aac1)
Message-ID: <20151220074905.ECBFC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f82aac1e2d97ce199dba3c5b7875ed3717cf3d79

>---------------------------------------------------------------

commit f82aac1e2d97ce199dba3c5b7875ed3717cf3d79
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Feb 5 21:42:30 2006 -0800

    Big Split into separate fixed and time packages
    
    darcs-hash:20060206054230-ac6dd-a970e95db4cf6337537aaf779596636f8b92f5fe


>---------------------------------------------------------------

f82aac1e2d97ce199dba3c5b7875ed3717cf3d79
 Makefile                                           | 189 ++-------------------
 TimeLib.xcodeproj/project.pbxproj                  |  68 ++++++--
 {Data => fixed/Data}/Fixed.hs                      |   0
 LICENSE => fixed/LICENSE                           |   2 +-
 fixed/Makefile                                     |  61 +++++++
 Setup.hs => fixed/Setup.hs                         |   0
 fixed/fixed.cabal                                  |  13 ++
 fixed/test/Makefile                                |  39 +++++
 {test => fixed/test}/TestFixed.hs                  |   0
 {test => fixed/test}/TestFixed.ref                 |   0
 test/Makefile                                      |  97 -----------
 {Data => time/Data}/Time.hs                        |   0
 {Data => time/Data}/Time/Calendar.hs               |   0
 {Data => time/Data}/Time/Calendar/Days.hs          |   0
 {Data => time/Data}/Time/Calendar/Easter.hs        |   0
 {Data => time/Data}/Time/Calendar/Gregorian.hs     |   0
 {Data => time/Data}/Time/Calendar/Julian.hs        |   0
 {Data => time/Data}/Time/Calendar/JulianYearDay.hs |   0
 {Data => time/Data}/Time/Calendar/MonthDay.hs      |   0
 {Data => time/Data}/Time/Calendar/OrdinalDate.hs   |   0
 {Data => time/Data}/Time/Calendar/Private.hs       |   0
 {Data => time/Data}/Time/Calendar/WeekDate.hs      |   0
 {Data => time/Data}/Time/Clock.hs                  |   0
 {Data => time/Data}/Time/Clock/CTimeval.hs         |   0
 {Data => time/Data}/Time/Clock/POSIX.hs            |   0
 {Data => time/Data}/Time/Clock/Scale.hs            |   0
 {Data => time/Data}/Time/Clock/TAI.hs              |   0
 {Data => time/Data}/Time/Clock/UTC.hs              |   0
 {Data => time/Data}/Time/LocalTime.hs              |   0
 {Data => time/Data}/Time/LocalTime/Format.hs       |   0
 {Data => time/Data}/Time/LocalTime/LocalTime.hs    |   0
 {Data => time/Data}/Time/LocalTime/TimeOfDay.hs    |   0
 {Data => time/Data}/Time/LocalTime/TimeZone.hs     |   0
 LICENSE => time/LICENSE                            |   0
 Makefile => time/Makefile                          |  54 +++---
 Setup.hs => time/Setup.hs                          |   0
 {test => time/test}/AddDays.hs                     |   0
 {test => time/test}/AddDays.ref                    |   0
 {test => time/test}/ClipDates.hs                   |   0
 {test => time/test}/ClipDates.ref                  |   0
 {test => time/test}/ConvertBack.hs                 |   0
 {test => time/test}/CurrentTime.hs                 |   0
 {test => time/test}/LongWeekYears.hs               |   0
 {test => time/test}/LongWeekYears.ref              |   0
 time/test/Makefile                                 |  93 ++++++++++
 {test => time/test}/ShowDST.hs                     |   0
 {test => time/test}/TestCalendars.hs               |   0
 {test => time/test}/TestCalendars.ref              |   0
 {test => time/test}/TestEaster.hs                  |   0
 {test => time/test}/TestEaster.ref                 |   0
 {test => time/test}/TestFormat.hs                  |   0
 {test => time/test}/TestFormatStuff.c              |   0
 {test => time/test}/TestFormatStuff.h              |   0
 {test => time/test}/TestMonthDay.hs                |   0
 {test => time/test}/TestMonthDay.ref               |   0
 {test => time/test}/TestParseDAT.hs                |   0
 {test => time/test}/TestParseDAT.ref               |   0
 {test => time/test}/TestTime.hs                    |   0
 {test => time/test}/TestTime.ref                   |   0
 {test => time/test}/TimeZone.hs                    |   0
 {test => time/test}/UseCases.lhs                   |   0
 {test => time/test}/tai-utc.dat                    |   0
 TimeLib.cabal => time/time.cabal                   |   3 +-
 timestuff.c => time/timestuff.c                    |   0
 timestuff.h => time/timestuff.h                    |   0
 65 files changed, 312 insertions(+), 307 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f82aac1e2d97ce199dba3c5b7875ed3717cf3d79

From git at git.haskell.org  Sun Dec 20 07:49:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:07 +0000 (UTC)
Subject: [commit: packages/time] master: add missing file; README file;
 root Makefile clean fix (76b8ca2)
Message-ID: <20151220074907.F3B753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/76b8ca2b62a41a3bddf727de841d35aac11df6d5

>---------------------------------------------------------------

commit 76b8ca2b62a41a3bddf727de841d35aac11df6d5
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Feb 5 22:36:47 2006 -0800

    add missing file; README file; root Makefile clean fix
    
    darcs-hash:20060206063647-ac6dd-e953bb4a546bdbadc1547fcc27f8f30f537eb435


>---------------------------------------------------------------

76b8ca2b62a41a3bddf727de841d35aac11df6d5
 Makefile                        |  2 +-
 README                          | 24 ++++++++++++++++++++++++
 time/Data/Time/Clock/UTCDiff.hs | 15 +++++++++++++++
 3 files changed, 40 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 571d69a..46d68a2 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,6 @@ doc: sources
 	haddock -h -o haddock `cat sources`
 
 clean:
-	rm -f sources
+	rm -f sources haddock
 	cd time && make clean
 	cd fixed && make clean
diff --git a/README b/README
new file mode 100644
index 0000000..7661654
--- /dev/null
+++ b/README
@@ -0,0 +1,24 @@
+This contains two packages, "fixed" and "time". They can each be built with Cabal. "time" depends on "fixed".
+
+  cd fixed
+  runghc Setup.hs configure
+  runghc Setup.hs build
+  sudo runghc Setup.hs install
+  cd ..
+
+  cd time
+  runghc Setup.hs configure
+  runghc Setup.hs build
+  sudo runghc Setup.hs install
+  cd ..
+
+You can use it with ghci:
+
+  $ ghci
+  Prelude> :m +Data.Time
+  Prelude Data.Time> t <- getCurrentTime
+  Prelude Data.Time> t
+  2006-02-06 06:31:43.859082 UTC
+  Prelude Data.Time> zt <- getZonedTime
+  Prelude Data.Time> zt
+  2006-02-05 22:32:32.948607 PST
diff --git a/time/Data/Time/Clock/UTCDiff.hs b/time/Data/Time/Clock/UTCDiff.hs
new file mode 100644
index 0000000..66a2a48
--- /dev/null
+++ b/time/Data/Time/Clock/UTCDiff.hs
@@ -0,0 +1,15 @@
+{-# OPTIONS -Wall -Werror #-}
+
+-- #hide
+module Data.Time.Clock.UTCDiff where
+
+import Data.Time.Clock.POSIX
+import Data.Time.Clock.UTC
+
+-- | addUTCTime a b = a + b
+addUTCTime :: NominalDiffTime -> UTCTime -> UTCTime
+addUTCTime x t = posixSecondsToUTCTime (x + (utcTimeToPOSIXSeconds t))
+
+-- | diffUTCTime a b = a - b
+diffUTCTime :: UTCTime -> UTCTime -> NominalDiffTime
+diffUTCTime a b = (utcTimeToPOSIXSeconds a) - (utcTimeToPOSIXSeconds b)


From git at git.haskell.org  Sun Dec 20 07:49:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:10 +0000 (UTC)
Subject: [commit: packages/time] master: export isLeapYear in Calendar;
 new version (eb6d142)
Message-ID: <20151220074910.0651C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/eb6d142d93f770efa3424ac923fe43c3ffabf0ca

>---------------------------------------------------------------

commit eb6d142d93f770efa3424ac923fe43c3ffabf0ca
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Mar 18 19:47:59 2006 -0800

    export isLeapYear in Calendar; new version
    
    darcs-hash:20060319034759-ac6dd-c81de3b9819edf8f99dd95e5e34af1871d29fab8


>---------------------------------------------------------------

eb6d142d93f770efa3424ac923fe43c3ffabf0ca
 time/Data/Time/Calendar/Gregorian.hs | 5 ++++-
 time/time.cabal                      | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/time/Data/Time/Calendar/Gregorian.hs b/time/Data/Time/Calendar/Gregorian.hs
index 9fe381d..2d3546c 100644
--- a/time/Data/Time/Calendar/Gregorian.hs
+++ b/time/Data/Time/Calendar/Gregorian.hs
@@ -9,7 +9,10 @@ module Data.Time.Calendar.Gregorian
 	-- calendrical arithmetic
     -- e.g. "one month after March 31st"
 	addGregorianMonthsClip,addGregorianMonthsRollOver,
-	addGregorianYearsClip,addGregorianYearsRollOver
+	addGregorianYearsClip,addGregorianYearsRollOver,
+
+	-- re-exported from OrdinalDate
+	isLeapYear
 ) where
 
 import Data.Time.Calendar.MonthDay
diff --git a/time/time.cabal b/time/time.cabal
index c682d8c..c0f0fe5 100644
--- a/time/time.cabal
+++ b/time/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	0.3
+Version:	0.3.1
 Stability:	Beta
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:49:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:12 +0000 (UTC)
Subject: [commit: packages/time] master: remove everything not part of time
 package (df1c341)
Message-ID: <20151220074912.0EC523A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/df1c341543873de7d250d9ef92a726647d3ef665

>---------------------------------------------------------------

commit df1c341543873de7d250d9ef92a726647d3ef665
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 1 00:20:30 2006 -0700

    remove everything not part of time package
    
    darcs-hash:20060501072030-ac6dd-fd9cd75b438585429686c16d0d5b1cd27dd17f31


>---------------------------------------------------------------

df1c341543873de7d250d9ef92a726647d3ef665
 LICENSE                  |  10 ----
 Makefile                 |  24 ---------
 README                   |  24 ---------
 fixed/Data/Fixed.hs      | 124 -----------------------------------------------
 fixed/LICENSE            |  10 ----
 fixed/Makefile           |  61 -----------------------
 fixed/Setup.hs           |   2 -
 fixed/fixed.cabal        |  13 -----
 fixed/test/Makefile      |  39 ---------------
 fixed/test/TestFixed.hs  |  25 ----------
 fixed/test/TestFixed.ref |  72 ---------------------------
 11 files changed, 404 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc df1c341543873de7d250d9ef92a726647d3ef665

From git at git.haskell.org  Sun Dec 20 07:49:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:14 +0000 (UTC)
Subject: [commit: packages/time] master: move time files to proper place
 (e29bc42)
Message-ID: <20151220074914.168EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e29bc429afa968dad1a372108a8efd62be28cf03

>---------------------------------------------------------------

commit e29bc429afa968dad1a372108a8efd62be28cf03
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 1 01:07:37 2006 -0700

    move time files to proper place
    
    darcs-hash:20060501080737-ac6dd-1516981211d8e07fa5bbb97c1e4c24b0cb4661b2


>---------------------------------------------------------------

e29bc429afa968dad1a372108a8efd62be28cf03
 {time/Data => Data}/Time.hs                        | 0
 {time/Data => Data}/Time/Calendar.hs               | 0
 {time/Data => Data}/Time/Calendar/Days.hs          | 0
 {time/Data => Data}/Time/Calendar/Easter.hs        | 0
 {time/Data => Data}/Time/Calendar/Gregorian.hs     | 0
 {time/Data => Data}/Time/Calendar/Julian.hs        | 0
 {time/Data => Data}/Time/Calendar/JulianYearDay.hs | 0
 {time/Data => Data}/Time/Calendar/MonthDay.hs      | 0
 {time/Data => Data}/Time/Calendar/OrdinalDate.hs   | 0
 {time/Data => Data}/Time/Calendar/Private.hs       | 0
 {time/Data => Data}/Time/Calendar/WeekDate.hs      | 0
 {time/Data => Data}/Time/Clock.hs                  | 0
 {time/Data => Data}/Time/Clock/CTimeval.hs         | 0
 {time/Data => Data}/Time/Clock/POSIX.hs            | 0
 {time/Data => Data}/Time/Clock/Scale.hs            | 0
 {time/Data => Data}/Time/Clock/TAI.hs              | 0
 {time/Data => Data}/Time/Clock/UTC.hs              | 0
 {time/Data => Data}/Time/Clock/UTCDiff.hs          | 0
 {time/Data => Data}/Time/LocalTime.hs              | 0
 {time/Data => Data}/Time/LocalTime/Format.hs       | 0
 {time/Data => Data}/Time/LocalTime/LocalTime.hs    | 0
 {time/Data => Data}/Time/LocalTime/TimeOfDay.hs    | 0
 {time/Data => Data}/Time/LocalTime/TimeZone.hs     | 0
 time/LICENSE => LICENSE                            | 0
 time/Setup.hs => Setup.hs                          | 0
 time/time.cabal => time.cabal                      | 4 ++--
 time/timestuff.c => timestuff.c                    | 0
 time/timestuff.h => timestuff.h                    | 0
 28 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/time/Data/Time.hs b/Data/Time.hs
similarity index 100%
rename from time/Data/Time.hs
rename to Data/Time.hs
diff --git a/time/Data/Time/Calendar.hs b/Data/Time/Calendar.hs
similarity index 100%
rename from time/Data/Time/Calendar.hs
rename to Data/Time/Calendar.hs
diff --git a/time/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
similarity index 100%
rename from time/Data/Time/Calendar/Days.hs
rename to Data/Time/Calendar/Days.hs
diff --git a/time/Data/Time/Calendar/Easter.hs b/Data/Time/Calendar/Easter.hs
similarity index 100%
rename from time/Data/Time/Calendar/Easter.hs
rename to Data/Time/Calendar/Easter.hs
diff --git a/time/Data/Time/Calendar/Gregorian.hs b/Data/Time/Calendar/Gregorian.hs
similarity index 100%
rename from time/Data/Time/Calendar/Gregorian.hs
rename to Data/Time/Calendar/Gregorian.hs
diff --git a/time/Data/Time/Calendar/Julian.hs b/Data/Time/Calendar/Julian.hs
similarity index 100%
rename from time/Data/Time/Calendar/Julian.hs
rename to Data/Time/Calendar/Julian.hs
diff --git a/time/Data/Time/Calendar/JulianYearDay.hs b/Data/Time/Calendar/JulianYearDay.hs
similarity index 100%
rename from time/Data/Time/Calendar/JulianYearDay.hs
rename to Data/Time/Calendar/JulianYearDay.hs
diff --git a/time/Data/Time/Calendar/MonthDay.hs b/Data/Time/Calendar/MonthDay.hs
similarity index 100%
rename from time/Data/Time/Calendar/MonthDay.hs
rename to Data/Time/Calendar/MonthDay.hs
diff --git a/time/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
similarity index 100%
rename from time/Data/Time/Calendar/OrdinalDate.hs
rename to Data/Time/Calendar/OrdinalDate.hs
diff --git a/time/Data/Time/Calendar/Private.hs b/Data/Time/Calendar/Private.hs
similarity index 100%
rename from time/Data/Time/Calendar/Private.hs
rename to Data/Time/Calendar/Private.hs
diff --git a/time/Data/Time/Calendar/WeekDate.hs b/Data/Time/Calendar/WeekDate.hs
similarity index 100%
rename from time/Data/Time/Calendar/WeekDate.hs
rename to Data/Time/Calendar/WeekDate.hs
diff --git a/time/Data/Time/Clock.hs b/Data/Time/Clock.hs
similarity index 100%
rename from time/Data/Time/Clock.hs
rename to Data/Time/Clock.hs
diff --git a/time/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
similarity index 100%
rename from time/Data/Time/Clock/CTimeval.hs
rename to Data/Time/Clock/CTimeval.hs
diff --git a/time/Data/Time/Clock/POSIX.hs b/Data/Time/Clock/POSIX.hs
similarity index 100%
rename from time/Data/Time/Clock/POSIX.hs
rename to Data/Time/Clock/POSIX.hs
diff --git a/time/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
similarity index 100%
rename from time/Data/Time/Clock/Scale.hs
rename to Data/Time/Clock/Scale.hs
diff --git a/time/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
similarity index 100%
rename from time/Data/Time/Clock/TAI.hs
rename to Data/Time/Clock/TAI.hs
diff --git a/time/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
similarity index 100%
rename from time/Data/Time/Clock/UTC.hs
rename to Data/Time/Clock/UTC.hs
diff --git a/time/Data/Time/Clock/UTCDiff.hs b/Data/Time/Clock/UTCDiff.hs
similarity index 100%
rename from time/Data/Time/Clock/UTCDiff.hs
rename to Data/Time/Clock/UTCDiff.hs
diff --git a/time/Data/Time/LocalTime.hs b/Data/Time/LocalTime.hs
similarity index 100%
rename from time/Data/Time/LocalTime.hs
rename to Data/Time/LocalTime.hs
diff --git a/time/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
similarity index 100%
rename from time/Data/Time/LocalTime/Format.hs
rename to Data/Time/LocalTime/Format.hs
diff --git a/time/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
similarity index 100%
rename from time/Data/Time/LocalTime/LocalTime.hs
rename to Data/Time/LocalTime/LocalTime.hs
diff --git a/time/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
similarity index 100%
rename from time/Data/Time/LocalTime/TimeOfDay.hs
rename to Data/Time/LocalTime/TimeOfDay.hs
diff --git a/time/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
similarity index 100%
rename from time/Data/Time/LocalTime/TimeZone.hs
rename to Data/Time/LocalTime/TimeZone.hs
diff --git a/time/LICENSE b/LICENSE
similarity index 100%
rename from time/LICENSE
rename to LICENSE
diff --git a/time/Setup.hs b/Setup.hs
similarity index 100%
rename from time/Setup.hs
rename to Setup.hs
diff --git a/time/time.cabal b/time.cabal
similarity index 94%
rename from time/time.cabal
rename to time.cabal
index c0f0fe5..4d8ebf5 100644
--- a/time/time.cabal
+++ b/time.cabal
@@ -7,8 +7,8 @@ Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
 Category:
-Build-Depends:	base, fixed
-Synopsis:	a new time library
+Build-Depends:	base
+Synopsis:	time library
 Exposed-modules:
 	Data.Time.Calendar,
 	Data.Time.Calendar.MonthDay,
diff --git a/time/timestuff.c b/timestuff.c
similarity index 100%
rename from time/timestuff.c
rename to timestuff.c
diff --git a/time/timestuff.h b/timestuff.h
similarity index 100%
rename from time/timestuff.h
rename to timestuff.h


From git at git.haskell.org  Sun Dec 20 07:49:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:16 +0000 (UTC)
Subject: [commit: packages/time] master: make suitable for build process
 (7d86eaa)
Message-ID: <20151220074916.1EBA83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3

>---------------------------------------------------------------

commit 7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon May 1 02:21:11 2006 -0700

    make suitable for build process
    
    darcs-hash:20060501092111-ac6dd-5bffa4956f92b470779215f8b501d2cb7e7fcafc


>---------------------------------------------------------------

7d86eaa6b7ef59d9fb09c9b1cbe74c76621404b3
 Makefile                           | 23 +++++++++++++++++++++++
 Setup.hs                           |  2 --
 timestuff.h => include/timestuff.h |  0
 time.cabal => package.conf.in      |  7 +++++--
 4 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
new file mode 100644
index 0000000..33c2a3f
--- /dev/null
+++ b/Makefile
@@ -0,0 +1,23 @@
+TOP=..
+include $(TOP)/mk/boilerplate.mk
+
+SUBDIRS = 
+
+ALL_DIRS = \
+	Data \
+	Data/Time \
+	Data/Time/Calendar \
+	Data/Time/Clock \
+	Data/Time/LocalTime
+
+PACKAGE = time
+VERSION = 0.3.1
+PACKAGE_DEPS = base
+
+SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
+
+SRC_CC_OPTS += -Wall -Werror -Iinclude
+
+SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)"
+
+include $(TOP)/mk/target.mk
diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
index 9a994af..0000000
--- a/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/timestuff.h b/include/timestuff.h
similarity index 100%
rename from timestuff.h
rename to include/timestuff.h
diff --git a/time.cabal b/package.conf.in
similarity index 90%
copy from time.cabal
copy to package.conf.in
index 4d8ebf5..eec6b3a 100644
--- a/time.cabal
+++ b/package.conf.in
@@ -1,11 +1,12 @@
-Name:		time
-Version:	0.3.1
+Name:		PACKAGE
+Version:	VERSION
 Stability:	Beta
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
+exposed:	True
 Category:
 Build-Depends:	base
 Synopsis:	time library
@@ -36,3 +37,5 @@ Other-modules:
 	Data.Time.LocalTime.TimeOfDay,
 	Data.Time.LocalTime.LocalTime,
 	Data.Time.LocalTime.Format
+include-dirs:		INCLUDE_DIR
+includes:		"timestuff.h"


From git at git.haskell.org  Sun Dec 20 07:49:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:18 +0000 (UTC)
Subject: [commit: packages/time] master: haddock working with time package
 (021cdd7)
Message-ID: <20151220074918.2C5203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/021cdd7549ae6472c25adaa7b3a49dac7af082b0

>---------------------------------------------------------------

commit 021cdd7549ae6472c25adaa7b3a49dac7af082b0
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue May 2 22:41:16 2006 -0700

    haddock working with time package
    
    darcs-hash:20060503054116-ac6dd-5604e00093fa50793b3a97849988ca2530a82cc3


>---------------------------------------------------------------

021cdd7549ae6472c25adaa7b3a49dac7af082b0
 package.conf.in | 2 ++
 prologue.txt    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/package.conf.in b/package.conf.in
index eec6b3a..dd2a3cb 100644
--- a/package.conf.in
+++ b/package.conf.in
@@ -39,3 +39,5 @@ Other-modules:
 	Data.Time.LocalTime.Format
 include-dirs:		INCLUDE_DIR
 includes:		"timestuff.h"
+haddock-interfaces:	HADDOCK_IFACE
+haddock-html:		HTML_DIR
diff --git a/prologue.txt b/prologue.txt
new file mode 100644
index 0000000..6fa7b04
--- /dev/null
+++ b/prologue.txt
@@ -0,0 +1,2 @@
+Clock and calendar time.
+


From git at git.haskell.org  Sun Dec 20 07:49:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:20 +0000 (UTC)
Subject: [commit: packages/time] master: set up boringfile (706483e)
Message-ID: <20151220074920.33F483A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/706483e5b72570be046ca6c352540bca01507217

>---------------------------------------------------------------

commit 706483e5b72570be046ca6c352540bca01507217
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 3 23:20:30 2006 -0700

    set up boringfile
    
    darcs-hash:20060504062030-ac6dd-233eb703d26a826c1c664cf52f3d8a23dd5a8203


>---------------------------------------------------------------

706483e5b72570be046ca6c352540bca01507217
 .darcs-boring | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/.darcs-boring b/.darcs-boring
new file mode 100644
index 0000000..61e18b4
--- /dev/null
+++ b/.darcs-boring
@@ -0,0 +1,43 @@
+# Boring file regexps:
+\.hi$
+\.o$
+\.p_hi$
+\.p_o$
+\.raw-hs$
+_split$
+\.a$
+(^|/)dist$
+(^|/)package.conf.inplace$
+(^|/)package.conf.installed$
+(^|/)\.depend$
+(^|/)\.setup-config$
+\.haddock$
+\.o\.cmd$
+\.ko$
+\.ko\.cmd$
+\.mod\.c$
+(^|/)\.tmp_versions($|/)
+(^|/)CVS($|/)
+(^|/)RCS($|/)
+~$
+#(^|/)\.[^/]
+(^|/)_darcs($|/)
+\.bak$
+\.BAK$
+\.orig$
+(^|/)vssver\.scc$
+\.swp$
+(^|/)MT($|/)
+(^|/)\{arch\}($|/)
+(^|/).arch-ids($|/)
+(^|/),
+\.class$
+\.prof$
+(^|/)\.DS_Store$
+(^|/)BitKeeper($|/)
+(^|/)ChangeSet($|/)
+(^|/)\.svn($|/)
+\.py[co]$
+\#
+\.cvsignore$
+(^|/)Thumbs\.db$


From git at git.haskell.org  Sun Dec 20 07:49:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:22 +0000 (UTC)
Subject: [commit: packages/time] master: XCode build and temp files are boring
 (e5ea873)
Message-ID: <20151220074922.39F1E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e5ea873e700621b7221433617392fa79d2be732e

>---------------------------------------------------------------

commit e5ea873e700621b7221433617392fa79d2be732e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 3 23:27:58 2006 -0700

    XCode build and temp files are boring
    
    darcs-hash:20060504062758-ac6dd-3987f29736c7fb7e2286a95f7a2113addbc513e9


>---------------------------------------------------------------

e5ea873e700621b7221433617392fa79d2be732e
 .darcs-boring | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.darcs-boring b/.darcs-boring
index 61e18b4..6c379a9 100644
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -12,6 +12,9 @@ _split$
 (^|/)\.depend$
 (^|/)\.setup-config$
 \.haddock$
+^build$
+\.xcodeproj/.*\.pbxuser$
+\.xcodeproj/.*\.mode1$
 \.o\.cmd$
 \.ko$
 \.ko\.cmd$


From git at git.haskell.org  Sun Dec 20 07:49:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:24 +0000 (UTC)
Subject: [commit: packages/time] master: Various fixes to make this build &
 work on Windows (4b425ec)
Message-ID: <20151220074924.44FA23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4b425ec9819e4a3c0ae52a3f84c2094d46a1ceac

>---------------------------------------------------------------

commit 4b425ec9819e4a3c0ae52a3f84c2094d46a1ceac
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Mon May 29 05:25:23 2006 -0700

    Various fixes to make this build & work on Windows
    
    A number of things didn't work on Windows: we were using
    gettimeofday() which doesn't exist, localtime_r() doesn't exist, the
    tm_zone field in struct tm doesn't exist, etc.
    
     * timestuff.{c,h} is now cbits/HsTime.c and includes/HsTime.h,
       for consistency with other packages
    
     * There's a configure script.  Hence, a default Setup.hs will be
       required for using Cabal (I haven't added this yet, I think we
       were going to make some more changes in Cabal to make it optional).
    
     * fixed various problems in package.conf.in.  I haven't tested
       time.cabal, I expect it doesn't work on Windows, but it might
       still work on Unix.
    
     * We get the current time from the native Win32 API.  This requires
       the Win32 library, hence a conditional dependency on Win32.
    
     * some cursory testing on Win32, we can get the local time and the
       timezone looks ok.
    
    darcs-hash:20060529122523-760e2-1707aeb6dcf612f6c7c134b1eab52c1187a8305f


>---------------------------------------------------------------

4b425ec9819e4a3c0ae52a3f84c2094d46a1ceac
 Data/Time/Clock/CTimeval.hs     |  7 +++++-
 Data/Time/Clock/POSIX.hs        | 34 ++++++++++++++++++++++----
 Data/Time/LocalTime/TimeZone.hs |  2 +-
 Makefile                        |  3 +++
 aclocal.m4                      | 19 +++++++++++++++
 cbits/HsTime.c                  | 54 +++++++++++++++++++++++++++++++++++++++++
 configure.ac                    | 15 ++++++++++++
 include/HsTime.h                | 13 ++++++++++
 include/timestuff.h             |  3 ---
 package.conf.in                 | 19 ++++++++++++---
 time.cabal                      |  4 ++-
 timestuff.c                     | 14 -----------
 12 files changed, 158 insertions(+), 29 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4b425ec9819e4a3c0ae52a3f84c2094d46a1ceac

From git at git.haskell.org  Sun Dec 20 07:49:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:26 +0000 (UTC)
Subject: [commit: packages/time] master: fix build breakage on Linux (a499f3f)
Message-ID: <20151220074926.4BA7E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a499f3f06163bbf84bf104334db88b28de599d63

>---------------------------------------------------------------

commit a499f3f06163bbf84bf104334db88b28de599d63
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Mon May 29 05:42:50 2006 -0700

    fix build breakage on Linux
    
    darcs-hash:20060529124250-760e2-12bae2db16624f19ae6462abe185ae79d3a04ad2


>---------------------------------------------------------------

a499f3f06163bbf84bf104334db88b28de599d63
 cbits/HsTime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index a63836f..6fd8342 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -6,7 +6,7 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 	struct tm* ptm;
 	long gmtoff;
 	int dst;
-	char *name;
+	const char *name;
 
 #if HAVE_LOCALTIME_R
 	struct tm tmd;


From git at git.haskell.org  Sun Dec 20 07:49:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:28 +0000 (UTC)
Subject: [commit: packages/time] master: CFILES directive for the benefit of
 Hugs (76bf7f8)
Message-ID: <20151220074928.531BB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/76bf7f82a6d883d933b97f1187aef79cd3cebbfb

>---------------------------------------------------------------

commit 76bf7f82a6d883d933b97f1187aef79cd3cebbfb
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Tue May 30 16:29:48 2006 -0700

    CFILES directive for the benefit of Hugs
    
    darcs-hash:20060530232948-b47d3-2ff97506454a770200384abb80b730d91a45c73d


>---------------------------------------------------------------

76bf7f82a6d883d933b97f1187aef79cd3cebbfb
 Data/Time/LocalTime/TimeZone.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index 07c1c01..d80671e 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -52,6 +52,7 @@ instance Show TimeZone where
 utc :: TimeZone
 utc = TimeZone 0 False "UTC"
 
+{-# CFILES cbits/HsTime.c #-}
 foreign import ccall unsafe "HsTime.h get_current_timezone_seconds" get_current_timezone_seconds :: CTime -> Ptr CInt -> Ptr CString -> IO CLong
 
 posixToCTime :: POSIXTime -> CTime


From git at git.haskell.org  Sun Dec 20 07:49:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:30 +0000 (UTC)
Subject: [commit: packages/time] master: remove dependency on ghcconfig.h
 (f67b546)
Message-ID: <20151220074930.59F7A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f67b5466dd799a0ce8b7847a71b1fa9f2ad6f2c2

>---------------------------------------------------------------

commit f67b5466dd799a0ce8b7847a71b1fa9f2ad6f2c2
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Tue May 30 16:30:29 2006 -0700

    remove dependency on ghcconfig.h
    
    darcs-hash:20060530233029-b47d3-8879f40442c09036bcb394df9f8bcf4f08a40d12


>---------------------------------------------------------------

f67b5466dd799a0ce8b7847a71b1fa9f2ad6f2c2
 configure.ac     | 1 +
 include/HsTime.h | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 51dbd33..f2e4186 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,6 +5,7 @@ AC_CONFIG_SRCDIR([include/HsTime.h])
 
 AC_CONFIG_HEADERS([include/HsTimeConfig.h])
 
+AC_CHECK_HEADERS([time.h])
 AC_CHECK_FUNCS([gmtime_r localtime_r])
 
 AC_STRUCT_TM
diff --git a/include/HsTime.h b/include/HsTime.h
index b447792..b8da946 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -1,7 +1,6 @@
 #ifndef __HSTIME_H__
 #define __HSTIME_H__
 
-#include "ghcconfig.h"
 #include "HsTimeConfig.h"
 
 #if HAVE_TIME_H


From git at git.haskell.org  Sun Dec 20 07:49:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:32 +0000 (UTC)
Subject: [commit: packages/time] master: extra Cabal fields for clean and
 sdist (37fd2cd)
Message-ID: <20151220074932.616E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/37fd2cdcfa945dee219ecfa5e69f3b640da9321b

>---------------------------------------------------------------

commit 37fd2cdcfa945dee219ecfa5e69f3b640da9321b
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Tue May 30 16:51:52 2006 -0700

    extra Cabal fields for clean and sdist
    
    darcs-hash:20060530235152-b47d3-782de042e361c2c70e3bdf8d7677f4fdf36314d4


>---------------------------------------------------------------

37fd2cdcfa945dee219ecfa5e69f3b640da9321b
 time.cabal | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/time.cabal b/time.cabal
index cce942c..89881a0 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,6 +1,6 @@
 Name:		time
 Version:	0.3.1
-Stability:	Beta
+Stability:	beta
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley
@@ -9,7 +9,7 @@ Homepage:	http://semantic.org/TimeLib/
 Category:
 Build-Depends:	base
 Synopsis:	time library
-Exposed-modules:
+Exposed-Modules:
 	Data.Time.Calendar,
 	Data.Time.Calendar.MonthDay,
 	Data.Time.Calendar.OrdinalDate,
@@ -23,7 +23,7 @@ Exposed-modules:
 	Data.Time
 Extensions:	ForeignFunctionInterface
 C-Sources:	HsTime.c
-Other-modules:
+Other-Modules:
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,
 	Data.Time.Calendar.Gregorian,
@@ -36,5 +36,11 @@ Other-modules:
 	Data.Time.LocalTime.TimeOfDay,
 	Data.Time.LocalTime.LocalTime,
 	Data.Time.LocalTime.Format
-include-dirs:		include
-includes:		"HsTime.h"
+Extra-Source-Files:
+	configure.ac configure
+	include/HsTime.h include/HsTimeConfig.h.in
+Extra-Tmp-Files:
+	config.log config.status autom4te.cache
+	include/HsTimeConfig.h
+Include-Dirs:	include
+Includes:	"HsTime.h"


From git at git.haskell.org  Sun Dec 20 07:49:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:34 +0000 (UTC)
Subject: [commit: packages/time] master: fix typo (3721982)
Message-ID: <20151220074934.66D793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/37219827d0e5796eb716007399dcbf3270b73986

>---------------------------------------------------------------

commit 37219827d0e5796eb716007399dcbf3270b73986
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Tue Jun 6 05:16:20 2006 -0700

    fix typo
    
    darcs-hash:20060606121620-760e2-1dc4cf4db92cbe47dcbfb7cca4b8f6e34df94c4d


>---------------------------------------------------------------

37219827d0e5796eb716007399dcbf3270b73986
 package.conf.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.conf.in b/package.conf.in
index f308e51..98922d7 100644
--- a/package.conf.in
+++ b/package.conf.in
@@ -47,7 +47,7 @@ Hidden-modules:
 	Data.Time.LocalTime.Format
 import-dirs:		IMPORT_DIR
 library-dirs:		LIB_DIR
-hs-libraries:		"HSTime"
+hs-libraries:		"HStime"
 include-dirs:		INCLUDE_DIR
 includes:		"HsTime.h"
 haddock-interfaces:	HADDOCK_IFACE


From git at git.haskell.org  Sun Dec 20 07:49:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:36 +0000 (UTC)
Subject: [commit: packages/time] master: re-add #include "ghcconfig.h",
 conditional on __GLASGOW_HASKELL__ (17faab4)
Message-ID: <20151220074936.6D6D73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/17faab4835a1decbb2c3dd5297b0073e56a8eed7

>---------------------------------------------------------------

commit 17faab4835a1decbb2c3dd5297b0073e56a8eed7
Author: simonmar <simonmar at microsoft.com>
Date:   Tue Jun 6 05:38:41 2006 -0700

    re-add #include "ghcconfig.h", conditional on __GLASGOW_HASKELL__
    
    darcs-hash:20060606123841-3ed52-e9ff9e6558dfbbc2ed6b26a3abb430079749e9c4


>---------------------------------------------------------------

17faab4835a1decbb2c3dd5297b0073e56a8eed7
 include/HsTime.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/include/HsTime.h b/include/HsTime.h
index b8da946..baca0d5 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -1,6 +1,9 @@
 #ifndef __HSTIME_H__
 #define __HSTIME_H__
 
+#ifdef __GLASGOW_HASKELL__
+#include "ghcconfig.h"
+#endif
 #include "HsTimeConfig.h"
 
 #if HAVE_TIME_H


From git at git.haskell.org  Sun Dec 20 07:49:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:38 +0000 (UTC)
Subject: [commit: packages/time] master: remove debugging code (580b6d2)
Message-ID: <20151220074938.7405C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/580b6d2b0e3c6409b1592c508754460c079a3969

>---------------------------------------------------------------

commit 580b6d2b0e3c6409b1592c508754460c079a3969
Author: simonmar <simonmar at microsoft.com>
Date:   Tue Jun 6 06:00:44 2006 -0700

    remove debugging code
    
    darcs-hash:20060606130044-3ed52-0c26fad63e2d0cde23c686bccd51205105b702a5


>---------------------------------------------------------------

580b6d2b0e3c6409b1592c508754460c079a3969
 cbits/HsTime.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 6fd8342..133fd6c 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -29,7 +29,6 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 
 # if mingw32_HOST_OS
 		name = dst ? _tzname[1] : _tzname[0];
-		printf("dst: %d, tzname0: %s, tzname1: %s\n", dst, _tzname[0], _tzname[1]);
 # elif HAVE_TZNAME
 		name = *tzname;
 # else


From git at git.haskell.org  Sun Dec 20 07:49:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:40 +0000 (UTC)
Subject: [commit: packages/time] master: use non-GHC-specific #ifdef test for
 Windows (d65e1de)
Message-ID: <20151220074940.7B0543A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d65e1de56921e9646f42f7cfda349100d57f1bba

>---------------------------------------------------------------

commit d65e1de56921e9646f42f7cfda349100d57f1bba
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Jun 7 01:18:06 2006 -0700

    use non-GHC-specific #ifdef test for Windows
    
    darcs-hash:20060607081806-760e2-001f4dfd1e83fba078f4d18274e0bda5ce8910c3


>---------------------------------------------------------------

d65e1de56921e9646f42f7cfda349100d57f1bba
 cbits/HsTime.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 133fd6c..7e93fe8 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -26,8 +26,7 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 		name = ptm -> tm_zone;
 		gmtoff = ptm -> tm_gmtoff;
 #else
-
-# if mingw32_HOST_OS
+# if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 		name = dst ? _tzname[1] : _tzname[0];
 # elif HAVE_TZNAME
 		name = *tzname;


From git at git.haskell.org  Sun Dec 20 07:49:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:42 +0000 (UTC)
Subject: [commit: packages/time] master: no need to include ghcconfig.h any
 more (cecf1ab)
Message-ID: <20151220074942.81EEB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cecf1abf74c74307c799d2f7555bcca2fb010f2a

>---------------------------------------------------------------

commit cecf1abf74c74307c799d2f7555bcca2fb010f2a
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Jun 7 01:18:29 2006 -0700

    no need to include ghcconfig.h any more
    
    darcs-hash:20060607081829-760e2-39d464373937cba058c1f6b2b6b6bfd5c16d98a5


>---------------------------------------------------------------

cecf1abf74c74307c799d2f7555bcca2fb010f2a
 include/HsTime.h | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/include/HsTime.h b/include/HsTime.h
index baca0d5..b8da946 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -1,9 +1,6 @@
 #ifndef __HSTIME_H__
 #define __HSTIME_H__
 
-#ifdef __GLASGOW_HASKELL__
-#include "ghcconfig.h"
-#endif
 #include "HsTimeConfig.h"
 
 #if HAVE_TIME_H


From git at git.haskell.org  Sun Dec 20 07:49:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:44 +0000 (UTC)
Subject: [commit: packages/time] master: eliminate the other mingw32_HOST_OS
 test (0108ad0)
Message-ID: <20151220074944.880D73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0108ad00f1ea1b38f448a7a3462a1745b892467c

>---------------------------------------------------------------

commit 0108ad00f1ea1b38f448a7a3462a1745b892467c
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Wed Jun 7 01:35:28 2006 -0700

    eliminate the other mingw32_HOST_OS test
    
    darcs-hash:20060607083528-b47d3-c41fa71af0c4ab114f85816306687ee85c2860a1


>---------------------------------------------------------------

0108ad00f1ea1b38f448a7a3462a1745b892467c
 cbits/HsTime.c | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 7e93fe8..f9651e9 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -25,18 +25,18 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 #if HAVE_TM_ZONE
 		name = ptm -> tm_zone;
 		gmtoff = ptm -> tm_gmtoff;
-#else
-# if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+#elif defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
 		name = dst ? _tzname[1] : _tzname[0];
-# elif HAVE_TZNAME
+		gmtoff = dst ? _timezone - 3600 : _timezone;
+#else
+
+# if HAVE_TZNAME
 		name = *tzname;
 # else
 #  error "Don't know how to get at timezone name on your OS"
 # endif
 
-# if mingw32_HOST_OS
-		gmtoff = dst ? _timezone - 3600 : _timezone;
-# elif HAVE_DECL_ALTZONE
+# if HAVE_DECL_ALTZONE
 		gmtoff = dst ? altzone : timezone;
 # else
 		gmtoff = dst ? timezone - 3600 : timezone;


From git at git.haskell.org  Sun Dec 20 07:49:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:46 +0000 (UTC)
Subject: [commit: packages/time] master: Set version to 1.0 stable (0908d41)
Message-ID: <20151220074946.8FA323A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0908d41b2b54d964238138e073a560f73a7b48ae

>---------------------------------------------------------------

commit 0908d41b2b54d964238138e073a560f73a7b48ae
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jun 11 15:03:22 2006 -0700

    Set version to 1.0 stable
    
    darcs-hash:20060611220322-ac6dd-ab053b27abeaf26b9342a0ae7c5151d61f1e95f5


>---------------------------------------------------------------

0908d41b2b54d964238138e073a560f73a7b48ae
 Makefile   | 2 +-
 time.cabal | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 9ee3b33..9c27f39 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ALL_DIRS = \
 	Data/Time/LocalTime
 
 PACKAGE = time
-VERSION = 0.3.1
+VERSION = 1.0
 PACKAGE_DEPS = base
 
 SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
diff --git a/time.cabal b/time.cabal
index 89881a0..80096e6 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,6 +1,6 @@
 Name:		time
-Version:	0.3.1
-Stability:	beta
+Version:	1.0
+Stability:	stable
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley


From git at git.haskell.org  Sun Dec 20 07:49:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:48 +0000 (UTC)
Subject: [commit: packages/time] master: add aclocal.m4 to extra sources
 (4def2c0)
Message-ID: <20151220074948.96FCF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4def2c0923b48c9b3dcfdf996b83163d82649c82

>---------------------------------------------------------------

commit 4def2c0923b48c9b3dcfdf996b83163d82649c82
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Tue Aug 29 05:36:40 2006 -0700

    add aclocal.m4 to extra sources
    
    darcs-hash:20060829123640-b47d3-3e8a7c23975307c746b443eca30ca4c427468bcf


>---------------------------------------------------------------

4def2c0923b48c9b3dcfdf996b83163d82649c82
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 80096e6..672bd2a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -37,7 +37,7 @@ Other-Modules:
 	Data.Time.LocalTime.LocalTime,
 	Data.Time.LocalTime.Format
 Extra-Source-Files:
-	configure.ac configure
+	aclocal.m4 configure.ac configure
 	include/HsTime.h include/HsTimeConfig.h.in
 Extra-Tmp-Files:
 	config.log config.status autom4te.cache


From git at git.haskell.org  Sun Dec 20 07:49:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:50 +0000 (UTC)
Subject: [commit: packages/time] master: includes -> install-includes (ca25b1b)
Message-ID: <20151220074950.9E9603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ca25b1ba1cedb6f9f94e5ecdc74c43712fe4abc4

>---------------------------------------------------------------

commit ca25b1ba1cedb6f9f94e5ecdc74c43712fe4abc4
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Tue Aug 29 05:37:45 2006 -0700

    includes -> install-includes
    
    darcs-hash:20060829123745-b47d3-b412b445da8438997899714f0cd0d54c91e54595


>---------------------------------------------------------------

ca25b1ba1cedb6f9f94e5ecdc74c43712fe4abc4
 time.cabal | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 672bd2a..1199bfd 100644
--- a/time.cabal
+++ b/time.cabal
@@ -43,4 +43,5 @@ Extra-Tmp-Files:
 	config.log config.status autom4te.cache
 	include/HsTimeConfig.h
 Include-Dirs:	include
-Includes:	"HsTime.h"
+Install-Includes:
+	HsTime.h HsTimeConfig.h


From git at git.haskell.org  Sun Dec 20 07:49:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:52 +0000 (UTC)
Subject: [commit: packages/time] master: fix C-Sources (#893) (3b0c7d3)
Message-ID: <20151220074952.A4BEE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3b0c7d3c2f4953b9fa2d4d8ce14ae4ed2b1ab4b5

>---------------------------------------------------------------

commit 3b0c7d3c2f4953b9fa2d4d8ce14ae4ed2b1ab4b5
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Fri Sep 8 15:53:13 2006 -0700

    fix C-Sources (#893)
    
    darcs-hash:20060908225313-b47d3-f3e63afec5f2173f6d7e535f6e6ee8a23094e725


>---------------------------------------------------------------

3b0c7d3c2f4953b9fa2d4d8ce14ae4ed2b1ab4b5
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 1199bfd..8500d1a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -22,7 +22,7 @@ Exposed-Modules:
 	Data.Time.LocalTime,
 	Data.Time
 Extensions:	ForeignFunctionInterface
-C-Sources:	HsTime.c
+C-Sources:	cbits/HsTime.c
 Other-Modules:
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,


From git at git.haskell.org  Sun Dec 20 07:49:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:54 +0000 (UTC)
Subject: [commit: packages/time] master: note CPP extension (0323c8c)
Message-ID: <20151220074954.AB18B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0323c8c75fc453d5945d177e4b17db8b7d032e73

>---------------------------------------------------------------

commit 0323c8c75fc453d5945d177e4b17db8b7d032e73
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Fri Sep 8 16:37:07 2006 -0700

    note CPP extension
    
    darcs-hash:20060908233707-b47d3-78501ce27828a9dec451577e46d281e401b84277


>---------------------------------------------------------------

0323c8c75fc453d5945d177e4b17db8b7d032e73
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 8500d1a..8720db3 100644
--- a/time.cabal
+++ b/time.cabal
@@ -21,7 +21,7 @@ Exposed-Modules:
 	Data.Time.Clock.TAI,
 	Data.Time.LocalTime,
 	Data.Time
-Extensions:	ForeignFunctionInterface
+Extensions:	ForeignFunctionInterface, CPP
 C-Sources:	cbits/HsTime.c
 Other-Modules:
 	Data.Time.Calendar.Private,


From git at git.haskell.org  Sun Dec 20 07:49:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:56 +0000 (UTC)
Subject: [commit: packages/time] master: fix up XCode project file for added
 files (b50f0c7)
Message-ID: <20151220074956.B26233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b50f0c78a16e3380759283b559dfec92e8f3f923

>---------------------------------------------------------------

commit b50f0c78a16e3380759283b559dfec92e8f3f923
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Sep 24 15:11:49 2006 -0700

    fix up XCode project file for added files
    
    darcs-hash:20060924221149-ac6dd-19f372cb63d0e2d981aaec9f0dd4ff79ad98c26a


>---------------------------------------------------------------

b50f0c78a16e3380759283b559dfec92e8f3f923
 TimeLib.xcodeproj/project.pbxproj | 153 +++++---------------------------------
 1 file changed, 18 insertions(+), 135 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b50f0c78a16e3380759283b559dfec92e8f3f923

From git at git.haskell.org  Sun Dec 20 07:49:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:49:58 +0000 (UTC)
Subject: [commit: packages/time] master: add Setup.hs (de08f7e)
Message-ID: <20151220074958.B971F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/de08f7e6870ea40f58f77719e08ca6562084f141

>---------------------------------------------------------------

commit de08f7e6870ea40f58f77719e08ca6562084f141
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Thu Sep 28 05:43:41 2006 -0700

    add Setup.hs
    
    darcs-hash:20060928124341-b47d3-60393a942de235747b1fd6da3d2368850b46b3e4


>---------------------------------------------------------------

de08f7e6870ea40f58f77719e08ca6562084f141
 Makefile | 2 ++
 Setup.hs | 6 ++++++
 2 files changed, 8 insertions(+)

diff --git a/Makefile b/Makefile
index 9c27f39..e2d286b 100644
--- a/Makefile
+++ b/Makefile
@@ -19,6 +19,8 @@ SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
 
 SRC_CC_OPTS += -Wall -Werror -Iinclude
 
+EXCLUDED_SRCS += Setup.hs
+
 SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)"
 
 UseGhcForCc = YES
diff --git a/Setup.hs b/Setup.hs
new file mode 100644
index 0000000..60804b2
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Distribution.Simple (defaultMainWithHooks, defaultUserHooks)
+
+main :: IO ()
+main = defaultMainWithHooks defaultUserHooks


From git at git.haskell.org  Sun Dec 20 07:50:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:00 +0000 (UTC)
Subject: [commit: packages/time] master: Changed docs for %U and %W to include
 the possibility of week 0 results. (85fd256)
Message-ID: <20151220075000.BF4B83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/85fd2569144c8fc3d2249817dabf9944e32cba78

>---------------------------------------------------------------

commit 85fd2569144c8fc3d2249817dabf9944e32cba78
Author: bjorn <bjorn at bringert.net>
Date:   Sat Nov 11 08:52:07 2006 -0800

    Changed docs for %U and %W to include the possibility of week 0 results.
    
    darcs-hash:20061111165207-6cdb2-9182b09f62f804176b0febb4a2169348d06655f3


>---------------------------------------------------------------

85fd2569144c8fc3d2249817dabf9944e32cba78
 Data/Time/LocalTime/Format.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index 9564868..d817c13 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -113,11 +113,11 @@ class FormatTime t where
 --
 -- [@%A@] day of week, long form ('fst' from 'wDays' @locale@), @Sunday@ - @Saturday@
 --
--- [@%U@] week number of year, where weeks start on Sunday (as 'sundayStartWeek'), @01@ - @53@
+-- [@%U@] week number of year, where weeks start on Sunday (as 'sundayStartWeek'), @00@ - @53@
 --
 -- [@%w@] day of week number, @0@ (= Sunday) - @6@ (= Saturday)
 --
--- [@%W@] week number of year, where weeks start on Monday (as 'mondayStartWeek'), @01@ - @53@
+-- [@%W@] week number of year, where weeks start on Monday (as 'mondayStartWeek'), @00@ - @53@
 formatTime :: (FormatTime t) => TimeLocale -> String -> t -> String
 formatTime _ [] _ = ""
 formatTime locale ('%':c:cs) t = (formatChar c) ++ (formatTime locale cs t) where


From git at git.haskell.org  Sun Dec 20 07:50:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:02 +0000 (UTC)
Subject: [commit: packages/time] master: Fixed typo: s/propleptic/proleptic/.
 (927eb34)
Message-ID: <20151220075002.C57EE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/927eb3448f5bf93ca44cf636b2f390f9520e9277

>---------------------------------------------------------------

commit 927eb3448f5bf93ca44cf636b2f390f9520e9277
Author: bjorn <bjorn at bringert.net>
Date:   Sat Nov 11 08:55:49 2006 -0800

    Fixed typo: s/propleptic/proleptic/.
    
    darcs-hash:20061111165549-6cdb2-2229da79c00c5415630eb6866533c290022c7ba0


>---------------------------------------------------------------

927eb3448f5bf93ca44cf636b2f390f9520e9277
 Data/Time/Calendar/JulianYearDay.hs | 2 +-
 Data/Time/Calendar/OrdinalDate.hs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Calendar/JulianYearDay.hs b/Data/Time/Calendar/JulianYearDay.hs
index a6d5baa..ba10c8f 100644
--- a/Data/Time/Calendar/JulianYearDay.hs
+++ b/Data/Time/Calendar/JulianYearDay.hs
@@ -33,6 +33,6 @@ showJulianYearAndDay :: Day -> String
 showJulianYearAndDay date = (show4 y) ++ "-" ++ (show3 d) where
 	(y,d) = toJulianYearAndDay date
 
--- | Is this year a leap year according to the propleptic Gregorian calendar?
+-- | Is this year a leap year according to the proleptic Gregorian calendar?
 isJulianLeapYear :: Integer -> Bool
 isJulianLeapYear year = (mod year 4 == 0)
diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index 7c2099a..a293b5e 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -33,7 +33,7 @@ showOrdinalDate :: Day -> String
 showOrdinalDate date = (show4 y) ++ "-" ++ (show3 d) where
 	(y,d) = toOrdinalDate date
 
--- | Is this year a leap year according to the propleptic Gregorian calendar?
+-- | Is this year a leap year according to the proleptic Gregorian calendar?
 isLeapYear :: Integer -> Bool
 isLeapYear year = (mod year 4 == 0) && ((mod year 400 == 0) || not (mod year 100 == 0))
 


From git at git.haskell.org  Sun Dec 20 07:50:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:04 +0000 (UTC)
Subject: [commit: packages/time] master: Added missing example for
 showWeekDate. (147381b)
Message-ID: <20151220075004.CBADF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/147381b33918537d64e9df200ed20ddac993d012

>---------------------------------------------------------------

commit 147381b33918537d64e9df200ed20ddac993d012
Author: bjorn <bjorn at bringert.net>
Date:   Wed Nov 15 14:07:39 2006 -0800

    Added missing example for showWeekDate.
    
    The showWeekDate haddock comment was:
      "show in ISO 8601 Week Date format as yyyy-Www-dd (e.g."
    
    darcs-hash:20061115220739-6cdb2-5f577de58f061136b82cffa9c22c73b2e914bbed


>---------------------------------------------------------------

147381b33918537d64e9df200ed20ddac993d012
 Data/Time/Calendar/WeekDate.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Time/Calendar/WeekDate.hs b/Data/Time/Calendar/WeekDate.hs
index a186ca9..0568a32 100644
--- a/Data/Time/Calendar/WeekDate.hs
+++ b/Data/Time/Calendar/WeekDate.hs
@@ -35,7 +35,7 @@ fromWeekDate y w d = ModifiedJulianDay (k - (mod k 7) + (toInteger (((clip 1 (if
 			(_,53,_) -> True
 			_ -> False
 
--- | show in ISO 8601 Week Date format as yyyy-Www-dd (e.g. 
+-- | show in ISO 8601 Week Date format as yyyy-Www-dd (e.g. \"2006-W46-3\").
 showWeekDate :: Day -> String
 showWeekDate date = (show4 y) ++ "-W" ++ (show2 w) ++ "-" ++ (show d) where
 	(y,w,d) = toWeekDate date


From git at git.haskell.org  Sun Dec 20 07:50:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:06 +0000 (UTC)
Subject: [commit: packages/time] master: Handle 'c' also in formatTime for
 ZonedTime, to get %Z filled in for ZonedTime and UTCTime. (573daed)
Message-ID: <20151220075006.D1DD73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/573daed43a143ea75360c23317ec9efebe01dfe5

>---------------------------------------------------------------

commit 573daed43a143ea75360c23317ec9efebe01dfe5
Author: bjorn <bjorn at bringert.net>
Date:   Wed Nov 15 14:08:18 2006 -0800

    Handle 'c' also in formatTime for ZonedTime, to get %Z filled in for ZonedTime and UTCTime.
    
    Before, formatTime "%c" did not include the time zone even when applied to ZonedTime or UTCTime,
    since "%c" was handled by the FormatTime LocalTime instance:
    
    > fmap (formatTime System.Locale.defaultTimeLocale "%c") getZonedTime
    "Sat Nov 11 19:12:45.395568  2006"
    > fmap (formatTime System.Locale.defaultTimeLocale "%c") getCurrentTime
    "Sat Nov 11 18:13:52.010944  2006"
    
    Now it is correct:
    
    > fmap (formatTime System.Locale.defaultTimeLocale "%c") getZonedTime
    "Wed Nov 15 23:08:43.987526 CET 2006"
    > fmap (formatTime System.Locale.defaultTimeLocale "%c") getCurrentTime
    "Wed Nov 15 22:08:51.530603 UTC 2006"
    
    darcs-hash:20061115220818-6cdb2-db20654b473141486d86a09551688043eebafb8b


>---------------------------------------------------------------

573daed43a143ea75360c23317ec9efebe01dfe5
 Data/Time/LocalTime/Format.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index d817c13..c13160e 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -160,6 +160,7 @@ instance FormatTime TimeOfDay where
 	formatCharacter _   = Nothing
 
 instance FormatTime ZonedTime where
+	formatCharacter 'c' = Just (\locale -> formatTime locale (dateTimeFmt locale))
 	formatCharacter 's' = Just (\_ zt -> show (truncate (utcTimeToPOSIXSeconds (zonedTimeToUTC zt)) :: Integer))
 	formatCharacter c = case (formatCharacter c) of
 		Just f -> Just (\locale dt -> f locale (zonedTimeToLocalTime dt))


From git at git.haskell.org  Sun Dec 20 07:50:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:08 +0000 (UTC)
Subject: [commit: packages/time] master: Add secondsToDiffTime and
 picosecondsToDiffTime. (96ec994)
Message-ID: <20151220075008.D7ACD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/96ec99479c89cac13ac310b0b85536e6973c2af1

>---------------------------------------------------------------

commit 96ec99479c89cac13ac310b0b85536e6973c2af1
Author: bjorn <bjorn at bringert.net>
Date:   Wed Nov 15 14:21:45 2006 -0800

    Add secondsToDiffTime and picosecondsToDiffTime.
    
    Rationale:
    As has come up on haskell-cafe
    (http://comments.gmane.org/gmane.comp.lang.haskell.cafe/15653), it
    takes a while to figure out how to make DiffTime values.
    
    secondsToDiffTime is not that important since it is just another name
    for fromInteger, but I suspect that it would be used a lot.  Using
    fromRational to create a DiffTime from a number of picoseconds is a
    bit of a hassle, so having a picosecondsToDiffTime would be useful.
    
    darcs-hash:20061115222145-6cdb2-4c0badc67fc5a5c1880c111902ee3e28ad793719


>---------------------------------------------------------------

96ec99479c89cac13ac310b0b85536e6973c2af1
 Data/Time/Clock/Scale.hs | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index b7bcf97..053c515 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -8,9 +8,11 @@ module Data.Time.Clock.Scale
 	UniversalTime(..),
 
 	-- * Absolute intervals
-	DiffTime
+	DiffTime,
+        secondsToDiffTime, picosecondsToDiffTime
 ) where
 
+import Data.Ratio ((%))
 import Data.Fixed
 
 -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
@@ -55,3 +57,11 @@ instance Fractional DiffTime where
 	(MkDiffTime a) / (MkDiffTime b) = MkDiffTime (a / b)
 	recip (MkDiffTime a) = MkDiffTime (recip a)
 	fromRational r = MkDiffTime (fromRational r)
+
+-- | Create a 'DiffTime' which represents an integral number of seconds.
+secondsToDiffTime :: Integer -> DiffTime
+secondsToDiffTime = fromInteger
+
+-- | Create a 'DiffTime' from a number of picoseconds.
+picosecondsToDiffTime :: Integer -> DiffTime
+picosecondsToDiffTime x = fromRational (x % 1000000000000)


From git at git.haskell.org  Sun Dec 20 07:50:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:10 +0000 (UTC)
Subject: [commit: packages/time] master: Added fromMondayStartWeek and
 fromSundayStartWeek to Data.Time.Calendar.OrdinalDate. (04282fe)
Message-ID: <20151220075010.DEFAB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/04282fedbfbc79af60e7b430457f72789917da9d

>---------------------------------------------------------------

commit 04282fedbfbc79af60e7b430457f72789917da9d
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 01:21:14 2006 -0800

    Added fromMondayStartWeek and fromSundayStartWeek to Data.Time.Calendar.OrdinalDate.
    
    I couldn't find any duals of mondayStartWeek and sundayStartWeek. They
    are useful when implementing parsing for %W and %U.
    
    darcs-hash:20061116092114-6cdb2-794a278759d65b1cdbb8fbb8f890409edbaa3834


>---------------------------------------------------------------

04282fedbfbc79af60e7b430457f72789917da9d
 Data/Time/Calendar/OrdinalDate.hs | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)

diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index a293b5e..a88943f 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -54,3 +54,36 @@ sundayStartWeek date =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7)
 	yd = snd (toOrdinalDate date)
 	d = (toModifiedJulianDay date) + 3
 	k = d - (toInteger yd)
+
+-- | The inverse of 'mondayStartWeek'. Get a 'Day' given the year,
+-- the number of the Monday-starting week, and the day of the week.
+-- The first Monday is the first day of week 1, any earlier days in the year 
+-- are week 0 (as \"%W\" in formatTime).
+fromMondayStartWeek :: Integer -- ^ Year.
+                    -> Int     -- ^ Monday-starting week number.
+                    -> Int     -- ^ Day of week. 
+                               -- Monday is 1, Sunday is 7 (as \"%u\" in formatTime).
+                    -> Day
+fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
+    where yd = firstMonday + 7 * toInteger (w-1) + toInteger d - 1
+          -- first day of the year
+          firstDay = toModifiedJulianDay (fromOrdinalDate y 1)
+          -- 0-based year day of first monday of the year
+          firstMonday = (5 - firstDay) `mod` 7
+
+-- | The inverse of 'sundayStartWeek'. Get a 'Day' given the year and
+-- the number of the day of a Sunday-starting week.
+-- The first Sunday is the first day of week 1, any earlier days in the 
+-- year are week 0 (as \"%U\" in formatTime).
+-- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+fromSundayStartWeek :: Integer -- ^ Year.
+                    -> Int     -- ^ Sunday-starting week number.
+                    -> Int     -- ^ Day of week
+                               -- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+                    -> Day
+fromSundayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
+    where yd = firstSunday + 7 * toInteger (w-1) + toInteger d
+          -- first day of the year
+          firstDay = toModifiedJulianDay (fromOrdinalDate y 1)
+          -- 0-based year day of first sunday of the year
+          firstSunday = (4 - firstDay) `mod` 7


From git at git.haskell.org  Sun Dec 20 07:50:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:12 +0000 (UTC)
Subject: [commit: packages/time] master: Some haddock formatting for
 fromMondayStartWeek and fromSundayStartWeek. (c2bc34a)
Message-ID: <20151220075012.E4CF93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c2bc34a0e99761e5c16f3217d4b1bc67c6303dc2

>---------------------------------------------------------------

commit c2bc34a0e99761e5c16f3217d4b1bc67c6303dc2
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 01:56:20 2006 -0800

    Some haddock formatting for fromMondayStartWeek and fromSundayStartWeek.
    
    darcs-hash:20061116095620-6cdb2-0add550bd79d80a7f1ddd794a050d72c25226e63


>---------------------------------------------------------------

c2bc34a0e99761e5c16f3217d4b1bc67c6303dc2
 Data/Time/Calendar/OrdinalDate.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index a88943f..dfd4069 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -58,11 +58,11 @@ sundayStartWeek date =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7)
 -- | The inverse of 'mondayStartWeek'. Get a 'Day' given the year,
 -- the number of the Monday-starting week, and the day of the week.
 -- The first Monday is the first day of week 1, any earlier days in the year 
--- are week 0 (as \"%W\" in formatTime).
+-- are week 0 (as \"%W\" in 'formatTime').
 fromMondayStartWeek :: Integer -- ^ Year.
                     -> Int     -- ^ Monday-starting week number.
                     -> Int     -- ^ Day of week. 
-                               -- Monday is 1, Sunday is 7 (as \"%u\" in formatTime).
+                               -- Monday is 1, Sunday is 7 (as \"%u\" in 'formatTime').
                     -> Day
 fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
     where yd = firstMonday + 7 * toInteger (w-1) + toInteger d - 1
@@ -74,12 +74,11 @@ fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
 -- | The inverse of 'sundayStartWeek'. Get a 'Day' given the year and
 -- the number of the day of a Sunday-starting week.
 -- The first Sunday is the first day of week 1, any earlier days in the 
--- year are week 0 (as \"%U\" in formatTime).
--- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+-- year are week 0 (as \"%U\" in 'formatTime').
 fromSundayStartWeek :: Integer -- ^ Year.
                     -> Int     -- ^ Sunday-starting week number.
                     -> Int     -- ^ Day of week
-                               -- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+                               -- Sunday is 0, Saturday is 6 (as \"%w\" in 'formatTime').
                     -> Day
 fromSundayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
     where yd = firstSunday + 7 * toInteger (w-1) + toInteger d


From git at git.haskell.org  Sun Dec 20 07:50:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:14 +0000 (UTC)
Subject: [commit: packages/time] master: Added Data.Time.LocalTime.Parse,
 UNIX-style time parsing. (06ad028)
Message-ID: <20151220075014.ED9AE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/06ad028f0ddff11a63871b119393b9cc0ee30cd3

>---------------------------------------------------------------

commit 06ad028f0ddff11a63871b119393b9cc0ee30cd3
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 01:58:49 2006 -0800

    Added Data.Time.LocalTime.Parse, UNIX-style time parsing.
    
    The old System.Time has had a TODO  "* add functions to parse strings to
    `CalendarTime' (some day...)" for a long time. The question about date parsing
    comes up once in a while on the mailing lists
    (e.g. http://comments.gmane.org/gmane.comp.lang.haskell.cafe/16438).
    
    darcs-hash:20061116095849-6cdb2-fef2cd50b6017d49ede023864ae4a2f56f9584a8


>---------------------------------------------------------------

06ad028f0ddff11a63871b119393b9cc0ee30cd3
 Data/Time/LocalTime.hs       |   4 +-
 Data/Time/LocalTime/Parse.hs | 310 +++++++++++++++++++++++++++++++++++++++++++
 time.cabal                   |   3 +-
 3 files changed, 315 insertions(+), 2 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 06ad028f0ddff11a63871b119393b9cc0ee30cd3

From git at git.haskell.org  Sun Dec 20 07:50:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:16 +0000 (UTC)
Subject: [commit: packages/time] master: Updated SRC and dependencies in
 time/Makefile to include Data.Time.LocalTime.Parse. (d6ff855)
Message-ID: <20151220075017.004823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d6ff855adbb921cd61cdf46ffa2781c4c6466618

>---------------------------------------------------------------

commit d6ff855adbb921cd61cdf46ffa2781c4c6466618
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 02:44:38 2006 -0800

    Updated SRC and dependencies in time/Makefile to include Data.Time.LocalTime.Parse.
    
    darcs-hash:20061116104438-6cdb2-7dad989c3cb1ccaadefe38b7f03a40a0a219ad8d


>---------------------------------------------------------------

d6ff855adbb921cd61cdf46ffa2781c4c6466618
 time/Makefile | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/time/Makefile b/time/Makefile
index 9ca9a17..f99d908 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -42,6 +42,7 @@ SRCS = \
 	Data/Time/LocalTime/TimeOfDay.hs \
 	Data/Time/LocalTime/LocalTime.hs \
 	Data/Time/LocalTime/Format.hs \
+	Data/Time/LocalTime/Parse.hs \
 	Data/Time/LocalTime.hs \
 	Data/Time.hs
 
@@ -121,19 +122,13 @@ Data/Time/Calendar/Julian.o : Data/Time/Calendar/Private.hi
 Data/Time/Calendar/Julian.o : Data/Time/Calendar/Days.hi
 Data/Time/Calendar/Julian.o : Data/Time/Calendar/JulianYearDay.hi
 Data/Time/Calendar/Julian.o : Data/Time/Calendar/MonthDay.hi
-Data/Time/Calendar.o : Data/Time/Calendar.hs
-Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
-Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
-Data/Time/Calendar/Easter.o : Data/Time/Calendar/Easter.hs
-Data/Time/Calendar/Easter.o : Data/Time/Calendar/Julian.hi
-Data/Time/Calendar/Easter.o : Data/Time/Calendar.hi
 Data/Time/Clock/UTC.o : Data/Time/Clock/UTC.hs
 Data/Time/Clock/UTC.o : Data/Time/Clock/Scale.hi
 Data/Time/Clock/UTC.o : Data/Time/Calendar/Days.hi
 Data/Time/Clock/POSIX.o : Data/Time/Clock/POSIX.hs
+Data/Time/Clock/POSIX.o : Data/Time/Clock/CTimeval.hi
 Data/Time/Clock/POSIX.o : Data/Time/Calendar/Days.hi
 Data/Time/Clock/POSIX.o : Data/Time/Clock/UTC.hi
-Data/Time/Clock/POSIX.o : Data/Time/Clock/CTimeval.hi
 Data/Time/Clock/UTCDiff.o : Data/Time/Clock/UTCDiff.hs
 Data/Time/Clock/UTCDiff.o : Data/Time/Clock/UTC.hi
 Data/Time/Clock/UTCDiff.o : Data/Time/Clock/POSIX.hi
@@ -150,11 +145,27 @@ Data/Time/LocalTime/TimeOfDay.o : Data/Time/LocalTime/TimeOfDay.hs
 Data/Time/LocalTime/TimeOfDay.o : Data/Time/Clock.hi
 Data/Time/LocalTime/TimeOfDay.o : Data/Time/Calendar/Private.hi
 Data/Time/LocalTime/TimeOfDay.o : Data/Time/LocalTime/TimeZone.hi
+Data/Time/Calendar.o : Data/Time/Calendar.hs
+Data/Time/Calendar.o : Data/Time/Calendar/Gregorian.hi
+Data/Time/Calendar.o : Data/Time/Calendar/Days.hi
+Data/Time/Calendar/Easter.o : Data/Time/Calendar/Easter.hs
+Data/Time/Calendar/Easter.o : Data/Time/Calendar/Julian.hi
+Data/Time/Calendar/Easter.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/LocalTime.hs
 Data/Time/LocalTime/LocalTime.o : Data/Time/Clock.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/Calendar.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/LocalTime.o : Data/Time/LocalTime/TimeOfDay.hi
+Data/Time/LocalTime/Parse.o : Data/Time/LocalTime/Parse.hs
+Data/Time/LocalTime/Parse.o : Data/Time/LocalTime/TimeZone.hi
+Data/Time/LocalTime/Parse.o : Data/Time/LocalTime/TimeOfDay.hi
+Data/Time/LocalTime/Parse.o : Data/Time/LocalTime/LocalTime.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Calendar/WeekDate.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Calendar/OrdinalDate.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Calendar/Gregorian.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Calendar/Days.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Clock/UTC.hi
+Data/Time/LocalTime/Parse.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/Format.hs
 Data/Time/LocalTime/Format.o : Data/Time/Clock/POSIX.hi
 Data/Time/LocalTime/Format.o : Data/Time/Clock.hi
@@ -166,6 +177,7 @@ Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeZone.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/TimeOfDay.hi
 Data/Time/LocalTime/Format.o : Data/Time/LocalTime/LocalTime.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime.hs
+Data/Time/LocalTime.o : Data/Time/LocalTime/Parse.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/Format.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/LocalTime.hi
 Data/Time/LocalTime.o : Data/Time/LocalTime/TimeOfDay.hi


From git at git.haskell.org  Sun Dec 20 07:50:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:19 +0000 (UTC)
Subject: [commit: packages/time] master: Changed UTC to +0000 in default time
 zone in ParseTime, to avoid spurios time zone names. (16a9225)
Message-ID: <20151220075019.065163A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/16a92252a19297d9e1ec75a7b292a880f57b9587

>---------------------------------------------------------------

commit 16a92252a19297d9e1ec75a7b292a880f57b9587
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 02:52:54 2006 -0800

    Changed UTC to +0000 in default time zone in ParseTime, to avoid spurios time zone names.
    
    darcs-hash:20061116105254-6cdb2-3328529fc7d8536b6e9009295768fdc2eae7e25a


>---------------------------------------------------------------

16a92252a19297d9e1ec75a7b292a880f57b9587
 Data/Time/LocalTime/Parse.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Time/LocalTime/Parse.hs b/Data/Time/LocalTime/Parse.hs
index b3c42c7..a5420d3 100644
--- a/Data/Time/LocalTime/Parse.hs
+++ b/Data/Time/LocalTime/Parse.hs
@@ -33,7 +33,7 @@ class ParseTime t where
     -- | Builds a time value from a parsed input string.
     -- If the input does not include all the information needed to
     -- construct a complete value, any missing parts should be taken
-    -- from 1970-01-01 00:00:00 UTC (which was a Thursday).
+    -- from 1970-01-01 00:00:00 +0000 (which was a Thursday).
     buildTime :: TimeLocale -- ^ The time locale.
               -> [(Char,String)] -- ^ Pairs of format characters and the 
                                  -- corresponding part of the input.
@@ -263,7 +263,7 @@ instance ParseTime LocalTime where
     buildTime l xs = LocalTime (buildTime l xs) (buildTime l xs)
 
 instance ParseTime TimeZone where
-    buildTime _ = foldl f utc
+    buildTime _ = foldl f (minutesToTimeZone 0)
       where 
         f t@(TimeZone offset dst name) (c,x) = 
             case c of


From git at git.haskell.org  Sun Dec 20 07:50:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:21 +0000 (UTC)
Subject: [commit: packages/time] master: Added quickcheck properties for time
 parsing. (ad26aa5)
Message-ID: <20151220075021.0F58F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ad26aa5cf47d8c573dd0b6333da5e065843f37af

>---------------------------------------------------------------

commit ad26aa5cf47d8c573dd0b6333da5e065843f37af
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 02:56:16 2006 -0800

    Added quickcheck properties for time parsing.
    
    darcs-hash:20061116105616-6cdb2-eed6a7e86410241c74b0b43e4e2d8c4a45096ba7


>---------------------------------------------------------------

ad26aa5cf47d8c573dd0b6333da5e065843f37af
 time/test/Makefile         |   6 +-
 time/test/TestParseTime.hs | 290 +++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 295 insertions(+), 1 deletion(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ad26aa5cf47d8c573dd0b6333da5e065843f37af

From git at git.haskell.org  Sun Dec 20 07:50:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:23 +0000 (UTC)
Subject: [commit: packages/time] master: Moved %c to failing ZonedTime test
 since formatTime %Z does not output time zone offset if there is no time zone
 name. (bef9a3c)
Message-ID: <20151220075023.158603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/bef9a3cf6f39980706483a8e14013890a9c54d80

>---------------------------------------------------------------

commit bef9a3cf6f39980706483a8e14013890a9c54d80
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 03:12:47 2006 -0800

    Moved %c to failing ZonedTime test since formatTime %Z does not output time zone offset if there is no time zone name.
    
    darcs-hash:20061116111247-6cdb2-509d4a19b5225b95dc0343a983099569d2f90fad


>---------------------------------------------------------------

bef9a3cf6f39980706483a8e14013890a9c54d80
 time/test/TestParseTime.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/time/test/TestParseTime.hs b/time/test/TestParseTime.hs
index 356f2fb..91d76b0 100644
--- a/time/test/TestParseTime.hs
+++ b/time/test/TestParseTime.hs
@@ -237,7 +237,7 @@ timeZoneFormats = map FormatString ["%z","%z%Z","%Z%z"]
 
 zonedTimeFormats :: [FormatString ZonedTime]
 zonedTimeFormats = map FormatString
-  ["%a, %d %b %Y %H:%M:%S %z","%c"]
+  ["%a, %d %b %Y %H:%M:%S %z"]
 
 utcTimeFormats :: [FormatString UTCTime]
 utcTimeFormats = map FormatString 
@@ -275,7 +275,8 @@ failingTimeZoneFormats = map FormatString
 failingZonedTimeFormats :: [FormatString ZonedTime]
 failingZonedTimeFormats = map FormatString 
     [
-     -- %Z is not implemented properly
+     -- can't figure out offset from %Z, also, formatTime produces "" for %Z
+     "%c",
      "%a, %d %b %Y %H:%M:%S %Z",
      -- %s does not include second decimals
      "%s %z"


From git at git.haskell.org  Sun Dec 20 07:50:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:25 +0000 (UTC)
Subject: [commit: packages/time] master: Changed test case Makefile to work
 with GHC 6.6 (there is no -package fixed). (eba81c2)
Message-ID: <20151220075025.1D2B43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/eba81c2d010185d361181c3132f6de9165037b43

>---------------------------------------------------------------

commit eba81c2d010185d361181c3132f6de9165037b43
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 03:13:46 2006 -0800

    Changed test case Makefile to work with GHC 6.6 (there is no -package fixed).
    
    darcs-hash:20061116111346-6cdb2-7ced2b2124315f6bf4545d0617ec10bd50bd6896


>---------------------------------------------------------------

eba81c2d010185d361181c3132f6de9165037b43
 time/test/LongWeekYears.hs |  1 -
 time/test/Makefile         | 32 ++++++++++++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/time/test/LongWeekYears.hs b/time/test/LongWeekYears.hs
index b5c3913..db453be 100644
--- a/time/test/LongWeekYears.hs
+++ b/time/test/LongWeekYears.hs
@@ -2,7 +2,6 @@
 
 module Main where
 
-import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
 import Data.Time.Calendar
 
diff --git a/time/test/Makefile b/time/test/Makefile
index cb4c2ea..9df2b39 100644
--- a/time/test/Makefile
+++ b/time/test/Makefile
@@ -1,52 +1,55 @@
+GHC = ghc
+GHCFLAGS = 
+
 default: CurrentTime.run ShowDST.run test
 
 TestMonthDay: TestMonthDay.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ConvertBack: ConvertBack.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestCalendars: TestCalendars.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestTime: TestTime.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 LongWeekYears: LongWeekYears.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ClipDates: ClipDates.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 AddDays: AddDays.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormat: TestFormat.o TestFormatStuff.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormatStuff.o: TestFormatStuff.c TestFormatStuff.h
 	gcc -o $@ -c $<
 
 TestParseDAT: TestParseDAT.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestEaster: TestEaster.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 CurrentTime: CurrentTime.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 ShowDST: ShowDST.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone: TimeZone.o ../libHStime.a
-	ghc -package fixed $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone.ref: FORCE
 	date +%z > $@
 
 TestParseTime: TestParseTime.o ../libHStime.a
-	ghc -package fixed -package QuickCheck $^ -o $@
+	$(GHC) $(GHCFLAGS) -package QuickCheck $^ -o $@
 
 test:	\
 	TestMonthDay.diff	\
@@ -60,6 +63,7 @@ test:	\
 	TestFormat.diff0	\
 	TestParseDAT.diff	\
 	TestEaster.diff	\
+	TestParseTime.run \
 	UseCases.o
 
 clean:


From git at git.haskell.org  Sun Dec 20 07:50:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:27 +0000 (UTC)
Subject: [commit: packages/time] master: Compile test programs using
 ../../dist/build/libHStime-1.0.a as produced by the Cabal build step.
 (43d95b2)
Message-ID: <20151220075027.244553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/43d95b2e3a860661e66bed2e606b7675178eb22f

>---------------------------------------------------------------

commit 43d95b2e3a860661e66bed2e606b7675178eb22f
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 03:20:48 2006 -0800

    Compile test programs using ../../dist/build/libHStime-1.0.a as produced by the Cabal build step.
    
    darcs-hash:20061116112048-6cdb2-c592217ab26ead8026d074c6d410f0d10265e0c0


>---------------------------------------------------------------

43d95b2e3a860661e66bed2e606b7675178eb22f
 time/test/Makefile | 29 +++++++++++++++--------------
 1 file changed, 15 insertions(+), 14 deletions(-)

diff --git a/time/test/Makefile b/time/test/Makefile
index 9df2b39..c3f2992 100644
--- a/time/test/Makefile
+++ b/time/test/Makefile
@@ -1,54 +1,55 @@
 GHC = ghc
 GHCFLAGS = 
+LIBS = ../../dist/build/libHStime-1.0.a
 
 default: CurrentTime.run ShowDST.run test
 
-TestMonthDay: TestMonthDay.o ../libHStime.a
+TestMonthDay: TestMonthDay.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ConvertBack: ConvertBack.o ../libHStime.a
+ConvertBack: ConvertBack.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestCalendars: TestCalendars.o ../libHStime.a
+TestCalendars: TestCalendars.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestTime: TestTime.o ../libHStime.a
+TestTime: TestTime.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-LongWeekYears: LongWeekYears.o ../libHStime.a
+LongWeekYears: LongWeekYears.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ClipDates: ClipDates.o ../libHStime.a
+ClipDates: ClipDates.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-AddDays: AddDays.o ../libHStime.a
+AddDays: AddDays.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestFormat: TestFormat.o TestFormatStuff.o ../libHStime.a
+TestFormat: TestFormat.o TestFormatStuff.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormatStuff.o: TestFormatStuff.c TestFormatStuff.h
 	gcc -o $@ -c $<
 
-TestParseDAT: TestParseDAT.o ../libHStime.a
+TestParseDAT: TestParseDAT.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestEaster: TestEaster.o ../libHStime.a
+TestEaster: TestEaster.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-CurrentTime: CurrentTime.o ../libHStime.a
+CurrentTime: CurrentTime.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ShowDST: ShowDST.o ../libHStime.a
+ShowDST: ShowDST.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TimeZone: TimeZone.o ../libHStime.a
+TimeZone: TimeZone.o $(LIBS)
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone.ref: FORCE
 	date +%z > $@
 
-TestParseTime: TestParseTime.o ../libHStime.a
+TestParseTime: TestParseTime.o $(LIBS)
 	$(GHC) $(GHCFLAGS) -package QuickCheck $^ -o $@
 
 test:	\


From git at git.haskell.org  Sun Dec 20 07:50:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:29 +0000 (UTC)
Subject: [commit: packages/time] master: Fixed taiEpoch Haddock comment to
 include the epoch time. (1632436)
Message-ID: <20151220075029.2A4993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/16324364771a9c323bed81d8eba20083576c9a4a

>---------------------------------------------------------------

commit 16324364771a9c323bed81d8eba20083576c9a4a
Author: bjorn <bjorn at bringert.net>
Date:   Thu Nov 16 04:00:24 2006 -0800

    Fixed taiEpoch Haddock comment to include the epoch time.
    
    The taiEpoch haddock comment was just "The epoch of TAI, which is".
    Changed this to "The epoch of TAI, which is 1858-11-17 00:00:00 TAI."
    
    darcs-hash:20061116120024-6cdb2-fe77f9d9bd5336bbd91bee5afcb055f3a6796965


>---------------------------------------------------------------

16324364771a9c323bed81d8eba20083576c9a4a
 Data/Time/Clock/TAI.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 00cebd5..b1c37c1 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -26,7 +26,7 @@ newtype AbsoluteTime = MkAbsoluteTime {unAbsoluteTime :: DiffTime} deriving (Eq,
 instance Show AbsoluteTime where
 	show t = show (utcToLocalTime utc (taiToUTCTime (const 0) t)) ++ " TAI" -- ugly, but standard apparently
 
--- | The epoch of TAI, which is 
+-- | The epoch of TAI, which is 1858-11-17 00:00:00 TAI.
 taiEpoch :: AbsoluteTime
 taiEpoch = MkAbsoluteTime 0
 


From git at git.haskell.org  Sun Dec 20 07:50:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:31 +0000 (UTC)
Subject: [commit: packages/time] master: move test dir up,
 remove old junk (9b6744e)
Message-ID: <20151220075031.32D1B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9b6744e0fb08826431d844e6f3e0e1f57544f8cf

>---------------------------------------------------------------

commit 9b6744e0fb08826431d844e6f3e0e1f57544f8cf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Dec 11 00:00:45 2006 -0800

    move test dir up, remove old junk
    
    darcs-hash:20061211080045-ac6dd-ce8452ab86b8c8efdfb9d6697df9c32aad49d87d


>---------------------------------------------------------------

9b6744e0fb08826431d844e6f3e0e1f57544f8cf
 {time/test => test}/AddDays.hs        |   0
 {time/test => test}/AddDays.ref       |   0
 {time/test => test}/ClipDates.hs      |   0
 {time/test => test}/ClipDates.ref     |   0
 {time/test => test}/ConvertBack.hs    |   0
 {time/test => test}/CurrentTime.hs    |   0
 {time/test => test}/LongWeekYears.hs  |   0
 {time/test => test}/LongWeekYears.ref |   0
 {time/test => test}/Makefile          |   0
 {time/test => test}/ShowDST.hs        |   0
 {time/test => test}/TestCalendars.hs  |   0
 {time/test => test}/TestCalendars.ref |   0
 {time/test => test}/TestEaster.hs     |   0
 {time/test => test}/TestEaster.ref    |   0
 {time/test => test}/TestFormat.hs     |   0
 {time/test => test}/TestFormatStuff.c |   0
 {time/test => test}/TestFormatStuff.h |   0
 {time/test => test}/TestMonthDay.hs   |   0
 {time/test => test}/TestMonthDay.ref  |   0
 {time/test => test}/TestParseDAT.hs   |   0
 {time/test => test}/TestParseDAT.ref  |   0
 {time/test => test}/TestParseTime.hs  |   0
 {time/test => test}/TestTime.hs       |   0
 {time/test => test}/TestTime.ref      |   0
 {time/test => test}/TimeZone.hs       |   0
 {time/test => test}/UseCases.lhs      |   0
 {time/test => test}/tai-utc.dat       |   0
 time/Makefile                         | 193 ----------------------------------
 28 files changed, 193 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9b6744e0fb08826431d844e6f3e0e1f57544f8cf

From git at git.haskell.org  Sun Dec 20 07:50:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:33 +0000 (UTC)
Subject: [commit: packages/time] master: HsTime.h should be installed (acf02ec)
Message-ID: <20151220075033.39DB43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/acf02ece782ad06eed2bf8980e2c24e65d6dca3b

>---------------------------------------------------------------

commit acf02ece782ad06eed2bf8980e2c24e65d6dca3b
Author: mukai <mukai at jmuk.org>
Date:   Wed Dec 13 07:13:46 2006 -0800

    HsTime.h should be installed
    
    darcs-hash:20061213151346-f0081-bc57b7801c511854b6e762e4db78a5e68ff109b7


>---------------------------------------------------------------

acf02ece782ad06eed2bf8980e2c24e65d6dca3b
 Makefile         |  2 +-
 include/Makefile | 11 +++++++++++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index e2d286b..76ea560 100644
--- a/Makefile
+++ b/Makefile
@@ -1,7 +1,7 @@
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = 
+SUBDIRS = include
 
 ALL_DIRS = \
 	cbits \
diff --git a/include/Makefile b/include/Makefile
new file mode 100644
index 0000000..748523c
--- /dev/null
+++ b/include/Makefile
@@ -0,0 +1,11 @@
+TOP=../..
+include $(TOP)/mk/boilerplate.mk
+
+H_FILES = $(wildcard *.h)
+
+includedir = $(libdir)/include
+INSTALL_INCLUDES = $(H_FILES)
+
+DIST_CLEAN_FILES += HsTimeConfig.h
+
+include $(TOP)/mk/target.mk


From git at git.haskell.org  Sun Dec 20 07:50:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:35 +0000 (UTC)
Subject: [commit: packages/time] master: clean up .xcodeproj to use cabal
 (5892926)
Message-ID: <20151220075035.43FD93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/58929269a10f917192c37231dade58935dded69b

>---------------------------------------------------------------

commit 58929269a10f917192c37231dade58935dded69b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Dec 19 21:05:38 2006 -0800

    clean up .xcodeproj to use cabal
    
    darcs-hash:20061220050538-ac6dd-e79ba99f9d60002b3298c351f73744dd7fc8eafd


>---------------------------------------------------------------

58929269a10f917192c37231dade58935dded69b
 time.xcodeproj/cabalbuild                          |   5 +
 .../project.pbxproj                                | 180 +++++----------------
 2 files changed, 42 insertions(+), 143 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 58929269a10f917192c37231dade58935dded69b

From git at git.haskell.org  Sun Dec 20 07:50:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:37 +0000 (UTC)
Subject: [commit: packages/time] master: improve error reporting in XCode
 (a4b8812)
Message-ID: <20151220075037.4B40B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a4b8812aa30291185aca449117d2bc8141985121

>---------------------------------------------------------------

commit a4b8812aa30291185aca449117d2bc8141985121
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Dec 19 22:49:48 2006 -0800

    improve error reporting in XCode
    
    darcs-hash:20061220064948-ac6dd-e6e4ca06bf1e0a7d15ca9d825a42a6b34775cefc


>---------------------------------------------------------------

a4b8812aa30291185aca449117d2bc8141985121
 time.xcodeproj/cabalbuild   |  5 ++++-
 time.xcodeproj/fixerrormsgs | 10 ++++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/time.xcodeproj/cabalbuild b/time.xcodeproj/cabalbuild
index 6b4a2d1..2462967 100755
--- a/time.xcodeproj/cabalbuild
+++ b/time.xcodeproj/cabalbuild
@@ -1,5 +1,8 @@
 #!/bin/sh
+{
 case $1 in
 	''		) runghc Setup.hs configure;runghc Setup.hs build ;;
 	*		) runghc Setup.hs $1 ;;
-esac
+esac 2>&1;
+} | ${0/%cabalbuild/}/fixerrormsgs
+exit $PIPESTATUS
diff --git a/time.xcodeproj/fixerrormsgs b/time.xcodeproj/fixerrormsgs
new file mode 100755
index 0000000..ee6d461
--- /dev/null
+++ b/time.xcodeproj/fixerrormsgs
@@ -0,0 +1,10 @@
+#!/usr/bin/perl
+$| = 1;
+my $found = false;
+while (<>)
+	{
+	s/^[ 	]*/ / if $found;
+	s/^ Warning:/ warning:/ if $found;
+	$found = s/(^[^ 	][^ 	]*:[0-9][0-9]*:)\n/$1/;
+	print;
+	}


From git at git.haskell.org  Sun Dec 20 07:50:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:39 +0000 (UTC)
Subject: [commit: packages/time] master: XCode tweak (ef08a05)
Message-ID: <20151220075039.5193F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ef08a05eb43c43181d0af24ba66dd6038f078665

>---------------------------------------------------------------

commit ef08a05eb43c43181d0af24ba66dd6038f078665
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Dec 19 22:50:56 2006 -0800

    XCode tweak
    
    darcs-hash:20061220065056-ac6dd-5e7ba8cb7e336e47f345da73ee1bec98f45ef182


>---------------------------------------------------------------

ef08a05eb43c43181d0af24ba66dd6038f078665
 time.xcodeproj/project.pbxproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/time.xcodeproj/project.pbxproj b/time.xcodeproj/project.pbxproj
index 6152858..a4fb8b8 100644
--- a/time.xcodeproj/project.pbxproj
+++ b/time.xcodeproj/project.pbxproj
@@ -87,6 +87,7 @@
 		AB6859EE0AC73993004B83FC /* prologue.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = prologue.txt; sourceTree = "<group>"; };
 		AB7FC7490954C86800796113 /* UTCDiff.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = UTCDiff.hs; sourceTree = "<group>"; };
 		AB7FC8360954E17000796113 /* LICENSE */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = LICENSE; sourceTree = "<group>"; };
+		AB9864C60B39084300D66E11 /* Setup.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = Setup.hs; sourceTree = "<group>"; };
 		ABC0F98D090C7A6000DEF265 /* tai-utc.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tai-utc.dat"; sourceTree = "<group>"; };
 		ABC0F98E090C7A6000DEF265 /* TestParseDAT.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = TestParseDAT.hs; sourceTree = "<group>"; };
 		ABC0F9910913518A00DEF265 /* TestParseDAT.ref */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestParseDAT.ref; sourceTree = "<group>"; };
@@ -165,6 +166,7 @@
 			isa = PBXGroup;
 			children = (
 				AB01DCF708374808003C9EF7 /* time.cabal */,
+				AB9864C60B39084300D66E11 /* Setup.hs */,
 				AB7FC8360954E17000796113 /* LICENSE */,
 				AB01DCF908374808003C9EF7 /* HsTime.h */,
 				AB01DCF808374808003C9EF7 /* HsTime.c */,


From git at git.haskell.org  Sun Dec 20 07:50:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:41 +0000 (UTC)
Subject: [commit: packages/time] master: xcodeproj cleanup (49451d6)
Message-ID: <20151220075041.57F693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/49451d6560edc0cf438c63d06b392a61f224c2ca

>---------------------------------------------------------------

commit 49451d6560edc0cf438c63d06b392a61f224c2ca
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Dec 20 02:10:47 2006 -0800

    xcodeproj cleanup
    
    darcs-hash:20061220101047-ac6dd-3093f56c4241839008d7f7d41348462ddab923de


>---------------------------------------------------------------

49451d6560edc0cf438c63d06b392a61f224c2ca
 time.xcodeproj/project.pbxproj | 160 +----------------------------------------
 1 file changed, 2 insertions(+), 158 deletions(-)

diff --git a/time.xcodeproj/project.pbxproj b/time.xcodeproj/project.pbxproj
index a4fb8b8..ee8c7d6 100644
--- a/time.xcodeproj/project.pbxproj
+++ b/time.xcodeproj/project.pbxproj
@@ -91,6 +91,7 @@
 		ABC0F98D090C7A6000DEF265 /* tai-utc.dat */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "tai-utc.dat"; sourceTree = "<group>"; };
 		ABC0F98E090C7A6000DEF265 /* TestParseDAT.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = TestParseDAT.hs; sourceTree = "<group>"; };
 		ABC0F9910913518A00DEF265 /* TestParseDAT.ref */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = TestParseDAT.ref; sourceTree = "<group>"; };
+		ABD4C3540B3939E7003A5C75 /* TestParseTime.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = TestParseTime.hs; sourceTree = "<group>"; };
 		ABD6783F084167B900CF37C0 /* POSIX.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = POSIX.hs; sourceTree = "<group>"; };
 		ABD67840084167D100CF37C0 /* CTimeval.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = CTimeval.hs; sourceTree = "<group>"; };
 		ABD67841084168B700CF37C0 /* UTC.hs */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.haskell; path = UTC.hs; sourceTree = "<group>"; };
@@ -247,6 +248,7 @@
 				AB20A9E509275795001A7C3C /* TestEaster.ref */,
 				ABC0F98D090C7A6000DEF265 /* tai-utc.dat */,
 				AB26689F08A6D7290059DEC0 /* UseCases.lhs */,
+				ABD4C3540B3939E7003A5C75 /* TestParseTime.hs */,
 			);
 			path = test;
 			sourceTree = "<group>";
@@ -339,40 +341,6 @@
 /* End PBXTargetDependency section */
 
 /* Begin XCBuildConfiguration section */
-		ABD26A480878B4D200AD8A23 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Untitled;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Development;
-		};
-		ABD26A490878B4D200AD8A23 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Untitled;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
 		ABD26A4A0878B4D200AD8A23 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -380,40 +348,6 @@
 			};
 			name = Default;
 		};
-		ABD26A4C0878B4D200AD8A23 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Test;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Development;
-		};
-		ABD26A4D0878B4D200AD8A23 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Test;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
 		ABD26A4E0878B4D200AD8A23 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -421,40 +355,6 @@
 			};
 			name = Default;
 		};
-		ABD26A500878B4D200AD8A23 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Untitled;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Development;
-		};
-		ABD26A510878B4D200AD8A23 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Untitled;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
 		ABD26A520878B4D200AD8A23 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -462,40 +362,6 @@
 			};
 			name = Default;
 		};
-		ABD26A540878B4D200AD8A23 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = NO;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Everything;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Development;
-		};
-		ABD26A550878B4D200AD8A23 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				COPY_PHASE_STRIP = YES;
-				OTHER_CFLAGS = "";
-				OTHER_LDFLAGS = "";
-				OTHER_REZFLAGS = "";
-				PRODUCT_NAME = Everything;
-				SECTORDER_FLAGS = "";
-				WARNING_CFLAGS = (
-					"-Wmost",
-					"-Wno-four-char-constants",
-					"-Wno-unknown-pragmas",
-				);
-			};
-			name = Deployment;
-		};
 		ABD26A560878B4D200AD8A23 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -512,18 +378,6 @@
 			};
 			name = Default;
 		};
-		ABD26A580878B4D200AD8A23 /* Development */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Development;
-		};
-		ABD26A590878B4D200AD8A23 /* Deployment */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-			};
-			name = Deployment;
-		};
 		ABD26A5A0878B4D200AD8A23 /* Default */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
@@ -536,8 +390,6 @@
 		ABD26A470878B4D200AD8A23 /* Build configuration list for PBXLegacyTarget "Build" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				ABD26A480878B4D200AD8A23 /* Development */,
-				ABD26A490878B4D200AD8A23 /* Deployment */,
 				ABD26A4A0878B4D200AD8A23 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -546,8 +398,6 @@
 		ABD26A4B0878B4D200AD8A23 /* Build configuration list for PBXLegacyTarget "Test" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				ABD26A4C0878B4D200AD8A23 /* Development */,
-				ABD26A4D0878B4D200AD8A23 /* Deployment */,
 				ABD26A4E0878B4D200AD8A23 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -556,8 +406,6 @@
 		ABD26A4F0878B4D200AD8A23 /* Build configuration list for PBXLegacyTarget "Documentation" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				ABD26A500878B4D200AD8A23 /* Development */,
-				ABD26A510878B4D200AD8A23 /* Deployment */,
 				ABD26A520878B4D200AD8A23 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -566,8 +414,6 @@
 		ABD26A530878B4D200AD8A23 /* Build configuration list for PBXAggregateTarget "Everything" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				ABD26A540878B4D200AD8A23 /* Development */,
-				ABD26A550878B4D200AD8A23 /* Deployment */,
 				ABD26A560878B4D200AD8A23 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;
@@ -576,8 +422,6 @@
 		ABD26A570878B4D200AD8A23 /* Build configuration list for PBXProject "time" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
-				ABD26A580878B4D200AD8A23 /* Development */,
-				ABD26A590878B4D200AD8A23 /* Deployment */,
 				ABD26A5A0878B4D200AD8A23 /* Default */,
 			);
 			defaultConfigurationIsVisible = 0;


From git at git.haskell.org  Sun Dec 20 07:50:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:43 +0000 (UTC)
Subject: [commit: packages/time] master: attempt to get cabal test working
 (843ed89)
Message-ID: <20151220075043.5FC603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/843ed89f8f3d46ddabe04f1ea8ccf33426a13c92

>---------------------------------------------------------------

commit 843ed89f8f3d46ddabe04f1ea8ccf33426a13c92
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Dec 20 02:12:54 2006 -0800

    attempt to get cabal test working
    
    darcs-hash:20061220101254-ac6dd-56f6ff37f578c96f352ca61032eaf269e727bdf9


>---------------------------------------------------------------

843ed89f8f3d46ddabe04f1ea8ccf33426a13c92
 Setup.hs      | 19 +++++++++++++++++--
 test/Makefile |  8 ++++----
 2 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index 60804b2..2859262 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,6 +1,21 @@
 module Main (main) where
 
-import Distribution.Simple (defaultMainWithHooks, defaultUserHooks)
+import Distribution.Simple
+import Distribution.PackageDescription
+import Distribution.Simple.LocalBuildInfo
+import System.Exit
+import System.Cmd
+import System.Directory
+import Control.Exception
+
+withCurrentDirectory :: FilePath -> IO a -> IO a
+withCurrentDirectory path f = do
+	cur <- getCurrentDirectory
+	setCurrentDirectory path
+	finally f (setCurrentDirectory cur)
+
+runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ExitCode
+runTestScript args flag pd lbi = withCurrentDirectory "test" (system "make")
 
 main :: IO ()
-main = defaultMainWithHooks defaultUserHooks
+main = defaultMainWithHooks defaultUserHooks{runTests = runTestScript}
diff --git a/test/Makefile b/test/Makefile
index c3f2992..ff2454b 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,6 +1,6 @@
 GHC = ghc
-GHCFLAGS = 
-LIBS = ../../dist/build/libHStime-1.0.a
+GHCFLAGS = -i../dist/build
+LIBS = ../dist/build/libHStime-1.0.a
 
 default: CurrentTime.run ShowDST.run test
 
@@ -88,10 +88,10 @@ clean:
 	@:
 
 %.o: %.hs
-	ghc -i.. -c $< -o $@
+	$(GHC) $(GHCFLAGS) -c $< -o $@
 
 %.o: %.lhs
-	ghc -i.. -c $< -o $@
+	$(GHC) $(GHCFLAGS) -c $< -o $@
 
 FORCE:
 


From git at git.haskell.org  Sun Dec 20 07:50:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:45 +0000 (UTC)
Subject: [commit: packages/time] master: get "runhaskell Setup.hs test" to
 work (ab61764)
Message-ID: <20151220075045.66C453A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ab6176494357c23ad1bd6b4a79bc5cbeae76c4b6

>---------------------------------------------------------------

commit ab6176494357c23ad1bd6b4a79bc5cbeae76c4b6
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Dec 22 18:26:02 2006 -0800

    get "runhaskell Setup.hs test" to work
    
    darcs-hash:20061223022602-ac6dd-8a16b100b94134574f8368cb1a521ea0d55ff64f


>---------------------------------------------------------------

ab6176494357c23ad1bd6b4a79bc5cbeae76c4b6
 test/Makefile         | 36 +++++++++++++++++++-----------------
 test/TestParseTime.hs | 23 ++++++++++++++++-------
 2 files changed, 35 insertions(+), 24 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index ff2454b..ecfaa96 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,55 +1,57 @@
 GHC = ghc
-GHCFLAGS = -i../dist/build
-LIBS = ../dist/build/libHStime-1.0.a
+GHCFLAGS = -package time
 
-default: CurrentTime.run ShowDST.run test
+default:
+	cd ..; runhaskell Setup.hs register --user --inplace
+	make CurrentTime.run ShowDST.run test
+	cd ..; runhaskell Setup.hs unregister --user
 
-TestMonthDay: TestMonthDay.o $(LIBS)
+TestMonthDay: TestMonthDay.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ConvertBack: ConvertBack.o $(LIBS)
+ConvertBack: ConvertBack.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestCalendars: TestCalendars.o $(LIBS)
+TestCalendars: TestCalendars.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestTime: TestTime.o $(LIBS)
+TestTime: TestTime.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-LongWeekYears: LongWeekYears.o $(LIBS)
+LongWeekYears: LongWeekYears.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ClipDates: ClipDates.o $(LIBS)
+ClipDates: ClipDates.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-AddDays: AddDays.o $(LIBS)
+AddDays: AddDays.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestFormat: TestFormat.o TestFormatStuff.o $(LIBS)
+TestFormat: TestFormat.o TestFormatStuff.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TestFormatStuff.o: TestFormatStuff.c TestFormatStuff.h
 	gcc -o $@ -c $<
 
-TestParseDAT: TestParseDAT.o $(LIBS)
+TestParseDAT: TestParseDAT.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TestEaster: TestEaster.o $(LIBS)
+TestEaster: TestEaster.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-CurrentTime: CurrentTime.o $(LIBS)
+CurrentTime: CurrentTime.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-ShowDST: ShowDST.o $(LIBS)
+ShowDST: ShowDST.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
-TimeZone: TimeZone.o $(LIBS)
+TimeZone: TimeZone.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
 TimeZone.ref: FORCE
 	date +%z > $@
 
-TestParseTime: TestParseTime.o $(LIBS)
+TestParseTime: TestParseTime.o
 	$(GHC) $(GHCFLAGS) -package QuickCheck $^ -o $@
 
 test:	\
diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 91d76b0..ad0c1c5 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -1,3 +1,5 @@
+{-# OPTIONS -Wall -Werror -fno-warn-type-defaults -fno-warn-unused-binds #-}
+
 import Control.Monad
 import Data.Char
 import Data.Ratio
@@ -10,6 +12,7 @@ import System.Locale
 import Test.QuickCheck
 
 
+ntest :: Int
 ntest = 1000
 
 main :: IO ()
@@ -26,10 +29,13 @@ checkOne :: Config -> NamedProperty -> IO ()
 checkOne config (n,p) = 
     do putStr (rpad 65 ' ' n)
        check config p
-  where rpad n c xs = xs ++ replicate (n - length xs) c
+  where rpad n' c xs = xs ++ replicate (n' - length xs) c
+
 
+parse :: ParseTime t => String -> String -> Maybe t
 parse f t = parseTime defaultTimeLocale f t
 
+format :: (FormatTime t) => String -> t -> String
 format f t = formatTime defaultTimeLocale f t
 
 
@@ -39,12 +45,12 @@ instance Arbitrary Day where
 
 instance Arbitrary DiffTime where
     arbitrary = oneof [intSecs, fracSecs] -- up to 1 leap second
-        where intSecs = liftM secondsToDiffTime $ choose (0, 86400) 
-              fracSecs = liftM picosecondsToDiffTime $ choose (0, 86400 * 10^12) 
-              secondsToDiffTime :: Integer -> DiffTime
-              secondsToDiffTime = fromInteger
-              picosecondsToDiffTime :: Integer -> DiffTime
-              picosecondsToDiffTime x = fromRational (x % 10^12)
+        where intSecs = liftM secondsToDiffTime' $ choose (0, 86400)
+              fracSecs = liftM picosecondsToDiffTime' $ choose (0, 86400 * 10^12)
+              secondsToDiffTime' :: Integer -> DiffTime
+              secondsToDiffTime' = fromInteger
+              picosecondsToDiffTime' :: Integer -> DiffTime
+              picosecondsToDiffTime' x = fromRational (x % 10^12)
     coarbitrary t = coarbitrary (fromEnum t)
 
 instance Arbitrary TimeOfDay where
@@ -75,6 +81,7 @@ instance Eq ZonedTime where
 -- * tests for dbugging failing cases
 --
 
+test_parse_format :: (FormatTime t,ParseTime t,Show t) => String -> t -> (String,String,Maybe t)
 test_parse_format f t = let s = format f t in (show t, s, parse f s `asTypeOf` Just t)
 
 --
@@ -101,11 +108,13 @@ prop_parse_showOrdinalDate d = parse "%Y-%j" (showOrdinalDate d) == Just d
 -- * fromMondayStartWeek and fromSundayStartWeek
 --
 
+prop_fromMondayStartWeek :: Day -> Bool
 prop_fromMondayStartWeek d = 
     let (w,wd)  = mondayStartWeek d
         (y,_,_) = toGregorian d
      in fromMondayStartWeek y w wd == d
 
+prop_fromSundayStartWeek :: Day -> Bool
 prop_fromSundayStartWeek d = 
     let (w,wd)  = sundayStartWeek d
         (y,_,_) = toGregorian d


From git at git.haskell.org  Sun Dec 20 07:50:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:47 +0000 (UTC)
Subject: [commit: packages/time] master: Changed %S to return whole seconds,
 and added %Q and %q. (f73da90)
Message-ID: <20151220075047.6EDC23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f73da902c82a2ce5f0a336ee1fd1774df5bdb6e2

>---------------------------------------------------------------

commit f73da902c82a2ce5f0a336ee1fd1774df5bdb6e2
Author: bjorn <bjorn at bringert.net>
Date:   Sun Feb 11 07:53:58 2007 -0800

    Changed %S to return whole seconds, and added %Q and %q.
    
    Implements part of http://hackage.haskell.org/trac/ghc/ticket/1007
    
    formatTime: Change %S to: the number of whole seconds.
    formatTime: Add %q: the number of picoseconds (including trailing zeroes).
    formatTime: Add %Q: decimal point and second decimals, without trailing zeros.
    If the number of picoseconds is zero, nothing is produced (not even the decimal point).
    
    Rationale: Currently %S includes decimals if there are any. This is different from
    strftime, and there is no format specifier for just the integer part of the seconds.
    It would be nice to have such a specifier to implement many standard date formats
    (e.g. RFC 822). Also a specifier for second decimals would also help when using %s.
    Currently there is no reasonable way to get more than integer second precision with
    since-epoch timestamps. The current %S would be equivalent to %S%Q under this proposal."
    
    darcs-hash:20070211155358-6cdb2-de94204665c57a1b86b65bd80f1a98d3d469d0f0


>---------------------------------------------------------------

f73da902c82a2ce5f0a336ee1fd1774df5bdb6e2
 Data/Time/LocalTime/Format.hs | 19 +++++++++++++++----
 Data/Time/LocalTime/Parse.hs  | 34 +++++++++++++++++++---------------
 2 files changed, 34 insertions(+), 19 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index c13160e..fc26327 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -20,6 +20,7 @@ import Data.Time.Clock.POSIX
 import System.Locale
 import Data.Maybe
 import Data.Char
+import Data.Fixed
 
 -- <http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html>
 class FormatTime t where
@@ -69,11 +70,19 @@ class FormatTime t where
 --
 -- [@%M@] minute, @00@ - @59@
 --
--- [@%S@] second with decimal part if not an integer, @00@ - @60.999999999999@
+-- [@%S@] second, without decimal part, @00@ - @60@
+--
+-- [@%q@] picosecond, including trailing zeros, @000000000000@ - @999999999999 at .
+--
+-- [@%Q@] decimal point and up to 12 second decimals, without trailing zeros.
+-- For a whole number of seconds, @%Q@ produces the empty string.
 --
 -- For UTCTime and ZonedTime:
 --
--- [@%s@] number of seconds since the Unix epoch
+-- [@%s@] number of whole seconds since the Unix epoch. For times before
+-- the Unix epoch, this is a negative number. Note that in @%s.%q@ and @%s%Q@ 
+-- the decimals are positive, not negative. For example, 0.9 seconds
+-- before the Unix epoch is formatted as @-1.1@ with @%s%Q at .
 --
 -- For Day (and LocalTime and ZonedTime and UTCTime):
 --
@@ -154,14 +163,16 @@ instance FormatTime TimeOfDay where
 	-- Minute
 	formatCharacter 'M' = Just (\_ -> show2 . todMin)
 	-- Second
-	formatCharacter 'S' = Just (\_ -> show2Fixed . todSec)
+	formatCharacter 'S' = Just (\_ -> (show2 :: Int -> String) . truncate . todSec)
+	formatCharacter 'q' = Just (\_ -> drop 1 . dropWhile (/='.') . showFixed False . todSec)
+	formatCharacter 'Q' = Just (\_ -> dropWhile (/='.') . showFixed True . todSec)
 
 	-- Default
 	formatCharacter _   = Nothing
 
 instance FormatTime ZonedTime where
 	formatCharacter 'c' = Just (\locale -> formatTime locale (dateTimeFmt locale))
-	formatCharacter 's' = Just (\_ zt -> show (truncate (utcTimeToPOSIXSeconds (zonedTimeToUTC zt)) :: Integer))
+	formatCharacter 's' = Just (\_ zt -> show (floor (utcTimeToPOSIXSeconds (zonedTimeToUTC zt)) :: Integer))
 	formatCharacter c = case (formatCharacter c) of
 		Just f -> Just (\locale dt -> f locale (zonedTimeToLocalTime dt))
 		Nothing -> case (formatCharacter c) of
diff --git a/Data/Time/LocalTime/Parse.hs b/Data/Time/LocalTime/Parse.hs
index a5420d3..b6ae350 100644
--- a/Data/Time/LocalTime/Parse.hs
+++ b/Data/Time/LocalTime/Parse.hs
@@ -123,10 +123,9 @@ parseValue l c =
       'k' -> spdigits 2
       'l' -> spdigits 2
       'M' -> digits 2 
-      'S' -> do s <- digits 2
-                ds <- liftM2 (:) (char '.') (munch isDigit)
-                      <++ return ""
-                return $ s ++ ds
+      'S' -> digits 2
+      'q' -> digits 12
+      'Q' -> liftM2 (:) (char '.') (munch isDigit) <++ return ""
       's' -> (char '-' >> liftM ('-':) (munch1 isDigit)) 
              <++ munch1 isDigit
       'Y' -> digits 4
@@ -246,18 +245,20 @@ instance ParseTime TimeOfDay where
                 'k' -> TimeOfDay (read x) m s
                 'l' -> TimeOfDay (read x) m s
                 'M' -> TimeOfDay h (read x) s
-                'S' -> TimeOfDay h m (readFixed x)
+                'S' -> TimeOfDay h m (fromInteger (read x))
+                'q' -> TimeOfDay h m (mkPico (truncate s) (read x))
+                'Q' -> if null x then t 
+                        else let ps = read $ take 12 $ rpad 12 '0' $ drop 1 x
+                              in TimeOfDay h m (mkPico (truncate s) ps)
                 _   -> t
             where am = TimeOfDay (h `mod` 12) m s
                   pm = TimeOfDay (if h < 12 then h + 12 else h) m s
 
+rpad :: Int -> a -> [a] -> [a]
+rpad n c xs = xs ++ replicate (n - length xs) c
 
-readFixed :: HasResolution a => String -> Fixed a
-readFixed s = case break (=='.') s of
-                (x,"")  -> fromInteger (read x)
-                (x,_:y) -> mkFixed12 (read x) (read (rpad 12 '0' y))
-  where rpad n c xs = xs ++ replicate (n - length xs) c
-        mkFixed12 i f = fromInteger i + fromRational (f % 1000000000000)
+mkPico :: Integer -> Integer -> Pico
+mkPico i f = fromInteger i + fromRational (f % 1000000000000)
 
 instance ParseTime LocalTime where
     buildTime l xs = LocalTime (buildTime l xs) (buildTime l xs)
@@ -278,9 +279,12 @@ instance ParseTime TimeZone where
 instance ParseTime ZonedTime where
     buildTime l xs = foldl f (ZonedTime (buildTime l xs) (buildTime l xs)) xs
         where
-          f t (c,x) =
+          f t@(ZonedTime (LocalTime _ tod) z) (c,x) =
               case c of
-                's' -> utcToZonedTime (zonedTimeZone t) (posixSecondsToUTCTime (fromInteger (read x)))
+                's' -> let s = fromInteger (read x)
+                           (_,ps) = properFraction (todSec tod) :: (Integer,Pico)
+                           s' = s + fromRational (toRational ps)
+                        in utcToZonedTime z (posixSecondsToUTCTime s')
                 _   -> t
 
 instance ParseTime UTCTime where
@@ -292,10 +296,10 @@ instance Read Day where
     readsPrec _ = readParen False $ readsTime defaultTimeLocale "%Y-%m-%d"
 
 instance Read TimeOfDay where
-    readsPrec _ = readParen False $ readsTime defaultTimeLocale "%H:%M:%S"
+    readsPrec _ = readParen False $ readsTime defaultTimeLocale "%H:%M:%S%Q"
 
 instance Read LocalTime where
-    readsPrec _ = readParen False $ readsTime defaultTimeLocale "%Y-%m-%d %H:%M:%S"
+    readsPrec _ = readParen False $ readsTime defaultTimeLocale "%Y-%m-%d %H:%M:%S%Q"
 
 instance Read TimeZone where
     readsPrec _ = readParen False $ \s ->


From git at git.haskell.org  Sun Dec 20 07:50:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:49 +0000 (UTC)
Subject: [commit: packages/time] master: QuickCheck properties for the new %S,
 %q and %Q. (fcf3460)
Message-ID: <20151220075049.750D33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/fcf34604835eb3f4b512052b49a1f51d3bc65fed

>---------------------------------------------------------------

commit fcf34604835eb3f4b512052b49a1f51d3bc65fed
Author: bjorn <bjorn at bringert.net>
Date:   Sun Feb 11 08:15:46 2007 -0800

    QuickCheck properties for the new %S, %q and %Q.
    
    darcs-hash:20070211161546-6cdb2-207fccfeafd267fd7216458018b523bd134137e4


>---------------------------------------------------------------

fcf34604835eb3f4b512052b49a1f51d3bc65fed
 test/TestParseTime.hs | 102 ++++++++++++++++++++++++++++++++++++++++----------
 1 file changed, 83 insertions(+), 19 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index ad0c1c5..8b8b334 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -133,6 +133,16 @@ prop_parse_format_named typeName f =
     ("prop_parse_format " ++ typeName ++ " " ++ show f, 
      property (prop_parse_format f))
 
+prop_format_parse_format :: (FormatTime t, ParseTime t) => FormatString t -> t -> Bool
+prop_format_parse_format (FormatString f) t = 
+    fmap (format f) (parse f (format f t) `asTypeOf` Just t) == Just (format f t)
+
+prop_format_parse_format_named :: (Arbitrary t, Show t, FormatTime t, ParseTime t) 
+                                  => String -> FormatString t -> NamedProperty
+prop_format_parse_format_named typeName f = 
+    ("prop_format_parse_format " ++ typeName ++ " " ++ show f, 
+     property (prop_format_parse_format f))
+
 --
 -- * crashes in parse
 --
@@ -190,6 +200,7 @@ properties =
  ++ [("prop_parse_showWeekDate", property prop_parse_showWeekDate),
      ("prop_parse_showGregorian", property prop_parse_showGregorian),
      ("prop_parse_showOrdinalDate", property prop_parse_showOrdinalDate)]
+
  ++ map (prop_parse_format_named "Day") dayFormats
  ++ map (prop_parse_format_named "TimeOfDay") timeOfDayFormats
  ++ map (prop_parse_format_named "LocalTime") localTimeFormats
@@ -197,13 +208,19 @@ properties =
  ++ map (prop_parse_format_named "ZonedTime") zonedTimeFormats
  ++ map (prop_parse_format_named "UTCTime") utcTimeFormats
 
- ++ map (prop_no_crash_bad_input_named "Day") dayFormats
- ++ map (prop_no_crash_bad_input_named "TimeOfDay") timeOfDayFormats
- ++ map (prop_no_crash_bad_input_named "LocalTime") localTimeFormats
- ++ map (prop_no_crash_bad_input_named "TimeZone") timeZoneFormats
- ++ map (prop_no_crash_bad_input_named "ZonedTime") zonedTimeFormats
- ++ map (prop_no_crash_bad_input_named "UTCTime") utcTimeFormats
+ ++ map (prop_format_parse_format_named "Day") partialDayFormats
+ ++ map (prop_format_parse_format_named "TimeOfDay") partialTimeOfDayFormats
+ ++ map (prop_format_parse_format_named "LocalTime") partialLocalTimeFormats
+ ++ map (prop_format_parse_format_named "TimeZone") partialTimeZoneFormats
+ ++ map (prop_format_parse_format_named "ZonedTime") partialZonedTimeFormats
+ ++ map (prop_format_parse_format_named "UTCTime") partialUTCTimeFormats
 
+ ++ map (prop_no_crash_bad_input_named "Day") (dayFormats ++ partialDayFormats ++ failingDayFormats)
+ ++ map (prop_no_crash_bad_input_named "TimeOfDay") (timeOfDayFormats ++ partialTimeOfDayFormats ++ failingTimeOfDayFormats)
+ ++ map (prop_no_crash_bad_input_named "LocalTime") (localTimeFormats ++ partialLocalTimeFormats ++ failingLocalTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "TimeZone") (timeZoneFormats ++ partialTimeZoneFormats ++ failingTimeZoneFormats)
+ ++ map (prop_no_crash_bad_input_named "ZonedTime") (zonedTimeFormats ++ partialZonedTimeFormats ++ failingZonedTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "UTCTime") (utcTimeFormats ++ partialUTCTimeFormats ++ failingUTCTimeFormats)
 
 
 
@@ -227,14 +244,16 @@ timeOfDayFormats :: [FormatString TimeOfDay]
 timeOfDayFormats = map FormatString
     [
      -- 24 h formats
-     "%H:%M:%S","%k:%M:%S","%H%M%S","%T","%X","%R:%S",
+     "%H:%M:%S.%q","%k:%M:%S.%q","%H%M%S.%q","%T.%q","%X.%q","%R:%S.%q",
+     "%H:%M:%S%Q","%k:%M:%S%Q","%H%M%S%Q","%T%Q","%X%Q","%R:%S%Q",
      -- 12 h formats
-     "%I:%M:%S %p","%I:%M:%S %P","%l:%M:%S %p","%r"
+     "%I:%M:%S.%q %p","%I:%M:%S.%q %P","%l:%M:%S.%q %p","%r %q",
+     "%I:%M:%S%Q %p","%I:%M:%S%Q %P","%l:%M:%S%Q %p","%r %Q"
     ]
 
 localTimeFormats :: [FormatString LocalTime]
 localTimeFormats = map FormatString $ 
-  ["%c"]
+  []
 {-
   -- there's soo many of them...
   concat [ [df ++ " " ++ tf, tf ++ " " ++ df] | FormatString df <- dayFormats, 
@@ -246,11 +265,52 @@ timeZoneFormats = map FormatString ["%z","%z%Z","%Z%z"]
 
 zonedTimeFormats :: [FormatString ZonedTime]
 zonedTimeFormats = map FormatString
-  ["%a, %d %b %Y %H:%M:%S %z"]
+  ["%a, %d %b %Y %H:%M:%S.%q %z", "%a, %d %b %Y %H:%M:%S%Q %z", "%s.%q %z", "%s%Q %z"]
 
 utcTimeFormats :: [FormatString UTCTime]
 utcTimeFormats = map FormatString 
-  ["%c"]
+  ["%s.%q","%s%Q"]
+
+--
+-- * Formats that do not include all the information
+--
+
+partialDayFormats :: [FormatString Day]
+partialDayFormats = map FormatString
+    [  ]
+
+partialTimeOfDayFormats :: [FormatString TimeOfDay]
+partialTimeOfDayFormats = map FormatString
+    [ ]
+
+partialLocalTimeFormats :: [FormatString LocalTime]
+partialLocalTimeFormats = map FormatString 
+    [
+     -- %c does not include second decimals 
+     "%c" 
+    ]
+
+partialTimeZoneFormats :: [FormatString TimeZone]
+partialTimeZoneFormats = map FormatString 
+    [
+    ]
+
+partialZonedTimeFormats :: [FormatString ZonedTime]
+partialZonedTimeFormats = map FormatString 
+    [
+     -- %s does not include second decimals
+     "%s %z"
+    ]
+
+partialUTCTimeFormats :: [FormatString UTCTime]
+partialUTCTimeFormats = map FormatString 
+    [
+     -- %s does not include second decimals
+     "%s",
+     -- %c does not include second decimals
+     "%c"
+    ]
+
 
 --
 -- * Known failures
@@ -266,13 +326,22 @@ knownFailures =
 
 
 
+
 failingDayFormats :: [FormatString Day]
 failingDayFormats = map FormatString
+    [ -- ISO week dates with two digit year
+     "%g-%V-%u","%g-%V-%a","%g-%V-%A","%g-%V-%w", "%A week %V, %g", "day %V, week %A, %g",
+     "%g-W%V-%u"
+    ]
+
+failingTimeOfDayFormats :: [FormatString TimeOfDay]
+failingTimeOfDayFormats = map FormatString
     [ ]
 
 failingLocalTimeFormats :: [FormatString LocalTime]
 failingLocalTimeFormats = map FormatString 
-    [ ]
+    [
+    ]
 
 failingTimeZoneFormats :: [FormatString TimeZone]
 failingTimeZoneFormats = map FormatString 
@@ -286,15 +355,10 @@ failingZonedTimeFormats = map FormatString
     [
      -- can't figure out offset from %Z, also, formatTime produces "" for %Z
      "%c",
-     "%a, %d %b %Y %H:%M:%S %Z",
-     -- %s does not include second decimals
-     "%s %z"
+     "%a, %d %b %Y %H:%M:%S %Z"
     ]
 
 failingUTCTimeFormats :: [FormatString UTCTime]
 failingUTCTimeFormats = map FormatString 
-    [
-     -- %s does not include second decimals
-     "%s"
-    ]
+    []
 


From git at git.haskell.org  Sun Dec 20 07:50:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:51 +0000 (UTC)
Subject: [commit: packages/time] master: Added %f: The century part of the
 week date year. (5ac1884)
Message-ID: <20151220075051.7C4683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5ac1884daa4866c151c1955cca0b0a308e95412d

>---------------------------------------------------------------

commit 5ac1884daa4866c151c1955cca0b0a308e95412d
Author: bjorn <bjorn at bringert.net>
Date:   Sun Feb 11 08:26:07 2007 -0800

    Added %f: The century part of the week date year.
    
    Fixes part of http://hackage.haskell.org/trac/ghc/ticket/1007
    Rationale: There is a %g specifier for the last two digits of the
    week date year, but no specifier for the century. %C cannot be used,
    since the normal century and the week date century can differ:
    
    > formatTime defaultTimeLocale "%Y %G" (fromGregorian 2000 1 1)
    "2000 1999"
    
    darcs-hash:20070211162607-6cdb2-605a7f26b21c0a063f2308683845e727688a35bd


>---------------------------------------------------------------

5ac1884daa4866c151c1955cca0b0a308e95412d
 Data/Time/LocalTime/Format.hs | 4 ++++
 Data/Time/LocalTime/Parse.hs  | 3 +++
 test/TestParseTime.hs         | 2 ++
 3 files changed, 9 insertions(+)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index fc26327..ff9ca67 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -114,6 +114,8 @@ class FormatTime t where
 --
 -- [@%g@] last two digits of year for Week Date format, @00@ - @99@
 --
+-- [@%f@] century (first two digits of year) for Week Date format, @00@ - @99@
+--
 -- [@%V@] week for Week Date format, @01@ - @53@
 --
 -- [@%u@] day for Week Date format, @1@ - @7@
@@ -208,6 +210,8 @@ instance FormatTime Day where
 	-- ISO 8601 Week Date
 	formatCharacter 'G' = Just (\_ -> show . (\(y,_,_) -> y) . toWeekDate)
 	formatCharacter 'g' = Just (\_ -> show2 . mod100 . (\(y,_,_) -> y) . toWeekDate)
+	formatCharacter 'f' = Just (\_ -> show2 . div100 . (\(y,_,_) -> y) . toWeekDate)
+
 	formatCharacter 'V' = Just (\_ -> show2 . (\(_,w,_) -> w) . toWeekDate)
 	formatCharacter 'u' = Just (\_ -> show . (\(_,_,d) -> d) . toWeekDate)
 
diff --git a/Data/Time/LocalTime/Parse.hs b/Data/Time/LocalTime/Parse.hs
index b6ae350..fa71a8a 100644
--- a/Data/Time/LocalTime/Parse.hs
+++ b/Data/Time/LocalTime/Parse.hs
@@ -139,6 +139,7 @@ parseValue l c =
       'j' -> digits 3
       'G' -> digits 4
       'g' -> digits 2
+      'f' -> digits 2
       'V' -> digits 2
       'u' -> oneOf $ map (:[]) ['1'..'7']
       'a' -> oneOf (map snd (wDays l))
@@ -198,6 +199,8 @@ instance ParseTime Day where
           'G' -> let y = read x in [Century (y `div` 100), Year (y `mod` 100)]
           -- %g: last two digits of year for Week Date format, 00 - 99
           'g' -> [Year (read x)]
+          -- %f century (first two digits of year) for Week Date format, 00 - 99
+          'f' -> [Century (read x)]
           -- %V: week for Week Date format, 01 - 53
           'V' -> [Week ISOWeek (read x)]
           -- %u: day for Week Date format, 1 - 7
diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 8b8b334..876c227 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -236,6 +236,8 @@ dayFormats = map FormatString
      -- ISO week dates
      "%G-%V-%u","%G-%V-%a","%G-%V-%A","%G-%V-%w", "%A week %V, %G", "day %V, week %A, %G",
      "%G-W%V-%u",
+     "%f%g-%V-%u","%f%g-%V-%a","%f%g-%V-%A","%f%g-%V-%w", "%A week %V, %f%g", "day %V, week %A, %f%g",
+     "%f%g-W%V-%u",
      -- monday and sunday week dates
      "%Y-w%U-%A", "%Y-w%W-%A", "%Y-%A-w%U", "%Y-%A-w%W", "%A week %U, %Y", "%A week %W, %Y"
     ]


From git at git.haskell.org  Sun Dec 20 07:50:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:53 +0000 (UTC)
Subject: [commit: packages/time] master: Changed %Z to produce the time zone
 offset if the time zone name is "". (4d14562)
Message-ID: <20151220075053.82AE53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4d14562fbd5ba0118216365198b3298eb6265648

>---------------------------------------------------------------

commit 4d14562fbd5ba0118216365198b3298eb6265648
Author: bjorn <bjorn at bringert.net>
Date:   Sun Feb 11 10:11:09 2007 -0800

    Changed %Z to produce the time zone offset if the time zone name is "".
    
    Rationale: Without this, if you format a ZonedTime which contains an
    unnamed timezone, %Z produces the empty string. This is invalid in
    many formats. It is better to output the offset when there
    is no timezone name.
    
    darcs-hash:20070211181109-6cdb2-bde288cdfb6400ef08b24b26aa2f59d7f25807e4


>---------------------------------------------------------------

4d14562fbd5ba0118216365198b3298eb6265648
 Data/Time/LocalTime/Format.hs |  4 +++-
 Data/Time/LocalTime/Parse.hs  | 17 ++++++++++-------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/LocalTime/Format.hs
index ff9ca67..61a4e90 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/LocalTime/Format.hs
@@ -183,7 +183,9 @@ instance FormatTime ZonedTime where
 
 instance FormatTime TimeZone where
 	formatCharacter 'z' = Just (\_ -> timeZoneOffsetString)
-	formatCharacter 'Z' = Just (\_ -> timeZoneName)
+	formatCharacter 'Z' = 
+            Just (\_ z -> let n = timeZoneName z
+                           in if null n then timeZoneOffsetString z else n)
 	formatCharacter _ = Nothing
 
 instance FormatTime Day where
diff --git a/Data/Time/LocalTime/Parse.hs b/Data/Time/LocalTime/Parse.hs
index fa71a8a..605eee9 100644
--- a/Data/Time/LocalTime/Parse.hs
+++ b/Data/Time/LocalTime/Parse.hs
@@ -114,7 +114,9 @@ parseValue :: TimeLocale -> Char -> ReadP String
 parseValue l c = 
     case c of
       'z' -> liftM2 (:) (choice [char '+', char '-']) (digits 4)
-      'Z' -> munch isUpper
+      'Z' -> munch1 isUpper <++
+             liftM2 (:) (choice [char '+', char '-']) (digits 4) <++
+             return "" -- produced by %Z for LocalTime
       'P' -> oneOf (let (am,pm) = amPm l 
                      in [map toLower am, map toLower pm])
       'p' -> oneOf (let (am,pm) = amPm l in [am, pm])
@@ -271,13 +273,16 @@ instance ParseTime TimeZone where
       where 
         f t@(TimeZone offset dst name) (c,x) = 
             case c of
-              'z' -> TimeZone (sign * (60 * h + m)) dst name
+              'z' -> zone
+              'Z' | null x           -> t
+                  | isUpper (head x) -> TimeZone offset dst x -- FIXME: figure out timezone offset?
+                  | otherwise        -> zone
+              _   -> t
+          where zone = TimeZone (sign * (60 * h + m)) dst name
                   where (s:h1:h2:m1:m2:[]) = x
                         sign = if s == '-' then -1 else 1
                         h = read [h1,h2]
                         m = read [m1,m2] 
-              'Z' -> TimeZone offset dst x -- FIXME: figure out timezone offset?
-              _   -> t
 
 instance ParseTime ZonedTime where
     buildTime l xs = foldl f (ZonedTime (buildTime l xs) (buildTime l xs)) xs
@@ -305,9 +310,7 @@ instance Read LocalTime where
     readsPrec _ = readParen False $ readsTime defaultTimeLocale "%Y-%m-%d %H:%M:%S%Q"
 
 instance Read TimeZone where
-    readsPrec _ = readParen False $ \s ->
-                      readsTime defaultTimeLocale "%z" s
-                       ++ readsTime defaultTimeLocale "%Z" s
+    readsPrec _ = readParen False $ readsTime defaultTimeLocale "%Z"
 
 instance Read ZonedTime where
     readsPrec n = readParen False $ \s ->


From git at git.haskell.org  Sun Dec 20 07:50:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:55 +0000 (UTC)
Subject: [commit: packages/time] master: Cleaned up date parsing QuickCheck
 properties. (3750abf)
Message-ID: <20151220075055.89EA83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3750abfb4e0384d8cdcc84720cdc88bcd576ba08

>---------------------------------------------------------------

commit 3750abfb4e0384d8cdcc84720cdc88bcd576ba08
Author: bjorn <bjorn at bringert.net>
Date:   Sun Feb 11 10:15:02 2007 -0800

    Cleaned up date parsing QuickCheck properties.
    
    darcs-hash:20070211181502-6cdb2-225795f312c8381c33bd79811535c0d34e2e461b


>---------------------------------------------------------------

3750abfb4e0384d8cdcc84720cdc88bcd576ba08
 test/TestParseTime.hs | 75 +++++++++++++--------------------------------------
 1 file changed, 19 insertions(+), 56 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 876c227..50049bc 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -211,16 +211,15 @@ properties =
  ++ map (prop_format_parse_format_named "Day") partialDayFormats
  ++ map (prop_format_parse_format_named "TimeOfDay") partialTimeOfDayFormats
  ++ map (prop_format_parse_format_named "LocalTime") partialLocalTimeFormats
- ++ map (prop_format_parse_format_named "TimeZone") partialTimeZoneFormats
  ++ map (prop_format_parse_format_named "ZonedTime") partialZonedTimeFormats
  ++ map (prop_format_parse_format_named "UTCTime") partialUTCTimeFormats
 
- ++ map (prop_no_crash_bad_input_named "Day") (dayFormats ++ partialDayFormats ++ failingDayFormats)
- ++ map (prop_no_crash_bad_input_named "TimeOfDay") (timeOfDayFormats ++ partialTimeOfDayFormats ++ failingTimeOfDayFormats)
- ++ map (prop_no_crash_bad_input_named "LocalTime") (localTimeFormats ++ partialLocalTimeFormats ++ failingLocalTimeFormats)
- ++ map (prop_no_crash_bad_input_named "TimeZone") (timeZoneFormats ++ partialTimeZoneFormats ++ failingTimeZoneFormats)
- ++ map (prop_no_crash_bad_input_named "ZonedTime") (zonedTimeFormats ++ partialZonedTimeFormats ++ failingZonedTimeFormats)
- ++ map (prop_no_crash_bad_input_named "UTCTime") (utcTimeFormats ++ partialUTCTimeFormats ++ failingUTCTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "Day") (dayFormats ++ partialDayFormats ++ failingPartialDayFormats)
+ ++ map (prop_no_crash_bad_input_named "TimeOfDay") (timeOfDayFormats ++ partialTimeOfDayFormats)
+ ++ map (prop_no_crash_bad_input_named "LocalTime") (localTimeFormats ++ partialLocalTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "TimeZone") (timeZoneFormats)
+ ++ map (prop_no_crash_bad_input_named "ZonedTime") (zonedTimeFormats ++ partialZonedTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "UTCTime") (utcTimeFormats ++ partialUTCTimeFormats)
 
 
 
@@ -263,11 +262,12 @@ localTimeFormats = map FormatString $
 -}
 
 timeZoneFormats :: [FormatString TimeZone]
-timeZoneFormats = map FormatString ["%z","%z%Z","%Z%z"]
+timeZoneFormats = map FormatString ["%z","%z%Z","%Z%z","%Z"]
 
 zonedTimeFormats :: [FormatString ZonedTime]
 zonedTimeFormats = map FormatString
-  ["%a, %d %b %Y %H:%M:%S.%q %z", "%a, %d %b %Y %H:%M:%S%Q %z", "%s.%q %z", "%s%Q %z"]
+  ["%a, %d %b %Y %H:%M:%S.%q %z", "%a, %d %b %Y %H:%M:%S%Q %z", "%s.%q %z", "%s%Q %z",
+   "%a, %d %b %Y %H:%M:%S.%q %Z", "%a, %d %b %Y %H:%M:%S%Q %Z", "%s.%q %Z", "%s%Q %Z"]
 
 utcTimeFormats :: [FormatString UTCTime]
 utcTimeFormats = map FormatString 
@@ -279,7 +279,7 @@ utcTimeFormats = map FormatString
 
 partialDayFormats :: [FormatString Day]
 partialDayFormats = map FormatString
-    [  ]
+    [ ]
 
 partialTimeOfDayFormats :: [FormatString TimeOfDay]
 partialTimeOfDayFormats = map FormatString
@@ -292,16 +292,13 @@ partialLocalTimeFormats = map FormatString
      "%c" 
     ]
 
-partialTimeZoneFormats :: [FormatString TimeZone]
-partialTimeZoneFormats = map FormatString 
-    [
-    ]
-
 partialZonedTimeFormats :: [FormatString ZonedTime]
 partialZonedTimeFormats = map FormatString 
     [
      -- %s does not include second decimals
-     "%s %z"
+     "%s %z",
+     -- %S does not include second decimals
+     "%c", "%a, %d %b %Y %H:%M:%S %Z"
     ]
 
 partialUTCTimeFormats :: [FormatString UTCTime]
@@ -320,47 +317,13 @@ partialUTCTimeFormats = map FormatString
 
 knownFailures :: [NamedProperty]
 knownFailures =
-    map (prop_parse_format_named "Day") failingDayFormats
- ++ map (prop_parse_format_named "LocalTime") failingLocalTimeFormats
- ++ map (prop_parse_format_named "TimeZone") failingTimeZoneFormats
- ++ map (prop_parse_format_named "ZonedTime") failingZonedTimeFormats
- ++ map (prop_parse_format_named "UTCTime") failingUTCTimeFormats
-
+    map (prop_format_parse_format_named "Day") failingPartialDayFormats
 
-
-
-failingDayFormats :: [FormatString Day]
-failingDayFormats = map FormatString
-    [ -- ISO week dates with two digit year
+failingPartialDayFormats :: [FormatString Day]
+failingPartialDayFormats = map FormatString
+    [ -- ISO week dates with two digit year. 
+      -- This can fail in the beginning or the end of a year where
+      -- the ISO week date year does not match the gregorian year.
      "%g-%V-%u","%g-%V-%a","%g-%V-%A","%g-%V-%w", "%A week %V, %g", "day %V, week %A, %g",
      "%g-W%V-%u"
     ]
-
-failingTimeOfDayFormats :: [FormatString TimeOfDay]
-failingTimeOfDayFormats = map FormatString
-    [ ]
-
-failingLocalTimeFormats :: [FormatString LocalTime]
-failingLocalTimeFormats = map FormatString 
-    [
-    ]
-
-failingTimeZoneFormats :: [FormatString TimeZone]
-failingTimeZoneFormats = map FormatString 
-    [
-     -- %Z does not figure out the offset
-     "%Z"
-    ]
-
-failingZonedTimeFormats :: [FormatString ZonedTime]
-failingZonedTimeFormats = map FormatString 
-    [
-     -- can't figure out offset from %Z, also, formatTime produces "" for %Z
-     "%c",
-     "%a, %d %b %Y %H:%M:%S %Z"
-    ]
-
-failingUTCTimeFormats :: [FormatString UTCTime]
-failingUTCTimeFormats = map FormatString 
-    []
-


From git at git.haskell.org  Sun Dec 20 07:50:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:57 +0000 (UTC)
Subject: [commit: packages/time] master: move parsing and formatting into new
 module (48535e6)
Message-ID: <20151220075057.92F873A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/48535e6a2a85ec5545a1ff30d9f27087108bbc57

>---------------------------------------------------------------

commit 48535e6a2a85ec5545a1ff30d9f27087108bbc57
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Feb 13 19:59:07 2007 -0800

    move parsing and formatting into new module
    
    darcs-hash:20070214035907-ac6dd-25a86dd8e9d5313cc998c300f9c524d4652749bf


>---------------------------------------------------------------

48535e6a2a85ec5545a1ff30d9f27087108bbc57
 Data/Time.hs                             |  4 +++-
 Data/Time/{LocalTime => }/Format.hs      | 11 +++++------
 Data/Time/{LocalTime => Format}/Parse.hs | 11 ++++-------
 Data/Time/LocalTime.hs                   |  6 +-----
 test/TestEaster.hs                       |  2 +-
 time.cabal                               |  4 ++--
 time.xcodeproj/project.pbxproj           | 12 ++++++++++--
 7 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/Data/Time.hs b/Data/Time.hs
index 65926cd..4167ec6 100644
--- a/Data/Time.hs
+++ b/Data/Time.hs
@@ -4,9 +4,11 @@ module Data.Time
 (
 	module Data.Time.Calendar,
 	module Data.Time.Clock,
-	module Data.Time.LocalTime
+	module Data.Time.LocalTime,
+	module Data.Time.Format
 ) where
 
 import Data.Time.Calendar
 import Data.Time.Clock
 import Data.Time.LocalTime
+import Data.Time.Format
diff --git a/Data/Time/LocalTime/Format.hs b/Data/Time/Format.hs
similarity index 97%
rename from Data/Time/LocalTime/Format.hs
rename to Data/Time/Format.hs
index 61a4e90..64f73ef 100644
--- a/Data/Time/LocalTime/Format.hs
+++ b/Data/Time/Format.hs
@@ -1,15 +1,14 @@
 {-# OPTIONS -Wall -Werror #-}
 
--- #hide
-module Data.Time.LocalTime.Format
+module Data.Time.Format
 	(
 	-- * UNIX-style formatting
-	module Data.Time.LocalTime.Format
+	module Data.Time.Format,
+	module Data.Time.Format.Parse
 	) where
 
-import Data.Time.LocalTime.LocalTime
-import Data.Time.LocalTime.TimeOfDay
-import Data.Time.LocalTime.TimeZone
+import Data.Time.Format.Parse
+import Data.Time.LocalTime
 import Data.Time.Calendar.WeekDate
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar
diff --git a/Data/Time/LocalTime/Parse.hs b/Data/Time/Format/Parse.hs
similarity index 98%
rename from Data/Time/LocalTime/Parse.hs
rename to Data/Time/Format/Parse.hs
index 605eee9..bee16e8 100644
--- a/Data/Time/LocalTime/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS -Wall -Werror #-}
 
 -- #hide
-module Data.Time.LocalTime.Parse 
+module Data.Time.Format.Parse 
     (
     -- * UNIX-style parsing
     parseTime, readTime, readsTime,
@@ -9,14 +9,11 @@ module Data.Time.LocalTime.Parse
     ) where
 
 import Data.Time.Clock.POSIX
-import Data.Time.Clock.UTC
-import Data.Time.Calendar.Days
-import Data.Time.Calendar.Gregorian
+import Data.Time.Clock
+import Data.Time.Calendar
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
-import Data.Time.LocalTime.LocalTime
-import Data.Time.LocalTime.TimeOfDay
-import Data.Time.LocalTime.TimeZone
+import Data.Time.LocalTime
 
 import Control.Monad
 import Data.Char
diff --git a/Data/Time/LocalTime.hs b/Data/Time/LocalTime.hs
index a5e2943..5676b58 100644
--- a/Data/Time/LocalTime.hs
+++ b/Data/Time/LocalTime.hs
@@ -4,13 +4,9 @@ module Data.Time.LocalTime
 (
 	module Data.Time.LocalTime.TimeZone,
 	module Data.Time.LocalTime.TimeOfDay,
-	module Data.Time.LocalTime.LocalTime,
-	module Data.Time.LocalTime.Format,
-	module Data.Time.LocalTime.Parse
+	module Data.Time.LocalTime.LocalTime
 ) where
 
 import Data.Time.LocalTime.TimeZone
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.LocalTime
-import Data.Time.LocalTime.Format
-import Data.Time.LocalTime.Parse
diff --git a/test/TestEaster.hs b/test/TestEaster.hs
index 86a3318..290c066 100644
--- a/test/TestEaster.hs
+++ b/test/TestEaster.hs
@@ -4,7 +4,7 @@ module Main where
 
 import Data.Time.Calendar.Easter
 import Data.Time.Calendar
-import Data.Time.LocalTime
+import Data.Time.Format
 
 import System.Locale
 
diff --git a/time.cabal b/time.cabal
index a4fae43..c45da8c 100644
--- a/time.cabal
+++ b/time.cabal
@@ -20,6 +20,7 @@ Exposed-Modules:
 	Data.Time.Clock.POSIX,
 	Data.Time.Clock.TAI,
 	Data.Time.LocalTime,
+	Data.Time.Format,
 	Data.Time
 Extensions:	ForeignFunctionInterface, CPP
 C-Sources:	cbits/HsTime.c
@@ -35,8 +36,7 @@ Other-Modules:
 	Data.Time.LocalTime.TimeZone,
 	Data.Time.LocalTime.TimeOfDay,
 	Data.Time.LocalTime.LocalTime,
-	Data.Time.LocalTime.Format,
-	Data.Time.LocalTime.Parse
+	Data.Time.Format.Parse
 Extra-Source-Files:
 	aclocal.m4 configure.ac configure
 	include/HsTime.h include/HsTimeConfig.h.in
diff --git a/time.xcodeproj/project.pbxproj b/time.xcodeproj/project.pbxproj
index ee8c7d6..e7fab3a 100644
--- a/time.xcodeproj/project.pbxproj
+++ b/time.xcodeproj/project.pbxproj
@@ -130,6 +130,8 @@
 				ABD6783C0841677900CF37C0 /* Clock */,
 				AB01DCFD08374838003C9EF7 /* Clock.hs */,
 				AB2666A808A56FE30059DEC0 /* LocalTime */,
+				ABD4B1320B82BCA100CEB254 /* Format */,
+				AB01DD13083748EC003C9EF7 /* Format.hs */,
 				AB2666E808A571460059DEC0 /* LocalTime.hs */,
 			);
 			path = Time;
@@ -157,8 +159,6 @@
 				AB01DD18083748EC003C9EF7 /* TimeZone.hs */,
 				AB01DD17083748EC003C9EF7 /* TimeOfDay.hs */,
 				AB01DD12083748EC003C9EF7 /* LocalTime.hs */,
-				AB01DD13083748EC003C9EF7 /* Format.hs */,
-				ABD6AC650B2D52D400843342 /* Parse.hs */,
 			);
 			path = LocalTime;
 			sourceTree = "<group>";
@@ -197,6 +197,14 @@
 			name = "GHC stuff";
 			sourceTree = "<group>";
 		};
+		ABD4B1320B82BCA100CEB254 /* Format */ = {
+			isa = PBXGroup;
+			children = (
+				ABD6AC650B2D52D400843342 /* Parse.hs */,
+			);
+			path = Format;
+			sourceTree = "<group>";
+		};
 		ABD6783C0841677900CF37C0 /* Clock */ = {
 			isa = PBXGroup;
 			children = (


From git at git.haskell.org  Sun Dec 20 07:50:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:50:59 +0000 (UTC)
Subject: [commit: packages/time] master: README about building from darcs
 (09c85ef)
Message-ID: <20151220075059.9A9053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/09c85ef703705f311b49ea7e7291a80c3a452d49

>---------------------------------------------------------------

commit 09c85ef703705f311b49ea7e7291a80c3a452d49
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Sun Feb 18 03:01:59 2007 -0800

    README about building from darcs
    
    darcs-hash:20070218110159-b47d3-02982554bbac9710b4ad35c5d4de873c6c0f693f


>---------------------------------------------------------------

09c85ef703705f311b49ea7e7291a80c3a452d49
 README | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README b/README
new file mode 100644
index 0000000..f5aa1cf
--- /dev/null
+++ b/README
@@ -0,0 +1,4 @@
+To build this package using Cabal directly from darcs, you must run
+"autoreconf" before the usual Cabal build steps (configure/build/install).
+autoreconf is included in the GNU autoconf tools.  There is no need to run
+the "configure" script: the "setup configure" step will do this for you.


From git at git.haskell.org  Sun Dec 20 07:51:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:01 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.1 (28d5ef3)
Message-ID: <20151220075101.A1F0B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/28d5ef3d018b1650652d25d6be07e5b3749dc6b3

>---------------------------------------------------------------

commit 28d5ef3d018b1650652d25d6be07e5b3749dc6b3
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Feb 19 17:52:51 2007 -0800

    version 1.1
    
    darcs-hash:20070220015251-ac6dd-223729392751ba0ef63dda315df9cd5263dbadc4


>---------------------------------------------------------------

28d5ef3d018b1650652d25d6be07e5b3749dc6b3
 Makefile     | 2 +-
 configure.ac | 2 +-
 time.cabal   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 76ea560..9fca5cd 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ ALL_DIRS = \
 	Data/Time/LocalTime
 
 PACKAGE = time
-VERSION = 1.0
+VERSION = 1.1
 PACKAGE_DEPS = base
 
 SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
diff --git a/configure.ac b/configure.ac
index f2e4186..5778502 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [0.3.1], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.1], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index c45da8c..d877a1b 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	1.0
+Version:	1.1
 Stability:	stable
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:51:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:03 +0000 (UTC)
Subject: [commit: packages/time] master: clean up HsTime (696f384)
Message-ID: <20151220075103.A89023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/696f384f00c6a33e0114fe30cd3a80e2e93dc3dc

>---------------------------------------------------------------

commit 696f384f00c6a33e0114fe30cd3a80e2e93dc3dc
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Feb 19 18:01:29 2007 -0800

    clean up HsTime
    
    darcs-hash:20070220020129-ac6dd-8b7a4cfbded155623c93ee1b26bafe5f801fd1c6


>---------------------------------------------------------------

696f384f00c6a33e0114fe30cd3a80e2e93dc3dc
 cbits/HsTime.c   | 44 ++++++++++++++++----------------------------
 include/HsTime.h |  2 +-
 2 files changed, 17 insertions(+), 29 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index f9651e9..58b7d06 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -3,50 +3,38 @@
 
 long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
-	struct tm* ptm;
-	long gmtoff;
-	int dst;
-	const char *name;
-
 #if HAVE_LOCALTIME_R
 	struct tm tmd;
-	ptm = localtime_r(&t,&tmd);
+	struct tm* ptm = localtime_r(&t,&tmd);
 #else
-	ptm = localtime(&t);
+	struct tm* ptm = localtime(&t);
 #endif
-	// We don't have a better API to use on Windows, the logic to
-	// decide whether a given data/time falls within DST is
-	// implemented as part of localtime() in the CRT.  This is_dst
-	// flag is all we need here.
-
 	if (ptm)
 	{
-	        dst = ptm -> tm_isdst;
+		int dst = ptm -> tm_isdst;
+		*pdst = dst;
 #if HAVE_TM_ZONE
-		name = ptm -> tm_zone;
-		gmtoff = ptm -> tm_gmtoff;
+		*pname = ptm -> tm_zone;
+		return ptm -> tm_gmtoff;
 #elif defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
-		name = dst ? _tzname[1] : _tzname[0];
-		gmtoff = dst ? _timezone - 3600 : _timezone;
+		// We don't have a better API to use on Windows, the logic to
+		// decide whether a given date/time falls within DST is
+		// implemented as part of localtime() in the CRT.  This is_dst
+		// flag is all we need here.
+		*pname = dst ? _tzname[1] : _tzname[0];
+		return dst ? _timezone - 3600 : _timezone;
 #else
-
 # if HAVE_TZNAME
-		name = *tzname;
+		*pname = *tzname;
 # else
-#  error "Don't know how to get at timezone name on your OS"
+#  error "Don't know how to get timezone name on your OS"
 # endif
-
 # if HAVE_DECL_ALTZONE
-		gmtoff = dst ? altzone : timezone;
+		return dst ? altzone : timezone;
 # else
-		gmtoff = dst ? timezone - 3600 : timezone;
+		return dst ? timezone - 3600 : timezone;
 # endif
-
 #endif // HAVE_TM_ZONE
-	        *pdst  = dst;
-		*pname = name;
-		return gmtoff;
-
 	}
 	else return 0x80000000;
 }
diff --git a/include/HsTime.h b/include/HsTime.h
index b8da946..059cbc0 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -7,6 +7,6 @@
 #include <time.h>
 #endif
 
-long int get_current_timezone_seconds (time_t,int* dst,char const* * name);
+long int get_current_timezone_seconds (time_t,int* pdst,char const* * pname);
 
 #endif


From git at git.haskell.org  Sun Dec 20 07:51:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:05 +0000 (UTC)
Subject: [commit: packages/time] master: build/license/boring cleanup (cc9a460)
Message-ID: <20151220075105.B10033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cc9a460009cf283c0e533ac051967a363842b1db

>---------------------------------------------------------------

commit cc9a460009cf283c0e533ac051967a363842b1db
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Feb 22 16:33:26 2007 -0800

    build/license/boring cleanup
    
    darcs-hash:20070223003326-ac6dd-68918006d98d55eea314ccedb36a5b24de0d509b


>---------------------------------------------------------------

cc9a460009cf283c0e533ac051967a363842b1db
 .darcs-boring   | 23 +++++++++++++++++++++++
 LICENSE         |  2 +-
 package.conf.in | 14 ++++++++------
 3 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/.darcs-boring b/.darcs-boring
index 6c379a9..0b4f6cb 100644
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -11,6 +11,7 @@ _split$
 (^|/)package.conf.installed$
 (^|/)\.depend$
 (^|/)\.setup-config$
+(^|/)\.installed-pkg-config$
 \.haddock$
 ^build$
 \.xcodeproj/.*\.pbxuser$
@@ -43,4 +44,26 @@ _split$
 \.py[co]$
 \#
 \.cvsignore$
+^Private($|/)
 (^|/)Thumbs\.db$
+^configure$
+^config\..*$
+^autom4te.cache($|/)
+^include/HsTimeConfig\.h$
+^include/HsTimeConfig\.h.in$
+^test/.*\.out$
+^test/AddDays$
+^test/ClipDates$
+^test/ConvertBack$
+^test/CurrentTime$
+^test/LongWeekYears$
+^test/ShowDST$
+^test/TestCalendars$
+^test/TestEaster$
+^test/TestFormat$
+^test/TestMonthDay$
+^test/TestParseDAT$
+^test/TestParseTime$
+^test/TestTime$
+^test/TimeZone$
+^test/TimeZone.ref$
diff --git a/LICENSE b/LICENSE
index 17f1f27..af649fe 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-TimeLib is Copyright (c) Ashley Yakeley, 2004-2005.
+TimeLib is Copyright (c) Ashley Yakeley, 2004-2007.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
diff --git a/package.conf.in b/package.conf.in
index 98922d7..fc3bf80 100644
--- a/package.conf.in
+++ b/package.conf.in
@@ -2,7 +2,7 @@
 
 Name:		PACKAGE
 Version:	VERSION
-Stability:	Beta
+Stability:	stable
 License:	BSD3
 License-File:	LICENSE
 Author:		Ashley Yakeley
@@ -29,10 +29,11 @@ Exposed-modules:
 	Data.Time.Clock.POSIX,
 	Data.Time.Clock.TAI,
 	Data.Time.LocalTime,
+	Data.Time.Format,
 	Data.Time
-Extensions:	ForeignFunctionInterface
-C-Sources:	HsTime.c
-Hidden-modules:
+Extensions:	ForeignFunctionInterface, CPP
+C-Sources:	cbits/HsTime.c
+Other-Modules:
 	Data.Time.Calendar.Private,
 	Data.Time.Calendar.Days,
 	Data.Time.Calendar.Gregorian,
@@ -44,11 +45,12 @@ Hidden-modules:
 	Data.Time.LocalTime.TimeZone,
 	Data.Time.LocalTime.TimeOfDay,
 	Data.Time.LocalTime.LocalTime,
-	Data.Time.LocalTime.Format
+	Data.Time.Format.Parse
 import-dirs:		IMPORT_DIR
 library-dirs:		LIB_DIR
 hs-libraries:		"HStime"
 include-dirs:		INCLUDE_DIR
-includes:		"HsTime.h"
+Install-Includes:
+	HsTime.h HsTimeConfig.h
 haddock-interfaces:	HADDOCK_IFACE
 haddock-html:		HTML_DIR


From git at git.haskell.org  Sun Dec 20 07:51:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:07 +0000 (UTC)
Subject: [commit: packages/time] master: Fixed hyperlinks to formatTime
 (7053937)
Message-ID: <20151220075107.B73423A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7053937ced02dbed6684556445211d094bb61c4b

>---------------------------------------------------------------

commit 7053937ced02dbed6684556445211d094bb61c4b
Author: sven.panne <sven.panne at aedion.de>
Date:   Thu Mar 22 10:02:58 2007 -0700

    Fixed hyperlinks to formatTime
    
    darcs-hash:20070322170258-96103-bd25d42aa6fa7432c891d28a9032b103f3cc53f3


>---------------------------------------------------------------

7053937ced02dbed6684556445211d094bb61c4b
 Data/Time/Calendar/OrdinalDate.hs | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index dfd4069..9dbdd96 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -38,8 +38,8 @@ isLeapYear :: Integer -> Bool
 isLeapYear year = (mod year 4 == 0) && ((mod year 400 == 0) || not (mod year 100 == 0))
 
 -- | Get the number of the Monday-starting week in the year and the day of the week.
--- The first Monday is the first day of week 1, any earlier days in the year are week 0 (as \"%W\" in formatTime).
--- Monday is 1, Sunday is 7 (as \"%u\" in formatTime).
+-- The first Monday is the first day of week 1, any earlier days in the year are week 0 (as \"%W\" in 'Data.Time.Format.formatTime').
+-- Monday is 1, Sunday is 7 (as \"%u\" in 'Data.Time.Format.formatTime').
 mondayStartWeek :: Day -> (Int,Int)
 mondayStartWeek date = (fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7) + 1) where
 	yd = snd (toOrdinalDate date)
@@ -47,8 +47,8 @@ mondayStartWeek date = (fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7
 	k = d - (toInteger yd)
 
 -- | Get the number of the Sunday-starting week in the year and the day of the week.
--- The first Sunday is the first day of week 1, any earlier days in the year are week 0 (as \"%U\" in formatTime).
--- Sunday is 0, Saturday is 6 (as \"%w\" in formatTime).
+-- The first Sunday is the first day of week 1, any earlier days in the year are week 0 (as \"%U\" in 'Data.Time.Format.formatTime').
+-- Sunday is 0, Saturday is 6 (as \"%w\" in 'Data.Time.Format.formatTime').
 sundayStartWeek :: Day -> (Int,Int)
 sundayStartWeek date =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7)) where
 	yd = snd (toOrdinalDate date)
@@ -58,11 +58,11 @@ sundayStartWeek date =(fromInteger ((div d 7) - (div k 7)),fromInteger (mod d 7)
 -- | The inverse of 'mondayStartWeek'. Get a 'Day' given the year,
 -- the number of the Monday-starting week, and the day of the week.
 -- The first Monday is the first day of week 1, any earlier days in the year 
--- are week 0 (as \"%W\" in 'formatTime').
+-- are week 0 (as \"%W\" in 'Data.Time.Format.formatTime').
 fromMondayStartWeek :: Integer -- ^ Year.
                     -> Int     -- ^ Monday-starting week number.
                     -> Int     -- ^ Day of week. 
-                               -- Monday is 1, Sunday is 7 (as \"%u\" in 'formatTime').
+                               -- Monday is 1, Sunday is 7 (as \"%u\" in 'Data.Time.Format.formatTime').
                     -> Day
 fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
     where yd = firstMonday + 7 * toInteger (w-1) + toInteger d - 1
@@ -74,11 +74,11 @@ fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
 -- | The inverse of 'sundayStartWeek'. Get a 'Day' given the year and
 -- the number of the day of a Sunday-starting week.
 -- The first Sunday is the first day of week 1, any earlier days in the 
--- year are week 0 (as \"%U\" in 'formatTime').
+-- year are week 0 (as \"%U\" in 'Data.Time.Format.formatTime').
 fromSundayStartWeek :: Integer -- ^ Year.
                     -> Int     -- ^ Sunday-starting week number.
                     -> Int     -- ^ Day of week
-                               -- Sunday is 0, Saturday is 6 (as \"%w\" in 'formatTime').
+                               -- Sunday is 0, Saturday is 6 (as \"%w\" in 'Data.Time.Format.formatTime').
                     -> Day
 fromSundayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
     where yd = firstSunday + 7 * toInteger (w-1) + toInteger d


From git at git.haskell.org  Sun Dec 20 07:51:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:09 +0000 (UTC)
Subject: [commit: packages/time] master: Added missing directory (a293612)
Message-ID: <20151220075109.BE6D63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a29361230de31e0d0fc6acb6b3e4c185f683463c

>---------------------------------------------------------------

commit a29361230de31e0d0fc6acb6b3e4c185f683463c
Author: sven.panne <sven.panne at aedion.de>
Date:   Thu Mar 22 10:26:49 2007 -0700

    Added missing directory
    
    darcs-hash:20070322172649-96103-35df5e909f8a7d8bb1158a45cc50110b24aa7c4f


>---------------------------------------------------------------

a29361230de31e0d0fc6acb6b3e4c185f683463c
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index 9fca5cd..8c4e8f5 100644
--- a/Makefile
+++ b/Makefile
@@ -9,6 +9,7 @@ ALL_DIRS = \
 	Data/Time \
 	Data/Time/Calendar \
 	Data/Time/Clock \
+	Data/Time/Format \
 	Data/Time/LocalTime
 
 PACKAGE = time


From git at git.haskell.org  Sun Dec 20 07:51:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:11 +0000 (UTC)
Subject: [commit: packages/time] master: Make Setup.hs suitable for building
 in a GHC tree (2f507d7)
Message-ID: <20151220075111.C52723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2f507d73fbd98f417b70fd4ce01c1108c211847e

>---------------------------------------------------------------

commit 2f507d73fbd98f417b70fd4ce01c1108c211847e
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Apr 7 10:41:49 2007 -0700

    Make Setup.hs suitable for building in a GHC tree
    
    darcs-hash:20070407174149-3fd76-51c9fae37e93e4f367400b38078fc490266864f0


>---------------------------------------------------------------

2f507d73fbd98f417b70fd4ce01c1108c211847e
 Setup.hs | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 60 insertions(+), 8 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index 2859262..9ef61d3 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,21 +1,73 @@
 module Main (main) where
 
+import Control.Exception
+import Data.List
 import Distribution.Simple
 import Distribution.PackageDescription
+import Distribution.PreProcess
+import Distribution.Setup
 import Distribution.Simple.LocalBuildInfo
-import System.Exit
 import System.Cmd
 import System.Directory
-import Control.Exception
+import System.Environment
+import System.Exit
+
+main :: IO ()
+main = do args <- getArgs
+          let (ghcArgs, args') = extractGhcArgs args
+              (_, args'') = extractConfigureArgs args'
+              hooks = defaultUserHooks {
+                  buildHook = add_ghc_options ghcArgs
+                            $ buildHook defaultUserHooks,
+                  runTests = runTestScript }
+          withArgs args'' $ defaultMainWithHooks hooks
 
 withCurrentDirectory :: FilePath -> IO a -> IO a
 withCurrentDirectory path f = do
-	cur <- getCurrentDirectory
-	setCurrentDirectory path
-	finally f (setCurrentDirectory cur)
+    cur <- getCurrentDirectory
+    setCurrentDirectory path
+    finally f (setCurrentDirectory cur)
 
-runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ExitCode
+runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo
+              -> IO ExitCode
 runTestScript args flag pd lbi = withCurrentDirectory "test" (system "make")
 
-main :: IO ()
-main = defaultMainWithHooks defaultUserHooks{runTests = runTestScript}
+extractGhcArgs :: [String] -> ([String], [String])
+extractGhcArgs = extractPrefixArgs "--ghc-option="
+
+extractConfigureArgs :: [String] -> ([String], [String])
+extractConfigureArgs = extractPrefixArgs "--configure-option="
+
+extractPrefixArgs :: String -> [String] -> ([String], [String])
+extractPrefixArgs prefix args
+ = let f [] = ([], [])
+       f (x:xs) = case f xs of
+                      (wantedArgs, otherArgs) ->
+                          case removePrefix prefix x of
+                              Just wantedArg ->
+                                  (wantedArg:wantedArgs, otherArgs)
+                              Nothing ->
+                                  (wantedArgs, x:otherArgs)
+   in f args
+
+removePrefix :: String -> String -> Maybe String
+removePrefix "" ys = Just ys
+removePrefix (x:xs) (y:ys)
+ | x == y = removePrefix xs ys
+ | otherwise = Nothing
+
+type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
+           -> IO ()
+
+add_ghc_options :: [String] -> Hook a -> Hook a
+add_ghc_options args f pd lbi muhs x
+ = do let lib' = case library pd of
+                     Just lib ->
+                         let bi = libBuildInfo lib
+                             opts = options bi ++ [(GHC, args)]
+                             bi' = bi { options = opts }
+                         in lib { libBuildInfo = bi' }
+                     Nothing -> error "Expected a library"
+          pd' = pd { library = Just lib' }
+      f pd' lbi muhs x
+


From git at git.haskell.org  Sun Dec 20 07:51:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:13 +0000 (UTC)
Subject: [commit: packages/time] master: Fix -Wall warnings (ae16651)
Message-ID: <20151220075113.CCDE63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ae16651f2429c01af64184318d06bed2023cd380

>---------------------------------------------------------------

commit ae16651f2429c01af64184318d06bed2023cd380
Author: Ian Lynagh <igloo at earth.li>
Date:   Tue Apr 10 18:22:40 2007 -0700

    Fix -Wall warnings
    
    darcs-hash:20070411012240-3fd76-b092e0f174e882a180df231c955a3456d2ddeb65


>---------------------------------------------------------------

ae16651f2429c01af64184318d06bed2023cd380
 Setup.hs | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index 9ef61d3..3c31867 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -4,7 +4,6 @@ import Control.Exception
 import Data.List
 import Distribution.Simple
 import Distribution.PackageDescription
-import Distribution.PreProcess
 import Distribution.Setup
 import Distribution.Simple.LocalBuildInfo
 import System.Cmd
@@ -30,7 +29,8 @@ withCurrentDirectory path f = do
 
 runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo
               -> IO ExitCode
-runTestScript args flag pd lbi = withCurrentDirectory "test" (system "make")
+runTestScript _args _flag _pd _lbi
+ = withCurrentDirectory "test" (system "make")
 
 extractGhcArgs :: [String] -> ([String], [String])
 extractGhcArgs = extractPrefixArgs "--ghc-option="
@@ -39,11 +39,11 @@ extractConfigureArgs :: [String] -> ([String], [String])
 extractConfigureArgs = extractPrefixArgs "--configure-option="
 
 extractPrefixArgs :: String -> [String] -> ([String], [String])
-extractPrefixArgs prefix args
+extractPrefixArgs the_prefix args
  = let f [] = ([], [])
        f (x:xs) = case f xs of
                       (wantedArgs, otherArgs) ->
-                          case removePrefix prefix x of
+                          case removePrefix the_prefix x of
                               Just wantedArg ->
                                   (wantedArg:wantedArgs, otherArgs)
                               Nothing ->
@@ -52,6 +52,7 @@ extractPrefixArgs prefix args
 
 removePrefix :: String -> String -> Maybe String
 removePrefix "" ys = Just ys
+removePrefix _  "" = Nothing
 removePrefix (x:xs) (y:ys)
  | x == y = removePrefix xs ys
  | otherwise = Nothing


From git at git.haskell.org  Sun Dec 20 07:51:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:15 +0000 (UTC)
Subject: [commit: packages/time] master: Hack due to time needing Win32 on
 Windows (dbd2265)
Message-ID: <20151220075115.D361D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/dbd22650b674227dff9c45c53e921367441fdc99

>---------------------------------------------------------------

commit dbd22650b674227dff9c45c53e921367441fdc99
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Apr 15 14:52:27 2007 -0700

    Hack due to time needing Win32 on Windows
    
    darcs-hash:20070415215227-3fd76-ee66b60c836f81fa879ba9e80220fac57f47e261


>---------------------------------------------------------------

dbd22650b674227dff9c45c53e921367441fdc99
 Setup.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Setup.hs b/Setup.hs
index 3c31867..f078742 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -10,12 +10,15 @@ import System.Cmd
 import System.Directory
 import System.Environment
 import System.Exit
+import System.Info
 
 main :: IO ()
 main = do args <- getArgs
           let (ghcArgs, args') = extractGhcArgs args
               (_, args'') = extractConfigureArgs args'
               hooks = defaultUserHooks {
+                  confHook = add_Win32_dep
+                           $ confHook defaultUserHooks,
                   buildHook = add_ghc_options ghcArgs
                             $ buildHook defaultUserHooks,
                   runTests = runTestScript }
@@ -72,3 +75,14 @@ add_ghc_options args f pd lbi muhs x
           pd' = pd { library = Just lib' }
       f pd' lbi muhs x
 
+type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
+
+-- XXX Hideous hack
+add_Win32_dep :: ConfHook -> ConfHook
+add_Win32_dep f pd cf
+ = do let pd' = if os == "mingw32"
+                then pd { buildDepends = Dependency "Win32" AnyVersion
+                                       : buildDepends pd }
+                else pd
+      f pd' cf
+


From git at git.haskell.org  Sun Dec 20 07:51:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:17 +0000 (UTC)
Subject: [commit: packages/time] master: Follow Cabal changes in Setup.*hs
 (fae8a55)
Message-ID: <20151220075117.DAE133A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6

>---------------------------------------------------------------

commit fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Apr 18 05:14:32 2007 -0700

    Follow Cabal changes in Setup.*hs
    
    darcs-hash:20070418121432-3fd76-50d82afe568d115252a1a061ee8e8cb581e2bebc


>---------------------------------------------------------------

fae8a5587481b1ae3da17c49d04cc0ab89ed8ca6
 Setup.hs | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index f078742..caecfdd 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -9,7 +9,6 @@ import Distribution.Simple.LocalBuildInfo
 import System.Cmd
 import System.Directory
 import System.Environment
-import System.Exit
 import System.Info
 
 main :: IO ()
@@ -31,7 +30,7 @@ withCurrentDirectory path f = do
     finally f (setCurrentDirectory cur)
 
 runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo
-              -> IO ExitCode
+              -> IO ()
 runTestScript _args _flag _pd _lbi
  = withCurrentDirectory "test" (system "make")
 
@@ -60,11 +59,10 @@ removePrefix (x:xs) (y:ys)
  | x == y = removePrefix xs ys
  | otherwise = Nothing
 
-type Hook a = PackageDescription -> LocalBuildInfo -> Maybe UserHooks -> a
-           -> IO ()
+type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
 
 add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi muhs x
+add_ghc_options args f pd lbi uhs x
  = do let lib' = case library pd of
                      Just lib ->
                          let bi = libBuildInfo lib
@@ -73,7 +71,7 @@ add_ghc_options args f pd lbi muhs x
                          in lib { libBuildInfo = bi' }
                      Nothing -> error "Expected a library"
           pd' = pd { library = Just lib' }
-      f pd' lbi muhs x
+      f pd' lbi uhs x
 
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
 


From git at git.haskell.org  Sun Dec 20 07:51:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:19 +0000 (UTC)
Subject: [commit: packages/time] master: We now need to check the exitcode of
 the tests (ccb1264)
Message-ID: <20151220075119.E3B0F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ccb1264e93dfa379d26368677aa05ec3b7ec34c2

>---------------------------------------------------------------

commit ccb1264e93dfa379d26368677aa05ec3b7ec34c2
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Apr 21 09:23:30 2007 -0700

    We now need to check the exitcode of the tests
    
    darcs-hash:20070421162330-3fd76-36ce113c06f673ae509deac9eb047e5f539a69c5


>---------------------------------------------------------------

ccb1264e93dfa379d26368677aa05ec3b7ec34c2
 Setup.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index caecfdd..d2fff29 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -2,10 +2,11 @@ module Main (main) where
 
 import Control.Exception
 import Data.List
-import Distribution.Simple
 import Distribution.PackageDescription
 import Distribution.Setup
+import Distribution.Simple
 import Distribution.Simple.LocalBuildInfo
+import Distribution.Simple.Utils
 import System.Cmd
 import System.Directory
 import System.Environment
@@ -29,10 +30,9 @@ withCurrentDirectory path f = do
     setCurrentDirectory path
     finally f (setCurrentDirectory cur)
 
-runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo
-              -> IO ()
+runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
 runTestScript _args _flag _pd _lbi
- = withCurrentDirectory "test" (system "make")
+ = maybeExit $ withCurrentDirectory "test" $ system "make"
 
 extractGhcArgs :: [String] -> ([String], [String])
 extractGhcArgs = extractPrefixArgs "--ghc-option="


From git at git.haskell.org  Sun Dec 20 07:51:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:21 +0000 (UTC)
Subject: [commit: packages/time] master: Bump version to 1.1.1 (9eb62d6)
Message-ID: <20151220075121.E91813A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9eb62d6b83f0401cf7d11afdbaaed725f44a57f5

>---------------------------------------------------------------

commit 9eb62d6b83f0401cf7d11afdbaaed725f44a57f5
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Apr 22 12:52:28 2007 -0700

    Bump version to 1.1.1
    
    darcs-hash:20070422195228-3fd76-279361d39d538b6e458e46526389712ccc8b45fe


>---------------------------------------------------------------

9eb62d6b83f0401cf7d11afdbaaed725f44a57f5
 Makefile     | 2 +-
 configure.ac | 2 +-
 time.cabal   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 8c4e8f5..9f61dd2 100644
--- a/Makefile
+++ b/Makefile
@@ -13,7 +13,7 @@ ALL_DIRS = \
 	Data/Time/LocalTime
 
 PACKAGE = time
-VERSION = 1.1
+VERSION = 1.1.1
 PACKAGE_DEPS = base
 
 SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
diff --git a/configure.ac b/configure.ac
index 5778502..0da7fc4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.1], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.1.1], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index d877a1b..3c44a66 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	1.1
+Version:	1.1.1
 Stability:	stable
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:51:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:23 +0000 (UTC)
Subject: [commit: packages/time] master: Remove Makefile and package.conf.in
 (used in the old GHC build system) (ef82b6f)
Message-ID: <20151220075123.F06503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ef82b6ff52f984bb55c26ef10624adc218a18f98

>---------------------------------------------------------------

commit ef82b6ff52f984bb55c26ef10624adc218a18f98
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu May 24 07:58:37 2007 -0700

    Remove Makefile and package.conf.in (used in the old GHC build system)
    
    darcs-hash:20070524145837-3fd76-402cae7ffe2155bdb3ef4b1a3081935c74e66f32


>---------------------------------------------------------------

ef82b6ff52f984bb55c26ef10624adc218a18f98
 Makefile        | 29 -----------------------------
 package.conf.in | 56 --------------------------------------------------------
 2 files changed, 85 deletions(-)

diff --git a/Makefile b/Makefile
deleted file mode 100644
index 9f61dd2..0000000
--- a/Makefile
+++ /dev/null
@@ -1,29 +0,0 @@
-TOP=..
-include $(TOP)/mk/boilerplate.mk
-
-SUBDIRS = include
-
-ALL_DIRS = \
-	cbits \
-	Data \
-	Data/Time \
-	Data/Time/Calendar \
-	Data/Time/Clock \
-	Data/Time/Format \
-	Data/Time/LocalTime
-
-PACKAGE = time
-VERSION = 1.1.1
-PACKAGE_DEPS = base
-
-SRC_HC_OPTS += -Wall -Werror -fffi -Iinclude
-
-SRC_CC_OPTS += -Wall -Werror -Iinclude
-
-EXCLUDED_SRCS += Setup.hs
-
-SRC_HADDOCK_OPTS += -t "Haskell Hierarchical Libraries ($(PACKAGE) package)"
-
-UseGhcForCc = YES
-
-include $(TOP)/mk/target.mk
diff --git a/package.conf.in b/package.conf.in
deleted file mode 100644
index fc3bf80..0000000
--- a/package.conf.in
+++ /dev/null
@@ -1,56 +0,0 @@
-#include "ghcconfig.h"
-
-Name:		PACKAGE
-Version:	VERSION
-Stability:	stable
-License:	BSD3
-License-File:	LICENSE
-Author:		Ashley Yakeley
-Maintainer:	<ashley at semantic.org>
-Homepage:	http://semantic.org/TimeLib/
-exposed:	True
-Category:
-
-#if mingw32_HOST_OS
-depends:	Win32, base
-#else
-depends:	base
-#endif
-
-Synopsis:	time library
-Exposed-modules:
-	Data.Time.Calendar,
-	Data.Time.Calendar.MonthDay,
-	Data.Time.Calendar.OrdinalDate,
-	Data.Time.Calendar.WeekDate,
-	Data.Time.Calendar.Julian,
-	Data.Time.Calendar.Easter,
-	Data.Time.Clock,
-	Data.Time.Clock.POSIX,
-	Data.Time.Clock.TAI,
-	Data.Time.LocalTime,
-	Data.Time.Format,
-	Data.Time
-Extensions:	ForeignFunctionInterface, CPP
-C-Sources:	cbits/HsTime.c
-Other-Modules:
-	Data.Time.Calendar.Private,
-	Data.Time.Calendar.Days,
-	Data.Time.Calendar.Gregorian,
-	Data.Time.Calendar.JulianYearDay,
-	Data.Time.Clock.Scale,
-	Data.Time.Clock.UTC,
-	Data.Time.Clock.CTimeval,
-	Data.Time.Clock.UTCDiff,
-	Data.Time.LocalTime.TimeZone,
-	Data.Time.LocalTime.TimeOfDay,
-	Data.Time.LocalTime.LocalTime,
-	Data.Time.Format.Parse
-import-dirs:		IMPORT_DIR
-library-dirs:		LIB_DIR
-hs-libraries:		"HStime"
-include-dirs:		INCLUDE_DIR
-Install-Includes:
-	HsTime.h HsTimeConfig.h
-haddock-interfaces:	HADDOCK_IFACE
-haddock-html:		HTML_DIR


From git at git.haskell.org  Sun Dec 20 07:51:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:26 +0000 (UTC)
Subject: [commit: packages/time] master: Follow base split (now dep on
 old-locale) (c0d8daf)
Message-ID: <20151220075126.030313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c0d8daf1b9f892bf94cf16e41f928c45c0437542

>---------------------------------------------------------------

commit c0d8daf1b9f892bf94cf16e41f928c45c0437542
Author: Ian Lynagh <igloo at earth.li>
Date:   Thu May 24 10:37:51 2007 -0700

    Follow base split (now dep on old-locale)
    
    darcs-hash:20070524173751-3fd76-d9ce4ca8fba7e38a62deaea0920d0011cf82678e


>---------------------------------------------------------------

c0d8daf1b9f892bf94cf16e41f928c45c0437542
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 3c44a66..cb9b6ca 100644
--- a/time.cabal
+++ b/time.cabal
@@ -7,7 +7,7 @@ Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
 Category:
-Build-Depends:	base
+Build-Depends:	base, old-locale
 Synopsis:	time library
 Exposed-Modules:
 	Data.Time.Calendar,


From git at git.haskell.org  Sun Dec 20 07:51:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:28 +0000 (UTC)
Subject: [commit: packages/time] master: --configure-option and --ghc-option
 are now provided by Cabal (a9edca5)
Message-ID: <20151220075128.09F6B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a9edca50d629162c592b7ef78d6cb55b23822b2c

>---------------------------------------------------------------

commit a9edca50d629162c592b7ef78d6cb55b23822b2c
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Mon Jun 4 04:55:55 2007 -0700

    --configure-option and --ghc-option are now provided by Cabal
    
    darcs-hash:20070604115555-b47d3-494f023ee54f001497ff09fe4e165b655a776147


>---------------------------------------------------------------

a9edca50d629162c592b7ef78d6cb55b23822b2c
 Setup.hs | 51 ++-------------------------------------------------
 1 file changed, 2 insertions(+), 49 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index d2fff29..e8a005c 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,7 +1,6 @@
 module Main (main) where
 
 import Control.Exception
-import Data.List
 import Distribution.PackageDescription
 import Distribution.Setup
 import Distribution.Simple
@@ -9,20 +8,14 @@ import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import System.Cmd
 import System.Directory
-import System.Environment
 import System.Info
 
 main :: IO ()
-main = do args <- getArgs
-          let (ghcArgs, args') = extractGhcArgs args
-              (_, args'') = extractConfigureArgs args'
-              hooks = defaultUserHooks {
+main = do let hooks = defaultUserHooks {
                   confHook = add_Win32_dep
                            $ confHook defaultUserHooks,
-                  buildHook = add_ghc_options ghcArgs
-                            $ buildHook defaultUserHooks,
                   runTests = runTestScript }
-          withArgs args'' $ defaultMainWithHooks hooks
+          defaultMainWithHooks hooks
 
 withCurrentDirectory :: FilePath -> IO a -> IO a
 withCurrentDirectory path f = do
@@ -34,45 +27,6 @@ runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
 runTestScript _args _flag _pd _lbi
  = maybeExit $ withCurrentDirectory "test" $ system "make"
 
-extractGhcArgs :: [String] -> ([String], [String])
-extractGhcArgs = extractPrefixArgs "--ghc-option="
-
-extractConfigureArgs :: [String] -> ([String], [String])
-extractConfigureArgs = extractPrefixArgs "--configure-option="
-
-extractPrefixArgs :: String -> [String] -> ([String], [String])
-extractPrefixArgs the_prefix args
- = let f [] = ([], [])
-       f (x:xs) = case f xs of
-                      (wantedArgs, otherArgs) ->
-                          case removePrefix the_prefix x of
-                              Just wantedArg ->
-                                  (wantedArg:wantedArgs, otherArgs)
-                              Nothing ->
-                                  (wantedArgs, x:otherArgs)
-   in f args
-
-removePrefix :: String -> String -> Maybe String
-removePrefix "" ys = Just ys
-removePrefix _  "" = Nothing
-removePrefix (x:xs) (y:ys)
- | x == y = removePrefix xs ys
- | otherwise = Nothing
-
-type Hook a = PackageDescription -> LocalBuildInfo -> UserHooks -> a -> IO ()
-
-add_ghc_options :: [String] -> Hook a -> Hook a
-add_ghc_options args f pd lbi uhs x
- = do let lib' = case library pd of
-                     Just lib ->
-                         let bi = libBuildInfo lib
-                             opts = options bi ++ [(GHC, args)]
-                             bi' = bi { options = opts }
-                         in lib { libBuildInfo = bi' }
-                     Nothing -> error "Expected a library"
-          pd' = pd { library = Just lib' }
-      f pd' lbi uhs x
-
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
 
 -- XXX Hideous hack
@@ -83,4 +37,3 @@ add_Win32_dep f pd cf
                                        : buildDepends pd }
                 else pd
       f pd' cf
-


From git at git.haskell.org  Sun Dec 20 07:51:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:30 +0000 (UTC)
Subject: [commit: packages/time] master: #undef PACKAGE_NAME and friends to
 avoid clashes (2f36990)
Message-ID: <20151220075130.0F79F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2f369900a7bb45aa52dede558fa5364a1a7a7e13

>---------------------------------------------------------------

commit 2f369900a7bb45aa52dede558fa5364a1a7a7e13
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Jun 6 07:20:42 2007 -0700

    #undef PACKAGE_NAME and friends to avoid clashes
    
    darcs-hash:20070606142042-760e2-20bc4e080e1edf8b0e12fd8c5b68da9d21e89c79


>---------------------------------------------------------------

2f369900a7bb45aa52dede558fa5364a1a7a7e13
 include/HsTime.h | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/include/HsTime.h b/include/HsTime.h
index 059cbc0..c02cc53 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -2,6 +2,12 @@
 #define __HSTIME_H__
 
 #include "HsTimeConfig.h"
+// Otherwise these clash with similar definitions from other packages:
+#undef PACKAGE_BUGREPORT
+#undef PACKAGE_NAME
+#undef PACKAGE_STRING
+#undef PACKAGE_TARNAME
+#undef PACKAGE_VERSION
 
 #if HAVE_TIME_H
 #include <time.h>


From git at git.haskell.org  Sun Dec 20 07:51:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:32 +0000 (UTC)
Subject: [commit: packages/time] master: Provide a configure flag to set which
 C compiler is used (96f1b36)
Message-ID: <20151220075132.157A03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/96f1b36a54af14d10654ff15235ab652fa187ef4

>---------------------------------------------------------------

commit 96f1b36a54af14d10654ff15235ab652fa187ef4
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Jul 7 04:24:51 2007 -0700

    Provide a configure flag to set which C compiler is used
    
    darcs-hash:20070707112451-3fd76-20588169237238c46714c9edaa964ca373949bfa


>---------------------------------------------------------------

96f1b36a54af14d10654ff15235ab652fa187ef4
 configure.ac | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/configure.ac b/configure.ac
index 0da7fc4..1b45b5b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,6 +3,11 @@ AC_INIT([Haskell time package], [1.1.1], [ashley at semantic.org], [time])
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
 
+AC_ARG_WITH([cc],
+            [C compiler],
+            [CC=$withval])
+AC_PROG_CC()
+
 AC_CONFIG_HEADERS([include/HsTimeConfig.h])
 
 AC_CHECK_HEADERS([time.h])


From git at git.haskell.org  Sun Dec 20 07:51:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:34 +0000 (UTC)
Subject: [commit: packages/time] master: FIX #1486: timezone offset has the
 wrong sign on Windows (8e487ba)
Message-ID: <20151220075134.1C7033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8e487bae5f6507e15d8b142683b0ba1c4eefa223

>---------------------------------------------------------------

commit 8e487bae5f6507e15d8b142683b0ba1c4eefa223
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Tue Jul 10 01:12:36 2007 -0700

    FIX #1486: timezone offset has the wrong sign on Windows
    
    Fix submitted by Olivier Boudry, thanks!
    
    darcs-hash:20070710081236-760e2-6581eff1e91b2207190b15ec6143f0eb26442178


>---------------------------------------------------------------

8e487bae5f6507e15d8b142683b0ba1c4eefa223
 cbits/HsTime.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index 58b7d06..dacb1d4 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -22,7 +22,7 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 		// implemented as part of localtime() in the CRT.  This is_dst
 		// flag is all we need here.
 		*pname = dst ? _tzname[1] : _tzname[0];
-		return dst ? _timezone - 3600 : _timezone;
+		return - (dst ? _timezone - 3600 : _timezone);
 #else
 # if HAVE_TZNAME
 		*pname = *tzname;


From git at git.haskell.org  Sun Dec 20 07:51:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:36 +0000 (UTC)
Subject: [commit: packages/time] master: Use configurations rather than
 Setup.hs hacks (5b0af2b)
Message-ID: <20151220075136.234CF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5b0af2be4901a466c6daf2895b242eaf46e70870

>---------------------------------------------------------------

commit 5b0af2be4901a466c6daf2895b242eaf46e70870
Author: Ian Lynagh <igloo at earth.li>
Date:   Sun Jul 29 14:38:33 2007 -0700

    Use configurations rather than Setup.hs hacks
    
    darcs-hash:20070729213833-3fd76-865c6cb804d9768e5712cfe6bb5cd1f77340eda9


>---------------------------------------------------------------

5b0af2be4901a466c6daf2895b242eaf46e70870
 Setup.hs   | 13 +---------
 time.cabal | 85 ++++++++++++++++++++++++++++++++++----------------------------
 2 files changed, 47 insertions(+), 51 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index e8a005c..d57f1c9 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -11,10 +11,7 @@ import System.Directory
 import System.Info
 
 main :: IO ()
-main = do let hooks = defaultUserHooks {
-                  confHook = add_Win32_dep
-                           $ confHook defaultUserHooks,
-                  runTests = runTestScript }
+main = do let hooks = defaultUserHooks { runTests = runTestScript }
           defaultMainWithHooks hooks
 
 withCurrentDirectory :: FilePath -> IO a -> IO a
@@ -29,11 +26,3 @@ runTestScript _args _flag _pd _lbi
 
 type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
 
--- XXX Hideous hack
-add_Win32_dep :: ConfHook -> ConfHook
-add_Win32_dep f pd cf
- = do let pd' = if os == "mingw32"
-                then pd { buildDepends = Dependency "Win32" AnyVersion
-                                       : buildDepends pd }
-                else pd
-      f pd' cf
diff --git a/time.cabal b/time.cabal
index cb9b6ca..e32a126 100644
--- a/time.cabal
+++ b/time.cabal
@@ -7,42 +7,49 @@ Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
 Category:
-Build-Depends:	base, old-locale
-Synopsis:	time library
-Exposed-Modules:
-	Data.Time.Calendar,
-	Data.Time.Calendar.MonthDay,
-	Data.Time.Calendar.OrdinalDate,
-	Data.Time.Calendar.WeekDate,
-	Data.Time.Calendar.Julian,
-	Data.Time.Calendar.Easter,
-	Data.Time.Clock,
-	Data.Time.Clock.POSIX,
-	Data.Time.Clock.TAI,
-	Data.Time.LocalTime,
-	Data.Time.Format,
-	Data.Time
-Extensions:	ForeignFunctionInterface, CPP
-C-Sources:	cbits/HsTime.c
-Other-Modules:
-	Data.Time.Calendar.Private,
-	Data.Time.Calendar.Days,
-	Data.Time.Calendar.Gregorian,
-	Data.Time.Calendar.JulianYearDay,
-	Data.Time.Clock.Scale,
-	Data.Time.Clock.UTC,
-	Data.Time.Clock.CTimeval,
-	Data.Time.Clock.UTCDiff,
-	Data.Time.LocalTime.TimeZone,
-	Data.Time.LocalTime.TimeOfDay,
-	Data.Time.LocalTime.LocalTime,
-	Data.Time.Format.Parse
-Extra-Source-Files:
-	aclocal.m4 configure.ac configure
-	include/HsTime.h include/HsTimeConfig.h.in
-Extra-Tmp-Files:
-	config.log config.status autom4te.cache
-	include/HsTimeConfig.h
-Include-Dirs:	include
-Install-Includes:
-	HsTime.h HsTimeConfig.h
+
+Library {
+    Build-Depends: base, old-locale
+    if os(mingw32) {
+        Build-Depends: Win32
+    }
+    Synopsis:	time library
+    Exposed-Modules:
+    	Data.Time.Calendar,
+    	Data.Time.Calendar.MonthDay,
+    	Data.Time.Calendar.OrdinalDate,
+    	Data.Time.Calendar.WeekDate,
+    	Data.Time.Calendar.Julian,
+    	Data.Time.Calendar.Easter,
+    	Data.Time.Clock,
+    	Data.Time.Clock.POSIX,
+    	Data.Time.Clock.TAI,
+    	Data.Time.LocalTime,
+    	Data.Time.Format,
+    	Data.Time
+    Extensions:	ForeignFunctionInterface, CPP
+    C-Sources:	cbits/HsTime.c
+    Other-Modules:
+    	Data.Time.Calendar.Private,
+    	Data.Time.Calendar.Days,
+    	Data.Time.Calendar.Gregorian,
+    	Data.Time.Calendar.JulianYearDay,
+    	Data.Time.Clock.Scale,
+    	Data.Time.Clock.UTC,
+    	Data.Time.Clock.CTimeval,
+    	Data.Time.Clock.UTCDiff,
+    	Data.Time.LocalTime.TimeZone,
+    	Data.Time.LocalTime.TimeOfDay,
+    	Data.Time.LocalTime.LocalTime,
+    	Data.Time.Format.Parse
+    Extra-Source-Files:
+    	aclocal.m4 configure.ac configure
+    	include/HsTime.h include/HsTimeConfig.h.in
+    Extra-Tmp-Files:
+    	config.log config.status autom4te.cache
+    	include/HsTimeConfig.h
+    Include-Dirs:	include
+    Install-Includes:
+    	HsTime.h HsTimeConfig.h
+}
+


From git at git.haskell.org  Sun Dec 20 07:51:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:38 +0000 (UTC)
Subject: [commit: packages/time] master: Track .cabal syntax changes once
 again (8b0d7b8)
Message-ID: <20151220075138.2A2213A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8b0d7b84e60e824da7a410431dfafcee52d64029

>---------------------------------------------------------------

commit 8b0d7b84e60e824da7a410431dfafcee52d64029
Author: sven.panne <sven.panne at aedion.de>
Date:   Sat Sep 1 08:47:28 2007 -0700

    Track .cabal syntax changes once again
    
    darcs-hash:20070901154728-96103-656ff80bfc077ca44cbfe2afc3ca3a1a032b2fa9


>---------------------------------------------------------------

8b0d7b84e60e824da7a410431dfafcee52d64029
 time.cabal | 65 +++++++++++++++++++++++++++++++-------------------------------
 1 file changed, 33 insertions(+), 32 deletions(-)

diff --git a/time.cabal b/time.cabal
index e32a126..f9c0c17 100644
--- a/time.cabal
+++ b/time.cabal
@@ -6,50 +6,51 @@ License-File:	LICENSE
 Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
+Synopsis:	time library
 Category:
 
+Extra-Source-Files:
+        aclocal.m4 configure.ac configure
+        include/HsTime.h include/HsTimeConfig.h.in
+Extra-Tmp-Files:
+        config.log config.status autom4te.cache
+        include/HsTimeConfig.h
+
 Library {
     Build-Depends: base, old-locale
     if os(mingw32) {
         Build-Depends: Win32
     }
-    Synopsis:	time library
     Exposed-Modules:
-    	Data.Time.Calendar,
-    	Data.Time.Calendar.MonthDay,
-    	Data.Time.Calendar.OrdinalDate,
-    	Data.Time.Calendar.WeekDate,
-    	Data.Time.Calendar.Julian,
-    	Data.Time.Calendar.Easter,
-    	Data.Time.Clock,
-    	Data.Time.Clock.POSIX,
-    	Data.Time.Clock.TAI,
-    	Data.Time.LocalTime,
-    	Data.Time.Format,
-    	Data.Time
+        Data.Time.Calendar,
+        Data.Time.Calendar.MonthDay,
+        Data.Time.Calendar.OrdinalDate,
+        Data.Time.Calendar.WeekDate,
+        Data.Time.Calendar.Julian,
+        Data.Time.Calendar.Easter,
+        Data.Time.Clock,
+        Data.Time.Clock.POSIX,
+        Data.Time.Clock.TAI,
+        Data.Time.LocalTime,
+        Data.Time.Format,
+        Data.Time
     Extensions:	ForeignFunctionInterface, CPP
     C-Sources:	cbits/HsTime.c
     Other-Modules:
-    	Data.Time.Calendar.Private,
-    	Data.Time.Calendar.Days,
-    	Data.Time.Calendar.Gregorian,
-    	Data.Time.Calendar.JulianYearDay,
-    	Data.Time.Clock.Scale,
-    	Data.Time.Clock.UTC,
-    	Data.Time.Clock.CTimeval,
-    	Data.Time.Clock.UTCDiff,
-    	Data.Time.LocalTime.TimeZone,
-    	Data.Time.LocalTime.TimeOfDay,
-    	Data.Time.LocalTime.LocalTime,
-    	Data.Time.Format.Parse
-    Extra-Source-Files:
-    	aclocal.m4 configure.ac configure
-    	include/HsTime.h include/HsTimeConfig.h.in
-    Extra-Tmp-Files:
-    	config.log config.status autom4te.cache
-    	include/HsTimeConfig.h
+        Data.Time.Calendar.Private,
+        Data.Time.Calendar.Days,
+        Data.Time.Calendar.Gregorian,
+        Data.Time.Calendar.JulianYearDay,
+        Data.Time.Clock.Scale,
+        Data.Time.Clock.UTC,
+        Data.Time.Clock.CTimeval,
+        Data.Time.Clock.UTCDiff,
+        Data.Time.LocalTime.TimeZone,
+        Data.Time.LocalTime.TimeOfDay,
+        Data.Time.LocalTime.LocalTime,
+        Data.Time.Format.Parse
     Include-Dirs:	include
     Install-Includes:
-    	HsTime.h HsTimeConfig.h
+        HsTime.h HsTimeConfig.h
 }
 


From git at git.haskell.org  Sun Dec 20 07:51:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:40 +0000 (UTC)
Subject: [commit: packages/time] master: Fixed Cabal-induced breakage,
 once again... (635d902)
Message-ID: <20151220075140.305D83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/635d902b2a9ddcece575ae4b2873f793201e5684

>---------------------------------------------------------------

commit 635d902b2a9ddcece575ae4b2873f793201e5684
Author: sven.panne <sven.panne at aedion.de>
Date:   Sat Sep 8 09:02:56 2007 -0700

    Fixed Cabal-induced breakage, once again...
    
    MERGE TO STABLE (if we have a concept of "stable libraries")
    
    darcs-hash:20070908160256-96103-c5c21e89632939ac5896cf44abc9aa381df7ed4e


>---------------------------------------------------------------

635d902b2a9ddcece575ae4b2873f793201e5684
 Setup.hs | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index d57f1c9..1863d6e 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -2,13 +2,11 @@ module Main (main) where
 
 import Control.Exception
 import Distribution.PackageDescription
-import Distribution.Setup
 import Distribution.Simple
 import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import System.Cmd
 import System.Directory
-import System.Info
 
 main :: IO ()
 main = do let hooks = defaultUserHooks { runTests = runTestScript }
@@ -23,6 +21,3 @@ withCurrentDirectory path f = do
 runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
 runTestScript _args _flag _pd _lbi
  = maybeExit $ withCurrentDirectory "test" $ system "make"
-
-type ConfHook = PackageDescription -> ConfigFlags -> IO LocalBuildInfo
-


From git at git.haskell.org  Sun Dec 20 07:51:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:42 +0000 (UTC)
Subject: [commit: packages/time] master: Allow a colon between the hours and
 minutes when parsing with %z and %Z. (e6e4837)
Message-ID: <20151220075142.36EC23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e6e4837310610731a112dced280b3a14e9fe9e8b

>---------------------------------------------------------------

commit e6e4837310610731a112dced280b3a14e9fe9e8b
Author: bjorn <bjorn at bringert.net>
Date:   Tue Oct 16 12:52:39 2007 -0700

    Allow a colon between the hours and minutes when parsing with %z and %Z.
    
    darcs-hash:20071016195239-6cdb2-17cf31be16d40e755740f2d3d264094be8e344a3


>---------------------------------------------------------------

e6e4837310610731a112dced280b3a14e9fe9e8b
 Data/Time/Format/Parse.hs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index bee16e8..7e4c319 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -110,9 +110,9 @@ parseInput l = liftM catMaybes . mapM p
 parseValue :: TimeLocale -> Char -> ReadP String
 parseValue l c = 
     case c of
-      'z' -> liftM2 (:) (choice [char '+', char '-']) (digits 4)
+      'z' -> numericTZ
       'Z' -> munch1 isUpper <++
-             liftM2 (:) (choice [char '+', char '-']) (digits 4) <++
+             numericTZ <++
              return "" -- produced by %Z for LocalTime
       'P' -> oneOf (let (am,pm) = amPm l 
                      in [map toLower am, map toLower pm])
@@ -154,8 +154,11 @@ parseValue l c =
     upTo :: Int -> ReadP a -> ReadP [a]
     upTo 0 _ = return []
     upTo n x = liftM2 (:) x (upTo (n-1) x) <++ return []
-
-
+    numericTZ = do s <- choice [char '+', char '-']
+                   h <- digits 2
+                   optional (char ':')
+                   m <- digits 2
+                   return (s:h++m)
 
 --
 -- * Instances for the time package types


From git at git.haskell.org  Sun Dec 20 07:51:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:44 +0000 (UTC)
Subject: [commit: packages/time] master: Document the format used for output
 with %z. (894b1f8)
Message-ID: <20151220075144.3DF0E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/894b1f8e83bee2e25b93441e01b72953150d5931

>---------------------------------------------------------------

commit 894b1f8e83bee2e25b93441e01b72953150d5931
Author: bjorn <bjorn at bringert.net>
Date:   Tue Oct 16 12:54:49 2007 -0700

    Document the format used for output with %z.
    
    darcs-hash:20071016195449-6cdb2-282aead0b5077d6d80d15d2110c9316b910ff13a


>---------------------------------------------------------------

894b1f8e83bee2e25b93441e01b72953150d5931
 Data/Time/Format.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 64f73ef..5e10cd1 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -37,7 +37,7 @@ class FormatTime t where
 --
 -- For TimeZone (and ZonedTime and UTCTime):
 --
--- [@%z@] timezone offset
+-- [@%z@] timezone offset on the format @-HHMM at .
 --
 -- [@%Z@] timezone name
 --


From git at git.haskell.org  Sun Dec 20 07:51:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:46 +0000 (UTC)
Subject: [commit: packages/time] master: Haddock for parseTime and friends.
 (0f2e21b)
Message-ID: <20151220075146.451693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0f2e21b7e9a01b5deea2ece7173b91d45a145c30

>---------------------------------------------------------------

commit 0f2e21b7e9a01b5deea2ece7173b91d45a145c30
Author: bjorn <bjorn at bringert.net>
Date:   Tue Oct 16 13:19:31 2007 -0700

    Haddock for parseTime and friends.
    
    darcs-hash:20071016201931-6cdb2-3cfa3dd21381bb0fd52398f717d5ba9ad4eaa7b2


>---------------------------------------------------------------

0f2e21b7e9a01b5deea2ece7173b91d45a145c30
 Data/Time/Format/Parse.hs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 7e4c319..c4a258d 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -36,8 +36,15 @@ class ParseTime t where
                                  -- corresponding part of the input.
               -> t
 
--- | Parse a time value given a format string. Supports the same %-codes as
--- 'formatTime'.
+-- | Parses a time value given a format string. Supports the same %-codes as
+-- 'formatTime'. Leading and trailing whitespace is accepted.
+-- Some variations in the input are accepted:
+--
+-- [@%z@] accepts any of @-HHMM@ or @-HH:MM at .
+--
+-- [@%Z@] accepts any string of upper case letters, or any
+-- of the formats accepted by @%z at .
+--
 parseTime :: ParseTime t =>
              TimeLocale -- ^ Time locale.
           -> String     -- ^ Format string.
@@ -49,8 +56,7 @@ parseTime l fmt s = case readsTime l fmt s of
                       _        -> Nothing
 
 -- | Parse a time value given a format string. Fails if the input could
--- not be parsed using the given format. Supports the same %-codes as
--- 'formatTime'.
+-- not be parsed using the given format. See 'parseTime' for details.
 readTime :: ParseTime t =>
             TimeLocale -- ^ Time locale.
          -> String     -- ^ Format string.
@@ -61,8 +67,7 @@ readTime l fmt s = case readsTime l fmt s of
                       [(_,x)]  -> error $ "readTime: junk at end of " ++ show x
                       _        -> error $ "readsTime: bad input " ++ show s
 
--- | Parse a time value given a format string. Supports the same %-codes as
--- 'formatTime'.
+-- | Parse a time value given a format string.  See 'parseTime' for details.
 readsTime :: ParseTime t =>
              TimeLocale -- ^ Time locale.
           -> String     -- ^ Format string


From git at git.haskell.org  Sun Dec 20 07:51:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:48 +0000 (UTC)
Subject: [commit: packages/time] master: Use configurations to allow building
 with ghc-6.6, 6.8 (eff99ca)
Message-ID: <20151220075148.4E2B83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/eff99ca5fd0da086e3fcb75203ff3d76fc4f2d00

>---------------------------------------------------------------

commit eff99ca5fd0da086e3fcb75203ff3d76fc4f2d00
Author: Duncan Coutts <duncan at haskell.org>
Date:   Thu Oct 18 10:38:27 2007 -0700

    Use configurations to allow building with ghc-6.6, 6.8
    
    Specify build-type: Custom since there is test code in Setup.hs
    
    darcs-hash:20071018173827-adfee-6a7bc524d8bade80a2276c809006e48faeb701dd


>---------------------------------------------------------------

eff99ca5fd0da086e3fcb75203ff3d76fc4f2d00
 time.cabal | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/time.cabal b/time.cabal
index f9c0c17..e2c477e 100644
--- a/time.cabal
+++ b/time.cabal
@@ -8,6 +8,8 @@ Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
 Synopsis:	time library
 Category:
+Build-Type:     Custom
+Cabal-Version:  >=1.2
 
 Extra-Source-Files:
         aclocal.m4 configure.ac configure
@@ -16,11 +18,16 @@ Extra-Tmp-Files:
         config.log config.status autom4te.cache
         include/HsTimeConfig.h
 
+Flag split-base
+
 Library {
-    Build-Depends: base, old-locale
-    if os(mingw32) {
+    Build-Depends: base >= 2
+    if flag(split-base)
+       Build-Depends: base >= 3, old-locale
+    else
+       Build-Depends: base < 3
+    if os(windows)
         Build-Depends: Win32
-    }
     Exposed-Modules:
         Data.Time.Calendar,
         Data.Time.Calendar.MonthDay,


From git at git.haskell.org  Sun Dec 20 07:51:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:50 +0000 (UTC)
Subject: [commit: packages/time] master: Bump version number (39c0eef)
Message-ID: <20151220075150.53F0F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/39c0eef062a890c38565b4d2ff65494d6c9b87b8

>---------------------------------------------------------------

commit 39c0eef062a890c38565b4d2ff65494d6c9b87b8
Author: Ian Lynagh <igloo at earth.li>
Date:   Sat Oct 27 05:49:20 2007 -0700

    Bump version number
    
    darcs-hash:20071027124920-3fd76-1e1832bf4e7b70abd50fd5f502f04781e30836b2


>---------------------------------------------------------------

39c0eef062a890c38565b4d2ff65494d6c9b87b8
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index e2c477e..0e7c244 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	1.1.1
+Version:	1.1.2.0
 Stability:	stable
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:51:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:52 +0000 (UTC)
Subject: [commit: packages/time] master: document how to get a POSIXTime from
 an EpochTime or CTime. (2869c91)
Message-ID: <20151220075152.5AE713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2869c91e34012c0dc1834db50c79b5e68d4b95f2

>---------------------------------------------------------------

commit 2869c91e34012c0dc1834db50c79b5e68d4b95f2
Author: Simon Marlow <simonmar at microsoft.com>
Date:   Wed Dec 5 01:15:37 2007 -0800

    document how to get a POSIXTime from an EpochTime or CTime.
    
    darcs-hash:20071205091537-760e2-5c6cf6c587c9f72fe962cedd4a33b764a627016d


>---------------------------------------------------------------

2869c91e34012c0dc1834db50c79b5e68d4b95f2
 Data/Time/Clock/POSIX.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Data/Time/Clock/POSIX.hs b/Data/Time/Clock/POSIX.hs
index b877bf7..84137c1 100644
--- a/Data/Time/Clock/POSIX.hs
+++ b/Data/Time/Clock/POSIX.hs
@@ -24,6 +24,9 @@ posixDayLength :: NominalDiffTime
 posixDayLength = 86400
 
 -- | POSIX time is the nominal time since 1970-01-01 00:00 UTC
+-- 
+-- To convert from a 'Foreign.C.CTime' or 'System.Posix.EpochTime', use 'realToFrac'.
+--
 type POSIXTime = NominalDiffTime
 
 unixEpochDay :: Day


From git at git.haskell.org  Sun Dec 20 07:51:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:54 +0000 (UTC)
Subject: [commit: packages/time] master: Figure out timezone offset from
 timezone name (3c404c3)
Message-ID: <20151220075154.62C823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3c404c3416cd4610b1189b1b40193e5617a143eb

>---------------------------------------------------------------

commit 3c404c3416cd4610b1189b1b40193e5617a143eb
Author: David Leuschner <david at loisch.de>
Date:   Sat Feb 2 03:33:17 2008 -0800

    Figure out timezone offset from timezone name
    
    darcs-hash:20080202113317-3c698-73870973cd45d7f9ca67476c4d46e39db79e8402


>---------------------------------------------------------------

3c404c3416cd4610b1189b1b40193e5617a143eb
 Data/Time/Format/Parse.hs | 232 ++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 226 insertions(+), 6 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3c404c3416cd4610b1189b1b40193e5617a143eb

From git at git.haskell.org  Sun Dec 20 07:51:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:56 +0000 (UTC)
Subject: [commit: packages/time] master: Bump version to 1.1.2.1 (71f2aa9)
Message-ID: <20151220075156.698FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/71f2aa9d7792783ae7fe4dc19f1d90bfa92f380d

>---------------------------------------------------------------

commit 71f2aa9d7792783ae7fe4dc19f1d90bfa92f380d
Author: Ian Lynagh <igloo at earth.li>
Date:   Wed Jun 4 05:13:53 2008 -0700

    Bump version to 1.1.2.1
    
    darcs-hash:20080604121353-3fd76-d2a8d0737dfac619589ac8d511c9712259c7a7a8


>---------------------------------------------------------------

71f2aa9d7792783ae7fe4dc19f1d90bfa92f380d
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 0e7c244..43cf8a0 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	1.1.2.0
+Version:	1.1.2.1
 Stability:	stable
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:51:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:51:58 +0000 (UTC)
Subject: [commit: packages/time] master: Remove -Wall and -Werror,
 they don't belong here (c46f680)
Message-ID: <20151220075158.6FB3A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c46f680fc0d2eec0a2c85b344478010097bcb05a

>---------------------------------------------------------------

commit c46f680fc0d2eec0a2c85b344478010097bcb05a
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Thu Jun 19 07:12:19 2008 -0700

    Remove -Wall and -Werror, they don't belong here
    
    this fixes GHC HEAD right now, which generates a warning for -ffi.
    
    darcs-hash:20080619141219-12142-2fdb57eb762347e667e8e5d1ed92e82afd5ef599


>---------------------------------------------------------------

c46f680fc0d2eec0a2c85b344478010097bcb05a
 Data/Time/Clock/CTimeval.hs     | 2 +-
 Data/Time/LocalTime/TimeZone.hs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
index 8025bdb..0e83072 100644
--- a/Data/Time/Clock/CTimeval.hs
+++ b/Data/Time/Clock/CTimeval.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -Wall -Werror -cpp #-}
+{-# OPTIONS -ffi -cpp #-}
 
 -- #hide
 module Data.Time.Clock.CTimeval where
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index d80671e..81f15d3 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -Wall -Werror #-}
+{-# OPTIONS -ffi #-}
 
 -- #hide
 module Data.Time.LocalTime.TimeZone


From git at git.haskell.org  Sun Dec 20 07:52:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:00 +0000 (UTC)
Subject: [commit: packages/time] master: Change "accuracy" to "precision".
 (cc3dae0)
Message-ID: <20151220075200.773FB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cc3dae057e2bdcd8423b8beb9b46d2651e114de7

>---------------------------------------------------------------

commit cc3dae057e2bdcd8423b8beb9b46d2651e114de7
Author: Alexander Dunlap <alexander.dunlap at gmail.com>
Date:   Tue Jul 29 11:37:58 2008 -0700

    Change "accuracy" to "precision".
    
    See <http://www.haskell.org/pipermail/libraries/2008-July/010290.html>.
    
    darcs-hash:20080729183758-e80da-955fe221e10854ee27e143cdb282caae7c010d33


>---------------------------------------------------------------

cc3dae057e2bdcd8423b8beb9b46d2651e114de7
 Data/Time/Clock/Scale.hs | 2 +-
 Data/Time/Clock/UTC.hs   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index 053c515..cb3fbee 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -21,7 +21,7 @@ newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (E
 
 -- | This is a length of time, as measured by a clock.
 -- Conversion functions will treat it as seconds.
--- It has an accuracy of 10^-12 s.
+-- It has a precision of 10^-12 s.
 newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord)
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 57daa6b..a76a805 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -39,7 +39,7 @@ instance Ord UTCTime where
 
 -- | This is a length of time, as measured by UTC.
 -- Conversion functions will treat it as seconds.
--- It has an accuracy of 10^-12 s.
+-- It has a precision of 10^-12 s.
 -- It ignores leap-seconds, so it's not necessarily a fixed amount of clock time.
 -- For instance, 23:00 UTC + 2 hours of NominalDiffTime = 01:00 UTC (+ 1 day),
 -- regardless of whether a leap-second intervened.


From git at git.haskell.org  Sun Dec 20 07:52:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:02 +0000 (UTC)
Subject: [commit: packages/time] master: don't warn about orphan instances;
 they're real warnings now (i.e. errors with -Werror) (b010dd2)
Message-ID: <20151220075202.7D6523A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b010dd2b7c8e852a85d4f1c2136f17dad8e33ddf

>---------------------------------------------------------------

commit b010dd2b7c8e852a85d4f1c2136f17dad8e33ddf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Aug 12 00:35:46 2008 -0700

    don't warn about orphan instances; they're real warnings now (i.e. errors with -Werror)
    
    darcs-hash:20080812073546-ac6dd-936d990eb8c2e6293124aec9f646a7988edca214


>---------------------------------------------------------------

b010dd2b7c8e852a85d4f1c2136f17dad8e33ddf
 Data/Time/Calendar/Gregorian.hs  | 2 +-
 Data/Time/Format/Parse.hs        | 2 +-
 Data/Time/LocalTime/LocalTime.hs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Data/Time/Calendar/Gregorian.hs b/Data/Time/Calendar/Gregorian.hs
index 2d3546c..1887838 100644
--- a/Data/Time/Calendar/Gregorian.hs
+++ b/Data/Time/Calendar/Gregorian.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -Wall -Werror #-}
+{-# OPTIONS -Wall -Werror -fno-warn-orphans #-}
 
 -- #hide
 module Data.Time.Calendar.Gregorian
diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 9f97cfd..aa9e2c3 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -Wall -Werror #-}
+{-# OPTIONS -Wall -Werror -fno-warn-orphans #-}
 
 -- #hide
 module Data.Time.Format.Parse 
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index c902bb6..6c8bbb6 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -Wall -Werror #-}
+{-# OPTIONS -Wall -Werror -fno-warn-orphans #-}
 
 -- #hide
 module Data.Time.LocalTime.LocalTime


From git at git.haskell.org  Sun Dec 20 07:52:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:04 +0000 (UTC)
Subject: [commit: packages/time] master: remove -ffi options (in favour of
 -XForeignFunctionInterface) (e581e9c)
Message-ID: <20151220075204.8422D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e581e9cbf1fc840663fa0e154ae99fc476223d5a

>---------------------------------------------------------------

commit e581e9cbf1fc840663fa0e154ae99fc476223d5a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Sep 14 17:19:01 2008 -0700

    remove -ffi options (in favour of -XForeignFunctionInterface)
    
    darcs-hash:20080915001901-ac6dd-48abe6364ead4d30656f5a1ca6a05a854f9bd0fb


>---------------------------------------------------------------

e581e9cbf1fc840663fa0e154ae99fc476223d5a
 Data/Time/Clock/CTimeval.hs | 2 +-
 test/TestEaster.hs          | 2 +-
 test/TestFormat.hs          | 2 +-
 test/TestParseDAT.hs        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
index 0e83072..ab5fd79 100644
--- a/Data/Time/Clock/CTimeval.hs
+++ b/Data/Time/Clock/CTimeval.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -cpp #-}
+{-# OPTIONS -cpp #-}
 
 -- #hide
 module Data.Time.Clock.CTimeval where
diff --git a/test/TestEaster.hs b/test/TestEaster.hs
index 290c066..8aae5ce 100644
--- a/test/TestEaster.hs
+++ b/test/TestEaster.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -Wall -Werror #-}
+{-# OPTIONS -Wall -Werror #-}
 
 module Main where
 
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index ecfa9fa..b827e0a 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -Wall -Werror #-}
+{-# OPTIONS -XForeignFunctionInterface -Wall -Werror #-}
 
 module Main where
 
diff --git a/test/TestParseDAT.hs b/test/TestParseDAT.hs
index ee56d49..181ca08 100644
--- a/test/TestParseDAT.hs
+++ b/test/TestParseDAT.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS -ffi -Wall -Werror #-}
+{-# OPTIONS -Wall -Werror #-}
 
 module Main where
 


From git at git.haskell.org  Sun Dec 20 07:52:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:06 +0000 (UTC)
Subject: [commit: packages/time] master: Add x-follows-version-policy tag
 (230f9ee)
Message-ID: <20151220075206.8B60F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/230f9ee15609e6e5b43d32f71041f18c15857ccb

>---------------------------------------------------------------

commit 230f9ee15609e6e5b43d32f71041f18c15857ccb
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri Oct 10 20:47:42 2008 -0700

    Add x-follows-version-policy tag
    
    darcs-hash:20081011034742-adfee-ceabc7cef114c6bc02d37cba7cdcd56e71e15744


>---------------------------------------------------------------

230f9ee15609e6e5b43d32f71041f18c15857ccb
 time.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/time.cabal b/time.cabal
index 43cf8a0..287ac1a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -10,6 +10,7 @@ Synopsis:	time library
 Category:
 Build-Type:     Custom
 Cabal-Version:  >=1.2
+x-follows-version-policy:
 
 Extra-Source-Files:
         aclocal.m4 configure.ac configure


From git at git.haskell.org  Sun Dec 20 07:52:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:08 +0000 (UTC)
Subject: [commit: packages/time] master: Bump version number to 1.1.2.2
 (3f174bc)
Message-ID: <20151220075208.9168C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3f174bc80dc7342572622da4a83db83fc90e8622

>---------------------------------------------------------------

commit 3f174bc80dc7342572622da4a83db83fc90e8622
Author: Duncan Coutts <duncan at haskell.org>
Date:   Fri Oct 10 20:48:01 2008 -0700

    Bump version number to 1.1.2.2
    
    Only warning and doc changes since the last release
    
    darcs-hash:20081011034801-adfee-f2cb7e23c6e6f767ee8b80bfa30c5fd78fefd7ab


>---------------------------------------------------------------

3f174bc80dc7342572622da4a83db83fc90e8622
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 287ac1a..aad656a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 Name:		time
-Version:	1.1.2.1
+Version:	1.1.2.2
 Stability:	stable
 License:	BSD3
 License-File:	LICENSE


From git at git.haskell.org  Sun Dec 20 07:52:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:10 +0000 (UTC)
Subject: [commit: packages/time] master: Improve meta-data (989fc61)
Message-ID: <20151220075210.9955D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/989fc61698038e6b230ce1c92b63167ccfe979e6

>---------------------------------------------------------------

commit 989fc61698038e6b230ce1c92b63167ccfe979e6
Author: Don Stewart <dons at galois.com>
Date:   Sat Oct 11 15:04:12 2008 -0700

    Improve meta-data
    
    darcs-hash:20081011220412-cba2c-18eac614e5ee4b1c7cc34abf7c6a91d3a28166c0


>---------------------------------------------------------------

989fc61698038e6b230ce1c92b63167ccfe979e6
 time.cabal | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/time.cabal b/time.cabal
index aad656a..3b3dcde 100644
--- a/time.cabal
+++ b/time.cabal
@@ -6,8 +6,9 @@ License-File:	LICENSE
 Author:		Ashley Yakeley
 Maintainer:	<ashley at semantic.org>
 Homepage:	http://semantic.org/TimeLib/
-Synopsis:	time library
-Category:
+Synopsis:	 A time library
+Description: A time library
+Category:   System
 Build-Type:     Custom
 Cabal-Version:  >=1.2
 x-follows-version-policy:


From git at git.haskell.org  Sun Dec 20 07:52:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:12 +0000 (UTC)
Subject: [commit: packages/time] master: Ix instance for Day. This is useful
 for e.g. storing daily tabulated data in arrays. (b94d3b7)
Message-ID: <20151220075212.9E8513A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b94d3b7c106b06acd57822dee8bf464022c3e53c

>---------------------------------------------------------------

commit b94d3b7c106b06acd57822dee8bf464022c3e53c
Author: Bjorn Buckwalter <bjorn.buckwalter at gmail.com>
Date:   Sat Nov 29 18:22:54 2008 -0800

    Ix instance for Day. This is useful for e.g. storing daily tabulated data in arrays.
    
    darcs-hash:20081130022254-03283-3e7adc8ff05bff3fb416856f6a1e58697a073cf6


>---------------------------------------------------------------

b94d3b7c106b06acd57822dee8bf464022c3e53c
 Data/Time/Calendar/Days.hs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index 9d91db0..2e62400 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -5,6 +5,8 @@ module Data.Time.Calendar.Days
 	Day(..),addDays,diffDays
 ) where
 
+import Data.Ix
+
 -- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17.
 newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Ord)
 
@@ -19,6 +21,13 @@ instance Enum Day where
 	enumFromTo (ModifiedJulianDay a) (ModifiedJulianDay b) = fmap ModifiedJulianDay (enumFromTo a b)
 	enumFromThenTo (ModifiedJulianDay a) (ModifiedJulianDay b) (ModifiedJulianDay c) = fmap ModifiedJulianDay (enumFromThenTo a b c)
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance Ix Day where
+	range (ModifiedJulianDay a,ModifiedJulianDay b) = fmap ModifiedJulianDay (range (a,b))
+	index (ModifiedJulianDay a,ModifiedJulianDay b) (ModifiedJulianDay c) = index (a,b) c
+	inRange (ModifiedJulianDay a,ModifiedJulianDay b) (ModifiedJulianDay c) = inRange (a,b) c
+	rangeSize (ModifiedJulianDay a,ModifiedJulianDay b) = rangeSize (a,b)
+
 addDays :: Integer -> Day -> Day
 addDays n (ModifiedJulianDay a) = ModifiedJulianDay (a + n)
 


From git at git.haskell.org  Sun Dec 20 07:52:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:14 +0000 (UTC)
Subject: [commit: packages/time] master: fix warnings; fix tests;
 remove GHC cruft; bump to 1.1.2.3 (578a832)
Message-ID: <20151220075214.A721C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/578a832dbdba861430513fa4ef6c778af722fe37

>---------------------------------------------------------------

commit 578a832dbdba861430513fa4ef6c778af722fe37
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jan 4 14:37:28 2009 -0800

    fix warnings; fix tests; remove GHC cruft; bump to 1.1.2.3
    
    darcs-hash:20090104223728-ac6dd-4019748e20d222ef709e509c98869e59c238b2aa


>---------------------------------------------------------------

578a832dbdba861430513fa4ef6c778af722fe37
 Data/Time/LocalTime/TimeZone.hs |   2 +-
 Setup.hs                        |   2 +-
 configure.ac                    |   2 +-
 include/Makefile                |  11 -
 prologue.txt                    |   2 -
 test/TestParseTime.hs           |   2 +-
 time.cabal                      |   2 +-
 time.xcodeproj/cabalbuild       |   8 -
 time.xcodeproj/fixerrormsgs     |  10 -
 time.xcodeproj/project.pbxproj  | 441 ----------------------------------------
 10 files changed, 5 insertions(+), 477 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 578a832dbdba861430513fa4ef6c778af722fe37

From git at git.haskell.org  Sun Dec 20 07:52:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:16 +0000 (UTC)
Subject: [commit: packages/time] master: fix Julian haddock docs (6a4e1ea)
Message-ID: <20151220075216.AE16A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/6a4e1ea5f1a477ded35b7eedec59a55b18cbc4b1

>---------------------------------------------------------------

commit 6a4e1ea5f1a477ded35b7eedec59a55b18cbc4b1
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jan 4 14:43:39 2009 -0800

    fix Julian haddock docs
    
    darcs-hash:20090104224339-ac6dd-d7e1a83ebcdace7c2f9638aa855efc18f9b6b0ae


>---------------------------------------------------------------

6a4e1ea5f1a477ded35b7eedec59a55b18cbc4b1
 Data/Time/Calendar/JulianYearDay.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Time/Calendar/JulianYearDay.hs b/Data/Time/Calendar/JulianYearDay.hs
index ba10c8f..26e4660 100644
--- a/Data/Time/Calendar/JulianYearDay.hs
+++ b/Data/Time/Calendar/JulianYearDay.hs
@@ -10,7 +10,7 @@ module Data.Time.Calendar.JulianYearDay
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Private
 
--- | convert to ISO 8601 Ordinal Day format. First element of result is year (proleptic Gregoran calendar),
+-- | convert to proleptic Julian year and day format. First element of result is year (proleptic Julian calendar),
 -- second is the day of the year, with 1 for Jan 1, and 365 (or 366 in leap years) for Dec 31.
 toJulianYearAndDay :: Day -> (Integer,Int)
 toJulianYearAndDay (ModifiedJulianDay mjd) = (year,yd) where
@@ -21,18 +21,18 @@ toJulianYearAndDay (ModifiedJulianDay mjd) = (year,yd) where
 	yd = fromInteger (d - (y * 365) + 1)
 	year = quad * 4 + y + 1
 
--- | convert from ISO 8601 Ordinal Day format.
+-- | convert from proleptic Julian year and day format.
 -- Invalid day numbers will be clipped to the correct range (1 to 365 or 366).
 fromJulianYearAndDay :: Integer -> Int -> Day
 fromJulianYearAndDay year day = ModifiedJulianDay mjd where
 	y = year - 1
 	mjd = (fromIntegral (clip 1 (if isJulianLeapYear year then 366 else 365) day)) + (365 * y) + (div y 4) - 678578
 
--- | show in ISO 8601 Ordinal Day format (yyyy-ddd)
+-- | show in proleptic Julian year and day format (yyyy-ddd)
 showJulianYearAndDay :: Day -> String
 showJulianYearAndDay date = (show4 y) ++ "-" ++ (show3 d) where
 	(y,d) = toJulianYearAndDay date
 
--- | Is this year a leap year according to the proleptic Gregorian calendar?
+-- | Is this year a leap year according to the proleptic Julian calendar?
 isJulianLeapYear :: Integer -> Bool
 isJulianLeapYear year = (mod year 4 == 0)


From git at git.haskell.org  Sun Dec 20 07:52:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:18 +0000 (UTC)
Subject: [commit: packages/time] master: add Makefile for development building;
 remove OPTIONS -Wall -Werror in each file (a8f5da7)
Message-ID: <20151220075218.B855B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a8f5da7d9d7d32114977b566f1f0f0546e07c219

>---------------------------------------------------------------

commit a8f5da7d9d7d32114977b566f1f0f0546e07c219
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jan 4 15:03:18 2009 -0800

    add Makefile for development building; remove OPTIONS -Wall -Werror in each file
    
    darcs-hash:20090104230318-ac6dd-8719d86331f9b46e617e53665bc12e6e067c21f9


>---------------------------------------------------------------

a8f5da7d9d7d32114977b566f1f0f0546e07c219
 Data/Time.hs                        |  2 --
 Data/Time/Calendar.hs               |  2 --
 Data/Time/Calendar/Days.hs          |  2 --
 Data/Time/Calendar/Easter.hs        |  2 --
 Data/Time/Calendar/Gregorian.hs     |  3 ++-
 Data/Time/Calendar/Julian.hs        |  2 --
 Data/Time/Calendar/JulianYearDay.hs |  2 --
 Data/Time/Calendar/MonthDay.hs      |  2 --
 Data/Time/Calendar/OrdinalDate.hs   |  2 --
 Data/Time/Calendar/Private.hs       |  2 --
 Data/Time/Calendar/WeekDate.hs      |  2 --
 Data/Time/Clock.hs                  |  2 --
 Data/Time/Clock/CTimeval.hs         |  2 --
 Data/Time/Clock/POSIX.hs            |  2 --
 Data/Time/Clock/Scale.hs            |  2 --
 Data/Time/Clock/TAI.hs              |  2 --
 Data/Time/Clock/UTC.hs              |  2 --
 Data/Time/Clock/UTCDiff.hs          |  2 --
 Data/Time/Format.hs                 |  2 --
 Data/Time/Format/Parse.hs           |  2 +-
 Data/Time/LocalTime.hs              |  2 --
 Data/Time/LocalTime/LocalTime.hs    |  3 ++-
 Data/Time/LocalTime/TimeOfDay.hs    |  2 --
 Makefile                            | 29 +++++++++++++++++++++++++++++
 24 files changed, 34 insertions(+), 43 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc a8f5da7d9d7d32114977b566f1f0f0546e07c219

From git at git.haskell.org  Sun Dec 20 07:52:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:20 +0000 (UTC)
Subject: [commit: packages/time] master: prop_name helper for defining named
 properties. (c8bba9b)
Message-ID: <20151220075220.BEB953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c8bba9b75c9ea49bfa955a2c5913b5322446923d

>---------------------------------------------------------------

commit c8bba9b75c9ea49bfa955a2c5913b5322446923d
Author: Bjorn Buckwalter <bjorn.buckwalter at gmail.com>
Date:   Sat Jan 17 17:10:08 2009 -0800

    prop_name helper for defining named properties.
    
    darcs-hash:20090118011008-03283-d383aaaec1c96d8ca8a0f23ca2464d29e6e7d428


>---------------------------------------------------------------

c8bba9b75c9ea49bfa955a2c5913b5322446923d
 test/TestParseTime.hs | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 8e313ba..11b8787 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -124,14 +124,17 @@ prop_fromSundayStartWeek d =
 -- * format and parse 
 --
 
+-- | Helper for defining named properties.
+prop_named :: (Arbitrary t, Show t, Testable a)
+           => String -> (FormatString s -> t -> a) -> String -> FormatString s -> NamedProperty
+prop_named name prop typeName f = (name ++ " " ++ typeName ++ " " ++ show f, property (prop f))
+
 prop_parse_format :: (Eq t, FormatTime t, ParseTime t) => FormatString t -> t -> Bool
 prop_parse_format (FormatString f) t = parse f (format f t) == Just t
 
 prop_parse_format_named :: (Arbitrary t, Eq t, Show t, FormatTime t, ParseTime t) 
                            => String -> FormatString t -> NamedProperty
-prop_parse_format_named typeName f = 
-    ("prop_parse_format " ++ typeName ++ " " ++ show f, 
-     property (prop_parse_format f))
+prop_parse_format_named = prop_named "prop_parse_format" prop_parse_format
 
 prop_format_parse_format :: (FormatTime t, ParseTime t) => FormatString t -> t -> Bool
 prop_format_parse_format (FormatString f) t = 
@@ -139,9 +142,7 @@ prop_format_parse_format (FormatString f) t =
 
 prop_format_parse_format_named :: (Arbitrary t, Show t, FormatTime t, ParseTime t) 
                                   => String -> FormatString t -> NamedProperty
-prop_format_parse_format_named typeName f = 
-    ("prop_format_parse_format " ++ typeName ++ " " ++ show f, 
-     property (prop_format_parse_format f))
+prop_format_parse_format_named = prop_named "prop_format_parse_format" prop_format_parse_format
 
 --
 -- * crashes in parse
@@ -166,9 +167,7 @@ prop_no_crash_bad_input fs@(FormatString f) (Input s) = property $
   where 
 prop_no_crash_bad_input_named :: (Eq t, ParseTime t)
                                  => String -> FormatString t -> NamedProperty
-prop_no_crash_bad_input_named typeName f = 
-    ("prop_no_crash_bad_input " ++ typeName ++ " " ++ show f, 
-     property (prop_no_crash_bad_input f))
+prop_no_crash_bad_input_named = prop_named "prop_no_crash_bad_input" prop_no_crash_bad_input
 
 --
 --


From git at git.haskell.org  Sun Dec 20 07:52:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:22 +0000 (UTC)
Subject: [commit: packages/time] master: Properties for testing
 case-insensitivity. (bd8607f)
Message-ID: <20151220075222.C61A93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/bd8607fd727c79c066aeae398104eee74b3faa53

>---------------------------------------------------------------

commit bd8607fd727c79c066aeae398104eee74b3faa53
Author: Bjorn Buckwalter <bjorn.buckwalter at gmail.com>
Date:   Sun Jan 18 13:51:43 2009 -0800

    Properties for testing case-insensitivity.
    
    Note that not all formats being tested have alphabetical characters. The additional testing of those is "wasteful".
    
    darcs-hash:20090118215143-03283-5ed4f9ba7cdc8fa09afdb4584e52ac017c4421db


>---------------------------------------------------------------

bd8607fd727c79c066aeae398104eee74b3faa53
 test/TestParseTime.hs | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 11b8787..76b897a 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -136,6 +136,22 @@ prop_parse_format_named :: (Arbitrary t, Eq t, Show t, FormatTime t, ParseTime t
                            => String -> FormatString t -> NamedProperty
 prop_parse_format_named = prop_named "prop_parse_format" prop_parse_format
 
+-- Verify case-insensitivity with upper case.
+prop_parse_format_upper :: (Eq t, FormatTime t, ParseTime t) => FormatString t -> t -> Bool
+prop_parse_format_upper (FormatString f) t = parse f (map toUpper $ format f t) == Just t
+
+prop_parse_format_upper_named :: (Arbitrary t, Eq t, Show t, FormatTime t, ParseTime t) 
+                              => String -> FormatString t -> NamedProperty
+prop_parse_format_upper_named = prop_named "prop_parse_format_upper" prop_parse_format_upper
+
+-- Verify case-insensitivity with lower case.
+prop_parse_format_lower :: (Eq t, FormatTime t, ParseTime t) => FormatString t -> t -> Bool
+prop_parse_format_lower (FormatString f) t = parse f (map toLower $ format f t) == Just t
+
+prop_parse_format_lower_named :: (Arbitrary t, Eq t, Show t, FormatTime t, ParseTime t) 
+                              => String -> FormatString t -> NamedProperty
+prop_parse_format_lower_named = prop_named "prop_parse_format_lower" prop_parse_format_lower
+
 prop_format_parse_format :: (FormatTime t, ParseTime t) => FormatString t -> t -> Bool
 prop_format_parse_format (FormatString f) t = 
     fmap (format f) (parse f (format f t) `asTypeOf` Just t) == Just (format f t)
@@ -207,6 +223,20 @@ properties =
  ++ map (prop_parse_format_named "ZonedTime") zonedTimeFormats
  ++ map (prop_parse_format_named "UTCTime") utcTimeFormats
 
+ ++ map (prop_parse_format_upper_named "Day") dayFormats
+ ++ map (prop_parse_format_upper_named "TimeOfDay") timeOfDayFormats
+ ++ map (prop_parse_format_upper_named "LocalTime") localTimeFormats
+ ++ map (prop_parse_format_upper_named "TimeZone") timeZoneFormats
+ ++ map (prop_parse_format_upper_named "ZonedTime") zonedTimeFormats
+ ++ map (prop_parse_format_upper_named "UTCTime") utcTimeFormats
+
+ ++ map (prop_parse_format_lower_named "Day") dayFormats
+ ++ map (prop_parse_format_lower_named "TimeOfDay") timeOfDayFormats
+ ++ map (prop_parse_format_lower_named "LocalTime") localTimeFormats
+ ++ map (prop_parse_format_lower_named "TimeZone") timeZoneFormats
+ ++ map (prop_parse_format_lower_named "ZonedTime") zonedTimeFormats
+ ++ map (prop_parse_format_lower_named "UTCTime") utcTimeFormats
+
  ++ map (prop_format_parse_format_named "Day") partialDayFormats
  ++ map (prop_format_parse_format_named "TimeOfDay") partialTimeOfDayFormats
  ++ map (prop_format_parse_format_named "LocalTime") partialLocalTimeFormats


From git at git.haskell.org  Sun Dec 20 07:52:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:24 +0000 (UTC)
Subject: [commit: packages/time] master: Case-insensitive parsing. (781548a)
Message-ID: <20151220075224.CDF263A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/781548a552f78bba54abcdd2e3fb178786bdf547

>---------------------------------------------------------------

commit 781548a552f78bba54abcdd2e3fb178786bdf547
Author: Bjorn Buckwalter <bjorn.buckwalter at gmail.com>
Date:   Sun Jan 18 13:54:47 2009 -0800

    Case-insensitive parsing.
    
    Note that when a TimeZone is parsed the timeZoneName is converted to upper case. The capitalization of the input could just as easily be preserved instead. It is unclear whether there is any clear advantage to either option.
    
    darcs-hash:20090118215447-03283-5df560167dff9f5cfaa4a40988befc60b0029696


>---------------------------------------------------------------

781548a552f78bba54abcdd2e3fb178786bdf547
 Data/Time/Format/Parse.hs | 49 +++++++++++++++++++++++++++++++----------------
 1 file changed, 32 insertions(+), 17 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 7218bfb..1aaf0d0 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -22,7 +22,23 @@ import Data.List
 import Data.Maybe
 import Data.Ratio
 import System.Locale
-import Text.ParserCombinators.ReadP
+import Text.ParserCombinators.ReadP hiding (char, string)
+
+
+-- | Case-insensitive version of 'Text.ParserCombinators.ReadP.char'.
+char :: Char -> ReadP Char
+char c = satisfy (\x -> toUpper c == toUpper x)
+-- | Case-insensitive version of 'Text.ParserCombinators.ReadP.string'.
+string :: String -> ReadP String
+string this = do s <- look; scan this s
+  where
+    scan []     _                               = do return this
+    scan (x:xs) (y:ys) | toUpper x == toUpper y = do get; scan xs ys
+    scan _      _                               = do pfail
+-- | Convert string to upper case.
+up :: String -> String
+up = map toUpper
+
 
 -- | The class of types which can be parsed given a UNIX-style time format
 -- string.
@@ -37,12 +53,12 @@ class ParseTime t where
               -> t
 
 -- | Parses a time value given a format string. Supports the same %-codes as
--- 'formatTime'. Leading and trailing whitespace is accepted.
--- Some variations in the input are accepted:
+-- 'formatTime'. Leading and trailing whitespace is accepted. Case is not
+-- significant. Some variations in the input are accepted:
 --
 -- [@%z@] accepts any of @-HHMM@ or @-HH:MM at .
 --
--- [@%Z@] accepts any string of upper case letters, or any
+-- [@%Z@] accepts any string of letters, or any
 -- of the formats accepted by @%z at .
 --
 parseTime :: ParseTime t =>
@@ -116,11 +132,10 @@ parseValue :: TimeLocale -> Char -> ReadP String
 parseValue l c = 
     case c of
       'z' -> numericTZ
-      'Z' -> munch1 isUpper <++
+      'Z' -> munch1 isAlpha <++
              numericTZ <++
              return "" -- produced by %Z for LocalTime
-      'P' -> oneOf (let (am,pm) = amPm l 
-                     in [map toLower am, map toLower pm])
+      'P' -> oneOf (let (am,pm) = amPm l in [am, pm])
       'p' -> oneOf (let (am,pm) = amPm l in [am, pm])
       'H' -> digits 2
       'I' -> digits 2
@@ -191,9 +206,9 @@ instance ParseTime Day where
           -- %C: century (being the first two digits of the year), 00 - 99
           'C' -> [Century (read x)]
           -- %B: month name, long form (fst from months locale), January - December
-          'B' -> [Month (1 + fromJust (elemIndex x (map fst (months l))))]
+          'B' -> [Month (1 + fromJust (elemIndex (up x) (map (up . fst) (months l))))]
           -- %b: month name, short form (snd from months locale), Jan - Dec
-          'b' -> [Month (1 + fromJust (elemIndex x (map snd (months l))))]
+          'b' -> [Month (1 + fromJust (elemIndex (up x) (map (up . snd) (months l))))]
           -- %m: month of year, leading 0 as needed, 01 - 12
           'm' -> [Month (read x)]
           -- %d: day of month, leading 0 as needed, 01 - 31
@@ -213,9 +228,9 @@ instance ParseTime Day where
           -- %u: day for Week Date format, 1 - 7
           'u' -> [WeekDay (read x)]
           -- %a: day of week, short form (snd from wDays locale), Sun - Sat
-          'a' -> [WeekDay (1 + (fromJust (elemIndex x (map snd (wDays l))) + 6) `mod` 7)]
+          'a' -> [WeekDay (1 + (fromJust (elemIndex (up x) (map (up . snd) (wDays l))) + 6) `mod` 7)]
           -- %A: day of week, long form (fst from wDays locale), Sunday - Saturday
-          'A' -> [WeekDay (1 + (fromJust (elemIndex x (map fst (wDays l))) + 6) `mod` 7)]
+          'A' -> [WeekDay (1 + (fromJust (elemIndex (up x) (map (up . fst) (wDays l))) + 6) `mod` 7)]
           -- %U: week number of year, where weeks start on Sunday (as sundayStartWeek), 01 - 53
           'U' -> [Week SundayWeek (read x)]
           -- %w: day of week number, 0 (= Sunday) - 6 (= Saturday)
@@ -248,8 +263,8 @@ instance ParseTime TimeOfDay where
         where
           f t@(TimeOfDay h m s) (c,x) = 
               case c of
-                'P' -> if x == map toLower (fst (amPm l)) then am else pm
-                'p' -> if x ==              fst (amPm l)  then am else pm
+                'P' -> if up x == fst (amPm l) then am else pm
+                'p' -> if up x == fst (amPm l) then am else pm
                 'H' -> TimeOfDay (read x) m s
                 'I' -> TimeOfDay (read x) m s
                 'k' -> TimeOfDay (read x) m s
@@ -280,10 +295,10 @@ instance ParseTime TimeZone where
             case c of
               'z' -> zone
               'Z' | null x           -> t
-                  | isUpper (head x) ->
-                      case lookup x _TIMEZONES_ of
-                        Just (offset', dst') -> TimeZone offset' dst' x
-                        Nothing -> TimeZone offset dst x
+                  | isAlpha (head x) -> let y = up x in
+                      case lookup y _TIMEZONES_ of
+                        Just (offset', dst') -> TimeZone offset' dst' y
+                        Nothing -> TimeZone offset dst y
                   | otherwise        -> zone
               _   -> t
           where zone = TimeZone (readTzOffset x) dst name


From git at git.haskell.org  Sun Dec 20 07:52:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:26 +0000 (UTC)
Subject: [commit: packages/time] master: clean up .cabal;
 first attempt at Windows compilability (1e426ff)
Message-ID: <20151220075226.D492B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1e426fff781e9bee333e4c1d0ffe28ebbe9360b4

>---------------------------------------------------------------

commit 1e426fff781e9bee333e4c1d0ffe28ebbe9360b4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Apr 16 23:36:49 2009 -0700

    clean up .cabal; first attempt at Windows compilability
    
    darcs-hash:20090417063649-ac6dd-223499b4d550028c3f5cc97094745c4eb72ca60e


>---------------------------------------------------------------

1e426fff781e9bee333e4c1d0ffe28ebbe9360b4
 Setup.hs         |  6 +++--
 include/HsTime.h |  4 ++++
 time.cabal       | 69 +++++++++++++++++++++++++++++++-------------------------
 3 files changed, 46 insertions(+), 33 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index 2211a91..ac50db8 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -7,10 +7,12 @@ import Distribution.Simple.LocalBuildInfo
 import Distribution.Simple.Utils
 import System.Cmd
 import System.Directory
+import System.Info
 
 main :: IO ()
-main = do let hooks = autoconfUserHooks { runTests = runTestScript }
-          defaultMainWithHooks hooks
+main = if os == "windows"
+ then defaultMain
+ else let hooks = autoconfUserHooks { runTests = runTestScript } in defaultMainWithHooks hooks
 
 withCurrentDirectory :: FilePath -> IO a -> IO a
 withCurrentDirectory path f = do
diff --git a/include/HsTime.h b/include/HsTime.h
index c02cc53..12d45bd 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -1,6 +1,9 @@
 #ifndef __HSTIME_H__
 #define __HSTIME_H__
 
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+#else
+
 #include "HsTimeConfig.h"
 // Otherwise these clash with similar definitions from other packages:
 #undef PACKAGE_BUGREPORT
@@ -12,6 +15,7 @@
 #if HAVE_TIME_H
 #include <time.h>
 #endif
+#endif
 
 long int get_current_timezone_seconds (time_t,int* pdst,char const* * pname);
 
diff --git a/time.cabal b/time.cabal
index 84b17b5..2850397 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,36 +1,42 @@
-Name:		time
-Version:	1.1.2.3
-Stability:	stable
-License:	BSD3
-License-File:	LICENSE
-Author:		Ashley Yakeley
-Maintainer:	<ashley at semantic.org>
-Homepage:	http://semantic.org/TimeLib/
-Synopsis:	 A time library
-Description: A time library
-Category:   System
-Build-Type:     Custom
-Cabal-Version:  >=1.2
+name:           time
+version:        1.1.2.4
+stability:      stable
+license:        BSD3
+license-file:   LICENSE
+author:         Ashley Yakeley
+maintainer:     <ashley at semantic.org>
+homepage:       http://semantic.org/TimeLib/
+synopsis:       A time library
+description:    A time library
+category:       System
+build-type:  Custom
+cabal-version:   >=1.2
 x-follows-version-policy:
 
-Extra-Source-Files:
-        aclocal.m4 configure.ac configure
-        include/HsTime.h include/HsTimeConfig.h.in
-Extra-Tmp-Files:
-        config.log config.status autom4te.cache
-        include/HsTimeConfig.h
+extra-source-files:
+    aclocal.m4
+    configure.ac
+    configure
+    include/HsTime.h
+    include/HsTimeConfig.h.in
+extra-tmp-files:
+    config.log
+    config.status
+    autom4te.cache
+    include/HsTimeConfig.h
 
-Flag split-base
+flag split-base
 
-Library {
-    Build-Depends: base >= 2
+library
+{
+    build-depends:    base >= 2
     if flag(split-base)
-       Build-Depends: base >= 3, old-locale
+        Build-Depends: base >= 3, old-locale
     else
-       Build-Depends: base < 3
+        Build-Depends: base < 3
     if os(windows)
         Build-Depends: Win32
-    Exposed-Modules:
+    exposed-modules:
         Data.Time.Calendar,
         Data.Time.Calendar.MonthDay,
         Data.Time.Calendar.OrdinalDate,
@@ -43,9 +49,9 @@ Library {
         Data.Time.LocalTime,
         Data.Time.Format,
         Data.Time
-    Extensions:	ForeignFunctionInterface, CPP
-    C-Sources:	cbits/HsTime.c
-    Other-Modules:
+    extensions:    ForeignFunctionInterface, CPP
+    c-sources:    cbits/HsTime.c
+    other-modules:
         Data.Time.Calendar.Private,
         Data.Time.Calendar.Days,
         Data.Time.Calendar.Gregorian,
@@ -58,8 +64,9 @@ Library {
         Data.Time.LocalTime.TimeOfDay,
         Data.Time.LocalTime.LocalTime,
         Data.Time.Format.Parse
-    Include-Dirs:	include
-    Install-Includes:
-        HsTime.h HsTimeConfig.h
+    include-dirs:    include
+    install-includes:
+        HsTime.h
+        HsTimeConfig.h
 }
 


From git at git.haskell.org  Sun Dec 20 07:52:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:28 +0000 (UTC)
Subject: [commit: packages/time] master: get building on Windows (89e52b0)
Message-ID: <20151220075228.DBB9B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/89e52b024e4b9600af3bb30debd6ac43711cdc04

>---------------------------------------------------------------

commit 89e52b024e4b9600af3bb30debd6ac43711cdc04
Author: ashley <ashley at semantic.org>
Date:   Fri Apr 17 00:58:14 2009 -0700

    get building on Windows
    
    Ignore-this: 7f61aa6f76736ff855aa665991f2a2c6
    
    darcs-hash:20090417075814-ca2d0-d459b191878a61b0ac33b05230ecba1d94f93e69


>---------------------------------------------------------------

89e52b024e4b9600af3bb30debd6ac43711cdc04
 Setup.hs         |  7 ++++---
 include/HsTime.h |  3 ++-
 time.cabal       | 10 +++++++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Setup.hs b/Setup.hs
index ac50db8..cdd46de 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -10,9 +10,10 @@ import System.Directory
 import System.Info
 
 main :: IO ()
-main = if os == "windows"
- then defaultMain
- else let hooks = autoconfUserHooks { runTests = runTestScript } in defaultMainWithHooks hooks
+main = case os of
+    "windows" -> defaultMain
+    "mingw32" -> defaultMain
+    _ -> let hooks = autoconfUserHooks { runTests = runTestScript } in defaultMainWithHooks hooks
 
 withCurrentDirectory :: FilePath -> IO a -> IO a
 withCurrentDirectory path f = do
diff --git a/include/HsTime.h b/include/HsTime.h
index 12d45bd..5296437 100644
--- a/include/HsTime.h
+++ b/include/HsTime.h
@@ -2,6 +2,7 @@
 #define __HSTIME_H__
 
 #if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+#define HAVE_TIME_H 1
 #else
 
 #include "HsTimeConfig.h"
@@ -11,11 +12,11 @@
 #undef PACKAGE_STRING
 #undef PACKAGE_TARNAME
 #undef PACKAGE_VERSION
+#endif
 
 #if HAVE_TIME_H
 #include <time.h>
 #endif
-#endif
 
 long int get_current_timezone_seconds (time_t,int* pdst,char const* * pname);
 
diff --git a/time.cabal b/time.cabal
index 2850397..9c74c9e 100644
--- a/time.cabal
+++ b/time.cabal
@@ -65,8 +65,12 @@ library
         Data.Time.LocalTime.LocalTime,
         Data.Time.Format.Parse
     include-dirs:    include
-    install-includes:
-        HsTime.h
-        HsTimeConfig.h
+    if os(windows)
+        install-includes:
+            HsTime.h
+    else
+        install-includes:
+            HsTime.h
+            HsTimeConfig.h
 }
 


From git at git.haskell.org  Sun Dec 20 07:52:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:30 +0000 (UTC)
Subject: [commit: packages/time] master: next version will be 1.1.3 (1b7d9c2)
Message-ID: <20151220075230.E27583A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1b7d9c29efb67bcc7488cb67bd8c964fa1582d1c

>---------------------------------------------------------------

commit 1b7d9c29efb67bcc7488cb67bd8c964fa1582d1c
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Apr 26 17:07:46 2009 -0700

    next version will be 1.1.3
    
    Ignore-this: 5ba6f9cb1bf0e27b3f461f77ac6a9787
    
    darcs-hash:20090427000746-ac6dd-4a8d881865f225955e9445bfc0aa33e3748ac158


>---------------------------------------------------------------

1b7d9c29efb67bcc7488cb67bd8c964fa1582d1c
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 9c74c9e..a5bc5b2 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.1.2.4
+version:        1.1.3
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:52:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:32 +0000 (UTC)
Subject: [commit: packages/time] master: Typeable instances for all types
 (1b0f97e)
Message-ID: <20151220075232.E94453A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1b0f97ef5603d21c23a8db6485e2aeb602196cb5

>---------------------------------------------------------------

commit 1b0f97ef5603d21c23a8db6485e2aeb602196cb5
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Apr 26 17:48:05 2009 -0700

    Typeable instances for all types
    
    Ignore-this: 48421f072110ddf70b09bd4c030af863
    
    darcs-hash:20090427004805-ac6dd-4cf4de606d27096343156c687b2a37991e055312


>---------------------------------------------------------------

1b0f97ef5603d21c23a8db6485e2aeb602196cb5
 Data/Time/Calendar/Days.hs       | 4 ++++
 Data/Time/Clock/Scale.hs         | 7 +++++++
 Data/Time/Clock/TAI.hs           | 4 ++++
 Data/Time/Clock/UTC.hs           | 7 +++++++
 Data/Time/LocalTime/LocalTime.hs | 7 +++++++
 Data/Time/LocalTime/TimeOfDay.hs | 4 ++++
 Data/Time/LocalTime/TimeZone.hs  | 4 ++++
 7 files changed, 37 insertions(+)

diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index 2e62400..ad493c4 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -6,10 +6,14 @@ module Data.Time.Calendar.Days
 ) where
 
 import Data.Ix
+import Data.Typeable
 
 -- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17.
 newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Ord)
 
+instance Typeable Day where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Calendar.Days.Day") []
+
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum Day where
 	succ (ModifiedJulianDay a) = ModifiedJulianDay (succ a)
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index 30f585b..101b770 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -12,16 +12,23 @@ module Data.Time.Clock.Scale
 
 import Data.Ratio ((%))
 import Data.Fixed
+import Data.Typeable
 
 -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
 -- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles.
 newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (Eq,Ord)
 
+instance Typeable UniversalTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.UniversalTime") []
+
 -- | This is a length of time, as measured by a clock.
 -- Conversion functions will treat it as seconds.
 -- It has a precision of 10^-12 s.
 newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord)
 
+instance Typeable DiffTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.DiffTime") []
+
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum DiffTime where
 	succ (MkDiffTime a) = MkDiffTime (succ a)
diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 835746c..a43e75e 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -16,11 +16,15 @@ module Data.Time.Clock.TAI
 import Data.Time.LocalTime
 import Data.Time.Calendar.Days
 import Data.Time.Clock
+import Data.Typeable
 import Data.Fixed
 
 -- | AbsoluteTime is TAI, time as measured by a clock.
 newtype AbsoluteTime = MkAbsoluteTime {unAbsoluteTime :: DiffTime} deriving (Eq,Ord)
 
+instance Typeable AbsoluteTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.TAI.AbsoluteTime") []
+
 instance Show AbsoluteTime where
 	show t = show (utcToLocalTime utc (taiToUTCTime (const 0) t)) ++ " TAI" -- ugly, but standard apparently
 
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index e28ce77..74df8d7 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -16,6 +16,7 @@ module Data.Time.Clock.UTC
 import Data.Time.Calendar.Days
 import Data.Time.Clock.Scale
 import Data.Fixed
+import Data.Typeable
 
 -- | This is the simplest representation of UTC.
 -- It consists of the day number, and a time offset from midnight.
@@ -27,6 +28,9 @@ data UTCTime = UTCTime {
 	utctDayTime :: DiffTime
 }
 
+instance Typeable UTCTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.UTCTime") []
+
 instance Eq UTCTime where
 	(UTCTime da ta) == (UTCTime db tb) = (da == db) && (ta == tb)
 
@@ -43,6 +47,9 @@ instance Ord UTCTime where
 -- regardless of whether a leap-second intervened.
 newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord)
 
+instance Typeable NominalDiffTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.NominalDiffTime") []
+
 instance Enum NominalDiffTime where
 	succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)
 	pred (MkNominalDiffTime a) = MkNominalDiffTime (pred a)
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 6d8f219..7125a55 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -16,6 +16,7 @@ import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar
 import Data.Time.Clock
+import Data.Typeable
 
 -- | A simple day and time aggregate, where the day is of the specified parameter,
 -- and the time is a TimeOfDay.
@@ -26,6 +27,9 @@ data LocalTime = LocalTime {
 	localTimeOfDay   :: TimeOfDay
 } deriving (Eq,Ord)
 
+instance Typeable LocalTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.LocalTime") []
+
 instance Show LocalTime where
 	show (LocalTime d t) = (showGregorian d) ++ " " ++ (show t)
 
@@ -56,6 +60,9 @@ data ZonedTime = ZonedTime {
 	zonedTimeZone :: TimeZone
 }
 
+instance Typeable ZonedTime where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.ZonedTime") []
+
 utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime
 utcToZonedTime zone time = ZonedTime (utcToLocalTime zone time) zone
 
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index 8134d1d..c0b4608 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -11,6 +11,7 @@ module Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar.Private
 import Data.Time.Clock
+import Data.Typeable
 import Data.Fixed
 
 -- | Time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day.
@@ -24,6 +25,9 @@ data TimeOfDay = TimeOfDay {
 	todSec     :: Pico
 } deriving (Eq,Ord)
 
+instance Typeable TimeOfDay where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeOfDay.TimeOfDay") []
+
 -- | Hour zero
 midnight :: TimeOfDay
 midnight = TimeOfDay 0 0 0
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index da4a9cb..34c85a5 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -17,6 +17,7 @@ import Data.Time.Clock.POSIX
 
 import Foreign
 import Foreign.C
+import Data.Typeable
 
 -- | A TimeZone is a whole number of minutes offset from UTC, together with a name and a \"just for summer\" flag.
 data TimeZone = TimeZone {
@@ -28,6 +29,9 @@ data TimeZone = TimeZone {
 	timeZoneName :: String
 } deriving (Eq,Ord)
 
+instance Typeable TimeZone where
+	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeZone.TimeZone") []
+
 -- | Create a nameless non-summer timezone for this number of minutes
 minutesToTimeZone :: Int -> TimeZone
 minutesToTimeZone m = TimeZone m False ""


From git at git.haskell.org  Sun Dec 20 07:52:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:34 +0000 (UTC)
Subject: [commit: packages/time] master: cap in .cabal (6d9856b)
Message-ID: <20151220075234.F07313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/6d9856b700ad8c10333f344b06ddfa1c4555b8e7

>---------------------------------------------------------------

commit 6d9856b700ad8c10333f344b06ddfa1c4555b8e7
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jun 1 21:04:36 2009 -0700

    cap in .cabal
    
    Ignore-this: edc82bb754c59d5acd39a6d8b4c75cd4
    
    darcs-hash:20090602040436-ac6dd-ae0eacca055d2f75b4d1410707434625c4e288b7


>---------------------------------------------------------------

6d9856b700ad8c10333f344b06ddfa1c4555b8e7
 time.cabal | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/time.cabal b/time.cabal
index a5bc5b2..15bde6b 100644
--- a/time.cabal
+++ b/time.cabal
@@ -31,11 +31,11 @@ library
 {
     build-depends:    base >= 2
     if flag(split-base)
-        Build-Depends: base >= 3, old-locale
+        build-depends: base >= 3, old-locale
     else
-        Build-Depends: base < 3
+        build-depends: base < 3
     if os(windows)
-        Build-Depends: Win32
+        build-depends: Win32
     exposed-modules:
         Data.Time.Calendar,
         Data.Time.Calendar.MonthDay,


From git at git.haskell.org  Sun Dec 20 07:52:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:37 +0000 (UTC)
Subject: [commit: packages/time] master: add validating converters (0cf7847)
Message-ID: <20151220075237.045AD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0cf7847561972882b17979ca1213525f8cba5ae2

>---------------------------------------------------------------

commit 0cf7847561972882b17979ca1213525f8cba5ae2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jun 1 23:51:42 2009 -0700

    add validating converters
    
    Ignore-this: 4b18a44adbcb288e62f8dbce1377be8b
    
    darcs-hash:20090602065142-ac6dd-8e4090d57516369e58f07fbf5872fadd5b30db9c


>---------------------------------------------------------------

0cf7847561972882b17979ca1213525f8cba5ae2
 Data/Time/Calendar/Gregorian.hs     |  9 ++++++++-
 Data/Time/Calendar/Julian.hs        |  9 ++++++++-
 Data/Time/Calendar/JulianYearDay.hs | 10 ++++++++++
 Data/Time/Calendar/MonthDay.hs      | 14 +++++++++++++-
 Data/Time/Calendar/OrdinalDate.hs   | 10 ++++++++++
 Data/Time/Calendar/Private.hs       |  5 +++++
 Data/Time/Calendar/WeekDate.hs      | 14 ++++++++++++++
 test/ConvertBack.hs                 | 17 +++++++++++------
 8 files changed, 79 insertions(+), 9 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0cf7847561972882b17979ca1213525f8cba5ae2

From git at git.haskell.org  Sun Dec 20 07:52:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:39 +0000 (UTC)
Subject: [commit: packages/time] master: use base==4.* (1a31e47)
Message-ID: <20151220075239.0B6073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1a31e473c9c5827233abb7d7eccbd81ffdc16fa2

>---------------------------------------------------------------

commit 1a31e473c9c5827233abb7d7eccbd81ffdc16fa2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Jun 17 01:48:43 2009 -0700

    use base==4.*
    
    Ignore-this: e37c8cafd9ef17ff3eff6980162e41e5
    
    darcs-hash:20090617084843-ac6dd-bb32d062e0f968ce9f7cd3f1cd0ab09732956943


>---------------------------------------------------------------

1a31e473c9c5827233abb7d7eccbd81ffdc16fa2
 time.cabal | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/time.cabal b/time.cabal
index 15bde6b..ef27092 100644
--- a/time.cabal
+++ b/time.cabal
@@ -25,15 +25,9 @@ extra-tmp-files:
     autom4te.cache
     include/HsTimeConfig.h
 
-flag split-base
-
 library
 {
-    build-depends:    base >= 2
-    if flag(split-base)
-        build-depends: base >= 3, old-locale
-    else
-        build-depends: base < 3
+    build-depends: base == 4.*, old-locale
     if os(windows)
         build-depends: Win32
     exposed-modules:


From git at git.haskell.org  Sun Dec 20 07:52:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:41 +0000 (UTC)
Subject: [commit: packages/time] master: add validating constructors (9884b31)
Message-ID: <20151220075241.145343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9884b31fcca197b64f6e356142d9d99e1422ab38

>---------------------------------------------------------------

commit 9884b31fcca197b64f6e356142d9d99e1422ab38
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Jun 17 01:49:36 2009 -0700

    add validating constructors
    
    Ignore-this: e01e75f9d860f34285265b39b20cf225
    
    darcs-hash:20090617084936-ac6dd-5ecf266acb8e2dabaa0b7a33fc2cda0cf6d44727


>---------------------------------------------------------------

9884b31fcca197b64f6e356142d9d99e1422ab38
 Data/Time/Calendar/OrdinalDate.hs | 31 +++++++++++++++++++++++++++++++
 Data/Time/LocalTime/TimeOfDay.hs  |  9 ++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)

diff --git a/Data/Time/Calendar/OrdinalDate.hs b/Data/Time/Calendar/OrdinalDate.hs
index 327c561..4e5b2b9 100644
--- a/Data/Time/Calendar/OrdinalDate.hs
+++ b/Data/Time/Calendar/OrdinalDate.hs
@@ -79,6 +79,21 @@ fromMondayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
           -- 0-based year day of first monday of the year
           firstMonday = (5 - firstDay) `mod` 7
 
+fromMondayStartWeekValid :: Integer -- ^ Year.
+                    -> Int     -- ^ Monday-starting week number.
+                    -> Int     -- ^ Day of week. 
+                               -- Monday is 1, Sunday is 7 (as \"%u\" in 'Data.Time.Format.formatTime').
+                    -> Maybe Day
+fromMondayStartWeekValid year w d = do
+	d' <- clipValid 1 7 d
+	-- first day of the year
+	let firstDay = toModifiedJulianDay (fromOrdinalDate year 1)
+	-- 0-based year day of first monday of the year
+	let firstMonday = (5 - firstDay) `mod` 7
+	let yd = firstMonday + 7 * toInteger (w-1) + toInteger d'
+	yd' <- clipValid 1 (if isLeapYear year then 366 else 365) yd
+	return (ModifiedJulianDay (firstDay - 1 + yd'))
+
 -- | The inverse of 'sundayStartWeek'. Get a 'Day' given the year and
 -- the number of the day of a Sunday-starting week.
 -- The first Sunday is the first day of week 1, any earlier days in the 
@@ -94,3 +109,19 @@ fromSundayStartWeek y w d = ModifiedJulianDay (firstDay + yd)
           firstDay = toModifiedJulianDay (fromOrdinalDate y 1)
           -- 0-based year day of first sunday of the year
           firstSunday = (4 - firstDay) `mod` 7
+
+fromSundayStartWeekValid :: Integer -- ^ Year.
+                    -> Int     -- ^ Monday-starting week number.
+                    -> Int     -- ^ Day of week. 
+                               -- Monday is 1, Sunday is 7 (as \"%u\" in 'Data.Time.Format.formatTime').
+                    -> Maybe Day
+fromSundayStartWeekValid year w d = do
+	d' <- clipValid 1 7 d
+	-- first day of the year
+	let firstDay = toModifiedJulianDay (fromOrdinalDate year 1)
+	-- 0-based year day of first sunday of the year
+	let firstMonday = (4 - firstDay) `mod` 7
+	let yd = firstMonday + 7 * toInteger (w-1) + toInteger d'
+	yd' <- clipValid 1 (if isLeapYear year then 366 else 365) yd
+	return (ModifiedJulianDay (firstDay - 1 + yd'))
+
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index c0b4608..9639545 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -2,7 +2,7 @@
 module Data.Time.LocalTime.TimeOfDay
 (
 	-- * Time of day
-	TimeOfDay(..),midnight,midday,
+	TimeOfDay(..),midnight,midday,makeTimeOfDayValid,
 	utcToLocalTimeOfDay,localToUTCTimeOfDay,
 	timeToTimeOfDay,timeOfDayToTime,
 	dayFractionToTimeOfDay,timeOfDayToDayFraction
@@ -39,6 +39,13 @@ midday = TimeOfDay 12 0 0
 instance Show TimeOfDay where
 	show (TimeOfDay h m s) = (show2 h) ++ ":" ++ (show2 m) ++ ":" ++ (show2Fixed s)
 
+makeTimeOfDayValid :: Int -> Int -> Pico -> Maybe TimeOfDay
+makeTimeOfDayValid h m s = do
+	clipValid 0 23 h
+	clipValid 0 59 m
+	clipValid 0 60.999999999999 s
+	return (TimeOfDay h m s)
+
 -- | Convert a ToD in UTC to a ToD in some timezone, together with a day adjustment.
 utcToLocalTimeOfDay :: TimeZone -> TimeOfDay -> (Integer,TimeOfDay)
 utcToLocalTimeOfDay zone (TimeOfDay h m s) = (fromIntegral (div h' 24),TimeOfDay (mod h' 24) (mod m' 60) s) where


From git at git.haskell.org  Sun Dec 20 07:52:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:43 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.1.4 (2c8d2f1)
Message-ID: <20151220075243.1AE613A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2c8d2f18f7ac245413c03b10589f0a9c479b03f7

>---------------------------------------------------------------

commit 2c8d2f18f7ac245413c03b10589f0a9c479b03f7
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Jul 11 00:50:07 2009 -0700

    version 1.1.4
    
    Ignore-this: e431293abfeda1f8459f0b737d23fd7b
    
    darcs-hash:20090711075007-ac6dd-296363021486c36779a7414beb5df74b6891096d


>---------------------------------------------------------------

2c8d2f18f7ac245413c03b10589f0a9c479b03f7
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index ef27092..943570a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.1.3
+version:        1.1.4
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:52:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:45 +0000 (UTC)
Subject: [commit: packages/time] master: formatTime: glibc-style modifier
 flags (2dc3703)
Message-ID: <20151220075245.230693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2dc370310ded2f5d49393b15aa06cb5fe37a5fe4

>---------------------------------------------------------------

commit 2dc370310ded2f5d49393b15aa06cb5fe37a5fe4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Jul 11 01:01:32 2009 -0700

    formatTime: glibc-style modifier flags
    
    Ignore-this: 8331c2248a9b7613bec5547b491345e4
    
    darcs-hash:20090711080132-ac6dd-d47e07a220f2aeb88b27e621fdcf3c3498fb8875


>---------------------------------------------------------------

2dc370310ded2f5d49393b15aa06cb5fe37a5fe4
 Data/Time/Calendar/Gregorian.hs     |   2 +-
 Data/Time/Calendar/Julian.hs        |   2 +-
 Data/Time/Calendar/JulianYearDay.hs |   2 +-
 Data/Time/Calendar/OrdinalDate.hs   |   2 +-
 Data/Time/Calendar/Private.hs       |  48 ++++++------
 Data/Time/Calendar/WeekDate.hs      |   4 +-
 Data/Time/Format.hs                 | 143 ++++++++++++++++++++----------------
 Data/Time/LocalTime/TimeOfDay.hs    |   2 +-
 Data/Time/LocalTime/TimeZone.hs     |  14 ++--
 test/TestFormat.hs                  |  21 +++++-
 10 files changed, 137 insertions(+), 103 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2dc370310ded2f5d49393b15aa06cb5fe37a5fe4

From git at git.haskell.org  Sun Dec 20 07:52:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:47 +0000 (UTC)
Subject: [commit: packages/time] master: update cabal-version constraint
 (2084584)
Message-ID: <20151220075247.2A3593A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2084584ab23d68190b1962a83dce55364fe59fa3

>---------------------------------------------------------------

commit 2084584ab23d68190b1962a83dce55364fe59fa3
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Fri Jul 17 09:02:55 2009 -0700

    update cabal-version constraint
    
    Ignore-this: 8afa55b6e44d52192aca8b1c94e59b4a
    
    The syntax 'base == 4.*' requires cabal version 1.6 or later.
    
    darcs-hash:20090717160255-b47d3-1ea8d54339e500897925ccd5fc60b37769f4e12f


>---------------------------------------------------------------

2084584ab23d68190b1962a83dce55364fe59fa3
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 943570a..b86a5cf 100644
--- a/time.cabal
+++ b/time.cabal
@@ -10,7 +10,7 @@ synopsis:       A time library
 description:    A time library
 category:       System
 build-type:  Custom
-cabal-version:   >=1.2
+cabal-version:   >=1.6
 x-follows-version-policy:
 
 extra-source-files:


From git at git.haskell.org  Sun Dec 20 07:52:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:49 +0000 (UTC)
Subject: [commit: packages/time] master: copyright date (f071372)
Message-ID: <20151220075249.313373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f0713723994cc5ddbcbd7243aaf893ba942fb187

>---------------------------------------------------------------

commit f0713723994cc5ddbcbd7243aaf893ba942fb187
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Apr 10 20:25:06 2010 -0700

    copyright date
    
    Ignore-this: 198dfe29d0077290f955c72688527bc8
    
    darcs-hash:20100411032506-ac6dd-104beb14b3799423c78ee5053baf16cd9dd18c41


>---------------------------------------------------------------

f0713723994cc5ddbcbd7243aaf893ba942fb187
 LICENSE | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/LICENSE b/LICENSE
index af649fe..485d7f6 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-TimeLib is Copyright (c) Ashley Yakeley, 2004-2007.
+TimeLib is Copyright (c) Ashley Yakeley, 2004-2010.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:


From git at git.haskell.org  Sun Dec 20 07:52:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:51 +0000 (UTC)
Subject: [commit: packages/time] master: sort out GHC 6.12 warnings (66ee658)
Message-ID: <20151220075251.3878E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/66ee658898559bfff6f7de50015f4827f5e7a967

>---------------------------------------------------------------

commit 66ee658898559bfff6f7de50015f4827f5e7a967
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Apr 10 20:34:14 2010 -0700

    sort out GHC 6.12 warnings
    
    Ignore-this: f97673c30230c03de97445fbab0e4bf6
    
    darcs-hash:20100411033414-ac6dd-1c96f2e3e15eb0296f7e20aaf5b695b7dff225ef


>---------------------------------------------------------------

66ee658898559bfff6f7de50015f4827f5e7a967
 Data/Time/Format/Parse.hs        | 2 +-
 Data/Time/LocalTime/TimeOfDay.hs | 6 +++---
 Makefile                         | 2 +-
 time.cabal                       | 1 +
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 1aaf0d0..d30d75c 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -33,7 +33,7 @@ string :: String -> ReadP String
 string this = do s <- look; scan this s
   where
     scan []     _                               = do return this
-    scan (x:xs) (y:ys) | toUpper x == toUpper y = do get; scan xs ys
+    scan (x:xs) (y:ys) | toUpper x == toUpper y = do _ <- get; scan xs ys
     scan _      _                               = do pfail
 -- | Convert string to upper case.
 up :: String -> String
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index 8b5ef19..1a360b7 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -41,9 +41,9 @@ instance Show TimeOfDay where
 
 makeTimeOfDayValid :: Int -> Int -> Pico -> Maybe TimeOfDay
 makeTimeOfDayValid h m s = do
-	clipValid 0 23 h
-	clipValid 0 59 m
-	clipValid 0 60.999999999999 s
+	_ <- clipValid 0 23 h
+	_ <- clipValid 0 59 m
+	_ <- clipValid 0 60.999999999999 s
 	return (TimeOfDay h m s)
 
 -- | Convert a ToD in UTC to a ToD in some timezone, together with a day adjustment.
diff --git a/Makefile b/Makefile
index 1b6d17b..d56bf1a 100644
--- a/Makefile
+++ b/Makefile
@@ -9,7 +9,7 @@ configure:
 	cabal configure --enable-library-profiling --enable-executable-profiling
 
 build: configure
-	cabal build --ghc-options="-Wall -Werror"
+	cabal build --ghc-options=-Werror
 
 test: build
 	cabal test
diff --git a/time.cabal b/time.cabal
index b86a5cf..51a77db 100644
--- a/time.cabal
+++ b/time.cabal
@@ -28,6 +28,7 @@ extra-tmp-files:
 library
 {
     build-depends: base == 4.*, old-locale
+    ghc-options: -Wall
     if os(windows)
         build-depends: Win32
     exposed-modules:


From git at git.haskell.org  Sun Dec 20 07:52:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:53 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.2;
 add Data instance, conditional on support (1bf713f)
Message-ID: <20151220075253.40B463A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1bf713fdcc3d3e2e8bb85f261822ba5933c7a7cf

>---------------------------------------------------------------

commit 1bf713fdcc3d3e2e8bb85f261822ba5933c7a7cf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Apr 10 22:19:39 2010 -0700

    version 1.2; add Data instance, conditional on support
    
    Ignore-this: fd76cc60dee7fdee543cf9156d7be919
    
    darcs-hash:20100411051939-ac6dd-28dd1696fee060935dbe26a49da0f53dc0f4490d


>---------------------------------------------------------------

1bf713fdcc3d3e2e8bb85f261822ba5933c7a7cf
 Data/Time/Calendar/Days.hs       | 13 ++++++++++++-
 Data/Time/Clock/Scale.hs         | 21 +++++++++++++++++++--
 Data/Time/Clock/TAI.hs           | 13 ++++++++++++-
 Data/Time/Clock/UTC.hs           | 18 +++++++++++++++++-
 Data/Time/Format/Parse.hs        | 13 ++++++++++++-
 Data/Time/LocalTime/LocalTime.hs | 18 +++++++++++++++++-
 Data/Time/LocalTime/TimeOfDay.hs | 13 ++++++++++++-
 Data/Time/LocalTime/TimeZone.hs  | 13 ++++++++++++-
 time.cabal                       |  9 ++++++++-
 9 files changed, 121 insertions(+), 10 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1bf713fdcc3d3e2e8bb85f261822ba5933c7a7cf

From git at git.haskell.org  Sun Dec 20 07:52:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:55 +0000 (UTC)
Subject: [commit: packages/time] master: fix tests (cec60a0)
Message-ID: <20151220075255.4772F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/cec60a0b5e84c4240d2fe0419b215f6fe3da43dc

>---------------------------------------------------------------

commit cec60a0b5e84c4240d2fe0419b215f6fe3da43dc
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Apr 10 22:40:58 2010 -0700

    fix tests
    
    Ignore-this: 98e1f1b38f6d01fbcaff8ffbc45ec492
    
    darcs-hash:20100411054058-ac6dd-b658c36af21af9caa015dc3fda05bad7f53457fc


>---------------------------------------------------------------

cec60a0b5e84c4240d2fe0419b215f6fe3da43dc
 Makefile              | 2 +-
 test/AddDays.hs       | 1 -
 test/Makefile         | 4 +---
 test/TestParseTime.hs | 1 -
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index d56bf1a..de4898f 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,7 @@ configure:
 build: configure
 	cabal build --ghc-options=-Werror
 
-test: build
+test: install
 	cabal test
 
 haddock: configure
diff --git a/test/AddDays.hs b/test/AddDays.hs
index 719f70a..a867905 100644
--- a/test/AddDays.hs
+++ b/test/AddDays.hs
@@ -3,7 +3,6 @@
 module Main where
 
 import Data.Time.Calendar
-import Control.Monad
 
 days ::[Day]
 days =
diff --git a/test/Makefile b/test/Makefile
index ecfaa96..307adcc 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -2,9 +2,7 @@ GHC = ghc
 GHCFLAGS = -package time
 
 default:
-	cd ..; runhaskell Setup.hs register --user --inplace
 	make CurrentTime.run ShowDST.run test
-	cd ..; runhaskell Setup.hs unregister --user
 
 TestMonthDay: TestMonthDay.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
@@ -66,7 +64,7 @@ test:	\
 	TestFormat.diff0	\
 	TestParseDAT.diff	\
 	TestEaster.diff	\
-	TestParseTime.run \
+#	TestParseTime.run \
 	UseCases.o
 
 clean:
diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 76b897a..b727f3f 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -6,7 +6,6 @@ import Data.Ratio
 import Data.Time
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
-import Data.Time.Clock
 import Data.Time.Clock.POSIX
 import System.Locale
 import Test.QuickCheck


From git at git.haskell.org  Sun Dec 20 07:52:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:57 +0000 (UTC)
Subject: [commit: packages/time] master: get working with both GHC 6.10 and
 6.12 (f4a0fd3)
Message-ID: <20151220075257.51EFA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f4a0fd3f8168c2ea9296eb96ec8acb1577be4561

>---------------------------------------------------------------

commit f4a0fd3f8168c2ea9296eb96ec8acb1577be4561
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Apr 11 01:26:03 2010 -0700

    get working with both GHC 6.10 and 6.12
    
    Ignore-this: 700ee8cb739e67c438d40313d8e38378
    
    darcs-hash:20100411082603-ac6dd-e5eaf0e878baa6b4348ccb11e1533d8279316952


>---------------------------------------------------------------

f4a0fd3f8168c2ea9296eb96ec8acb1577be4561
 Data/Time/Calendar/Days.hs       | 10 +++++-----
 Data/Time/Clock/Scale.hs         | 17 ++++++++++-------
 Data/Time/Clock/TAI.hs           | 12 +++++++-----
 Data/Time/Clock/UTC.hs           | 18 +++++++++++-------
 Data/Time/Format/Parse.hs        | 13 +++++++------
 Data/Time/LocalTime/LocalTime.hs | 19 +++++++++++--------
 Data/Time/LocalTime/TimeOfDay.hs | 12 +++++++-----
 Data/Time/LocalTime/TimeZone.hs  | 10 +++++-----
 include/HsConfigure.h            |  7 +++++++
 time.cabal                       |  4 ++--
 10 files changed, 72 insertions(+), 50 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f4a0fd3f8168c2ea9296eb96ec8acb1577be4561

From git at git.haskell.org  Sun Dec 20 07:52:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:52:59 +0000 (UTC)
Subject: [commit: packages/time] master: 1.2.0.1,
 include missing HsConfigure in sdist (bfa764f)
Message-ID: <20151220075259.582C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/bfa764fe8086315833df9f74727951d7118e279d

>---------------------------------------------------------------

commit bfa764fe8086315833df9f74727951d7118e279d
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Apr 11 13:35:07 2010 -0700

    1.2.0.1, include missing HsConfigure in sdist
    
    Ignore-this: 78dfddb786e7c1103f1ea70a33a43683
    
    darcs-hash:20100411203507-ac6dd-93f6581e5deec6bb709669222630b210dd3b2e55


>---------------------------------------------------------------

bfa764fe8086315833df9f74727951d7118e279d
 time.cabal | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 9b0d75e..22fa857 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2
+version:        1.2.0.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE
@@ -17,6 +17,7 @@ extra-source-files:
     aclocal.m4
     configure.ac
     configure
+    include/HsConfigure.h
     include/HsTime.h
     include/HsTimeConfig.h.in
 extra-tmp-files:


From git at git.haskell.org  Sun Dec 20 07:53:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:01 +0000 (UTC)
Subject: [commit: packages/time] master: include test files in package
 (5c73538)
Message-ID: <20151220075301.5E9E33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5c73538f7d5ba0d850089b255360c5fb49f21ab7

>---------------------------------------------------------------

commit 5c73538f7d5ba0d850089b255360c5fb49f21ab7
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Apr 26 23:55:11 2010 -0700

    include test files in package
    
    Ignore-this: f13d5c23a548692e9700359316171b3f
    
    darcs-hash:20100427065511-ac6dd-0010c3787102b0df85f73274c78edf094d477936


>---------------------------------------------------------------

5c73538f7d5ba0d850089b255360c5fb49f21ab7
 time.cabal | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 22fa857..5db8d82 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.0.1
+version:        1.2.0.2
 stability:      stable
 license:        BSD3
 license-file:   LICENSE
@@ -20,6 +20,13 @@ extra-source-files:
     include/HsConfigure.h
     include/HsTime.h
     include/HsTimeConfig.h.in
+    test/Makefile
+    test/*.hs
+    test/*.lhs
+    test/*.ref
+    test/*.dat
+    test/*.c
+    test/*.h
 extra-tmp-files:
     config.log
     config.status


From git at git.haskell.org  Sun Dec 20 07:53:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:03 +0000 (UTC)
Subject: [commit: packages/time] master: Fixed loss of accuracy in
 timeOfDayToDayFraction. (2677235)
Message-ID: <20151220075303.663083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2677235d39a575502782af06898f3b80ee8a460c

>---------------------------------------------------------------

commit 2677235d39a575502782af06898f3b80ee8a460c
Author: Bjorn Buckwalter <bjorn at buckwalter.se>
Date:   Mon Jun 21 01:04:47 2010 -0700

    Fixed loss of accuracy in timeOfDayToDayFraction.
    
    Ignore-this: 4ba8be01f14c2838bede8c16866ad134
    
    darcs-hash:20100621080447-6cbaf-00ccf839cf4be9821b7c2456a4d96e29ec5753ea


>---------------------------------------------------------------

2677235d39a575502782af06898f3b80ee8a460c
 Data/Time/LocalTime/TimeOfDay.hs |  2 +-
 test/TestTime.hs                 | 10 ++++++++++
 test/TestTime.ref                |  5 +++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index e7618e4..37b2079 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -93,4 +93,4 @@ dayFractionToTimeOfDay df = timeToTimeOfDay (realToFrac (df * 86400))
 
 -- | Get the fraction of a day since midnight given a TimeOfDay.
 timeOfDayToDayFraction :: TimeOfDay -> Rational
-timeOfDayToDayFraction tod = realToFrac (timeOfDayToTime tod / posixDayLength)
+timeOfDayToDayFraction tod = realToFrac (timeOfDayToTime tod) / realToFrac posixDayLength
diff --git a/test/TestTime.hs b/test/TestTime.hs
index 159d001..5fb35c2 100644
--- a/test/TestTime.hs
+++ b/test/TestTime.hs
@@ -80,8 +80,18 @@ testUT1 = do
 	putStrLn (show (ut1ToLocalTime poslong (ModJulianDate 51604.0)))
 	putStrLn (show (ut1ToLocalTime poslong (ModJulianDate 51604.5)))
 
+testTimeOfDayToDayFraction :: IO ()
+testTimeOfDayToDayFraction = do
+	putStrLn ""
+	let f = dayFractionToTimeOfDay . timeOfDayToDayFraction
+	putStrLn (show (f (TimeOfDay 12 34 56.789)))
+	putStrLn (show (f (TimeOfDay 12 34 56.789123)))
+	putStrLn (show (f (TimeOfDay 12 34 56.789123456)))
+	putStrLn (show (f (TimeOfDay 12 34 56.789123456789)))
+
 main :: IO ()
 main = do
 	testCal
 	testUTC
 	testUT1
+	testTimeOfDayToDayFraction
diff --git a/test/TestTime.ref b/test/TestTime.ref
index 00cb151..9f8dd39 100644
--- a/test/TestTime.ref
+++ b/test/TestTime.ref
@@ -867,3 +867,8 @@
 2000-03-01 04:00:00
 2000-03-01 08:00:00
 2000-03-01 20:00:00
+
+12:34:56.789
+12:34:56.789123
+12:34:56.789123456
+12:34:56.789123456789


From git at git.haskell.org  Sun Dec 20 07:53:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:05 +0000 (UTC)
Subject: [commit: packages/time] master: set version to 1.2.1 (5c06110)
Message-ID: <20151220075305.6D0E63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5c06110cf659ea939b3cf1649224ef461e66330f

>---------------------------------------------------------------

commit 5c06110cf659ea939b3cf1649224ef461e66330f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jun 21 01:35:26 2010 -0700

    set version to 1.2.1
    
    Ignore-this: 91693f57fdce225a96d5464e6b2fea8
    
    darcs-hash:20100621083526-ac6dd-f26575ae0f18ee7643bcd4db109d27b10d87657a


>---------------------------------------------------------------

5c06110cf659ea939b3cf1649224ef461e66330f
 configure.ac | 2 +-
 time.cabal   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 885bb01..9b071fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.1.2.3], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.2.1], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index 5db8d82..fff80ca 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.0.2
+version:        1.2.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:07 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.2.0.3 is more appropriate
 than 1.2.1. (aeb4c0e)
Message-ID: <20151220075307.73FAF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/aeb4c0ea777413874e3c84b7159f45f9a6d012b2

>---------------------------------------------------------------

commit aeb4c0ea777413874e3c84b7159f45f9a6d012b2
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jun 21 20:58:47 2010 -0700

    version 1.2.0.3 is more appropriate than 1.2.1.
    
    Ignore-this: 9f96c2b5545fc859d43ae3bb1284860a
    
    darcs-hash:20100622035847-ac6dd-e660685ec54477b1d73da5e537b1fe36c632a584


>---------------------------------------------------------------

aeb4c0ea777413874e3c84b7159f45f9a6d012b2
 configure.ac | 2 +-
 time.cabal   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 9b071fd..b04e8cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.2.1], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.2.0.3], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index fff80ca..3f88c02 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.1
+version:        1.2.0.3
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:09 +0000 (UTC)
Subject: [commit: packages/time] master: test says Success (f3d2c2a)
Message-ID: <20151220075309.7A07F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f3d2c2af9a0319280a3ea7ccba31a28ee2e62001

>---------------------------------------------------------------

commit f3d2c2af9a0319280a3ea7ccba31a28ee2e62001
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jan 23 17:55:11 2011 -0800

    test says Success
    
    Ignore-this: 91a0f645a63f9a42877122ae2121f59f
    
    darcs-hash:20110124015511-ac6dd-71e1db4e1a45886cdb5038dc5ed3d4995b01258f


>---------------------------------------------------------------

f3d2c2af9a0319280a3ea7ccba31a28ee2e62001
 test/Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/Makefile b/test/Makefile
index 307adcc..f97252e 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -66,6 +66,7 @@ test:	\
 	TestEaster.diff	\
 #	TestParseTime.run \
 	UseCases.o
+	@echo "Success!"
 
 clean:
 	rm -rf TestMonthDay ConvertBack TestCalendars TestTime LongWeekYears ClipDates	\


From git at git.haskell.org  Sun Dec 20 07:53:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:11 +0000 (UTC)
Subject: [commit: packages/time] master: fix parse "undefined" bug;
 added TestParseTime into tests (c5041a7)
Message-ID: <20151220075311.81A663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c5041a75c0c4ac903d4b6aa8ce4494b3fd75138b

>---------------------------------------------------------------

commit c5041a75c0c4ac903d4b6aa8ce4494b3fd75138b
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 2 21:32:19 2011 -0800

    fix parse "undefined" bug; added TestParseTime into tests
    
    Ignore-this: aa74ebeef71272fda0a79962ed2e8f93
    
    darcs-hash:20110203053219-ac6dd-38e9068fa7badb315aa19be8f1f77f75f06c03cc


>---------------------------------------------------------------

c5041a75c0c4ac903d4b6aa8ce4494b3fd75138b
 Data/Time/Format.hs       |  2 +-
 Data/Time/Format/Parse.hs |  7 ++++--
 Makefile                  |  2 +-
 test/Makefile             | 10 ++++----
 test/TestFormat.hs        | 59 +++++++++++++++++++++++++++++++++++++++++++++--
 test/TestParseTime.hs     | 42 +++++++++++++++++++++++----------
 time.cabal                |  2 +-
 7 files changed, 99 insertions(+), 25 deletions(-)

diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 8d27f83..174bbea 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -55,7 +55,7 @@ formatChar c locale mpado t = case (formatCharacter c) of
 --
 -- For 'TimeZone' (and 'ZonedTime' and 'UTCTime'):
 --
--- [@%z@] timezone offset on the format @-HHMM at .
+-- [@%z@] timezone offset in the format @-HHMM at .
 --
 -- [@%Z@] timezone name
 --
diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 4fd2282..aa0b66d 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -179,10 +179,13 @@ parseValue l c =
   where
     oneOf = choice . map string
     digits n = count n (satisfy isDigit)
-    spdigits n = skipSpaces >> upTo n (satisfy isDigit)
+    spdigits n = skipSpaces >> oneUpTo n (satisfy isDigit)
+    oneUpTo :: Int -> ReadP a -> ReadP [a]
+    oneUpTo 0 _ = pfail
+    oneUpTo n x = liftM2 (:) x (upTo (n-1) x)
     upTo :: Int -> ReadP a -> ReadP [a]
     upTo 0 _ = return []
-    upTo n x = liftM2 (:) x (upTo (n-1) x) <++ return []
+    upTo n x = (oneUpTo n x) <++ return []
     numericTZ = do s <- choice [char '+', char '-']
                    h <- digits 2
                    optional (char ':')
diff --git a/Makefile b/Makefile
index de4898f..a0b37a9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-default: build
+default: install
 
 # Building
 
diff --git a/test/Makefile b/test/Makefile
index f97252e..5c1487a 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -64,26 +64,27 @@ test:	\
 	TestFormat.diff0	\
 	TestParseDAT.diff	\
 	TestEaster.diff	\
-#	TestParseTime.run \
+	TestParseTime.run \
 	UseCases.o
 	@echo "Success!"
 
 clean:
 	rm -rf TestMonthDay ConvertBack TestCalendars TestTime LongWeekYears ClipDates	\
 	AddDays TestFormat TestParseDAT TestEaster CurrentTime ShowDST TimeZone TimeZone.ref TestParseTime \
-        *.out *.o *.hi Makefile.bak
+        *.out *.run *.o *.hi Makefile.bak
 
 %.diff: %.ref %.out
 	diff -u $^
 
 %.diff0: %.out
-	echo -n | diff -u - $^
+	diff -u /dev/null $^
 
 %.out: %
 	./$< > $@
 
 %.run: %
 	./$<
+	touch $@
 
 %.hi: %.o
 	@:
@@ -98,6 +99,3 @@ FORCE:
 
 .SECONDARY:
 
-# TestTime.o TestFormat.o CurrentTime.o ShowDST.o TimeZone.o: $(patsubst %.hs,%.hi,$(SRCS))
-
-TestFixed.o: ../Data/Fixed.hi
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index bcc18d4..65ca575 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -9,6 +9,7 @@ import Data.Char
 import System.Locale
 import Foreign
 import Foreign.C
+import Control.Exception;
 
 {-
 	size_t format_time (
@@ -93,9 +94,63 @@ formats =  ["%G-W%V-%u","%U-%w","%W-%u"] ++ (fmap (\char -> '%':char:[]) chars)
 hashformats :: [String]
 hashformats =  (fmap (\char -> '%':'#':char:[]) chars)
 
+somestrings :: [String]
+somestrings = ["", " ", "-", "\n"]
+
+getBottom :: a -> IO (Maybe Control.Exception.SomeException);
+getBottom a = Control.Exception.catch (seq a (return Nothing)) (return . Just);    
+
+safeString :: String -> IO String
+safeString s = do
+ msx <- getBottom s
+ case msx of
+  Just sx -> return (show sx)
+  Nothing -> case s of
+   (c:cc) -> do
+    mcx <- getBottom c
+    case mcx of
+     Just cx -> return (show cx)
+     Nothing -> do
+      ss <- safeString cc
+      return (c:ss)
+   [] -> return ""
+
+compareExpected :: (Eq t,Show t,ParseTime t) => String -> String -> String -> Maybe t -> IO ()
+compareExpected ts fmt str expected = let
+ found = parseTime defaultTimeLocale fmt str
+ in do
+  mex <- getBottom found
+  case mex of
+   Just ex -> putStrLn ("Exception with " ++ fmt ++ " for " ++ ts ++" " ++ (show str) ++ ": expected " ++ (show expected) ++ ", caught " ++ (show ex))
+   Nothing -> if found == expected
+    then return ()
+    else do
+     sf <- safeString (show found)
+     putStrLn ("Mismatch with " ++ fmt ++ " for " ++ ts ++" " ++ (show str) ++ ": expected " ++ (show expected) ++ ", found " ++ sf)
+
+class (ParseTime t) => TestParse t where
+    expectedParse :: String -> String -> Maybe t
+    expectedParse "%Z" str | all isSpace str = Just (buildTime defaultTimeLocale [])
+    expectedParse _ _ = Nothing
+
+instance TestParse Day
+instance TestParse TimeOfDay
+instance TestParse LocalTime
+instance TestParse TimeZone
+instance TestParse ZonedTime
+instance TestParse UTCTime
+
+checkParse :: String -> String -> IO ()
+checkParse fmt str = do
+ compareExpected "Day" fmt str (expectedParse fmt str :: Maybe Day)
+ compareExpected "TimeOfDay" fmt str (expectedParse fmt str :: Maybe TimeOfDay)
+ compareExpected "LocalTime" fmt str (expectedParse fmt str :: Maybe LocalTime)
+ compareExpected "TimeZone" fmt str (expectedParse fmt str :: Maybe TimeZone)
+ compareExpected "UTCTime" fmt str (expectedParse fmt str :: Maybe UTCTime)
 
 main :: IO ()
-main = 
-	mapM_ (\fmt -> mapM_ (\time -> mapM_ (\zone -> compareFormat id fmt zone time) zones) times) formats >>
+main = do
+	mapM_ (\fmt -> mapM_ (checkParse fmt) somestrings) formats
+	mapM_ (\fmt -> mapM_ (\time -> mapM_ (\zone -> compareFormat id fmt zone time) zones) times) formats
 	mapM_ (\fmt -> mapM_ (\time -> mapM_ (\zone -> compareFormat (fmap toLower) fmt zone time) zones) times) hashformats
 
diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index b727f3f..37d13f6 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -8,7 +8,9 @@ import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
 import Data.Time.Clock.POSIX
 import System.Locale
+import System.Exit
 import Test.QuickCheck
+import Test.QuickCheck.Batch
 
 
 ntest :: Int
@@ -16,19 +18,35 @@ ntest = 1000
 
 main :: IO ()
 main = do putStrLn "Should work:"
-          checkAll properties
+          good <- checkAll properties
           putStrLn "Known failures:"
-          checkAll knownFailures
-
-checkAll :: [NamedProperty] -> IO ()
-checkAll ps = mapM_ (checkOne config) ps
- where config = defaultConfig { configMaxTest = ntest }
-       
-checkOne :: Config -> NamedProperty -> IO ()
-checkOne config (n,p) = 
-    do putStr (rpad 65 ' ' n)
-       check config p
-  where rpad n' c xs = xs ++ replicate (n' - length xs) c
+          _ <- checkAll knownFailures
+          exitWith (if good then ExitSuccess else ExitFailure 1)
+
+
+checkAll :: [NamedProperty] -> IO Bool
+checkAll ps = fmap and (mapM checkOne ps)
+
+trMessage :: TestResult -> String
+trMessage (TestOk s _ _) = s
+trMessage (TestExausted s i ss) = "Exhausted " ++ (show s) ++ " " ++ (show i) ++ " " ++ (show ss)
+trMessage (TestFailed ss i) = "Failed " ++ (show ss) ++ " " ++ (show i)
+trMessage (TestAborted ex) = "Aborted " ++ (show ex)
+
+trGood :: TestResult -> Bool
+trGood (TestOk _ _ _) = True
+trGood _ = False
+
+checkOne :: NamedProperty -> IO Bool
+checkOne (n,p) =
+    do
+       putStr (rpad 65 ' ' n)
+       tr <- run p options
+       putStrLn (trMessage tr)
+       return (trGood tr)
+  where
+    rpad n' c xs = xs ++ replicate (n' - length xs) c
+    options = TestOptions {no_of_tests = 10000,length_of_tests = 0,debug_tests = False}
 
 
 parse :: ParseTime t => String -> String -> Maybe t
diff --git a/time.cabal b/time.cabal
index 3f88c02..2759127 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.0.3
+version:        1.2.0.4
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:13 +0000 (UTC)
Subject: [commit: packages/time] master: .run files are boring (ff06923)
Message-ID: <20151220075313.897173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ff069238035c36b43d10502a9a02cf10f9497c80

>---------------------------------------------------------------

commit ff069238035c36b43d10502a9a02cf10f9497c80
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Feb 2 21:34:07 2011 -0800

    .run files are boring
    
    Ignore-this: 7d76b141e01b923879e5e432d41b933c
    
    darcs-hash:20110203053407-ac6dd-f4ffed0f583b01ebeb95bc92770c60fab025d047


>---------------------------------------------------------------

ff069238035c36b43d10502a9a02cf10f9497c80
 .darcs-boring | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.darcs-boring b/.darcs-boring
index 0b4f6cb..ca040f7 100644
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -52,6 +52,7 @@ _split$
 ^include/HsTimeConfig\.h$
 ^include/HsTimeConfig\.h.in$
 ^test/.*\.out$
+^test/.*\.run$
 ^test/AddDays$
 ^test/ClipDates$
 ^test/ConvertBack$


From git at git.haskell.org  Sun Dec 20 07:53:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:15 +0000 (UTC)
Subject: [commit: packages/time] master: specify QuickCheck version (1c69e66)
Message-ID: <20151220075315.908743A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1c69e66cfbf65a7e224ef97023063b9c7d39e112

>---------------------------------------------------------------

commit 1c69e66cfbf65a7e224ef97023063b9c7d39e112
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 21:21:47 2011 -0700

    specify QuickCheck version
    
    Ignore-this: b82b874985d6bc74cf6f7989f46f5a96
    
    darcs-hash:20110508042147-ac6dd-0198670fb2c4e5ecc8e0ffa16dcc2b6618564ac7


>---------------------------------------------------------------

1c69e66cfbf65a7e224ef97023063b9c7d39e112
 test/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/Makefile b/test/Makefile
index 5c1487a..f8ef07d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,5 +1,5 @@
 GHC = ghc
-GHCFLAGS = -package time
+GHCFLAGS = -package time -package QuickCheck-1.2.0.1
 
 default:
 	make CurrentTime.run ShowDST.run test
@@ -50,7 +50,7 @@ TimeZone.ref: FORCE
 	date +%z > $@
 
 TestParseTime: TestParseTime.o
-	$(GHC) $(GHCFLAGS) -package QuickCheck $^ -o $@
+	$(GHC) $(GHCFLAGS) $^ -o $@
 
 test:	\
 	TestMonthDay.diff	\


From git at git.haskell.org  Sun Dec 20 07:53:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:17 +0000 (UTC)
Subject: [commit: packages/time] master: test for %y parse to 1969 - 2068
 (ac3fc0b)
Message-ID: <20151220075317.97F1A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ac3fc0bf4d197ed82fdd6dff4383a07d8766d433

>---------------------------------------------------------------

commit ac3fc0bf4d197ed82fdd6dff4383a07d8766d433
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 21:22:16 2011 -0700

    test for %y parse to 1969 - 2068
    
    Ignore-this: ac903c931b2fe745f073a5cb474e9d95
    
    darcs-hash:20110508042216-ac6dd-e6e305e2cb3804511eefdd74dc4b558fcfd00f51


>---------------------------------------------------------------

ac3fc0bf4d197ed82fdd6dff4383a07d8766d433
 test/TestParseTime.hs | 54 ++++++++++++++++++++++++++++++++++++++++-----------
 1 file changed, 43 insertions(+), 11 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 37d13f6..64a4504 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -1,8 +1,10 @@
 {-# OPTIONS -Wall -Werror -fno-warn-type-defaults -fno-warn-unused-binds -fno-warn-orphans #-}
+{-# LANGUAGE FlexibleInstances, ExistentialQuantification #-}
 
 import Control.Monad
 import Data.Char
 import Data.Ratio
+import Data.Maybe
 import Data.Time
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
@@ -13,18 +15,49 @@ import Test.QuickCheck
 import Test.QuickCheck.Batch
 
 
+class RunTest p where
+    runTest :: p -> IO TestResult
+
+instance RunTest (IO TestResult) where
+    runTest iob = iob
+
+instance RunTest Property where
+    runTest p = run p (TestOptions {no_of_tests = 10000,length_of_tests = 0,debug_tests = False})
+
+data ExhaustiveTest = forall t. (Show t) => MkExhaustiveTest [t] (t -> IO Bool)
+
+instance RunTest ExhaustiveTest where
+    runTest (MkExhaustiveTest cases f) = do
+        results <- mapM (\t -> do {b <- f t;return (b,show t)}) cases
+        let failures = mapMaybe (\(b,n) -> if b then Nothing else Just n) results
+        let fcount = length failures
+        return (if fcount == 0 then TestOk "OK" 0 [] else TestFailed failures fcount)
+
 ntest :: Int
 ntest = 1000
 
 main :: IO ()
-main = do putStrLn "Should work:"
-          good <- checkAll properties
-          putStrLn "Known failures:"
-          _ <- checkAll knownFailures
-          exitWith (if good then ExitSuccess else ExitFailure 1)
-
-
-checkAll :: [NamedProperty] -> IO Bool
+main = do
+    putStrLn "Should work:"
+    good1 <- checkAll extests
+    putStrLn "Should work:"
+    good2 <- checkAll properties
+    putStrLn "Known failures:"
+    _ <- checkAll knownFailures
+    exitWith (if good1 && good2 then ExitSuccess else ExitFailure 1)
+
+extests :: [(String,ExhaustiveTest)]
+extests = [("parse %y",MkExhaustiveTest [0..99] parseYY)]
+
+-- | 1969 - 2068
+expectedYear :: Integer -> Integer
+expectedYear i | i >= 69 = 1900 + i
+expectedYear i = 2000 + i
+
+parseYY :: Integer -> IO Bool
+parseYY i = return (parse "%y" ((show (div i 10)) ++ (show (mod i 10))) == Just (fromGregorian (expectedYear i) 1 1))
+
+checkAll :: RunTest p => [(String,p)] -> IO Bool
 checkAll ps = fmap and (mapM checkOne ps)
 
 trMessage :: TestResult -> String
@@ -37,16 +70,15 @@ trGood :: TestResult -> Bool
 trGood (TestOk _ _ _) = True
 trGood _ = False
 
-checkOne :: NamedProperty -> IO Bool
+checkOne :: RunTest p => (String,p) -> IO Bool
 checkOne (n,p) =
     do
        putStr (rpad 65 ' ' n)
-       tr <- run p options
+       tr <- runTest p
        putStrLn (trMessage tr)
        return (trGood tr)
   where
     rpad n' c xs = xs ++ replicate (n' - length xs) c
-    options = TestOptions {no_of_tests = 10000,length_of_tests = 0,debug_tests = False}
 
 
 parse :: ParseTime t => String -> String -> Maybe t


From git at git.haskell.org  Sun Dec 20 07:53:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:19 +0000 (UTC)
Subject: [commit: packages/time] master: test parse %C %y (c3d1c28)
Message-ID: <20151220075319.9FA4E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c3d1c2821373e6dbc62923ab74d89c4a6b1b0b18

>---------------------------------------------------------------

commit c3d1c2821373e6dbc62923ab74d89c4a6b1b0b18
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 21:29:05 2011 -0700

    test parse %C %y
    
    Ignore-this: 22f6db0e1424c95dece1fdf7740d982e
    
    darcs-hash:20110508042905-ac6dd-5026d47053631acb8848806368fb17bbf8bc9837


>---------------------------------------------------------------

c3d1c2821373e6dbc62923ab74d89c4a6b1b0b18
 test/TestParseTime.hs | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 64a4504..5594f34 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -47,15 +47,27 @@ main = do
     exitWith (if good1 && good2 then ExitSuccess else ExitFailure 1)
 
 extests :: [(String,ExhaustiveTest)]
-extests = [("parse %y",MkExhaustiveTest [0..99] parseYY)]
+extests = [
+    ("parse %y",MkExhaustiveTest [0..99] parseYY),
+    ("parse %C %y 1900s",MkExhaustiveTest [0..99] (parseCYY 19)),
+    ("parse %C %y 2000s",MkExhaustiveTest [0..99] (parseCYY 20)),
+    ("parse %C %y 1400s",MkExhaustiveTest [0..99] (parseCYY 14)),
+    ("parse %C %y 700s",MkExhaustiveTest [0..99] (parseCYY 7))
+    ]
 
 -- | 1969 - 2068
 expectedYear :: Integer -> Integer
 expectedYear i | i >= 69 = 1900 + i
 expectedYear i = 2000 + i
 
+show2 :: Integer -> String
+show2 i = (show (div i 10)) ++ (show (mod i 10))
+
 parseYY :: Integer -> IO Bool
-parseYY i = return (parse "%y" ((show (div i 10)) ++ (show (mod i 10))) == Just (fromGregorian (expectedYear i) 1 1))
+parseYY i = return (parse "%y" (show2 i) == Just (fromGregorian (expectedYear i) 1 1))
+
+parseCYY :: Integer -> Integer -> IO Bool
+parseCYY c i = return (parse "%C %y" ((show2 c) ++ " " ++ (show2 i)) == Just (fromGregorian ((c * 100) + i) 1 1))
 
 checkAll :: RunTest p => [(String,p)] -> IO Bool
 checkAll ps = fmap and (mapM checkOne ps)


From git at git.haskell.org  Sun Dec 20 07:53:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:21 +0000 (UTC)
Subject: [commit: packages/time] master: parse %y range 1969 - 2068,
 bug #2671 (84f1505)
Message-ID: <20151220075321.A64663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/84f1505205d9edfce0315fe18cba3fa506554a85

>---------------------------------------------------------------

commit 84f1505205d9edfce0315fe18cba3fa506554a85
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 21:36:17 2011 -0700

    parse %y range 1969 - 2068, bug #2671
    
    Ignore-this: 30d5c56ed53c337433764e109aaa5ac4
    
    darcs-hash:20110508043617-ac6dd-8e192552d6fd229ccc824600cba2bb74170ebd6a


>---------------------------------------------------------------

84f1505205d9edfce0315fe18cba3fa506554a85
 Data/Time/Format/Parse.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index aa0b66d..135fc01 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -254,8 +254,9 @@ instance ParseTime Day where
 
       buildDay cs = rest cs
         where
-        y = let c = safeLast 19 [x | Century x <- cs]
+        y = let 
                 d = safeLast 70 [x | Year x <- cs]
+                c = safeLast (if d >= 69 then 19 else 20) [x | Century x <- cs]
              in 100 * c + d
 
         rest (Month m:_)  = let d = safeLast 1 [x | Day x <- cs]


From git at git.haskell.org  Sun Dec 20 07:53:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:23 +0000 (UTC)
Subject: [commit: packages/time] master: test for parse %m single digit
 (3dd4c2c)
Message-ID: <20151220075323.ACBD53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3dd4c2cab3b79fb33933f5d64108e474de3f1a06

>---------------------------------------------------------------

commit 3dd4c2cab3b79fb33933f5d64108e474de3f1a06
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 22:16:09 2011 -0700

    test for parse %m single digit
    
    Ignore-this: a79ecf3b70510657aca907e78c70f012
    
    darcs-hash:20110508051609-ac6dd-9ad32ef4836008a307a1de03594d405fd79daec3


>---------------------------------------------------------------

3dd4c2cab3b79fb33933f5d64108e474de3f1a06
 test/TestParseTime.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 5594f34..c8eabd2 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -52,9 +52,14 @@ extests = [
     ("parse %C %y 1900s",MkExhaustiveTest [0..99] (parseCYY 19)),
     ("parse %C %y 2000s",MkExhaustiveTest [0..99] (parseCYY 20)),
     ("parse %C %y 1400s",MkExhaustiveTest [0..99] (parseCYY 14)),
-    ("parse %C %y 700s",MkExhaustiveTest [0..99] (parseCYY 7))
+    ("parse %C %y 700s",MkExhaustiveTest [0..99] (parseCYY 7)),
+    ("parseYearDay",MkExhaustiveTest [(fromGregorian 2011 1 1) .. (fromGregorian 2011 12 31)] parseYearDay)
     ]
 
+parseYearDay :: Day -> IO Bool
+parseYearDay day = case toGregorian day of
+    (y,m,d) -> return $ (parse "%Y %m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
+
 -- | 1969 - 2068
 expectedYear :: Integer -> Integer
 expectedYear i | i >= 69 = 1900 + i


From git at git.haskell.org  Sun Dec 20 07:53:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:25 +0000 (UTC)
Subject: [commit: packages/time] master: test parse %d %e single digit
 (8028949)
Message-ID: <20151220075325.B493D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/802894907b34d4f3979ea2a88d0393c7d404e9ec

>---------------------------------------------------------------

commit 802894907b34d4f3979ea2a88d0393c7d404e9ec
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 22:21:09 2011 -0700

    test parse %d %e single digit
    
    Ignore-this: 81b90faa6de38d80462fc534b5e0f101
    
    darcs-hash:20110508052109-ac6dd-6c9689e1cf5500fb02b7172ba2e6dd731a81f1b9


>---------------------------------------------------------------

802894907b34d4f3979ea2a88d0393c7d404e9ec
 test/TestParseTime.hs | 26 ++++++++++++++++++++++----
 1 file changed, 22 insertions(+), 4 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index c8eabd2..1d2d1c2 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -46,6 +46,9 @@ main = do
     _ <- checkAll knownFailures
     exitWith (if good1 && good2 then ExitSuccess else ExitFailure 1)
 
+days2011 :: [Day]
+days2011 = [(fromGregorian 2011 1 1) .. (fromGregorian 2011 12 31)]
+
 extests :: [(String,ExhaustiveTest)]
 extests = [
     ("parse %y",MkExhaustiveTest [0..99] parseYY),
@@ -53,19 +56,34 @@ extests = [
     ("parse %C %y 2000s",MkExhaustiveTest [0..99] (parseCYY 20)),
     ("parse %C %y 1400s",MkExhaustiveTest [0..99] (parseCYY 14)),
     ("parse %C %y 700s",MkExhaustiveTest [0..99] (parseCYY 7)),
-    ("parseYearDay",MkExhaustiveTest [(fromGregorian 2011 1 1) .. (fromGregorian 2011 12 31)] parseYearDay)
+    ("parseYearDay %Y %m %d",MkExhaustiveTest days2011 parseYearDayD),
+    ("parseYearDay %Y %m %d 0-pad",MkExhaustiveTest days2011 parseYearDayD2),
+    ("parseYearDay %Y %m %e",MkExhaustiveTest days2011 parseYearDayE),
+    ("parseYearDay %Y %m %e 0-pad",MkExhaustiveTest days2011 parseYearDayE2)
     ]
 
-parseYearDay :: Day -> IO Bool
-parseYearDay day = case toGregorian day of
+parseYearDayD :: Day -> IO Bool
+parseYearDayD day = case toGregorian day of
+    (y,m,d) -> return $ (parse "%Y %m %d" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
+
+parseYearDayD2 :: Day -> IO Bool
+parseYearDayD2 day = case toGregorian day of
+    (y,m,d) -> return $ (parse "%Y %m %d" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))) == Just day
+
+parseYearDayE :: Day -> IO Bool
+parseYearDayE day = case toGregorian day of
     (y,m,d) -> return $ (parse "%Y %m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
 
+parseYearDayE2 :: Day -> IO Bool
+parseYearDayE2 day = case toGregorian day of
+    (y,m,d) -> return $ (parse "%Y %m %e" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))) == Just day
+
 -- | 1969 - 2068
 expectedYear :: Integer -> Integer
 expectedYear i | i >= 69 = 1900 + i
 expectedYear i = 2000 + i
 
-show2 :: Integer -> String
+show2 :: (Integral n) => n -> String
 show2 i = (show (div i 10)) ++ (show (mod i 10))
 
 parseYY :: Integer -> IO Bool


From git at git.haskell.org  Sun Dec 20 07:53:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:27 +0000 (UTC)
Subject: [commit: packages/time] master: test parse %-m single digit (7cef519)
Message-ID: <20151220075327.BAD993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7cef51954de82636ac53c25858531569c0fbebbe

>---------------------------------------------------------------

commit 7cef51954de82636ac53c25858531569c0fbebbe
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 22:31:58 2011 -0700

    test parse %-m single digit
    
    Ignore-this: 32fc454ea7f34c9985e4d2cab174021
    
    darcs-hash:20110508053158-ac6dd-3c4acb3124184955ea67bc432067ec40d11558a8


>---------------------------------------------------------------

7cef51954de82636ac53c25858531569c0fbebbe
 test/TestParseTime.hs | 21 ++++++++-------------
 1 file changed, 8 insertions(+), 13 deletions(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index 1d2d1c2..a8b3832 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -56,27 +56,22 @@ extests = [
     ("parse %C %y 2000s",MkExhaustiveTest [0..99] (parseCYY 20)),
     ("parse %C %y 1400s",MkExhaustiveTest [0..99] (parseCYY 14)),
     ("parse %C %y 700s",MkExhaustiveTest [0..99] (parseCYY 7)),
-    ("parseYearDay %Y %m %d",MkExhaustiveTest days2011 parseYearDayD),
-    ("parseYearDay %Y %m %d 0-pad",MkExhaustiveTest days2011 parseYearDayD2),
-    ("parseYearDay %Y %m %e",MkExhaustiveTest days2011 parseYearDayE),
-    ("parseYearDay %Y %m %e 0-pad",MkExhaustiveTest days2011 parseYearDayE2)
+    ("parse %Y%m%d",MkExhaustiveTest days2011 parseYMD),
+    ("parse %Y %m %d",MkExhaustiveTest days2011 parseYearDayD),
+    ("parse %Y %-m %e",MkExhaustiveTest days2011 parseYearDayE)
     ]
 
+parseYMD :: Day -> IO Bool
+parseYMD day = case toGregorian day of
+    (y,m,d) -> return $ (parse "%Y%m%d" ((show y) ++ (show2 m) ++ (show2 d))) == Just day
+
 parseYearDayD :: Day -> IO Bool
 parseYearDayD day = case toGregorian day of
-    (y,m,d) -> return $ (parse "%Y %m %d" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
-
-parseYearDayD2 :: Day -> IO Bool
-parseYearDayD2 day = case toGregorian day of
     (y,m,d) -> return $ (parse "%Y %m %d" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))) == Just day
 
 parseYearDayE :: Day -> IO Bool
 parseYearDayE day = case toGregorian day of
-    (y,m,d) -> return $ (parse "%Y %m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
-
-parseYearDayE2 :: Day -> IO Bool
-parseYearDayE2 day = case toGregorian day of
-    (y,m,d) -> return $ (parse "%Y %m %e" ((show y) ++ " " ++ (show2 m) ++ " " ++ (show2 d))) == Just day
+    (y,m,d) -> return $ (parse "%Y %-m %e" ((show y) ++ " " ++ (show m) ++ " " ++ (show d))) == Just day
 
 -- | 1969 - 2068
 expectedYear :: Integer -> Integer


From git at git.haskell.org  Sun Dec 20 07:53:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:29 +0000 (UTC)
Subject: [commit: packages/time] master: allow - _ 0 modifiers in % parsing
 (b2902c9)
Message-ID: <20151220075329.C15063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b2902c953cbe901a755539cdde45458d6b623c74

>---------------------------------------------------------------

commit b2902c953cbe901a755539cdde45458d6b623c74
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 7 22:57:59 2011 -0700

    allow - _ 0 modifiers in % parsing
    
    Ignore-this: 275981732f80ca7fd14bf2a33a578632
    
    darcs-hash:20110508055759-ac6dd-aff88a854a40ff2ad6e168ed5c719bdf55b72d31


>---------------------------------------------------------------

b2902c953cbe901a755539cdde45458d6b623c74
 Data/Time/Format/Parse.hs | 89 +++++++++++++++++++++++++----------------------
 test/TestFormat.hs        |  3 ++
 2 files changed, 51 insertions(+), 41 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index 135fc01..b8855c1 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -104,9 +104,12 @@ readsTime l f = readP_to_S (liftM (buildTime l) r)
 -- * Internals
 --
 
+data Padding = NoPadding | SpacePadding | ZeroPadding
+  deriving Show
+
 type DateFormat = [DateFormatSpec]
 
-data DateFormatSpec = Value Char
+data DateFormatSpec = Value (Maybe Padding) Char
                      | WhiteSpace
                      | Literal Char
   deriving Show
@@ -114,31 +117,33 @@ data DateFormatSpec = Value Char
 parseFormat :: TimeLocale -> String -> DateFormat
 parseFormat l = p
   where p "" = []
-        p ('%': c :cs) = s ++ p cs
-            where s = case c of
-                        'c' -> p (dateTimeFmt l)
-                        'R' -> p "%H:%M"
-                        'T' -> p "%H:%M:%S"
-                        'X' -> p (timeFmt l)
-                        'r' -> p (time12Fmt l)
-                        'D' -> p "%m/%d/%y"
-                        'F' -> p "%Y-%m-%d"
-                        'x' -> p (dateFmt l)
-                        'h' -> p "%b"
-                        '%' -> [Literal '%']
-                        _   -> [Value c]
+        p ('%': '-' : c :cs) = (pc (Just NoPadding) c) ++ p cs
+        p ('%': '_' : c :cs) = (pc (Just SpacePadding) c) ++ p cs
+        p ('%': '0' : c :cs) = (pc (Just ZeroPadding) c) ++ p cs
+        p ('%': c :cs) = (pc Nothing c) ++ p cs
         p (c:cs) | isSpace c = WhiteSpace : p cs
         p (c:cs) = Literal c : p cs
+        pc _ 'c' = p (dateTimeFmt l)
+        pc _ 'R' = p "%H:%M"
+        pc _ 'T' = p "%H:%M:%S"
+        pc _ 'X' = p (timeFmt l)
+        pc _ 'r' = p (time12Fmt l)
+        pc _ 'D' = p "%m/%d/%y"
+        pc _ 'F' = p "%Y-%m-%d"
+        pc _ 'x' = p (dateFmt l)
+        pc _ 'h' = p "%b"
+        pc _ '%' = [Literal '%']
+        pc mpad c   = [Value mpad c]
 
 parseInput :: TimeLocale -> DateFormat -> ReadP [(Char,String)]
 parseInput l = liftM catMaybes . mapM p
-  where p (Value c)   = parseValue l c >>= return . Just . (,) c
+  where p (Value mpad c)   = parseValue l mpad c >>= return . Just . (,) c
         p WhiteSpace  = skipSpaces >> return Nothing
         p (Literal c) = char c >> return Nothing
 
 -- | Get the string corresponding to the given format specifier.
-parseValue :: TimeLocale -> Char -> ReadP String
-parseValue l c = 
+parseValue :: TimeLocale -> Maybe Padding -> Char -> ReadP String
+parseValue l mpad c = 
     case c of
       'z' -> numericTZ
       'Z' -> munch1 isAlpha <++
@@ -146,40 +151,42 @@ parseValue l c =
              return "" -- produced by %Z for LocalTime
       'P' -> oneOf (let (am,pm) = amPm l in [am, pm])
       'p' -> oneOf (let (am,pm) = amPm l in [am, pm])
-      'H' -> digits 2
-      'I' -> digits 2
-      'k' -> spdigits 2
-      'l' -> spdigits 2
-      'M' -> digits 2 
-      'S' -> digits 2
-      'q' -> digits 12
+      'H' -> digits ZeroPadding 2
+      'I' -> digits ZeroPadding 2
+      'k' -> digits NoPadding 2
+      'l' -> digits NoPadding 2
+      'M' -> digits ZeroPadding 2 
+      'S' -> digits ZeroPadding 2
+      'q' -> digits ZeroPadding 12
       'Q' -> liftM2 (:) (char '.') (munch isDigit) <++ return ""
       's' -> (char '-' >> liftM ('-':) (munch1 isDigit)) 
              <++ munch1 isDigit
-      'Y' -> digits 4
-      'y' -> digits 2
-      'C' -> digits 2
+      'Y' -> digits ZeroPadding 4
+      'y' -> digits ZeroPadding 2
+      'C' -> digits ZeroPadding 2
       'B' -> oneOf (map fst (months l))
       'b' -> oneOf (map snd (months l))
-      'm' -> digits 2
-      'd' -> digits 2
-      'e' -> spdigits 2
-      'j' -> digits 3
-      'G' -> digits 4
-      'g' -> digits 2
-      'f' -> digits 2
-      'V' -> digits 2
+      'm' -> digits ZeroPadding 2
+      'd' -> digits ZeroPadding 2
+      'e' -> digits NoPadding 2
+      'j' -> digits ZeroPadding 3
+      'G' -> digits ZeroPadding 4
+      'g' -> digits ZeroPadding 2
+      'f' -> digits ZeroPadding 2
+      'V' -> digits ZeroPadding 2
       'u' -> oneOf $ map (:[]) ['1'..'7']
       'a' -> oneOf (map snd (wDays l))
       'A' -> oneOf (map fst (wDays l))
-      'U' -> digits 2
+      'U' -> digits ZeroPadding 2
       'w' -> oneOf $ map (:[]) ['0'..'6']
-      'W' -> digits 2
+      'W' -> digits ZeroPadding 2
       _   -> fail $ "Unknown format character: " ++ show c
   where
     oneOf = choice . map string
-    digits n = count n (satisfy isDigit)
-    spdigits n = skipSpaces >> oneUpTo n (satisfy isDigit)
+    digitsforce ZeroPadding n = count n (satisfy isDigit)
+    digitsforce SpacePadding n = skipSpaces >> oneUpTo n (satisfy isDigit)
+    digitsforce NoPadding n = skipSpaces >> oneUpTo n (satisfy isDigit)
+    digits pad = digitsforce (fromMaybe pad mpad)
     oneUpTo :: Int -> ReadP a -> ReadP [a]
     oneUpTo 0 _ = pfail
     oneUpTo n x = liftM2 (:) x (upTo (n-1) x)
@@ -187,9 +194,9 @@ parseValue l c =
     upTo 0 _ = return []
     upTo n x = (oneUpTo n x) <++ return []
     numericTZ = do s <- choice [char '+', char '-']
-                   h <- digits 2
+                   h <- digitsforce ZeroPadding 2
                    optional (char ':')
-                   m <- digits 2
+                   m <- digitsforce ZeroPadding 2
                    return (s:h++m)
 #endif
 
diff --git a/test/TestFormat.hs b/test/TestFormat.hs
index 65ca575..19173b6 100644
--- a/test/TestFormat.hs
+++ b/test/TestFormat.hs
@@ -131,6 +131,9 @@ compareExpected ts fmt str expected = let
 class (ParseTime t) => TestParse t where
     expectedParse :: String -> String -> Maybe t
     expectedParse "%Z" str | all isSpace str = Just (buildTime defaultTimeLocale [])
+    expectedParse "%_Z" str | all isSpace str = Just (buildTime defaultTimeLocale [])
+    expectedParse "%-Z" str | all isSpace str = Just (buildTime defaultTimeLocale [])
+    expectedParse "%0Z" str | all isSpace str = Just (buildTime defaultTimeLocale [])
     expectedParse _ _ = Nothing
 
 instance TestParse Day


From git at git.haskell.org  Sun Dec 20 07:53:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:31 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.2.0.5 (c8c840a)
Message-ID: <20151220075331.C85713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c8c840a328c38acc6a2f243832e474715d4d1568

>---------------------------------------------------------------

commit c8c840a328c38acc6a2f243832e474715d4d1568
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue May 10 23:34:37 2011 -0700

    version 1.2.0.5
    
    Ignore-this: 3def541a0b608a54c482ada9b0ab89ff
    
    darcs-hash:20110511063437-ac6dd-fd171d1311e7e6247158b5b132abffb0cc088948


>---------------------------------------------------------------

c8c840a328c38acc6a2f243832e474715d4d1568
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 2759127..5ca5557 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.0.4
+version:        1.2.0.5
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:33 +0000 (UTC)
Subject: [commit: packages/time] master: correct padding in parse;
 doc (83ec536)
Message-ID: <20151220075333.CEF683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/83ec536b75b3bd342ee273a7db061d35830afc32

>---------------------------------------------------------------

commit 83ec536b75b3bd342ee273a7db061d35830afc32
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed May 11 00:40:32 2011 -0700

    correct padding in parse; doc
    
    Ignore-this: b922ed3e94021edde3d9d78bdb9844b2
    
    darcs-hash:20110511074032-ac6dd-51fd06ffe64b8c2c3b836ebc511b990c1d9a0662


>---------------------------------------------------------------

83ec536b75b3bd342ee273a7db061d35830afc32
 Data/Time/Format/Parse.hs | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index b8855c1..aaf7029 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -55,20 +55,21 @@ class ParseTime t where
     -- If the input does not include all the information needed to
     -- construct a complete value, any missing parts should be taken
     -- from 1970-01-01 00:00:00 +0000 (which was a Thursday).
+    -- In the absence of @%C@ or @%Y@, century is 1969 - 2068.
     buildTime :: TimeLocale -- ^ The time locale.
               -> [(Char,String)] -- ^ Pairs of format characters and the 
                                  -- corresponding part of the input.
               -> t
 
 #if LANGUAGE_Rank2Types
--- | Parses a time value given a format string. Supports the same %-codes as
--- 'formatTime'. Leading and trailing whitespace is accepted. Case is not
--- significant. Some variations in the input are accepted:
+-- | Parses a time value given a format string.
+-- Supports the same %-codes as 'formatTime', including @%-@, @%_@ and @%0@ modifiers.
+-- Leading and trailing whitespace is accepted. Case is not significant.
+-- Some variations in the input are accepted:
 --
 -- [@%z@] accepts any of @-HHMM@ or @-HH:MM at .
 --
--- [@%Z@] accepts any string of letters, or any
--- of the formats accepted by @%z at .
+-- [@%Z@] accepts any string of letters, or any of the formats accepted by @%z at .
 --
 parseTime :: ParseTime t =>
              TimeLocale -- ^ Time locale.
@@ -153,8 +154,8 @@ parseValue l mpad c =
       'p' -> oneOf (let (am,pm) = amPm l in [am, pm])
       'H' -> digits ZeroPadding 2
       'I' -> digits ZeroPadding 2
-      'k' -> digits NoPadding 2
-      'l' -> digits NoPadding 2
+      'k' -> digits SpacePadding 2
+      'l' -> digits SpacePadding 2
       'M' -> digits ZeroPadding 2 
       'S' -> digits ZeroPadding 2
       'q' -> digits ZeroPadding 12
@@ -168,7 +169,7 @@ parseValue l mpad c =
       'b' -> oneOf (map snd (months l))
       'm' -> digits ZeroPadding 2
       'd' -> digits ZeroPadding 2
-      'e' -> digits NoPadding 2
+      'e' -> digits SpacePadding 2
       'j' -> digits ZeroPadding 3
       'G' -> digits ZeroPadding 4
       'g' -> digits ZeroPadding 2
@@ -185,7 +186,7 @@ parseValue l mpad c =
     oneOf = choice . map string
     digitsforce ZeroPadding n = count n (satisfy isDigit)
     digitsforce SpacePadding n = skipSpaces >> oneUpTo n (satisfy isDigit)
-    digitsforce NoPadding n = skipSpaces >> oneUpTo n (satisfy isDigit)
+    digitsforce NoPadding n = oneUpTo n (satisfy isDigit)
     digits pad = digitsforce (fromMaybe pad mpad)
     oneUpTo :: Int -> ReadP a -> ReadP [a]
     oneUpTo 0 _ = pfail


From git at git.haskell.org  Sun Dec 20 07:53:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:35 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.3: instance RealFrac
 DiffTime (234e6ce)
Message-ID: <20151220075335.D60B53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/234e6cef3c5ade6b46b7a55a90c12247d918bf0a

>---------------------------------------------------------------

commit 234e6cef3c5ade6b46b7a55a90c12247d918bf0a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Aug 9 19:12:09 2011 -0700

    version 1.3: instance RealFrac DiffTime
    
    Ignore-this: db3b670e3c17170909ab4c5b34b83716
    
    darcs-hash:20110810021209-ac6dd-915d3dcb3b6e543f834c997820182d669e7bb2ac


>---------------------------------------------------------------

234e6cef3c5ade6b46b7a55a90c12247d918bf0a
 Data/Time/Clock/Scale.hs | 8 ++++++++
 configure.ac             | 2 +-
 time.cabal               | 2 +-
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index f07fd64..fb67cc5 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -83,6 +83,14 @@ instance Fractional DiffTime where
 	recip (MkDiffTime a) = MkDiffTime (recip a)
 	fromRational r = MkDiffTime (fromRational r)
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance RealFrac DiffTime where
+    properFraction (MkDiffTime a) = let (b',a') = properFraction a in (b',MkDiffTime a')
+    truncate (MkDiffTime a) = truncate a
+    round (MkDiffTime a) = round a
+    ceiling (MkDiffTime a) = ceiling a
+    floor (MkDiffTime a) = floor a
+
 -- | Create a 'DiffTime' which represents an integral number of seconds.
 secondsToDiffTime :: Integer -> DiffTime
 secondsToDiffTime = fromInteger
diff --git a/configure.ac b/configure.ac
index b04e8cd..dc58c49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.2.0.3], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.3], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index 5ca5557..21bf3e4 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.2.0.5
+version:        1.3
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:37 +0000 (UTC)
Subject: [commit: packages/time] master: NFData instances,
 contributed by Herbert Valerio Riedel <hvriedel@gmail.com> (4466857)
Message-ID: <20151220075337.DCA3D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4466857c177c0315e8400fe7d64b930d52e12ce1

>---------------------------------------------------------------

commit 4466857c177c0315e8400fe7d64b930d52e12ce1
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Sep 12 03:08:07 2011 -0700

    NFData instances, contributed by Herbert Valerio Riedel <hvriedel at gmail.com>
    
    Ignore-this: 5279778ec762aa123b8ff68f417d5353
    
    darcs-hash:20110912100807-ac6dd-182208624a89df2741cdc147aa1f6255cf35ee9d


>---------------------------------------------------------------

4466857c177c0315e8400fe7d64b930d52e12ce1
 Data/Time/Calendar/Days.hs       | 4 ++++
 Data/Time/Clock/Scale.hs         | 8 ++++++++
 Data/Time/Clock/TAI.hs           | 4 ++++
 Data/Time/Clock/UTC.hs           | 7 +++++++
 Data/Time/LocalTime/LocalTime.hs | 7 +++++++
 Data/Time/LocalTime/TimeOfDay.hs | 4 ++++
 Data/Time/LocalTime/TimeZone.hs  | 4 ++++
 time.cabal                       | 4 ++--
 8 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index bd2be33..c09a273 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -7,6 +7,7 @@ module Data.Time.Calendar.Days
 	Day(..),addDays,diffDays
 ) where
 
+import Control.DeepSeq
 import Data.Ix
 import Data.Typeable
 #if LANGUAGE_Rank2Types
@@ -22,6 +23,9 @@ newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Or
 #endif
     )
 
+instance NFData Day where
+	rnf (ModifiedJulianDay a) = rnf a
+
 instance Typeable Day where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Calendar.Days.Day") []
 
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index fb67cc5..37c3f32 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -12,6 +12,7 @@ module Data.Time.Clock.Scale
         secondsToDiffTime, picosecondsToDiffTime
 ) where
 
+import Control.DeepSeq
 import Data.Ratio ((%))
 import Data.Fixed
 import Data.Typeable
@@ -29,6 +30,10 @@ newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (E
 #endif
     )
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance NFData UniversalTime where
+	rnf (ModJulianDate a) = rnf a
+
 instance Typeable UniversalTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.UniversalTime") []
 
@@ -46,6 +51,9 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
 #endif
     )
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance NFData DiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+
 instance Typeable DiffTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.DiffTime") []
 
diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 946e4ca..77c2134 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -18,6 +18,7 @@ module Data.Time.Clock.TAI
 import Data.Time.LocalTime
 import Data.Time.Calendar.Days
 import Data.Time.Clock
+import Control.DeepSeq
 import Data.Typeable
 import Data.Fixed
 #if LANGUAGE_Rank2Types
@@ -35,6 +36,9 @@ newtype AbsoluteTime = MkAbsoluteTime {unAbsoluteTime :: DiffTime} deriving (Eq,
 #endif
     )
 
+instance NFData AbsoluteTime where
+	rnf (MkAbsoluteTime a) = rnf a
+
 instance Typeable AbsoluteTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.TAI.AbsoluteTime") []
 
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 1153bf8..e172b15 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -15,6 +15,7 @@ module Data.Time.Clock.UTC
 	UTCTime(..),NominalDiffTime
 ) where
 
+import Control.DeepSeq
 import Data.Time.Calendar.Days
 import Data.Time.Clock.Scale
 import Data.Fixed
@@ -40,6 +41,9 @@ data UTCTime = UTCTime {
 #endif
 #endif
 
+instance NFData UTCTime where
+	rnf (UTCTime d t) = d `deepseq` t `deepseq` ()
+
 instance Typeable UTCTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.UTCTime") []
 
@@ -67,6 +71,9 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
 #endif
     )
 
+-- necessary because H98 doesn't have "cunning newtype" derivation
+instance NFData NominalDiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+
 instance Typeable NominalDiffTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.NominalDiffTime") []
 
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 0a79728..feb0341 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -17,6 +17,7 @@ import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar
 import Data.Time.Clock
+import Control.DeepSeq
 import Data.Typeable
 #if LANGUAGE_Rank2Types
 import Data.Data
@@ -39,6 +40,9 @@ data LocalTime = LocalTime {
 #endif
     )
 
+instance NFData LocalTime where
+	rnf (LocalTime d t) = d `deepseq` t `deepseq` ()
+
 instance Typeable LocalTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.LocalTime") []
 
@@ -79,6 +83,9 @@ data ZonedTime = ZonedTime {
 #endif
 #endif
 
+instance NFData ZonedTime where
+	rnf (ZonedTime lt z) = lt `deepseq` z `deepseq` ()
+
 instance Typeable ZonedTime where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.ZonedTime") []
 
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index 37b2079..ed0dbed 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -13,6 +13,7 @@ module Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar.Private
 import Data.Time.Clock
+import Control.DeepSeq
 import Data.Typeable
 import Data.Fixed
 #if LANGUAGE_Rank2Types
@@ -38,6 +39,9 @@ data TimeOfDay = TimeOfDay {
 #endif
     )
 
+instance NFData TimeOfDay where
+	rnf (TimeOfDay h m s) = h `deepseq` m `deepseq` s `seq` () -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+
 instance Typeable TimeOfDay where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeOfDay.TimeOfDay") []
 
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index 35ffaab..16b2e52 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -19,6 +19,7 @@ import Data.Time.Clock.POSIX
 
 import Foreign
 import Foreign.C
+import Control.DeepSeq
 import Data.Typeable
 #if LANGUAGE_Rank2Types
 import Data.Data
@@ -40,6 +41,9 @@ data TimeZone = TimeZone {
 #endif
     )
 
+instance NFData TimeZone where
+	rnf (TimeZone m so n) = m `deepseq` so `deepseq` n `deepseq` ()
+
 instance Typeable TimeZone where
 	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeZone.TimeZone") []
 
diff --git a/time.cabal b/time.cabal
index 21bf3e4..c8f0f0f 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.3
+version:        1.4
 stability:      stable
 license:        BSD3
 license-file:   LICENSE
@@ -35,7 +35,7 @@ extra-tmp-files:
 
 library
 {
-    build-depends: base == 4.*, old-locale
+    build-depends: base == 4.*, deepseq >= 1.1 && < 1.2, old-locale
     ghc-options: -Wall
     if impl(ghc)
         extensions: Rank2Types DeriveDataTypeable StandaloneDeriving


From git at git.haskell.org  Sun Dec 20 07:53:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:39 +0000 (UTC)
Subject: [commit: packages/time] master: remove upper bound on deepseq
 dependency (e395b77)
Message-ID: <20151220075339.E4DA23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e395b77cdd1f2f7573ad8938c2a55c87152acc11

>---------------------------------------------------------------

commit e395b77cdd1f2f7573ad8938c2a55c87152acc11
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Tue Sep 13 02:22:50 2011 -0700

    remove upper bound on deepseq dependency
    
    Ignore-this: d0b757647470d538d442591df4753e2
    
    darcs-hash:20110913092250-ac6dd-41757c62fa83dafea4fbddac27038fcb405ba108


>---------------------------------------------------------------

e395b77cdd1f2f7573ad8938c2a55c87152acc11
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index c8f0f0f..7acb243 100644
--- a/time.cabal
+++ b/time.cabal
@@ -35,7 +35,7 @@ extra-tmp-files:
 
 library
 {
-    build-depends: base == 4.*, deepseq >= 1.1 && < 1.2, old-locale
+    build-depends: base == 4.*, deepseq >= 1.1, old-locale
     ghc-options: -Wall
     if impl(ghc)
         extensions: Rank2Types DeriveDataTypeable StandaloneDeriving


From git at git.haskell.org  Sun Dec 20 07:53:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:41 +0000 (UTC)
Subject: [commit: packages/time] master: RULES for realToFrac, for speed,
 contributed by Liyang HU <haskell.org@liyang.hu> (8eee78e)
Message-ID: <20151220075341.EC2413A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8eee78e5d4de47651bb837adb28f3550e0611a52

>---------------------------------------------------------------

commit 8eee78e5d4de47651bb837adb28f3550e0611a52
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 30 17:38:00 2011 -0700

    RULES for realToFrac, for speed, contributed by Liyang HU <haskell.org at liyang.hu>
    
    Ignore-this: c277f94b61ec0c6eab64c1770478220b
    
    darcs-hash:20111031003800-ac6dd-affc63c79ba1478a0ebe610bdd42772a7fd85d86


>---------------------------------------------------------------

8eee78e5d4de47651bb837adb28f3550e0611a52
 Data/Time/Clock/Scale.hs    |  6 ++++++
 Data/Time/Clock/UTC.hs      |  9 +++++++++
 test/Makefile               | 10 +++++++---
 test/RealToFracBenchmark.hs | 22 ++++++++++++++++++++++
 time.cabal                  |  2 +-
 5 files changed, 45 insertions(+), 4 deletions(-)

diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index 37c3f32..ffa52a2 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -106,3 +106,9 @@ secondsToDiffTime = fromInteger
 -- | Create a 'DiffTime' from a number of picoseconds.
 picosecondsToDiffTime :: Integer -> DiffTime
 picosecondsToDiffTime x = fromRational (x % 1000000000000)
+
+{-# RULES
+"realToFrac/DiffTime->Pico"              realToFrac = \ (MkDiffTime ps) -> ps
+"realToFrac/Pico->DiffTime"              realToFrac = MkDiffTime
+  #-}
+
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index e172b15..4f3c23a 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -118,3 +118,12 @@ instance RealFrac NominalDiffTime where
 	round (MkNominalDiffTime a) = round a
 	ceiling (MkNominalDiffTime a) = ceiling a
 	floor (MkNominalDiffTime a) = floor a
+
+{-# RULES
+"realToFrac/DiffTime->NominalDiffTime"   realToFrac = \ dt -> MkNominalDiffTime (realToFrac dt)
+"realToFrac/NominalDiffTime->DiffTime"   realToFrac = \ (MkNominalDiffTime ps) -> realToFrac ps
+
+"realToFrac/NominalDiffTime->Pico"       realToFrac = \ (MkNominalDiffTime ps) -> ps
+"realToFrac/Pico->NominalDiffTime"       realToFrac = MkNominalDiffTime
+  #-}
+
diff --git a/test/Makefile b/test/Makefile
index f8ef07d..ca57f7d 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -52,6 +52,9 @@ TimeZone.ref: FORCE
 TestParseTime: TestParseTime.o
 	$(GHC) $(GHCFLAGS) $^ -o $@
 
+RealToFracBenchmark: RealToFracBenchmark.o
+	$(GHC) $(GHCFLAGS) $^ -o $@
+
 test:	\
 	TestMonthDay.diff	\
 	ConvertBack.diff0	\
@@ -64,13 +67,14 @@ test:	\
 	TestFormat.diff0	\
 	TestParseDAT.diff	\
 	TestEaster.diff	\
-	TestParseTime.run \
-	UseCases.o
+	TestParseTime.run	\
+	UseCases.o	\
+	RealToFracBenchmark.run
 	@echo "Success!"
 
 clean:
 	rm -rf TestMonthDay ConvertBack TestCalendars TestTime LongWeekYears ClipDates	\
-	AddDays TestFormat TestParseDAT TestEaster CurrentTime ShowDST TimeZone TimeZone.ref TestParseTime \
+	AddDays TestFormat TestParseDAT TestEaster CurrentTime ShowDST TimeZone TimeZone.ref TestParseTime RealToFracBenchmark \
         *.out *.run *.o *.hi Makefile.bak
 
 %.diff: %.ref %.out
diff --git a/test/RealToFracBenchmark.hs b/test/RealToFracBenchmark.hs
new file mode 100644
index 0000000..be4eae2
--- /dev/null
+++ b/test/RealToFracBenchmark.hs
@@ -0,0 +1,22 @@
+{- Contributed by Liyang HU <haskell.org at liyang.hu> -}
+module Main where
+
+import Prelude
+import Control.Applicative
+import Control.Monad
+import Control.DeepSeq
+import Data.Time
+import Data.Time.Clock.POSIX
+import System.Random
+
+main :: IO ()
+main = do
+    ts <- replicateM 100000 $ do
+        t <- posixSecondsToUTCTime . realToFrac <$>
+            ( (*) . fromInteger <$> randomRIO (-15*10^21, 15*10^21) <*>
+                randomIO :: IO Double ) :: IO UTCTime
+        rnf t `seq` return t
+    now <- getCurrentTime
+    print . sum $ map (diffUTCTime now) ts
+    print =<< flip diffUTCTime now <$> getCurrentTime
+
diff --git a/time.cabal b/time.cabal
index 7acb243..cadeea7 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4
+version:        1.4.0.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:53:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:43 +0000 (UTC)
Subject: [commit: packages/time] master: fix for latest GHC (1674b5d)
Message-ID: <20151220075343.F2E823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1674b5d844d146915003beb46c152b3056cfd3a9

>---------------------------------------------------------------

commit 1674b5d844d146915003beb46c152b3056cfd3a9
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Jul 7 19:59:16 2012 -0700

    fix for latest GHC
    
    Ignore-this: b6ff8799465d56758c990e952c77e140
    
    darcs-hash:20120708025916-ac6dd-6a0bae17c075e655e248024f48e0fed5a259433f


>---------------------------------------------------------------

1674b5d844d146915003beb46c152b3056cfd3a9
 test/TestParseTime.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/TestParseTime.hs b/test/TestParseTime.hs
index a8b3832..1ee7368 100644
--- a/test/TestParseTime.hs
+++ b/test/TestParseTime.hs
@@ -78,7 +78,7 @@ expectedYear :: Integer -> Integer
 expectedYear i | i >= 69 = 1900 + i
 expectedYear i = 2000 + i
 
-show2 :: (Integral n) => n -> String
+show2 :: (Integral n,Show n) => n -> String
 show2 i = (show (div i 10)) ++ (show (mod i 10))
 
 parseYY :: Integer -> IO Bool


From git at git.haskell.org  Sun Dec 20 07:53:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:46 +0000 (UTC)
Subject: [commit: packages/time] master: changed uses of mkTyCon to mkTyCon3
 (8f9b7ae)
Message-ID: <20151220075346.05A653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8f9b7ae035401105e311dcd8596da5d1aa2f5801

>---------------------------------------------------------------

commit 8f9b7ae035401105e311dcd8596da5d1aa2f5801
Author: blackredtree <blackredtree at gmail.com>
Date:   Thu Sep 13 15:00:34 2012 -0700

    changed uses of mkTyCon to mkTyCon3
    
    Ignore-this: f31d15b2eccb114f507cadfcda0b0630
    
    darcs-hash:20120913220034-08fed-bb57957a23120580281bea112d59d15509920b0e


>---------------------------------------------------------------

8f9b7ae035401105e311dcd8596da5d1aa2f5801
 Data/Time/Calendar/Days.hs       | 2 +-
 Data/Time/Clock/Scale.hs         | 4 ++--
 Data/Time/Clock/TAI.hs           | 2 +-
 Data/Time/Clock/UTC.hs           | 4 ++--
 Data/Time/LocalTime/LocalTime.hs | 4 ++--
 Data/Time/LocalTime/TimeOfDay.hs | 2 +-
 Data/Time/LocalTime/TimeZone.hs  | 2 +-
 7 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index c09a273..6911833 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -27,7 +27,7 @@ instance NFData Day where
 	rnf (ModifiedJulianDay a) = rnf a
 
 instance Typeable Day where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Calendar.Days.Day") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Calendar.Days" "Day") []
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum Day where
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index ffa52a2..237a77b 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -35,7 +35,7 @@ instance NFData UniversalTime where
 	rnf (ModJulianDate a) = rnf a
 
 instance Typeable UniversalTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.UniversalTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "UniversalTime") []
 
 -- | This is a length of time, as measured by a clock.
 -- Conversion functions will treat it as seconds.
@@ -55,7 +55,7 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
 instance NFData DiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
 instance Typeable DiffTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.Scale.DiffTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "DiffTime") []
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum DiffTime where
diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 77c2134..5e6bfef 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -40,7 +40,7 @@ instance NFData AbsoluteTime where
 	rnf (MkAbsoluteTime a) = rnf a
 
 instance Typeable AbsoluteTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.TAI.AbsoluteTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.TAI" "AbsoluteTime") []
 
 instance Show AbsoluteTime where
 	show t = show (utcToLocalTime utc (taiToUTCTime (const 0) t)) ++ " TAI" -- ugly, but standard apparently
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 4f3c23a..da1ecc2 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -45,7 +45,7 @@ instance NFData UTCTime where
 	rnf (UTCTime d t) = d `deepseq` t `deepseq` ()
 
 instance Typeable UTCTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.UTCTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "UTCTime") []
 
 instance Eq UTCTime where
 	(UTCTime da ta) == (UTCTime db tb) = (da == db) && (ta == tb)
@@ -75,7 +75,7 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
 instance NFData NominalDiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
 instance Typeable NominalDiffTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.Clock.UTC.NominalDiffTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "NominalDiffTime") []
 
 instance Enum NominalDiffTime where
 	succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index feb0341..02f06a4 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -44,7 +44,7 @@ instance NFData LocalTime where
 	rnf (LocalTime d t) = d `deepseq` t `deepseq` ()
 
 instance Typeable LocalTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.LocalTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "LocalTime") []
 
 instance Show LocalTime where
 	show (LocalTime d t) = (showGregorian d) ++ " " ++ (show t)
@@ -87,7 +87,7 @@ instance NFData ZonedTime where
 	rnf (ZonedTime lt z) = lt `deepseq` z `deepseq` ()
 
 instance Typeable ZonedTime where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.LocalTime.ZonedTime") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "ZonedTime") []
 
 utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime
 utcToZonedTime zone time = ZonedTime (utcToLocalTime zone time) zone
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index ed0dbed..8fdf539 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -43,7 +43,7 @@ instance NFData TimeOfDay where
 	rnf (TimeOfDay h m s) = h `deepseq` m `deepseq` s `seq` () -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
 instance Typeable TimeOfDay where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeOfDay.TimeOfDay") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeOfDay" "TimeOfDay") []
 
 -- | Hour zero
 midnight :: TimeOfDay
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index 16b2e52..689288f 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -45,7 +45,7 @@ instance NFData TimeZone where
 	rnf (TimeZone m so n) = m `deepseq` so `deepseq` n `deepseq` ()
 
 instance Typeable TimeZone where
-	typeOf _ = mkTyConApp (mkTyCon "Data.Time.LocalTime.TimeZone.TimeZone") []
+	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeZone" "TimeZone") []
 
 -- | Create a nameless non-summer timezone for this number of minutes
 minutesToTimeZone :: Int -> TimeZone


From git at git.haskell.org  Sun Dec 20 07:53:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:48 +0000 (UTC)
Subject: [commit: packages/time] master: revamped tests to use the new cabal
 testing interface (df3fc69)
Message-ID: <20151220075348.1845F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/df3fc69a5e9b5a668933b1c6cca88a9ab6d14db2

>---------------------------------------------------------------

commit df3fc69a5e9b5a668933b1c6cca88a9ab6d14db2
Author: blackredtree <blackredtree at gmail.com>
Date:   Thu Sep 13 15:22:27 2012 -0700

    revamped tests to use the new cabal testing interface
    
    Ignore-this: bf07a09bbbf9641fcaa104d0540b9646
    
    tests now use string comparsion instead of diffing to determine test results
    
    .ref files were converted into hs modules exporting the same data
    
    darcs-hash:20120913222227-08fed-71851925b9e0a2a7b67d193b8e92fac37fc95c6f


>---------------------------------------------------------------

df3fc69a5e9b5a668933b1c6cca88a9ab6d14db2
 {test => Test}/AddDays.hs             |  14 +-
 Test/AddDaysRef.hs                    | 249 ++++++++++
 Test/ClipDates.hs                     |  56 +++
 Test/ClipDatesRef.hs                  | 565 ++++++++++++++++++++++
 Test/ConvertBack.hs                   |  46 ++
 {test => Test}/CurrentTime.hs         |   0
 Test/LongWeekYears.hs                 |  26 +
 Test/LongWeekYearsRef.hs              | 154 ++++++
 {test => Test}/Makefile               |   0
 {test => Test}/RealToFracBenchmark.hs |   0
 {test => Test}/ShowDST.hs             |   0
 Test/TAI_UTC_DAT.hs                   |  41 ++
 {test => Test}/TestCalendars.hs       |  20 +-
 Test/TestCalendarsRef.hs              |   8 +
 Test/TestEaster.hs                    |  40 ++
 Test/TestEasterRef.hs                 |  61 +++
 {test => Test}/TestFormat.hs          | 111 +++--
 {test => Test}/TestFormatStuff.c      |   0
 {test => Test}/TestFormatStuff.h      |   0
 Test/TestMonthDay.hs                  |  29 ++
 Test/TestMonthDayRef.hs               | 750 +++++++++++++++++++++++++++++
 {test => Test}/TestParseDAT.hs        |  48 +-
 Test/TestParseDAT_Ref.hs              |  94 ++++
 {test => Test}/TestParseTime.hs       |  23 +-
 Test/TestTime.hs                      | 112 +++++
 Test/TestTimeRef.hs                   | 880 ++++++++++++++++++++++++++++++++++
 {test => Test}/TimeZone.hs            |   0
 {test => Test}/UseCases.lhs           |   0
 test/AddDays.ref                      | 245 ----------
 test/ClipDates.hs                     |  26 -
 test/ClipDates.ref                    | 561 ----------------------
 test/ConvertBack.hs                   |  36 --
 test/LongWeekYears.hs                 |  18 -
 test/LongWeekYears.ref                | 150 ------
 test/TestCalendars.ref                |   4 -
 test/TestEaster.hs                    |  23 -
 test/TestEaster.ref                   |  57 ---
 test/TestMonthDay.hs                  |  20 -
 test/TestMonthDay.ref                 | 746 ----------------------------
 test/TestParseDAT.ref                 |  90 ----
 test/TestTime.hs                      |  97 ----
 test/TestTime.ref                     | 874 ---------------------------------
 test/tai-utc.dat                      |  37 --
 time.cabal                            |  66 ++-
 44 files changed, 3307 insertions(+), 3070 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc df3fc69a5e9b5a668933b1c6cca88a9ab6d14db2

From git at git.haskell.org  Sun Dec 20 07:53:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:50 +0000 (UTC)
Subject: [commit: packages/time] master: removed unneccesary Makefile (b317b99)
Message-ID: <20151220075350.1EBF53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b317b9924e78b343f585a92cbb66d486a6e80bc4

>---------------------------------------------------------------

commit b317b9924e78b343f585a92cbb66d486a6e80bc4
Author: blackredtree <blackredtree at gmail.com>
Date:   Thu Sep 13 15:24:52 2012 -0700

    removed unneccesary Makefile
    
    Ignore-this: cf806b83e0305616c9ab0f403ee90cd0
    
    darcs-hash:20120913222452-08fed-25ca1213291a7fafe793405b1b265ffddc4f1a5d


>---------------------------------------------------------------

b317b9924e78b343f585a92cbb66d486a6e80bc4
 Test/Makefile | 105 ----------------------------------------------------------
 1 file changed, 105 deletions(-)

diff --git a/Test/Makefile b/Test/Makefile
deleted file mode 100644
index ca57f7d..0000000
--- a/Test/Makefile
+++ /dev/null
@@ -1,105 +0,0 @@
-GHC = ghc
-GHCFLAGS = -package time -package QuickCheck-1.2.0.1
-
-default:
-	make CurrentTime.run ShowDST.run test
-
-TestMonthDay: TestMonthDay.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-ConvertBack: ConvertBack.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TestCalendars: TestCalendars.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TestTime: TestTime.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-LongWeekYears: LongWeekYears.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-ClipDates: ClipDates.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-AddDays: AddDays.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TestFormat: TestFormat.o TestFormatStuff.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TestFormatStuff.o: TestFormatStuff.c TestFormatStuff.h
-	gcc -o $@ -c $<
-
-TestParseDAT: TestParseDAT.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TestEaster: TestEaster.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-CurrentTime: CurrentTime.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-ShowDST: ShowDST.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TimeZone: TimeZone.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-TimeZone.ref: FORCE
-	date +%z > $@
-
-TestParseTime: TestParseTime.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-RealToFracBenchmark: RealToFracBenchmark.o
-	$(GHC) $(GHCFLAGS) $^ -o $@
-
-test:	\
-	TestMonthDay.diff	\
-	ConvertBack.diff0	\
-	TestCalendars.diff	\
-	TestTime.diff	\
-	LongWeekYears.diff	\
-	ClipDates.diff	\
-	AddDays.diff	\
-	TimeZone.diff	\
-	TestFormat.diff0	\
-	TestParseDAT.diff	\
-	TestEaster.diff	\
-	TestParseTime.run	\
-	UseCases.o	\
-	RealToFracBenchmark.run
-	@echo "Success!"
-
-clean:
-	rm -rf TestMonthDay ConvertBack TestCalendars TestTime LongWeekYears ClipDates	\
-	AddDays TestFormat TestParseDAT TestEaster CurrentTime ShowDST TimeZone TimeZone.ref TestParseTime RealToFracBenchmark \
-        *.out *.run *.o *.hi Makefile.bak
-
-%.diff: %.ref %.out
-	diff -u $^
-
-%.diff0: %.out
-	diff -u /dev/null $^
-
-%.out: %
-	./$< > $@
-
-%.run: %
-	./$<
-	touch $@
-
-%.hi: %.o
-	@:
-
-%.o: %.hs
-	$(GHC) $(GHCFLAGS) -c $< -o $@
-
-%.o: %.lhs
-	$(GHC) $(GHCFLAGS) -c $< -o $@
-
-FORCE:
-
-.SECONDARY:
-


From git at git.haskell.org  Sun Dec 20 07:53:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:52 +0000 (UTC)
Subject: [commit: packages/time] master: added Test.Tests and Test.TestUtil
 modules (46ce767)
Message-ID: <20151220075352.273113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/46ce76714c2a83d851a644a170ac958673aaa86c

>---------------------------------------------------------------

commit 46ce76714c2a83d851a644a170ac958673aaa86c
Author: blackredtree <blackredtree at gmail.com>
Date:   Thu Sep 20 15:41:04 2012 -0700

    added Test.Tests and Test.TestUtil modules
    
    Ignore-this: d5fe357080d6ed4f83e2272ad789bbb3
    
    darcs-hash:20120920224104-08fed-3afdeb091b1fab883b255c1be18af368c103dd2c


>---------------------------------------------------------------

46ce76714c2a83d851a644a170ac958673aaa86c
 Test/TestUtil.hs | 43 +++++++++++++++++++++++++++++++++++++++++++
 Test/Tests.hs    | 26 ++++++++++++++++++++++++++
 2 files changed, 69 insertions(+)

diff --git a/Test/TestUtil.hs b/Test/TestUtil.hs
new file mode 100644
index 0000000..237bcfb
--- /dev/null
+++ b/Test/TestUtil.hs
@@ -0,0 +1,43 @@
+module Test.TestUtil
+  ( SimpleTest(..)
+  , IO_SimpleTest(..)
+  , diff
+  , module Distribution.TestSuite )
+ where
+
+import Distribution.TestSuite
+
+import System.Cmd
+import System.Exit
+
+--
+
+data SimpleTest = SimpleTest String Result
+
+instance TestOptions SimpleTest where
+  name (SimpleTest s _) = s
+  options = const []
+  defaultOptions _ = return $ Options []
+  check _ _ = []
+  
+instance PureTestable SimpleTest where
+  run (SimpleTest _ r) _ = r
+
+--
+
+data IO_SimpleTest = IO_SimpleTest String (IO Result)
+
+instance TestOptions IO_SimpleTest where
+  name (IO_SimpleTest s _) = s
+  options = const []
+  defaultOptions _ = return $ Options []
+  check _ _ = []
+
+instance ImpureTestable IO_SimpleTest where
+  runM (IO_SimpleTest _ r) _ = r
+
+--
+
+diff :: String -> String -> Result
+diff s t
+  = if s == t then Pass else Fail ""
diff --git a/Test/Tests.hs b/Test/Tests.hs
new file mode 100644
index 0000000..d8e1cb2
--- /dev/null
+++ b/Test/Tests.hs
@@ -0,0 +1,26 @@
+module Test.Tests where
+
+import Distribution.TestSuite
+
+import Test.AddDays
+import Test.ClipDates
+import Test.ConvertBack
+import Test.LongWeekYears
+import Test.TestCalendars
+import Test.TestEaster
+import Test.TestFormat
+import Test.TestMonthDay
+import Test.TestParseDAT
+import Test.TestTime
+
+tests :: [Test]
+tests = [ addDaysTest
+        , clipDates
+        , convertBack
+        , longWeekYears
+        , testCalendars
+        , testEaster
+        , testFormat
+        , testMonthDay
+        , testParseDAT
+        , testTime ]


From git at git.haskell.org  Sun Dec 20 07:53:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:54 +0000 (UTC)
Subject: [commit: packages/time] master: get working with Cabal 1.16;
 fix up build process (2fa30f7)
Message-ID: <20151220075354.2DCFC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2fa30f752df06fad3f4245f99b9c3aefcdf447df

>---------------------------------------------------------------

commit 2fa30f752df06fad3f4245f99b9c3aefcdf447df
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 21 16:48:44 2012 -0700

    get working with Cabal 1.16; fix up build process
    
    Ignore-this: f4503eb3fa2fbd1ac938024548d1176f
    
    darcs-hash:20121021234844-ac6dd-fc357fa538cdf5e1c09c14771cd37c204331a35a


>---------------------------------------------------------------

2fa30f752df06fad3f4245f99b9c3aefcdf447df
 Makefile         | 10 +++++-----
 Setup.hs         | 18 +-----------------
 Test/TestUtil.hs | 38 ++++++++------------------------------
 Test/Tests.hs    |  4 ++--
 configure.ac     |  2 ++
 time.cabal       |  6 +++---
 6 files changed, 21 insertions(+), 57 deletions(-)

diff --git a/Makefile b/Makefile
index a0b37a9..37a78fc 100644
--- a/Makefile
+++ b/Makefile
@@ -6,24 +6,24 @@ clean:
 	cabal clean
 
 configure:
-	cabal configure --enable-library-profiling --enable-executable-profiling
+	cabal configure --enable-library-profiling --enable-executable-profiling --enable-tests
 
 build: configure
 	cabal build --ghc-options=-Werror
 
-test: install
+test: build
 	cabal test
 
 haddock: configure
 	cabal haddock
 
-install: build haddock
+install: build test haddock
 	cabal install --user --enable-library-profiling --enable-executable-profiling
 
-sdist: configure
+sdist: clean configure
 	cabal sdist
 
 # switch off intermediate file deletion
 .SECONDARY:
 
-.PHONY: default configure build haddock install test sdist
+.PHONY: default clean configure build haddock install test sdist
diff --git a/Setup.hs b/Setup.hs
index cdd46de..26fdbce 100644
--- a/Setup.hs
+++ b/Setup.hs
@@ -1,26 +1,10 @@
 module Main (main) where
 
-import Control.Exception
-import Distribution.PackageDescription
 import Distribution.Simple
-import Distribution.Simple.LocalBuildInfo
-import Distribution.Simple.Utils
-import System.Cmd
-import System.Directory
 import System.Info
 
 main :: IO ()
 main = case os of
     "windows" -> defaultMain
     "mingw32" -> defaultMain
-    _ -> let hooks = autoconfUserHooks { runTests = runTestScript } in defaultMainWithHooks hooks
-
-withCurrentDirectory :: FilePath -> IO a -> IO a
-withCurrentDirectory path f = do
-    cur <- getCurrentDirectory
-    setCurrentDirectory path
-    finally f (setCurrentDirectory cur)
-
-runTestScript :: Args -> Bool -> PackageDescription -> LocalBuildInfo -> IO ()
-runTestScript _args _flag _pd _lbi
- = maybeExit $ withCurrentDirectory "test" $ system "make"
+    _ -> defaultMainWithHooks autoconfUserHooks
diff --git a/Test/TestUtil.hs b/Test/TestUtil.hs
index 237bcfb..2c0be91 100644
--- a/Test/TestUtil.hs
+++ b/Test/TestUtil.hs
@@ -1,42 +1,20 @@
 module Test.TestUtil
-  ( SimpleTest(..)
-  , IO_SimpleTest(..)
-  , diff
-  , module Distribution.TestSuite )
- where
+  (
+  module Test.TestUtil
+  , module Distribution.TestSuite
+  ) where
 
 import Distribution.TestSuite
 
-import System.Cmd
-import System.Exit
-
---
-
 data SimpleTest = SimpleTest String Result
 
-instance TestOptions SimpleTest where
-  name (SimpleTest s _) = s
-  options = const []
-  defaultOptions _ = return $ Options []
-  check _ _ = []
-  
-instance PureTestable SimpleTest where
-  run (SimpleTest _ r) _ = r
-
---
+pure :: SimpleTest -> Test
+pure (SimpleTest name result) = Test (TestInstance (return (Finished result)) name [] [] (\_ _ -> Left ""))
 
 data IO_SimpleTest = IO_SimpleTest String (IO Result)
 
-instance TestOptions IO_SimpleTest where
-  name (IO_SimpleTest s _) = s
-  options = const []
-  defaultOptions _ = return $ Options []
-  check _ _ = []
-
-instance ImpureTestable IO_SimpleTest where
-  runM (IO_SimpleTest _ r) _ = r
-
---
+impure :: IO_SimpleTest -> Test
+impure (IO_SimpleTest name mresult) = Test (TestInstance (fmap Finished mresult) name [] [] (\_ _ -> Left ""))
 
 diff :: String -> String -> Result
 diff s t
diff --git a/Test/Tests.hs b/Test/Tests.hs
index d8e1cb2..2185918 100644
--- a/Test/Tests.hs
+++ b/Test/Tests.hs
@@ -13,8 +13,8 @@ import Test.TestMonthDay
 import Test.TestParseDAT
 import Test.TestTime
 
-tests :: [Test]
-tests = [ addDaysTest
+tests :: IO [Test]
+tests = return [ addDaysTest
         , clipDates
         , convertBack
         , longWeekYears
diff --git a/configure.ac b/configure.ac
index dc58c49..927625a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,6 +6,8 @@ AC_CONFIG_SRCDIR([include/HsTime.h])
 AC_ARG_WITH([cc],
             [C compiler],
             [CC=$withval])
+AC_ARG_WITH([gcc],[Gnu C compiler])
+AC_ARG_WITH([compiler],[Haskell compiler])
 AC_PROG_CC()
 
 AC_CONFIG_HEADERS([include/HsTimeConfig.h])
diff --git a/time.cabal b/time.cabal
index e6e2668..ec13915 100644
--- a/time.cabal
+++ b/time.cabal
@@ -9,8 +9,8 @@ homepage:       http://semantic.org/TimeLib/
 synopsis:       A time library
 description:    A time library
 category:       System
-build-type:     Simple
-cabal-version:  >=1.9.2
+build-type:     Custom
+cabal-version:  >=1.16
 x-follows-version-policy:
 
 extra-source-files:
@@ -91,7 +91,7 @@ Test-Suite tests
   cpp-options: -DLANGUAGE_Rank2Types -DLANGUAGE_DeriveDataTypeable -DLANGUAGE_StandaloneDeriving
   c-sources: cbits/HsTime.c Test/TestFormatStuff.c
   include-dirs: include
-  build-depends: base, deepseq, Cabal >= 1.9.2, old-locale, process
+  build-depends: base, deepseq, Cabal >= 1.16, old-locale, process
   other-modules:
     Test.TestTime
     Test.TestTimeRef


From git at git.haskell.org  Sun Dec 20 07:53:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:56 +0000 (UTC)
Subject: [commit: packages/time] master: clean up tests (54a7b3b)
Message-ID: <20151220075356.358D23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/54a7b3baccde8bcafd9238f587f728e9beb73b7f

>---------------------------------------------------------------

commit 54a7b3baccde8bcafd9238f587f728e9beb73b7f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 28 17:05:35 2012 -0700

    clean up tests
    
    Ignore-this: daf151d23ca95cf9938f58b2378b68df
    
    darcs-hash:20121029000535-ac6dd-aa7918f6f704d0591e929c58c506b69250593844


>---------------------------------------------------------------

54a7b3baccde8bcafd9238f587f728e9beb73b7f
 Test/AddDays.hs       |   2 +-
 Test/ClipDates.hs     |   2 +-
 Test/ConvertBack.hs   |   2 +-
 Test/LongWeekYears.hs |   2 +-
 Test/TestCalendars.hs |   2 +-
 Test/TestEaster.hs    |   2 +-
 Test/TestFormat.hs    | 103 ++++++++++++++++++++------------------------------
 Test/TestMonthDay.hs  |   2 +-
 Test/TestParseDAT.hs  |   2 +-
 Test/TestTime.hs      |   2 +-
 Test/TestUtil.hs      |  37 ++++++++++++++++--
 11 files changed, 83 insertions(+), 75 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 54a7b3baccde8bcafd9238f587f728e9beb73b7f

From git at git.haskell.org  Sun Dec 20 07:53:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:53:58 +0000 (UTC)
Subject: [commit: packages/time] master: clean up cabal (f3549c0)
Message-ID: <20151220075358.3C3233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f3549c01321318e863201c60fbab1cae0d7009c0

>---------------------------------------------------------------

commit f3549c01321318e863201c60fbab1cae0d7009c0
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 28 22:26:12 2012 -0700

    clean up cabal
    
    Ignore-this: 5e5b69183c6e72366a4dd98122daa5ef
    
    darcs-hash:20121029052612-ac6dd-bcb9e948acbc01ea8ce0964bcbdd20afe27d0796


>---------------------------------------------------------------

f3549c01321318e863201c60fbab1cae0d7009c0
 Setup.hs   | 10 ----------
 time.cabal | 14 ++++++++------
 2 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/Setup.hs b/Setup.hs
deleted file mode 100644
index 26fdbce..0000000
--- a/Setup.hs
+++ /dev/null
@@ -1,10 +0,0 @@
-module Main (main) where
-
-import Distribution.Simple
-import System.Info
-
-main :: IO ()
-main = case os of
-    "windows" -> defaultMain
-    "mingw32" -> defaultMain
-    _ -> defaultMainWithHooks autoconfUserHooks
diff --git a/time.cabal b/time.cabal
index ec13915..6574f89 100644
--- a/time.cabal
+++ b/time.cabal
@@ -9,7 +9,7 @@ homepage:       http://semantic.org/TimeLib/
 synopsis:       A time library
 description:    A time library
 category:       System
-build-type:     Custom
+build-type:     Configure
 cabal-version:  >=1.16
 x-follows-version-policy:
 
@@ -34,16 +34,17 @@ extra-tmp-files:
     include/HsTimeConfig.h
 
 library
-    Build-Depends: base >= 4,
+    build-depends: base >= 4,
                    deepseq >= 1.1,
                    old-locale
     ghc-options: -Wall
+    default-language: Haskell2010
     if impl(ghc)
-        extensions: Rank2Types DeriveDataTypeable StandaloneDeriving
+        default-extensions: Rank2Types DeriveDataTypeable StandaloneDeriving
         cpp-options: -DLANGUAGE_Rank2Types -DLANGUAGE_DeriveDataTypeable -DLANGUAGE_StandaloneDeriving
     else
         if impl(hugs)
-            extensions: Rank2Types
+            default-extensions: Rank2Types
             cpp-options: -DLANGUAGE_Rank2Types
     if os(windows)
         build-depends: Win32
@@ -60,7 +61,7 @@ library
         Data.Time.LocalTime,
         Data.Time.Format,
         Data.Time
-    extensions:    ForeignFunctionInterface, CPP
+    default-extensions:    CPP
     c-sources:    cbits/HsTime.c
     other-modules:
         Data.Time.Calendar.Private,
@@ -87,7 +88,8 @@ library
 Test-Suite tests
   type: detailed-0.9
   test-module: Test.Tests
-  extensions: Rank2Types, ForeignFunctionInterface, CPP, DeriveDataTypeable, StandaloneDeriving 
+  default-language: Haskell2010
+  default-extensions: Rank2Types, CPP, DeriveDataTypeable, StandaloneDeriving 
   cpp-options: -DLANGUAGE_Rank2Types -DLANGUAGE_DeriveDataTypeable -DLANGUAGE_StandaloneDeriving
   c-sources: cbits/HsTime.c Test/TestFormatStuff.c
   include-dirs: include


From git at git.haskell.org  Sun Dec 20 07:54:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:00 +0000 (UTC)
Subject: [commit: packages/time] master: more TestInstance clean-up (0417890)
Message-ID: <20151220075400.42C5A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/041789051b0d6aa09d03560bf0b5b3c7fda9c645

>---------------------------------------------------------------

commit 041789051b0d6aa09d03560bf0b5b3c7fda9c645
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 28 22:28:49 2012 -0700

    more TestInstance clean-up
    
    Ignore-this: 2596abdead9de1796655be9e58f2ce95
    
    darcs-hash:20121029052849-ac6dd-ebd63fbd2dd9044bcd2ec8f5c5073c5514eac0f5


>---------------------------------------------------------------

041789051b0d6aa09d03560bf0b5b3c7fda9c645
 Test/AddDays.hs       |  2 +-
 Test/ClipDates.hs     |  2 +-
 Test/ConvertBack.hs   |  2 +-
 Test/LongWeekYears.hs |  2 +-
 Test/TestCalendars.hs |  2 +-
 Test/TestEaster.hs    |  2 +-
 Test/TestFormat.hs    |  4 ++--
 Test/TestMonthDay.hs  |  2 +-
 Test/TestParseDAT.hs  |  2 +-
 Test/TestTime.hs      |  2 +-
 Test/TestUtil.hs      | 38 +++++++++++++++++---------------------
 11 files changed, 28 insertions(+), 32 deletions(-)

diff --git a/Test/AddDays.hs b/Test/AddDays.hs
index a3754d9..0066673 100644
--- a/Test/AddDays.hs
+++ b/Test/AddDays.hs
@@ -43,5 +43,5 @@ resultDays = do
 
 addDaysTest :: Test
 addDaysTest
-  = Test $ pure $ SimpleTest "addDays"
+  = Test $ pure "addDays"
       $ diff addDaysRef $ unlines resultDays
diff --git a/Test/ClipDates.hs b/Test/ClipDates.hs
index 1b5d35f..761b9e9 100644
--- a/Test/ClipDates.hs
+++ b/Test/ClipDates.hs
@@ -35,7 +35,7 @@ tupleUp3 l1 l2 l3
 
 clipDates :: Test
 clipDates
-  = Test $ pure $ SimpleTest "clipDates"
+  = Test $ pure "clipDates"
       $ let yad  = unlines $ map yearAndDay
                    $ tupleUp2 [1968,1969,1971] [-4,0,1,200,364,365,366,367,700]
                               
diff --git a/Test/ConvertBack.hs b/Test/ConvertBack.hs
index ce0238b..857e80f 100644
--- a/Test/ConvertBack.hs
+++ b/Test/ConvertBack.hs
@@ -42,5 +42,5 @@ days = [ModifiedJulianDay 50000 .. ModifiedJulianDay 50200] ++
 
 convertBack :: Test
 convertBack
-  = Test $ pure $ SimpleTest "convertBack"
+  = Test $ pure "convertBack"
       $ diff "" $ concatMap (\ch -> concatMap ch days) checkers
diff --git a/Test/LongWeekYears.hs b/Test/LongWeekYears.hs
index 7824425..220b3c7 100644
--- a/Test/LongWeekYears.hs
+++ b/Test/LongWeekYears.hs
@@ -22,5 +22,5 @@ showLongYear year
 
 longWeekYears :: Test
 longWeekYears
-  = Test $ pure $ SimpleTest "longWeekYears"
+  = Test $ pure "longWeekYears"
       $ diff longWeekYearsRef $ unlines $ map showLongYear [1901 .. 2050]
diff --git a/Test/TestCalendars.hs b/Test/TestCalendars.hs
index 324b792..5f1932c 100644
--- a/Test/TestCalendars.hs
+++ b/Test/TestCalendars.hs
@@ -29,7 +29,7 @@ days = [
 
 testCalendars :: Test
 testCalendars 
-  = Test $ pure $ SimpleTest "testCalendars"
+  = Test $ pure "testCalendars"
       $ diff testCalendarsRef 
           $ unlines $ map (\d -> showShowers d) days
  where
diff --git a/Test/TestEaster.hs b/Test/TestEaster.hs
index b6b9bd7..e97c84e 100644
--- a/Test/TestEaster.hs
+++ b/Test/TestEaster.hs
@@ -21,7 +21,7 @@ showWithWDay = formatTime defaultTimeLocale "%F %A"
 
 testEaster :: Test
 testEaster 
-  = Test $ pure $ SimpleTest "testEaster"
+  = Test $ pure "testEaster"
       $ let ds = unlines $ map (\day ->
                    unwords [ showWithWDay day, "->"
                            , showWithWDay (sundayAfter day)]) days
diff --git a/Test/TestFormat.hs b/Test/TestFormat.hs
index eb8b2ee..001de68 100644
--- a/Test/TestFormat.hs
+++ b/Test/TestFormat.hs
@@ -75,7 +75,7 @@ times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
 compareFormat :: String -> (String -> String) -> String -> TimeZone -> UTCTime -> TestInstance
 compareFormat testname modUnix fmt zone time =
   let ctime = utcToZonedTime zone time in
-  impure $ IO_SimpleTest (testname ++ ": " ++ (show fmt) ++ " of " ++ (show ctime)) $
+  impure (testname ++ ": " ++ (show fmt) ++ " of " ++ (show ctime)) $
     do
       let haskellText = formatTime locale fmt ctime
       unixText <- fmap modUnix (unixFormatTime fmt zone time)
@@ -124,7 +124,7 @@ safeString s = do
    [] -> return ""
 
 compareExpected :: (Eq t,Show t,ParseTime t) => String -> String -> String -> Maybe t -> TestInstance
-compareExpected testname fmt str expected = impure $ IO_SimpleTest (testname ++ ": " ++ (show fmt) ++ " on " ++ (show str)) $ do
+compareExpected testname fmt str expected = impure (testname ++ ": " ++ (show fmt) ++ " on " ++ (show str)) $ do
     let found = parseTime defaultTimeLocale fmt str
     mex <- getBottom found
     case mex of
diff --git a/Test/TestMonthDay.hs b/Test/TestMonthDay.hs
index 0d3a665..fa3bdcc 100644
--- a/Test/TestMonthDay.hs
+++ b/Test/TestMonthDay.hs
@@ -15,7 +15,7 @@ showCompare a1 b a2 = "DIFF: " ++ (show a1) ++ " -> " ++ b ++ " -> " ++ (show a2
 
 testMonthDay :: Test
 testMonthDay
-  = Test $ pure $ SimpleTest "testMonthDay"
+  = Test $ pure "testMonthDay"
       $ diff testMonthDayRef 
             $ concat $ map (\isL -> unlines (leap isL : yearDays isL)) [False,True]
  where
diff --git a/Test/TestParseDAT.hs b/Test/TestParseDAT.hs
index 187d062..313758d 100644
--- a/Test/TestParseDAT.hs
+++ b/Test/TestParseDAT.hs
@@ -43,7 +43,7 @@ times =
 
 testParseDAT :: Test
 testParseDAT
-  = Test $ pure $ SimpleTest "testParseDAT"
+  = Test $ pure "testParseDAT"
       $ diff testParseDAT_Ref parseDAT
  where
   parseDAT =
diff --git a/Test/TestTime.hs b/Test/TestTime.hs
index c47712e..cfa476b 100644
--- a/Test/TestTime.hs
+++ b/Test/TestTime.hs
@@ -108,5 +108,5 @@ testTimeOfDayToDayFraction
 
 testTime :: Test
 testTime
-  = Test $ pure $ SimpleTest "testTime"
+  = Test $ pure "testTime"
       $ diff testTimeRef $ unlines [testCal, testUTC, testUT1, testTimeOfDayToDayFraction]
diff --git a/Test/TestUtil.hs b/Test/TestUtil.hs
index 776b859..88d95d2 100644
--- a/Test/TestUtil.hs
+++ b/Test/TestUtil.hs
@@ -6,19 +6,21 @@ module Test.TestUtil
 
 import Distribution.TestSuite
 
-data SimpleTest = SimpleTest String Result
-
-pure :: SimpleTest -> TestInstance
-pure (SimpleTest name result) = TestInstance (return (Finished result)) name [] [] (\_ _ -> Left "")
-
-data IO_SimpleTest = IO_SimpleTest String (IO Result)
+impure :: String -> IO Result -> TestInstance
+impure name mresult = TestInstance {
+    run = fmap Finished mresult,
+    name = name,
+    tags = [],
+    options = [],
+    setOption = \_ _ -> Left "unsupported"
+}
 
-impure :: IO_SimpleTest -> TestInstance
-impure (IO_SimpleTest name mresult) = TestInstance (fmap Finished mresult) name [] [] (\_ _ -> Left "")
+pure :: String -> Result -> TestInstance
+pure name result = impure name (return result)
 
 diff :: String -> String -> Result
-diff s t
-  = if s == t then Pass else Fail ""
+diff s t | s == t = Pass
+diff _ _ = Fail ""
 
 finish :: IO Progress -> IO Result
 finish iop = do
@@ -27,24 +29,18 @@ finish iop = do
         Finished result -> return result
         Progress _ iop' -> finish iop'
 
-concatRun :: [IO Progress] -> IO Progress
-concatRun [] = return (Finished Pass)
+concatRun :: [IO Progress] -> IO Result
+concatRun [] = return Pass
 concatRun (iop:iops) = do
     result <- finish iop
     case result of
         Pass -> concatRun iops
-        _ -> return (Finished result)
+        _ -> return result
 
 concatTestInstance :: String -> [TestInstance] -> TestInstance
-concatTestInstance tname tis = TestInstance {
-    run = concatRun (fmap run tis),
-    name = tname,
-    tags = [],
-    options = [],
-    setOption = \_ _ -> Left "unsupported"
-}
+concatTestInstance tname tis = impure tname (concatRun (fmap run tis))
 
 fastTestInstanceGroup :: String -> [TestInstance] -> Test
---fastTestGroup tname tis = testGroup tname (fmap Test tis)
+fastTestInstanceGroup tname tis | False = testGroup tname (fmap Test tis)
 fastTestInstanceGroup tname tis = Test (concatTestInstance tname tis)
 


From git at git.haskell.org  Sun Dec 20 07:54:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:02 +0000 (UTC)
Subject: [commit: packages/time] master: %C not restricted to two characters
 in format (295c172)
Message-ID: <20151220075402.49FB23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/295c172ffdfd981375485387e3c1963d2544095a

>---------------------------------------------------------------

commit 295c172ffdfd981375485387e3c1963d2544095a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 28 22:29:37 2012 -0700

    %C not restricted to two characters in format
    
    Ignore-this: dab171d022b83436dc3a0449525654e
    
    darcs-hash:20121029052937-ac6dd-916d8ce315605f9b428f32728e8da8007091ae27


>---------------------------------------------------------------

295c172ffdfd981375485387e3c1963d2544095a
 Data/Time/Format.hs | 4 ++--
 Test/TestFormat.hs  | 5 ++++-
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 174bbea..926004b 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -113,7 +113,7 @@ formatChar c locale mpado t = case (formatCharacter c) of
 --
 -- [@%y@] last two digits of year, @00@ - @99@
 --
--- [@%C@] century (being the first two digits of the year), @00@ - @99@
+-- [@%C@] century
 --
 -- [@%B@] month name, long form ('fst' from 'months' @locale@), @January@ - @December@
 --
@@ -213,7 +213,7 @@ instance FormatTime Day where
 	-- Year Count
 	formatCharacter 'Y' = Just (\_ _ -> show . fst . toOrdinalDate)
 	formatCharacter 'y' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . mod100 . fst . toOrdinalDate)
-	formatCharacter 'C' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . div100 . fst . toOrdinalDate)
+	formatCharacter 'C' = Just (\_ _ -> show . div100 . fst . toOrdinalDate)
 	-- Month of Year
 	formatCharacter 'B' = Just (\locale _ -> fst . (\(_,m,_) -> (months locale) !! (m - 1)) . toGregorian)
 	formatCharacter 'b' = Just (\locale _ -> snd . (\(_,m,_) -> (months locale) !! (m - 1)) . toGregorian)
diff --git a/Test/TestFormat.hs b/Test/TestFormat.hs
index 001de68..3aae5e5 100644
--- a/Test/TestFormat.hs
+++ b/Test/TestFormat.hs
@@ -68,9 +68,12 @@ getYearP3 year = localTimeToUTC utc (LocalTime (fromGregorian year 03 04) midnig
 getYearP4 :: Integer -> UTCTime
 getYearP4 year = localTimeToUTC utc (LocalTime (fromGregorian year 12 31) midnight)
 
+years :: [Integer]
+years = [999,1000,1899,1900,1901] ++ [1980..2000] ++ [9999,10000]
+
 times :: [UTCTime]
 times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
-	(fmap getYearP1 [1980..2000]) ++ (fmap getYearP2 [1980..2000]) ++ (fmap getYearP3 [1980..2000]) ++ (fmap getYearP4 [1980..2000])
+	(fmap getYearP1 years) ++ (fmap getYearP2 years) ++ (fmap getYearP3 years) ++ (fmap getYearP4 years)
 
 compareFormat :: String -> (String -> String) -> String -> TimeZone -> UTCTime -> TestInstance
 compareFormat testname modUnix fmt zone time =


From git at git.haskell.org  Sun Dec 20 07:54:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:04 +0000 (UTC)
Subject: [commit: packages/time] master: fix up test infrastructure (500ca20)
Message-ID: <20151220075404.51DFA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/500ca2046c1f85279a4b2b95b71dadc5f4c22986

>---------------------------------------------------------------

commit 500ca2046c1f85279a4b2b95b71dadc5f4c22986
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Wed Nov 14 20:17:38 2012 -0800

    fix up test infrastructure
    
    Ignore-this: 884e829c58ee215ab63a75114c0627ec
    
    darcs-hash:20121115041738-ac6dd-c747d085442d3b43b6c8f66bf7b78431ad2efd4b


>---------------------------------------------------------------

500ca2046c1f85279a4b2b95b71dadc5f4c22986
 Makefile              |   2 +-
 Test/AddDays.hs       |  10 +---
 Test/ClipDates.hs     |  38 +++++---------
 Test/ConvertBack.hs   |  10 +---
 Test/LongWeekYears.hs |  10 +---
 Test/TestCalendars.hs |  17 ++----
 Test/TestEaster.hs    |  12 ++---
 Test/TestFormat.hs    |  49 +++++++-----------
 Test/TestMonthDay.hs  |  29 ++++-------
 Test/TestParseDAT.hs  |  35 +++++--------
 Test/TestParseTime.hs | 127 +++++++++++++++++++++++----------------------
 Test/TestTime.hs      |  10 +---
 Test/TestUtil.hs      |  85 +++++++++++++++---------------
 Test/Tests.hs         |   8 +--
 time.cabal            | 140 +++++++++++++++++++++++++++++---------------------
 15 files changed, 271 insertions(+), 311 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 500ca2046c1f85279a4b2b95b71dadc5f4c22986

From git at git.haskell.org  Sun Dec 20 07:54:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:06 +0000 (UTC)
Subject: [commit: packages/time] master: more test infrastructure (b85fefa)
Message-ID: <20151220075406.5A2663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b85fefa65a538c2e38bd688594c68fd0d16236db

>---------------------------------------------------------------

commit b85fefa65a538c2e38bd688594c68fd0d16236db
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Thu Nov 15 00:52:10 2012 -0800

    more test infrastructure
    
    Ignore-this: 7e091ce926e7c054340ecdbc1779fb84
    
    darcs-hash:20121115085210-ac6dd-a38387a32dbb5d33ce700fc5004aa8e73475831f


>---------------------------------------------------------------

b85fefa65a538c2e38bd688594c68fd0d16236db
 Test.hs               |  6 ++++++
 Test/TestParseTime.hs | 35 -----------------------------------
 2 files changed, 6 insertions(+), 35 deletions(-)

diff --git a/Test.hs b/Test.hs
new file mode 100644
index 0000000..27e2bee
--- /dev/null
+++ b/Test.hs
@@ -0,0 +1,6 @@
+module Main where
+import Test.Framework
+import Test.Tests
+
+main :: IO ()
+main = defaultMain tests
diff --git a/Test/TestParseTime.hs b/Test/TestParseTime.hs
index 823a3c1..fa7b241 100644
--- a/Test/TestParseTime.hs
+++ b/Test/TestParseTime.hs
@@ -12,13 +12,7 @@ import Data.Time.Calendar.WeekDate
 import Data.Time.Clock.POSIX
 import System.Locale
 import Test.QuickCheck hiding (Result)
---import qualified Test.QuickCheck
 import Test.TestUtil
---import qualified Test.TestUtil
-
-
---instance RunTest Property where
---    runTest p = run p (TestOptions {no_of_tests = 10000,length_of_tests = 0,debug_tests = False})
 
 ntest :: Int
 ntest = 1000
@@ -32,9 +26,6 @@ testParseTime = testGroup "testParseTime"
     testGroup "properties" (fmap (\(n,prop) -> testProperty n prop) properties)
     ]
 
-{-
-knownFailures
--}
 yearDays :: Integer -> [Day]
 yearDays y = [(fromGregorian y 1 1) .. (fromGregorian y 12 31)]
 
@@ -83,38 +74,12 @@ parseCYY c i = return $ diff (Just (fromGregorian ((c * 100) + i) 1 1)) (parse "
 parseCYY2 :: Integer -> Integer -> IO Result
 parseCYY2 c i = return $ diff (Just (fromGregorian ((c * 100) + i) 1 1)) (parse "%C %y" ((show2 c) ++ " " ++ (show2 i)))
 
-{-
-checkAll :: RunTest p => [(String,p)] -> IO Bool
-checkAll ps = fmap and (mapM checkOne ps)
-
-trMessage :: TestResult -> String
-trMessage (TestOk s _ _) = s
-trMessage (TestExausted s i ss) = "Exhausted " ++ (show s) ++ " " ++ (show i) ++ " " ++ (show ss)
-trMessage (TestFailed ss i) = "Failed " ++ (show ss) ++ " " ++ (show i)
-trMessage (TestAborted ex) = "Aborted " ++ (show ex)
-
-trGood :: TestResult -> Bool
-trGood (TestOk _ _ _) = True
-trGood _ = False
-
-checkOne :: RunTest p => (String,p) -> IO Bool
-checkOne (n,p) =
-    do
-       putStr (rpad 65 ' ' n)
-       tr <- runTest p
-       putStrLn (trMessage tr)
-       return (trGood tr)
-  where
-    rpad n' c xs = xs ++ replicate (n' - length xs) c
--}
-
 parse :: ParseTime t => String -> String -> Maybe t
 parse f t = parseTime defaultTimeLocale f t
 
 format :: (FormatTime t) => String -> t -> String
 format f t = formatTime defaultTimeLocale f t
 
-
 instance Arbitrary Day where
     arbitrary = liftM ModifiedJulianDay $ choose (-313698, 2973483) -- 1000-01-1 to 9999-12-31
 


From git at git.haskell.org  Sun Dec 20 07:54:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:08 +0000 (UTC)
Subject: [commit: packages/time] master: fixed some parsing issues;
 more test sorting out (3d0480a)
Message-ID: <20151220075408.63C8D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3d0480ac7ea30169cc5b3f5e3d39aa45f9bd80b8

>---------------------------------------------------------------

commit 3d0480ac7ea30169cc5b3f5e3d39aa45f9bd80b8
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Nov 24 03:47:35 2012 -0800

    fixed some parsing issues; more test sorting out
    
    Ignore-this: d08009aa11f8a8919041b57651193763
    
    darcs-hash:20121124114735-ac6dd-252292144b82f3ec98609cdc344de145d123a3a1


>---------------------------------------------------------------

3d0480ac7ea30169cc5b3f5e3d39aa45f9bd80b8
 Data/Time/Format/Parse.hs | 176 +++++++++++++++++++++++++++++-----------------
 Test/AddDaysRef.hs        |   1 +
 Test/ClipDatesRef.hs      |   1 +
 Test/LongWeekYearsRef.hs  |   1 +
 Test/TAI_UTC_DAT.hs       |   1 +
 Test/TestCalendarsRef.hs  |   1 +
 Test/TestEasterRef.hs     |   1 +
 Test/TestMonthDayRef.hs   |   1 +
 Test/TestParseDAT_Ref.hs  |   1 +
 Test/TestParseTime.hs     |  82 +++++++++++++--------
 Test/TestTimeRef.hs       |   1 +
 Test/TestUtil.hs          |   7 +-
 12 files changed, 174 insertions(+), 100 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3d0480ac7ea30169cc5b3f5e3d39aa45f9bd80b8

From git at git.haskell.org  Sun Dec 20 07:54:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:10 +0000 (UTC)
Subject: [commit: packages/time] master: fix format modifiers for YCGf
 (fc49f3e)
Message-ID: <20151220075410.698313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/fc49f3e92d7ce4474d16a282784da6686ed8a180

>---------------------------------------------------------------

commit fc49f3e92d7ce4474d16a282784da6686ed8a180
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Nov 24 18:23:58 2012 -0800

    fix format modifiers for YCGf
    
    Ignore-this: 6fb972e177214f11f807e125d5e69da3
    
    darcs-hash:20121125022358-ac6dd-901bbe054d6df17f3410480ba25140d6d0068879


>---------------------------------------------------------------

fc49f3e92d7ce4474d16a282784da6686ed8a180
 Data/Time/Calendar/Private.hs | 32 ++++++++++++++------------------
 Data/Time/Format.hs           |  8 ++++----
 Test/TestFormat.hs            | 21 +++++++++++++++++++--
 3 files changed, 37 insertions(+), 24 deletions(-)

diff --git a/Data/Time/Calendar/Private.hs b/Data/Time/Calendar/Private.hs
index 6afe648..f241dc3 100644
--- a/Data/Time/Calendar/Private.hs
+++ b/Data/Time/Calendar/Private.hs
@@ -9,33 +9,29 @@ pad1 :: NumericPadOption -> String -> String
 pad1 (Just c) s = c:s
 pad1 _ s = s
 
+padN :: Int -> Char -> String -> String
+padN i _ s | i <= 0 = s
+padN i c s = (replicate i c) ++ s
+
 show2Fixed :: NumericPadOption -> Pico -> String
 show2Fixed opt x | x < 10 = pad1 opt (showFixed True x)
 show2Fixed _ x = showFixed True x
 
+showPaddedMin :: (Num t,Ord t,Show t) => Int -> NumericPadOption -> t -> String
+showPaddedMin _ Nothing i = show i
+showPaddedMin pl opt i | i < 0 = '-':(showPaddedMin pl opt (negate i))
+showPaddedMin pl (Just c) i =
+  let s = show i in 
+    padN (pl - (length s)) c s
+
 show2 :: (Num t,Ord t,Show t) => NumericPadOption -> t -> String
-show2 opt i | i < 0 = '-':(show2 opt (negate i))
-show2 opt i = let
-	s = show i in
-  case s of
-	[_] -> pad1 opt s
-	_ -> s
+show2 = showPaddedMin 2
 
 show3 :: (Num t,Ord t,Show t) => NumericPadOption -> t -> String
-show3 opt i | i < 0 = '-':(show3 opt (negate i))
-show3 opt i = let
-	s = show2 opt i in
-  case s of
-	[_,_] -> pad1 opt s
-	_ -> s
+show3 = showPaddedMin 3
 
 show4 :: (Num t,Ord t,Show t) => NumericPadOption -> t -> String
-show4 opt i | i < 0 = '-':(show4 opt (negate i))
-show4 opt i = let
-	s = show3 opt i in
-  case s of
-	[_,_,_] -> pad1 opt s
-	_ -> s
+show4 = showPaddedMin 4
 
 mod100 :: (Integral i) => i -> i
 mod100 x = mod x 100
diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 926004b..f332f97 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -211,9 +211,9 @@ instance FormatTime Day where
 	formatCharacter 'x' = Just (\locale _ -> formatTime locale (dateFmt locale))
 
 	-- Year Count
-	formatCharacter 'Y' = Just (\_ _ -> show . fst . toOrdinalDate)
+	formatCharacter 'Y' = Just (\_ opt -> (show4 (fromMaybe Nothing opt)) . fst . toOrdinalDate)
 	formatCharacter 'y' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . mod100 . fst . toOrdinalDate)
-	formatCharacter 'C' = Just (\_ _ -> show . div100 . fst . toOrdinalDate)
+	formatCharacter 'C' = Just (\_ opt -> (show2 (fromMaybe Nothing opt)) . div100 . fst . toOrdinalDate)
 	-- Month of Year
 	formatCharacter 'B' = Just (\locale _ -> fst . (\(_,m,_) -> (months locale) !! (m - 1)) . toGregorian)
 	formatCharacter 'b' = Just (\locale _ -> snd . (\(_,m,_) -> (months locale) !! (m - 1)) . toGregorian)
@@ -226,9 +226,9 @@ instance FormatTime Day where
 	formatCharacter 'j' = Just (\_ opt -> (show3 (fromMaybe (Just '0') opt)) . snd . toOrdinalDate)
 
 	-- ISO 8601 Week Date
-	formatCharacter 'G' = Just (\_ _ -> show . (\(y,_,_) -> y) . toWeekDate)
+	formatCharacter 'G' = Just (\_ opt -> (show4 (fromMaybe Nothing opt)) . (\(y,_,_) -> y) . toWeekDate)
 	formatCharacter 'g' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . mod100 . (\(y,_,_) -> y) . toWeekDate)
-	formatCharacter 'f' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . div100 . (\(y,_,_) -> y) . toWeekDate)
+	formatCharacter 'f' = Just (\_ opt -> (show2 (fromMaybe Nothing opt)) . div100 . (\(y,_,_) -> y) . toWeekDate)
 
 	formatCharacter 'V' = Just (\_ opt -> (show2 (fromMaybe (Just '0') opt)) . (\(_,w,_) -> w) . toWeekDate)
 	formatCharacter 'u' = Just (\_ _ -> show . (\(_,_,d) -> d) . toWeekDate)
diff --git a/Test/TestFormat.hs b/Test/TestFormat.hs
index c063847..fe5f375 100644
--- a/Test/TestFormat.hs
+++ b/Test/TestFormat.hs
@@ -70,17 +70,34 @@ times :: [UTCTime]
 times = [baseTime0] ++ (fmap getDay [0..23]) ++ (fmap getDay [0..100]) ++
 	(fmap getYearP1 years) ++ (fmap getYearP2 years) ++ (fmap getYearP3 years) ++ (fmap getYearP4 years)
 
+padN :: Int -> Char -> String -> String
+padN n _ s | n <= (length s) = s
+padN n c s = (replicate (n - length s) c) ++ s
+
+unixWorkarounds :: String -> String -> String
+unixWorkarounds "%_Y" s = padN 4 ' ' s
+unixWorkarounds "%0Y" s = padN 4 '0' s
+unixWorkarounds "%_C" s = padN 2 ' ' s
+unixWorkarounds "%0C" s = padN 2 '0' s
+unixWorkarounds "%_G" s = padN 4 ' ' s
+unixWorkarounds "%0G" s = padN 4 '0' s
+unixWorkarounds "%_f" s = padN 2 ' ' s
+unixWorkarounds "%0f" s = padN 2 '0' s
+unixWorkarounds _ s = s
+
 compareFormat :: String -> (String -> String) -> String -> TimeZone -> UTCTime -> Test
 compareFormat testname modUnix fmt zone time = let
     ctime = utcToZonedTime zone time 
     haskellText = formatTime locale fmt ctime
     in ioTest (testname ++ ": " ++ (show fmt) ++ " of " ++ (show ctime)) $
     do
-       unixText <- fmap modUnix (unixFormatTime fmt zone time)
-       return $ diff unixText haskellText
+       unixText <- unixFormatTime fmt zone time
+       let expectedText = unixWorkarounds fmt (modUnix unixText)
+       return $ diff expectedText haskellText
 
 -- as found in http://www.opengroup.org/onlinepubs/007908799/xsh/strftime.html
 -- plus FgGklz
+-- f not supported
 -- P not always supported
 -- s time-zone dependent
 chars :: [Char]


From git at git.haskell.org  Sun Dec 20 07:54:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:12 +0000 (UTC)
Subject: [commit: packages/time] master: test warning on 32-bit systems
 (63896a3)
Message-ID: <20151220075412.7004C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/63896a3379e35c635487ecb0c8ca90fb0debb6f4

>---------------------------------------------------------------

commit 63896a3379e35c635487ecb0c8ca90fb0debb6f4
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 25 02:18:39 2012 -0800

    test warning on 32-bit systems
    
    Ignore-this: 8b699d17f9112b170580414a8b4a2b2
    
    darcs-hash:20121125101839-ac6dd-953b3b0c939f02e528a3a8fb3fce55365e8839c4


>---------------------------------------------------------------

63896a3379e35c635487ecb0c8ca90fb0debb6f4
 Test.hs | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/Test.hs b/Test.hs
index 27e2bee..855e73c 100644
--- a/Test.hs
+++ b/Test.hs
@@ -1,6 +1,11 @@
 module Main where
 import Test.Framework
 import Test.Tests
+import Foreign.C.Types
 
 main :: IO ()
-main = defaultMain tests
+main = do
+  if (toRational (1000000000000 :: CTime)) /= (1000000000000 :: Rational)
+    then putStrLn "WARNING: Some tests will incorrectly fail due to a 32-bit time_t C type."
+    else return ()
+  defaultMain tests


From git at git.haskell.org  Sun Dec 20 07:54:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:14 +0000 (UTC)
Subject: [commit: packages/time] master: update haddock for format & parse
 (9b3c6c7)
Message-ID: <20151220075414.77FD23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9b3c6c7662ec88e8b2df1d43927027989668c6e3

>---------------------------------------------------------------

commit 9b3c6c7662ec88e8b2df1d43927027989668c6e3
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 25 02:54:34 2012 -0800

    update haddock for format & parse
    
    Ignore-this: 5f710d4cf2071a3e93fe5b17729a72de
    
    darcs-hash:20121125105434-ac6dd-361778510fc0965617ec4b4f3316bc37adfb3ff7


>---------------------------------------------------------------

9b3c6c7662ec88e8b2df1d43927027989668c6e3
 Data/Time/Format.hs       | 48 +++++++++++++++++++++++------------------------
 Data/Time/Format/Parse.hs | 36 +++++++++++++++++++++--------------
 2 files changed, 46 insertions(+), 38 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9b3c6c7662ec88e8b2df1d43927027989668c6e3

From git at git.haskell.org  Sun Dec 20 07:54:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:16 +0000 (UTC)
Subject: [commit: packages/time] master: fix time.cabal (c5f3fdc)
Message-ID: <20151220075416.7E2693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c5f3fdc94e0724af6bc91be94487e939d2211da6

>---------------------------------------------------------------

commit c5f3fdc94e0724af6bc91be94487e939d2211da6
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 25 03:12:24 2012 -0800

    fix time.cabal
    
    Ignore-this: bac91d44100c3aab03e4ef2440ec3a9c
    
    darcs-hash:20121125111224-ac6dd-c7db079938d2688d6803332b742e4e02ff9abaaf


>---------------------------------------------------------------

c5f3fdc94e0724af6bc91be94487e939d2211da6
 configure.ac |  2 +-
 time.cabal   | 15 ++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 927625a..82a1173 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.3], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.4.0.2], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index 7254d3b..0335d52 100644
--- a/time.cabal
+++ b/time.cabal
@@ -20,19 +20,20 @@ extra-source-files:
     include/HsConfigure.h
     include/HsTime.h
     include/HsTimeConfig.h.in
-    test/Makefile
-    test/*.hs
-    test/*.lhs
-    test/*.ref
-    test/*.dat
-    test/*.c
-    test/*.h
+    Test/*.hs
+    Test/*.lhs
+    Test/*.c
+    Test/*.h
 extra-tmp-files:
     config.log
     config.status
     autom4te.cache
     include/HsTimeConfig.h
 
+source-repository head
+  type:     darcs
+  location: http://code.haskell.org/time/
+
 library
     build-depends: 
         base >= 4,


From git at git.haskell.org  Sun Dec 20 07:54:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:18 +0000 (UTC)
Subject: [commit: packages/time] master: more fixing of time.cabal (d452222)
Message-ID: <20151220075418.841003A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d4522223d762136234793dbdef5c21bbb000143e

>---------------------------------------------------------------

commit d4522223d762136234793dbdef5c21bbb000143e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Nov 25 03:22:49 2012 -0800

    more fixing of time.cabal
    
    Ignore-this: 589eeb82bf6e1c7a8a4513c924c2299a
    
    darcs-hash:20121125112249-ac6dd-dc7003a0bcdf8530d63fee170344b4513490e119


>---------------------------------------------------------------

d4522223d762136234793dbdef5c21bbb000143e
 time.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/time.cabal b/time.cabal
index 0335d52..873a06a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -10,7 +10,7 @@ synopsis:       A time library
 description:    A time library
 category:       System
 build-type:     Configure
-cabal-version:  >=1.16
+cabal-version:  >=1.14
 x-follows-version-policy:
 
 extra-source-files:
@@ -36,7 +36,7 @@ source-repository head
 
 library
     build-depends: 
-        base >= 4,
+        base >= 4 && < 5,
         deepseq >= 1.1,
         old-locale
     ghc-options: -Wall


From git at git.haskell.org  Sun Dec 20 07:54:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:20 +0000 (UTC)
Subject: [commit: packages/time] master: Derive Typeable instances (222f71c)
Message-ID: <20151220075420.8B3103A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/222f71c3c2d97dfcb68e2db171d57835695c91b5

>---------------------------------------------------------------

commit 222f71c3c2d97dfcb68e2db171d57835695c91b5
Author: jpm <jpm at cs.ox.ac.uk>
Date:   Wed Nov 28 06:58:44 2012 -0800

    Derive Typeable instances
    
    Ignore-this: d301bb00a270f5c27cf9bffc27f85828
    
    darcs-hash:20121128145844-ddd07-279620f99a395c40ffc649ee93d3c5bee3e4e7d9


>---------------------------------------------------------------

222f71c3c2d97dfcb68e2db171d57835695c91b5
 Data/Time/Calendar/Days.hs       |  5 +----
 Data/Time/Clock/Scale.hs         | 10 ++--------
 Data/Time/Clock/TAI.hs           |  5 +----
 Data/Time/Clock/UTC.hs           | 10 ++--------
 Data/Time/LocalTime/LocalTime.hs | 10 ++--------
 Data/Time/LocalTime/TimeOfDay.hs |  5 +----
 Data/Time/LocalTime/TimeZone.hs  |  5 +----
 7 files changed, 10 insertions(+), 40 deletions(-)

diff --git a/Data/Time/Calendar/Days.hs b/Data/Time/Calendar/Days.hs
index 6911833..9b535c0 100644
--- a/Data/Time/Calendar/Days.hs
+++ b/Data/Time/Calendar/Days.hs
@@ -18,7 +18,7 @@ import Data.Data
 newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
     )
@@ -26,9 +26,6 @@ newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Or
 instance NFData Day where
 	rnf (ModifiedJulianDay a) = rnf a
 
-instance Typeable Day where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Calendar.Days" "Day") []
-
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum Day where
 	succ (ModifiedJulianDay a) = ModifiedJulianDay (succ a)
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index 237a77b..9e91795 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -25,7 +25,7 @@ import Data.Data
 newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
     )
@@ -34,9 +34,6 @@ newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (E
 instance NFData UniversalTime where
 	rnf (ModJulianDate a) = rnf a
 
-instance Typeable UniversalTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "UniversalTime") []
-
 -- | This is a length of time, as measured by a clock.
 -- Conversion functions will treat it as seconds.
 -- It has a precision of 10^-12 s.
@@ -44,7 +41,7 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    ,Data
+    ,Data, Typeable
 #else
 #endif
 #endif
@@ -54,9 +51,6 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance NFData DiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
-instance Typeable DiffTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.Scale" "DiffTime") []
-
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum DiffTime where
 	succ (MkDiffTime a) = MkDiffTime (succ a)
diff --git a/Data/Time/Clock/TAI.hs b/Data/Time/Clock/TAI.hs
index 5e6bfef..271f750 100644
--- a/Data/Time/Clock/TAI.hs
+++ b/Data/Time/Clock/TAI.hs
@@ -30,7 +30,7 @@ newtype AbsoluteTime = MkAbsoluteTime {unAbsoluteTime :: DiffTime} deriving (Eq,
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
 #endif
@@ -39,9 +39,6 @@ newtype AbsoluteTime = MkAbsoluteTime {unAbsoluteTime :: DiffTime} deriving (Eq,
 instance NFData AbsoluteTime where
 	rnf (MkAbsoluteTime a) = rnf a
 
-instance Typeable AbsoluteTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.TAI" "AbsoluteTime") []
-
 instance Show AbsoluteTime where
 	show t = show (utcToLocalTime utc (taiToUTCTime (const 0) t)) ++ " TAI" -- ugly, but standard apparently
 
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index da1ecc2..3ba3309 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -36,7 +36,7 @@ data UTCTime = UTCTime {
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    deriving (Data)
+    deriving (Data, Typeable)
 #endif
 #endif
 #endif
@@ -44,9 +44,6 @@ data UTCTime = UTCTime {
 instance NFData UTCTime where
 	rnf (UTCTime d t) = d `deepseq` t `deepseq` ()
 
-instance Typeable UTCTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "UTCTime") []
-
 instance Eq UTCTime where
 	(UTCTime da ta) == (UTCTime db tb) = (da == db) && (ta == tb)
 
@@ -65,7 +62,7 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
 #endif
@@ -74,9 +71,6 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance NFData NominalDiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
-instance Typeable NominalDiffTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.Clock.UTC" "NominalDiffTime") []
-
 instance Enum NominalDiffTime where
 	succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)
 	pred (MkNominalDiffTime a) = MkNominalDiffTime (pred a)
diff --git a/Data/Time/LocalTime/LocalTime.hs b/Data/Time/LocalTime/LocalTime.hs
index 02f06a4..b32af80 100644
--- a/Data/Time/LocalTime/LocalTime.hs
+++ b/Data/Time/LocalTime/LocalTime.hs
@@ -34,7 +34,7 @@ data LocalTime = LocalTime {
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
 #endif
@@ -43,9 +43,6 @@ data LocalTime = LocalTime {
 instance NFData LocalTime where
 	rnf (LocalTime d t) = d `deepseq` t `deepseq` ()
 
-instance Typeable LocalTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "LocalTime") []
-
 instance Show LocalTime where
 	show (LocalTime d t) = (showGregorian d) ++ " " ++ (show t)
 
@@ -78,7 +75,7 @@ data ZonedTime = ZonedTime {
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    deriving (Data)
+    deriving (Data, Typeable)
 #endif
 #endif
 #endif
@@ -86,9 +83,6 @@ data ZonedTime = ZonedTime {
 instance NFData ZonedTime where
 	rnf (ZonedTime lt z) = lt `deepseq` z `deepseq` ()
 
-instance Typeable ZonedTime where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.LocalTime" "ZonedTime") []
-
 utcToZonedTime :: TimeZone -> UTCTime -> ZonedTime
 utcToZonedTime zone time = ZonedTime (utcToLocalTime zone time) zone
 
diff --git a/Data/Time/LocalTime/TimeOfDay.hs b/Data/Time/LocalTime/TimeOfDay.hs
index 8fdf539..93c0c70 100644
--- a/Data/Time/LocalTime/TimeOfDay.hs
+++ b/Data/Time/LocalTime/TimeOfDay.hs
@@ -33,7 +33,7 @@ data TimeOfDay = TimeOfDay {
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
 #if HAS_DataPico
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
 #endif
@@ -42,9 +42,6 @@ data TimeOfDay = TimeOfDay {
 instance NFData TimeOfDay where
 	rnf (TimeOfDay h m s) = h `deepseq` m `deepseq` s `seq` () -- FIXME: Data.Fixed had no NFData instances yet at time of writing
 
-instance Typeable TimeOfDay where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeOfDay" "TimeOfDay") []
-
 -- | Hour zero
 midnight :: TimeOfDay
 midnight = TimeOfDay 0 0 0
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index 689288f..fa70026 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -36,7 +36,7 @@ data TimeZone = TimeZone {
 } deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
-    ,Data
+    ,Data, Typeable
 #endif
 #endif
     )
@@ -44,9 +44,6 @@ data TimeZone = TimeZone {
 instance NFData TimeZone where
 	rnf (TimeZone m so n) = m `deepseq` so `deepseq` n `deepseq` ()
 
-instance Typeable TimeZone where
-	typeOf _ = mkTyConApp (mkTyCon3 "time" "Data.Time.LocalTime.TimeZone" "TimeZone") []
-
 -- | Create a nameless non-summer timezone for this number of minutes
 minutesToTimeZone :: Int -> TimeZone
 minutesToTimeZone m = TimeZone m False ""


From git at git.haskell.org  Sun Dec 20 07:54:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:22 +0000 (UTC)
Subject: [commit: packages/time] master: use throwErrnoIfMinus1 gettimeofday
 for consistency in error handling (d575902)
Message-ID: <20151220075422.925A03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/d575902c77c2697cc03e28a0f3e81fffbae7c7b6

>---------------------------------------------------------------

commit d575902c77c2697cc03e28a0f3e81fffbae7c7b6
Author: Dylan Simon <dylan at dylex.net>
Date:   Fri Jan 25 18:59:54 2013 -0800

    use throwErrnoIfMinus1 gettimeofday for consistency in error handling
    
    Ignore-this: fc81b9dd998c4e7c01a58d3e3a104cb8
    
    darcs-hash:20130126025954-56c21-c94b312b53512f2202f5012b2abab5b2b8f4c05d


>---------------------------------------------------------------

d575902c77c2697cc03e28a0f3e81fffbae7c7b6
 Data/Time/Clock/CTimeval.hs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
index 5e0ffdf..b0d8920 100644
--- a/Data/Time/Clock/CTimeval.hs
+++ b/Data/Time/Clock/CTimeval.hs
@@ -25,10 +25,8 @@ foreign import ccall unsafe "time.h gettimeofday" gettimeofday :: Ptr CTimeval -
 -- | Get the current POSIX time from the system clock.
 getCTimeval :: IO CTimeval
 getCTimeval = with (MkCTimeval 0 0) (\ptval -> do
-	result <- gettimeofday ptval nullPtr
-	if (result == 0)
-	 then peek ptval
-	 else fail ("error in gettimeofday: " ++ (show result))
+	throwErrnoIfMinus1_ "gettimeofday" $ gettimeofday ptval nullPtr
+	peek ptval
 	)
 
 #endif


From git at git.haskell.org  Sun Dec 20 07:54:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:24 +0000 (UTC)
Subject: [commit: packages/time] master: Make getTimeZone cross-platform
 consistent by always considering the TZ environment variable. (9926c4a)
Message-ID: <20151220075424.987653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9926c4aae23dc11afb018175a15e505da4e73e73

>---------------------------------------------------------------

commit 9926c4aae23dc11afb018175a15e505da4e73e73
Author: oconnorr <oconnorr at google.com>
Date:   Mon Jun 10 15:22:54 2013 -0700

    Make getTimeZone cross-platform consistent by always considering the TZ environment variable.
    
    Ignore-this: 98f02c84c56cc5f77aa96e3f9d9e90fc
    
    The current behaviour of getTimeZone is system dependent.  On Linux, using glibc we get the following result:
    
    $ ghc -package time-1.4 -e 'System.Posix.Env.putEnv "TZ=EST5EDT" >> Data.Time.getCurrentTimeZone >>= print >> System.Posix.Env.putEnv "TZ=PST8PDT" >> Data.Time.getCurrentTimeZone >>= print'
    EDT
    EDT
    
    Under MacOS X we get a different result
    
    $ ghc -package time-1.4 -e 'System.Posix.Env.putEnv "TZ=EST5EDT" >> Data.Time.getCurrentTimeZone >>= print >> System.Posix.Env.putEnv "TZ=PST8PDT" >> Data.Time.getCurrentTimeZone >>= print'
    EDT
    PDT
    
    The underlying problem is that POSIX does not fully specify the behaviour of localtime_r, upon which getTimeZone relies.  POSIX.1-2008 says:
    
        Unlike localtime(), the localtime_r() function is not required to set tzname.
    
    "not required" means that localtime_r may or may not set tzname.  MacOS X's behaviour sets tzname on every call to localtime_r.
    
    On the other hand, Linux, using glibc, the behaviour of localtime_r is outstandingly complicated.  Upon the first call to localtime_r (or more techincially upon the first call to tzset_internal) it will set tzname based upon the value in the TZ environment variable, but upon subsequent calls, localtime_r will *not* set the tzname.
    
    This leads to the bizzare behaviour under Linux whereby the value used by getTimeZone (and getCurrentTimeZone) will always use the value of the TZ environment variable during the first call, and it is impossible to change it again.  The only workaround available to a Haskell programer is to call tzset, which is can only be found in another package.
    
    This patch calls tzset() before each call to localtime_r() which forces tzname to be set from the TZ enviroment call.  The result is that on all platforms one gets the sane result of
    
    $ ghc -package time-1.4.1 -e 'System.Posix.Env.putEnv "TZ=EST5EDT" >> Data.Time.getCurrentTimeZone >>= print >> System.Posix.Env.putEnv "TZ=PST8PDT" >> Data.Time.getCurrentTimeZone >>= print'
    EDT
    PDT
    
    darcs-hash:20130610222254-a4c94-e18c93b079fcee2becc635ed32a2ce3c34f9276e


>---------------------------------------------------------------

9926c4aae23dc11afb018175a15e505da4e73e73
 cbits/HsTime.c | 1 +
 time.cabal     | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index dacb1d4..e8a1155 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -5,6 +5,7 @@ long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
 #if HAVE_LOCALTIME_R
 	struct tm tmd;
+        tzset();
 	struct tm* ptm = localtime_r(&t,&tmd);
 #else
 	struct tm* ptm = localtime(&t);
diff --git a/time.cabal b/time.cabal
index 873a06a..5e38d2a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.0.2
+version:        1.4.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:54:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:26 +0000 (UTC)
Subject: [commit: packages/time] master: Regression test for getTimeZone.
 (27173fc)
Message-ID: <20151220075426.A03ED3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/27173fcefbcaf8d699a3929585758597191ca313

>---------------------------------------------------------------

commit 27173fcefbcaf8d699a3929585758597191ca313
Author: oconnorr <oconnorr at google.com>
Date:   Fri Jun 14 12:19:45 2013 -0700

    Regression test for getTimeZone.
    
    Ignore-this: e113a43c80f89126aa12b2fdcd73ae9f
    
    The localtime_r call made from getTimeZone may or may not perform a tzset().
    In particular, in glibc, a tzset() will only be performed the first time a process runs localtime_r.
    
    This added regression test will fail on implementations like glibc that only
    perform a tzset() on the first call to localtime_r.
    
    A fix to make getTimeZone always call tzset() can be found in patch:
    
    [Make getTimeZone cross-platform consistent by always considering the TZ environment variable.
    oconnorr at google.com**20130610222254
    
    darcs-hash:20130614191945-a4c94-8b89e390a71d3b46bf56997ad103bec7a5144f13


>---------------------------------------------------------------

27173fcefbcaf8d699a3929585758597191ca313
 Test/TestTimeZone.hs | 17 +++++++++++++++++
 Test/Tests.hs        |  4 +++-
 time.cabal           |  5 +++--
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/Test/TestTimeZone.hs b/Test/TestTimeZone.hs
new file mode 100644
index 0000000..8e79baa
--- /dev/null
+++ b/Test/TestTimeZone.hs
@@ -0,0 +1,17 @@
+{-# OPTIONS -Wall -Werror #-}
+
+module Test.TestTimeZone where
+
+import Data.Time
+import System.Posix.Env (putEnv)
+import Test.TestUtil
+
+testTimeZone :: Test
+testTimeZone = ioTest "getTimeZone respects TZ env var" $ do
+  putEnv "TZ=UTC+0"
+  zone1 <- getTimeZone epoch
+  putEnv "TZ=EST+5"
+  zone2 <- getTimeZone epoch
+  return $ diff False (zone1 == zone2)
+ where
+  epoch = UTCTime (ModifiedJulianDay 0) 0
diff --git a/Test/Tests.hs b/Test/Tests.hs
index 512b64e..3900e45 100644
--- a/Test/Tests.hs
+++ b/Test/Tests.hs
@@ -13,6 +13,7 @@ import Test.TestMonthDay
 import Test.TestParseDAT
 import Test.TestParseTime
 import Test.TestTime
+import Test.TestTimeZone
 
 tests :: [Test]
 tests = [ addDaysTest
@@ -25,4 +26,5 @@ tests = [ addDaysTest
         , testMonthDay
         , testParseDAT
         , testParseTime
-        , testTime ]
+        , testTime
+        , testTimeZone ]
diff --git a/time.cabal b/time.cabal
index 5e38d2a..e1f7d79 100644
--- a/time.cabal
+++ b/time.cabal
@@ -114,8 +114,9 @@ test-suite tests
         old-locale,
         process,
         QuickCheck >= 2.5.1,
-        test-framework >= 0.6.1,
-        test-framework-quickcheck2 >= 0.2.12
+        test-framework >= 0.6.1 && < 0.7,
+        test-framework-quickcheck2 >= 0.2.12,
+        unix
     main-is: Test.hs
     other-modules:
         Test.Tests


From git at git.haskell.org  Sun Dec 20 07:54:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:28 +0000 (UTC)
Subject: [commit: packages/time] master: detabify cbits (a4fbbed)
Message-ID: <20151220075428.A6D573A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a4fbbedf1bb8190ed6ac57b0fc89750b581be31a

>---------------------------------------------------------------

commit a4fbbedf1bb8190ed6ac57b0fc89750b581be31a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Jun 23 17:35:10 2013 -0700

    detabify cbits
    
    Ignore-this: bc6e127a254ec4e39b03ad5d601ee014
    
    darcs-hash:20130624003510-ac6dd-f1537ad91adc4bd50fc1b222d6af0311ccde7a06


>---------------------------------------------------------------

a4fbbedf1bb8190ed6ac57b0fc89750b581be31a
 cbits/HsTime.c | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index e8a1155..cfafb27 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -4,38 +4,38 @@
 long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
 #if HAVE_LOCALTIME_R
-	struct tm tmd;
-        tzset();
-	struct tm* ptm = localtime_r(&t,&tmd);
+    struct tm tmd;
+    tzset();
+    struct tm* ptm = localtime_r(&t,&tmd);
 #else
-	struct tm* ptm = localtime(&t);
+    struct tm* ptm = localtime(&t);
 #endif
-	if (ptm)
-	{
-		int dst = ptm -> tm_isdst;
-		*pdst = dst;
+    if (ptm)
+    {
+        int dst = ptm -> tm_isdst;
+        *pdst = dst;
 #if HAVE_TM_ZONE
-		*pname = ptm -> tm_zone;
-		return ptm -> tm_gmtoff;
+        *pname = ptm -> tm_zone;
+        return ptm -> tm_gmtoff;
 #elif defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
-		// We don't have a better API to use on Windows, the logic to
-		// decide whether a given date/time falls within DST is
-		// implemented as part of localtime() in the CRT.  This is_dst
-		// flag is all we need here.
-		*pname = dst ? _tzname[1] : _tzname[0];
-		return - (dst ? _timezone - 3600 : _timezone);
+        // We don't have a better API to use on Windows, the logic to
+        // decide whether a given date/time falls within DST is
+        // implemented as part of localtime() in the CRT.  This is_dst
+        // flag is all we need here.
+        *pname = dst ? _tzname[1] : _tzname[0];
+        return - (dst ? _timezone - 3600 : _timezone);
 #else
 # if HAVE_TZNAME
-		*pname = *tzname;
+        *pname = *tzname;
 # else
 #  error "Don't know how to get timezone name on your OS"
 # endif
 # if HAVE_DECL_ALTZONE
-		return dst ? altzone : timezone;
+        return dst ? altzone : timezone;
 # else
-		return dst ? timezone - 3600 : timezone;
+        return dst ? timezone - 3600 : timezone;
 # endif
 #endif // HAVE_TM_ZONE
-	}
-	else return 0x80000000;
+    }
+    else return 0x80000000;
 }


From git at git.haskell.org  Sun Dec 20 07:54:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:30 +0000 (UTC)
Subject: [commit: packages/time] master: Changes for Safe Haskell (7cc0d01)
Message-ID: <20151220075430.ADF573A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7cc0d011e7a956c62d1c6a5d83b302cb938693e4

>---------------------------------------------------------------

commit 7cc0d011e7a956c62d1c6a5d83b302cb938693e4
Author: omari <omari at smileystation.com>
Date:   Thu Feb 13 15:24:36 2014 -0800

    Changes for Safe Haskell
    
    Ignore-this: c7c8f97541bd4ab2620613c51fad3b91
    
    Makes minimal necessary changes so that modules will infer as Safe
    for Safe Haskell.  Some modules are using rewrite rules, which are
    not Safe; to these I added Trustworthy pragmas.  The rewrite rules
    will continue to fire as normal, according to GHC's documentation.
    
    Other modules import Foreign.  I changed these to import
    Foreign.Safe instead.
    
    I changed the time.cabal file so that the minimum version of Base is
    4.4; that was the first version of Base that has the Foreign.Safe
    module.  (base 4.4 came with GHC 7.2, which is over two years old.)
    
    darcs-hash:20140213232436-6ee4c-27c941c537e6ab258befe3e38b9d9266334e9421


>---------------------------------------------------------------

7cc0d011e7a956c62d1c6a5d83b302cb938693e4
 Data/Time/Clock/CTimeval.hs     | 2 +-
 Data/Time/Clock/Scale.hs        | 1 +
 Data/Time/Clock/UTC.hs          | 1 +
 Data/Time/LocalTime/TimeZone.hs | 2 +-
 time.cabal                      | 2 +-
 5 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Data/Time/Clock/CTimeval.hs b/Data/Time/Clock/CTimeval.hs
index b0d8920..c8a692a 100644
--- a/Data/Time/Clock/CTimeval.hs
+++ b/Data/Time/Clock/CTimeval.hs
@@ -4,7 +4,7 @@ module Data.Time.Clock.CTimeval where
 #ifndef mingw32_HOST_OS
 -- All Unix-specific, this
 
-import Foreign
+import Foreign.Safe
 import Foreign.C
 
 data CTimeval = MkCTimeval CLong CLong
diff --git a/Data/Time/Clock/Scale.hs b/Data/Time/Clock/Scale.hs
index 9e91795..8ba7759 100644
--- a/Data/Time/Clock/Scale.hs
+++ b/Data/Time/Clock/Scale.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE Trustworthy #-}
 {-# OPTIONS -fno-warn-unused-imports #-}
 #include "HsConfigure.h"
 -- #hide
diff --git a/Data/Time/Clock/UTC.hs b/Data/Time/Clock/UTC.hs
index 3ba3309..d41b8f8 100644
--- a/Data/Time/Clock/UTC.hs
+++ b/Data/Time/Clock/UTC.hs
@@ -1,4 +1,5 @@
 {-# OPTIONS -fno-warn-unused-imports #-}
+{-# LANGUAGE Trustworthy #-}
 #include "HsConfigure.h"
 -- #hide
 module Data.Time.Clock.UTC
diff --git a/Data/Time/LocalTime/TimeZone.hs b/Data/Time/LocalTime/TimeZone.hs
index fa70026..e9e4f5f 100644
--- a/Data/Time/LocalTime/TimeZone.hs
+++ b/Data/Time/LocalTime/TimeZone.hs
@@ -17,7 +17,7 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
-import Foreign
+import Foreign.Safe
 import Foreign.C
 import Control.DeepSeq
 import Data.Typeable
diff --git a/time.cabal b/time.cabal
index e1f7d79..334fa08 100644
--- a/time.cabal
+++ b/time.cabal
@@ -36,7 +36,7 @@ source-repository head
 
 library
     build-depends: 
-        base >= 4 && < 5,
+        base >= 4.4 && < 5,
         deepseq >= 1.1,
         old-locale
     ghc-options: -Wall


From git at git.haskell.org  Sun Dec 20 07:54:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:32 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.4.2;
 improve Makefile (1e92867)
Message-ID: <20151220075432.B49743A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1e928677ff732d5355ef249faa4584caa2335bd9

>---------------------------------------------------------------

commit 1e928677ff732d5355ef249faa4584caa2335bd9
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Mar 2 21:18:43 2014 -0800

    version 1.4.2; improve Makefile
    
    Ignore-this: 9dcd1b4a4decdf6ea319f55849f97cbf
    
    darcs-hash:20140303051843-ac6dd-949729bef614ae9d022ba7a96419719ef92c2f0a


>---------------------------------------------------------------

1e928677ff732d5355ef249faa4584caa2335bd9
 Makefile   | 11 +++++++----
 time.cabal |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 4fe6afb..73f55fd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-default: install
+default: clean test install sdist
 
 # Building
 
@@ -17,8 +17,11 @@ test: build
 haddock: configure
 	cabal haddock
 
-install: build test haddock
-	cabal install --user --enable-library-profiling --enable-executable-profiling
+copy: build test haddock
+	cabal copy
+
+install:
+	cabal install --user --ghc-options=-Werror --enable-library-profiling --enable-executable-profiling
 
 sdist: clean configure
 	cabal sdist
@@ -26,4 +29,4 @@ sdist: clean configure
 # switch off intermediate file deletion
 .SECONDARY:
 
-.PHONY: default clean configure build haddock install test sdist
+.PHONY: default clean configure build haddock copy install test sdist
diff --git a/time.cabal b/time.cabal
index 334fa08..fad816c 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.1
+version:        1.4.2
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:54:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:34 +0000 (UTC)
Subject: [commit: packages/time] master: tzset regardless of HAVE_LOCALTIME_R
 (a22e848)
Message-ID: <20151220075434.BB80F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a22e848dde29581cecb03a6cea70a73ee6a405cf

>---------------------------------------------------------------

commit a22e848dde29581cecb03a6cea70a73ee6a405cf
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat Jul 19 13:37:05 2014 -0700

    tzset regardless of HAVE_LOCALTIME_R
    
    Ignore-this: a03b607f40ed91382348da78649d6f62
    
    darcs-hash:20140719203705-ac6dd-dd66552eab0b730816f50cf4a30add39a633240b


>---------------------------------------------------------------

a22e848dde29581cecb03a6cea70a73ee6a405cf
 cbits/HsTime.c | 2 +-
 time.cabal     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cbits/HsTime.c b/cbits/HsTime.c
index cfafb27..646fac6 100644
--- a/cbits/HsTime.c
+++ b/cbits/HsTime.c
@@ -3,9 +3,9 @@
 
 long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
+    tzset();
 #if HAVE_LOCALTIME_R
     struct tm tmd;
-    tzset();
     struct tm* ptm = localtime_r(&t,&tmd);
 #else
     struct tm* ptm = localtime(&t);
diff --git a/time.cabal b/time.cabal
index fad816c..b02f0e3 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.2
+version:        1.4.2.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:54:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:36 +0000 (UTC)
Subject: [commit: packages/time] master: use latest test library (656b250)
Message-ID: <20151220075436.C26AF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/656b250ba24a60e15abb440ec302bd479270bae4

>---------------------------------------------------------------

commit 656b250ba24a60e15abb440ec302bd479270bae4
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Jul 19 20:57:07 2014 -0700

    use latest test library


>---------------------------------------------------------------

656b250ba24a60e15abb440ec302bd479270bae4
 Test/TestUtil.hs | 3 ++-
 time.cabal       | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Test/TestUtil.hs b/Test/TestUtil.hs
index bb2b58e..b711f93 100644
--- a/Test/TestUtil.hs
+++ b/Test/TestUtil.hs
@@ -9,8 +9,9 @@ module Test.TestUtil
 import Test.Framework
 import Test.Framework.Providers.API
 import Test.Framework.Providers.QuickCheck2
+import Data.Typeable
 
-data Result = Pass | Fail String
+data Result = Pass | Fail String deriving Typeable
 
 instance Show Result where
     show Pass = "passed"
diff --git a/time.cabal b/time.cabal
index b02f0e3..34cdd78 100644
--- a/time.cabal
+++ b/time.cabal
@@ -114,8 +114,8 @@ test-suite tests
         old-locale,
         process,
         QuickCheck >= 2.5.1,
-        test-framework >= 0.6.1 && < 0.7,
-        test-framework-quickcheck2 >= 0.2.12,
+        test-framework >= 0.8,
+        test-framework-quickcheck2 >= 0.3,
         unix
     main-is: Test.hs
     other-modules:


From git at git.haskell.org  Sun Dec 20 07:54:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:38 +0000 (UTC)
Subject: [commit: packages/time] master: .gitignore (08a0531)
Message-ID: <20151220075438.C8C0D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/08a053130822da4933c8a289277a6dbd103e308b

>---------------------------------------------------------------

commit 08a053130822da4933c8a289277a6dbd103e308b
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Jul 19 20:58:50 2014 -0700

    .gitignore


>---------------------------------------------------------------

08a053130822da4933c8a289277a6dbd103e308b
 .darcs-boring | 70 -----------------------------------------------------------
 .gitignore    |  6 +++++
 2 files changed, 6 insertions(+), 70 deletions(-)

diff --git a/.darcs-boring b/.darcs-boring
deleted file mode 100644
index ca040f7..0000000
--- a/.darcs-boring
+++ /dev/null
@@ -1,70 +0,0 @@
-# Boring file regexps:
-\.hi$
-\.o$
-\.p_hi$
-\.p_o$
-\.raw-hs$
-_split$
-\.a$
-(^|/)dist$
-(^|/)package.conf.inplace$
-(^|/)package.conf.installed$
-(^|/)\.depend$
-(^|/)\.setup-config$
-(^|/)\.installed-pkg-config$
-\.haddock$
-^build$
-\.xcodeproj/.*\.pbxuser$
-\.xcodeproj/.*\.mode1$
-\.o\.cmd$
-\.ko$
-\.ko\.cmd$
-\.mod\.c$
-(^|/)\.tmp_versions($|/)
-(^|/)CVS($|/)
-(^|/)RCS($|/)
-~$
-#(^|/)\.[^/]
-(^|/)_darcs($|/)
-\.bak$
-\.BAK$
-\.orig$
-(^|/)vssver\.scc$
-\.swp$
-(^|/)MT($|/)
-(^|/)\{arch\}($|/)
-(^|/).arch-ids($|/)
-(^|/),
-\.class$
-\.prof$
-(^|/)\.DS_Store$
-(^|/)BitKeeper($|/)
-(^|/)ChangeSet($|/)
-(^|/)\.svn($|/)
-\.py[co]$
-\#
-\.cvsignore$
-^Private($|/)
-(^|/)Thumbs\.db$
-^configure$
-^config\..*$
-^autom4te.cache($|/)
-^include/HsTimeConfig\.h$
-^include/HsTimeConfig\.h.in$
-^test/.*\.out$
-^test/.*\.run$
-^test/AddDays$
-^test/ClipDates$
-^test/ConvertBack$
-^test/CurrentTime$
-^test/LongWeekYears$
-^test/ShowDST$
-^test/TestCalendars$
-^test/TestEaster$
-^test/TestFormat$
-^test/TestMonthDay$
-^test/TestParseDAT$
-^test/TestParseTime$
-^test/TestTime$
-^test/TimeZone$
-^test/TimeZone.ref$
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..dead619
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+dist/
+configure
+autom4te.cache/
+config.*
+include/HsTimeConfig.h
+include/HsTimeConfig.h.in


From git at git.haskell.org  Sun Dec 20 07:54:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:40 +0000 (UTC)
Subject: [commit: packages/time] master: time.cabal: note homepage and
 source-repository (dff2fcf)
Message-ID: <20151220075440.CEFB53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/dff2fcfa89e87de2ea67b701ad2b6d3ad090aa3e

>---------------------------------------------------------------

commit dff2fcfa89e87de2ea67b701ad2b6d3ad090aa3e
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Jul 19 21:54:57 2014 -0700

    time.cabal: note homepage and source-repository


>---------------------------------------------------------------

dff2fcfa89e87de2ea67b701ad2b6d3ad090aa3e
 time.cabal | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/time.cabal b/time.cabal
index 34cdd78..1b71b00 100644
--- a/time.cabal
+++ b/time.cabal
@@ -5,7 +5,7 @@ license:        BSD3
 license-file:   LICENSE
 author:         Ashley Yakeley
 maintainer:     <ashley at semantic.org>
-homepage:       http://semantic.org/TimeLib/
+homepage:       https://github.com/haskell/time
 synopsis:       A time library
 description:    A time library
 category:       System
@@ -31,8 +31,8 @@ extra-tmp-files:
     include/HsTimeConfig.h
 
 source-repository head
-  type:     darcs
-  location: http://code.haskell.org/time/
+  type:     git
+  location: https://github.com/haskell/time
 
 library
     build-depends: 


From git at git.haskell.org  Sun Dec 20 07:54:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:42 +0000 (UTC)
Subject: [commit: packages/time] master: more parse tests (757c5c4)
Message-ID: <20151220075442.D72D93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/757c5c4e7293c01a2dee8e59b86bbccbe57c814b

>---------------------------------------------------------------

commit 757c5c4e7293c01a2dee8e59b86bbccbe57c814b
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Jul 20 20:59:52 2014 -0700

    more parse tests


>---------------------------------------------------------------

757c5c4e7293c01a2dee8e59b86bbccbe57c814b
 Test/TestParseTime.hs | 120 ++++++++++++++++++++++++++++++++------------------
 1 file changed, 76 insertions(+), 44 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 757c5c4e7293c01a2dee8e59b86bbccbe57c814b

From git at git.haskell.org  Sun Dec 20 07:54:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:44 +0000 (UTC)
Subject: [commit: packages/time] master: Data.Time.Format.Parse re-exports
 System.Locale. Bump to 1.5 for this. (f1853e7)
Message-ID: <20151220075444.DF5C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f1853e7ecb323df073606a028898fdfe0a5933e6

>---------------------------------------------------------------

commit f1853e7ecb323df073606a028898fdfe0a5933e6
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 10 02:46:16 2014 -0700

    Data.Time.Format.Parse re-exports System.Locale. Bump to 1.5 for this.


>---------------------------------------------------------------

f1853e7ecb323df073606a028898fdfe0a5933e6
 Data/Time/Format.hs       | 1 -
 Data/Time/Format/Parse.hs | 4 +++-
 Test/TestEaster.hs        | 2 --
 Test/TestFormat.hs        | 1 -
 Test/TestParseTime.hs     | 1 -
 time.cabal                | 2 +-
 6 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/Data/Time/Format.hs b/Data/Time/Format.hs
index 21bce35..d071c30 100644
--- a/Data/Time/Format.hs
+++ b/Data/Time/Format.hs
@@ -14,7 +14,6 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
-import System.Locale
 import Data.Maybe
 import Data.Char
 import Data.Fixed
diff --git a/Data/Time/Format/Parse.hs b/Data/Time/Format/Parse.hs
index f9cc33d..c0569ee 100644
--- a/Data/Time/Format/Parse.hs
+++ b/Data/Time/Format/Parse.hs
@@ -8,7 +8,9 @@ module Data.Time.Format.Parse
 #if LANGUAGE_Rank2Types
     parseTime, readTime, readsTime,
 #endif
-    ParseTime(..)
+    ParseTime(..),
+    -- * Locale
+    module System.Locale
     ) where
 
 import Data.Time.Clock.POSIX
diff --git a/Test/TestEaster.hs b/Test/TestEaster.hs
index 20c8889..afba44c 100644
--- a/Test/TestEaster.hs
+++ b/Test/TestEaster.hs
@@ -6,8 +6,6 @@ import Data.Time.Calendar.Easter
 import Data.Time.Calendar
 import Data.Time.Format
 
-import System.Locale
-
 import Test.TestUtil
 import Test.TestEasterRef
 
diff --git a/Test/TestFormat.hs b/Test/TestFormat.hs
index fe5f375..68b8d2f 100644
--- a/Test/TestFormat.hs
+++ b/Test/TestFormat.hs
@@ -5,7 +5,6 @@ module Test.TestFormat where
 import Data.Time
 import Data.Time.Clock.POSIX
 import Data.Char
-import System.Locale
 import Foreign
 import Foreign.C
 import Control.Exception;
diff --git a/Test/TestParseTime.hs b/Test/TestParseTime.hs
index 7ddf400..fcb7421 100644
--- a/Test/TestParseTime.hs
+++ b/Test/TestParseTime.hs
@@ -10,7 +10,6 @@ import Data.Time
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
 import Data.Time.Clock.POSIX
-import System.Locale
 import Test.QuickCheck hiding (Result,reason)
 import Test.QuickCheck.Property hiding (result)
 import Test.TestUtil hiding (Result)
diff --git a/time.cabal b/time.cabal
index 1b71b00..d41b553 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.4.2.1
+version:        1.5
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:54:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:46 +0000 (UTC)
Subject: [commit: packages/time] master: .Format.Parse: add parseTimeM
 parseTimeOrError readSTime readPTime,
 deprecate parseTime readTime readsTime (1a633e6)
Message-ID: <20151220075446.E97063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1a633e6737ae45634619e2c9895c89848020bdec

>---------------------------------------------------------------

commit 1a633e6737ae45634619e2c9895c89848020bdec
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 10 03:19:27 2014 -0700

    .Format.Parse: add parseTimeM parseTimeOrError readSTime readPTime, deprecate parseTime readTime readsTime


>---------------------------------------------------------------

1a633e6737ae45634619e2c9895c89848020bdec
 Data/Time/Format/Parse.hs | 95 +++++++++++++++++++++++++++++++++++------------
 Test/TestFormat.hs        | 10 ++---
 Test/TestParseTime.hs     | 89 +++++++++++++++++++++++++++++++-------------
 3 files changed, 140 insertions(+), 54 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1a633e6737ae45634619e2c9895c89848020bdec

From git at git.haskell.org  Sun Dec 20 07:54:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:48 +0000 (UTC)
Subject: [commit: packages/time] master: clean up source (50ddcf7)
Message-ID: <20151220075448.F0AAF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/50ddcf77f6ab8d6464e64422c0ac563c2b600423

>---------------------------------------------------------------

commit 50ddcf77f6ab8d6464e64422c0ac563c2b600423
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 17 19:21:51 2014 -0700

    clean up source


>---------------------------------------------------------------

50ddcf77f6ab8d6464e64422c0ac563c2b600423
 Data/Time/Format/Parse.hs | 0
 Test/TestFormat.hs        | 0
 Test/TestParseTime.hs     | 0
 3 files changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Sun Dec 20 07:54:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:51 +0000 (UTC)
Subject: [commit: packages/time] master: TestParseTime: more tests (c732e4d)
Message-ID: <20151220075451.0360C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/c732e4d16d58ec1de790dc60afd7475c96641d89

>---------------------------------------------------------------

commit c732e4d16d58ec1de790dc60afd7475c96641d89
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 17 19:39:51 2014 -0700

    TestParseTime: more tests


>---------------------------------------------------------------

c732e4d16d58ec1de790dc60afd7475c96641d89
 Test/TestParseTime.hs | 36 ++++++++++++++++++++++++------------
 1 file changed, 24 insertions(+), 12 deletions(-)

diff --git a/Test/TestParseTime.hs b/Test/TestParseTime.hs
index e53a016..97acfb6 100644
--- a/Test/TestParseTime.hs
+++ b/Test/TestParseTime.hs
@@ -63,25 +63,37 @@ readTest expected target = let
     name = show target
     in pureTest name result
 
+readTestsParensSpaces :: forall a. (Eq a,Show a,Read a) => a -> String -> Test
+readTestsParensSpaces expected target = testGroup target
+    [
+    readTest [(expected,"")] $ target,
+    readTest [(expected,"")] $ "("++target++")",
+    readTest [(expected,"")] $ " ("++target++")",
+    readTest [(expected," ")] $ " ( "++target++" ) ",
+    readTest [(expected," ")] $ " (( "++target++" )) ",
+    readTest ([] :: [(a,String)]) $ "("++target,
+    readTest [(expected,")")] $ ""++target++")",
+    readTest [(expected,"")] $ "(("++target++"))",
+    readTest [(expected," ")] $ "  (   (     "++target++"   )  ) "
+    ] where
+
 readOtherTypesTest :: Test
 readOtherTypesTest = testGroup "read other types"
     [
-    readTest [(3,"")] "3",
-    readTest [(3,"")] "(3)",
-    readTest [(3,"")] " (3)",
-    readTest [(3," ")] " ( 3 ) ",
-    readTest [(3," ")] " (( 3 )) ",
-    readTest [("a","")] "(\"a\")",
-    readTest ([] :: [(String,String)]) "(\"a\"",
-    readTest [("a",")")] "\"a\")",
-    readTest [("a","")] "((\"a\"))",
-    readTest [("a"," ")] "  (   (     \"a\"   )  ) "
-    ] where
+    readTestsParensSpaces 3 "3",
+    readTestsParensSpaces "a" "\"a\""
+    ]
 
 readTests :: Test
 readTests = testGroup "read times"
     [
-    ]
+    readTestsParensSpaces testDay "1912-07-08",
+    readTestsParensSpaces testDay "1912-7-8",
+    readTestsParensSpaces testTimeOfDay "08:04:02",
+    readTestsParensSpaces testTimeOfDay "8:4:2"
+    ] where
+    testDay = fromGregorian 1912 7 8
+    testTimeOfDay = TimeOfDay 8 4 2
 
 simpleFormatTests :: Test
 simpleFormatTests = testGroup "simple"


From git at git.haskell.org  Sun Dec 20 07:54:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:53 +0000 (UTC)
Subject: [commit: packages/time] master: move lib/test sources to separate
 directories (ad32d01)
Message-ID: <20151220075453.0CFD33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ad32d011138e7147236b0299cb0c2efb327e1f9d

>---------------------------------------------------------------

commit ad32d011138e7147236b0299cb0c2efb327e1f9d
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 17 20:00:05 2014 -0700

    move lib/test sources to separate directories


>---------------------------------------------------------------

ad32d011138e7147236b0299cb0c2efb327e1f9d
 Makefile                                          |  2 +-
 {Data => lib/Data}/Time.hs                        |  0
 {Data => lib/Data}/Time/Calendar.hs               |  0
 {Data => lib/Data}/Time/Calendar/Days.hs          |  0
 {Data => lib/Data}/Time/Calendar/Easter.hs        |  0
 {Data => lib/Data}/Time/Calendar/Gregorian.hs     |  0
 {Data => lib/Data}/Time/Calendar/Julian.hs        |  0
 {Data => lib/Data}/Time/Calendar/JulianYearDay.hs |  0
 {Data => lib/Data}/Time/Calendar/MonthDay.hs      |  0
 {Data => lib/Data}/Time/Calendar/OrdinalDate.hs   |  0
 {Data => lib/Data}/Time/Calendar/Private.hs       |  0
 {Data => lib/Data}/Time/Calendar/WeekDate.hs      |  0
 {Data => lib/Data}/Time/Clock.hs                  |  0
 {Data => lib/Data}/Time/Clock/CTimeval.hs         |  0
 {Data => lib/Data}/Time/Clock/POSIX.hs            |  0
 {Data => lib/Data}/Time/Clock/Scale.hs            |  0
 {Data => lib/Data}/Time/Clock/TAI.hs              |  0
 {Data => lib/Data}/Time/Clock/UTC.hs              |  0
 {Data => lib/Data}/Time/Clock/UTCDiff.hs          |  0
 {Data => lib/Data}/Time/Format.hs                 |  0
 {Data => lib/Data}/Time/Format/Parse.hs           |  0
 {Data => lib/Data}/Time/LocalTime.hs              |  0
 {Data => lib/Data}/Time/LocalTime/LocalTime.hs    |  0
 {Data => lib/Data}/Time/LocalTime/TimeOfDay.hs    |  0
 {Data => lib/Data}/Time/LocalTime/TimeZone.hs     |  0
 Test.hs => test/Test.hs                           |  0
 {Test => test/Test}/AddDays.hs                    |  0
 {Test => test/Test}/AddDaysRef.hs                 |  0
 {Test => test/Test}/ClipDates.hs                  |  0
 {Test => test/Test}/ClipDatesRef.hs               |  0
 {Test => test/Test}/ConvertBack.hs                |  0
 {Test => test/Test}/CurrentTime.hs                |  0
 {Test => test/Test}/LongWeekYears.hs              |  0
 {Test => test/Test}/LongWeekYearsRef.hs           |  0
 {Test => test/Test}/RealToFracBenchmark.hs        |  0
 {Test => test/Test}/ShowDST.hs                    |  0
 {Test => test/Test}/TAI_UTC_DAT.hs                |  0
 {Test => test/Test}/TestCalendars.hs              |  0
 {Test => test/Test}/TestCalendarsRef.hs           |  0
 {Test => test/Test}/TestEaster.hs                 |  0
 {Test => test/Test}/TestEasterRef.hs              |  0
 {Test => test/Test}/TestFormat.hs                 |  0
 {Test => test/Test}/TestFormatStuff.c             |  0
 {Test => test/Test}/TestFormatStuff.h             |  0
 {Test => test/Test}/TestMonthDay.hs               |  0
 {Test => test/Test}/TestMonthDayRef.hs            |  0
 {Test => test/Test}/TestParseDAT.hs               |  0
 {Test => test/Test}/TestParseDAT_Ref.hs           |  0
 {Test => test/Test}/TestParseTime.hs              |  0
 {Test => test/Test}/TestTime.hs                   |  0
 {Test => test/Test}/TestTimeRef.hs                |  0
 {Test => test/Test}/TestTimeZone.hs               |  0
 {Test => test/Test}/TestUtil.hs                   |  0
 {Test => test/Test}/Tests.hs                      |  0
 {Test => test/Test}/TimeZone.hs                   |  0
 {Test => test/Test}/UseCases.lhs                  |  0
 time.cabal                                        | 32 ++++-------------------
 57 files changed, 6 insertions(+), 28 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ad32d011138e7147236b0299cb0c2efb327e1f9d

From git at git.haskell.org  Sun Dec 20 07:54:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:55 +0000 (UTC)
Subject: [commit: packages/time] master: further file moves and .cabal fixes
 (0939180)
Message-ID: <20151220075455.1790B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/093918017defa1bf5c56c6ca5f31c6bc03c52de5

>---------------------------------------------------------------

commit 093918017defa1bf5c56c6ca5f31c6bc03c52de5
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 17 20:09:24 2014 -0700

    further file moves and .cabal fixes


>---------------------------------------------------------------

093918017defa1bf5c56c6ca5f31c6bc03c52de5
 configure.ac                           |  4 +-
 {cbits => lib/cbits}/HsTime.c          |  0
 {include => lib/include}/HsConfigure.h |  0
 {include => lib/include}/HsTime.h      |  0
 lib/include/HsTimeConfig.h             | 87 ++++++++++++++++++++++++++++++++++
 lib/include/HsTimeConfig.h.in          | 86 +++++++++++++++++++++++++++++++++
 lib/include/HsTimeConfig.h.in~         | 86 +++++++++++++++++++++++++++++++++
 time.cabal                             | 23 ++++-----
 8 files changed, 270 insertions(+), 16 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 093918017defa1bf5c56c6ca5f31c6bc03c52de5

From git at git.haskell.org  Sun Dec 20 07:54:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:57 +0000 (UTC)
Subject: [commit: packages/time] master: remove odd file (185cb99)
Message-ID: <20151220075457.1E6273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/185cb993a5b2d0bda1d214d9d811ae68456440e6

>---------------------------------------------------------------

commit 185cb993a5b2d0bda1d214d9d811ae68456440e6
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Aug 17 20:11:34 2014 -0700

    remove odd file


>---------------------------------------------------------------

185cb993a5b2d0bda1d214d9d811ae68456440e6
 lib/include/HsTimeConfig.h.in~ | 86 ------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/lib/include/HsTimeConfig.h.in~ b/lib/include/HsTimeConfig.h.in~
deleted file mode 100644
index 618088e..0000000
--- a/lib/include/HsTimeConfig.h.in~
+++ /dev/null
@@ -1,86 +0,0 @@
-/* include/HsTimeConfig.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the declaration of `altzone', and to 0 if you
-   don't. */
-#undef HAVE_DECL_ALTZONE
-
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#undef HAVE_DECL_TZNAME
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
-
-/* Define to 1 if you don't have `tm_zone' but do have the external array
-   `tzname'. */
-#undef HAVE_TZNAME
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME


From git at git.haskell.org  Sun Dec 20 07:54:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:54:59 +0000 (UTC)
Subject: [commit: packages/time] master: Makefile: slight fix (077665f)
Message-ID: <20151220075459.242FE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/077665f054fb140b8e0ef8afbdf03eec1b627a30

>---------------------------------------------------------------

commit 077665f054fb140b8e0ef8afbdf03eec1b627a30
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Aug 18 00:54:48 2014 -0700

    Makefile: slight fix


>---------------------------------------------------------------

077665f054fb140b8e0ef8afbdf03eec1b627a30
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index afe2b5b..7b37eb9 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,7 @@ build: configure
 	cabal build --ghc-options=-Werror
 
 test: configure
-	cabal test --test-option=--hide-successes --test-option=--color
+	cabal test --ghc-options=-Werror --test-option=--hide-successes --test-option=--color
 
 haddock: configure
 	cabal haddock


From git at git.haskell.org  Sun Dec 20 07:55:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:01 +0000 (UTC)
Subject: [commit: packages/time] master: .Format.Parse: be cleverer about
 skipping spaces (42afd39)
Message-ID: <20151220075501.2CD6B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/42afd39fc919636b86c7b4764d0e610afce208ef

>---------------------------------------------------------------

commit 42afd39fc919636b86c7b4764d0e610afce208ef
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Aug 18 01:48:59 2014 -0700

    .Format.Parse: be cleverer about skipping spaces


>---------------------------------------------------------------

42afd39fc919636b86c7b4764d0e610afce208ef
 lib/Data/Time/Format/Parse.hs |  2 +-
 test/Test/TestParseTime.hs    | 67 +++++++++++++++++++++++++++++--------------
 2 files changed, 47 insertions(+), 22 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 42afd39fc919636b86c7b4764d0e610afce208ef

From git at git.haskell.org  Sun Dec 20 07:55:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:03 +0000 (UTC)
Subject: [commit: packages/time] master: .Format.Parse: fix spaces parsing
 (f964074)
Message-ID: <20151220075503.34C943A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f964074acda92566bc15e25f31bb5c752b17c002

>---------------------------------------------------------------

commit f964074acda92566bc15e25f31bb5c752b17c002
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Aug 18 02:03:25 2014 -0700

    .Format.Parse: fix spaces parsing


>---------------------------------------------------------------

f964074acda92566bc15e25f31bb5c752b17c002
 lib/Data/Time/Format/Parse.hs | 2 +-
 test/Test/TestParseTime.hs    | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index e750f9a..5b0b762 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -131,7 +131,7 @@ readPTime :: ParseTime t =>
           -> String     -- ^ Format string
           -> ReadP t
 readPTime False l f = readPOnlyTime l f
-readPTime True l f = readPOnlyTime l f <++ (skipSpaces >> readPOnlyTime l f)
+readPTime True l f = (skipSpaces >> readPOnlyTime l f) <++ readPOnlyTime l f
 
 -- | Parse a time value given a format string (without allowing leading whitespace).  See 'parseTimeM' for details.
 readPOnlyTime :: ParseTime t =>
diff --git a/test/Test/TestParseTime.hs b/test/Test/TestParseTime.hs
index 0fb9711..b0e9ef2 100644
--- a/test/Test/TestParseTime.hs
+++ b/test/Test/TestParseTime.hs
@@ -147,9 +147,13 @@ particularParseTests :: Test
 particularParseTests = testGroup "particular"
     [
         spacingTests epoch "%Q" "",
+        spacingTests epoch "%Q" ".0",
         spacingTests epoch "%k" " 0",
         spacingTests epoch "%M" "00",
-        spacingTests (TimeZone 120 False "") "%Z" "+0200"
+        spacingTests epoch "%m" "01",
+        spacingTests (TimeZone 120 False "") "%z" "+0200",
+        spacingTests (TimeZone 120 False "") "%Z" "+0200",
+        spacingTests (TimeZone (-480) False "PST") "%Z" "PST"
     ]
 
 parseYMD :: Day -> Test


From git at git.haskell.org  Sun Dec 20 07:55:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:05 +0000 (UTC)
Subject: [commit: packages/time] master: remove dependency on old-locale
 (907cbc2)
Message-ID: <20151220075505.3DA4C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/907cbc2c7c3fcecea255028fb895c3f5b144a6eb

>---------------------------------------------------------------

commit 907cbc2c7c3fcecea255028fb895c3f5b144a6eb
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Aug 23 21:56:11 2014 -0700

    remove dependency on old-locale


>---------------------------------------------------------------

907cbc2c7c3fcecea255028fb895c3f5b144a6eb
 lib/Data/Time/Format/Locale.hs | 78 ++++++++++++++++++++++++++++++++++++++++++
 lib/Data/Time/Format/Parse.hs  |  4 +--
 lib/System/Locale.hs           |  5 +++
 time.cabal                     |  8 ++---
 4 files changed, 89 insertions(+), 6 deletions(-)

diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
new file mode 100644
index 0000000..11ec05a
--- /dev/null
+++ b/lib/Data/Time/Format/Locale.hs
@@ -0,0 +1,78 @@
+-- Note: this file derives from old-locale:System.Locale.hs, which is copyright (c) The University of Glasgow 2001
+
+module Data.Time.Format.Locale (
+
+    TimeLocale(..)
+
+    , defaultTimeLocale
+
+    , iso8601DateFormat
+    , rfc822DateFormat
+    )
+where
+
+import Prelude
+
+data TimeLocale = TimeLocale {
+        -- |full and abbreviated week days
+        wDays  :: [(String, String)],
+        -- |full and abbreviated months
+        months :: [(String, String)],
+        intervals :: [(String, String)],
+        -- |AM\/PM symbols
+        amPm   :: (String, String),
+        -- |formatting strings
+        dateTimeFmt, dateFmt,
+        timeFmt, time12Fmt :: String
+        } deriving (Eq, Ord, Show)
+
+defaultTimeLocale :: TimeLocale
+defaultTimeLocale =  TimeLocale {
+        wDays  = [("Sunday",   "Sun"),  ("Monday",    "Mon"),
+                  ("Tuesday",  "Tue"),  ("Wednesday", "Wed"),
+                  ("Thursday", "Thu"),  ("Friday",    "Fri"),
+                  ("Saturday", "Sat")],
+
+        months = [("January",   "Jan"), ("February",  "Feb"),
+                  ("March",     "Mar"), ("April",     "Apr"),
+                  ("May",       "May"), ("June",      "Jun"),
+                  ("July",      "Jul"), ("August",    "Aug"),
+                  ("September", "Sep"), ("October",   "Oct"),
+                  ("November",  "Nov"), ("December",  "Dec")],
+
+        intervals = [ ("year","years")
+                    , ("month", "months")
+                    , ("day","days")
+                    , ("hour","hours")
+                    , ("min","mins")
+                    , ("sec","secs")
+                    , ("usec","usecs")
+                    ],
+
+        amPm = ("AM", "PM"),
+        dateTimeFmt = "%a %b %e %H:%M:%S %Z %Y",
+        dateFmt = "%m/%d/%y",
+        timeFmt = "%H:%M:%S",
+        time12Fmt = "%I:%M:%S %p"
+        }
+
+
+{- | Construct format string according to <http://en.wikipedia.org/wiki/ISO_8601 ISO-8601>.
+
+The @Maybe String@ argument allows to supply an optional time specification. E.g.:
+
+@
+'iso8601DateFormat' Nothing            == "%Y-%m-%d"           -- i.e. @/YYYY-MM-DD/@
+'iso8601DateFormat' (Just "%H:%M:%S")  == "%Y-%m-%dT%H:%M:%S"  -- i.e. @/YYYY-MM-DD/T/HH:MM:SS/@
+@
+-}
+
+iso8601DateFormat :: Maybe String -> String
+iso8601DateFormat mTimeFmt =
+    "%Y-%m-%d" ++ case mTimeFmt of
+             Nothing  -> ""
+             Just fmt -> 'T' : fmt
+
+-- | Format string according to <http://tools.ietf.org/html/rfc822#section-5 RFC822>.
+rfc822DateFormat :: String
+rfc822DateFormat = "%a, %_d %b %Y %H:%M:%S %Z"
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index 5b0b762..82c48df 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -11,7 +11,7 @@ module Data.Time.Format.Parse
 #endif
     ParseTime(..),
     -- * Locale
-    module System.Locale
+    module Data.Time.Format.Locale
     ) where
 
 import Data.Time.Clock.POSIX
@@ -29,7 +29,7 @@ import Data.Fixed
 import Data.List
 import Data.Maybe
 import Data.Ratio
-import System.Locale
+import Data.Time.Format.Locale
 #if LANGUAGE_Rank2Types
 import Text.ParserCombinators.ReadP hiding (char, string)
 #endif
diff --git a/lib/System/Locale.hs b/lib/System/Locale.hs
new file mode 100644
index 0000000..88961cc
--- /dev/null
+++ b/lib/System/Locale.hs
@@ -0,0 +1,5 @@
+module System.Locale
+{-# DEPRECATED "Use Data.Time.Format instead" #-}
+(module Data.Time.Format.Locale)
+where
+import Data.Time.Format.Locale
diff --git a/time.cabal b/time.cabal
index 881fd7d..23a388f 100644
--- a/time.cabal
+++ b/time.cabal
@@ -36,8 +36,7 @@ library
     hs-source-dirs: lib
     build-depends:
         base >= 4.4 && < 5,
-        deepseq >= 1.1,
-        old-locale
+        deepseq >= 1.1
     ghc-options: -Wall
     default-language: Haskell2010
     if impl(ghc)
@@ -64,7 +63,8 @@ library
         Data.Time.Clock.TAI,
         Data.Time.LocalTime,
         Data.Time.Format,
-        Data.Time
+        Data.Time,
+        System.Locale
     default-extensions:    CPP
     c-sources: lib/cbits/HsTime.c
     other-modules:
@@ -80,6 +80,7 @@ library
         Data.Time.LocalTime.TimeOfDay,
         Data.Time.LocalTime.LocalTime,
         Data.Time.Format.Parse
+        Data.Time.Format.Locale
     include-dirs: lib/include
     if os(windows)
         install-includes:
@@ -108,7 +109,6 @@ test-suite tests
     build-depends:
         base,
         deepseq,
-        old-locale,
         time == 1.5,
         QuickCheck >= 2.5.1,
         test-framework >= 0.8,


From git at git.haskell.org  Sun Dec 20 07:55:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:07 +0000 (UTC)
Subject: [commit: packages/time] master: LICENSE: some code U. Glasgow
 (635917c)
Message-ID: <20151220075507.44A9F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/635917c79260a6ddf890b2e2b5ff257bb029ff35

>---------------------------------------------------------------

commit 635917c79260a6ddf890b2e2b5ff257bb029ff35
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Aug 23 22:10:18 2014 -0700

    LICENSE: some code U. Glasgow


>---------------------------------------------------------------

635917c79260a6ddf890b2e2b5ff257bb029ff35
 LICENSE | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/LICENSE b/LICENSE
index 485d7f6..34a3712 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,5 +1,5 @@
-TimeLib is Copyright (c) Ashley Yakeley, 2004-2010.
-All rights reserved.
+TimeLib is Copyright (c) Ashley Yakeley, 2004-2014. All rights reserved.
+Certain sections are Copyright 2004, The University Court of the University of Glasgow. All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
 


From git at git.haskell.org  Sun Dec 20 07:55:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:09 +0000 (UTC)
Subject: [commit: packages/time] master: remove System.Locale (e4ea1d9)
Message-ID: <20151220075509.4B0D03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e4ea1d9be7cb20339b1140937f2db01e5fe1d1a0

>---------------------------------------------------------------

commit e4ea1d9be7cb20339b1140937f2db01e5fe1d1a0
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Aug 25 01:32:51 2014 -0700

    remove System.Locale


>---------------------------------------------------------------

e4ea1d9be7cb20339b1140937f2db01e5fe1d1a0
 lib/System/Locale.hs | 5 -----
 time.cabal           | 3 +--
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/System/Locale.hs b/lib/System/Locale.hs
deleted file mode 100644
index 88961cc..0000000
--- a/lib/System/Locale.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module System.Locale
-{-# DEPRECATED "Use Data.Time.Format instead" #-}
-(module Data.Time.Format.Locale)
-where
-import Data.Time.Format.Locale
diff --git a/time.cabal b/time.cabal
index 23a388f..383267f 100644
--- a/time.cabal
+++ b/time.cabal
@@ -63,8 +63,7 @@ library
         Data.Time.Clock.TAI,
         Data.Time.LocalTime,
         Data.Time.Format,
-        Data.Time,
-        System.Locale
+        Data.Time
     default-extensions:    CPP
     c-sources: lib/cbits/HsTime.c
     other-modules:


From git at git.haskell.org  Sun Dec 20 07:55:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:11 +0000 (UTC)
Subject: [commit: packages/time] master: allow user control of parsing of
 time-zone names (dc4157a)
Message-ID: <20151220075511.5381B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/dc4157a645c6a91803470a2e795008b680072586

>---------------------------------------------------------------

commit dc4157a645c6a91803470a2e795008b680072586
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Aug 25 02:39:44 2014 -0700

    allow user control of parsing of time-zone names


>---------------------------------------------------------------

dc4157a645c6a91803470a2e795008b680072586
 lib/Data/Time/Format/Locale.hs | 230 ++++++++++++++++++++++++++++++++++++++-
 lib/Data/Time/Format/Parse.hs  | 238 +++--------------------------------------
 2 files changed, 241 insertions(+), 227 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc dc4157a645c6a91803470a2e795008b680072586

From git at git.haskell.org  Sun Dec 20 07:55:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:13 +0000 (UTC)
Subject: [commit: packages/time] master: parse single-letter "military" time
 zones;
 test parsing of all defaultLocale time zones. Test failure: "EAST" is there
 twice. (2e0c3f8)
Message-ID: <20151220075513.5B7AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2e0c3f84f91a22e6c7cf9ee77d3f823a3aeb9355

>---------------------------------------------------------------

commit 2e0c3f84f91a22e6c7cf9ee77d3f823a3aeb9355
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Sep 1 20:34:22 2014 -0700

    parse single-letter "military" time zones; test parsing of all defaultLocale time zones. Test failure: "EAST" is there twice.


>---------------------------------------------------------------

2e0c3f84f91a22e6c7cf9ee77d3f823a3aeb9355
 lib/Data/Time/Format/Locale.hs     |  2 --
 lib/Data/Time/Format/Parse.hs      | 16 +++++++++++++++-
 test/ShowDefaultTZAbbreviations.hs |  9 +++++++++
 test/Test/TestParseTime.hs         | 32 ++++++++++++++++++++++++++++++++
 time.cabal                         |  8 ++++++++
 5 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
index 3708b8e..399cb25 100644
--- a/lib/Data/Time/Format/Locale.hs
+++ b/lib/Data/Time/Format/Locale.hs
@@ -210,8 +210,6 @@ _TIMEZONES_ =
     --  Universal Coordinated Time
     ,("UTC",     (readTzOffset "+00:00", False))
     --  Same as UTC
-    ,("Z",       (readTzOffset "+00:00", False))
-    --  Same as UTC
     ,("ZULU",    (readTzOffset "+00:00", False))
     --  Western European Time
     ,("WET",     (readTzOffset "+00:00", False))
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index 0064dda..07dc5b2 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -410,6 +410,18 @@ mkPico i f = fromInteger i + fromRational (f % 1000000000000)
 instance ParseTime LocalTime where
     buildTime l xs = LocalTime (buildTime l xs) (buildTime l xs)
 
+enumDiff :: (Enum a) => a -> a -> Int
+enumDiff a b = (fromEnum a) - (fromEnum b)
+
+getMilZoneHours :: Char -> Maybe Int
+getMilZoneHours c | c < 'A' = Nothing
+getMilZoneHours c | c <= 'I' = Just $ 1 + enumDiff c 'A'
+getMilZoneHours 'J' = Nothing
+getMilZoneHours c | c <= 'M' = Just $ 10 + enumDiff c 'K'
+getMilZoneHours c | c <= 'Y' = Just $ (enumDiff 'N' c) - 1
+getMilZoneHours 'Z' = Just 0
+getMilZoneHours _ = Nothing
+
 instance ParseTime TimeZone where
     buildTime l = foldl f (minutesToTimeZone 0)
       where
@@ -420,7 +432,9 @@ instance ParseTime TimeZone where
                   | isAlpha (head x) -> let y = up x in
                       case find (\tz -> y == timeZoneName tz) (knownTimeZones l) of
                         Just tz -> tz
-                        Nothing -> TimeZone offset dst y
+                        Nothing -> case y of
+                            [yc] | Just hours <- getMilZoneHours yc -> TimeZone (hours * 60) False y
+                            _ -> TimeZone offset dst y
                   | otherwise        -> zone
               _   -> t
           where zone = TimeZone (readTzOffset x) dst name
diff --git a/test/ShowDefaultTZAbbreviations.hs b/test/ShowDefaultTZAbbreviations.hs
new file mode 100644
index 0000000..fc24783
--- /dev/null
+++ b/test/ShowDefaultTZAbbreviations.hs
@@ -0,0 +1,9 @@
+module Main where
+
+import Data.Time
+
+showTZ :: TimeZone -> String
+showTZ tz = (formatTime defaultTimeLocale "%Z %z " tz) ++ show (timeZoneSummerOnly tz)
+
+main :: IO ()
+main = mapM_ (\tz -> putStrLn (showTZ tz)) (knownTimeZones defaultTimeLocale)
diff --git a/test/Test/TestParseTime.hs b/test/Test/TestParseTime.hs
index b0e9ef2..26ee67d 100644
--- a/test/Test/TestParseTime.hs
+++ b/test/Test/TestParseTime.hs
@@ -27,6 +27,9 @@ testParseTime = testGroup "testParseTime"
     simpleFormatTests,
     extests,
     particularParseTests,
+    badParseTests,
+    defaultTimeZoneTests,
+    militaryTimeZoneTests,
     testGroup "properties" (fmap (\(n,prop) -> testProperty n prop) properties)
     ]
 
@@ -156,6 +159,12 @@ particularParseTests = testGroup "particular"
         spacingTests (TimeZone (-480) False "PST") "%Z" "PST"
     ]
 
+badParseTests :: Test
+badParseTests = testGroup "bad"
+    [
+        parseTest False (Nothing :: Maybe Day) "%Y" ""
+    ]
+
 parseYMD :: Day -> Test
 parseYMD day = case toGregorian day of
     (y,m,d) -> parseTest False (Just day) "%Y%m%d" ((show y) ++ (show2 m) ++ (show2 d))
@@ -200,6 +209,29 @@ readsTest :: forall t. (Show t, Eq t, ParseTime t) => Maybe t -> String -> Strin
 readsTest (Just e) = readsTest' [(e,"")]
 readsTest Nothing = readsTest' ([] :: [(t,String)])
 -}
+
+enumAdd :: (Enum a) => Int -> a -> a
+enumAdd i a = toEnum (i + fromEnum a)
+
+getMilZoneLetter :: Int -> Char
+getMilZoneLetter 0 = 'Z'
+getMilZoneLetter h | h < 0 = enumAdd (negate h) 'M'
+getMilZoneLetter h | h < 10 = enumAdd (h - 1) 'A'
+getMilZoneLetter h = enumAdd (h - 10) 'K'
+
+getMilZone :: Int -> TimeZone
+getMilZone hour = TimeZone (hour * 60) False [getMilZoneLetter hour]
+
+testParseTimeZone :: TimeZone -> Test
+testParseTimeZone tz = parseTest False (Just tz) "%Z" (timeZoneName tz)
+
+defaultTimeZoneTests :: Test
+defaultTimeZoneTests = testGroup "default time zones" (fmap testParseTimeZone (knownTimeZones defaultTimeLocale))
+
+militaryTimeZoneTests :: Test
+militaryTimeZoneTests = testGroup "military time zones" (fmap (testParseTimeZone . getMilZone) [-12 .. 12])
+
+
 parse :: ParseTime t => Bool -> String -> String -> Maybe t
 parse sp f t = parseTimeM sp defaultTimeLocale f t
 
diff --git a/time.cabal b/time.cabal
index 383267f..b5c1638 100644
--- a/time.cabal
+++ b/time.cabal
@@ -89,6 +89,14 @@ library
             HsTime.h
             HsTimeConfig.h
 
+test-suite ShowDefaultTZAbbreviations
+    hs-source-dirs: test
+    type: exitcode-stdio-1.0
+    build-depends:
+        base,
+        time == 1.5
+    main-is: ShowDefaultTZAbbreviations.hs
+
 test-suite tests
     hs-source-dirs: test
     type: exitcode-stdio-1.0


From git at git.haskell.org  Sun Dec 20 07:55:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:15 +0000 (UTC)
Subject: [commit: packages/time] master: We're not in the time-zone business.
 defaultTimeLocale only has the time-zones mentioned in RFC 822. (f5ed156)
Message-ID: <20151220075515.630BC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/f5ed15614b8950c1c31b031a50ce18755b652f0e

>---------------------------------------------------------------

commit f5ed15614b8950c1c31b031a50ce18755b652f0e
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Sep 1 20:53:59 2014 -0700

    We're not in the time-zone business. defaultTimeLocale only has the time-zones mentioned in RFC 822.


>---------------------------------------------------------------

f5ed15614b8950c1c31b031a50ce18755b652f0e
 lib/Data/Time/Format/Locale.hs     | 239 +++----------------------------------
 test/ShowDefaultTZAbbreviations.hs |   2 +-
 2 files changed, 19 insertions(+), 222 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f5ed15614b8950c1c31b031a50ce18755b652f0e

From git at git.haskell.org  Sun Dec 20 07:55:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:17 +0000 (UTC)
Subject: [commit: packages/time] master: remove "intervals" from TimeLocale
 (2be4631)
Message-ID: <20151220075517.695E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2be46316b8ae4849fb38555c36722116b71edd74

>---------------------------------------------------------------

commit 2be46316b8ae4849fb38555c36722116b71edd74
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Mon Sep 1 21:22:44 2014 -0700

    remove "intervals" from TimeLocale


>---------------------------------------------------------------

2be46316b8ae4849fb38555c36722116b71edd74
 lib/Data/Time/Format/Locale.hs | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
index e613fb9..ce0598a 100644
--- a/lib/Data/Time/Format/Locale.hs
+++ b/lib/Data/Time/Format/Locale.hs
@@ -18,7 +18,6 @@ data TimeLocale = TimeLocale {
         wDays  :: [(String, String)],
         -- |full and abbreviated months
         months :: [(String, String)],
-        intervals :: [(String, String)],
         -- |AM\/PM symbols
         amPm   :: (String, String),
         -- |formatting strings
@@ -47,15 +46,6 @@ defaultTimeLocale =  TimeLocale {
                   ("September", "Sep"), ("October",   "Oct"),
                   ("November",  "Nov"), ("December",  "Dec")],
 
-        intervals = [ ("year","years")
-                    , ("month", "months")
-                    , ("day","days")
-                    , ("hour","hours")
-                    , ("min","mins")
-                    , ("sec","secs")
-                    , ("usec","usecs")
-                    ],
-
         amPm = ("AM", "PM"),
         dateTimeFmt = "%a %b %e %H:%M:%S %Z %Y",
         dateFmt = "%m/%d/%y",


From git at git.haskell.org  Sun Dec 20 07:55:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:19 +0000 (UTC)
Subject: [commit: packages/time] master: doc quote cleanup (2a14cb0)
Message-ID: <20151220075519.7088E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/2a14cb05a1685d6f8ddc3725f811cbfd48a34915

>---------------------------------------------------------------

commit 2a14cb05a1685d6f8ddc3725f811cbfd48a34915
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Sep 7 20:26:16 2014 -0700

    doc quote cleanup


>---------------------------------------------------------------

2a14cb05a1685d6f8ddc3725f811cbfd48a34915
 lib/Data/Time/Format/Locale.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
index ce0598a..2ce510f 100644
--- a/lib/Data/Time/Format/Locale.hs
+++ b/lib/Data/Time/Format/Locale.hs
@@ -30,7 +30,7 @@ data TimeLocale = TimeLocale {
 -- | Locale representing American usage.
 --
 -- 'knownTimeZones' contains only the ten time-zones mentioned in RFC 822 sec. 5:
--- "UT", "GMT", "EST", "EDT", "CST", "CDT", "MST", "MDT", "PST", "PDT".
+-- \"UT\", \"GMT\", \"EST\", \"EDT\", \"CST\", \"CDT\", \"MST\", \"MDT\", \"PST\", \"PDT\".
 -- Note that the parsing functions will regardless parse single-letter military time-zones and +HHMM format.
 defaultTimeLocale :: TimeLocale
 defaultTimeLocale =  TimeLocale {


From git at git.haskell.org  Sun Dec 20 07:55:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:21 +0000 (UTC)
Subject: [commit: packages/time] master: Added bug-reports line to time.cabal
 (892717c)
Message-ID: <20151220075521.77D553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/892717c506ebbeadf8b9f1f8eecf5e145cfed47e

>---------------------------------------------------------------

commit 892717c506ebbeadf8b9f1f8eecf5e145cfed47e
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sun Sep 7 23:13:08 2014 -0700

    Added bug-reports line to time.cabal


>---------------------------------------------------------------

892717c506ebbeadf8b9f1f8eecf5e145cfed47e
 time.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/time.cabal b/time.cabal
index b5c1638..068219a 100644
--- a/time.cabal
+++ b/time.cabal
@@ -6,6 +6,7 @@ license-file:   LICENSE
 author:         Ashley Yakeley
 maintainer:     <ashley at semantic.org>
 homepage:       https://github.com/haskell/time
+bug-reports:    https://github.com/haskell/time/issues
 synopsis:       A time library
 description:    A time library
 category:       System


From git at git.haskell.org  Sun Dec 20 07:55:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:23 +0000 (UTC)
Subject: [commit: packages/time] master: Removed autogenerated HsTimeConfig.h*
 from repository, updated .gitignore. (82e0256)
Message-ID: <20151220075523.7E83C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/82e0256223e94b21dbffb0dc60d196fc54cb41a4

>---------------------------------------------------------------

commit 82e0256223e94b21dbffb0dc60d196fc54cb41a4
Author: Gintautas Miliauskas <gintautas.miliauskas at gmail.com>
Date:   Sun Oct 12 02:29:04 2014 +0200

    Removed autogenerated HsTimeConfig.h* from repository, updated .gitignore.


>---------------------------------------------------------------

82e0256223e94b21dbffb0dc60d196fc54cb41a4
 .gitignore                    | 11 ++++--
 lib/include/HsTimeConfig.h    | 87 -------------------------------------------
 lib/include/HsTimeConfig.h.in | 86 ------------------------------------------
 3 files changed, 7 insertions(+), 177 deletions(-)

diff --git a/.gitignore b/.gitignore
index dead619..5880242 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
-dist/
-configure
+GNUmakefile
 autom4te.cache/
 config.*
-include/HsTimeConfig.h
-include/HsTimeConfig.h.in
+configure
+dist/
+dist-install
+ghc.mk
+lib/include/HsTimeConfig.h
+lib/include/HsTimeConfig.h.in
diff --git a/lib/include/HsTimeConfig.h b/lib/include/HsTimeConfig.h
deleted file mode 100644
index 769d94e..0000000
--- a/lib/include/HsTimeConfig.h
+++ /dev/null
@@ -1,87 +0,0 @@
-/* lib/include/HsTimeConfig.h.  Generated from HsTimeConfig.h.in by configure.  */
-/* lib/include/HsTimeConfig.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the declaration of `altzone', and to 0 if you
-   don't. */
-#define HAVE_DECL_ALTZONE 0
-
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-/* #undef HAVE_DECL_TZNAME */
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#define HAVE_GMTIME_R 1
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
-
-/* Define to 1 if you have the `localtime_r' function. */
-#define HAVE_LOCALTIME_R 1
-
-/* Define to 1 if you have the <memory.h> header file. */
-#define HAVE_MEMORY_H 1
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
-
-/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
-
-/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
-
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#define HAVE_STRUCT_TM_TM_ZONE 1
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
-
-/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
-
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#define HAVE_TM_ZONE 1
-
-/* Define to 1 if you don't have `tm_zone' but do have the external array
-   `tzname'. */
-/* #undef HAVE_TZNAME */
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "ashley at semantic.org"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "Haskell time package"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "Haskell time package 1.4.0.2"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "time"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.4.0.2"
-
-/* Define to 1 if you have the ANSI C header files. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#define TIME_WITH_SYS_TIME 1
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-/* #undef TM_IN_SYS_TIME */
diff --git a/lib/include/HsTimeConfig.h.in b/lib/include/HsTimeConfig.h.in
deleted file mode 100644
index b6da5d3..0000000
--- a/lib/include/HsTimeConfig.h.in
+++ /dev/null
@@ -1,86 +0,0 @@
-/* lib/include/HsTimeConfig.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the declaration of `altzone', and to 0 if you
-   don't. */
-#undef HAVE_DECL_ALTZONE
-
-/* Define to 1 if you have the declaration of `tzname', and to 0 if you don't.
-   */
-#undef HAVE_DECL_TZNAME
-
-/* Define to 1 if you have the `gmtime_r' function. */
-#undef HAVE_GMTIME_R
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the `localtime_r' function. */
-#undef HAVE_LOCALTIME_R
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if `tm_zone' is a member of `struct tm'. */
-#undef HAVE_STRUCT_TM_TM_ZONE
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/time.h> header file. */
-#undef HAVE_SYS_TIME_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <time.h> header file. */
-#undef HAVE_TIME_H
-
-/* Define to 1 if your `struct tm' has `tm_zone'. Deprecated, use
-   `HAVE_STRUCT_TM_TM_ZONE' instead. */
-#undef HAVE_TM_ZONE
-
-/* Define to 1 if you don't have `tm_zone' but do have the external array
-   `tzname'. */
-#undef HAVE_TZNAME
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the home page for this package. */
-#undef PACKAGE_URL
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
-#undef TIME_WITH_SYS_TIME
-
-/* Define to 1 if your <sys/time.h> declares `struct tm'. */
-#undef TM_IN_SYS_TIME


From git at git.haskell.org  Sun Dec 20 07:55:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:25 +0000 (UTC)
Subject: [commit: packages/time] master: Use `_tzset()` for non-POSIX Windows
 environments (9f12261)
Message-ID: <20151220075525.84D113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9f12261f5e81f70a50f29f0a43d487070cfa1ab4

>---------------------------------------------------------------

commit 9f12261f5e81f70a50f29f0a43d487070cfa1ab4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Oct 12 10:26:50 2014 +0200

    Use `_tzset()` for non-POSIX Windows environments
    
    When compiling with MinGW (which does not provide a full POSIX layer as
    opposed to CygWin) it's better to use the CRT's underscore-prefixed
    `_tzset()` variant to avoid linker issues as Microsoft considers the
    POSIX named `tzset()` function deprecated
    
    Further reading
    
     - http://msdn.microsoft.com/en-us/library/ms235384.aspx
     - http://stackoverflow.com/questions/23477746/what-are-the-posix-like-functions-in-msvcs-c-runtime
    
    This hopefully addresses #2


>---------------------------------------------------------------

9f12261f5e81f70a50f29f0a43d487070cfa1ab4
 lib/cbits/HsTime.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/lib/cbits/HsTime.c b/lib/cbits/HsTime.c
index 646fac6..e2be98a 100644
--- a/lib/cbits/HsTime.c
+++ b/lib/cbits/HsTime.c
@@ -3,7 +3,17 @@
 
 long int get_current_timezone_seconds (time_t t,int* pdst,char const* * pname)
 {
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(_WIN32)
+    // When compiling with MinGW (which does not provide a full POSIX
+    // layer as opposed to CygWin) it's better to use the CRT's
+    // underscore-prefixed `_tzset()` variant to avoid linker issues
+    // as Microsoft considers the POSIX named `tzset()` function
+    // deprecated (see http://msdn.microsoft.com/en-us/library/ms235384.aspx)
+    _tzset();
+#else
     tzset();
+#endif
+
 #if HAVE_LOCALTIME_R
     struct tm tmd;
     struct tm* ptm = localtime_r(&t,&tmd);


From git at git.haskell.org  Sun Dec 20 07:55:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:27 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #4 from
 hvr/pr-tzset (7633c67)
Message-ID: <20151220075527.8B8163A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7633c6731670fe757ccdf66ccd889e8e12ded56d

>---------------------------------------------------------------

commit 7633c6731670fe757ccdf66ccd889e8e12ded56d
Merge: 892717c 9f12261
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 12 22:18:16 2014 -0700

    Merge pull request #4 from hvr/pr-tzset
    
    Use `_tzset()` for non-POSIX Windows environments



>---------------------------------------------------------------

7633c6731670fe757ccdf66ccd889e8e12ded56d
 lib/cbits/HsTime.c | 10 ++++++++++
 1 file changed, 10 insertions(+)


From git at git.haskell.org  Sun Dec 20 07:55:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:29 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #3 from
 gintas/master (991e6be)
Message-ID: <20151220075529.9260B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/991e6be84974b02d7f968601ab02d2e2b3e14190

>---------------------------------------------------------------

commit 991e6be84974b02d7f968601ab02d2e2b3e14190
Merge: 7633c67 82e0256
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Oct 12 22:19:57 2014 -0700

    Merge pull request #3 from gintas/master
    
    Removed autogenerated HsTimeConfig.h* from repository, updated .gitignore



>---------------------------------------------------------------

991e6be84974b02d7f968601ab02d2e2b3e14190
 .gitignore                    | 11 ++++--
 lib/include/HsTimeConfig.h    | 87 -------------------------------------------
 lib/include/HsTimeConfig.h.in | 86 ------------------------------------------
 3 files changed, 7 insertions(+), 177 deletions(-)


From git at git.haskell.org  Sun Dec 20 07:55:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:31 +0000 (UTC)
Subject: [commit: packages/time] master: Add `Setup.hs` file (5511b80)
Message-ID: <20151220075531.9A3E03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5511b80a884ec945fabfa3ca7ae0107713e5000e

>---------------------------------------------------------------

commit 5511b80a884ec945fabfa3ca7ae0107713e5000e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Oct 14 17:40:36 2014 +0200

    Add `Setup.hs` file
    
    This adds a `Setup.hs` appropriate for `build-type: configure`
    and makes `cabal check` happy.


>---------------------------------------------------------------

5511b80a884ec945fabfa3ca7ae0107713e5000e
 Setup.hs | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Setup.hs b/Setup.hs
new file mode 100644
index 0000000..54f57d6
--- /dev/null
+++ b/Setup.hs
@@ -0,0 +1,6 @@
+module Main (main) where
+
+import Distribution.Simple
+
+main :: IO ()
+main = defaultMainWithHooks autoconfUserHooks


From git at git.haskell.org  Sun Dec 20 07:55:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:33 +0000 (UTC)
Subject: [commit: packages/time] master: Remove an extra division (52523fb)
Message-ID: <20151220075533.A1B193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/52523fbc2deebeb7137b76d66e68eea1c8c030c0

>---------------------------------------------------------------

commit 52523fbc2deebeb7137b76d66e68eea1c8c030c0
Author: treeowl <David.Feuer at gmail.com>
Date:   Fri Nov 7 00:14:37 2014 -0500

    Remove an extra division
    
    Currently, GHC does not merge `div` with `mod` by itself; `divMod` saves time.
    
    Turn nested `if`s into `case`.


>---------------------------------------------------------------

52523fbc2deebeb7137b76d66e68eea1c8c030c0
 lib/Data/Time/Calendar/WeekDate.hs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/lib/Data/Time/Calendar/WeekDate.hs b/lib/Data/Time/Calendar/WeekDate.hs
index 1c76977..c7046b4 100644
--- a/lib/Data/Time/Calendar/WeekDate.hs
+++ b/lib/Data/Time/Calendar/WeekDate.hs
@@ -9,20 +9,19 @@ import Data.Time.Calendar.Private
 -- Note that \"Week\" years are not quite the same as Gregorian years, as the first day of the year is always a Monday.
 -- The first week of a year is the first week to contain at least four days in the corresponding Gregorian year.
 toWeekDate :: Day -> (Integer,Int,Int)
-toWeekDate date@(ModifiedJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger (mod d 7) + 1) where
+toWeekDate date@(ModifiedJulianDay mjd) = (y1,fromInteger (w1 + 1),fromInteger d_mod_7 + 1) where
+        (d_div_7, d_mod_7) = d `divMod` 7
 	(y0,yd) = toOrdinalDate date
 	d = mjd + 2
 	foo :: Integer -> Integer
 	foo y = bar (toModifiedJulianDay (fromOrdinalDate y 6))
-	bar k = (div d 7) - (div k 7)
-	w0 = bar (d - (toInteger yd) + 4)
-	(y1,w1) = if w0 == -1
-		then (y0 - 1,foo (y0 - 1))
-		else if w0 == 52
-		then if (foo (y0 + 1)) == 0
-			then (y0 + 1,0)
-			else (y0,w0)
-		else (y0,w0)
+	bar k = d_div_7 - k `div` 7
+	(y1,w1) = case bar (d - toInteger yd + 4) of
+	            -1 -> (y0 - 1, foo (y0 - 1))
+	            52 -> if foo (y0 + 1) == 0
+	                  then (y0 + 1, 0)
+	                  else (y0, 52)
+	            w0  -> (y0, w0)
 	
 -- | convert from ISO 8601 Week Date format. First argument is year, second week number (1-52 or 53), third day of week (1 for Monday to 7 for Sunday).
 -- Invalid week and day values will be clipped to the correct range.


From git at git.haskell.org  Sun Dec 20 07:55:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:35 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #10 from
 treeowl/master (b55b3c2)
Message-ID: <20151220075535.A7E4B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b55b3c260f042791d4c833d454cc576db9ddf574

>---------------------------------------------------------------

commit b55b3c260f042791d4c833d454cc576db9ddf574
Merge: 991e6be 52523fb
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Nov 7 02:14:54 2014 -0800

    Merge pull request #10 from treeowl/master
    
    Remove an extra division



>---------------------------------------------------------------

b55b3c260f042791d4c833d454cc576db9ddf574
 lib/Data/Time/Calendar/WeekDate.hs | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)


From git at git.haskell.org  Sun Dec 20 07:55:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:37 +0000 (UTC)
Subject: [commit: packages/time] master: Add support for `deepseq-1.4.0.0`
 (e6d887a)
Message-ID: <20151220075537.AE0D33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e6d887a4eb63a9971ba86d84222e809f3c20373c

>---------------------------------------------------------------

commit e6d887a4eb63a9971ba86d84222e809f3c20373c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 14 18:19:36 2014 +0100

    Add support for `deepseq-1.4.0.0`
    
    `deepseq-1.4.0.0`'s major change is the default `rnf` method implementation
    (see haskell/deepseq#1 for details).
    
    This commit changes `time` not to rely on the default implementation and
    instead explicitly make use of `seq` like the old default implementation did.


>---------------------------------------------------------------

e6d887a4eb63a9971ba86d84222e809f3c20373c
 lib/Data/Time/Clock/Scale.hs | 3 ++-
 lib/Data/Time/Clock/UTC.hs   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index 8ba7759..def28ce 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -50,7 +50,8 @@ newtype DiffTime = MkDiffTime Pico deriving (Eq,Ord
     )
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance NFData DiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+instance NFData DiffTime where -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+        rnf dt = seq dt ()
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
 instance Enum DiffTime where
diff --git a/lib/Data/Time/Clock/UTC.hs b/lib/Data/Time/Clock/UTC.hs
index d41b8f8..4cb9447 100644
--- a/lib/Data/Time/Clock/UTC.hs
+++ b/lib/Data/Time/Clock/UTC.hs
@@ -70,7 +70,8 @@ newtype NominalDiffTime = MkNominalDiffTime Pico deriving (Eq,Ord
     )
 
 -- necessary because H98 doesn't have "cunning newtype" derivation
-instance NFData NominalDiffTime -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+instance NFData NominalDiffTime where -- FIXME: Data.Fixed had no NFData instances yet at time of writing
+        rnf ndt = seq ndt ()
 
 instance Enum NominalDiffTime where
 	succ (MkNominalDiffTime a) = MkNominalDiffTime (succ a)


From git at git.haskell.org  Sun Dec 20 07:55:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:39 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #11 from
 hvr/pr-deepseq14 (982ea8f)
Message-ID: <20151220075539.B61933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/982ea8f68740a93399c78b0275d2a685d79c15cf

>---------------------------------------------------------------

commit 982ea8f68740a93399c78b0275d2a685d79c15cf
Merge: b55b3c2 e6d887a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Nov 14 14:27:46 2014 -0800

    Merge pull request #11 from hvr/pr-deepseq14
    
    Add support for `deepseq-1.4.0.0`



>---------------------------------------------------------------

982ea8f68740a93399c78b0275d2a685d79c15cf
 lib/Data/Time/Clock/Scale.hs | 3 ++-
 lib/Data/Time/Clock/UTC.hs   | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)


From git at git.haskell.org  Sun Dec 20 07:55:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:41 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #5 from
 hvr/pr-setuphs (ab6475c)
Message-ID: <20151220075541.BD5F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ab6475cb94260f4303afbbd4b770cbd14ec2f57e

>---------------------------------------------------------------

commit ab6475cb94260f4303afbbd4b770cbd14ec2f57e
Merge: 982ea8f 5511b80
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Nov 14 14:28:19 2014 -0800

    Merge pull request #5 from hvr/pr-setuphs
    
    Add `Setup.hs` file



>---------------------------------------------------------------

ab6475cb94260f4303afbbd4b770cbd14ec2f57e
 Setup.hs | 6 ++++++
 1 file changed, 6 insertions(+)


From git at git.haskell.org  Sun Dec 20 07:55:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:43 +0000 (UTC)
Subject: [commit: packages/time] master: fix deprecation of base 4.8 (7513fad)
Message-ID: <20151220075543.C485F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7513fad1f1f7a4c48fa20582dfe407427484f367

>---------------------------------------------------------------

commit 7513fad1f1f7a4c48fa20582dfe407427484f367
Author: David Terei <code at davidterei.com>
Date:   Fri Nov 21 11:32:55 2014 -0800

    fix deprecation of base 4.8


>---------------------------------------------------------------

7513fad1f1f7a4c48fa20582dfe407427484f367
 lib/Data/Time/Clock/CTimeval.hs     | 4 ++++
 lib/Data/Time/LocalTime/TimeZone.hs | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/lib/Data/Time/Clock/CTimeval.hs b/lib/Data/Time/Clock/CTimeval.hs
index c8a692a..012501a 100644
--- a/lib/Data/Time/Clock/CTimeval.hs
+++ b/lib/Data/Time/Clock/CTimeval.hs
@@ -4,7 +4,11 @@ module Data.Time.Clock.CTimeval where
 #ifndef mingw32_HOST_OS
 -- All Unix-specific, this
 
+#if __GLASGOW_HASKELL__ >= 709
+import Foreign
+#else
 import Foreign.Safe
+#endif
 import Foreign.C
 
 data CTimeval = MkCTimeval CLong CLong
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index e9e4f5f..2efaebb 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -17,7 +17,11 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock
 import Data.Time.Clock.POSIX
 
+#if __GLASGOW_HASKELL__ >= 709
+import Foreign
+#else
 import Foreign.Safe
+#endif
 import Foreign.C
 import Control.DeepSeq
 import Data.Typeable


From git at git.haskell.org  Sun Dec 20 07:55:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:45 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #12 from
 dterei/base48-foreign-fix (8c7c106)
Message-ID: <20151220075545.CAC5B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8c7c106e890141b0452fefdc1bc03191a2f70893

>---------------------------------------------------------------

commit 8c7c106e890141b0452fefdc1bc03191a2f70893
Merge: ab6475c 7513fad
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Fri Nov 21 12:54:26 2014 -0800

    Merge pull request #12 from dterei/base48-foreign-fix
    
    Fix deprecation of Foreign.Safe in base 4.8



>---------------------------------------------------------------

8c7c106e890141b0452fefdc1bc03191a2f70893
 lib/Data/Time/Clock/CTimeval.hs     | 4 ++++
 lib/Data/Time/LocalTime/TimeZone.hs | 4 ++++
 2 files changed, 8 insertions(+)


From git at git.haskell.org  Sun Dec 20 07:55:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:47 +0000 (UTC)
Subject: [commit: packages/time] master: Improve documentation of wdays in
 TimeLocale (9366adb)
Message-ID: <20151220075547.D30CA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/9366adb2d12ff3ad4be7a40a160e231b5c650af7

>---------------------------------------------------------------

commit 9366adb2d12ff3ad4be7a40a160e231b5c650af7
Author: Lubom?r Sedl?? <lubomir.sedlar at gmail.com>
Date:   Sat Dec 13 14:46:50 2014 +0100

    Improve documentation of wdays in TimeLocale


>---------------------------------------------------------------

9366adb2d12ff3ad4be7a40a160e231b5c650af7
 lib/Data/Time/Format/Locale.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
index 2ce510f..80ead81 100644
--- a/lib/Data/Time/Format/Locale.hs
+++ b/lib/Data/Time/Format/Locale.hs
@@ -14,7 +14,7 @@ where
 import Data.Time.LocalTime
 
 data TimeLocale = TimeLocale {
-        -- |full and abbreviated week days
+        -- |full and abbreviated week days, starting with Sunday
         wDays  :: [(String, String)],
         -- |full and abbreviated months
         months :: [(String, String)],


From git at git.haskell.org  Sun Dec 20 07:55:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:49 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #14 from
 lubomir/document-locale (968ec05)
Message-ID: <20151220075549.DA7783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/968ec057a457c970a3b1bb6e5a612f392f29734e

>---------------------------------------------------------------

commit 968ec057a457c970a3b1bb6e5a612f392f29734e
Merge: 8c7c106 9366adb
Author: Gregory Collins <greg at gregorycollins.net>
Date:   Sat Dec 13 22:01:27 2014 +0100

    Merge pull request #14 from lubomir/document-locale
    
    Improve documentation of wdays in TimeLocale



>---------------------------------------------------------------

968ec057a457c970a3b1bb6e5a612f392f29734e
 lib/Data/Time/Format/Locale.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 07:55:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:51 +0000 (UTC)
Subject: [commit: packages/time] master: version 1.5.0.1 (8d3c90a)
Message-ID: <20151220075551.E21A23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/8d3c90a420c8985dcc439766c028821cea7dc848

>---------------------------------------------------------------

commit 8d3c90a420c8985dcc439766c028821cea7dc848
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 13 14:32:01 2014 -0800

    version 1.5.0.1


>---------------------------------------------------------------

8d3c90a420c8985dcc439766c028821cea7dc848
 time.cabal | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/time.cabal b/time.cabal
index 068219a..c1a82be 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.5
+version:        1.5.0.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE
@@ -95,7 +95,7 @@ test-suite ShowDefaultTZAbbreviations
     type: exitcode-stdio-1.0
     build-depends:
         base,
-        time == 1.5
+        time == 1.5.0.1
     main-is: ShowDefaultTZAbbreviations.hs
 
 test-suite tests
@@ -117,7 +117,7 @@ test-suite tests
     build-depends:
         base,
         deepseq,
-        time == 1.5,
+        time == 1.5.0.1,
         QuickCheck >= 2.5.1,
         test-framework >= 0.8,
         test-framework-quickcheck2 >= 0.3,


From git at git.haskell.org  Sun Dec 20 07:55:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:53 +0000 (UTC)
Subject: [commit: packages/time] master: Fix note about `%Y` padding. (a52561a)
Message-ID: <20151220075553.E8DE73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/a52561acc09a942995f74bb8a0a2cd89f955c941

>---------------------------------------------------------------

commit a52561acc09a942995f74bb8a0a2cd89f955c941
Author: Bj?rn Buckwalter <bjorn.buckwalter at gmail.com>
Date:   Sun Dec 14 22:16:52 2014 +0100

    Fix note about `%Y` padding.


>---------------------------------------------------------------

a52561acc09a942995f74bb8a0a2cd89f955c941
 lib/Data/Time/Format.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/Data/Time/Format.hs b/lib/Data/Time/Format.hs
index d071c30..91dc93d 100644
--- a/lib/Data/Time/Format.hs
+++ b/lib/Data/Time/Format.hs
@@ -108,7 +108,7 @@ formatChar c locale mpado t = case (formatCharacter c) of
 --
 -- [@%x@] as 'dateFmt' @locale@ (e.g. @%m\/%d\/%y@)
 --
--- [@%Y@] year, no padding. Note @%0y@ and @%_y@ pad to four chars
+-- [@%Y@] year, no padding. Note @%0Y@ and @%_Y@ pad to four chars
 --
 -- [@%y@] year of century, 0-padded to two chars, @00@ - @99@
 --


From git at git.haskell.org  Sun Dec 20 07:55:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:55 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #17 from
 bjornbm/patch-1 (ba160e5)
Message-ID: <20151220075555.EFFAE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ba160e582fc02a9d9b19b3235926c91cc390240f

>---------------------------------------------------------------

commit ba160e582fc02a9d9b19b3235926c91cc390240f
Merge: 8d3c90a a52561a
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Dec 14 13:47:10 2014 -0800

    Merge pull request #17 from bjornbm/patch-1
    
    Fix note about `%Y` padding.



>---------------------------------------------------------------

ba160e582fc02a9d9b19b3235926c91cc390240f
 lib/Data/Time/Format.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 07:55:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:55:58 +0000 (UTC)
Subject: [commit: packages/time] master: De-tabify all Haskell source files.
 (63d2c82)
Message-ID: <20151220075558.06C9C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/63d2c8270de4ce32ae39e4d98ca1749ebb10ad94

>---------------------------------------------------------------

commit 63d2c8270de4ce32ae39e4d98ca1749ebb10ad94
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Dec 23 14:43:30 2014 +1100

    De-tabify all Haskell source files.
    
    This library is a GHC core library and GHC is now built using the
    -fwarn-tabs flag by default. De-tabifying this brings it into line
    with GHC standard practice.
    
    Also add -fwarn-tabs to the cabal file.
    
    Closes: https://github.com/haskell/time/issues/18


>---------------------------------------------------------------

63d2c8270de4ce32ae39e4d98ca1749ebb10ad94
 lib/Data/Time.hs                        |   8 +-
 lib/Data/Time/Calendar.hs               |   4 +-
 lib/Data/Time/Calendar/Days.hs          |  54 +++++-----
 lib/Data/Time/Calendar/Easter.hs        |  20 ++--
 lib/Data/Time/Calendar/Gregorian.hs     |  34 +++----
 lib/Data/Time/Calendar/Julian.hs        |  28 +++---
 lib/Data/Time/Calendar/JulianYearDay.hs |  36 +++----
 lib/Data/Time/Calendar/MonthDay.hs      |  32 +++---
 lib/Data/Time/Calendar/OrdinalDate.hs   |  80 +++++++--------
 lib/Data/Time/Calendar/WeekDate.hs      |  52 +++++-----
 lib/Data/Time/Clock.hs                  |   8 +-
 lib/Data/Time/Clock/CTimeval.hs         |  24 ++---
 lib/Data/Time/Clock/POSIX.hs            |   6 +-
 lib/Data/Time/Clock/Scale.hs            |  52 +++++-----
 lib/Data/Time/Clock/TAI.hs              | 142 +++++++++++++--------------
 lib/Data/Time/Clock/UTC.hs              |  90 ++++++++---------
 lib/Data/Time/Format.hs                 | 168 ++++++++++++++++----------------
 lib/Data/Time/LocalTime.hs              |   6 +-
 lib/Data/Time/LocalTime/LocalTime.hs    |  48 ++++-----
 lib/Data/Time/LocalTime/TimeOfDay.hs    |  50 +++++-----
 lib/Data/Time/LocalTime/TimeZone.hs     |  44 ++++-----
 time.cabal                              |   2 +-
 22 files changed, 494 insertions(+), 494 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 63d2c8270de4ce32ae39e4d98ca1749ebb10ad94

From git at git.haskell.org  Sun Dec 20 07:56:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:00 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #19 from
 erikd/master (b0c04d9)
Message-ID: <20151220075600.0E44E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b0c04d9e15ecfe7c629212280bb790d383a3f784

>---------------------------------------------------------------

commit b0c04d9e15ecfe7c629212280bb790d383a3f784
Merge: ba160e5 63d2c82
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Dec 22 20:10:45 2014 -0800

    Merge pull request #19 from erikd/master
    
    De-tabify all Haskell source files.



>---------------------------------------------------------------

b0c04d9e15ecfe7c629212280bb790d383a3f784
 lib/Data/Time.hs                        |   8 +-
 lib/Data/Time/Calendar.hs               |   4 +-
 lib/Data/Time/Calendar/Days.hs          |  54 +++++-----
 lib/Data/Time/Calendar/Easter.hs        |  20 ++--
 lib/Data/Time/Calendar/Gregorian.hs     |  34 +++----
 lib/Data/Time/Calendar/Julian.hs        |  28 +++---
 lib/Data/Time/Calendar/JulianYearDay.hs |  36 +++----
 lib/Data/Time/Calendar/MonthDay.hs      |  32 +++---
 lib/Data/Time/Calendar/OrdinalDate.hs   |  80 +++++++--------
 lib/Data/Time/Calendar/WeekDate.hs      |  52 +++++-----
 lib/Data/Time/Clock.hs                  |   8 +-
 lib/Data/Time/Clock/CTimeval.hs         |  24 ++---
 lib/Data/Time/Clock/POSIX.hs            |   6 +-
 lib/Data/Time/Clock/Scale.hs            |  52 +++++-----
 lib/Data/Time/Clock/TAI.hs              | 142 +++++++++++++--------------
 lib/Data/Time/Clock/UTC.hs              |  90 ++++++++---------
 lib/Data/Time/Format.hs                 | 168 ++++++++++++++++----------------
 lib/Data/Time/LocalTime.hs              |   6 +-
 lib/Data/Time/LocalTime/LocalTime.hs    |  48 ++++-----
 lib/Data/Time/LocalTime/TimeOfDay.hs    |  50 +++++-----
 lib/Data/Time/LocalTime/TimeZone.hs     |  44 ++++-----
 time.cabal                              |   2 +-
 22 files changed, 494 insertions(+), 494 deletions(-)


From git at git.haskell.org  Sun Dec 20 07:56:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:02 +0000 (UTC)
Subject: [commit: packages/time] master: Convert README file to markdown.
 (5808f3e)
Message-ID: <20151220075602.153EF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5808f3eb013c67e1605678ed67323a557c03d835

>---------------------------------------------------------------

commit 5808f3eb013c67e1605678ed67323a557c03d835
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Dec 23 20:25:10 2014 +1100

    Convert README file to markdown.
    
    Also change 'darcs' to 'git'.


>---------------------------------------------------------------

5808f3eb013c67e1605678ed67323a557c03d835
 README => Readme.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/README b/Readme.md
similarity index 50%
rename from README
rename to Readme.md
index f5aa1cf..584287b 100644
--- a/README
+++ b/Readme.md
@@ -1,4 +1,11 @@
-To build this package using Cabal directly from darcs, you must run
+# time
+
+This is the haskell time library that is bundled with [GHC][GHC] the Glasgow/
+Glorious Haskell compiler.
+
+To build this package using Cabal directly from git, you must run
 "autoreconf" before the usual Cabal build steps (configure/build/install).
 autoreconf is included in the GNU autoconf tools.  There is no need to run
 the "configure" script: the "setup configure" step will do this for you.
+
+[GHC]: https://www.haskell.org/ghc/


From git at git.haskell.org  Sun Dec 20 07:56:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:04 +0000 (UTC)
Subject: [commit: packages/time] master: Document that the show instance for
 UTCTime is elsewhere. (5bcf96f)
Message-ID: <20151220075604.1CC0B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5bcf96f4c0f5755a110e7ef6ae3ab54b42a1e96e

>---------------------------------------------------------------

commit 5bcf96f4c0f5755a110e7ef6ae3ab54b42a1e96e
Author: Tom Ellis <tom-2013 at purelyagile.com>
Date:   Wed Dec 31 13:05:27 2014 +0000

    Document that the show instance for UTCTime is elsewhere.


>---------------------------------------------------------------

5bcf96f4c0f5755a110e7ef6ae3ab54b42a1e96e
 lib/Data/Time/Clock/UTC.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Data/Time/Clock/UTC.hs b/lib/Data/Time/Clock/UTC.hs
index eff7f4d..0c0a7d3 100644
--- a/lib/Data/Time/Clock/UTC.hs
+++ b/lib/Data/Time/Clock/UTC.hs
@@ -28,6 +28,9 @@ import Data.Data
 -- | This is the simplest representation of UTC.
 -- It consists of the day number, and a time offset from midnight.
 -- Note that if a day has a leap second added to it, it will have 86401 seconds.
+--
+-- For the 'Show' instance of 'UTCTime' import @Data.Time@ or
+-- @Data.Time.LocalTime at .
 data UTCTime = UTCTime {
     -- | the day
     utctDay :: Day,


From git at git.haskell.org  Sun Dec 20 07:56:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:06 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #21 from
 tomjaguarpaw/master (acc5478)
Message-ID: <20151220075606.239FC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/acc5478a3aa6c2e33f4fb3f644a2239490e7447f

>---------------------------------------------------------------

commit acc5478a3aa6c2e33f4fb3f644a2239490e7447f
Merge: b0c04d9 5bcf96f
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Mon Jan 5 16:43:51 2015 -0800

    Merge pull request #21 from tomjaguarpaw/master
    
    Document that the show instance for UTCTime is elsewhere.



>---------------------------------------------------------------

acc5478a3aa6c2e33f4fb3f644a2239490e7447f
 lib/Data/Time/Clock/UTC.hs | 3 +++
 1 file changed, 3 insertions(+)


From git at git.haskell.org  Sun Dec 20 07:56:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:08 +0000 (UTC)
Subject: [commit: packages/time] master: document orphan Read instances
 (0a8946c)
Message-ID: <20151220075608.2B0DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/0a8946c3bc8159960dd50ef28ff17b21aceb4e92

>---------------------------------------------------------------

commit 0a8946c3bc8159960dd50ef28ff17b21aceb4e92
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Feb 21 02:02:29 2015 -0800

    document orphan Read instances


>---------------------------------------------------------------

0a8946c3bc8159960dd50ef28ff17b21aceb4e92
 lib/Data/Time/Calendar/Days.hs       | 3 +++
 lib/Data/Time/Clock/UTC.hs           | 7 +++++--
 lib/Data/Time/LocalTime/LocalTime.hs | 6 ++++++
 lib/Data/Time/LocalTime/TimeOfDay.hs | 3 +++
 lib/Data/Time/LocalTime/TimeZone.hs  | 3 +++
 5 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/lib/Data/Time/Calendar/Days.hs b/lib/Data/Time/Calendar/Days.hs
index 3ff0efb..c2ea920 100644
--- a/lib/Data/Time/Calendar/Days.hs
+++ b/lib/Data/Time/Calendar/Days.hs
@@ -15,6 +15,9 @@ import Data.Data
 #endif
 
 -- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17.
+--
+-- For the 'Read' instance of 'Day',
+-- import "Data.Time" or "Data.Time.Format".
 newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
diff --git a/lib/Data/Time/Clock/UTC.hs b/lib/Data/Time/Clock/UTC.hs
index 0c0a7d3..63783e2 100644
--- a/lib/Data/Time/Clock/UTC.hs
+++ b/lib/Data/Time/Clock/UTC.hs
@@ -29,8 +29,11 @@ import Data.Data
 -- It consists of the day number, and a time offset from midnight.
 -- Note that if a day has a leap second added to it, it will have 86401 seconds.
 --
--- For the 'Show' instance of 'UTCTime' import @Data.Time@ or
--- @Data.Time.LocalTime at .
+-- For the 'Read' instance of 'UTCTime',
+-- import "Data.Time" or "Data.Time.Format".
+--
+-- For the 'Show' instance of 'UTCTime',
+-- import "Data.Time" or "Data.Time.LocalTime".
 data UTCTime = UTCTime {
     -- | the day
     utctDay :: Day,
diff --git a/lib/Data/Time/LocalTime/LocalTime.hs b/lib/Data/Time/LocalTime/LocalTime.hs
index b2ae6e6..d653fb5 100644
--- a/lib/Data/Time/LocalTime/LocalTime.hs
+++ b/lib/Data/Time/LocalTime/LocalTime.hs
@@ -27,6 +27,9 @@ import Data.Data
 -- and the time is a TimeOfDay.
 -- Conversion of this (as local civil time) to UTC depends on the time zone.
 -- Conversion of this (as local mean time) to UT1 depends on the longitude.
+--
+-- For the 'Read' instance of 'LocalTime',
+-- import "Data.Time" or "Data.Time.Format".
 data LocalTime = LocalTime {
     localDay    :: Day,
     localTimeOfDay   :: TimeOfDay
@@ -68,6 +71,9 @@ localTimeToUT1 :: Rational -> LocalTime -> UniversalTime
 localTimeToUT1 long (LocalTime (ModifiedJulianDay localMJD) tod) = ModJulianDate ((fromIntegral localMJD) + (timeOfDayToDayFraction tod) - (long / 360))
 
 -- | A local time together with a TimeZone.
+--
+-- For the 'Read' instance of 'ZonedTime',
+-- import "Data.Time" or "Data.Time.Format".
 data ZonedTime = ZonedTime {
     zonedTimeToLocalTime :: LocalTime,
     zonedTimeZone :: TimeZone
diff --git a/lib/Data/Time/LocalTime/TimeOfDay.hs b/lib/Data/Time/LocalTime/TimeOfDay.hs
index 91d77df..8e6e7cc 100644
--- a/lib/Data/Time/LocalTime/TimeOfDay.hs
+++ b/lib/Data/Time/LocalTime/TimeOfDay.hs
@@ -21,6 +21,9 @@ import Data.Data
 #endif
 
 -- | Time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day.
+--
+-- For the 'Read' instance of 'TimeOfDay',
+-- import "Data.Time" or "Data.Time.Format".
 data TimeOfDay = TimeOfDay {
     -- | range 0 - 23
     todHour    :: Int,
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index 630ca54..6c2f39b 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -30,6 +30,9 @@ import Data.Data
 #endif
 
 -- | A TimeZone is a whole number of minutes offset from UTC, together with a name and a \"just for summer\" flag.
+--
+-- For the 'Read' instance of 'TimeZone',
+-- import "Data.Time" or "Data.Time.Format".
 data TimeZone = TimeZone {
     -- | The number of minutes offset from UTC. Positive means local time will be later in the day than UTC.
     timeZoneMinutes :: Int,


From git at git.haskell.org  Sun Dec 20 07:56:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:10 +0000 (UTC)
Subject: [commit: packages/time] master: Days: remove unused code (1749892)
Message-ID: <20151220075610.31B543A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1749892e6ae6eaafaf709cad1bc8361f4ae4ac25

>---------------------------------------------------------------

commit 1749892e6ae6eaafaf709cad1bc8361f4ae4ac25
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Feb 21 02:17:17 2015 -0800

    Days: remove unused code


>---------------------------------------------------------------

1749892e6ae6eaafaf709cad1bc8361f4ae4ac25
 lib/Data/Time/Calendar/Days.hs | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/lib/Data/Time/Calendar/Days.hs b/lib/Data/Time/Calendar/Days.hs
index c2ea920..b051288 100644
--- a/lib/Data/Time/Calendar/Days.hs
+++ b/lib/Data/Time/Calendar/Days.hs
@@ -52,26 +52,3 @@ addDays n (ModifiedJulianDay a) = ModifiedJulianDay (a + n)
 
 diffDays :: Day -> Day -> Integer
 diffDays (ModifiedJulianDay a) (ModifiedJulianDay b) = a - b
-
-{-
-instance Show Day where
-    show (ModifiedJulianDay d) = "MJD " ++ (show d)
-
--- necessary because H98 doesn't have "cunning newtype" derivation
-instance Num Day where
-    (ModifiedJulianDay a) + (ModifiedJulianDay b) = ModifiedJulianDay (a + b)
-    (ModifiedJulianDay a) - (ModifiedJulianDay b) = ModifiedJulianDay (a - b)
-    (ModifiedJulianDay a) * (ModifiedJulianDay b) = ModifiedJulianDay (a * b)
-    negate (ModifiedJulianDay a) = ModifiedJulianDay (negate a)
-    abs (ModifiedJulianDay a) = ModifiedJulianDay (abs a)
-    signum (ModifiedJulianDay a) = ModifiedJulianDay (signum a)
-    fromInteger = ModifiedJulianDay
-
-instance Real Day where
-    toRational (ModifiedJulianDay a) = toRational a
-
-instance Integral Day where
-    toInteger (ModifiedJulianDay a) = toInteger a
-    quotRem (ModifiedJulianDay a) (ModifiedJulianDay b) = (ModifiedJulianDay c,ModifiedJulianDay d) where
-        (c,d) = quotRem a b
--}


From git at git.haskell.org  Sun Dec 20 07:56:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:12 +0000 (UTC)
Subject: [commit: packages/time] master: instance Show UniversalTime (7b06a35)
Message-ID: <20151220075612.396873A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7b06a35f56e85fc2c1d2929fa2e174432d319211

>---------------------------------------------------------------

commit 7b06a35f56e85fc2c1d2929fa2e174432d319211
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Feb 21 02:34:10 2015 -0800

    instance Show UniversalTime


>---------------------------------------------------------------

7b06a35f56e85fc2c1d2929fa2e174432d319211
 lib/Data/Time/Clock/Scale.hs         | 3 +++
 lib/Data/Time/LocalTime/LocalTime.hs | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index 5838b4d..c511829 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -23,6 +23,9 @@ import Data.Data
 
 -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
 -- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles.
+--
+-- For the 'Show' instance of 'UniversalTime',
+-- import "Data.Time" or "Data.Time.LocalTime".
 newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
diff --git a/lib/Data/Time/LocalTime/LocalTime.hs b/lib/Data/Time/LocalTime/LocalTime.hs
index d653fb5..360a2c6 100644
--- a/lib/Data/Time/LocalTime/LocalTime.hs
+++ b/lib/Data/Time/LocalTime/LocalTime.hs
@@ -70,6 +70,10 @@ ut1ToLocalTime long (ModJulianDate date) = LocalTime (ModifiedJulianDay localMJD
 localTimeToUT1 :: Rational -> LocalTime -> UniversalTime
 localTimeToUT1 long (LocalTime (ModifiedJulianDay localMJD) tod) = ModJulianDate ((fromIntegral localMJD) + (timeOfDayToDayFraction tod) - (long / 360))
 
+-- orphan instance
+instance Show UniversalTime where
+    show t = show (ut1ToLocalTime 0 t)
+
 -- | A local time together with a TimeZone.
 --
 -- For the 'Read' instance of 'ZonedTime',


From git at git.haskell.org  Sun Dec 20 07:56:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:14 +0000 (UTC)
Subject: [commit: packages/time] master: instance FormatTime UniversalTime;
 instance ParseTime UniversalTime; instance Read UniversalTime (1ca245b)
Message-ID: <20151220075614.407E53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1ca245b63dcb9b409be9ecc2b034b821d24af8f9

>---------------------------------------------------------------

commit 1ca245b63dcb9b409be9ecc2b034b821d24af8f9
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Feb 21 03:09:37 2015 -0800

    instance FormatTime UniversalTime; instance ParseTime UniversalTime; instance Read UniversalTime


>---------------------------------------------------------------

1ca245b63dcb9b409be9ecc2b034b821d24af8f9
 lib/Data/Time/Clock/Scale.hs  |  3 +++
 lib/Data/Time/Format.hs       |  9 ++++++---
 lib/Data/Time/Format/Parse.hs |  6 ++++++
 test/Test/TestParseTime.hs    | 22 +++++++++++++++++++++-
 4 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index c511829..8700e32 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -24,6 +24,9 @@ import Data.Data
 -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
 -- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles.
 --
+-- For the 'Read' instance of 'UniversalTime',
+-- import "Data.Time" or "Data.Time.Format".
+--
 -- For the 'Show' instance of 'UniversalTime',
 -- import "Data.Time" or "Data.Time.LocalTime".
 newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (Eq,Ord
diff --git a/lib/Data/Time/Format.hs b/lib/Data/Time/Format.hs
index d9f0050..e3fe96b 100644
--- a/lib/Data/Time/Format.hs
+++ b/lib/Data/Time/Format.hs
@@ -58,11 +58,11 @@ formatChar c locale mpado t = case (formatCharacter c) of
 --
 -- [@%Z@] timezone name
 --
--- For 'LocalTime' (and 'ZonedTime' and 'UTCTime'):
+-- For 'LocalTime' (and 'ZonedTime' and 'UTCTime' and 'UniversalTime'):
 --
 -- [@%c@] as 'dateTimeFmt' @locale@ (e.g. @%a %b %e %H:%M:%S %Z %Y@)
 --
--- For 'TimeOfDay' (and 'LocalTime' and 'ZonedTime' and 'UTCTime'):
+-- For 'TimeOfDay' (and 'LocalTime' and 'ZonedTime' and 'UTCTime' and 'UniversalTime'):
 --
 -- [@%R@] same as @%H:%M@
 --
@@ -100,7 +100,7 @@ formatChar c locale mpado t = case (formatCharacter c) of
 -- the decimals are positive, not negative. For example, 0.9 seconds
 -- before the Unix epoch is formatted as @-1.1@ with @%s%Q at .
 --
--- For 'Day' (and 'LocalTime' and 'ZonedTime' and 'UTCTime'):
+-- For 'Day' (and 'LocalTime' and 'ZonedTime' and 'UTCTime' and 'UniversalTime'):
 --
 -- [@%D@] same as @%m\/%d\/%y@
 --
@@ -244,3 +244,6 @@ instance FormatTime Day where
 
 instance FormatTime UTCTime where
     formatCharacter c = fmap (\f locale mpado t -> f locale mpado (utcToZonedTime utc t)) (formatCharacter c)
+
+instance FormatTime UniversalTime where
+    formatCharacter c = fmap (\f locale mpado t -> f locale mpado (ut1ToLocalTime 0 t)) (formatCharacter c)
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index 07dc5b2..0bd698d 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -464,6 +464,9 @@ instance ParseTime ZonedTime where
 instance ParseTime UTCTime where
     buildTime l = zonedTimeToUTC . buildTime l
 
+instance ParseTime UniversalTime where
+    buildTime l = localTimeToUT1 0 . buildTime l
+
 -- * Read instances for time package types
 
 #if LANGUAGE_Rank2Types
@@ -485,5 +488,8 @@ instance Read ZonedTime where
 
 instance Read UTCTime where
     readsPrec n s = [ (zonedTimeToUTC t, r) | (t,r) <- readsPrec n s ]
+
+instance Read UniversalTime where
+    readsPrec n s = [ (localTimeToUT1 0 t, r) | (t,r) <- readsPrec n s ]
 #endif
 
diff --git a/test/Test/TestParseTime.hs b/test/Test/TestParseTime.hs
index 26ee67d..4c65fbd 100644
--- a/test/Test/TestParseTime.hs
+++ b/test/Test/TestParseTime.hs
@@ -286,6 +286,13 @@ instance Arbitrary UTCTime where
 instance CoArbitrary UTCTime where
     coarbitrary t = coarbitrary (truncate (utcTimeToPOSIXSeconds t) :: Integer)
 
+instance Arbitrary UniversalTime where
+    arbitrary = liftM (\n -> ModJulianDate $ n % k) $ choose (-313698 * k, 2973483 * k) where -- 1000-01-1 to 9999-12-31
+        k = 86400
+
+instance CoArbitrary UniversalTime where
+    coarbitrary (ModJulianDate d) = coarbitrary d
+
 -- missing from the time package
 instance Eq ZonedTime where
     ZonedTime t1 tz1 == ZonedTime t2 tz2 = t1 == t2 && tz1 == tz2
@@ -438,7 +445,8 @@ properties =
      ("prop_read_show LocalTime", property (prop_read_show :: LocalTime -> Result)),
      ("prop_read_show TimeZone", property (prop_read_show :: TimeZone -> Result)),
      ("prop_read_show ZonedTime", property (prop_read_show :: ZonedTime -> Result)),
-     ("prop_read_show UTCTime", property (prop_read_show :: UTCTime -> Result))]
+     ("prop_read_show UTCTime", property (prop_read_show :: UTCTime -> Result)),
+     ("prop_read_show UniversalTime", property (prop_read_show :: UniversalTime -> Result))]
  ++ [("prop_parse_showWeekDate", property prop_parse_showWeekDate),
      ("prop_parse_showGregorian", property prop_parse_showGregorian),
      ("prop_parse_showOrdinalDate", property prop_parse_showOrdinalDate)]
@@ -449,6 +457,7 @@ properties =
  ++ map (prop_parse_format_named "TimeZone") timeZoneFormats
  ++ map (prop_parse_format_named "ZonedTime") zonedTimeFormats
  ++ map (prop_parse_format_named "UTCTime") utcTimeFormats
+ ++ map (prop_parse_format_named "UniversalTime") universalTimeFormats
 
  ++ map (prop_parse_format_upper_named "Day") dayFormats
  ++ map (prop_parse_format_upper_named "TimeOfDay") timeOfDayFormats
@@ -456,6 +465,7 @@ properties =
  ++ map (prop_parse_format_upper_named "TimeZone") timeZoneFormats
  ++ map (prop_parse_format_upper_named "ZonedTime") zonedTimeFormats
  ++ map (prop_parse_format_upper_named "UTCTime") utcTimeFormats
+ ++ map (prop_parse_format_upper_named "UniversalTime") universalTimeFormats
 
  ++ map (prop_parse_format_lower_named "Day") dayFormats
  ++ map (prop_parse_format_lower_named "TimeOfDay") timeOfDayFormats
@@ -463,12 +473,14 @@ properties =
  ++ map (prop_parse_format_lower_named "TimeZone") timeZoneFormats
  ++ map (prop_parse_format_lower_named "ZonedTime") zonedTimeFormats
  ++ map (prop_parse_format_lower_named "UTCTime") utcTimeFormats
+ ++ map (prop_parse_format_lower_named "UniversalTime") universalTimeFormats
 
  ++ map (prop_format_parse_format_named "Day") partialDayFormats
  ++ map (prop_format_parse_format_named "TimeOfDay") partialTimeOfDayFormats
  ++ map (prop_format_parse_format_named "LocalTime") partialLocalTimeFormats
  ++ map (prop_format_parse_format_named "ZonedTime") partialZonedTimeFormats
  ++ map (prop_format_parse_format_named "UTCTime") partialUTCTimeFormats
+ ++ map (prop_format_parse_format_named "UniversalTime") partialUniversalTimeFormats
 
  ++ map (prop_no_crash_bad_input_named "Day") (dayFormats ++ partialDayFormats ++ failingPartialDayFormats)
  ++ map (prop_no_crash_bad_input_named "TimeOfDay") (timeOfDayFormats ++ partialTimeOfDayFormats)
@@ -476,6 +488,7 @@ properties =
  ++ map (prop_no_crash_bad_input_named "TimeZone") (timeZoneFormats)
  ++ map (prop_no_crash_bad_input_named "ZonedTime") (zonedTimeFormats ++ partialZonedTimeFormats)
  ++ map (prop_no_crash_bad_input_named "UTCTime") (utcTimeFormats ++ partialUTCTimeFormats)
+ ++ map (prop_no_crash_bad_input_named "UniversalTime") (universalTimeFormats ++ partialUniversalTimeFormats)
 
 
 
@@ -528,6 +541,9 @@ utcTimeFormats :: [FormatString UTCTime]
 utcTimeFormats = map FormatString
   ["%s.%q","%s%Q"]
 
+universalTimeFormats :: [FormatString UniversalTime]
+universalTimeFormats = map FormatString []
+
 --
 -- * Formats that do not include all the information
 --
@@ -562,6 +578,10 @@ partialUTCTimeFormats = map FormatString
      "%c"
     ]
 
+partialUniversalTimeFormats :: [FormatString UniversalTime]
+partialUniversalTimeFormats = map FormatString
+    [ ]
+
 
 --
 -- * Known failures


From git at git.haskell.org  Sun Dec 20 07:56:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:16 +0000 (UTC)
Subject: [commit: packages/time] master: Ensure Read/Show instances are always
 provided with UTCTime and Universal (34c255e)
Message-ID: <20151220075616.486853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/34c255e0bfb1659d09785eaefcfd781549ff99ed

>---------------------------------------------------------------

commit 34c255e0bfb1659d09785eaefcfd781549ff99ed
Author: U-CIQDEV\gbazerman <gbazerman at GBAZERMAN-T35.ciqdev.com>
Date:   Wed Mar 11 15:43:45 2015 -0400

    Ensure Read/Show instances are always provided with UTCTime and Universal


>---------------------------------------------------------------

34c255e0bfb1659d09785eaefcfd781549ff99ed
 lib/Data/Time/Clock.hs               | 9 +++------
 lib/Data/Time/Clock/POSIX.hs         | 6 +++++-
 lib/Data/Time/Clock/Scale.hs         | 6 ------
 lib/Data/Time/Clock/UTC.hs           | 6 ------
 lib/Data/Time/Format/Parse.hs        | 3 ++-
 lib/Data/Time/LocalTime/LocalTime.hs | 7 ++++++-
 lib/Data/Time/LocalTime/TimeOfDay.hs | 2 +-
 lib/Data/Time/LocalTime/TimeZone.hs  | 2 +-
 8 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/lib/Data/Time/Clock.hs b/lib/Data/Time/Clock.hs
index e1d1088..b03e272 100644
--- a/lib/Data/Time/Clock.hs
+++ b/lib/Data/Time/Clock.hs
@@ -4,15 +4,12 @@ module Data.Time.Clock
     module Data.Time.Clock.Scale,
     module Data.Time.Clock.UTC,
     module Data.Time.Clock.UTCDiff,
-    module Data.Time.Clock
+    getCurrentTime
 ) where
 
 import Data.Time.Clock.Scale
 import Data.Time.Clock.UTCDiff
 import Data.Time.Clock.UTC
 import Data.Time.Clock.POSIX
-import Control.Monad
-
--- | Get the current UTC time from the system clock.
-getCurrentTime :: IO UTCTime
-getCurrentTime = liftM posixSecondsToUTCTime getPOSIXTime
+import Data.Time.Format.Parse()
+import Data.Time.LocalTime()
diff --git a/lib/Data/Time/Clock/POSIX.hs b/lib/Data/Time/Clock/POSIX.hs
index 07411c5..91f22e0 100644
--- a/lib/Data/Time/Clock/POSIX.hs
+++ b/lib/Data/Time/Clock/POSIX.hs
@@ -2,7 +2,7 @@
 -- Most people won't need this module.
 module Data.Time.Clock.POSIX
 (
-    posixDayLength,POSIXTime,posixSecondsToUTCTime,utcTimeToPOSIXSeconds,getPOSIXTime
+    posixDayLength,POSIXTime,posixSecondsToUTCTime,utcTimeToPOSIXSeconds,getPOSIXTime,getCurrentTime
 ) where
 
 import Data.Time.Clock.UTC
@@ -64,3 +64,7 @@ ctimevalToPosixSeconds (MkCTimeval s mus) = (fromIntegral s) + (fromIntegral mus
 getPOSIXTime = liftM ctimevalToPosixSeconds getCTimeval
 
 #endif
+
+-- | Get the current UTC time from the system clock.
+getCurrentTime :: IO UTCTime
+getCurrentTime = liftM posixSecondsToUTCTime getPOSIXTime
diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index 8700e32..5838b4d 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -23,12 +23,6 @@ import Data.Data
 
 -- | The Modified Julian Date is the day with the fraction of the day, measured from UT midnight.
 -- It's used to represent UT1, which is time as measured by the earth's rotation, adjusted for various wobbles.
---
--- For the 'Read' instance of 'UniversalTime',
--- import "Data.Time" or "Data.Time.Format".
---
--- For the 'Show' instance of 'UniversalTime',
--- import "Data.Time" or "Data.Time.LocalTime".
 newtype UniversalTime = ModJulianDate {getModJulianDate :: Rational} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
diff --git a/lib/Data/Time/Clock/UTC.hs b/lib/Data/Time/Clock/UTC.hs
index 63783e2..eff7f4d 100644
--- a/lib/Data/Time/Clock/UTC.hs
+++ b/lib/Data/Time/Clock/UTC.hs
@@ -28,12 +28,6 @@ import Data.Data
 -- | This is the simplest representation of UTC.
 -- It consists of the day number, and a time offset from midnight.
 -- Note that if a day has a leap second added to it, it will have 86401 seconds.
---
--- For the 'Read' instance of 'UTCTime',
--- import "Data.Time" or "Data.Time.Format".
---
--- For the 'Show' instance of 'UTCTime',
--- import "Data.Time" or "Data.Time.LocalTime".
 data UTCTime = UTCTime {
     -- | the day
     utctDay :: Day,
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index 0bd698d..dda7e8f 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -15,7 +15,8 @@ module Data.Time.Format.Parse
     ) where
 
 import Data.Time.Clock.POSIX
-import Data.Time.Clock
+import Data.Time.Clock.Scale
+import Data.Time.Clock.UTC
 import Data.Time.Calendar
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
diff --git a/lib/Data/Time/LocalTime/LocalTime.hs b/lib/Data/Time/LocalTime/LocalTime.hs
index 360a2c6..1c47f53 100644
--- a/lib/Data/Time/LocalTime/LocalTime.hs
+++ b/lib/Data/Time/LocalTime/LocalTime.hs
@@ -16,7 +16,12 @@ module Data.Time.LocalTime.LocalTime
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar
-import Data.Time.Clock
+
+import Data.Time.Clock.Scale
+import Data.Time.Clock.UTCDiff
+import Data.Time.Clock.UTC
+import Data.Time.Clock.POSIX
+
 import Control.DeepSeq
 import Data.Typeable
 #if LANGUAGE_Rank2Types
diff --git a/lib/Data/Time/LocalTime/TimeOfDay.hs b/lib/Data/Time/LocalTime/TimeOfDay.hs
index 8e6e7cc..30e03c9 100644
--- a/lib/Data/Time/LocalTime/TimeOfDay.hs
+++ b/lib/Data/Time/LocalTime/TimeOfDay.hs
@@ -12,7 +12,7 @@ module Data.Time.LocalTime.TimeOfDay
 
 import Data.Time.LocalTime.TimeZone
 import Data.Time.Calendar.Private
-import Data.Time.Clock
+import Data.Time.Clock.Scale
 import Control.DeepSeq
 import Data.Typeable
 import Data.Fixed
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index 6c2f39b..177d115 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -14,8 +14,8 @@ module Data.Time.LocalTime.TimeZone
 
 --import System.Time.Calendar.Format
 import Data.Time.Calendar.Private
-import Data.Time.Clock
 import Data.Time.Clock.POSIX
+import Data.Time.Clock.UTC
 
 #if __GLASGOW_HASKELL__ >= 709
 import Foreign


From git at git.haskell.org  Sun Dec 20 07:56:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:18 +0000 (UTC)
Subject: [commit: packages/time] master: Loosen required cabal-version
 (85cf1aa)
Message-ID: <20151220075618.4F7253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/85cf1aa22833cb0cd4bec9aaae958a466cc7486b

>---------------------------------------------------------------

commit 85cf1aa22833cb0cd4bec9aaae958a466cc7486b
Author: Adam Bergmark <adam at bergmark.nl>
Date:   Sat May 2 09:39:16 2015 +0200

    Loosen required cabal-version
    
    1.14 has the same features as 1.10 so this was overly restrictive and can prevent you from installing time on older GHCs.


>---------------------------------------------------------------

85cf1aa22833cb0cd4bec9aaae958a466cc7486b
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index 3769786..3f1b32e 100644
--- a/time.cabal
+++ b/time.cabal
@@ -11,7 +11,7 @@ synopsis:       A time library
 description:    A time library
 category:       System
 build-type:     Configure
-cabal-version:  >=1.14
+cabal-version:  >=1.10
 x-follows-version-policy:
 
 extra-source-files:


From git at git.haskell.org  Sun Dec 20 07:56:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:20 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #32 from
 bergmark/patch-1 (7875368)
Message-ID: <20151220075620.55CCF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/7875368f8e901d7882dadbe4598ca2fed8c8adc2

>---------------------------------------------------------------

commit 7875368f8e901d7882dadbe4598ca2fed8c8adc2
Merge: 1ca245b 85cf1aa
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 9 12:27:55 2015 -0700

    Merge pull request #32 from bergmark/patch-1
    
    Loosen required cabal-version



>---------------------------------------------------------------

7875368f8e901d7882dadbe4598ca2fed8c8adc2
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 07:56:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:22 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #20 from
 erikd/master (ad3ee77)
Message-ID: <20151220075622.5E0BD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ad3ee7736dd67a2c428ec7ab95e1f0b1b476749c

>---------------------------------------------------------------

commit ad3ee7736dd67a2c428ec7ab95e1f0b1b476749c
Merge: 7875368 5808f3e
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 9 12:30:40 2015 -0700

    Merge pull request #20 from erikd/master
    
    Convert README file to markdown.



>---------------------------------------------------------------

ad3ee7736dd67a2c428ec7ab95e1f0b1b476749c
 README => Readme.md | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 07:56:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:24 +0000 (UTC)
Subject: [commit: packages/time] master: ensure read instances for additional
 types -- TimeZone, Day, LocalTime, ZonedTime, TimeOfDay (60408b8)
Message-ID: <20151220075624.6651A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/60408b856a1f05b8bdda93d59c960f5a8611e31e

>---------------------------------------------------------------

commit 60408b856a1f05b8bdda93d59c960f5a8611e31e
Author: Gershom <gershom at rgntgw1-3-72-dhcp.int.colorado.edu>
Date:   Fri May 22 17:32:51 2015 -0600

    ensure read instances for additional types -- TimeZone, Day, LocalTime, ZonedTime, TimeOfDay


>---------------------------------------------------------------

60408b856a1f05b8bdda93d59c960f5a8611e31e
 lib/Data/Time/Calendar.hs            |  1 +
 lib/Data/Time/Calendar/Days.hs       |  3 ---
 lib/Data/Time/Format.hs              | 11 ++++++++---
 lib/Data/Time/Format/Locale.hs       |  3 ++-
 lib/Data/Time/Format/Parse.hs        |  8 +++++---
 lib/Data/Time/LocalTime.hs           |  1 +
 lib/Data/Time/LocalTime/LocalTime.hs |  9 ++-------
 lib/Data/Time/LocalTime/TimeOfDay.hs |  3 ---
 lib/Data/Time/LocalTime/TimeZone.hs  |  3 ---
 9 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/lib/Data/Time/Calendar.hs b/lib/Data/Time/Calendar.hs
index cf2279c..2abe1a0 100644
--- a/lib/Data/Time/Calendar.hs
+++ b/lib/Data/Time/Calendar.hs
@@ -6,3 +6,4 @@ module Data.Time.Calendar
 
 import Data.Time.Calendar.Days
 import Data.Time.Calendar.Gregorian
+import Data.Time.Format()
\ No newline at end of file
diff --git a/lib/Data/Time/Calendar/Days.hs b/lib/Data/Time/Calendar/Days.hs
index b051288..6b472b5 100644
--- a/lib/Data/Time/Calendar/Days.hs
+++ b/lib/Data/Time/Calendar/Days.hs
@@ -15,9 +15,6 @@ import Data.Data
 #endif
 
 -- | The Modified Julian Day is a standard count of days, with zero being the day 1858-11-17.
---
--- For the 'Read' instance of 'Day',
--- import "Data.Time" or "Data.Time.Format".
 newtype Day = ModifiedJulianDay {toModifiedJulianDay :: Integer} deriving (Eq,Ord
 #if LANGUAGE_DeriveDataTypeable
 #if LANGUAGE_Rank2Types
diff --git a/lib/Data/Time/Format.hs b/lib/Data/Time/Format.hs
index e3fe96b..5ddd341 100644
--- a/lib/Data/Time/Format.hs
+++ b/lib/Data/Time/Format.hs
@@ -6,12 +6,17 @@ module Data.Time.Format
     ) where
 
 import Data.Time.Format.Parse
-import Data.Time.LocalTime
+
+import Data.Time.LocalTime.TimeZone
+import Data.Time.LocalTime.TimeOfDay
+import Data.Time.LocalTime.LocalTime
+import Data.Time.Calendar.Days
+import Data.Time.Calendar.Gregorian
 import Data.Time.Calendar.WeekDate
 import Data.Time.Calendar.OrdinalDate
-import Data.Time.Calendar
 import Data.Time.Calendar.Private
-import Data.Time.Clock
+import Data.Time.Clock.Scale
+import Data.Time.Clock.UTC
 import Data.Time.Clock.POSIX
 
 import Data.Maybe
diff --git a/lib/Data/Time/Format/Locale.hs b/lib/Data/Time/Format/Locale.hs
index 80ead81..e0e57c9 100644
--- a/lib/Data/Time/Format/Locale.hs
+++ b/lib/Data/Time/Format/Locale.hs
@@ -11,7 +11,8 @@ module Data.Time.Format.Locale (
     )
 where
 
-import Data.Time.LocalTime
+import Data.Time.LocalTime.TimeZone
+
 
 data TimeLocale = TimeLocale {
         -- |full and abbreviated week days, starting with Sunday
diff --git a/lib/Data/Time/Format/Parse.hs b/lib/Data/Time/Format/Parse.hs
index dda7e8f..20dad98 100644
--- a/lib/Data/Time/Format/Parse.hs
+++ b/lib/Data/Time/Format/Parse.hs
@@ -17,10 +17,13 @@ module Data.Time.Format.Parse
 import Data.Time.Clock.POSIX
 import Data.Time.Clock.Scale
 import Data.Time.Clock.UTC
-import Data.Time.Calendar
+import Data.Time.Calendar.Days
+import Data.Time.Calendar.Gregorian
 import Data.Time.Calendar.OrdinalDate
 import Data.Time.Calendar.WeekDate
-import Data.Time.LocalTime
+import Data.Time.LocalTime.TimeZone
+import Data.Time.LocalTime.TimeOfDay
+import Data.Time.LocalTime.LocalTime
 
 #if LANGUAGE_Rank2Types
 import Control.Monad
@@ -493,4 +496,3 @@ instance Read UTCTime where
 instance Read UniversalTime where
     readsPrec n s = [ (localTimeToUT1 0 t, r) | (t,r) <- readsPrec n s ]
 #endif
-
diff --git a/lib/Data/Time/LocalTime.hs b/lib/Data/Time/LocalTime.hs
index 046da36..735d826 100644
--- a/lib/Data/Time/LocalTime.hs
+++ b/lib/Data/Time/LocalTime.hs
@@ -5,6 +5,7 @@ module Data.Time.LocalTime
     module Data.Time.LocalTime.LocalTime
 ) where
 
+import Data.Time.Format()
 import Data.Time.LocalTime.TimeZone
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.LocalTime
diff --git a/lib/Data/Time/LocalTime/LocalTime.hs b/lib/Data/Time/LocalTime/LocalTime.hs
index 1c47f53..77ab2cc 100644
--- a/lib/Data/Time/LocalTime/LocalTime.hs
+++ b/lib/Data/Time/LocalTime/LocalTime.hs
@@ -15,7 +15,8 @@ module Data.Time.LocalTime.LocalTime
 
 import Data.Time.LocalTime.TimeOfDay
 import Data.Time.LocalTime.TimeZone
-import Data.Time.Calendar
+import Data.Time.Calendar.Days
+import Data.Time.Calendar.Gregorian
 
 import Data.Time.Clock.Scale
 import Data.Time.Clock.UTCDiff
@@ -32,9 +33,6 @@ import Data.Data
 -- and the time is a TimeOfDay.
 -- Conversion of this (as local civil time) to UTC depends on the time zone.
 -- Conversion of this (as local mean time) to UT1 depends on the longitude.
---
--- For the 'Read' instance of 'LocalTime',
--- import "Data.Time" or "Data.Time.Format".
 data LocalTime = LocalTime {
     localDay    :: Day,
     localTimeOfDay   :: TimeOfDay
@@ -80,9 +78,6 @@ instance Show UniversalTime where
     show t = show (ut1ToLocalTime 0 t)
 
 -- | A local time together with a TimeZone.
---
--- For the 'Read' instance of 'ZonedTime',
--- import "Data.Time" or "Data.Time.Format".
 data ZonedTime = ZonedTime {
     zonedTimeToLocalTime :: LocalTime,
     zonedTimeZone :: TimeZone
diff --git a/lib/Data/Time/LocalTime/TimeOfDay.hs b/lib/Data/Time/LocalTime/TimeOfDay.hs
index 30e03c9..4645857 100644
--- a/lib/Data/Time/LocalTime/TimeOfDay.hs
+++ b/lib/Data/Time/LocalTime/TimeOfDay.hs
@@ -21,9 +21,6 @@ import Data.Data
 #endif
 
 -- | Time of day as represented in hour, minute and second (with picoseconds), typically used to express local time of day.
---
--- For the 'Read' instance of 'TimeOfDay',
--- import "Data.Time" or "Data.Time.Format".
 data TimeOfDay = TimeOfDay {
     -- | range 0 - 23
     todHour    :: Int,
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index 177d115..90846f2 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -30,9 +30,6 @@ import Data.Data
 #endif
 
 -- | A TimeZone is a whole number of minutes offset from UTC, together with a name and a \"just for summer\" flag.
---
--- For the 'Read' instance of 'TimeZone',
--- import "Data.Time" or "Data.Time.Format".
 data TimeZone = TimeZone {
     -- | The number of minutes offset from UTC. Positive means local time will be later in the day than UTC.
     timeZoneMinutes :: Int,


From git at git.haskell.org  Sun Dec 20 07:56:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:26 +0000 (UTC)
Subject: [commit: packages/time] master: newline (76bd850)
Message-ID: <20151220075626.6D7343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/76bd8504a450b7cfb52f6a98908313b687a7aab5

>---------------------------------------------------------------

commit 76bd8504a450b7cfb52f6a98908313b687a7aab5
Author: Gershom <gershom at mbp.local>
Date:   Sat May 23 00:07:43 2015 -0600

    newline


>---------------------------------------------------------------

76bd8504a450b7cfb52f6a98908313b687a7aab5
 lib/Data/Time/Calendar.hs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Sun Dec 20 07:56:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:28 +0000 (UTC)
Subject: [commit: packages/time] master: remove tabs and trailing spaces
 (dd6dce8)
Message-ID: <20151220075628.774E13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/dd6dce846f5cd000fb069f90060bbd8453d1d996

>---------------------------------------------------------------

commit dd6dce846f5cd000fb069f90060bbd8453d1d996
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 19:01:25 2015 -0700

    remove tabs and trailing spaces


>---------------------------------------------------------------

dd6dce846f5cd000fb069f90060bbd8453d1d996
 lib/Data/Time/Calendar/Private.hs |  0
 test/Test/AddDays.hs              | 40 ++++++++++++++++----------------
 test/Test/ClipDates.hs            |  0
 test/Test/ClipDatesRef.hs         |  0
 test/Test/ConvertBack.hs          | 22 +++++++++---------
 test/Test/CurrentTime.hs          | 10 ++++----
 test/Test/LongWeekYears.hs        |  4 ++--
 test/Test/ShowDST.hs              | 46 ++++++++++++++++++-------------------
 test/Test/TAI_UTC_DAT.hs          |  0
 test/Test/TestCalendars.hs        | 20 ++++++++--------
 test/Test/TestEaster.hs           |  0
 test/Test/TestFormat.hs           | 30 ++++++++++++------------
 test/Test/TestFormatStuff.c       | 20 ++++++++--------
 test/Test/TestFormatStuff.h       |  6 ++---
 test/Test/TestMonthDay.hs         |  0
 test/Test/TestParseDAT.hs         | 48 +++++++++++++++++++--------------------
 test/Test/TestParseTime.hs        |  2 +-
 test/Test/TestTime.hs             |  8 +++----
 test/Test/TestTimeRef.hs          |  0
 test/Test/TimeZone.hs             |  4 ++--
 test/Test/UseCases.lhs            |  0
 21 files changed, 130 insertions(+), 130 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc dd6dce846f5cd000fb069f90060bbd8453d1d996

From git at git.haskell.org  Sun Dec 20 07:56:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:30 +0000 (UTC)
Subject: [commit: packages/time] master: clean up .cabal (e1246f4)
Message-ID: <20151220075630.7DBD43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e1246f42651f6903157419522c0a019645312d82

>---------------------------------------------------------------

commit e1246f42651f6903157419522c0a019645312d82
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 19:05:21 2015 -0700

    clean up .cabal


>---------------------------------------------------------------

e1246f42651f6903157419522c0a019645312d82
 time.cabal | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/time.cabal b/time.cabal
index 3f1b32e..ea78698 100644
--- a/time.cabal
+++ b/time.cabal
@@ -30,15 +30,11 @@ extra-tmp-files:
     lib/include/HsTimeConfig.h
 
 source-repository head
-  type:     git
-  location: https://github.com/haskell/time
+    type:     git
+    location: https://github.com/haskell/time
 
 library
     hs-source-dirs: lib
-    build-depends:
-        base >= 4.4 && < 5,
-        deepseq >= 1.1
-    ghc-options: -Wall -fwarn-tabs
     default-language: Haskell2010
     if impl(ghc)
         default-extensions:
@@ -50,6 +46,10 @@ library
         if impl(hugs)
             default-extensions: Rank2Types
             cpp-options: -DLANGUAGE_Rank2Types
+    ghc-options: -Wall -fwarn-tabs
+    build-depends:
+        base >= 4.4 && < 5,
+        deepseq >= 1.1
     if os(windows)
         build-depends: Win32
     exposed-modules:
@@ -91,16 +91,18 @@ library
             HsTimeConfig.h
 
 test-suite ShowDefaultTZAbbreviations
-    hs-source-dirs: test
     type: exitcode-stdio-1.0
+    hs-source-dirs: test
+    default-language: Haskell2010
+    ghc-options: -Wall -fwarn-tabs
     build-depends:
         base,
         time == 1.5.0.1
     main-is: ShowDefaultTZAbbreviations.hs
 
 test-suite tests
-    hs-source-dirs: test
     type: exitcode-stdio-1.0
+    hs-source-dirs: test
     default-language: Haskell2010
     default-extensions:
         Rank2Types
@@ -112,7 +114,7 @@ test-suite tests
         FlexibleInstances
         UndecidableInstances
         ScopedTypeVariables
-    ghc-options: -Wall
+    ghc-options: -Wall -fwarn-tabs
     c-sources: test/Test/TestFormatStuff.c
     build-depends:
         base,


From git at git.haskell.org  Sun Dec 20 07:56:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:32 +0000 (UTC)
Subject: [commit: packages/time] master: bump version (3a3bbe0)
Message-ID: <20151220075632.83FE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/3a3bbe07210659e9563e845bce25b764fe2c4439

>---------------------------------------------------------------

commit 3a3bbe07210659e9563e845bce25b764fe2c4439
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 19:19:14 2015 -0700

    bump version


>---------------------------------------------------------------

3a3bbe07210659e9563e845bce25b764fe2c4439
 time.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/time.cabal b/time.cabal
index ea78698..dbeaf09 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.5.0.1
+version:        1.5.1
 stability:      stable
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Sun Dec 20 07:56:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:34 +0000 (UTC)
Subject: [commit: packages/time] master: bump version (5b4f363)
Message-ID: <20151220075634.8A25A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/5b4f363d51eb6c44a94cb80be1de0dcc77b28858

>---------------------------------------------------------------

commit 5b4f363d51eb6c44a94cb80be1de0dcc77b28858
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 19:45:48 2015 -0700

    bump version


>---------------------------------------------------------------

5b4f363d51eb6c44a94cb80be1de0dcc77b28858
 time.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/time.cabal b/time.cabal
index dbeaf09..9ad68b6 100644
--- a/time.cabal
+++ b/time.cabal
@@ -97,7 +97,7 @@ test-suite ShowDefaultTZAbbreviations
     ghc-options: -Wall -fwarn-tabs
     build-depends:
         base,
-        time == 1.5.0.1
+        time == 1.5.1
     main-is: ShowDefaultTZAbbreviations.hs
 
 test-suite tests
@@ -119,7 +119,7 @@ test-suite tests
     build-depends:
         base,
         deepseq,
-        time == 1.5.0.1,
+        time == 1.5.1,
         QuickCheck >= 2.5.1,
         test-framework >= 0.8,
         test-framework-quickcheck2 >= 0.3,


From git at git.haskell.org  Sun Dec 20 07:56:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:36 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #26 from
 gbaz/instances (80a554c)
Message-ID: <20151220075636.92B1F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/80a554c39ae8b99b46a0f64c63a43cf359a8fc09

>---------------------------------------------------------------

commit 80a554c39ae8b99b46a0f64c63a43cf359a8fc09
Merge: 5b4f363 76bd850
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sat May 30 20:48:57 2015 -0700

    Merge pull request #26 from gbaz/instances
    
    Ensure Read/Show instances are always provided with UTCTime and Universa...



>---------------------------------------------------------------

80a554c39ae8b99b46a0f64c63a43cf359a8fc09
 lib/Data/Time/Calendar.hs            |  1 +
 lib/Data/Time/Calendar/Days.hs       |  3 ---
 lib/Data/Time/Clock.hs               |  9 +++------
 lib/Data/Time/Clock/POSIX.hs         |  6 +++++-
 lib/Data/Time/Clock/Scale.hs         |  6 ------
 lib/Data/Time/Clock/UTC.hs           |  6 ------
 lib/Data/Time/Format.hs              | 11 ++++++++---
 lib/Data/Time/Format/Locale.hs       |  3 ++-
 lib/Data/Time/Format/Parse.hs        | 11 +++++++----
 lib/Data/Time/LocalTime.hs           |  1 +
 lib/Data/Time/LocalTime/LocalTime.hs | 16 ++++++++--------
 lib/Data/Time/LocalTime/TimeOfDay.hs |  5 +----
 lib/Data/Time/LocalTime/TimeZone.hs  |  5 +----
 13 files changed, 37 insertions(+), 46 deletions(-)


From git at git.haskell.org  Sun Dec 20 07:56:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:38 +0000 (UTC)
Subject: [commit: packages/time] master: test sdist (ccd0609)
Message-ID: <20151220075638.994843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/ccd06090ff5db142dabd36d7e8ce5ca5bc10b60f

>---------------------------------------------------------------

commit ccd06090ff5db142dabd36d7e8ce5ca5bc10b60f
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 21:05:46 2015 -0700

    test sdist


>---------------------------------------------------------------

ccd06090ff5db142dabd36d7e8ce5ca5bc10b60f
 .gitignore |  1 +
 Makefile   | 11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5880242..2c7ac62 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ dist-install
 ghc.mk
 lib/include/HsTimeConfig.h
 lib/include/HsTimeConfig.h.in
+test-sdist
diff --git a/Makefile b/Makefile
index 7b37eb9..291dc2f 100644
--- a/Makefile
+++ b/Makefile
@@ -1,8 +1,9 @@
-default: clean test install sdist
+default: clean test install test-sdist
 
 # Building
 
 clean:
+	rm -rf test-sdist
 	cabal clean
 
 configure:
@@ -26,7 +27,13 @@ install:
 sdist: clean configure
 	cabal sdist
 
+test-sdist: sdist
+	mkdir -p test-sdist
+	tar -C test-sdist -z -x -f dist/time-1.5.1.tar.gz
+	cp Makefile test-sdist/time-1.5.1/
+	cd test-sdist/time-1.5.1 && make test
+
 # switch off intermediate file deletion
 .SECONDARY:
 
-.PHONY: default clean configure build haddock copy install test sdist
+.PHONY: default clean configure build haddock copy install test sdist test-sdist


From git at git.haskell.org  Sun Dec 20 07:56:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:40 +0000 (UTC)
Subject: [commit: packages/time] master: Test.TestTimeZone was missing in
 time.cabal, added (4c63614)
Message-ID: <20151220075640.A120C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/4c636143d7ce70a595a0e413812792d8d208dbf9

>---------------------------------------------------------------

commit 4c636143d7ce70a595a0e413812792d8d208dbf9
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 21:07:36 2015 -0700

    Test.TestTimeZone was missing in time.cabal, added


>---------------------------------------------------------------

4c636143d7ce70a595a0e413812792d8d208dbf9
 time.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/time.cabal b/time.cabal
index 9ad68b6..ed6479e 100644
--- a/time.cabal
+++ b/time.cabal
@@ -140,6 +140,7 @@ test-suite tests
         Test.TestEasterRef
         Test.TestCalendars
         Test.TestCalendarsRef
+        Test.TestTimeZone
         Test.LongWeekYears
         Test.LongWeekYearsRef
         Test.ConvertBack


From git at git.haskell.org  Sun Dec 20 07:56:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:42 +0000 (UTC)
Subject: [commit: packages/time] master: Added diffTimeToPicoseconds (also
 cleaned up picosecondsToDiffTime) (020ce40)
Message-ID: <20151220075642.A805F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/020ce40e69951849041349c0c38243e56169f572

>---------------------------------------------------------------

commit 020ce40e69951849041349c0c38243e56169f572
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat May 30 21:54:25 2015 -0700

    Added diffTimeToPicoseconds (also cleaned up picosecondsToDiffTime)


>---------------------------------------------------------------

020ce40e69951849041349c0c38243e56169f572
 lib/Data/Time/Clock/Scale.hs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index 5838b4d..c508f7b 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -10,7 +10,9 @@ module Data.Time.Clock.Scale
 
     -- * Absolute intervals
     DiffTime,
-        secondsToDiffTime, picosecondsToDiffTime
+    secondsToDiffTime,
+    picosecondsToDiffTime,
+    diffTimeToPicoseconds,
 ) where
 
 import Control.DeepSeq
@@ -101,7 +103,11 @@ secondsToDiffTime = fromInteger
 
 -- | Create a 'DiffTime' from a number of picoseconds.
 picosecondsToDiffTime :: Integer -> DiffTime
-picosecondsToDiffTime x = fromRational (x % 1000000000000)
+picosecondsToDiffTime x = MkDiffTime (MkFixed x)
+
+-- | Get the number of picoseconds in a 'DiffTime'.
+diffTimeToPicoseconds :: DiffTime -> Integer
+diffTimeToPicoseconds (MkDiffTime (MkFixed x)) = x
 
 {-# RULES
 "realToFrac/DiffTime->Pico"              realToFrac = \ (MkDiffTime ps) -> ps


From git at git.haskell.org  Sun Dec 20 07:56:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:44 +0000 (UTC)
Subject: [commit: packages/time] master: Fix compilation on GHC 7.0 by not
 using Trustworthy (603b058)
Message-ID: <20151220075644.AEE8A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/603b05864dbba686873828c2498c75e73a3adc9a

>---------------------------------------------------------------

commit 603b05864dbba686873828c2498c75e73a3adc9a
Author: Adam Bergmark <adam at bergmark.nl>
Date:   Mon Jul 13 10:59:41 2015 +0200

    Fix compilation on GHC 7.0 by not using Trustworthy


>---------------------------------------------------------------

603b05864dbba686873828c2498c75e73a3adc9a
 lib/Data/Time/Clock/CTimeval.hs     | 2 +-
 lib/Data/Time/Clock/Scale.hs        | 3 ++-
 lib/Data/Time/Clock/UTC.hs          | 3 ++-
 lib/Data/Time/LocalTime/TimeZone.hs | 2 +-
 time.cabal                          | 3 +--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/lib/Data/Time/Clock/CTimeval.hs b/lib/Data/Time/Clock/CTimeval.hs
index add0bf9..8c2d550 100644
--- a/lib/Data/Time/Clock/CTimeval.hs
+++ b/lib/Data/Time/Clock/CTimeval.hs
@@ -4,7 +4,7 @@ module Data.Time.Clock.CTimeval where
 #ifndef mingw32_HOST_OS
 -- All Unix-specific, this
 
-#if __GLASGOW_HASKELL__ >= 709
+#if __GLASGOW_HASKELL__ >= 709 || __GLASGOW_HASKELL__ < 702
 import Foreign
 #else
 import Foreign.Safe
diff --git a/lib/Data/Time/Clock/Scale.hs b/lib/Data/Time/Clock/Scale.hs
index 5838b4d..6cef322 100644
--- a/lib/Data/Time/Clock/Scale.hs
+++ b/lib/Data/Time/Clock/Scale.hs
@@ -1,4 +1,6 @@
+#if __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE Trustworthy #-}
+#endif
 {-# OPTIONS -fno-warn-unused-imports #-}
 #include "HsConfigure.h"
 -- #hide
@@ -107,4 +109,3 @@ picosecondsToDiffTime x = fromRational (x % 1000000000000)
 "realToFrac/DiffTime->Pico"              realToFrac = \ (MkDiffTime ps) -> ps
 "realToFrac/Pico->DiffTime"              realToFrac = MkDiffTime
   #-}
-
diff --git a/lib/Data/Time/Clock/UTC.hs b/lib/Data/Time/Clock/UTC.hs
index eff7f4d..3e27076 100644
--- a/lib/Data/Time/Clock/UTC.hs
+++ b/lib/Data/Time/Clock/UTC.hs
@@ -1,5 +1,7 @@
 {-# OPTIONS -fno-warn-unused-imports #-}
+#if __GLASGOW_HASKELL__ >= 702
 {-# LANGUAGE Trustworthy #-}
+#endif
 #include "HsConfigure.h"
 -- #hide
 module Data.Time.Clock.UTC
@@ -122,4 +124,3 @@ instance RealFrac NominalDiffTime where
 "realToFrac/NominalDiffTime->Pico"       realToFrac = \ (MkNominalDiffTime ps) -> ps
 "realToFrac/Pico->NominalDiffTime"       realToFrac = MkNominalDiffTime
   #-}
-
diff --git a/lib/Data/Time/LocalTime/TimeZone.hs b/lib/Data/Time/LocalTime/TimeZone.hs
index 90846f2..9381075 100644
--- a/lib/Data/Time/LocalTime/TimeZone.hs
+++ b/lib/Data/Time/LocalTime/TimeZone.hs
@@ -17,7 +17,7 @@ import Data.Time.Calendar.Private
 import Data.Time.Clock.POSIX
 import Data.Time.Clock.UTC
 
-#if __GLASGOW_HASKELL__ >= 709
+#if __GLASGOW_HASKELL__ >= 709 || __GLASGOW_HASKELL__ < 702
 import Foreign
 #else
 import Foreign.Safe
diff --git a/time.cabal b/time.cabal
index ed6479e..34f7f58 100644
--- a/time.cabal
+++ b/time.cabal
@@ -48,7 +48,7 @@ library
             cpp-options: -DLANGUAGE_Rank2Types
     ghc-options: -Wall -fwarn-tabs
     build-depends:
-        base >= 4.4 && < 5,
+        base >= 4.3 && < 5,
         deepseq >= 1.1
     if os(windows)
         build-depends: Win32
@@ -149,4 +149,3 @@ test-suite tests
         Test.AddDays
         Test.AddDaysRef
         Test.TestUtil
-


From git at git.haskell.org  Sun Dec 20 07:56:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:46 +0000 (UTC)
Subject: [commit: packages/time] master: use clock_gettime to implement
 getPOSIXTime if available (1b74336)
Message-ID: <20151220075646.B73933A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1b74336b646b6bd3e36eee3efa00f41b915f02c7

>---------------------------------------------------------------

commit 1b74336b646b6bd3e36eee3efa00f41b915f02c7
Author: Marios Titas <redneb at gmx.com>
Date:   Sun Aug 23 00:23:02 2015 +0100

    use clock_gettime to implement getPOSIXTime if available


>---------------------------------------------------------------

1b74336b646b6bd3e36eee3efa00f41b915f02c7
 configure.ac                      |  2 ++
 lib/Data/Time/Clock/CTimespec.hsc | 41 +++++++++++++++++++++++++++++++++++++++
 lib/Data/Time/Clock/POSIX.hs      | 14 +++++++++++++
 time.cabal                        |  1 +
 4 files changed, 58 insertions(+)

diff --git a/configure.ac b/configure.ac
index 2b2149a..4be2aff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,6 +15,8 @@ AC_CONFIG_HEADERS([lib/include/HsTimeConfig.h])
 AC_CHECK_HEADERS([time.h])
 AC_CHECK_FUNCS([gmtime_r localtime_r])
 
+AC_CHECK_FUNCS([clock_gettime])
+
 AC_STRUCT_TM
 AC_STRUCT_TIMEZONE
 
diff --git a/lib/Data/Time/Clock/CTimespec.hsc b/lib/Data/Time/Clock/CTimespec.hsc
new file mode 100644
index 0000000..fb9aaa3
--- /dev/null
+++ b/lib/Data/Time/Clock/CTimespec.hsc
@@ -0,0 +1,41 @@
+-- #hide
+module Data.Time.Clock.CTimespec where
+
+#include "HsTimeConfig.h"
+
+#if !defined(mingw32_HOST_OS) && HAVE_CLOCK_GETTIME
+
+#if __GLASGOW_HASKELL__ >= 709
+import Foreign
+#else
+import Foreign.Safe
+#endif
+import Foreign.C
+
+#include <time.h>
+
+data CTimespec = MkCTimespec CTime CLong
+
+instance Storable CTimespec where
+    sizeOf _ = #{size struct timespec}
+    alignment _ = alignment (undefined :: CLong)
+    peek p = do
+        s  <- #{peek struct timespec, tv_sec } p
+        ns <- #{peek struct timespec, tv_nsec} p
+        return (MkCTimespec s ns)
+    poke p (MkCTimespec s ns) = do
+        #{poke struct timespec, tv_sec } p s
+        #{poke struct timespec, tv_nsec} p ns
+
+foreign import ccall unsafe "time.h clock_gettime"
+    clock_gettime :: #{type clockid_t} -> Ptr CTimespec -> IO CInt
+
+-- | Get the current POSIX time from the system clock.
+getCTimespec :: IO CTimespec
+getCTimespec = alloca (\ptspec -> do
+    throwErrnoIfMinus1_ "clock_gettime" $
+        clock_gettime #{const CLOCK_REALTIME} ptspec
+    peek ptspec
+    )
+
+#endif
diff --git a/lib/Data/Time/Clock/POSIX.hs b/lib/Data/Time/Clock/POSIX.hs
index 91f22e0..a7a3737 100644
--- a/lib/Data/Time/Clock/POSIX.hs
+++ b/lib/Data/Time/Clock/POSIX.hs
@@ -10,9 +10,14 @@ import Data.Time.Calendar.Days
 import Data.Fixed
 import Control.Monad
 
+#include "HsTimeConfig.h"
+
 #ifdef mingw32_HOST_OS
 import Data.Word    ( Word64)
 import System.Win32.Time
+#elif HAVE_CLOCK_GETTIME
+import Data.Time.Clock.CTimespec
+import Foreign.C.Types (CTime(..))
 #else
 import Data.Time.Clock.CTimeval
 #endif
@@ -55,6 +60,15 @@ getPOSIXTime = do
 win32_epoch_adjust :: Word64
 win32_epoch_adjust = 116444736000000000
 
+#elif HAVE_CLOCK_GETTIME
+
+-- Use hi-res POSIX time
+ctimespecToPosixSeconds :: CTimespec -> POSIXTime
+ctimespecToPosixSeconds (MkCTimespec (CTime s) ns) =
+    (fromIntegral s) + (fromIntegral ns) / 1000000000
+
+getPOSIXTime = liftM ctimespecToPosixSeconds getCTimespec
+
 #else
 
 -- Use POSIX time
diff --git a/time.cabal b/time.cabal
index ed6479e..0115a47 100644
--- a/time.cabal
+++ b/time.cabal
@@ -75,6 +75,7 @@ library
         Data.Time.Clock.Scale,
         Data.Time.Clock.UTC,
         Data.Time.Clock.CTimeval,
+        Data.Time.Clock.CTimespec,
         Data.Time.Clock.UTCDiff,
         Data.Time.LocalTime.TimeZone,
         Data.Time.LocalTime.TimeOfDay,


From git at git.haskell.org  Sun Dec 20 07:56:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:48 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #38 from
 redneb/clock_gettime (882305f)
Message-ID: <20151220075648.C04303A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/882305fbe11e1ce43fbd7cf09f5e64f7d755d67e

>---------------------------------------------------------------

commit 882305fbe11e1ce43fbd7cf09f5e64f7d755d67e
Merge: 020ce40 1b74336
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 23 13:01:53 2015 -0700

    Merge pull request #38 from redneb/clock_gettime
    
    use clock_gettime to implement getPOSIXTime if available



>---------------------------------------------------------------

882305fbe11e1ce43fbd7cf09f5e64f7d755d67e
 configure.ac                      |  2 ++
 lib/Data/Time/Clock/CTimespec.hsc | 41 +++++++++++++++++++++++++++++++++++++++
 lib/Data/Time/Clock/POSIX.hs      | 14 +++++++++++++
 time.cabal                        |  1 +
 4 files changed, 58 insertions(+)


From git at git.haskell.org  Sun Dec 20 07:56:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:50 +0000 (UTC)
Subject: [commit: packages/time] master: Merge pull request #35 from
 bergmark/ghc70 (45c652b)
Message-ID: <20151220075650.C91F63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/45c652b0a88097bf00ab2e81625741ee3552a309

>---------------------------------------------------------------

commit 45c652b0a88097bf00ab2e81625741ee3552a309
Merge: 882305f 603b058
Author: Ashley Yakeley <ashley at semantic.org>
Date:   Sun Aug 23 13:08:53 2015 -0700

    Merge pull request #35 from bergmark/ghc70
    
    Fix compilation on GHC 7.0 by not using Trustworthy



>---------------------------------------------------------------

45c652b0a88097bf00ab2e81625741ee3552a309
 lib/Data/Time/Clock/CTimeval.hs     | 2 +-
 lib/Data/Time/Clock/Scale.hs        | 3 ++-
 lib/Data/Time/Clock/UTC.hs          | 3 ++-
 lib/Data/Time/LocalTime/TimeZone.hs | 2 +-
 time.cabal                          | 3 +--
 5 files changed, 7 insertions(+), 6 deletions(-)



From git at git.haskell.org  Sun Dec 20 07:56:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:52 +0000 (UTC)
Subject: [commit: packages/time] master: use stack;
 include autotools stuff (899f339)
Message-ID: <20151220075652.D76193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/899f3394427f53e04bd2c7ddd14d5ff3916a037f

>---------------------------------------------------------------

commit 899f3394427f53e04bd2c7ddd14d5ff3916a037f
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 14:48:35 2015 -0800

    use stack; include autotools stuff


>---------------------------------------------------------------

899f3394427f53e04bd2c7ddd14d5ff3916a037f
 .gitignore                    |    3 +-
 Makefile                      |   39 -
 configure                     | 4638 +++++++++++++++++++++++++++++++++++++++++
 lib/include/HsTimeConfig.h.in |   89 +
 stack.yaml                    |   32 +
 5 files changed, 4760 insertions(+), 41 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 899f3394427f53e04bd2c7ddd14d5ff3916a037f

From git at git.haskell.org  Sun Dec 20 07:56:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:54 +0000 (UTC)
Subject: [commit: packages/time] master: fix bug in fromSundayStartWeekValid,
 with tests (1732b96)
Message-ID: <20151220075654.E1C683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/1732b969c0e2845b20969a539db217eff9e1c91f

>---------------------------------------------------------------

commit 1732b969c0e2845b20969a539db217eff9e1c91f
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 19:59:01 2015 -0800

    fix bug in fromSundayStartWeekValid, with tests


>---------------------------------------------------------------

1732b969c0e2845b20969a539db217eff9e1c91f
 lib/Data/Time/Calendar/OrdinalDate.hs | 109 ++++++++++++++++++++++++----------
 test/Test/TestValid.hs                |  61 +++++++++++++++++++
 test/Test/Tests.hs                    |   4 +-
 time.cabal                            |   1 +
 4 files changed, 141 insertions(+), 34 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1732b969c0e2845b20969a539db217eff9e1c91f

From git at git.haskell.org  Sun Dec 20 07:56:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:56 +0000 (UTC)
Subject: [commit: packages/time] master: make parsing reject invalid dates and
 the like (e9cd141)
Message-ID: <20151220075656.EA4853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/e9cd1412d9e6b6a52f936edfe370ced30084ae88

>---------------------------------------------------------------

commit e9cd1412d9e6b6a52f936edfe370ced30084ae88
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 20:13:27 2015 -0800

    make parsing reject invalid dates and the like


>---------------------------------------------------------------

e9cd1412d9e6b6a52f936edfe370ced30084ae88
 lib/Data/Time/Format/Parse.hs | 361 ++++++++++++++++++++++++++++--------------
 test/Test/TestFormat.hs       |   8 +-
 2 files changed, 245 insertions(+), 124 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e9cd1412d9e6b6a52f936edfe370ced30084ae88

From git at git.haskell.org  Sun Dec 20 07:56:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:56:58 +0000 (UTC)
Subject: [commit: packages/time] master: bump version (05ae57a)
Message-ID: <20151220075658.F14BC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/05ae57ad38e1b8d56146b213050dc6b9886a1ee6

>---------------------------------------------------------------

commit 05ae57ad38e1b8d56146b213050dc6b9886a1ee6
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 20:31:28 2015 -0800

    bump version


>---------------------------------------------------------------

05ae57ad38e1b8d56146b213050dc6b9886a1ee6
 configure.ac | 2 +-
 time.cabal   | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4be2aff..4367fd2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([Haskell time package], [1.4.0.2], [ashley at semantic.org], [time])
+AC_INIT([Haskell time package], [1.6], [ashley at semantic.org], [time])
 
 # Safety check: Ensure that we are in the correct source directory.
 AC_CONFIG_SRCDIR([lib/include/HsTime.h])
diff --git a/time.cabal b/time.cabal
index 31d1e93..4e766b2 100644
--- a/time.cabal
+++ b/time.cabal
@@ -1,5 +1,5 @@
 name:           time
-version:        1.5.1
+version:        1.6
 stability:      stable
 license:        BSD3
 license-file:   LICENSE
@@ -98,7 +98,7 @@ test-suite ShowDefaultTZAbbreviations
     ghc-options: -Wall -fwarn-tabs
     build-depends:
         base,
-        time == 1.5.1
+        time == 1.6
     main-is: ShowDefaultTZAbbreviations.hs
 
 test-suite tests
@@ -120,7 +120,7 @@ test-suite tests
     build-depends:
         base,
         deepseq,
-        time == 1.5.1,
+        time == 1.6,
         QuickCheck >= 2.5.1,
         test-framework >= 0.8,
         test-framework-quickcheck2 >= 0.3,


From git at git.haskell.org  Sun Dec 20 07:57:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:57:01 +0000 (UTC)
Subject: [commit: packages/time] master: remove trailing space (b31cee9)
Message-ID: <20151220075701.0515A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/b31cee91232e1f134a8cfa41b977077854ccc040

>---------------------------------------------------------------

commit b31cee91232e1f134a8cfa41b977077854ccc040
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 20:33:15 2015 -0800

    remove trailing space


>---------------------------------------------------------------

b31cee91232e1f134a8cfa41b977077854ccc040
 lib/Data/Time/Calendar/OrdinalDate.hs | 0
 lib/Data/Time/Format/Parse.hs         | 0
 test/Test/ConvertBack.hs              | 0
 test/Test/TestTime.hs                 | 0
 4 files changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Sun Dec 20 07:57:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 07:57:03 +0000 (UTC)
Subject: [commit: packages/time] master: added changelog.md (346ced4)
Message-ID: <20151220075703.0D1A23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/time

On branch  : master
Link       : http://git.haskell.org/packages/time.git/commitdiff/346ced46c94c6113b7333beb8fa1b577f03fa2e5

>---------------------------------------------------------------

commit 346ced46c94c6113b7333beb8fa1b577f03fa2e5
Author: Ashley Yakeley <ashley at yakeley.org>
Date:   Sat Dec 19 20:47:55 2015 -0800

    added changelog.md


>---------------------------------------------------------------

346ced46c94c6113b7333beb8fa1b577f03fa2e5
 changelog.md | 17 +++++++++++++++++
 time.cabal   |  1 +
 2 files changed, 18 insertions(+)

diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..ee9e84c
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,17 @@
+# Change Log
+
+## [1.6]
+
+### Added
+- FormatTime, ParseTime, Show and Read instances for UniversalTime
+- diffTimeToPicoseconds
+- this change log
+
+### Changed
+- Use clock_gettime where available
+- Read and Show instances exported in the same module as their types
+- Fixed bug in fromSundayStartWeekValid
+- Parsing functions now reject invalid dates
+- Various documentation fixes
+
+## [1.5.0.1]
diff --git a/time.cabal b/time.cabal
index 4e766b2..8eea72e 100644
--- a/time.cabal
+++ b/time.cabal
@@ -15,6 +15,7 @@ cabal-version:  >=1.10
 x-follows-version-policy:
 
 extra-source-files:
+    changelog.md
     aclocal.m4
     configure.ac
     configure


From git at git.haskell.org  Sun Dec 20 09:15:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 09:15:15 +0000 (UTC)
Subject: [commit: packages/hpc] master: Relax upper bound to allow new
 time-1.6 release (a6dee68)
Message-ID: <20151220091515.389803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

On branch  : master
Link       : http://git.haskell.org/packages/hpc.git/commitdiff/a6dee68551ce931e2d2184c47c0e64180618450a

>---------------------------------------------------------------

commit a6dee68551ce931e2d2184c47c0e64180618450a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 10:15:42 2015 +0100

    Relax upper bound to allow new time-1.6 release


>---------------------------------------------------------------

a6dee68551ce931e2d2184c47c0e64180618450a
 hpc.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hpc.cabal b/hpc.cabal
index 39340f1..b6ca16a 100644
--- a/hpc.cabal
+++ b/hpc.cabal
@@ -39,5 +39,5 @@ Library
         containers >= 0.4.1 && < 0.6,
         directory  >= 1.1   && < 1.3,
         filepath   >= 1     && < 1.5,
-        time       >= 1.2   && < 1.6
+        time       >= 1.2   && < 1.7
     ghc-options: -Wall


From git at git.haskell.org  Sun Dec 20 10:03:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 10:03:56 +0000 (UTC)
Subject: [commit: ghc] master: Update time submodule to v1.6 release (bcc213d)
Message-ID: <20151220100356.025E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bcc213db535bbf796f6a520f67145ba4715add61/ghc

>---------------------------------------------------------------

commit bcc213db535bbf796f6a520f67145ba4715add61
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 10:26:54 2015 +0100

    Update time submodule to v1.6 release
    
    This is the designated release to go with GHC 8.0.1
    
    /cc @AshleyYakeley


>---------------------------------------------------------------

bcc213db535bbf796f6a520f67145ba4715add61
 compiler/ghc.cabal.in | 2 +-
 libraries/Cabal       | 2 +-
 libraries/directory   | 2 +-
 libraries/hpc         | 2 +-
 libraries/time        | 2 +-
 libraries/unix        | 2 +-
 mk/warnings.mk        | 4 +---
 7 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/compiler/ghc.cabal.in b/compiler/ghc.cabal.in
index e816133..da8fce2 100644
--- a/compiler/ghc.cabal.in
+++ b/compiler/ghc.cabal.in
@@ -49,7 +49,7 @@ Library
                    process    >= 1   && < 1.5,
                    bytestring >= 0.9 && < 0.11,
                    binary     == 0.8.*,
-                   time                 < 1.6,
+                   time       >= 1.4 && < 1.7,
                    containers >= 0.5 && < 0.6,
                    array      >= 0.1 && < 0.6,
                    filepath   >= 1   && < 1.5,
diff --git a/libraries/Cabal b/libraries/Cabal
index e275a16..50ccb66 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit e275a162ccac087f8b25b424551e8a1598dd5943
+Subproject commit 50ccb668e866ccbe35a1982bf81750cec7aea382
diff --git a/libraries/directory b/libraries/directory
index 4dcb287..5696798 160000
--- a/libraries/directory
+++ b/libraries/directory
@@ -1 +1 @@
-Subproject commit 4dcb2873166558575fe70142da87952bd558f943
+Subproject commit 5696798a0adbf3401688f223fe64a4aa6378e87b
diff --git a/libraries/hpc b/libraries/hpc
index 5123582..a6dee68 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit 5123582f48b46efc3d27424bc475125a1de78e2e
+Subproject commit a6dee68551ce931e2d2184c47c0e64180618450a
diff --git a/libraries/time b/libraries/time
index 8d3c90a..409d7a0 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 8d3c90a420c8985dcc439766c028821cea7dc848
+Subproject commit 409d7a01659c2ac331017a6ece423485bc7aaf01
diff --git a/libraries/unix b/libraries/unix
index 5d5b747..4f3b5d8 160000
--- a/libraries/unix
+++ b/libraries/unix
@@ -1 +1 @@
-Subproject commit 5d5b74716b696b0f22c37a88ccc5c114b13f0398
+Subproject commit 4f3b5d8b87eef07d8df62a8d7240830bb81a8a6b
diff --git a/mk/warnings.mk b/mk/warnings.mk
index e2b80be..4420601 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -55,9 +55,7 @@ libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 # haddock's attoparsec uses deprecated `inlinePerformIO`
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
 
-# not yet de-tabbed
-libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-tabs
-# On Windows, there are also some unused import warnings
+# On Windows, there are/were some unused import warnings
 ifeq "$(HostOS_CPP)" "mingw32"
 libraries/time_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports -Wno-identities
 endif


From git at git.haskell.org  Sun Dec 20 11:46:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 11:46:53 +0000 (UTC)
Subject: [commit: ghc] master: Merge new commands from ghci-ng (re #10874)
 (dd56eb1)
Message-ID: <20151220114653.5E4723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dd56eb1efc11bcbd60ab0b77ca3e4f949d7d0844/ghc

>---------------------------------------------------------------

commit dd56eb1efc11bcbd60ab0b77ca3e4f949d7d0844
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 11:50:59 2015 +0100

    Merge new commands from ghci-ng (re #10874)
    
    This adds the new commands `:all-types`, `:loc-at`, `:type-at`, and
    `:uses` designed for editor-integration (such as Emacs' `haskell-mode`).
    
    This was originally implemented by Chris Done on
    
      https://github.com/chrisdone/ghci-ng
    
    and has been in use by Emacs' `haskell-mode` for over a year already,
    and closely missed the GHC 7.10 release back then.
    
    I've squashed the commits, rebased to GHC HEAD, and heavily refactored and
    improved the patch.
    
    Tests will be added in a separate commit.
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1240


>---------------------------------------------------------------

dd56eb1efc11bcbd60ab0b77ca3e4f949d7d0844
 docs/users_guide/7.12.1-notes.rst |   5 +
 docs/users_guide/ghci.rst         |  80 +++++++++
 ghc/GhciInfo.hs                   | 366 ++++++++++++++++++++++++++++++++++++++
 ghc/GhciMonad.hs                  |  19 ++
 ghc/InteractiveUI.hs              | 233 +++++++++++++++++++++---
 ghc/ghc-bin.cabal.in              |  21 ++-
 6 files changed, 692 insertions(+), 32 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc dd56eb1efc11bcbd60ab0b77ca3e4f949d7d0844

From git at git.haskell.org  Sun Dec 20 16:19:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:40 +0000 (UTC)
Subject: [commit: packages/containers] branch 'strict-tuples' created
Message-ID: <20151220161940.D87D73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : strict-tuples
Referencing: cd8d45fb8c4132a5bf56b140a40d9f37f04cfd56

From git at git.haskell.org  Sun Dec 20 16:19:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:42 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop-0.6' created
Message-ID: <20151220161942.D89573A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop-0.6
Referencing: 7ab1c399726c5a4a562cff3f56017ff5852ac82e

From git at git.haskell.org  Sun Dec 20 16:19:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:44 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop' created
Message-ID: <20151220161944.D967D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop
Referencing: b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef

From git at git.haskell.org  Sun Dec 20 16:19:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:46 +0000 (UTC)
Subject: [commit: packages/containers] branch 'develop-0.6-questionable'
 created
Message-ID: <20151220161946.DB1FC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : develop-0.6-questionable
Referencing: 2bf686d3dd0706eef416590100f8d1ebaa3eb80b

From git at git.haskell.org  Sun Dec 20 16:19:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:48 +0000 (UTC)
Subject: [commit: packages/containers] branch 'zip-devel' created
Message-ID: <20151220161948.DB9F23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New branch : zip-devel
Referencing: ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6

From git at git.haskell.org  Sun Dec 20 16:19:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:50 +0000 (UTC)
Subject: [commit: packages/containers] branch 'ghc-head' deleted
Message-ID: <20151220161950.DC5FB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

Deleted branch: ghc-head

From git at git.haskell.org  Sun Dec 20 16:19:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:52 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.7.0-release' created
Message-ID: <20151220161952.DD4733A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.7.0-release
Referencing: d06b845316672e4b6a123048702668c220acea03

From git at git.haskell.org  Sun Dec 20 16:19:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:54 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.6.2-release' created
Message-ID: <20151220161954.DE8F63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.6.2-release
Referencing: ab15b1f50d85199aebbe58c7e8efb7f3f1f09eda

From git at git.haskell.org  Sun Dec 20 16:19:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:56 +0000 (UTC)
Subject: [commit: packages/containers] tag 'v0.5.7.1' created
Message-ID: <20151220161956.DF8133A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : v0.5.7.1
Referencing: 6d73570e85db8b0dabc27b4f92518b0d013f8a84

From git at git.haskell.org  Sun Dec 20 16:19:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:19:58 +0000 (UTC)
Subject: [commit: packages/containers] tag 'containers-0.5.6.3-release' created
Message-ID: <20151220161958.E07DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

New tag    : containers-0.5.6.3-release
Referencing: a401400fa89b2f942a2e2d22610c21259b45d016

From git at git.haskell.org  Sun Dec 20 16:20:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:00 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add IsList instances for OverloadedLists (0e99ba8)
Message-ID: <20151220162000.EE6E23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0e99ba8851f875c4b44631c7afad3b70e74842c2

>---------------------------------------------------------------

commit 0e99ba8851f875c4b44631c7afad3b70e74842c2
Author: Konstantine Rybnikov <k-bx at k-bx.com>
Date:   Sun Apr 13 22:27:39 2014 +0200

    Add IsList instances for OverloadedLists


>---------------------------------------------------------------

0e99ba8851f875c4b44631c7afad3b70e74842c2
 Data/IntMap/Base.hs | 16 +++++++++++++++-
 Data/IntSet/Base.hs | 13 +++++++++++++
 Data/Map/Base.hs    | 13 +++++++++++++
 Data/Set/Base.hs    | 13 +++++++++++++
 4 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 34a263a..75b3ae9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -5,6 +5,10 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+{-# LANGUAGE ScopedTypeVariables #-}
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntMap.Base
@@ -231,6 +235,9 @@ import Data.StrictPair
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
                   DataType, mkDataType)
 import GHC.Exts (build)
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 #endif
 
@@ -1770,6 +1777,13 @@ fromSet f (IntSet.Tip kx bm) = buildTree f kx bm (IntSet.suffixBitMask + 1)
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance GHCExts.IsList (IntMap a) where
+  type Item (IntMap a) = (Key,a)
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the map to a list of key\/value pairs. Subject to list
 -- fusion.
 --
@@ -1907,7 +1921,7 @@ fromAscListWithKey f (x0 : xs0) = fromDistinctAscList (combineEq x0 xs0)
 --
 -- > fromDistinctAscList [(3,"b"), (5,"a")] == fromList [(3, "b"), (5, "a")]
 
-fromDistinctAscList :: [(Key,a)] -> IntMap a
+fromDistinctAscList :: forall a. [(Key,a)] -> IntMap a
 fromDistinctAscList []         = Nil
 fromDistinctAscList (z0 : zs0) = work z0 zs0 Nada
   where
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index be41db5..0063c3f 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntSet.Base
@@ -198,6 +201,9 @@ import Text.Read
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts (Int(..), build)
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import GHC.Prim (indexInt8OffAddr#)
 #endif
 
@@ -936,6 +942,13 @@ elems
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance GHCExts.IsList IntSet where
+  type Item IntSet = Key
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the set to a list of elements. Subject to list fusion.
 toList :: IntSet -> [Key]
 toList
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 6a93a73..69f8276 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Map.Base
@@ -278,6 +281,9 @@ import qualified Data.Set.Base as Set
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 import Data.Data
 #endif
@@ -1948,6 +1954,13 @@ fromSet f (Set.Bin sz x l r) = Bin sz x (f x) (fromSet f l) (fromSet f r)
   Lists
   use [foldlStrict] to reduce demand on the control-stack
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance (Ord k) => GHCExts.IsList (Map k v) where
+  type Item (Map k v) = (k,v)
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n*log n)/. Build a map from a list of key\/value pairs. See also 'fromAscList'.
 -- If the list contains more than one value for the same key, the last value
 -- for the key is retained.
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index f863d17..94372df 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Set.Base
@@ -194,6 +197,9 @@ import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts as GHCExts
+#endif
 import Text.Read
 import Data.Data
 #endif
@@ -763,6 +769,13 @@ elems = toAscList
 {--------------------------------------------------------------------
   Lists
 --------------------------------------------------------------------}
+#if __GLASGOW_HASKELL__ >= 708
+instance (Ord a) => GHCExts.IsList (Set a) where
+  type Item (Set a) = a
+  fromList = fromList
+  toList   = toList
+#endif
+
 -- | /O(n)/. Convert the set to a list of elements. Subject to list fusion.
 toList :: Set a -> [a]
 toList = toAscList


From git at git.haskell.org  Sun Dec 20 16:20:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:03 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add LANGUAGE RoleAnnotations for ghc 7.8 (cb08a7e)
Message-ID: <20151220162003.037063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cb08a7e06676d38f2f5deb35d0035429c1c10eb1

>---------------------------------------------------------------

commit cb08a7e06676d38f2f5deb35d0035429c1c10eb1
Author: Konstantine Rybnikov <k-bx at k-bx.com>
Date:   Sun Apr 13 23:52:57 2014 +0200

    Add LANGUAGE RoleAnnotations for ghc 7.8


>---------------------------------------------------------------

cb08a7e06676d38f2f5deb35d0035429c1c10eb1
 Data/Map/Base.hs | 3 +++
 Data/Set/Base.hs | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 6a93a73..95f7b91 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE RoleAnnotations #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Map.Base
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index f863d17..da3b21d 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -5,6 +5,9 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE RoleAnnotations #-}
+#endif
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.Set.Base


From git at git.haskell.org  Sun Dec 20 16:20:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:05 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Merge pull request #42 from k-bx/add-role-annotations-lang
 (0098d41)
Message-ID: <20151220162005.0B3013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0098d41f0aa0460f96eb2251ac743bb7fa137a68

>---------------------------------------------------------------

commit 0098d41f0aa0460f96eb2251ac743bb7fa137a68
Merge: e787f05 cb08a7e
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 07:01:33 2014 +0100

    Merge pull request #42 from k-bx/add-role-annotations-lang
    
    Add LANGUAGE RoleAnnotations for ghc 7.8



>---------------------------------------------------------------

0098d41f0aa0460f96eb2251ac743bb7fa137a68
 Data/Map/Base.hs | 3 +++
 Data/Set/Base.hs | 3 +++
 2 files changed, 6 insertions(+)


From git at git.haskell.org  Sun Dec 20 16:20:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:07 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master, zip-devel: Merge language pragmas (bae098f)
Message-ID: <20151220162007.16F433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bae098fb0a3994bc2b0ec3313004b40cd097ed8d

>---------------------------------------------------------------

commit bae098fb0a3994bc2b0ec3313004b40cd097ed8d
Merge: 0098d41 0e99ba8
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Apr 14 08:20:44 2014 +0200

    Merge language pragmas



>---------------------------------------------------------------

bae098fb0a3994bc2b0ec3313004b40cd097ed8d
 Data/IntMap/Base.hs | 16 +++++++++++++++-
 Data/IntSet/Base.hs | 13 +++++++++++++
 Data/Map/Base.hs    | 11 +++++++++++
 Data/Set/Base.hs    | 11 +++++++++++
 4 files changed, 50 insertions(+), 1 deletion(-)

diff --cc Data/Map/Base.hs
index 95f7b91,69f8276..db9549f
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |
diff --cc Data/Set/Base.hs
index da3b21d,94372df..ffcdfd0
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@@ -6,7 -6,7 +6,8 @@@
  {-# LANGUAGE Trustworthy #-}
  #endif
  #if __GLASGOW_HASKELL__ >= 708
 +{-# LANGUAGE RoleAnnotations #-}
+ {-# LANGUAGE TypeFamilies #-}
  #endif
  -----------------------------------------------------------------------------
  -- |


From git at git.haskell.org  Sun Dec 20 16:20:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:09 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Don't have tests depend on library to avoid dep conflicts (53da0d5)
Message-ID: <20151220162009.1D5843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/53da0d55d8592d86772691322cc7eebae511e29e

>---------------------------------------------------------------

commit 53da0d55d8592d86772691322cc7eebae511e29e
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Wed Apr 23 08:50:44 2014 +0200

    Don't have tests depend on library to avoid dep conflicts


>---------------------------------------------------------------

53da0d55d8592d86772691322cc7eebae511e29e
 containers.cabal | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 8abca7a..640cb5e 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -211,14 +211,13 @@ Test-suite seq-properties
         test-framework-quickcheck2
 
 test-suite map-strictness-properties
-  hs-source-dirs: tests
+  hs-source-dirs: tests, .
   main-is: MapStrictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
     base,
     ChasingBottoms,
-    containers,
     QuickCheck >= 2.4.0.1,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
@@ -226,14 +225,13 @@ test-suite map-strictness-properties
   ghc-options: -Wall
 
 test-suite intmap-strictness-properties
-  hs-source-dirs: tests
+  hs-source-dirs: tests, .
   main-is: IntMapStrictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
     base,
     ChasingBottoms,
-    containers,
     QuickCheck >= 2.4.0.1,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9


From git at git.haskell.org  Sun Dec 20 16:20:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:11 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add missing test dependencies (c17cfaf)
Message-ID: <20151220162011.23B513A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c17cfaf7996942ed305dc1db55ea82da40ed47e4

>---------------------------------------------------------------

commit c17cfaf7996942ed305dc1db55ea82da40ed47e4
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Wed Apr 23 09:25:40 2014 +0200

    Add missing test dependencies


>---------------------------------------------------------------

c17cfaf7996942ed305dc1db55ea82da40ed47e4
 containers.cabal | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 640cb5e..209589b 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -216,9 +216,12 @@ test-suite map-strictness-properties
   type: exitcode-stdio-1.0
 
   build-depends:
-    base,
+    array,
+    base >= 4.2 && < 5,
     ChasingBottoms,
+    deepseq >= 1.2 && < 1.4,
     QuickCheck >= 2.4.0.1,
+    ghc-prim,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
 
@@ -230,9 +233,12 @@ test-suite intmap-strictness-properties
   type: exitcode-stdio-1.0
 
   build-depends:
-    base,
+    array,
+    base >= 4.2 && < 5,
     ChasingBottoms,
+    deepseq >= 1.2 && < 1.4,
     QuickCheck >= 2.4.0.1,
+    ghc-prim,
     test-framework >= 0.3.3,
     test-framework-quickcheck2 >= 0.2.9
 


From git at git.haskell.org  Sun Dec 20 16:20:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:13 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Add Travis-CI job control file (234896a)
Message-ID: <20151220162013.2C5B23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/234896a2bb2c1f57f033b1f19f38ef039e99fe1e

>---------------------------------------------------------------

commit 234896a2bb2c1f57f033b1f19f38ef039e99fe1e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 22 22:48:36 2014 +0200

    Add Travis-CI job control file
    
    This builds and tests containers with GHC 7.0, 7.4, 7.6, 7.8, and GHC HEAD
    
    (Once haskell/cabal#1806 is fixed we can use CABALVER=1.20 w/ GHCVER=7.8.2)


>---------------------------------------------------------------

234896a2bb2c1f57f033b1f19f38ef039e99fe1e
 .travis.yml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..67d893c
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,60 @@
+# NB: don't set `language: haskell` here
+
+# See also https://github.com/hvr/multi-ghc-travis for more information
+env:
+ - GHCVER=7.0.4 CABALVER=1.16
+ # we have to use CABALVER=1.16 for GHC<7.6 as well, as there's
+ # no package for earlier cabal versions in the PPA
+ - GHCVER=7.4.2 CABALVER=1.16
+ - GHCVER=7.6.3 CABALVER=1.16
+ - GHCVER=7.8.2 CABALVER=1.18
+ # NOTE: we can't use Cabal 1.20 yet due to
+ #  https://github.com/haskell/cabal/issues/1806
+ - GHCVER=head  CABALVER=1.18
+
+matrix:
+  allow_failures:
+   - env: GHCVER=head  CABALVER=1.18
+
+# Note: the distinction between `before_install` and `install` is not
+#       important.
+before_install:
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
+ - cabal --version
+
+install:
+ - travis_retry cabal update
+ - cabal install --only-dependencies
+ # we need to install the test-suite deps manually as the cabal solver would
+ # otherwise complaing about cyclic deps
+ - cabal install 'test-framework >= 0.3.3' 'test-framework-quickcheck2 >= 0.2.9' 'QuickCheck >= 2.4.0.1' 'ChasingBottoms' 'HUnit' 'test-framework-hunit'
+
+# Here starts the actual work to be performed for the package under
+# test; any command which exits with a non-zero exit code causes the
+# build to fail.
+script:
+ # -v2 provides useful information for debugging
+ - cabal configure -v2 --enable-tests
+
+ # this builds all libraries and executables
+ # (including tests/benchmarks)
+ - cabal build
+ - cabal test
+
+ # tests that a source-distribution can be generated
+ - cabal sdist
+
+ # check that the generated source-distribution can be built & installed
+ - export SRC_TGZ=$(cabal info . | awk '{print $2 ".tar.gz";exit}') ;
+   cd dist/;
+   if [ -f "$SRC_TGZ" ]; then
+      cabal install --force-reinstalls "$SRC_TGZ";
+   else
+      echo "expected '$SRC_TGZ' not found";
+      exit 1;
+   fi
+
+# EOF


From git at git.haskell.org  Sun Dec 20 16:20:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:15 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Markdownify and extend README (7d8360a)
Message-ID: <20151220162015.333F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7d8360ac1e3a484bae714b5253e287a0f77b80c3

>---------------------------------------------------------------

commit 7d8360ac1e3a484bae714b5253e287a0f77b80c3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Apr 23 12:42:06 2014 +0200

    Markdownify and extend README


>---------------------------------------------------------------

7d8360ac1e3a484bae714b5253e287a0f77b80c3
 README    |  6 ------
 README.md | 12 ++++++++++++
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/README b/README
deleted file mode 100644
index 1fb326b..0000000
--- a/README
+++ /dev/null
@@ -1,6 +0,0 @@
-POTENTIAL CONTRIBUTORS
-======================
-
-Please follow the guidelines outlined on the Haskell Wiki when proposing an API change.
-
-http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..0eab2ca
--- /dev/null
+++ b/README.md
@@ -0,0 +1,12 @@
+The `containers` Package [![Build Status](https://travis-ci.org/haskell/containers.svg?branch=master)](https://travis-ci.org/haskell/containers)
+========================
+
+See [`containers` on Hackage](http://hackage.haskell.org/package/containers) for more information.
+
+
+Contributing
+------------
+
+For reporting bugs (and maybe even the respective fix), please use the [GitHub issue tracker](https://github.com/haskell/containers/issues).
+
+For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers) (but use the GitHub facilities instead of GHC's Trac for submitting patches).


From git at git.haskell.org  Sun Dec 20 16:20:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:17 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Try to use CABALVER=1.20 again (e5d74fa)
Message-ID: <20151220162017.3A4AE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e5d74fa883ef2d66511d12cdb62b9586abff14c5

>---------------------------------------------------------------

commit e5d74fa883ef2d66511d12cdb62b9586abff14c5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat May 3 17:45:13 2014 +0200

    Try to use CABALVER=1.20 again
    
    ...hoping that haskell/cabal#1806 has been resolved for good


>---------------------------------------------------------------

e5d74fa883ef2d66511d12cdb62b9586abff14c5
 .travis.yml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 67d893c..8af3116 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,13 +8,11 @@ env:
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.16
  - GHCVER=7.8.2 CABALVER=1.18
- # NOTE: we can't use Cabal 1.20 yet due to
- #  https://github.com/haskell/cabal/issues/1806
- - GHCVER=head  CABALVER=1.18
+ - GHCVER=head  CABALVER=1.20
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=1.18
+   - env: GHCVER=head  CABALVER=1.20
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.


From git at git.haskell.org  Sun Dec 20 16:20:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:19 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: tree: Fix imports for the Applicative/Monad change (c40e6dd)
Message-ID: <20151220162019.4157B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c40e6dd40861d788ee0cc337775d803d8907b6ff

>---------------------------------------------------------------

commit c40e6dd40861d788ee0cc337775d803d8907b6ff
Author: Austin Seipp <aseipp at pobox.com>
Date:   Mon May 12 07:31:59 2014 -0500

    tree: Fix imports for the Applicative/Monad change
    
    Due to various problems with orphans and cycles in base, while
    implementing the Applicative/Monad Proposal, Alternative joined
    MonadPlus in Control.Monad.
    
    A knock-on effect of this is that Control.Monad now exports 'empty',
    which conflicts with Data.Sequence in this case. Luckily the fix is
    actually quite easy: just restrict the imports to liftM, since that's
    all we use anyway.
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>


>---------------------------------------------------------------

c40e6dd40861d788ee0cc337775d803d8907b6ff
 Data/Tree.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index 56af20f..dab25c2 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -32,7 +32,7 @@ module Data.Tree(
     ) where
 
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad
+import Control.Monad (liftM)
 import Data.Monoid (Monoid(..))
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)


From git at git.haskell.org  Sun Dec 20 16:20:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:21 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Merge pull request #44 from thoughtpolice/amp (e84c5d2)
Message-ID: <20151220162021.47D783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e84c5d2145415cb0beacce0909a551ae5e28d396

>---------------------------------------------------------------

commit e84c5d2145415cb0beacce0909a551ae5e28d396
Merge: e5d74fa c40e6dd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon May 12 15:05:18 2014 +0200

    Merge pull request #44 from thoughtpolice/amp
    
    tree: Fix imports for the Applicative/Monad change



>---------------------------------------------------------------

e84c5d2145415cb0beacce0909a551ae5e28d396
 Data/Tree.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:20:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:23 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Added fixity declarations for member, notMember, union,
 and intersection. (3999b51)
Message-ID: <20151220162023.528333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3999b512f5aa28a7b119a18b286a8485d1285319

>---------------------------------------------------------------

commit 3999b512f5aa28a7b119a18b286a8485d1285319
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.


>---------------------------------------------------------------

3999b512f5aa28a7b119a18b286a8485d1285319
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,6 +395,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -403,6 +405,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -818,6 +822,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -881,6 +887,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,10 +332,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -523,6 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -597,6 +602,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,6 +456,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -469,6 +471,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1230,6 +1234,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1350,6 +1356,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,6 +318,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -327,6 +329,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -578,6 +582,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -636,6 +642,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Sun Dec 20 16:20:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:25 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Fixed syntax of fixity declarations. (07ab0fa)
Message-ID: <20151220162025.5D0C53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/07ab0fa052843dc8fd4c874876d03d8a71525f87

>---------------------------------------------------------------

commit 07ab0fa052843dc8fd4c874876d03d8a71525f87
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

07ab0fa052843dc8fd4c874876d03d8a71525f87
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..237aea8 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..5aee4ef 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..bc2fd47 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..d0533f5 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Sun Dec 20 16:20:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:27 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Revert "Fixed syntax of fixity declarations." (fa2c888)
Message-ID: <20151220162027.67B273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fa2c8880efd7adf81e33de72f1a38a0c2b31e90b

>---------------------------------------------------------------

commit fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Jul 22 17:09:30 2014 +0200

    Revert "Fixed syntax of fixity declarations."
    
    This reverts commit 07ab0fa052843dc8fd4c874876d03d8a71525f87.


>---------------------------------------------------------------

fa2c8880efd7adf81e33de72f1a38a0c2b31e90b
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 237aea8..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 `member`
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 `union`
+infixl 5 union
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 5aee4ef..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 `union`
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index bc2fd47..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index d0533f5..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 `member`
+infix 4 member
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 `notMember`
+infix 4 notMember
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 `union`
+infixl 5 union
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 `intersection`
+infixl 5 intersection
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Sun Dec 20 16:20:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:29 +0000 (UTC)
Subject: [commit: packages/containers] develop, develop-0.6,
 develop-0.6-questionable, master,
 zip-devel: Revert "Added fixity declarations for member, notMember, union,
 and intersection." (3b1eee5)
Message-ID: <20151220162029.723DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop,develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3b1eee514581edcc51c3c4304087e2dff30e05cd

>---------------------------------------------------------------

commit 3b1eee514581edcc51c3c4304087e2dff30e05cd
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Tue Jul 22 17:09:50 2014 +0200

    Revert "Added fixity declarations for member, notMember, union, and intersection."
    
    This reverts commit 3999b512f5aa28a7b119a18b286a8485d1285319.


>---------------------------------------------------------------

3b1eee514581edcc51c3c4304087e2dff30e05cd
 Data/IntMap/Base.hs | 8 --------
 Data/IntSet/Base.hs | 7 -------
 Data/Map/Base.hs    | 8 --------
 Data/Set/Base.hs    | 8 --------
 4 files changed, 31 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..75b3ae9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,8 +395,6 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
-
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -405,8 +403,6 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
-
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -822,8 +818,6 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
-
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -887,8 +881,6 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
-
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..0063c3f 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,14 +332,10 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
-
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
-
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -527,7 +523,6 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -602,8 +597,6 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
-
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..db9549f 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,8 +456,6 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
-
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -471,8 +469,6 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
-
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1234,8 +1230,6 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
-
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1356,8 +1350,6 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
-
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..ffcdfd0 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,8 +318,6 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
-
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -329,8 +327,6 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
-
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -582,8 +578,6 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
-
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -642,8 +636,6 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
-
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Sun Dec 20 16:20:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:31 +0000 (UTC)
Subject: [commit: packages/containers] develop: Added fixity declarations for
 member, notMember, union, and intersection. (4dd6e01)
Message-ID: <20151220162031.7C0733A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4dd6e01a78774de5e5dd6639b55a2902e610e0cc

>---------------------------------------------------------------

commit 4dd6e01a78774de5e5dd6639b55a2902e610e0cc
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.


>---------------------------------------------------------------

4dd6e01a78774de5e5dd6639b55a2902e610e0cc
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..9f7be70 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,6 +395,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -403,6 +405,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -818,6 +822,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -881,6 +887,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..9719de1 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,10 +332,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -523,6 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -597,6 +602,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..9d066fa 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,6 +456,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -469,6 +471,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1230,6 +1234,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1350,6 +1356,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..5727de6 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,6 +318,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -327,6 +329,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -578,6 +582,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -636,6 +642,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Sun Dec 20 16:20:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:33 +0000 (UTC)
Subject: [commit: packages/containers] develop: Fixed syntax of fixity
 declarations. (6ec9b1b)
Message-ID: <20151220162033.867653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f

>---------------------------------------------------------------

commit 6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

6ec9b1b4be2d7c264ebd2aa9d6ed06c98029cf8f
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 9f7be70..237aea8 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -395,7 +395,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -405,7 +405,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -822,7 +822,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -887,7 +887,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 9719de1..5aee4ef 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -332,13 +332,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -527,7 +527,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -602,7 +602,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 9d066fa..bc2fd47 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -456,7 +456,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -471,7 +471,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1234,7 +1234,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1356,7 +1356,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 5727de6..d0533f5 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -318,7 +318,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -329,7 +329,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -582,7 +582,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -642,7 +642,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Sun Dec 20 16:20:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:35 +0000 (UTC)
Subject: [commit: packages/containers] develop: Merge branch 'selinger-master'
 into develop. (f8629a2)
Message-ID: <20151220162035.8F8D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f8629a228545896ed9133fd72ebbcf97336767da

>---------------------------------------------------------------

commit f8629a228545896ed9133fd72ebbcf97336767da
Merge: 3b1eee5 6ec9b1b
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Aug 8 11:06:49 2014 +0200

    Merge branch 'selinger-master' into develop.
    
    PVP: Major version bump is needed.



>---------------------------------------------------------------

f8629a228545896ed9133fd72ebbcf97336767da
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)


From git at git.haskell.org  Sun Dec 20 16:20:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:37 +0000 (UTC)
Subject: [commit: packages/containers] develop: Make types of the drawing
 functions more generic, i.e. Show s => Tree s instead of Tree String (2c85f08)
Message-ID: <20151220162037.966FC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2c85f0823848ef7f70a27944bc4741c91ca1c0ef

>---------------------------------------------------------------

commit 2c85f0823848ef7f70a27944bc4741c91ca1c0ef
Author: jonasc <github at bcdf.eu>
Date:   Fri Aug 8 00:15:10 2014 +0200

    Make types of the drawing functions more generic, i.e. Show s => Tree s instead of Tree String


>---------------------------------------------------------------

2c85f0823848ef7f70a27944bc4741c91ca1c0ef
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index dab25c2..7cfba42 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -83,15 +83,15 @@ instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 
 -- | Neat 2-dimensional drawing of a tree.
-drawTree :: Tree String -> String
+drawTree :: Show a => Tree a -> String
 drawTree  = unlines . draw
 
 -- | Neat 2-dimensional drawing of a forest.
-drawForest :: Forest String -> String
+drawForest :: Show a => Forest a -> String
 drawForest  = unlines . map drawTree
 
-draw :: Tree String -> [String]
-draw (Node x ts0) = x : drawSubTrees ts0
+draw :: Show a => Tree a -> [String]
+draw (Node x ts0) = show x : drawSubTrees ts0
   where
     drawSubTrees [] = []
     drawSubTrees [t] =


From git at git.haskell.org  Sun Dec 20 16:20:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:39 +0000 (UTC)
Subject: [commit: packages/containers] develop: Merge branch 'jonasc-master'
 into develop (b44b6a7)
Message-ID: <20151220162039.9D3593A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef

>---------------------------------------------------------------

commit b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef
Merge: f8629a2 2c85f08
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Aug 8 11:07:42 2014 +0200

    Merge branch 'jonasc-master' into develop
    
    PVP: Major version bump is needed.



>---------------------------------------------------------------

b44b6a727c123c0ec33e8ac0f1299ac73ee1d0ef
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:20:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:41 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use defensive `Data.Foldable` import (74f9b89)
Message-ID: <20151220162041.A4AD43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/74f9b89a542240e7ab510ee4fb73a4d46035b8ea

>---------------------------------------------------------------

commit 74f9b89a542240e7ab510ee4fb73a4d46035b8ea
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Sep 27 15:12:33 2014 +0200

    Use defensive `Data.Foldable` import
    
    With this `import`-style containers will compile warning free
    with existing GHC versions as well as GHC HEAD (in its current form)
    
    This change is also needed because `Data.Foldable` is planned to export
    `null` and `length` which will otherwise clash with `Data.Sequence`


>---------------------------------------------------------------

74f9b89a542240e7ab510ee4fb73a4d46035b8ea
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9bfd6f9..6bbebdb 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -149,7 +149,7 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-import Data.Foldable
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), foldl', toList)
 import Data.Traversable
 import Data.Typeable
 


From git at git.haskell.org  Sun Dec 20 16:20:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:43 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #54 from hvr/pr-foldable (085e1b8)
Message-ID: <20151220162043.AD01A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b

>---------------------------------------------------------------

commit 085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b
Merge: 3b1eee5 74f9b89
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Sep 28 12:45:42 2014 +0200

    Merge pull request #54 from hvr/pr-foldable
    
    Use defensive `Data.Foldable` import



>---------------------------------------------------------------

085e1b8b2cfbd1159bbc9f8cbf6a4127cc32227b
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:20:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:45 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Move foldlStrict (defined 4 times) to Data.StrictFold. (27a5da9)
Message-ID: <20151220162045.B96F33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/27a5da9e0a99b2df2cfb267eed2dae8167c746a2

>---------------------------------------------------------------

commit 27a5da9e0a99b2df2cfb267eed2dae8167c746a2
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 12 11:06:53 2014 +0200

    Move foldlStrict (defined 4 times) to Data.StrictFold.
    
    The foldlStrict is Data.List.foldl' which is always inlined, which
    allows more optimizations. Also, foldl' is not Haskell 98, although
    it is Haskell 2010.


>---------------------------------------------------------------

27a5da9e0a99b2df2cfb267eed2dae8167c746a2
 Data/IntMap/Base.hs   |  9 +--------
 Data/IntMap/Strict.hs |  1 +
 Data/IntSet/Base.hs   |  7 +------
 Data/Map/Base.hs      |  9 +--------
 Data/Map/Strict.hs    |  2 ++
 Data/Set/Base.hs      |  7 +------
 Data/StrictFold.hs    | 16 ++++++++++++++++
 containers.cabal      |  1 +
 8 files changed, 24 insertions(+), 28 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 75b3ae9..8d04bfa 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -211,7 +211,6 @@ module Data.IntMap.Base (
     , shorter
     , branchMask
     , highestBitMask
-    , foldlStrict
     ) where
 
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
@@ -229,6 +228,7 @@ import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 import Data.BitUtil
 import Data.IntSet.Base (Key)
 import qualified Data.IntSet.Base as IntSet
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -2085,13 +2085,6 @@ branchMask p1 p2
   Utilities
 --------------------------------------------------------------------}
 
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
-
 -- | /O(1)/.  Decompose a map into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a map in parallel.
 --
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 2ca3707..f19682e 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -258,6 +258,7 @@ import Data.IntMap.Base hiding
 
 import Data.BitUtil
 import qualified Data.IntSet.Base as IntSet
+import Data.StrictFold
 import Data.StrictPair
 
 -- $strictness
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 0063c3f..c843d46 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -192,6 +192,7 @@ import Data.Word (Word)
 import Prelude hiding (filter, foldr, foldl, null, map)
 
 import Data.BitUtil
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -1491,12 +1492,6 @@ bitcount a0 x0 = go a0 x0
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
 
 -- | /O(1)/.  Decompose a set into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a set in parallel.
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index db9549f..650e003 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -262,7 +262,6 @@ module Data.Map.Base (
     , glue
     , trim
     , trimLookupLo
-    , foldlStrict
     , MaybeS(..)
     , filterGt
     , filterLt
@@ -279,6 +278,7 @@ import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import qualified Data.Set.Base as Set
+import Data.StrictFold
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
@@ -2826,13 +2826,6 @@ validsize t
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
-
 
 -- | /O(1)/.  Decompose a map into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a map in parallel.
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 75a29c8..4e0d820 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -269,7 +269,9 @@ import Data.Map.Base hiding
     , updateMaxWithKey
     )
 import qualified Data.Set.Base as Set
+import Data.StrictFold
 import Data.StrictPair
+
 import Data.Bits (shiftL, shiftR)
 
 -- Use macros to define strictness of functions.  STRICT_x_OF_y
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index ffcdfd0..3a2c938 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -194,6 +194,7 @@ import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
+import Data.StrictFold
 import Data.StrictPair
 
 #if __GLASGOW_HASKELL__
@@ -1416,12 +1417,6 @@ bin x l r
 {--------------------------------------------------------------------
   Utilities
 --------------------------------------------------------------------}
-foldlStrict :: (a -> b -> a) -> a -> [b] -> a
-foldlStrict f = go
-  where
-    go z []     = z
-    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
-{-# INLINE foldlStrict #-}
 
 -- | /O(1)/.  Decompose a set into pieces based on the structure of the underlying
 -- tree.  This function is useful for consuming a set in parallel.
diff --git a/Data/StrictFold.hs b/Data/StrictFold.hs
new file mode 100644
index 0000000..9c90a66
--- /dev/null
+++ b/Data/StrictFold.hs
@@ -0,0 +1,16 @@
+{-# LANGUAGE CPP #-}
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+{-# LANGUAGE Trustworthy #-}
+#endif
+module Data.StrictFold (foldlStrict) where
+
+-- | Same as regular 'Data.List.foldl'', but marked INLINE so that it is always
+-- inlined. This allows further optimization of the call to f, which can be
+-- optimized/specialised/inlined.
+
+foldlStrict :: (a -> b -> a) -> a -> [b] -> a
+foldlStrict f = go
+  where
+    go z []     = z
+    go z (x:xs) = let z' = f z x in z' `seq` go z' xs
+{-# INLINE foldlStrict #-}
diff --git a/containers.cabal b/containers.cabal
index 209589b..a952a77 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -57,6 +57,7 @@ Library
         Data.IntSet.Base
         Data.Map.Base
         Data.Set.Base
+        Data.StrictFold
         Data.StrictPair
 
     include-dirs: include


From git at git.haskell.org  Sun Dec 20 16:20:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:47 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Move utilities (BitUtils, Strict{Fold,
 Pair}) to Utils directory. (9cfe43a)
Message-ID: <20151220162047.C95B43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9cfe43a9790f8c8511f93f380e7d7168bb1c1a88

>---------------------------------------------------------------

commit 9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 12 11:13:13 2014 +0200

    Move utilities (BitUtils,Strict{Fold,Pair}) to Utils directory.
    
    The Data directory was becoming a little too crowded.


>---------------------------------------------------------------

9cfe43a9790f8c8511f93f380e7d7168bb1c1a88
 Data/IntMap/Base.hs            | 6 +++---
 Data/IntMap/Strict.hs          | 6 +++---
 Data/IntSet/Base.hs            | 6 +++---
 Data/Map/Base.hs               | 4 ++--
 Data/Map/Strict.hs             | 4 ++--
 Data/Set/Base.hs               | 4 ++--
 Data/{ => Utils}/BitUtil.hs    | 4 ++--
 Data/{ => Utils}/StrictFold.hs | 2 +-
 Data/{ => Utils}/StrictPair.hs | 2 +-
 containers.cabal               | 6 +++---
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 8d04bfa..fec5abe 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -225,11 +225,11 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
-import Data.BitUtil
 import Data.IntSet.Base (Key)
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix),
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index f19682e..3a7dde8 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -256,10 +256,10 @@ import Data.IntMap.Base hiding
     , fromDistinctAscList
     )
 
-import Data.BitUtil
 import qualified Data.IntSet.Base as IntSet
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 -- $strictness
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c843d46..309ab42 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -191,9 +191,9 @@ import Data.Typeable
 import Data.Word (Word)
 import Prelude hiding (filter, foldr, foldl, null, map)
 
-import Data.BitUtil
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.BitUtil
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import Data.Data (Data(..), Constr, mkConstr, constrIndex, Fixity(Prefix), DataType, mkDataType)
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 650e003..d1d8ffe 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -272,13 +272,13 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
 import Data.Monoid (Monoid(..))
-import Data.StrictPair
 import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import qualified Data.Set.Base as Set
-import Data.StrictFold
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 4e0d820..5f286b9 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -269,8 +269,8 @@ import Data.Map.Base hiding
     , updateMaxWithKey
     )
 import qualified Data.Set.Base as Set
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 import Data.Bits (shiftL, shiftR)
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 3a2c938..6c39a8e 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -194,8 +194,8 @@ import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
-import Data.StrictFold
-import Data.StrictPair
+import Data.Utils.StrictFold
+import Data.Utils.StrictPair
 
 #if __GLASGOW_HASKELL__
 import GHC.Exts ( build )
diff --git a/Data/BitUtil.hs b/Data/Utils/BitUtil.hs
similarity index 97%
rename from Data/BitUtil.hs
rename to Data/Utils/BitUtil.hs
index 848bac1..bea078e 100644
--- a/Data/BitUtil.hs
+++ b/Data/Utils/BitUtil.hs
@@ -7,7 +7,7 @@
 #endif
 -----------------------------------------------------------------------------
 -- |
--- Module      :  Data.BitUtil
+-- Module      :  Data.Utils.BitUtil
 -- Copyright   :  (c) Clark Gaebel 2012
 --                (c) Johan Tibel 2012
 -- License     :  BSD-style
@@ -16,7 +16,7 @@
 -- Portability :  portable
 -----------------------------------------------------------------------------
 
-module Data.BitUtil
+module Data.Utils.BitUtil
     ( highestBitMask
     , shiftLL
     , shiftRL
diff --git a/Data/StrictFold.hs b/Data/Utils/StrictFold.hs
similarity index 90%
rename from Data/StrictFold.hs
rename to Data/Utils/StrictFold.hs
index 9c90a66..953c9f1 100644
--- a/Data/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictFold (foldlStrict) where
+module Data.Utils.StrictFold (foldlStrict) where
 
 -- | Same as regular 'Data.List.foldl'', but marked INLINE so that it is always
 -- inlined. This allows further optimization of the call to f, which can be
diff --git a/Data/StrictPair.hs b/Data/Utils/StrictPair.hs
similarity index 77%
rename from Data/StrictPair.hs
rename to Data/Utils/StrictPair.hs
index 48609b3..6ae7ded 100644
--- a/Data/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -2,7 +2,7 @@
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
-module Data.StrictPair (StrictPair(..), toPair) where
+module Data.Utils.StrictPair (StrictPair(..), toPair) where
 
 -- | Same as regular Haskell pairs, but (x :*: _|_) = (_|_ :*: y) =
 -- _|_
diff --git a/containers.cabal b/containers.cabal
index a952a77..dcf36fd 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -52,13 +52,13 @@ Library
             Data.Sequence
             Data.Tree
     other-modules:
-        Data.BitUtil
         Data.IntMap.Base
         Data.IntSet.Base
         Data.Map.Base
         Data.Set.Base
-        Data.StrictFold
-        Data.StrictPair
+        Data.Utils.BitUtil
+        Data.Utils.StrictFold
+        Data.Utils.StrictPair
 
     include-dirs: include
 


From git at git.haskell.org  Sun Dec 20 16:20:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:49 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Fix subtle bug in binary search (46b3b9d)
Message-ID: <20151220162049.D01213A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/46b3b9d4b34e761aa6f75335c717742bc89d922d

>---------------------------------------------------------------

commit 46b3b9d4b34e761aa6f75335c717742bc89d922d
Author: Josh Acay <cacay at cmu.edu>
Date:   Tue Oct 14 14:42:17 2014 -0400

    Fix subtle bug in binary search


>---------------------------------------------------------------

46b3b9d4b34e761aa6f75335c717742bc89d922d
 Data/Graph.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index c5cdf4b..65f3fb1 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -244,7 +244,7 @@ graphFromEdges edges0
                                    EQ -> Just mid
                                    GT -> findVertex (mid+1) b
                               where
-                                mid = (a + b) `div` 2
+                                mid = a + (b - a) `div` 2
 
 -------------------------------------------------------------------------
 --                                                                      -


From git at git.haskell.org  Sun Dec 20 16:20:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:51 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #58 from cacay/master (828b60d)
Message-ID: <20151220162051.D75D43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/828b60d394418132eb86993bbde29538b066aed8

>---------------------------------------------------------------

commit 828b60d394418132eb86993bbde29538b066aed8
Merge: 9cfe43a 46b3b9d
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Oct 14 21:52:28 2014 +0200

    Merge pull request #58 from cacay/master
    
    Fix bug in binary search



>---------------------------------------------------------------

828b60d394418132eb86993bbde29538b066aed8
 Data/Graph.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:20:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:53 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Minor documentation fix. (864ebff)
Message-ID: <20151220162053.DF1503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/864ebff7995e7d4358475f8808f10329a832b78b

>---------------------------------------------------------------

commit 864ebff7995e7d4358475f8808f10329a832b78b
Author: strout <steve.trout at gmail.com>
Date:   Tue Oct 14 22:53:42 2014 -0500

    Minor documentation fix.
    
    Completed a sentence in maxView documentation.


>---------------------------------------------------------------

864ebff7995e7d4358475f8808f10329a832b78b
 Data/Map/Base.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index d1d8ffe..eafab03 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1171,6 +1171,7 @@ minView x   = Just (first snd $ deleteFindMin x)
 
 -- | /O(log n)/. Retrieves the value associated with maximal key of the
 -- map, and the map stripped of that element, or 'Nothing' if passed an
+-- empty map.
 --
 -- > maxView (fromList [(5,"a"), (3,"b")]) == Just ("a", singleton 3 "b")
 -- > maxView empty == Nothing


From git at git.haskell.org  Sun Dec 20 16:20:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:55 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #59 from strout/patch-1 (b9bd228)
Message-ID: <20151220162055.E6CB53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e

>---------------------------------------------------------------

commit b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e
Merge: 828b60d 864ebff
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Oct 15 08:48:37 2014 +0200

    Merge pull request #59 from strout/patch-1
    
    Minor documentation fix.



>---------------------------------------------------------------

b9bd228149bfb61fe9f87a6ca9858ce1df1aee9e
 Data/Map/Base.hs | 1 +
 1 file changed, 1 insertion(+)


From git at git.haskell.org  Sun Dec 20 16:20:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:20:57 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Define some new Foldable methods for containers (61b9066)
Message-ID: <20151220162057.F15053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/61b9066d79ac346743dfe56425307e27e2e5d060

>---------------------------------------------------------------

commit 61b9066d79ac346743dfe56425307e27e2e5d060
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Oct 14 20:25:29 2014 +0200

    Define some new Foldable methods for containers
    
    This is a first attempt at addressing #56


>---------------------------------------------------------------

61b9066d79ac346743dfe56425307e27e2e5d060
 Data/IntMap/Base.hs | 15 +++++++++++++++
 Data/Map/Base.hs    | 15 +++++++++++++++
 Data/Sequence.hs    |  7 +++++++
 Data/Set/Base.hs    | 20 ++++++++++++++++++++
 Data/Tree.hs        |  7 +++++++
 5 files changed, 64 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index fec5abe..0de3e5b 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -320,6 +320,21 @@ instance Foldable.Foldable IntMap where
           go (Bin _ _ l r) = go l `mappend` go r
   {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+  foldl' = foldl'
+  {-# INLINE foldl' #-}
+  foldr' = foldr'
+  {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+  length = size
+  {-# INLINE length #-}
+  null   = null
+  {-# INLINE null #-}
+  toList = elems -- NB: Foldable.toList /= IntMap.toList
+  {-# INLINE toList #-}
+#endif
+
 instance Traversable IntMap where
     traverse f = traverseWithKey (\_ -> f)
     {-# INLINE traverse #-}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index d1d8ffe..d01367b 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2653,6 +2653,21 @@ instance Foldable.Foldable (Map k) where
           go (Bin _ _ v l r) = go l `mappend` (f v `mappend` go r)
   {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+  foldl' = foldl'
+  {-# INLINE foldl' #-}
+  foldr' = foldr'
+  {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+  length = size
+  {-# INLINE length #-}
+  null   = null
+  {-# INLINE null #-}
+  toList = elems -- NB: Foldable.toList /= Map.toList
+  {-# INLINE toList #-}
+#endif
+
 instance (NFData k, NFData a) => NFData (Map k a) where
     rnf Tip = ()
     rnf (Bin _ kx x l r) = rnf kx `seq` rnf x `seq` rnf l `seq` rnf r
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 6bbebdb..f1385f5 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -189,6 +189,13 @@ instance Foldable Seq where
     foldl1 f (Seq xs) = getElem (foldl1 f' xs)
       where f' (Elem x) (Elem y) = Elem (f x y)
 
+#if MIN_VERSION_base(4,8,0)
+    length = length
+    {-# INLINE length #-}
+    null   = null
+    {-# INLINE null #-}
+#endif
+
 instance Traversable Seq where
     traverse f (Seq xs) = Seq <$> traverse (traverse f) xs
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 6c39a8e..9260aeb 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -262,6 +262,26 @@ instance Foldable.Foldable Set where
             go (Bin _ k l r) = go l `mappend` (f k `mappend` go r)
     {-# INLINE foldMap #-}
 
+#if MIN_VERSION_base(4,6,0)
+    foldl' = foldl'
+    {-# INLINE foldl' #-}
+    foldr' = foldr'
+    {-# INLINE foldr' #-}
+#endif
+#if MIN_VERSION_base(4,8,0)
+    length = size
+    {-# INLINE length #-}
+    null   = null
+    {-# INLINE null #-}
+    toList = toList
+    {-# INLINE toList #-}
+    minimum = findMin
+    {-# INLINE minimum #-}
+    maximum = findMax
+    {-# INLINE maximum #-}
+#endif
+
+
 #if __GLASGOW_HASKELL__
 
 {--------------------------------------------------------------------
diff --git a/Data/Tree.hs b/Data/Tree.hs
index dab25c2..2f18c68 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -79,6 +79,13 @@ instance Traversable Tree where
 instance Foldable Tree where
     foldMap f (Node x ts) = f x `mappend` foldMap (foldMap f) ts
 
+#if MIN_VERSION_base(4,8,0)
+    null _ = False
+    {-# INLINE null #-}
+    toList = flatten
+    {-# INLINE toList #-}
+#endif
+
 instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 


From git at git.haskell.org  Sun Dec 20 16:21:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:00 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Replace `MIN_VERSION_base_4_[57]_0` by `MIN_VERSION_base()`
 (3582252)
Message-ID: <20151220162100.059F83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3582252bda944421c0a38c86684657e59dbe81be

>---------------------------------------------------------------

commit 3582252bda944421c0a38c86684657e59dbe81be
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Oct 16 22:35:13 2014 +0200

    Replace `MIN_VERSION_base_4_[57]_0` by `MIN_VERSION_base()`


>---------------------------------------------------------------

3582252bda944421c0a38c86684657e59dbe81be
 Data/IntSet/Base.hs | 24 ++----------------------
 1 file changed, 2 insertions(+), 22 deletions(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 309ab42..c8e70f6 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -162,26 +162,6 @@ module Data.IntSet.Base (
     , bitmapOf
     ) where
 
--- We want to be able to compile without cabal. Nevertheless
--- #if defined(MIN_VERSION_base) && MIN_VERSION_base(4,5,0)
--- does not work, because if MIN_VERSION_base is undefined,
--- the last condition is syntactically wrong.
-#define MIN_VERSION_base_4_5_0 0
-#ifdef MIN_VERSION_base
-#if MIN_VERSION_base(4,5,0)
-#undef MIN_VERSION_base_4_5_0
-#define MIN_VERSION_base_4_5_0 1
-#endif
-#endif
-
-#define MIN_VERSION_base_4_7_0 0
-#ifdef MIN_VERSION_base
-#if MIN_VERSION_base(4,7,0)
-#undef MIN_VERSION_base_4_7_0
-#define MIN_VERSION_base_4_7_0 1
-#endif
-#endif
-
 import Control.DeepSeq (NFData)
 import Data.Bits
 import qualified Data.List as List
@@ -1228,7 +1208,7 @@ tip kx bm = Tip kx bm
 ----------------------------------------------------------------------}
 
 suffixBitMask :: Int
-#if MIN_VERSION_base_4_7_0
+#if MIN_VERSION_base(4,7,0)
 suffixBitMask = finiteBitSize (undefined::Word) - 1
 #else
 suffixBitMask = bitSize (undefined::Word) - 1
@@ -1479,7 +1459,7 @@ foldr'Bits prefix f z bm = let lb = lowestBitSet bm
 ----------------------------------------------------------------------}
 
 bitcount :: Int -> Word -> Int
-#if MIN_VERSION_base_4_5_0
+#if MIN_VERSION_base(4,5,0)
 bitcount a x = a + popCount x
 #else
 bitcount a0 x0 = go a0 x0


From git at git.haskell.org  Sun Dec 20 16:21:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:02 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #57 from hvr/pr-foldable (daf640e)
Message-ID: <20151220162102.10CFC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/daf640ec6c0c189a6c570a1dff4e958e2fa8d697

>---------------------------------------------------------------

commit daf640ec6c0c189a6c570a1dff4e958e2fa8d697
Merge: b9bd228 3582252
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:24:41 2014 +0200

    Merge pull request #57 from hvr/pr-foldable
    
    Define some new Foldable methods for containers



>---------------------------------------------------------------

daf640ec6c0c189a6c570a1dff4e958e2fa8d697
 Data/IntMap/Base.hs | 15 +++++++++++++++
 Data/IntSet/Base.hs | 24 ++----------------------
 Data/Map/Base.hs    | 15 +++++++++++++++
 Data/Sequence.hs    |  7 +++++++
 Data/Set/Base.hs    | 20 ++++++++++++++++++++
 Data/Tree.hs        |  7 +++++++
 6 files changed, 66 insertions(+), 22 deletions(-)



From git at git.haskell.org  Sun Dec 20 16:21:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:04 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Provide default MIN_VERSION_base if not available. (0762786)
Message-ID: <20151220162104.1D0C43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/076278627b6b3fda9522a9ca971f2467947527d6

>---------------------------------------------------------------

commit 076278627b6b3fda9522a9ca971f2467947527d6
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:43:09 2014 +0200

    Provide default MIN_VERSION_base if not available.
    
    After #56, we use MIN_VERSION_base in many places. We now provide
    trivial MIN_VERSION_base if not available to allow compiling without
    cabal.


>---------------------------------------------------------------

076278627b6b3fda9522a9ca971f2467947527d6
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 8 ++++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Sequence.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 Data/Tree.hs        | 8 ++++++++
 6 files changed, 48 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 0de3e5b..8f2e32f 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -247,6 +247,14 @@ import Text.Read
 -- want the compilers to be compiled by as many compilers as possible.
 #define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 -- A "Nat" is a natural machine word (an unsigned Int)
 type Nat = Word
 
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c8e70f6..b6f8014 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -202,6 +202,14 @@ import GHC.Prim (indexInt8OffAddr#)
 #define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_3(fn) fn _ arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 infixl 9 \\{-This comment teaches CPP correct behaviour -}
 
 -- A "Nat" is a natural machine word (an unsigned Int)
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 72934e9..edcfdb7 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -299,6 +299,14 @@ import Data.Data
 #define STRICT_1_OF_4(fn) fn arg _ _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_4(fn) fn _ arg _ _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f1385f5..a2b4844 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -160,6 +160,14 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
 import Data.Data
 #endif
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 infixr 5 `consTree`
 infixl 5 `snocTree`
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 9260aeb..e676a6f 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -214,6 +214,14 @@ import Data.Data
 #define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
 #define STRICT_2_OF_3(fn) fn _ arg _ | arg `seq` False = undefined
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 {--------------------------------------------------------------------
   Operators
 --------------------------------------------------------------------}
diff --git a/Data/Tree.hs b/Data/Tree.hs
index 2f18c68..c880213 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -45,6 +45,14 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Data (Data)
 #endif
 
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
+
 -- | Multi-way trees, also known as /rose trees/.
 data Tree a = Node {
         rootLabel :: a,         -- ^ label value


From git at git.haskell.org  Sun Dec 20 16:21:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:06 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Remove RoleAnnotations extension from containers.cabal. (1d555a4)
Message-ID: <20151220162106.24DC23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1d555a4d7d2b902808d73c2fad4314672241e81d

>---------------------------------------------------------------

commit 1d555a4d7d2b902808d73c2fad4314672241e81d
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 10:46:13 2014 +0200

    Remove RoleAnnotations extension from containers.cabal.
    
    We switch the language extensions in specific files. We only provide
    extensions for GHC pre 7.0, as it cannot enable extensions
    conditionally using CPP.


>---------------------------------------------------------------

1d555a4d7d2b902808d73c2fad4314672241e81d
 containers.cabal | 2 --
 1 file changed, 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index dcf36fd..815882e 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -64,8 +64,6 @@ Library
 
     if impl(ghc<7.0)
         extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
-    if impl(ghc >= 7.8)
-        extensions: RoleAnnotations
 
 -------------------
 -- T E S T I N G --


From git at git.haskell.org  Sun Dec 20 16:21:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:08 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Make Foldable.fold be INLINABLE without an argument. (398e466)
Message-ID: <20151220162108.2E0353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/398e46672e498f83f28733f3a7a188651e9576b8

>---------------------------------------------------------------

commit 398e46672e498f83f28733f3a7a188651e9576b8
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 14:07:13 2014 +0200

    Make Foldable.fold be INLINABLE without an argument.


>---------------------------------------------------------------

398e46672e498f83f28733f3a7a188651e9576b8
 Data/IntMap/Base.hs | 2 +-
 Data/Map/Base.hs    | 2 +-
 Data/Set/Base.hs    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 8f2e32f..c1b2f4d 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -313,7 +313,7 @@ instance Monoid (IntMap a) where
     mconcat = unions
 
 instance Foldable.Foldable IntMap where
-  fold t = go t
+  fold = go
     where go Nil = mempty
           go (Tip _ v) = v
           go (Bin _ _ l r) = go l `mappend` go r
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index edcfdb7..781ac3a 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2647,7 +2647,7 @@ instance Traversable (Map k) where
   {-# INLINE traverse #-}
 
 instance Foldable.Foldable (Map k) where
-  fold t = go t
+  fold = go
     where go Tip = mempty
           go (Bin 1 _ v _ _) = v
           go (Bin _ _ v l r) = go l `mappend` (v `mappend` go r)
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index e676a6f..67ade4e 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -255,7 +255,7 @@ instance Ord a => Monoid (Set a) where
     mconcat = unions
 
 instance Foldable.Foldable Set where
-    fold t = go t
+    fold = go
       where go Tip = mempty
             go (Bin 1 k _ _) = k
             go (Bin _ k l r) = go l `mappend` (k `mappend` go r)


From git at git.haskell.org  Sun Dec 20 16:21:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:10 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add Foldable.{elem, maximum, minimum, sum,
 product} specializations. (530fc76)
Message-ID: <20151220162110.37F313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/530fc76bdd17089fcaaa655d66156abbc2092c2c

>---------------------------------------------------------------

commit 530fc76bdd17089fcaaa655d66156abbc2092c2c
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Oct 19 14:07:42 2014 +0200

    Add Foldable.{elem,maximum,minimum,sum,product} specializations.
    
    Following #56, add specializations for other base-4.8 Foldable methods,
    using strict folds and shortcircuiting.
    
    The Set.elem uses only Eq a, so it runs in linear time.


>---------------------------------------------------------------

530fc76bdd17089fcaaa655d66156abbc2092c2c
 Data/IntMap/Base.hs | 30 ++++++++++++++++++++++++++++++
 Data/Map/Base.hs    | 25 +++++++++++++++++++++++++
 Data/Set/Base.hs    |  9 +++++++++
 3 files changed, 64 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index c1b2f4d..007e41e 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -341,6 +341,36 @@ instance Foldable.Foldable IntMap where
   {-# INLINE null #-}
   toList = elems -- NB: Foldable.toList /= IntMap.toList
   {-# INLINE toList #-}
+  elem = go
+    where STRICT_1_OF_2(go)
+          go _ Nil = False
+          go x (Tip _ y) = x == y
+          go x (Bin _ _ l r) = go x l || go x r
+  {-# INLINABLE elem #-}
+  maximum = start
+    where start Nil = error "IntMap.Foldable.maximum: called with empty map"
+          start (Tip _ y) = y
+          start (Bin _ _ l r) = go (start l) r
+
+          STRICT_1_OF_2(go)
+          go m Nil = m
+          go m (Tip _ y) = max m y
+          go m (Bin _ _ l r) = go (go m l) r
+  {-# INLINABLE maximum #-}
+  minimum = start
+    where start Nil = error "IntMap.Foldable.minimum: called with empty map"
+          start (Tip _ y) = y
+          start (Bin _ _ l r) = go (start l) r
+
+          STRICT_1_OF_2(go)
+          go m Nil = m
+          go m (Tip _ y) = min m y
+          go m (Bin _ _ l r) = go (go m l) r
+  {-# INLINABLE minimum #-}
+  sum = foldl' (+) 0
+  {-# INLINABLE sum #-}
+  product = foldl' (*) 1
+  {-# INLINABLE product #-}
 #endif
 
 instance Traversable IntMap where
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 781ac3a..de074f4 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -2675,6 +2675,31 @@ instance Foldable.Foldable (Map k) where
   {-# INLINE null #-}
   toList = elems -- NB: Foldable.toList /= Map.toList
   {-# INLINE toList #-}
+  elem = go
+    where STRICT_1_OF_2(go)
+          go _ Tip = False
+          go x (Bin _ _ v l r) = x == v || go x l || go x r
+  {-# INLINABLE elem #-}
+  maximum = start
+    where start Tip = error "Map.Foldable.maximum: called with empty map"
+          start (Bin _ _ v l r) = go (go v l) r
+
+          STRICT_1_OF_2(go)
+          go m Tip = m
+          go m (Bin _ _ v l r) = go (go (max m v) l) r
+  {-# INLINABLE maximum #-}
+  minimum = start
+    where start Tip = error "Map.Foldable.minumum: called with empty map"
+          start (Bin _ _ v l r) = go (go v l) r
+
+          STRICT_1_OF_2(go)
+          go m Tip = m
+          go m (Bin _ _ v l r) = go (go (min m v) l) r
+  {-# INLINABLE minimum #-}
+  sum = foldl' (+) 0
+  {-# INLINABLE sum #-}
+  product = foldl' (*) 1
+  {-# INLINABLE product #-}
 #endif
 
 instance (NFData k, NFData a) => NFData (Map k a) where
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 67ade4e..7e792f4 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -283,10 +283,19 @@ instance Foldable.Foldable Set where
     {-# INLINE null #-}
     toList = toList
     {-# INLINE toList #-}
+    elem = go
+      where STRICT_1_OF_2(go)
+            go _ Tip = False
+            go x (Bin _ y l r) = x == y || go x l || go x r
+    {-# INLINABLE elem #-}
     minimum = findMin
     {-# INLINE minimum #-}
     maximum = findMax
     {-# INLINE maximum #-}
+    sum = foldl' (+) 0
+    {-# INLINABLE sum #-}
+    product = foldl' (*) 1
+    {-# INLINABLE product #-}
 #endif
 
 


From git at git.haskell.org  Sun Dec 20 16:21:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:12 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Force prefix and suffix before middle (7dfdc33)
Message-ID: <20151220162112.40CF43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7dfdc33f8cc740036cee5a5e94c5603722d6fd02

>---------------------------------------------------------------

commit 7dfdc33f8cc740036cee5a5e94c5603722d6fd02
Author: treeowl <David.Feuer at gmail.com>
Date:   Sat Nov 8 22:08:19 2014 -0500

    Force prefix and suffix before middle
    
    This should be slightly more efficient. Probably very slightly, but there doesn't seem to be a good reason not to.


>---------------------------------------------------------------

7dfdc33f8cc740036cee5a5e94c5603722d6fd02
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index a2b4844..1952b1c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -346,7 +346,7 @@ instance Traversable FingerTree where
 instance NFData a => NFData (FingerTree a) where
     rnf (Empty) = ()
     rnf (Single x) = rnf x
-    rnf (Deep _ pr m sf) = rnf pr `seq` rnf m `seq` rnf sf
+    rnf (Deep _ pr m sf) = rnf pr `seq` rnf sf `seq` rnf m
 
 {-# INLINE deep #-}
 deep            :: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> FingerTree a


From git at git.haskell.org  Sun Dec 20 16:21:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:14 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #61 from treeowl/master (f9c23af)
Message-ID: <20151220162114.474373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f9c23af0c7396aaf457ce9916392c7f949b60384

>---------------------------------------------------------------

commit f9c23af0c7396aaf457ce9916392c7f949b60384
Merge: 530fc76 7dfdc33
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 9 07:11:13 2014 +0100

    Merge pull request #61 from treeowl/master
    
    Force prefix and suffix before middle



>---------------------------------------------------------------

f9c23af0c7396aaf457ce9916392c7f949b60384
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:21:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:16 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Tighten Safe Haskell bounds,
 fixes new warning in GHC 7.10. (245ef13)
Message-ID: <20151220162116.4EA583A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/245ef135eb8701fcd139770e564f25e774d26422

>---------------------------------------------------------------

commit 245ef135eb8701fcd139770e564f25e774d26422
Author: David Terei <code at davidterei.com>
Date:   Wed Nov 12 18:19:51 2014 -0800

    Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.


>---------------------------------------------------------------

245ef135eb8701fcd139770e564f25e774d26422
 Data/IntMap.hs           | 2 +-
 Data/IntMap/Lazy.hs      | 2 +-
 Data/IntMap/Strict.hs    | 4 +++-
 Data/Utils/StrictFold.hs | 2 +-
 Data/Utils/StrictPair.hs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/Data/IntMap.hs b/Data/IntMap.hs
index 29ca3f5..52b05c2 100644
--- a/Data/IntMap.hs
+++ b/Data/IntMap.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Lazy.hs b/Data/IntMap/Lazy.hs
index ab89e1a..62bf835 100644
--- a/Data/IntMap/Lazy.hs
+++ b/Data/IntMap/Lazy.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 -----------------------------------------------------------------------------
 -- |
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 3a7dde8..f1c363c 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -1,5 +1,7 @@
 {-# LANGUAGE CPP #-}
-#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 709
+{-# LANGUAGE Safe #-}
+#elif !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
 -----------------------------------------------------------------------------
diff --git a/Data/Utils/StrictFold.hs b/Data/Utils/StrictFold.hs
index 953c9f1..b080e8a 100644
--- a/Data/Utils/StrictFold.hs
+++ b/Data/Utils/StrictFold.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictFold (foldlStrict) where
 
diff --git a/Data/Utils/StrictPair.hs b/Data/Utils/StrictPair.hs
index 6ae7ded..0c01ca4 100644
--- a/Data/Utils/StrictPair.hs
+++ b/Data/Utils/StrictPair.hs
@@ -1,6 +1,6 @@
 {-# LANGUAGE CPP #-}
 #if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
-{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE Safe #-}
 #endif
 module Data.Utils.StrictPair (StrictPair(..), toPair) where
 


From git at git.haskell.org  Sun Dec 20 16:21:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:18 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add support for `deepseq-1.4` (667cf94)
Message-ID: <20151220162118.567883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/667cf94c6826738429485b806354d1e92136ba56

>---------------------------------------------------------------

commit 667cf94c6826738429485b806354d1e92136ba56
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Fri Nov 14 16:09:27 2014 +0100

    Add support for `deepseq-1.4`
    
    This change avoids relying on `rnf`'s default method implementation
    which has changed in `deepseq-1.4.0.0`


>---------------------------------------------------------------

667cf94c6826738429485b806354d1e92136ba56
 Data/IntSet/Base.hs |  4 ++--
 containers.cabal    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index b6f8014..6333eea 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -162,7 +162,7 @@ module Data.IntSet.Base (
     , bitmapOf
     ) where
 
-import Control.DeepSeq (NFData)
+import Control.DeepSeq (NFData(rnf))
 import Data.Bits
 import qualified Data.List as List
 import Data.Maybe (fromMaybe)
@@ -1099,7 +1099,7 @@ INSTANCE_TYPEABLE0(IntSet,intSetTc,"IntSet")
 -- The IntSet constructors consist only of strict fields of Ints and
 -- IntSets, thus the default NFData instance which evaluates to whnf
 -- should suffice
-instance NFData IntSet
+instance NFData IntSet where rnf x = seq x ()
 
 {--------------------------------------------------------------------
   Debugging
diff --git a/containers.cabal b/containers.cabal
index 815882e..050257c 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -31,7 +31,7 @@ source-repository head
     location: http://github.com/haskell/containers.git
 
 Library
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5
     if impl(ghc>=6.10)
         build-depends: ghc-prim
 
@@ -83,7 +83,7 @@ Test-suite map-lazy-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -100,7 +100,7 @@ Test-suite map-strict-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING -DSTRICT
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -117,7 +117,7 @@ Test-suite set-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -134,7 +134,7 @@ Test-suite intmap-lazy-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -151,7 +151,7 @@ Test-suite intmap-strict-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING -DSTRICT
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -168,7 +168,7 @@ Test-suite intset-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -185,7 +185,7 @@ Test-suite deprecated-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -200,7 +200,7 @@ Test-suite seq-properties
     type: exitcode-stdio-1.0
     cpp-options: -DTESTING
 
-    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.4, ghc-prim
+    build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
@@ -218,7 +218,7 @@ test-suite map-strictness-properties
     array,
     base >= 4.2 && < 5,
     ChasingBottoms,
-    deepseq >= 1.2 && < 1.4,
+    deepseq >= 1.2 && < 1.5,
     QuickCheck >= 2.4.0.1,
     ghc-prim,
     test-framework >= 0.3.3,
@@ -235,7 +235,7 @@ test-suite intmap-strictness-properties
     array,
     base >= 4.2 && < 5,
     ChasingBottoms,
-    deepseq >= 1.2 && < 1.4,
+    deepseq >= 1.2 && < 1.5,
     QuickCheck >= 2.4.0.1,
     ghc-prim,
     test-framework >= 0.3.3,


From git at git.haskell.org  Sun Dec 20 16:21:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:20 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #65 from dterei/safe710fixes (09ae752)
Message-ID: <20151220162120.5D90A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/09ae752eeffd06e24ffb4abeabcd6511dea0e68e

>---------------------------------------------------------------

commit 09ae752eeffd06e24ffb4abeabcd6511dea0e68e
Merge: f9c23af 245ef13
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 14 16:15:41 2014 +0100

    Merge pull request #65 from dterei/safe710fixes
    
    Tighten Safe Haskell bounds, fixes new warning in GHC 7.10.



>---------------------------------------------------------------

09ae752eeffd06e24ffb4abeabcd6511dea0e68e
 Data/IntMap.hs           | 2 +-
 Data/IntMap/Lazy.hs      | 2 +-
 Data/IntMap/Strict.hs    | 4 +++-
 Data/Utils/StrictFold.hs | 2 +-
 Data/Utils/StrictPair.hs | 2 +-
 5 files changed, 7 insertions(+), 5 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:22 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #67 from hvr/pr-deepseq-14 (c802c36)
Message-ID: <20151220162122.659D23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c802c36dbed4b800d8c2131181f5af3db837aded

>---------------------------------------------------------------

commit c802c36dbed4b800d8c2131181f5af3db837aded
Merge: 09ae752 667cf94
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 14 16:27:16 2014 +0100

    Merge pull request #67 from hvr/pr-deepseq-14
    
    Add support for `deepseq-1.4`



>---------------------------------------------------------------

c802c36dbed4b800d8c2131181f5af3db837aded
 Data/IntSet/Base.hs |  4 ++--
 containers.cabal    | 22 +++++++++++-----------
 2 files changed, 13 insertions(+), 13 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:24 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Improve Foldable methods (c4884ad)
Message-ID: <20151220162124.6C7CC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c4884ad0d7310e62c48ebd23600d73230718ae45

>---------------------------------------------------------------

commit c4884ad0d7310e62c48ebd23600d73230718ae45
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Nov 17 17:48:10 2014 -0500

    Improve Foldable methods
    
    Define foldMap for Seq directly, instead of relying on the default
    based on foldr.
    
    Define length and null for ViewR directly, instead of relying on
    (inappropriate) defaults.


>---------------------------------------------------------------

c4884ad0d7310e62c48ebd23600d73230718ae45
 Data/Sequence.hs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1952b1c..0c2be04 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -149,7 +149,7 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), foldl', toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
 import Data.Traversable
 import Data.Typeable
 
@@ -188,6 +188,7 @@ instance Functor Seq where
 #endif
 
 instance Foldable Seq where
+    foldMap f (Seq xs) = foldMap (foldMap f) xs
     foldr f z (Seq xs) = foldr (flip (foldr f)) z xs
     foldl f z (Seq xs) = foldl (foldl f) z xs
 
@@ -310,6 +311,11 @@ instance Sized a => Sized (FingerTree a) where
     size (Deep v _ _ _)     = v
 
 instance Foldable FingerTree where
+    foldMap _ Empty = mempty
+    foldMap f (Single x) = f x
+    foldMap f (Deep _ pr m sf) =
+        foldMap f pr `mappend` (foldMap (foldMap f) m `mappend` foldMap f sf)
+
     foldr _ z Empty = z
     foldr f z (Single x) = x `f` z
     foldr f z (Deep _ pr m sf) =
@@ -388,6 +394,11 @@ data Digit a
 #endif
 
 instance Foldable Digit where
+    foldMap f (One a) = f a
+    foldMap f (Two a b) = f a `mappend` f b
+    foldMap f (Three a b c) = f a `mappend` (f b `mappend` f c)
+    foldMap f (Four a b c d) = f a `mappend` (f b `mappend` (f c `mappend` f d))
+
     foldr f z (One a) = a `f` z
     foldr f z (Two a b) = a `f` (b `f` z)
     foldr f z (Three a b c) = a `f` (b `f` (c `f` z))
@@ -458,6 +469,9 @@ data Node a
 #endif
 
 instance Foldable Node where
+    foldMap f (Node2 _ a b) = f a `mappend` f b
+    foldMap f (Node3 _ a b c) = f a `mappend` (f b `mappend` f c)
+
     foldr f z (Node2 _ a b) = a `f` (b `f` z)
     foldr f z (Node3 _ a b c) = a `f` (b `f` (c `f` z))
 
@@ -508,6 +522,7 @@ instance Functor Elem where
     fmap f (Elem x) = Elem (f x)
 
 instance Foldable Elem where
+    foldMap f (Elem x) = f x
     foldr f z (Elem x) = f x z
     foldl f z (Elem x) = f z x
 
@@ -1009,6 +1024,9 @@ instance Functor ViewR where
     fmap f (xs :> x)    = fmap f xs :> f x
 
 instance Foldable ViewR where
+    foldMap _ EmptyR = mempty
+    foldMap f (xs :> x) = foldMap f xs `mappend` f x
+
     foldr _ z EmptyR = z
     foldr f z (xs :> x) = foldr f (f x z) xs
 
@@ -1017,6 +1035,14 @@ instance Foldable ViewR where
 
     foldr1 _ EmptyR = error "foldr1: empty view"
     foldr1 f (xs :> x) = foldr f x xs
+#if MIN_VERSION_base(4,8,0)
+    -- The default definitions are sensible for ViewL, but not so much for
+    -- ViewR.
+    null EmptyR = True
+    null (_ :> _) = False
+
+    length = foldr' (\_ k -> k+1) 0
+#endif
 
 instance Traversable ViewR where
     traverse _ EmptyR       = pure EmptyR


From git at git.haskell.org  Sun Dec 20 16:21:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:26 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #68 from treeowl/foldmapseq (94fa013)
Message-ID: <20151220162126.74B603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/94fa01318f3a575eb3045956415827b582ac9fb8

>---------------------------------------------------------------

commit 94fa01318f3a575eb3045956415827b582ac9fb8
Merge: c802c36 c4884ad
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 10:31:01 2014 +0100

    Merge pull request #68 from treeowl/foldmapseq
    
    Improve Foldable methods



>---------------------------------------------------------------

94fa01318f3a575eb3045956415827b582ac9fb8
 Data/Sequence.hs | 28 +++++++++++++++++++++++++++-
 1 file changed, 27 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:21:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:28 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Implement fmap/coerce rules (ad24ce6)
Message-ID: <20151220162128.810453A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88

>---------------------------------------------------------------

commit ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Nov 13 00:16:28 2014 -0500

    Implement fmap/coerce rules
    
    Implement fmap/coerce rules for Map, Sequence, and Tree. One concern:
    unfortunately, implementing the RULES forces the LANGUAGE to be turned
    from Safe to Trustworthy.  This is rather sad. An alternative would be
    to do this in another module, but orphan rules are not so lovely either.


>---------------------------------------------------------------

ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88
 Data/Map/Base.hs               | 24 +++++++++++++++++-------
 Data/Map/Strict.hs             | 19 ++++++++++++++++++-
 Data/Sequence.hs               | 27 ++++++++++++++++++++-------
 Data/Tree.hs                   | 29 ++++++++++++++++++++++-------
 tests-ghc/all.T                |  3 +++
 tests-ghc/mapcoercemap.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercemap.stdout  |  3 +++
 tests-ghc/mapcoerceseq.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoerceseq.stdout  |  3 +++
 tests-ghc/mapcoercesmap.hs     | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercesmap.stdout |  3 +++
 11 files changed, 164 insertions(+), 22 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ad24ce6e10d2a0168dcb4d68765b4a25ae22ad88

From git at git.haskell.org  Sun Dec 20 16:21:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:30 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #66 from treeowl/seqfmapcoerce (e083f68)
Message-ID: <20151220162130.8BB753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e083f683d833d6ffd98b7b91f27c1e10a2cded97

>---------------------------------------------------------------

commit e083f683d833d6ffd98b7b91f27c1e10a2cded97
Merge: 94fa013 ad24ce6
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 14:50:46 2014 +0100

    Merge pull request #66 from treeowl/seqfmapcoerce
    
    Implement fmap/coerce rules



>---------------------------------------------------------------

e083f683d833d6ffd98b7b91f27c1e10a2cded97
 Data/Map/Base.hs               | 24 +++++++++++++++++-------
 Data/Map/Strict.hs             | 19 ++++++++++++++++++-
 Data/Sequence.hs               | 27 ++++++++++++++++++++-------
 Data/Tree.hs                   | 29 ++++++++++++++++++++++-------
 tests-ghc/all.T                |  3 +++
 tests-ghc/mapcoercemap.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercemap.stdout  |  3 +++
 tests-ghc/mapcoerceseq.hs      | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoerceseq.stdout  |  3 +++
 tests-ghc/mapcoercesmap.hs     | 25 +++++++++++++++++++++++++
 tests-ghc/mapcoercesmap.stdout |  3 +++
 11 files changed, 164 insertions(+), 22 deletions(-)

diff --cc Data/Sequence.hs
index 0c2be04,0bef765..1c4e143
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@@ -187,8 -189,18 +189,19 @@@ instance Functor Seq wher
      x <$ s = replicate (length s) x
  #endif
  
+ fmapSeq :: (a -> b) -> Seq a -> Seq b
+ fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
+ #if MIN_VERSION_base(4,8,0)
+ -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
+ -- well enough with RULES to do what we want.
+ {-# NOINLINE [1] fmapSeq #-}
+ {-# RULES
+ "fmapSeq/coerce" fmapSeq coerce = coerce
+  #-}
+ #endif
+ 
  instance Foldable Seq where
 +    foldMap f (Seq xs) = foldMap (foldMap f) xs
      foldr f z (Seq xs) = foldr (flip (foldr f)) z xs
      foldl f z (Seq xs) = foldl (foldl f) z xs
  


From git at git.haskell.org  Sun Dec 20 16:21:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:32 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add fmap/fmap rules (352c73d)
Message-ID: <20151220162132.97C993A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/352c73dca04572fc843417518b9f5dd684c1792c

>---------------------------------------------------------------

commit 352c73dca04572fc843417518b9f5dd684c1792c
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Nov 18 09:41:29 2014 -0500

    Add fmap/fmap rules
    
    Specifically, fuse map, mapWithIndex, mapWithKey, etc., with each
    other.


>---------------------------------------------------------------

352c73dca04572fc843417518b9f5dd684c1792c
 Data/IntMap/Base.hs   | 19 +++++++++++++++++++
 Data/IntMap/Strict.hs | 19 +++++++++++++++++++
 Data/Map/Base.hs      | 19 ++++++++++++++++++-
 Data/Map/Strict.hs    | 24 +++++++++++++++++++++---
 Data/Sequence.hs      | 19 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 5 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 007e41e..3832e1c 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -1301,6 +1301,13 @@ map f t
       Tip k x     -> Tip k (f x)
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
+
 -- | /O(n)/. Map a function over all values in the map.
 --
 -- > let f key x = (show key) ++ ":" ++ x
@@ -1313,6 +1320,18 @@ mapWithKey f t
       Tip k x     -> Tip k (f k x)
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/.
 -- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index f1c363c..af44b2a 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -718,6 +718,13 @@ map f t
       Tip k x     -> Tip k $! f x
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
+
 -- | /O(n)/. Map a function over all values in the map.
 --
 -- > let f key x = (show key) ++ ":" ++ x
@@ -730,6 +737,18 @@ mapWithKey f t
       Tip k x     -> Tip k $! f k x
       Nil         -> Nil
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/. The function @'mapAccum'@ threads an accumulating
 -- argument through the map in ascending order of keys.
 --
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 89b851e..3911125 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1662,10 +1662,15 @@ mapEitherWithKey f0 t0 = toPair $ go f0 t0
 map :: (a -> b) -> Map k a -> Map k b
 map _ Tip = Tip
 map f (Bin sx kx x l r) = Bin sx kx (f x) (map f l) (map f r)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] map #-}
 {-# RULES
 "map/coerce" map coerce = coerce
  #-}
@@ -1680,6 +1685,18 @@ mapWithKey :: (k -> a -> b) -> Map k a -> Map k b
 mapWithKey _ Tip = Tip
 mapWithKey f (Bin sx kx x l r) = Bin sx kx (f kx x) (mapWithKey f l) (mapWithKey f r)
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- | /O(n)/.
 -- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 8c7ea0f..6255e91 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -935,10 +935,15 @@ mapEitherWithKey f0 t0 = toPair $ go f0 t0
 map :: (a -> b) -> Map k a -> Map k b
 map _ Tip = Tip
 map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f r)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] map #-}
+{-# RULES
+"map/map" forall f g xs . map f (map g xs) = map (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] map #-}
 {-# RULES
 "mapSeq/coerce" map coerce = coerce
  #-}
@@ -951,8 +956,21 @@ map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f
 
 mapWithKey :: (k -> a -> b) -> Map k a -> Map k b
 mapWithKey _ Tip = Tip
-mapWithKey f (Bin sx kx x l r) = let x' = f kx x
-                                 in x' `seq` Bin sx kx x' (mapWithKey f l) (mapWithKey f r)
+mapWithKey f (Bin sx kx x l r) =
+  let x' = f kx x
+  in x' `seq` Bin sx kx x' (mapWithKey f l) (mapWithKey f r)
+
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithKey #-}
+{-# RULES
+"mapWithKey/mapWithKey" forall f g xs . mapWithKey f (mapWithKey g xs) =
+  mapWithKey (\k a -> f k (g k a)) xs
+"mapWithKey/map" forall f g xs . mapWithKey f (map g xs) =
+  mapWithKey (\k a -> f k (g a)) xs
+"map/mapWithKey" forall f g xs . map f (mapWithKey g xs) =
+  mapWithKey (\k a -> f (g k a)) xs
+ #-}
+#endif
 
 -- | /O(n)/. The function 'mapAccum' threads an accumulating
 -- argument through the map in ascending order of keys.
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1c4e143..fe59172 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -191,10 +191,15 @@ instance Functor Seq where
 
 fmapSeq :: (a -> b) -> Seq a -> Seq b
 fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] fmapSeq #-}
+{-# RULES
+"fmapSeq/fmapSeq" forall f g xs . fmapSeq f (fmapSeq g xs) = fmapSeq (f . g) xs
+ #-}
+#endif
 #if MIN_VERSION_base(4,8,0)
 -- Safe coercions were introduced in 4.7.0, but I am not sure if they played
 -- well enough with RULES to do what we want.
-{-# NOINLINE [1] fmapSeq #-}
 {-# RULES
 "fmapSeq/coerce" fmapSeq coerce = coerce
  #-}
@@ -1265,6 +1270,18 @@ adjustDigit f i (Four a b c d)
 mapWithIndex :: (Int -> a -> b) -> Seq a -> Seq b
 mapWithIndex f xs = snd (mapAccumL' (\ i x -> (i + 1, f i x)) 0 xs)
 
+#ifdef __GLASGOW_HASKELL__
+{-# NOINLINE [1] mapWithIndex #-}
+{-# RULES
+"mapWithIndex/mapWithIndex" forall f g xs . mapWithIndex f (mapWithIndex g xs) =
+  mapWithIndex (\k a -> f k (g k a)) xs
+"mapWithIndex/fmapSeq" forall f g xs . mapWithIndex f (fmapSeq g xs) =
+  mapWithIndex (\k a -> f k (g a)) xs
+"fmapSeq/mapWithIndex" forall f g xs . fmapSeq f (mapWithIndex g xs) =
+  mapWithIndex (\k a -> f (g k a)) xs
+ #-}
+#endif
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.


From git at git.haskell.org  Sun Dec 20 16:21:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:34 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #69 from treeowl/fmapfmap (b2c1c79)
Message-ID: <20151220162134.A0B6B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b2c1c79893c4b112d98f82dccb006b7453dc4f21

>---------------------------------------------------------------

commit b2c1c79893c4b112d98f82dccb006b7453dc4f21
Merge: e083f68 352c73d
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Nov 18 16:44:20 2014 +0100

    Merge pull request #69 from treeowl/fmapfmap
    
    Add fmap/fmap rules



>---------------------------------------------------------------

b2c1c79893c4b112d98f82dccb006b7453dc4f21
 Data/IntMap/Base.hs   | 19 +++++++++++++++++++
 Data/IntMap/Strict.hs | 19 +++++++++++++++++++
 Data/Map/Base.hs      | 19 ++++++++++++++++++-
 Data/Map/Strict.hs    | 24 +++++++++++++++++++++---
 Data/Sequence.hs      | 19 ++++++++++++++++++-
 5 files changed, 95 insertions(+), 5 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:36 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Implement map/coerce for IntMap (ee3eb5f)
Message-ID: <20151220162136.AA22E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ee3eb5f19dbbd193e7c8b991c861f8568c7106d9

>---------------------------------------------------------------

commit ee3eb5f19dbbd193e7c8b991c861f8568c7106d9
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Nov 18 17:39:18 2014 -0500

    Implement map/coerce for IntMap
    
    I realized what I was doing with MIN_VERSION was kind of silly.
    The easy/sane thing to do is really to use __GLASGOW_HASKELL__
    for the coercion stuff.


>---------------------------------------------------------------

ee3eb5f19dbbd193e7c8b991c861f8568c7106d9
 Data/IntMap/Base.hs                                | 23 +++++++++++++++-------
 Data/IntMap/Strict.hs                              | 12 ++++++++---
 tests-ghc/all.T                                    |  2 ++
 tests-ghc/{mapcoercemap.hs => mapcoerceintmap.hs}  |  8 ++++----
 ...{mapcoercemap.stdout => mapcoerceintmap.stdout} |  0
 .../{mapcoercemap.hs => mapcoerceintmapstrict.hs}  | 14 ++++++-------
 ...emap.stdout => mapcoerceintmapstrict.hs.stdout} |  0
 7 files changed, 38 insertions(+), 21 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 3832e1c..d5fd75a 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -9,6 +9,13 @@
 #if __GLASGOW_HASKELL__ >= 708
 {-# LANGUAGE TypeFamilies #-}
 #endif
+-- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
+-- Nevertheless, as a convenience, we also allow compiling without cabal by
+-- defining trivial MIN_VERSION_base if needed.
+#ifndef MIN_VERSION_base
+#define MIN_VERSION_base(major1,major2,minor) 0
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      :  Data.IntMap.Base
@@ -240,6 +247,9 @@ import qualified GHC.Exts as GHCExts
 #endif
 import Text.Read
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+import Data.Coerce
+#endif
 
 -- Use macros to define strictness of functions.
 -- STRICT_x_OF_y denotes an y-ary function strict in the x-th parameter.
@@ -247,13 +257,6 @@ import Text.Read
 -- want the compilers to be compiled by as many compilers as possible.
 #define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
 
--- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
--- Nevertheless, as a convenience, we also allow compiling without cabal by
--- defining trivial MIN_VERSION_base if needed.
-#ifndef MIN_VERSION_base
-#define MIN_VERSION_base(major1,major2,minor) 0
-#endif
-
 
 -- A "Nat" is a natural machine word (an unsigned Int)
 type Nat = Word
@@ -1307,6 +1310,12 @@ map f t
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not play well with RULES yet.
+{-# RULES
+"map/coerce" map coerce = coerce
+ #-}
+#endif
 
 -- | /O(n)/. Map a function over all values in the map.
 --
diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index af44b2a..d7f45f7 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -1,7 +1,5 @@
 {-# LANGUAGE CPP #-}
-#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 709
-{-# LANGUAGE Safe #-}
-#elif !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
+#if !defined(TESTING) && __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
 -----------------------------------------------------------------------------
@@ -262,6 +260,9 @@ import qualified Data.IntSet.Base as IntSet
 import Data.Utils.BitUtil
 import Data.Utils.StrictFold
 import Data.Utils.StrictPair
+#if __GLASGOW_HASKELL__ >= 709
+import Data.Coerce
+#endif
 
 -- $strictness
 --
@@ -724,6 +725,11 @@ map f t
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 709
+{-# RULES
+"map/coerce" map coerce = coerce
+ #-}
+#endif
 
 -- | /O(n)/. Map a function over all values in the map.
 --
diff --git a/tests-ghc/all.T b/tests-ghc/all.T
index 6a8a339..eba1dcc 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/all.T
@@ -8,3 +8,5 @@ test('sequence001', normal, compile_and_run, ['-package containers'])
 test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
+test('mapcoerceintmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
+test('mapcoerceintmapstrict', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/mapcoerceintmap.hs
similarity index 76%
copy from tests-ghc/mapcoercemap.hs
copy to tests-ghc/mapcoerceintmap.hs
index 6dd336d..ded48c7 100644
--- a/tests-ghc/mapcoercemap.hs
+++ b/tests-ghc/mapcoerceintmap.hs
@@ -2,15 +2,15 @@
 
 import GHC.Exts hiding (fromList)
 import Unsafe.Coerce
-import Data.Map
+import Data.IntMap.Lazy
 
 newtype Age = Age Int
 
-fooAge :: Map Int Int -> Map Int Age
+fooAge :: IntMap Int -> IntMap Age
 fooAge = fmap Age
-fooCoerce :: Map Int Int -> Map Int Age
+fooCoerce :: IntMap Int -> IntMap Age
 fooCoerce = fmap coerce
-fooUnsafeCoerce :: Map Int Int -> Map Int Age
+fooUnsafeCoerce :: IntMap Int -> IntMap Age
 fooUnsafeCoerce = fmap unsafeCoerce
 
 same :: a -> b -> IO ()
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/mapcoerceintmap.stdout
similarity index 100%
copy from tests-ghc/mapcoercemap.stdout
copy to tests-ghc/mapcoerceintmap.stdout
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/mapcoerceintmapstrict.hs
similarity index 61%
copy from tests-ghc/mapcoercemap.hs
copy to tests-ghc/mapcoerceintmapstrict.hs
index 6dd336d..2e97004 100644
--- a/tests-ghc/mapcoercemap.hs
+++ b/tests-ghc/mapcoerceintmapstrict.hs
@@ -2,16 +2,16 @@
 
 import GHC.Exts hiding (fromList)
 import Unsafe.Coerce
-import Data.Map
+import Data.IntMap.Strict as IM
 
 newtype Age = Age Int
 
-fooAge :: Map Int Int -> Map Int Age
-fooAge = fmap Age
-fooCoerce :: Map Int Int -> Map Int Age
-fooCoerce = fmap coerce
-fooUnsafeCoerce :: Map Int Int -> Map Int Age
-fooUnsafeCoerce = fmap unsafeCoerce
+fooAge :: IntMap Int -> IntMap Age
+fooAge = IM.map Age
+fooCoerce :: IntMap Int -> IntMap Age
+fooCoerce = IM.map coerce
+fooUnsafeCoerce :: IntMap Int -> IntMap Age
+fooUnsafeCoerce = IM.map unsafeCoerce
 
 same :: a -> b -> IO ()
 same x y = case reallyUnsafePtrEquality# (unsafeCoerce x) y of
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/mapcoerceintmapstrict.hs.stdout
similarity index 100%
copy from tests-ghc/mapcoercemap.stdout
copy to tests-ghc/mapcoerceintmapstrict.hs.stdout


From git at git.haskell.org  Sun Dec 20 16:21:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:38 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Optimize *> and >> for Seq (22ef7de)
Message-ID: <20151220162138.B1B193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0

>---------------------------------------------------------------

commit 22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Nov 19 15:14:01 2014 -0500

    Optimize *> and >> for Seq
    
    Based on a discussion with Ross Paterson, use a multiplication-
    by-doubling algorithm to improve asymptotic time and space
    performance.


>---------------------------------------------------------------

22ef7de71a5de7f9447f3fdcf16fa8f786cb84c0
 Data/Sequence.hs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1c4e143..2cfa9c7 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -228,11 +228,13 @@ instance Monad Seq where
     return = singleton
     xs >>= f = foldl' add empty xs
       where add ys x = ys >< f x
+    (>>) = (*>)
 
 instance Applicative Seq where
     pure = singleton
     fs <*> xs = foldl' add empty fs
       where add ys f = ys >< fmap f xs
+    xs *> ys = replicateSeq (length xs) ys
 
 instance MonadPlus Seq where
     mzero = empty
@@ -655,6 +657,19 @@ replicateM n x
   | n >= 0      = unwrapMonad (replicateA n (WrapMonad x))
   | otherwise   = error "replicateM takes a nonnegative integer argument"
 
+-- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
+replicateSeq :: Int -> Seq a -> Seq a
+replicateSeq n xs
+  | n < 0     = error "replicateSeq takes a nonnegative integer argument"
+  | n == 0    = empty
+  | otherwise = go n xs
+  where
+    -- Invariant: k >= 1
+    go 1 xs = xs
+    go k xs | even k    = kxs
+            | otherwise = xs >< kxs
+            where kxs = go (k `quot` 2) $! (xs >< xs)
+
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.
 (<|)            :: a -> Seq a -> Seq a


From git at git.haskell.org  Sun Dec 20 16:21:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:40 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #71 from treeowl/fmapcoerceintmap (bcebc7a)
Message-ID: <20151220162140.BA2A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bcebc7af8d347d6229836847cd09ce6971dd6db4

>---------------------------------------------------------------

commit bcebc7af8d347d6229836847cd09ce6971dd6db4
Merge: b2c1c79 ee3eb5f
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 07:56:17 2014 +0100

    Merge pull request #71 from treeowl/fmapcoerceintmap
    
    Implement map/coerce for IntMap



>---------------------------------------------------------------

bcebc7af8d347d6229836847cd09ce6971dd6db4
 Data/IntMap/Base.hs                                | 23 +++++++++++++++-------
 Data/IntMap/Strict.hs                              | 12 ++++++++---
 tests-ghc/all.T                                    |  2 ++
 tests-ghc/{mapcoercemap.hs => mapcoerceintmap.hs}  |  8 ++++----
 ...{mapcoercemap.stdout => mapcoerceintmap.stdout} |  0
 .../{mapcoercemap.hs => mapcoerceintmapstrict.hs}  | 14 ++++++-------
 ...emap.stdout => mapcoerceintmapstrict.hs.stdout} |  0
 7 files changed, 38 insertions(+), 21 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:42 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #72 from treeowl/then (dde7a53)
Message-ID: <20151220162142.C3AB73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/dde7a531b506096ae32b358c2dc83f3edac91ec2

>---------------------------------------------------------------

commit dde7a531b506096ae32b358c2dc83f3edac91ec2
Merge: bcebc7a 22ef7de
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 08:06:03 2014 +0100

    Merge pull request #72 from treeowl/then
    
    Optimize *> and >> for Seq



>---------------------------------------------------------------

dde7a531b506096ae32b358c2dc83f3edac91ec2
 Data/Sequence.hs | 15 +++++++++++++++
 1 file changed, 15 insertions(+)



From git at git.haskell.org  Sun Dec 20 16:21:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:44 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use GHC version for coercion rules (8da46db)
Message-ID: <20151220162144.CD11A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/8da46dbc4598062397c6a6b684f7bae9931f3d80

>---------------------------------------------------------------

commit 8da46dbc4598062397c6a6b684f7bae9931f3d80
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Nov 21 10:14:38 2014 -0500

    Use GHC version for coercion rules
    
    Using the library version didn't make much sense, especially since the
    tests-ghc tests had to switch on compiler version anyway, but also
    because compiling without cabal would prevent the code from being used.
    The conditional fake MIN_VERSION_base definition should probably stay up
    top where I moved it, though, in case someone needs to use it to adjust
    imports or exports in the future--the top seems an inherently better
    place for that.


>---------------------------------------------------------------

8da46dbc4598062397c6a6b684f7bae9931f3d80
 Data/Map/Base.hs   | 7 +++----
 Data/Map/Strict.hs | 7 +++----
 Data/Sequence.hs   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 3911125..e582e16 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -294,7 +294,7 @@ import qualified GHC.Exts as GHCExts
 import Text.Read
 import Data.Data
 #endif
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -1668,9 +1668,8 @@ map f (Bin sx kx x l r) = Bin sx kx (f x) (map f l) (map f r)
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "map/coerce" map coerce = coerce
  #-}
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 6255e91..88f494e 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -279,7 +279,7 @@ import Data.Utils.StrictFold
 import Data.Utils.StrictPair
 
 import Data.Bits (shiftL, shiftR)
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -941,9 +941,8 @@ map f (Bin sx kx x l r) = let x' = f x in x' `seq` Bin sx kx x' (map f l) (map f
 "map/map" forall f g xs . map f (map g xs) = map (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "mapSeq/coerce" map coerce = coerce
  #-}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 331ac30..4799056 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -165,7 +165,7 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
 #endif
-#if MIN_VERSION_base(4,8,0)
+#if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
 
@@ -197,9 +197,8 @@ fmapSeq f (Seq xs) = Seq (fmap (fmap f) xs)
 "fmapSeq/fmapSeq" forall f g xs . fmapSeq f (fmapSeq g xs) = fmapSeq (f . g) xs
  #-}
 #endif
-#if MIN_VERSION_base(4,8,0)
--- Safe coercions were introduced in 4.7.0, but I am not sure if they played
--- well enough with RULES to do what we want.
+#if __GLASGOW_HASKELL__ >= 709
+-- Safe coercions were introduced in 7.8, but did not work well with RULES yet.
 {-# RULES
 "fmapSeq/coerce" fmapSeq coerce = coerce
  #-}


From git at git.haskell.org  Sun Dec 20 16:21:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:46 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #75 from treeowl/coerce-version (ddf12fd)
Message-ID: <20151220162146.D66663A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ddf12fd51a0611cba8250bdbde9fdcbb66211b1d

>---------------------------------------------------------------

commit ddf12fd51a0611cba8250bdbde9fdcbb66211b1d
Merge: dde7a53 8da46db
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 18:50:11 2014 +0100

    Merge pull request #75 from treeowl/coerce-version
    
    Use GHC version for coercion rules



>---------------------------------------------------------------

ddf12fd51a0611cba8250bdbde9fdcbb66211b1d
 Data/Map/Base.hs   | 7 +++----
 Data/Map/Strict.hs | 7 +++----
 Data/Sequence.hs   | 7 +++----
 3 files changed, 9 insertions(+), 12 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:48 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Use Data.Functor.Identity (bd7b470)
Message-ID: <20151220162148.DF4F93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bd7b470abda94c486c784fd7d6c69dd91e0ae2be

>---------------------------------------------------------------

commit bd7b470abda94c486c784fd7d6c69dd91e0ae2be
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Nov 21 11:25:58 2014 -0500

    Use Data.Functor.Identity
    
    This has just entered base, and includes some optimizations that may or
    may not be relevant. For older versions, don't bother making Identity a
    Monad instance--it's not exported, and that instance is never used.
    Make applicativeTree slightly more readable.


>---------------------------------------------------------------

bd7b470abda94c486c784fd7d6c69dd91e0ae2be
 Data/Sequence.hs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4799056..4e37dbf 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -168,6 +168,9 @@ import Data.Data
 #if __GLASGOW_HASKELL__ >= 709
 import Data.Coerce
 #endif
+#if MIN_VERSION_base(4,8,0)
+import Data.Functor.Identity (Identity(..))
+#endif
 
 
 infixr 5 `consTree`
@@ -554,19 +557,16 @@ instance NFData a => NFData (Elem a) where
 -------------------------------------------------------
 -- Applicative construction
 -------------------------------------------------------
+#if !MIN_VERSION_base(4,8,0)
+newtype Identity a = Identity {runIdentity :: a}
 
-newtype Id a = Id {runId :: a}
-
-instance Functor Id where
-    fmap f (Id x) = Id (f x)
-
-instance Monad Id where
-    return = Id
-    m >>= k = k (runId m)
+instance Functor Identity where
+    fmap f (Identity x) = Identity (f x)
 
-instance Applicative Id where
-    pure = return
-    (<*>) = ap
+instance Applicative Identity where
+    pure = Identity
+    Identity f <*> Identity x = Identity (f x)
+#endif
 
 -- | This is essentially a clone of Control.Monad.State.Strict.
 newtype State s a = State {runState :: s -> (s, a)}
@@ -598,13 +598,13 @@ mapAccumL' f s t = runState (traverse (State . flip f) t) s
 -- specified.  This is a generalization of 'replicateA', which itself
 -- is a generalization of many Data.Sequence methods.
 {-# SPECIALIZE applicativeTree :: Int -> Int -> State s a -> State s (FingerTree a) #-}
-{-# SPECIALIZE applicativeTree :: Int -> Int -> Id a -> Id (FingerTree a) #-}
--- Special note: the Id specialization automatically does node sharing,
+{-# SPECIALIZE applicativeTree :: Int -> Int -> Identity a -> Identity (FingerTree a) #-}
+-- Special note: the Identity specialization automatically does node sharing,
 -- reducing memory usage of the resulting tree to /O(log n)/.
 applicativeTree :: Applicative f => Int -> Int -> f a -> f (FingerTree a)
 applicativeTree n mSize m = mSize `seq` case n of
     0 -> pure Empty
-    1 -> liftA Single m
+    1 -> fmap Single m
     2 -> deepA one emptyTree one
     3 -> deepA two emptyTree one
     4 -> deepA two emptyTree two
@@ -612,12 +612,12 @@ applicativeTree n mSize m = mSize `seq` case n of
     6 -> deepA three emptyTree three
     7 -> deepA four emptyTree three
     8 -> deepA four emptyTree four
-    _ -> let (q, r) = n `quotRem` 3 in q `seq` case r of
-        0 -> deepA three (applicativeTree (q - 2) mSize' n3) three
-        1 -> deepA four (applicativeTree (q - 2) mSize' n3) three
-        _ -> deepA four (applicativeTree (q - 2) mSize' n3) four
+    _ -> case n `quotRem` 3 of
+           (q,0) -> deepA three (applicativeTree (q - 2) mSize' n3) three
+           (q,1) -> deepA four  (applicativeTree (q - 2) mSize' n3) three
+           (q,_) -> deepA four  (applicativeTree (q - 2) mSize' n3) four
   where
-    one = liftA One m
+    one = fmap One m
     two = liftA2 Two m m
     three = liftA3 Three m m m
     four = liftA3 Four m m m <*> m
@@ -641,7 +641,7 @@ singleton x     =  Seq (Single (Elem x))
 -- | /O(log n)/. @replicate n x@ is a sequence consisting of @n@ copies of @x at .
 replicate       :: Int -> a -> Seq a
 replicate n x
-  | n >= 0      = runId (replicateA n (Id x))
+  | n >= 0      = runIdentity (replicateA n (Identity x))
   | otherwise   = error "replicate takes a nonnegative integer argument"
 
 -- | 'replicateA' is an 'Applicative' version of 'replicate', and makes


From git at git.haskell.org  Sun Dec 20 16:21:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:50 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #76 from treeowl/identity (c138008)
Message-ID: <20151220162150.E72013A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c1380089319e24ce1373b6cd0a027f7447b45d32

>---------------------------------------------------------------

commit c1380089319e24ce1373b6cd0a027f7447b45d32
Merge: ddf12fd bd7b470
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Nov 21 19:56:10 2014 +0100

    Merge pull request #76 from treeowl/identity
    
    Use Data.Functor.Identity



>---------------------------------------------------------------

c1380089319e24ce1373b6cd0a027f7447b45d32
 Data/Sequence.hs | 40 ++++++++++++++++++++--------------------
 1 file changed, 20 insertions(+), 20 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:52 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make index middle-lazy (aedfe3f)
Message-ID: <20151220162152.EE1D13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/aedfe3f327f781484ec6fb4718156919791c4979

>---------------------------------------------------------------

commit aedfe3f327f781484ec6fb4718156919791c4979
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sun Nov 23 15:36:39 2014 -0500

    Make index middle-lazy
    
    `index` should not descend the finger tree spine unless it needs
    to.


>---------------------------------------------------------------

aedfe3f327f781484ec6fb4718156919791c4979
 Data/Sequence.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4e37dbf..511cad9 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1159,14 +1159,14 @@ data Place a = Place {-# UNPACK #-} !Int a
 lookupTree :: Sized a => Int -> FingerTree a -> Place a
 lookupTree _ Empty = error "lookupTree of empty tree"
 lookupTree i (Single x) = Place i x
-lookupTree i (Deep _ pr m sf)
+lookupTree i (Deep totalSize pr m sf)
   | i < spr     =  lookupDigit i pr
   | i < spm     =  case lookupTree (i - spr) m of
                    Place i' xs -> lookupNode i' xs
   | otherwise   =  lookupDigit (i - spm) sf
   where
     spr     = size pr
-    spm     = spr + size m
+    spm     = totalSize - size sf
 
 {-# SPECIALIZE lookupNode :: Int -> Node (Elem a) -> Place (Elem a) #-}
 {-# SPECIALIZE lookupNode :: Int -> Node (Node a) -> Place (Node a) #-}


From git at git.haskell.org  Sun Dec 20 16:21:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:55 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #80 from treeowl/fix-index (e1e75b8)
Message-ID: <20151220162155.011363A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e1e75b83e3f4bd4bf4031d01d3cec56428c2be33

>---------------------------------------------------------------

commit e1e75b83e3f4bd4bf4031d01d3cec56428c2be33
Merge: c138008 aedfe3f
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 23 23:05:14 2014 +0100

    Merge pull request #80 from treeowl/fix-index
    
    Make index middle-lazy



>---------------------------------------------------------------

e1e75b83e3f4bd4bf4031d01d3cec56428c2be33
 Data/Sequence.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:21:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:57 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add an IsList instance for Data.Sequence.Seq (1931ecf)
Message-ID: <20151220162157.0818B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1931ecf7da3d4e4ead4bd1ef5f5ed07807893339

>---------------------------------------------------------------

commit 1931ecf7da3d4e4ead4bd1ef5f5ed07807893339
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 17:16:39 2014 -0500

    Add an IsList instance for Data.Sequence.Seq


>---------------------------------------------------------------

1931ecf7da3d4e4ead4bd1ef5f5ed07807893339
 Data/Sequence.hs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 511cad9..757f677 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -5,6 +5,9 @@
 #if __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
 #endif
+#if __GLASGOW_HASKELL__ >= 708
+{-# LANGUAGE TypeFamilies #-}
+#endif
 -- We use cabal-generated MIN_VERSION_base to adapt to changes of base.
 -- Nevertheless, as a convenience, we also allow compiling without cabal by
 -- defining trivial MIN_VERSION_base if needed.
@@ -171,7 +174,9 @@ import Data.Coerce
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif
-
+#if __GLASGOW_HASKELL__ >= 708
+import qualified GHC.Exts
+#endif
 
 infixr 5 `consTree`
 infixl 5 `snocTree`
@@ -1655,6 +1660,13 @@ findIndicesR p xs = foldlWithIndex g [] xs
 fromList        :: [a] -> Seq a
 fromList        =  Data.List.foldl' (|>) empty
 
+#if __GLASGOW_HASKELL__ >= 708
+instance GHC.Exts.IsList (Seq a) where
+    type Item (Seq a) = a
+    fromList = fromList
+    toList = toList
+#endif
+
 ------------------------------------------------------------------------
 -- Reverse
 ------------------------------------------------------------------------


From git at git.haskell.org  Sun Dec 20 16:21:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:21:59 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Merge pull request #85 from treeowl/islist (cd5a854)
Message-ID: <20151220162159.1195C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cd5a854691c34dbea4a7fddd166095b7d2f0b3e0

>---------------------------------------------------------------

commit cd5a854691c34dbea4a7fddd166095b7d2f0b3e0
Merge: e1e75b8 1931ecf
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 4 10:01:51 2014 +0100

    Merge pull request #85 from treeowl/islist
    
    Add an IsList instance for Data.Sequence.Seq



>---------------------------------------------------------------

cd5a854691c34dbea4a7fddd166095b7d2f0b3e0
 Data/Sequence.hs | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:22:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:01 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make version-appropriate Foldable imports (39e9ee9)
Message-ID: <20151220162201.18F333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/39e9ee9992269eb2ad3a9b7e608457c6d1a92b04

>---------------------------------------------------------------

commit 39e9ee9992269eb2ad3a9b7e608457c6d1a92b04
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 4 10:59:22 2014 -0500

    Make version-appropriate Foldable imports
    
    foldl' and foldr' moved into the Foldable class, then toList.
    This gets rid of a warning about the imports.


>---------------------------------------------------------------

39e9ee9992269eb2ad3a9b7e608457c6d1a92b04
 Data/Sequence.hs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 511cad9..88faf62 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -155,7 +155,15 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
+#if MIN_VERSION_base(4,8,0)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
+#else
+#if MIN_VERSION_base(4,6,0)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr'), toList)
+#else
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
+#endif
+#endif
 import Data.Traversable
 import Data.Typeable
 


From git at git.haskell.org  Sun Dec 20 16:22:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:03 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master,
 zip-devel: Merge pull request #86 from treeowl/foldableimports (f22d14b)
Message-ID: <20151220162203.215E03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f22d14b56e2c70d6525436a178912c7010bd5169

>---------------------------------------------------------------

commit f22d14b56e2c70d6525436a178912c7010bd5169
Merge: cd5a854 39e9ee9
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Dec 5 07:12:40 2014 +0100

    Merge pull request #86 from treeowl/foldableimports
    
    Make version-appropriate Foldable imports



>---------------------------------------------------------------

f22d14b56e2c70d6525436a178912c7010bd5169
 Data/Sequence.hs | 8 ++++++++
 1 file changed, 8 insertions(+)



From git at git.haskell.org  Sun Dec 20 16:22:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:05 +0000 (UTC)
Subject: [commit: packages/containers]
 develop-0.6,develop-0.6-questionable,master,zip-devel: Specialize
 splitTraverse; strictify pair splitting (7e6d75f)
Message-ID: <20151220162205.2A3213A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285

>---------------------------------------------------------------

commit 7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 13:27:41 2014 -0500

    Specialize splitTraverse; strictify pair splitting
    
    Explicitly specialize `splitTraverse` functions to the necessary types.
    This has no immediate performance impact, but makes it clearer what the
    functions are about. Make splitting pairs a bit stricter; we don't need
    that much laziness.


>---------------------------------------------------------------

7e6d75f9cfb524ccb3c7dfd149c6f7f74e276285
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 10d3a92..9955584 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1726,14 +1726,18 @@ instance Splittable (Seq a) where
     splitState = splitAt
 
 instance (Splittable a, Splittable b) => Splittable (a, b) where
-    splitState i (a, b) = ((al, bl), (ar, br))
+    splitState i (a, b) = (al `seq` bl `seq` (al, bl), ar `seq` br `seq` (ar, br))
       where
         (al, ar) = splitState i a
         (bl, br) = splitState i b
 
+{-# SPECIALIZE splitTraverseSeq :: (Seq x -> a -> b) -> Seq x -> Seq a -> Seq b #-}
+{-# SPECIALIZE splitTraverseSeq :: ((Seq x, Seq y) -> a -> b) -> (Seq x, Seq y) -> Seq a -> Seq b #-}
 splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b
 splitTraverseSeq f s (Seq xs) = Seq $ splitTraverseTree (\s' (Elem a) -> Elem (f s' a)) s xs
 
+{-# SPECIALIZE splitTraverseTree :: (Seq x -> Elem y -> b) -> Seq x -> FingerTree (Elem y) -> FingerTree b #-}
+{-# SPECIALIZE splitTraverseTree :: (Seq x -> Node y -> b) -> Seq x -> FingerTree (Node y) -> FingerTree b #-}
 splitTraverseTree :: (Sized a, Splittable s) => (s -> a -> b) -> s -> FingerTree a -> FingerTree b
 splitTraverseTree _f _s Empty = Empty
 splitTraverseTree f s (Single xs) = Single $ f s xs
@@ -1742,6 +1746,8 @@ splitTraverseTree f s (Deep n pr m sf) = Deep n (splitTraverseDigit f prs pr) (s
     (prs, r) = splitState (size pr) s
     (ms, sfs) = splitState (n - size pr - size sf) r
 
+{-# SPECIALIZE splitTraverseDigit :: (Seq x -> Elem y -> b) -> Seq x -> Digit (Elem y) -> Digit b #-}
+{-# SPECIALIZE splitTraverseDigit :: (Seq x -> Node y -> b) -> Seq x -> Digit (Node y) -> Digit b #-}
 splitTraverseDigit :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Digit a -> Digit b
 splitTraverseDigit f s (One a) = One (f s a)
 splitTraverseDigit f s (Two a b) = Two (f first a) (f second b)
@@ -1757,6 +1763,8 @@ splitTraverseDigit f s (Four a b c d) = Four (f first a) (f second b) (f third c
     (middle, fourth) = splitState (size b + size c) s'
     (second, third) = splitState (size b) middle
 
+{-# SPECIALIZE splitTraverseNode :: (Seq x -> Elem y -> b) -> Seq x -> Node (Elem y) -> Node b #-}
+{-# SPECIALIZE splitTraverseNode :: (Seq x -> Node y -> b) -> Seq x -> Node (Node y) -> Node b #-}
 splitTraverseNode :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Node a -> Node b
 splitTraverseNode f s (Node2 ns a b) = Node2 ns (f first a) (f second b)
   where


From git at git.haskell.org  Sun Dec 20 16:22:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:07 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Make zipWith faster (31e1234)
Message-ID: <20151220162207.3169E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/31e1234435ae734bbf3d33a79e9cce89d06ac738

>---------------------------------------------------------------

commit 31e1234435ae734bbf3d33a79e9cce89d06ac738
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Dec 2 17:09:49 2014 -0500

    Make zipWith faster
    
    Make `zipWith` build its result with the structure of its first
    argument, splitting up its second argument as it goes. This allows
    fast random access to the elements of the results immediately,
    without having to build large portions of the structure. It also
    seems to be slightly faster than the old implementation when the
    entire result is used, presumably by avoiding rebalancing costs.
    I believe most of this code will also help implement a fast
    `(<*>)`.
    
    Use the same approach to implement `zipWith3` and `zipWith4`.
    
    Clean up a couple warnings.
    
    Many thanks to Carter Schonwald for suggesting that I use the
    structure of the first sequence to structure the result, and for
    helping me come up with the splitTraverse approach.
    
    Benchmarks:
    
    Zipping two 100000 element lists and extracting the 50000th element
    takes about 11.4ms with the new implementation, as opposed to 88ms with
    the old. Zipping two 10000 element sequences and forcing the result to
    normal form takes 4.0ms now rather than 19.7ms. The indexing gains show
    up for even very short sequences, but the new implementation really
    starts to look good once the size gets to around 1000--presumably it
    handles cache effects better than the old one. Note that the naive
    approach of converting sequences to lists, zipping them, and then
    converting back, actually works very well for forcing short sequences to
    normal form, even better than the new implementation. But it starts to
    lose a lot of ground by the time the size gets to around 10000, and its
    performance on the indexing tests is bad.


>---------------------------------------------------------------

31e1234435ae734bbf3d33a79e9cce89d06ac738
 Data/Sequence.hs | 106 +++++++++++++++++++++++++++++++++++++++++++++++--------
 1 file changed, 92 insertions(+), 14 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b54f1e6..10d3a92 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -676,10 +676,10 @@ replicateM n x
 
 -- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
 replicateSeq :: Int -> Seq a -> Seq a
-replicateSeq n xs
+replicateSeq n s
   | n < 0     = error "replicateSeq takes a nonnegative integer argument"
   | n == 0    = empty
-  | otherwise = go n xs
+  | otherwise = go n s
   where
     -- Invariant: k >= 1
     go 1 xs = xs
@@ -1703,6 +1703,75 @@ reverseNode f (Node2 s a b) = Node2 s (f b) (f a)
 reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 
 ------------------------------------------------------------------------
+-- Traversing with splittable "state"
+------------------------------------------------------------------------
+
+-- For zipping, and probably also for (<*>), it is useful to build a result by
+-- traversing a sequence while splitting up something else.  For zipping, we
+-- traverse the first sequence while splitting up the second [and third [and
+-- fourth]]. For fs <*> xs, we expect soon to traverse
+--
+-- > replicate (length fs * length xs) ()
+--
+-- while splitting something essentially equivalent to
+--
+-- > fmap (\f -> fmap f xs) fs
+--
+-- David Feuer, with excellent guidance from Carter Schonwald, December 2014
+
+class Splittable s where
+    splitState :: Int -> s -> (s,s)
+
+instance Splittable (Seq a) where
+    splitState = splitAt
+
+instance (Splittable a, Splittable b) => Splittable (a, b) where
+    splitState i (a, b) = ((al, bl), (ar, br))
+      where
+        (al, ar) = splitState i a
+        (bl, br) = splitState i b
+
+splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b
+splitTraverseSeq f s (Seq xs) = Seq $ splitTraverseTree (\s' (Elem a) -> Elem (f s' a)) s xs
+
+splitTraverseTree :: (Sized a, Splittable s) => (s -> a -> b) -> s -> FingerTree a -> FingerTree b
+splitTraverseTree _f _s Empty = Empty
+splitTraverseTree f s (Single xs) = Single $ f s xs
+splitTraverseTree f s (Deep n pr m sf) = Deep n (splitTraverseDigit f prs pr) (splitTraverseTree (splitTraverseNode f) ms m) (splitTraverseDigit f sfs sf)
+  where
+    (prs, r) = splitState (size pr) s
+    (ms, sfs) = splitState (n - size pr - size sf) r
+
+splitTraverseDigit :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Digit a -> Digit b
+splitTraverseDigit f s (One a) = One (f s a)
+splitTraverseDigit f s (Two a b) = Two (f first a) (f second b)
+  where
+    (first, second) = splitState (size a) s
+splitTraverseDigit f s (Three a b c) = Three (f first a) (f second b) (f third c)
+  where
+    (first, r) = splitState (size a) s
+    (second, third) = splitState (size b) r
+splitTraverseDigit f s (Four a b c d) = Four (f first a) (f second b) (f third c) (f fourth d)
+  where
+    (first, s') = splitState (size a) s
+    (middle, fourth) = splitState (size b + size c) s'
+    (second, third) = splitState (size b) middle
+
+splitTraverseNode :: (Sized a, Splittable s) => (s -> a -> b) -> s -> Node a -> Node b
+splitTraverseNode f s (Node2 ns a b) = Node2 ns (f first a) (f second b)
+  where
+    (first, second) = splitState (size a) s
+splitTraverseNode f s (Node3 ns a b c) = Node3 ns (f first a) (f second b) (f third c)
+  where
+    (first, r) = splitState (size a) s
+    (second, third) = splitState (size b) r
+
+getSingleton :: Seq a -> a
+getSingleton (Seq (Single (Elem a))) = a
+getSingleton (Seq Empty) = error "getSingleton: Empty"
+getSingleton _ = error "getSingleton: Not a singleton."
+
+------------------------------------------------------------------------
 -- Zipping
 ------------------------------------------------------------------------
 
@@ -1717,17 +1786,11 @@ zip = zipWith (,)
 -- For example, @zipWith (+)@ is applied to two sequences to take the
 -- sequence of corresponding sums.
 zipWith :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith f xs ys
-  | length xs <= length ys      = zipWith' f xs ys
-  | otherwise                   = zipWith' (flip f) ys xs
-
--- like 'zipWith', but assumes length xs <= length ys
-zipWith' :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith' f xs ys = snd (mapAccumL k ys xs)
+zipWith f s1 s2 = splitTraverseSeq (\s a -> f a (getSingleton s)) s2' s1'
   where
-    k kys x = case viewl kys of
-           (z :< zs) -> (zs, f x z)
-           EmptyL    -> error "zipWith': unexpected EmptyL"
+    minLen = min (length s1) (length s2)
+    s1' = take minLen s1
+    s2' = take minLen s2
 
 -- | /O(min(n1,n2,n3))/.  'zip3' takes three sequences and returns a
 -- sequence of triples, analogous to 'zip'.
@@ -1738,7 +1801,14 @@ zip3 = zipWith3 (,,)
 -- three elements, as well as three sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith3 :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
-zipWith3 f s1 s2 s3 = zipWith ($) (zipWith f s1 s2) s3
+zipWith3 f s1 s2 s3 = splitTraverseSeq (\s a ->
+    case s of
+      (b, c) -> f a (getSingleton b) (getSingleton c)) (s2', s3') s1'
+  where
+    minLen = minimum [length s1, length s2, length s3]
+    s1' = take minLen s1
+    s2' = take minLen s2
+    s3' = take minLen s3
 
 -- | /O(min(n1,n2,n3,n4))/.  'zip4' takes four sequences and returns a
 -- sequence of quadruples, analogous to 'zip'.
@@ -1749,7 +1819,15 @@ zip4 = zipWith4 (,,,)
 -- four elements, as well as four sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith4 :: (a -> b -> c -> d -> e) -> Seq a -> Seq b -> Seq c -> Seq d -> Seq e
-zipWith4 f s1 s2 s3 s4 = zipWith ($) (zipWith ($) (zipWith f s1 s2) s3) s4
+zipWith4 f s1 s2 s3 s4 = splitTraverseSeq (\s a ->
+    case s of
+      (b, (c, d)) -> f a (getSingleton b) (getSingleton c) (getSingleton d)) (s2', (s3', s4')) s1'
+  where
+    minLen = minimum [length s1, length s2, length s3, length s4]
+    s1' = take minLen s1
+    s2' = take minLen s2
+    s3' = take minLen s3
+    s4' = take minLen s4
 
 ------------------------------------------------------------------------
 -- Sorting


From git at git.haskell.org  Sun Dec 20 16:22:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:09 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add zip benchmarks (cdf173f)
Message-ID: <20151220162209.382E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/cdf173f4cb1f792a4ac54b939bf197c214abcd43

>---------------------------------------------------------------

commit cdf173f4cb1f792a4ac54b939bf197c214abcd43
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 3 12:31:45 2014 -0500

    Add zip benchmarks


>---------------------------------------------------------------

cdf173f4cb1f792a4ac54b939bf197c214abcd43
 benchmarks/Sequence.hs | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8c18582..ccaca6c 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -20,10 +20,16 @@ main = do
         r1000 = rlist 1000
     rnf [r10, r100, r1000] `seq` return ()
     defaultMain
-        [ bench "splitAt/append 10" $ nf (shuffle r10) s10
-        , bench "splitAt/append 100" $ nf (shuffle r100) s100
-        , bench "splitAt/append 1000" $ nf (shuffle r1000) s1000
-        ]
+      [ bgroup "splitAt/append"
+         [ bench "10" $ nf (shuffle r10) s10
+         , bench "100" $ nf (shuffle r100) s100
+         , bench "1000" $ nf (shuffle r1000) s1000
+         ]
+      , bgroup "zip"
+         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
+         , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
+         , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
+         ] ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Sun Dec 20 16:22:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:11 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Nix the Splittable class;
 add fromFunction (4abaee4)
Message-ID: <20151220162211.423E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4abaee4c2edadc13413a78848c6eea0558ec06c8

>---------------------------------------------------------------

commit 4abaee4c2edadc13413a78848c6eea0558ec06c8
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 00:23:44 2014 -0500

    Nix the Splittable class; add fromFunction
    
    Also export splitTraverse, and write mapWithIndex using
    a hand-unboxed mapWithIndex#.


>---------------------------------------------------------------

4abaee4c2edadc13413a78848c6eea0558ec06c8
 Data/Sequence.hs | 220 +++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 142 insertions(+), 78 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 4abaee4c2edadc13413a78848c6eea0558ec06c8

From git at git.haskell.org  Sun Dec 20 16:22:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:13 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master, zip-devel: Add comments explaining the splitting traversal (c0e8c7d)
Message-ID: <20151220162213.4A1EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master,zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c0e8c7d9e135527a188c5a932cab1e96c11c1de5

>---------------------------------------------------------------

commit c0e8c7d9e135527a188c5a932cab1e96c11c1de5
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 4 11:50:20 2014 -0500

    Add comments explaining the splitting traversal
    
    Why it's a good idea, how it works, and what the benchmarks
    say.


>---------------------------------------------------------------

c0e8c7d9e135527a188c5a932cab1e96c11c1de5
 Data/Sequence.hs | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 57 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9955584..212c926 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -128,6 +128,7 @@ module Data.Sequence (
     foldlWithIndex, -- :: (b -> Int -> a -> b) -> b -> Seq a -> b
     foldrWithIndex, -- :: (Int -> a -> b -> b) -> b -> Seq a -> b
     -- * Transformations
+    genSplitTraverseSeq,
     mapWithIndex,   -- :: (Int -> a -> b) -> Seq a -> Seq b
     reverse,        -- :: Seq a -> Seq a
     -- ** Zips
@@ -1709,7 +1710,7 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- For zipping, and probably also for (<*>), it is useful to build a result by
 -- traversing a sequence while splitting up something else.  For zipping, we
 -- traverse the first sequence while splitting up the second [and third [and
--- fourth]]. For fs <*> xs, we expect soon to traverse
+-- fourth]]. For fs <*> xs, we hope to traverse
 --
 -- > replicate (length fs * length xs) ()
 --
@@ -1717,6 +1718,51 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 --
 -- > fmap (\f -> fmap f xs) fs
 --
+-- What makes all this crazy code a good idea:
+--
+-- Suppose we zip together two sequences of the same length:
+--
+-- zs = zip xs ys
+--
+-- We want to get reasonably fast indexing into zs immediately, rather than
+-- needing to construct the entire thing first, as the previous implementation
+-- required. The first aspect is that we build the result "outside-in" or
+-- "top-down", rather than left to right. That gives us access to both ends
+-- quickly. But that's not enough, by itself, to give immediate access to the
+-- center of zs. For that, we need to be able to skip over larger segments of
+-- zs, delaying their construction until we actually need them. The way we do
+-- this is to traverse xs, while splitting up ys according to the structure of
+-- xs. If we have a Deep _ pr m sf, we split ys into three pieces, and hand off
+-- one piece to the prefix, one to the middle, and one to the suffix of the
+-- result. The key point is that we don't need to actually do anything further
+-- with those pieces until we actually need them; the computations to split
+-- them up further and zip them with their matching pieces can be delayed until
+-- they're actually needed. We do the same thing for Digits (splitting into
+-- between one and four pieces) and Nodes (splitting into two or three). The
+-- ultimate result is that we can index, or split at, any location in zs in
+-- O(log(min{i,n-i})) time *immediately*, with only a constant-factor slowdown
+-- as thunks are forced along the path.
+--
+-- Benchmark info, and alternatives:
+--
+-- The old zipping code used mapAccumL to traverse the first sequence while
+-- cutting down the second sequence one piece at a time.
+--
+-- An alternative way to express that basic idea is to convert both sequences
+-- to lists, zip the lists, and then convert the result back to a sequence.
+-- I'll call this the "listy" implementation.
+--
+-- I benchmarked two operations: Each started by zipping two sequences
+-- constructed with replicate and/or fromList. The first would then immediately
+-- index into the result. The second would apply deepseq to force the entire
+-- result.  The new implementation worked much better than either of the others
+-- on the immediate indexing test, as expected. It also worked better than the
+-- old implementation for all the deepseq tests. For short sequences, the listy
+-- implementation outperformed all the others on the deepseq test. However, the
+-- splitting implementation caught up and surpassed it once the sequences grew
+-- long enough. It seems likely that by avoiding rebuilding, it interacts
+-- better with the cache hierarchy.
+--
 -- David Feuer, with excellent guidance from Carter Schonwald, December 2014
 
 class Splittable s where
@@ -1731,6 +1777,16 @@ instance (Splittable a, Splittable b) => Splittable (a, b) where
         (al, ar) = splitState i a
         (bl, br) = splitState i b
 
+data GenSplittable s = GenSplittable s (Int -> s -> (s,s))
+instance Splittable (GenSplittable s) where
+    splitState i (GenSplittable s spl) = (GenSplittable l spl, GenSplittable r spl)
+      where
+        (l,r) = spl i s
+
+{-# INLINE genSplitTraverseSeq #-}
+genSplitTraverseSeq :: (Int -> s -> (s, s)) -> (s -> a -> b) -> s -> Seq a -> Seq b
+genSplitTraverseSeq spl f s = splitTraverseSeq (\(GenSplittable s _) -> f s) (GenSplittable s spl)
+
 {-# SPECIALIZE splitTraverseSeq :: (Seq x -> a -> b) -> Seq x -> Seq a -> Seq b #-}
 {-# SPECIALIZE splitTraverseSeq :: ((Seq x, Seq y) -> a -> b) -> (Seq x, Seq y) -> Seq a -> Seq b #-}
 splitTraverseSeq :: (Splittable s) => (s -> a -> b) -> s -> Seq a -> Seq b


From git at git.haskell.org  Sun Dec 20 16:22:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:15 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Make <*> fast (73c06d4)
Message-ID: <20151220162215.51DCE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/73c06d4421aaca2dc3c06d07d452d3e8f586ecf4

>---------------------------------------------------------------

commit 73c06d4421aaca2dc3c06d07d452d3e8f586ecf4
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 18:46:49 2014 -0500

    Make <*> fast
    
    Use the `splitTraverse` mechanism to implement `<*>` with optimal
    incremental performance. Stop exporting `splitTraverse`.
    
    Many thanks to Joachim Breitner for writing the splitting code for
    this.


>---------------------------------------------------------------

73c06d4421aaca2dc3c06d07d452d3e8f586ecf4
 Data/Sequence.hs | 61 ++++++++++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 57 insertions(+), 4 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9e78ce1..f7d551c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -133,7 +133,6 @@ module Data.Sequence (
     -- * Transformations
     mapWithIndex,   -- :: (Int -> a -> b) -> Seq a -> Seq b
     reverse,        -- :: Seq a -> Seq a
-    splitTraverse,  -- :: (Int -> s -> (s, s)) -> (s -> a -> b) -> s -> Seq a -> Seq b
     -- ** Zips
     zip,            -- :: Seq a -> Seq b -> Seq (a, b)
     zipWith,        -- :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
@@ -257,10 +256,65 @@ instance Monad Seq where
 
 instance Applicative Seq where
     pure = singleton
-    fs <*> xs = foldl' add empty fs
-      where add ys f = ys >< fmap f xs
+
+    Seq Empty <*> _ = empty
+    _ <*> Seq Empty = empty
+    Seq (Single (Elem f)) <*> xs = fmap f xs
+    fs <*> Seq (Single (Elem x)) = fmap ($x) fs
+    fs <*> xs = splitTraverse splitCPs
+                              (\s _ -> uncurry ($) (getSingletonCPs s))
+                              (createCPs fs xs)
+                              (replicate (length fs * length xs) ())
+
     xs *> ys = replicateSeq (length xs) ys
 
+-- The splitCPs code below, for splitting ragged-ended Cartesian products,
+-- was generously provided by Joachim Breitner.
+
+data CPs x y =
+      CPs (Seq x)
+          (Seq y)
+          {-# UNPACK #-} !Int {- beginning column -}
+          {-# UNPACK #-} !Int {- last column -}
+    | SingleCPs x (Seq y)
+#ifdef TESTING
+    deriving Show
+#endif
+
+-- Note: The total length of CPs xs ys fc lc  is
+-- (length xs - 1) * length ys - fc + lc + 1
+
+-- Create a non-trivial Cps given two sequences
+createCPs :: Seq x -> Seq y -> CPs x y
+createCPs xs ys = CPs xs ys 0 (length ys - 1)
+
+-- Smart constructor
+mkCPs :: Seq x -> Seq y -> Int -> Int -> CPs x y
+mkCPs (Seq (Single (Elem x))) ys fc lc = SingleCPs x (drop fc $ take (lc+1) ys)
+mkCPs xs ys fc lc = CPs xs ys fc lc
+
+splitCPs:: Int -> CPs x y -> (CPs x y, CPs x y)
+splitCPs n (SingleCPs x ys)
+    = ( SingleCPs x ys1, SingleCPs x ys2 )
+  where (ys1, ys2) = splitAt n ys
+splitCPs n (CPs xs ys fc lc)
+    = ( mkCPs (take r_end xs)   ys fc      c_end
+      , mkCPs (drop r_begin xs) ys c_begin lc
+      )
+  where
+    -- Coordinates of the beginning of the second chunk
+    (r_begin,  -- number of rows that do not go into the second chunk
+     c_begin) = (n + fc) `quotRem` length ys
+
+    -- Coordinates of the end of the first chunk
+    r_end | c_begin == 0 = r_begin     -- cut nicely along rows, keep the other rows
+          | otherwise    = r_begin + 1 -- we need to keep one row in both chunks
+    c_end = (c_begin - 1 + length ys) `rem` length ys
+
+getSingletonCPs :: CPs x y -> (x, y)
+getSingletonCPs (SingleCPs x ys) = (x, getSingleton ys)
+getSingletonCPs _ = error "getSingletonCPs: Not a singleton"
+
 instance MonadPlus Seq where
     mzero = empty
     mplus = (><)
@@ -1370,7 +1424,6 @@ mapWithIndex# f (Seq xs) = Seq $ mapWithIndexTree# (\s (Elem a) -> Elem (f s a))
       !(I# sb) = size b
       !sPsa = s +# sa
       !sPsab = sPsa +# sb
-      
 #endif
 
 -- | /O(n)/. Convert a given sequence length and a function representing that


From git at git.haskell.org  Sun Dec 20 16:22:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:17 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Update benchmark running
 script to new Criterion options. (83f32bc)
Message-ID: <20151220162217.589063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/83f32bcf58a43dfec32a4151d2f677635da7e5cd

>---------------------------------------------------------------

commit 83f32bcf58a43dfec32a4151d2f677635da7e5cd
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 14:57:04 2014 +0100

    Update benchmark running script to new Criterion options.


>---------------------------------------------------------------

83f32bcf58a43dfec32a4151d2f677635da7e5cd
 benchmarks/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 1539a2a..ff45493 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -4,7 +4,7 @@ bench-%: %.hs force
 	ghc -O2 -DTESTING $< -i../$(TOP) -o $@ -outputdir tmp -rtsopts
 
 bench-%.csv: bench-%
-	./bench-$* $(BENCHMARK) -v -u bench-$*.csv
+	./bench-$* $(BENCHMARK) -v 2 --csv bench-$*.csv
 
 .PHONY: force clean veryclean
 force:


From git at git.haskell.org  Sun Dec 20 16:22:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:19 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Add simple fromFunction
 benchmark. (fc87eee)
Message-ID: <20151220162219.5F4253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fc87eeefa5907559b2669a16baed03db79f82981

>---------------------------------------------------------------

commit fc87eeefa5907559b2669a16baed03db79f82981
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 14:57:24 2014 +0100

    Add simple fromFunction benchmark.


>---------------------------------------------------------------

fc87eeefa5907559b2669a16baed03db79f82981
 benchmarks/Sequence.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index ccaca6c..58e1114 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -29,7 +29,13 @@ main = do
          [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
          , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
          , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
-         ] ]
+         ]
+      , bgroup "fromFunction"
+         [ bench "ix10000/5000" $ nf (\size -> S.fromFunction size id `S.index` (size `div` 2)) 10000
+         , bench "nf100" $ nf (\size -> S.fromFunction size id) 100
+         , bench "nf10000" $ nf (\size -> S.fromFunction size id) 10000
+         ]
+      ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Sun Dec 20 16:22:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:21 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Add simple mapWithIndex
 benchmark. (0f3ac0b)
Message-ID: <20151220162221.65C963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0f3ac0b3e48f49e5565b692f2abcb2219895d145

>---------------------------------------------------------------

commit 0f3ac0b3e48f49e5565b692f2abcb2219895d145
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 15:43:09 2014 +0100

    Add simple mapWithIndex benchmark.


>---------------------------------------------------------------

0f3ac0b3e48f49e5565b692f2abcb2219895d145
 benchmarks/Sequence.hs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 58e1114..5ae2cd3 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -12,7 +12,8 @@ main = do
     let s10 = S.fromList [1..10] :: S.Seq Int
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
-    rnf [s10, s100, s1000] `seq` return ()
+        s10000 = S.fromList [1..10000] :: S.Seq Int
+    rnf [s10, s100, s1000, s10000] `seq` return ()
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
@@ -35,6 +36,11 @@ main = do
          , bench "nf100" $ nf (\size -> S.fromFunction size id) 100
          , bench "nf10000" $ nf (\size -> S.fromFunction size id) 10000
          ]
+      , bgroup "mapWithIndex"
+         [ bench "ix10000/5000" $ nf (S.mapWithIndex (+)) s10000
+         , bench "nf100" $ nf (S.mapWithIndex (+)) s100
+         , bench "nf10000" $ nf (S.mapWithIndex (+)) s10000
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Sun Dec 20 16:22:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:23 +0000 (UTC)
Subject: [commit: packages/containers] zip-devel: Direct implementation of
 fromFunction. (ce7f531)
Message-ID: <20151220162223.6C8113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : zip-devel
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6

>---------------------------------------------------------------

commit ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 7 16:16:59 2014 +0100

    Direct implementation of fromFunction.
    
    We avoid using Four Digit, so that elements can be added to the
    new Seq without forcing a large rebuild.


>---------------------------------------------------------------

ce7f531605b5f2bb350f36c51a74d9ebd84ff8b6
 Data/Sequence.hs | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f7d551c..4f7eb86 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1429,7 +1429,28 @@ mapWithIndex# f (Seq xs) = Seq $ mapWithIndexTree# (\s (Elem a) -> Elem (f s a))
 -- | /O(n)/. Convert a given sequence length and a function representing that
 -- sequence into a sequence.
 fromFunction :: Int -> (Int -> a) -> Seq a
-fromFunction len f = mapWithIndex (\i _ -> f i) (replicate len ())
+fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with negative len"
+                   | len == 0 = empty
+                   | otherwise = Seq $ create (Elem . f) 1 0 len
+ where
+  create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
+  create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = case trees of
+    1 -> Single $ b i
+    2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
+    3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
+    4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
+    5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
+    6 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
+    _ -> case trees `quotRem` 3 of
+      (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
+                         (Two (b (i+(2+3*(trees'-1))*s)) (b (i+(3+3*(trees'-1))*s)))
+      (trees',2) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-1))
+                         (Two (b (i+(3+3*(trees'-1))*s)) (b (i+(4+3*(trees'-1))*s)))
+      (trees',0) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
+                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-2))
+                         (Three (b (i+(3+3*(trees'-2))*s)) (b (i+(4+3*(trees'-2))*s)) (b (i+(5+3*(trees'-2))*s)))
 
 -- Splitting
 


From git at git.haskell.org  Sun Dec 20 16:22:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:25 +0000 (UTC)
Subject: [commit: packages/containers]
 develop-0.6,develop-0.6-questionable,master: Nix the Splittable class;
 add fromFunction (41cc152)
Message-ID: <20151220162225.752713A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/41cc1523f99cecfd93efed16abab28eebd873abb

>---------------------------------------------------------------

commit 41cc1523f99cecfd93efed16abab28eebd873abb
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 6 00:23:44 2014 -0500

    Nix the Splittable class; add fromFunction
    
    Write mapWithIndex using
    a hand-unboxed mapWithIndex#.
    
    Make `split` strict, and add an internal strict `splitAt'`. This
    helps `zipWith` a little.


>---------------------------------------------------------------

41cc1523f99cecfd93efed16abab28eebd873abb
 Data/Sequence.hs | 249 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 167 insertions(+), 82 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 41cc1523f99cecfd93efed16abab28eebd873abb

From git at git.haskell.org  Sun Dec 20 16:22:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:27 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Simplify zipWith3 and zipWith4 to reduce code size (58f3597)
Message-ID: <20151220162227.7CD1E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/58f359787438f18dc7fbfe25f115654bd28ac94b

>---------------------------------------------------------------

commit 58f359787438f18dc7fbfe25f115654bd28ac94b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 10 18:33:27 2014 -0500

    Simplify zipWith3 and zipWith4 to reduce code size
    
    The performance impact isn't worth the code blowup.
    
    Also, fix a bug in `fromFunction`.


>---------------------------------------------------------------

58f359787438f18dc7fbfe25f115654bd28ac94b
 Data/Sequence.hs | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 29a19b3..62d76b3 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1382,7 +1382,7 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
     3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
     4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
     5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
-    6 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
+    6 -> Deep (6*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
     _ -> case trees `quotRem` 3 of
       (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
                          (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
@@ -1937,12 +1937,16 @@ zip = zipWith (,)
 -- For example, @zipWith (+)@ is applied to two sequences to take the
 -- sequence of corresponding sums.
 zipWith :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
-zipWith f s1 s2 = splitMap splitAt' (\s a -> f a (getSingleton s)) s2' s1'
+zipWith f s1 s2 = zipWith' f s1' s2'
   where
     minLen = min (length s1) (length s2)
     s1' = take minLen s1
     s2' = take minLen s2
 
+-- | A version of zipWith that assumes the sequences have the same length.
+zipWith' :: (a -> b -> c) -> Seq a -> Seq b -> Seq c
+zipWith' f s1 s2 = splitMap splitAt' (\s a -> f a (getSingleton s)) s2 s1
+
 -- | /O(min(n1,n2,n3))/.  'zip3' takes three sequences and returns a
 -- sequence of triples, analogous to 'zip'.
 zip3 :: Seq a -> Seq b -> Seq c -> Seq (a,b,c)
@@ -1952,14 +1956,16 @@ zip3 = zipWith3 (,,)
 -- three elements, as well as three sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith3 :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
-zipWith3 f s1 s2 s3 = splitMap (\i (s,t) -> case (splitAt' i s, splitAt' i t) of ((s', s''), (t', t'')) -> ((s',t'),(s'',t'')))
-    (\(b,c) a -> f a (getSingleton b) (getSingleton c)) (s2',s3') s1'
+zipWith3 f s1 s2 s3 = zipWith' ($) (zipWith' f s1' s2') s3'
   where
     minLen = minimum [length s1, length s2, length s3]
     s1' = take minLen s1
     s2' = take minLen s2
     s3' = take minLen s3
 
+zipWith3' :: (a -> b -> c -> d) -> Seq a -> Seq b -> Seq c -> Seq d
+zipWith3' f s1 s2 s3 = zipWith' ($) (zipWith' f s1 s2) s3
+
 -- | /O(min(n1,n2,n3,n4))/.  'zip4' takes four sequences and returns a
 -- sequence of quadruples, analogous to 'zip'.
 zip4 :: Seq a -> Seq b -> Seq c -> Seq d -> Seq (a,b,c,d)
@@ -1969,8 +1975,7 @@ zip4 = zipWith4 (,,,)
 -- four elements, as well as four sequences and returns a sequence of
 -- their point-wise combinations, analogous to 'zipWith'.
 zipWith4 :: (a -> b -> c -> d -> e) -> Seq a -> Seq b -> Seq c -> Seq d -> Seq e
-zipWith4 f s1 s2 s3 s4 = splitMap (\i (s,t,u) -> case (splitAt' i s, splitAt' i t, splitAt' i u) of ((s',s''),(t',t''),(u',u'')) -> ((s',t',u'),(s'',t'',u'')))
-  (\(b, c, d) a -> f a (getSingleton b) (getSingleton c) (getSingleton d)) (s2',s3',s4') s1'
+zipWith4 f s1 s2 s3 s4 = zipWith' ($) (zipWith3' f s1' s2' s3') s4'
   where
     minLen = minimum [length s1, length s2, length s3, length s4]
     s1' = take minLen s1


From git at git.haskell.org  Sun Dec 20 16:22:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:29 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Revert the fromFunction shallowing (d8c9008)
Message-ID: <20151220162229.84EE83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d8c90085755397b0180a349385fdd1b1820ae1aa

>---------------------------------------------------------------

commit d8c90085755397b0180a349385fdd1b1820ae1aa
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 11 21:21:38 2014 -0500

    Revert the fromFunction shallowing
    
    I don't actually know whether we want it shallower or "safer".
    Make `fromFunction` easier to read.


>---------------------------------------------------------------

d8c90085755397b0180a349385fdd1b1820ae1aa
 Data/Sequence.hs | 42 +++++++++++++++++++++++-------------------
 1 file changed, 23 insertions(+), 19 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 62d76b3..f3fbbe7 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1374,25 +1374,29 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 #else
                    | otherwise = Seq $ create (Elem . f) 1 0 len
 #endif
- where
-  create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
-  create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
-    1 -> Single $ b i
-    2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
-    3 -> Deep (3*s) (Two (b i) (b (i+s))) Empty (One (b (i+2*s)))
-    4 -> Deep (4*s) (Two (b i) (b (i+s))) Empty (Two (b (i+2*s)) (b (i+3*s)))
-    5 -> Deep (5*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Two (b (i+3*s)) (b (i+4*s)))
-    6 -> Deep (6*s) (Three (b i) (b (i+s)) (b (i+2*s))) Empty (Three (b (i+3*s)) (b (i+4*s)) (b (i+5*s)))
-    _ -> case trees `quotRem` 3 of
-      (trees',1) -> Deep (trees*s) (Two (b i) (b (i+s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+2*s) (trees'-1))
-                         (Two (b (i+(2+3*(trees'-1))*s)) (b (i+(3+3*(trees'-1))*s)))
-      (trees',2) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-1))
-                         (Two (b (i+(3+3*(trees'-1))*s)) (b (i+(4+3*(trees'-1))*s)))
-      (trees',0) -> Deep (trees*s) (Three (b i) (b (i+s)) (b (i+2*s)))
-                         (create (\j -> Node3 (3*s) (b j) (b (j+s)) (b (j+2*s))) (3*s) (i+3*s) (trees'-2))
-                         (Three (b (i+(3+3*(trees'-2))*s)) (b (i+(4+3*(trees'-2))*s)) (b (i+(5+3*(trees'-2))*s)))
+  where
+    create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
+    create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
+       1 -> Single $ b i
+       2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
+       3 -> Deep (3*s) (createTwo b s i) Empty (One (b (i+2*s)))
+       4 -> Deep (4*s) (createTwo b s i) Empty (createTwo b s (i+2*s))
+       5 -> Deep (5*s) (createThree b s i) Empty (createTwo b s (i+3*s))
+       6 -> Deep (6*s) (createThree b s i) Empty (createThree b s (i+3*s))
+       _ -> case trees `quotRem` 3 of
+           (trees', 1) -> Deep (trees*s) (createTwo b s i)
+                              (create mb (3*s) (i+2*s) (trees'-1))
+                              (createTwo b s (i+(2+3*(trees'-1))*s))
+           (trees', 2) -> Deep (trees*s) (createThree b s i)
+                              (create mb (3*s) (i+3*s) (trees'-1))
+                              (createTwo b s (i+(3+3*(trees'-1))*s))
+           (trees', 0) -> Deep (trees*s) (createThree b s i)
+                              (create mb (3*s) (i+3*s) (trees'-2))
+                              (createThree b s (i+(3+3*(trees'-2))*s))
+      where
+        createTwo b s i = Two (b i) (b (i + s))
+        createThree b s i = Three (b i) (b (i + s)) (b (i + s + s))
+        mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
 
 -- Splitting
 


From git at git.haskell.org  Sun Dec 20 16:22:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:31 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Rename strictness tests to match other test names. (7e42d81)
Message-ID: <20151220162231.8B69E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7e42d81350aac6db1aa52180572a117e67b168b3

>---------------------------------------------------------------

commit 7e42d81350aac6db1aa52180572a117e67b168b3
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 15:56:15 2014 +0100

    Rename strictness tests to match other test names.


>---------------------------------------------------------------

7e42d81350aac6db1aa52180572a117e67b168b3
 containers.cabal                                    | 4 ++--
 tests/{IntMapStrictness.hs => intmap-strictness.hs} | 0
 tests/{MapStrictness.hs => map-strictness.hs}       | 0
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/containers.cabal b/containers.cabal
index 050257c..ae7e247 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -211,7 +211,7 @@ Test-suite seq-properties
 
 test-suite map-strictness-properties
   hs-source-dirs: tests, .
-  main-is: MapStrictness.hs
+  main-is: map-strictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
@@ -228,7 +228,7 @@ test-suite map-strictness-properties
 
 test-suite intmap-strictness-properties
   hs-source-dirs: tests, .
-  main-is: IntMapStrictness.hs
+  main-is: intmap-strictness.hs
   type: exitcode-stdio-1.0
 
   build-depends:
diff --git a/tests/IntMapStrictness.hs b/tests/intmap-strictness.hs
similarity index 100%
rename from tests/IntMapStrictness.hs
rename to tests/intmap-strictness.hs
diff --git a/tests/MapStrictness.hs b/tests/map-strictness.hs
similarity index 100%
rename from tests/MapStrictness.hs
rename to tests/map-strictness.hs


From git at git.haskell.org  Sun Dec 20 16:22:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:33 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use pre-evaluated sequences in benchmarks. (999851e)
Message-ID: <20151220162233.921833A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/999851e33acde2db08b06cf8d0331f37bbeb3c0b

>---------------------------------------------------------------

commit 999851e33acde2db08b06cf8d0331f37bbeb3c0b
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:26:42 2014 +0100

    Use pre-evaluated sequences in benchmarks.


>---------------------------------------------------------------

999851e33acde2db08b06cf8d0331f37bbeb3c0b
 benchmarks/Sequence.hs | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index ccaca6c..8fd1fcf 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -12,13 +12,20 @@ main = do
     let s10 = S.fromList [1..10] :: S.Seq Int
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
-    rnf [s10, s100, s1000] `seq` return ()
+        s10000 = S.fromList [1..10000] :: S.Seq Int
+    rnf [s10, s100, s1000, s10000] `seq` return ()
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
         r100 = rlist 100
         r1000 = rlist 1000
-    rnf [r10, r100, r1000] `seq` return ()
+        r10000 = rlist 10000
+    rnf [r10, r100, r1000, r10000] `seq` return ()
+    let u10 = S.replicate 10 () :: S.Seq ()
+        u100 = S.replicate 100 () :: S.Seq ()
+        u1000 = S.replicate 1000 () :: S.Seq ()
+        u10000 = S.replicate 10000 () :: S.Seq ()
+    rnf [u10, u100, u1000, u10000] `seq` return ()
     defaultMain
       [ bgroup "splitAt/append"
          [ bench "10" $ nf (shuffle r10) s10
@@ -26,9 +33,9 @@ main = do
          , bench "1000" $ nf (shuffle r1000) s1000
          ]
       , bgroup "zip"
-         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (S.replicate 10000 (), S.fromList [1..10000::Int])
-         , bench "nf150" $ nf (uncurry S.zip) (S.fromList [1..150::Int], S.replicate 150 ())
-         , bench "nf10000" $ nf (uncurry S.zip) (S.fromList [1..10000::Int], S.replicate 10000 ())
+         [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (s10000, u10000)
+         , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
+         , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
          ] ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Sun Dec 20 16:22:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:35 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Update URL of the fingertree paper. (7ffc123)
Message-ID: <20151220162235.9ABDB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7ffc123000d82a676a23e0ce5e916a871598610f

>---------------------------------------------------------------

commit 7ffc123000d82a676a23e0ce5e916a871598610f
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:40:11 2014 +0100

    Update URL of the fingertree paper.


>---------------------------------------------------------------

7ffc123000d82a676a23e0ce5e916a871598610f
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index f3fbbe7..9f3f543 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -40,7 +40,7 @@
 --    * Ralf Hinze and Ross Paterson,
 --      \"Finger trees: a simple general-purpose data structure\",
 --      /Journal of Functional Programming/ 16:2 (2006) pp 197-217.
---      <http://www.soi.city.ac.uk/~ross/papers/FingerTree.html>
+--      <http://staff.city.ac.uk/~ross/papers/FingerTree.html>
 --
 -- /Note/: Many of these operations have the same names as similar
 -- operations on lists in the "Prelude".  The ambiguity may be resolved


From git at git.haskell.org  Sun Dec 20 16:22:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:37 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add test for fromFunction. (61eeeec)
Message-ID: <20151220162237.A1A0D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/61eeeec856e39108ba3d5cb4251b249acc782305

>---------------------------------------------------------------

commit 61eeeec856e39108ba3d5cb4251b249acc782305
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 14 16:49:49 2014 +0100

    Add test for fromFunction.


>---------------------------------------------------------------

61eeeec856e39108ba3d5cb4251b249acc782305
 tests/seq-properties.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 74b2e9c..14d5a5f 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -36,6 +36,7 @@ main = defaultMain
        , testProperty "(|>)" prop_snoc
        , testProperty "(><)" prop_append
        , testProperty "fromList" prop_fromList
+       , testProperty "fromFunction" prop_fromFunction
        , testProperty "replicate" prop_replicate
        , testProperty "replicateA" prop_replicateA
        , testProperty "replicateM" prop_replicateM
@@ -270,6 +271,10 @@ prop_fromList :: [A] -> Bool
 prop_fromList xs =
     toList' (fromList xs) ~= xs
 
+prop_fromFunction :: [A] -> Bool
+prop_fromFunction xs =
+    toList' (fromFunction (Prelude.length xs) (xs!!)) ~= xs
+
 -- ** Repetition
 
 prop_replicate :: NonNegative Int -> A -> Bool


From git at git.haskell.org  Sun Dec 20 16:22:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:39 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Fix warnings. (610ebfb)
Message-ID: <20151220162239.A996B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/610ebfbe4eecfb04886ed87691aeb65869ee0445

>---------------------------------------------------------------

commit 610ebfbe4eecfb04886ed87691aeb65869ee0445
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 07:41:55 2014 +0100

    Fix warnings.


>---------------------------------------------------------------

610ebfbe4eecfb04886ed87691aeb65869ee0445
 Data/Sequence.hs | 48 ++++++++++++++++++++++--------------------------
 1 file changed, 22 insertions(+), 26 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9f3f543..d85cab6 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -164,9 +164,9 @@ import Data.Functor (Functor(..))
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
 #else
 #if MIN_VERSION_base(4,6,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr'), toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl'), toList)
 #else
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', foldr', toList)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', toList)
 #endif
 #endif
 import Data.Traversable
@@ -180,6 +180,7 @@ import Data.Data
 #endif
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
+import qualified GHC.Exts
 #define COERCE coerce
 #else
 #ifdef __GLASGOW_HASKELL__
@@ -192,9 +193,6 @@ import qualified Unsafe.Coerce
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif
-#ifdef __GLASGOW_HASKELL__
-import qualified GHC.Exts
-#endif
 
 infixr 5 `consTree`
 infixl 5 `snocTree`
@@ -246,6 +244,8 @@ instance Foldable Seq where
     {-# INLINE length #-}
     null   = null
     {-# INLINE null #-}
+    toList   = toList
+    {-# INLINE toList #-}
 #endif
 
 instance Traversable Seq where
@@ -611,10 +611,6 @@ instance Applicative (State s) where
 execState :: State s a -> s -> a
 execState m x = snd (runState m x)
 
--- | A helper method: a strict version of mapAccumL.
-mapAccumL' :: Traversable t => (a -> b -> (a, c)) -> a -> t b -> (a, t c)
-mapAccumL' f s t = runState (traverse (State . flip f) t) s
-
 -- | 'applicativeTree' takes an Applicative-wrapped construction of a
 -- piece of a FingerTree, assumed to always have the same size (which
 -- is put in the second argument), and replicates it as many times as
@@ -1305,12 +1301,12 @@ adjustDigit f i (Four a b c d)
 -- function that also depends on the element's index, and applies it to every
 -- element in the sequence.
 mapWithIndex :: (Int -> a -> b) -> Seq a -> Seq b
-mapWithIndex f (Seq xs) = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f s a)) 0 xs
+mapWithIndex f' (Seq xs') = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f' s a)) 0 xs'
  where
   {-# SPECIALIZE mapWithIndexTree :: (Int -> Elem y -> b) -> Int -> FingerTree (Elem y) -> FingerTree b #-}
   {-# SPECIALIZE mapWithIndexTree :: (Int -> Node y -> b) -> Int -> FingerTree (Node y) -> FingerTree b #-}
   mapWithIndexTree :: Sized a => (Int -> a -> b) -> Int -> FingerTree a -> FingerTree b
-  mapWithIndexTree _f s Empty = s `seq` Empty
+  mapWithIndexTree _ s Empty = s `seq` Empty
   mapWithIndexTree f s (Single xs) = Single $ f s xs
   mapWithIndexTree f s (Deep n pr m sf) = sPspr `seq` sPsprm `seq`
           Deep n
@@ -1379,23 +1375,23 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
     create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
        1 -> Single $ b i
        2 -> Deep (2*s) (One (b i)) Empty (One (b (i+s)))
-       3 -> Deep (3*s) (createTwo b s i) Empty (One (b (i+2*s)))
-       4 -> Deep (4*s) (createTwo b s i) Empty (createTwo b s (i+2*s))
-       5 -> Deep (5*s) (createThree b s i) Empty (createTwo b s (i+3*s))
-       6 -> Deep (6*s) (createThree b s i) Empty (createThree b s (i+3*s))
+       3 -> Deep (3*s) (createTwo i) Empty (One (b (i+2*s)))
+       4 -> Deep (4*s) (createTwo i) Empty (createTwo (i+2*s))
+       5 -> Deep (5*s) (createThree i) Empty (createTwo (i+3*s))
+       6 -> Deep (6*s) (createThree i) Empty (createThree (i+3*s))
        _ -> case trees `quotRem` 3 of
-           (trees', 1) -> Deep (trees*s) (createTwo b s i)
+           (trees', 1) -> Deep (trees*s) (createTwo i)
                               (create mb (3*s) (i+2*s) (trees'-1))
-                              (createTwo b s (i+(2+3*(trees'-1))*s))
-           (trees', 2) -> Deep (trees*s) (createThree b s i)
+                              (createTwo (i+(2+3*(trees'-1))*s))
+           (trees', 2) -> Deep (trees*s) (createThree i)
                               (create mb (3*s) (i+3*s) (trees'-1))
-                              (createTwo b s (i+(3+3*(trees'-1))*s))
-           (trees', 0) -> Deep (trees*s) (createThree b s i)
+                              (createTwo (i+(3+3*(trees'-1))*s))
+           (trees', _) -> Deep (trees*s) (createThree i)
                               (create mb (3*s) (i+3*s) (trees'-2))
-                              (createThree b s (i+(3+3*(trees'-2))*s))
+                              (createThree (i+(3+3*(trees'-2))*s))
       where
-        createTwo b s i = Two (b i) (b (i + s))
-        createThree b s i = Three (b i) (b (i + s)) (b (i + s + s))
+        createTwo j = Two (b j) (b (j + s))
+        createThree j = Three (b j) (b (j + s)) (b (j + 2*s))
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
 
 -- Splitting
@@ -1884,8 +1880,8 @@ splitMap splt' = go
   {-# SPECIALIZE splitMapTree :: (Int -> s -> (s,s)) -> (s -> Elem y -> b) -> s -> FingerTree (Elem y) -> FingerTree b #-}
   {-# SPECIALIZE splitMapTree :: (Int -> s -> (s,s)) -> (s -> Node y -> b) -> s -> FingerTree (Node y) -> FingerTree b #-}
   splitMapTree :: Sized a => (Int -> s -> (s,s)) -> (s -> a -> b) -> s -> FingerTree a -> FingerTree b
-  splitMapTree splt _f _s Empty = Empty
-  splitMapTree splt f s (Single xs) = Single $ f s xs
+  splitMapTree _    _ _ Empty = Empty
+  splitMapTree _    f s (Single xs) = Single $ f s xs
   splitMapTree splt f s (Deep n pr m sf) = Deep n (splitMapDigit splt f prs pr) (splitMapTree splt (splitMapNode splt f) ms m) (splitMapDigit splt f sfs sf)
     where
       (prs, r) = splt (size pr) s
@@ -1894,7 +1890,7 @@ splitMap splt' = go
   {-# SPECIALIZE splitMapDigit :: (Int -> s -> (s,s)) -> (s -> Elem y -> b) -> s -> Digit (Elem y) -> Digit b #-}
   {-# SPECIALIZE splitMapDigit :: (Int -> s -> (s,s)) -> (s -> Node y -> b) -> s -> Digit (Node y) -> Digit b #-}
   splitMapDigit :: Sized a => (Int -> s -> (s,s)) -> (s -> a -> b) -> s -> Digit a -> Digit b
-  splitMapDigit splt f s (One a) = One (f s a)
+  splitMapDigit _    f s (One a) = One (f s a)
   splitMapDigit splt f s (Two a b) = Two (f first a) (f second b)
     where
       (first, second) = splt (size a) s


From git at git.haskell.org  Sun Dec 20 16:22:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:41 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Make sure the helper functions are inlined. (3e60f3a)
Message-ID: <20151220162241.B104B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3e60f3aa337ddf670a3f20586353c539f6b49eb4

>---------------------------------------------------------------

commit 3e60f3aa337ddf670a3f20586353c539f6b49eb4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 08:15:42 2014 +0100

    Make sure the helper functions are inlined.


>---------------------------------------------------------------

3e60f3aa337ddf670a3f20586353c539f6b49eb4
 Data/Sequence.hs | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index d85cab6..fa80b3f 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1391,8 +1391,11 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
                               (createThree (i+(3+3*(trees'-2))*s))
       where
         createTwo j = Two (b j) (b (j + s))
+        {-# INLINE createTwo #-}
         createThree j = Three (b j) (b (j + s)) (b (j + 2*s))
+        {-# INLINE createThree #-}
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
+        {-# INLINE mb #-}
 
 -- Splitting
 


From git at git.haskell.org  Sun Dec 20 16:22:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:43 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Move the closing parent to a separate line. (97599c0)
Message-ID: <20151220162243.B7E023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/97599c082e5388551d2f8f767045b807194083fa

>---------------------------------------------------------------

commit 97599c082e5388551d2f8f767045b807194083fa
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 08:24:34 2014 +0100

    Move the closing parent to a separate line.


>---------------------------------------------------------------

97599c082e5388551d2f8f767045b807194083fa
 benchmarks/Sequence.hs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8fd1fcf..8bc2d74 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -36,7 +36,8 @@ main = do
          [ bench "ix10000/5000" $ nf (\(xs,ys) -> S.zip xs ys `S.index` 5000) (s10000, u10000)
          , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
          , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
-         ] ]
+         ]
+      ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point
 -- and rejoin the pieces in the opposite order.


From git at git.haskell.org  Sun Dec 20 16:22:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:45 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Remove unsafeCoerce, use only coerce on GHC 7.8 and later. (b38f240)
Message-ID: <20151220162245.BFD153A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b38f240ab4bec53c5f5800cc1b621a00b4604b2d

>---------------------------------------------------------------

commit b38f240ab4bec53c5f5800cc1b621a00b4604b2d
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 09:02:37 2014 +0100

    Remove unsafeCoerce, use only coerce on GHC 7.8 and later.
    
    Also, move the conditional compilation to a local where definition.
    
    On my GHC 7.6.3, there is no heap allocation in the cmm in fromFunction
    for the (Elem . f) closure, so there is no penalty of not using `coerce`.
    Nevertheless, GHC 7.8.3 and GHC-head (15 Dec 2014) do heap-allocate
    trivial closure for (Elem . f), so `coerce` helps.
    
    Back to GHC 7.6.3, I found that the following does not allocate in
    GHC 7.6.3:
      newtype Elem a = Elem a
      elemMap :: Int -> (Int -> b) -> [Elem b]
      elemMap s f = go (Elem . f) 0
       where go :: (Int -> b) -> Int -> [b]
             go f i | i >= s = []
                    | otherwise = f i : go f (i+1)
    Nevertheless, the following does heap-allocate trivial closure for f:
      newtype Elem a = Elem a
      elemMap :: [Int] -> (Int -> b) -> [Elem b]
      elemMap xs f = go (Elem . f) xs
       where go :: (Int -> b) -> [Int] -> [b]
             go f [] = []
             go f (x:xs) = f x : go f xs
    I am not sure what the difference is, but the current fromFunction
    does not allocate too (on 7.6.3).


>---------------------------------------------------------------

b38f240ab4bec53c5f5800cc1b621a00b4604b2d
 Data/Sequence.hs | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index fa80b3f..4c281fc 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -181,14 +181,7 @@ import Data.Data
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
 import qualified GHC.Exts
-#define COERCE coerce
 #else
-#ifdef __GLASGOW_HASKELL__
-import qualified Unsafe.Coerce
--- Note that by compiling this file with GHC 7.8 or later, we prove that
--- it is safe to use COERCE with earlier GHC versions.
-#define COERCE Unsafe.Coerce.unsafeCoerce
-#endif
 #endif
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
@@ -1365,11 +1358,7 @@ mapWithIndex f' (Seq xs') = Seq $ mapWithIndexTree (\s (Elem a) -> Elem (f' s a)
 fromFunction :: Int -> (Int -> a) -> Seq a
 fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with negative len"
                    | len == 0 = empty
-#ifdef __GLASGOW_HASKELL__
-                   | otherwise = Seq $ create (COERCE f) 1 0 len
-#else
-                   | otherwise = Seq $ create (Elem . f) 1 0 len
-#endif
+                   | otherwise = Seq $ create (lift_elem f) 1 0 len
   where
     create :: (Int -> a) -> Int -> Int -> Int -> FingerTree a
     create b{-tree_builder-} s{-tree_size-} i{-start_index-} trees = i `seq` s `seq` case trees of
@@ -1397,6 +1386,14 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
         mb j = Node3 (3*s) (b j) (b (j + s)) (b (j + 2*s))
         {-# INLINE mb #-}
 
+    lift_elem :: (Int -> a) -> (Int -> Elem a)
+#if __GLASGOW_HASKELL__ >= 708
+    lift_elem g = coerce g
+#else
+    lift_elem g = Elem . g
+#endif
+    {-# INLINE lift_elem #-}
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.


From git at git.haskell.org  Sun Dec 20 16:22:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:47 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add simple fromFunction benchmarks. (a556ef2)
Message-ID: <20151220162247.C74753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a556ef225952c27731a00b24b6417b6a057507ce

>---------------------------------------------------------------

commit a556ef225952c27731a00b24b6417b6a057507ce
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 14:47:20 2014 +0100

    Add simple fromFunction benchmarks.


>---------------------------------------------------------------

a556ef225952c27731a00b24b6417b6a057507ce
 benchmarks/Sequence.hs | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index 8bc2d74..b6b82fa 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -37,6 +37,13 @@ main = do
          , bench "nf100" $ nf (uncurry S.zip) (s100, u100)
          , bench "nf10000" $ nf (uncurry S.zip) (s10000, u10000)
          ]
+      , bgroup "fromFunction"
+         [ bench "ix10000/5000" $ nf (\s -> S.fromFunction s (+1) `S.index` (s `div` 2)) 10000
+         , bench "nf10" $ nf (\s -> S.fromFunction s (+1)) 10
+         , bench "nf100" $ nf (\s -> S.fromFunction s (+1)) 100
+         , bench "nf1000" $ nf (\s -> S.fromFunction s (+1)) 1000
+         , bench "nf10000" $ nf (\s -> S.fromFunction s (+1)) 10000
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Sun Dec 20 16:22:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:49 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use a top-down version of fromList (51a1f7c)
Message-ID: <20151220162249.CE5F23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/51a1f7c6670058ed4feefd1ef86170ddef173e63

>---------------------------------------------------------------

commit 51a1f7c6670058ed4feefd1ef86170ddef173e63
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Dec 9 14:56:53 2014 -0500

    Use a top-down version of fromList
    
    Ross Paterson came up with a version of fromList that avoids the
    tree rebuilding inherent in the `(|>)`-based approach. This
    version is somewhat strictified and rearranged. It reduces
    allocation substantially over the old version. Mutator time goes
    down too, but for some reason GC time rises to match it.


>---------------------------------------------------------------

51a1f7c6670058ed4feefd1ef86170ddef173e63
 Data/Sequence.hs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 4c281fc..651dd5e 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1752,11 +1752,34 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- Lists
 ------------------------------------------------------------------------
 
+-- The implementation below, by Ross Paterson, avoids the rebuilding
+-- the previous (|>)-based implementation suffered from.
+
 -- | /O(n)/. Create a sequence from a finite list of elements.
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList        =  Data.List.foldl' (|>) empty
+fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
+  where
+    {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
+    {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
+    mkTree :: (Sized a) => Int -> [a] -> FingerTree a
+    mkTree s [] = s `seq` Empty
+    mkTree s [x1] = s `seq` Single x1
+    mkTree s [x1, x2] = Deep (2*s) (One x1) Empty (One x2)
+    mkTree s [x1, x2, x3] = Deep (3*s) (One x1) Empty (Two x2 x3)
+    mkTree s (x1:x2:x3:xs) = s `seq` case getNodes (3*s) xs of
+                                       (ns, sf) -> m `seq` deep' (Three x1 x2 x3) m sf
+                                           where m = mkTree (3*s) ns
+
+    deep' pr@(Three x1 _ _) m sf = Deep (3*size x1 + size m + size sf) pr m sf
+    
+    getNodes :: Int -> [a] -> ([Node a], Digit a)
+    getNodes s [x1] = s `seq` ([], One x1)
+    getNodes s [x1, x2] = s `seq` ([], Two x1 x2)
+    getNodes s [x1, x2, x3] = s `seq` ([], Three x1 x2 x3)
+    getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
+       where (ns, d) = getNodes s xs
 
 #if __GLASGOW_HASKELL__ >= 708
 instance GHC.Exts.IsList (Seq a) where


From git at git.haskell.org  Sun Dec 20 16:22:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:51 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Remove trailing whitespace. (a1d613b)
Message-ID: <20151220162251.D70523A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a1d613b50c2e0e15e01159ab2fa1b377a49e2a38

>---------------------------------------------------------------

commit a1d613b50c2e0e15e01159ab2fa1b377a49e2a38
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:30:58 2014 +0100

    Remove trailing whitespace.


>---------------------------------------------------------------

a1d613b50c2e0e15e01159ab2fa1b377a49e2a38
 Data/Sequence.hs | 0
 1 file changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Sun Dec 20 16:22:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:53 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Use coerce for [a]->[Elem a] convertion in fromList. (9b37d5a)
Message-ID: <20151220162253.DEE0B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9b37d5a262e8070abce1f51d4913d9312a630acd

>---------------------------------------------------------------

commit 9b37d5a262e8070abce1f51d4913d9312a630acd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:37:18 2014 +0100

    Use coerce for [a]->[Elem a] convertion in fromList.


>---------------------------------------------------------------

9b37d5a262e8070abce1f51d4913d9312a630acd
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 1b6dea2..71ded95 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1759,7 +1759,7 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
+fromList xs = Seq $ mkTree 1 $ map_elem xs
   where
     {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
     {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
@@ -1781,6 +1781,14 @@ fromList xs = Seq $ mkTree 1 $ Data.List.map Elem xs
     getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
        where (ns, d) = getNodes s xs
 
+    map_elem :: [a] -> [Elem a]
+#if __GLASGOW_HASKELL__ >= 708
+    map_elem xs = coerce xs
+#else
+    map_elem xs = Data.List.map Elem xs
+#endif
+    {-# INLINE map_elem #-}
+
 #if __GLASGOW_HASKELL__ >= 708
 instance GHC.Exts.IsList (Seq a) where
     type Item (Seq a) = a


From git at git.haskell.org  Sun Dec 20 16:22:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:55 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Comment various conditional imports. (9df67f5)
Message-ID: <20151220162255.E641C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/9df67f5121ef14c865b4fae9db96aebf083dfb6c

>---------------------------------------------------------------

commit 9df67f5121ef14c865b4fae9db96aebf083dfb6c
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:57:20 2014 +0100

    Comment various conditional imports.


>---------------------------------------------------------------

9df67f5121ef14c865b4fae9db96aebf083dfb6c
 Data/Sequence.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 71ded95..2e8f84c 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -172,17 +172,22 @@ import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', t
 import Data.Traversable
 import Data.Typeable
 
+-- GHC specific stuff
 #ifdef __GLASGOW_HASKELL__
 import GHC.Exts (build)
 import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
 #endif
+
+-- Coercion on GHC 7.8+
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
 import qualified GHC.Exts
 #else
 #endif
+
+-- Identity functor on base 4.8 (GHC 7.10+)
 #if MIN_VERSION_base(4,8,0)
 import Data.Functor.Identity (Identity(..))
 #endif


From git at git.haskell.org  Sun Dec 20 16:22:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:22:57 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6, develop-0.6-questionable,
 master: Add Data.Sequence.fromArray. (52ba9e5)
Message-ID: <20151220162257.EEFDC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branches: develop-0.6,develop-0.6-questionable,master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/52ba9e5d9c85d4bd11236c1e43b4847a50a3b771

>---------------------------------------------------------------

commit 52ba9e5d9c85d4bd11236c1e43b4847a50a3b771
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 17:58:46 2014 +0100

    Add Data.Sequence.fromArray.
    
    Sugested by David Feuer in #88.
    
    The implementation on GHC uses GHC.Arr module and is considerably faster
    than on non-GHC compilers.


>---------------------------------------------------------------

52ba9e5d9c85d4bd11236c1e43b4847a50a3b771
 Data/Sequence.hs        | 19 +++++++++++++++++++
 tests/seq-properties.hs |  6 ++++++
 2 files changed, 25 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 2e8f84c..690a9fe 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -62,6 +62,7 @@ module Data.Sequence (
     (><),           -- :: Seq a -> Seq a -> Seq a
     fromList,       -- :: [a] -> Seq a
     fromFunction,   -- :: Int -> (Int -> a) -> Seq a
+    fromArray,      -- :: Ix i => Array i a -> Seq a
     -- ** Repetition
     replicate,      -- :: Int -> a -> Seq a
     replicateA,     -- :: Applicative f => Int -> f a -> f (Seq a)
@@ -180,6 +181,13 @@ import Text.Read (Lexeme(Ident), lexP, parens, prec,
 import Data.Data
 #endif
 
+-- Array stuff, with GHC.Arr on GHC
+import Data.Array (Ix, Array)
+import qualified Data.Array
+#ifdef __GLASGOW_HASKELL__
+import qualified GHC.Arr
+#endif
+
 -- Coercion on GHC 7.8+
 #if __GLASGOW_HASKELL__ >= 708
 import Data.Coerce
@@ -1399,6 +1407,17 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 #endif
     {-# INLINE lift_elem #-}
 
+-- | /O(n)/. Create a sequence consisting of the elements of an 'Array'.
+-- Note that the resulting sequence elements may be evaluated lazily (as on GHC),
+-- so you must force the entire structure to be sure that the original array
+-- can be garbage-collected.
+fromArray :: Ix i => Array i a -> Seq a
+#ifdef __GLASGOW_HASKELL__
+fromArray a = fromFunction (GHC.Arr.numElements a) (GHC.Arr.unsafeAt a)
+#else
+fromArray a = fromList2 (Data.Array.rangeSize (Data.Array.bounds a)) (Data.Array.elems a)
+#endif
+
 -- Splitting
 
 -- | /O(log(min(i,n-i)))/. The first @i@ elements of a sequence.
diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 14d5a5f..a64e66d 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -2,6 +2,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
+import Data.Array (listArray)
 import Data.Foldable (Foldable(..), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
@@ -37,6 +38,7 @@ main = defaultMain
        , testProperty "(><)" prop_append
        , testProperty "fromList" prop_fromList
        , testProperty "fromFunction" prop_fromFunction
+       , testProperty "fromArray" prop_fromArray
        , testProperty "replicate" prop_replicate
        , testProperty "replicateA" prop_replicateA
        , testProperty "replicateM" prop_replicateM
@@ -275,6 +277,10 @@ prop_fromFunction :: [A] -> Bool
 prop_fromFunction xs =
     toList' (fromFunction (Prelude.length xs) (xs!!)) ~= xs
 
+prop_fromArray :: [A] -> Bool
+prop_fromArray xs =
+    toList' (fromArray (listArray (42, 42+Prelude.length xs-1) xs)) ~= xs
+
 -- ** Repetition
 
 prop_replicate :: NonNegative Int -> A -> Bool


From git at git.haskell.org  Sun Dec 20 16:23:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:00 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6: Make types of the drawing
 functions more generic, i.e. Show s => Tree s instead of Tree String (7ab1c39)
Message-ID: <20151220162300.0224D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7ab1c399726c5a4a562cff3f56017ff5852ac82e

>---------------------------------------------------------------

commit 7ab1c399726c5a4a562cff3f56017ff5852ac82e
Author: jonasc <github at bcdf.eu>
Date:   Fri Aug 8 00:15:10 2014 +0200

    Make types of the drawing functions more generic, i.e. Show s => Tree s instead of Tree String


>---------------------------------------------------------------

7ab1c399726c5a4a562cff3f56017ff5852ac82e
 Data/Tree.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Tree.hs b/Data/Tree.hs
index 57a4324..1642c3b 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -113,15 +113,15 @@ instance NFData a => NFData (Tree a) where
     rnf (Node x ts) = rnf x `seq` rnf ts
 
 -- | Neat 2-dimensional drawing of a tree.
-drawTree :: Tree String -> String
+drawTree :: Show a => Tree a -> String
 drawTree  = unlines . draw
 
 -- | Neat 2-dimensional drawing of a forest.
-drawForest :: Forest String -> String
+drawForest :: Show a => Forest a -> String
 drawForest  = unlines . map drawTree
 
-draw :: Tree String -> [String]
-draw (Node x ts0) = x : drawSubTrees ts0
+draw :: Show a => Tree a -> [String]
+draw (Node x ts0) = show x : drawSubTrees ts0
   where
     drawSubTrees [] = []
     drawSubTrees [t] =


From git at git.haskell.org  Sun Dec 20 16:23:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:02 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6-questionable: Added fixity
 declarations for member, notMember, union, and intersection. (de85ae9)
Message-ID: <20151220162302.0D5603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6-questionable
Link       : http://git.haskell.org/packages/containers.git/commitdiff/de85ae9eccb84284873d419c899743a85bd4e66a

>---------------------------------------------------------------

commit de85ae9eccb84284873d419c899743a85bd4e66a
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:31:20 2014 -0300

    Added fixity declarations for member, notMember, union, and intersection.
    
    Milan Straka: It is quite unlikely that this ever gets merged, as it can
    cause build failures (it broke the testing suite for example) and offers
    in my opinion little benefit.


>---------------------------------------------------------------

de85ae9eccb84284873d419c899743a85bd4e66a
 Data/IntMap/Base.hs | 8 ++++++++
 Data/IntSet/Base.hs | 7 +++++++
 Data/Map/Base.hs    | 8 ++++++++
 Data/Set/Base.hs    | 8 ++++++++
 4 files changed, 31 insertions(+)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index d5fd75a..2a912d9 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -451,6 +451,8 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -459,6 +461,8 @@ member k = k `seq` go
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
+infix 4 notMember
+
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
 -- See Note: Local 'go' functions and capturing]
@@ -874,6 +878,8 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
+infixl 5 union
+
 -- | /O(n+m)/. The union with a combining function.
 --
 -- > unionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == fromList [(3, "b"), (5, "aA"), (7, "C")]
@@ -937,6 +943,8 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
+infixl 5 intersection
+
 -- | /O(n+m)/. The intersection with a combining function.
 --
 -- > intersectionWith (++) (fromList [(5, "a"), (3, "b")]) (fromList [(5, "A"), (7, "C")]) == singleton 5 "aA"
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 6333eea..f2dfb90 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -321,10 +321,14 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
+infix 4 member
+
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -512,6 +516,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
+infixl 5 union
 
 {--------------------------------------------------------------------
   Difference
@@ -586,6 +591,8 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
+infixl 5 intersection
+
 {--------------------------------------------------------------------
   Subset
 --------------------------------------------------------------------}
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index e582e16..92ff096 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -466,6 +466,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
 -- > notMember 5 (fromList [(5,'a'), (3,'b')]) == False
@@ -479,6 +481,8 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
 find :: Ord k => k -> Map k a -> a
@@ -1241,6 +1245,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
 hedgeUnion _   _   t1  Tip = t1
@@ -1361,6 +1367,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 7e792f4..0c4f62b 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -356,6 +356,8 @@ member = go
 {-# INLINE member #-}
 #endif
 
+infix 4 member
+
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
 notMember a t = not $ member a t
@@ -365,6 +367,8 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
+infix 4 notMember
+
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
 -- > lookupLT 3 (fromList [3, 5]) == Nothing
@@ -616,6 +620,8 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
+infixl 5 union
+
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
 hedgeUnion blo bhi Tip (Bin _ x l r) = link x (filterGt blo l) (filterLt bhi r)
@@ -674,6 +680,8 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
+infixl 5 intersection
+
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip
 hedgeInt _ _ Tip _   = Tip


From git at git.haskell.org  Sun Dec 20 16:23:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:04 +0000 (UTC)
Subject: [commit: packages/containers] develop-0.6-questionable: Fixed syntax
 of fixity declarations. (2bf686d)
Message-ID: <20151220162304.1853C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : develop-0.6-questionable
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2bf686d3dd0706eef416590100f8d1ebaa3eb80b

>---------------------------------------------------------------

commit 2bf686d3dd0706eef416590100f8d1ebaa3eb80b
Author: Peter Selinger <selinger at mathstat.dal.ca>
Date:   Fri Jul 4 10:47:35 2014 -0300

    Fixed syntax of fixity declarations.


>---------------------------------------------------------------

2bf686d3dd0706eef416590100f8d1ebaa3eb80b
 Data/IntMap/Base.hs | 8 ++++----
 Data/IntSet/Base.hs | 8 ++++----
 Data/Map/Base.hs    | 8 ++++----
 Data/Set/Base.hs    | 8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 2a912d9..8afb60c 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -451,7 +451,7 @@ member k = k `seq` go
     go (Tip kx _) = k == kx
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the key not a member of the map?
 --
@@ -461,7 +461,7 @@ infix 4 member
 notMember :: Key -> IntMap a -> Bool
 notMember k m = not $ member k m
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(min(n,W))/. Lookup the value at a key in the map. See also 'Data.Map.lookup'.
 
@@ -878,7 +878,7 @@ union :: IntMap a -> IntMap a -> IntMap a
 union m1 m2
   = mergeWithKey' Bin const id id m1 m2
 
-infixl 5 union
+infixl 5 `union`
 
 -- | /O(n+m)/. The union with a combining function.
 --
@@ -943,7 +943,7 @@ intersection :: IntMap a -> IntMap b -> IntMap a
 intersection m1 m2
   = mergeWithKey' bin const (const Nil) (const Nil) m1 m2
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 -- | /O(n+m)/. The intersection with a combining function.
 --
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index f2dfb90..bd78790 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -321,13 +321,13 @@ member x = x `seq` go
     go (Tip y bm) = prefixOf x == y && bitmapOf x .&. bm /= 0
     go Nil = False
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(min(n,W))/. Is the element not in the set?
 notMember :: Key -> IntSet -> Bool
 notMember k = not . member k
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -516,7 +516,7 @@ union t@(Bin _ _ _ _) Nil = t
 union (Tip kx bm) t = insertBM kx bm t
 union Nil t = t
 
-infixl 5 union
+infixl 5 `union`
 
 {--------------------------------------------------------------------
   Difference
@@ -591,7 +591,7 @@ intersection (Tip kx1 bm1) t2 = intersectBM t2
 
 intersection Nil _ = Nil
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 {--------------------------------------------------------------------
   Subset
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 92ff096..ae291c7 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -466,7 +466,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the key not a member of the map? See also 'member'.
 --
@@ -481,7 +481,7 @@ notMember k m = not $ member k m
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find the value at a key.
 -- Calls 'error' when the element can not be found.
@@ -1245,7 +1245,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 -- left-biased hedge union
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Map a b -> Map a b -> Map a b
@@ -1367,7 +1367,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord k => MaybeS k -> MaybeS k -> Map k a -> Map k b -> Map k a
 hedgeInt _ _ _   Tip = Tip
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 0c4f62b..732e973 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -356,7 +356,7 @@ member = go
 {-# INLINE member #-}
 #endif
 
-infix 4 member
+infix 4 `member`
 
 -- | /O(log n)/. Is the element not in the set?
 notMember :: Ord a => a -> Set a -> Bool
@@ -367,7 +367,7 @@ notMember a t = not $ member a t
 {-# INLINE notMember #-}
 #endif
 
-infix 4 notMember
+infix 4 `notMember`
 
 -- | /O(log n)/. Find largest element smaller than the given one.
 --
@@ -620,7 +620,7 @@ union t1 t2 = hedgeUnion NothingS NothingS t1 t2
 {-# INLINABLE union #-}
 #endif
 
-infixl 5 union
+infixl 5 `union`
 
 hedgeUnion :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeUnion _   _   t1  Tip = t1
@@ -680,7 +680,7 @@ intersection t1 t2 = hedgeInt NothingS NothingS t1 t2
 {-# INLINABLE intersection #-}
 #endif
 
-infixl 5 intersection
+infixl 5 `intersection`
 
 hedgeInt :: Ord a => MaybeS a -> MaybeS a -> Set a -> Set a -> Set a
 hedgeInt _ _ _   Tip = Tip


From git at git.haskell.org  Sun Dec 20 16:23:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:06 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.0
 (b9e4e22)
Message-ID: <20151220162306.1DC4A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b9e4e22d6e37150dcf5c04e4c4beabfba5342576

>---------------------------------------------------------------

commit b9e4e22d6e37150dcf5c04e4c4beabfba5342576
Author: Johan Tibell <johan.tibell at gmail.com>
Date:   Mon Dec 15 19:57:52 2014 +0100

    Bump version number to 0.5.6.0


>---------------------------------------------------------------

b9e4e22d6e37150dcf5c04e4c4beabfba5342576
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index ae7e247..bbf5913 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.5.1
+version: 0.5.6.0
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:23:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:08 +0000 (UTC)
Subject: [commit: packages/containers] master: Add Ross Paterson to 2014
 copyright statement (302d6b4)
Message-ID: <20151220162308.263723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/302d6b4839702ce6e18fd1908240b920efb1b04a

>---------------------------------------------------------------

commit 302d6b4839702ce6e18fd1908240b920efb1b04a
Author: David Feuer <David.Feuer at gmail.com>
Date:   Mon Dec 15 15:54:22 2014 -0500

    Add Ross Paterson to 2014 copyright statement
    
    He wrote the first draft of the new `fromList` code.


>---------------------------------------------------------------

302d6b4839702ce6e18fd1908240b920efb1b04a
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 690a9fe..9a23f77 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -19,7 +19,7 @@
 -- Module      :  Data.Sequence
 -- Copyright   :  (c) Ross Paterson 2005
 --                (c) Louis Wasserman 2009
---                (c) David Feuer and Milan Straka 2014
+--                (c) David Feuer, Ross Paterson, and Milan Straka 2014
 -- License     :  BSD-style
 -- Maintainer  :  libraries at haskell.org
 -- Stability   :  experimental


From git at git.haskell.org  Sun Dec 20 16:23:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:10 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #97 from
 treeowl/add-credit (33e65be)
Message-ID: <20151220162310.2D98E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/33e65bea1713e1720857fb1c1f982631b872913f

>---------------------------------------------------------------

commit 33e65bea1713e1720857fb1c1f982631b872913f
Merge: b9e4e22 302d6b4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 22:01:23 2014 +0100

    Merge pull request #97 from treeowl/add-credit
    
    Add Ross Paterson to 2014 copyright statement



>---------------------------------------------------------------

33e65bea1713e1720857fb1c1f982631b872913f
 Data/Sequence.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:23:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:12 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix warnings. (2bdc5f3)
Message-ID: <20151220162312.350A33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd

>---------------------------------------------------------------

commit 2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 22:47:28 2014 +0100

    Fix warnings.
    
    In getNodes, pass (a, [a]) instead of an [a] which we know is nonempty.
    This way we do not have to create void pattern-match case for empty
    list.
    
    Also use STRICT_x_OF_y macros instead of `seq`-ing in every
    pattern-match case.


>---------------------------------------------------------------

2bdc5f38f740f43b49bad0a53c81b9d4a25a56bd
 Data/Sequence.hs | 40 ++++++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 16 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9a23f77..1f19c62 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -183,7 +183,6 @@ import Data.Data
 
 -- Array stuff, with GHC.Arr on GHC
 import Data.Array (Ix, Array)
-import qualified Data.Array
 #ifdef __GLASGOW_HASKELL__
 import qualified GHC.Arr
 #endif
@@ -200,6 +199,15 @@ import qualified GHC.Exts
 import Data.Functor.Identity (Identity(..))
 #endif
 
+
+-- Use macros to define strictness of functions.
+-- STRICT_x_OF_y denotes an y-ary function strict in the x-th parameter.
+-- We do not use BangPatterns, because they are not in any standard and we
+-- want the compilers to be compiled by as many compilers as possible.
+#define STRICT_1_OF_2(fn) fn arg _ | arg `seq` False = undefined
+#define STRICT_1_OF_3(fn) fn arg _ _ | arg `seq` False = undefined
+
+
 infixr 5 `consTree`
 infixl 5 `snocTree`
 
@@ -1783,27 +1791,27 @@ findIndicesR p xs = foldlWithIndex g [] xs
 -- There is a function 'toList' in the opposite direction for all
 -- instances of the 'Foldable' class, including 'Seq'.
 fromList        :: [a] -> Seq a
-fromList xs = Seq $ mkTree 1 $ map_elem xs
+fromList = Seq . mkTree 1 . map_elem
   where
     {-# SPECIALIZE mkTree :: Int -> [Elem a] -> FingerTree (Elem a) #-}
     {-# SPECIALIZE mkTree :: Int -> [Node a] -> FingerTree (Node a) #-}
     mkTree :: (Sized a) => Int -> [a] -> FingerTree a
-    mkTree s [] = s `seq` Empty
-    mkTree s [x1] = s `seq` Single x1
+    STRICT_1_OF_2(mkTree)
+    mkTree _ [] = Empty
+    mkTree _ [x1] = Single x1
     mkTree s [x1, x2] = Deep (2*s) (One x1) Empty (One x2)
     mkTree s [x1, x2, x3] = Deep (3*s) (One x1) Empty (Two x2 x3)
-    mkTree s (x1:x2:x3:xs) = s `seq` case getNodes (3*s) xs of
-                                       (ns, sf) -> m `seq` deep' (Three x1 x2 x3) m sf
-                                           where m = mkTree (3*s) ns
-
-    deep' pr@(Three x1 _ _) m sf = Deep (3*size x1 + size m + size sf) pr m sf
-
-    getNodes :: Int -> [a] -> ([Node a], Digit a)
-    getNodes s [x1] = s `seq` ([], One x1)
-    getNodes s [x1, x2] = s `seq` ([], Two x1 x2)
-    getNodes s [x1, x2, x3] = s `seq` ([], Three x1 x2 x3)
-    getNodes s (x1:x2:x3:xs) = s `seq` (Node3 s x1 x2 x3:ns, d)
-       where (ns, d) = getNodes s xs
+    mkTree s (x1:x2:x3:x4:xs) = case getNodes (3*s) x4 xs of
+      (ns, sf) -> case mkTree (3*s) ns of
+        m -> m `seq` Deep (3*size x1 + size m + size sf) (Three x1 x2 x3) m sf
+
+    getNodes :: Int -> a -> [a] -> ([Node a], Digit a)
+    STRICT_1_OF_3(getNodes)
+    getNodes _ x1 [] = ([], One x1)
+    getNodes _ x1 [x2] = ([], Two x1 x2)
+    getNodes _ x1 [x2, x3] = ([], Three x1 x2 x3)
+    getNodes s x1 (x2:x3:x4:xs) = (Node3 s x1 x2 x3:ns, d)
+       where (ns, d) = getNodes s x4 xs
 
     map_elem :: [a] -> [Elem a]
 #if __GLASGOW_HASKELL__ >= 708


From git at git.haskell.org  Sun Dec 20 16:23:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:14 +0000 (UTC)
Subject: [commit: packages/containers] master: Nuke include/Typeable.h,
 create include/containers.h instead. (b3257c8)
Message-ID: <20151220162314.4B3893A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b3257c8b59a9f4dec03be19b6d2cd7a562691e04

>---------------------------------------------------------------

commit b3257c8b59a9f4dec03be19b6d2cd7a562691e04
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 15 23:48:18 2014 +0100

    Nuke include/Typeable.h, create include/containers.h instead.
    
    The "Typeable.h" collides with the header of same name in base.
    
    The new "containers.h" is now used in every Haskell source.
    It contains more stuff used across the containers codebase:
    - INSTANCE_TYPEABLE[0-2] (was in Typeable.h)
    - include MachDeps on __GLASGOW_HASKELL__ to define WORD_SIZE_IN_BITS
    - define STRICT_x_OF_y macros
    - define MIN_VERSION_base if not defined by cabal (during cabal-less build)


>---------------------------------------------------------------

b3257c8b59a9f4dec03be19b6d2cd7a562691e04
 Data/Graph.hs            |  3 +++
 Data/IntMap.hs           |  3 +++
 Data/IntMap/Base.hs      | 15 ++---------
 Data/IntMap/Lazy.hs      |  3 +++
 Data/IntMap/Strict.hs    |  3 +++
 Data/IntSet.hs           |  3 +++
 Data/IntSet/Base.hs      | 25 +++----------------
 Data/Map.hs              |  3 +++
 Data/Map/Base.hs         | 20 +++------------
 Data/Map/Lazy.hs         |  3 +++
 Data/Map/Strict.hs       | 23 ++++-------------
 Data/Sequence.hs         | 18 +++-----------
 Data/Set.hs              |  3 +++
 Data/Set/Base.hs         | 19 +++-----------
 Data/Tree.hs             |  9 ++-----
 Data/Utils/BitUtil.hs    |  8 +++---
 Data/Utils/StrictFold.hs |  3 +++
 Data/Utils/StrictPair.hs |  3 +++
 containers.cabal         |  2 +-
 include/Typeable.h       | 65 ------------------------------------------------
 include/containers.h     | 61 +++++++++++++++++++++++++++++++++++++++++++++
 21 files changed, 116 insertions(+), 179 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc b3257c8b59a9f4dec03be19b6d2cd7a562691e04

From git at git.haskell.org  Sun Dec 20 16:23:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:16 +0000 (UTC)
Subject: [commit: packages/containers] master: Add the include dir also to
 tests. (040309f)
Message-ID: <20151220162316.528863A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/040309f6915306cc7aa7da02f144fe026e4fb6fe

>---------------------------------------------------------------

commit 040309f6915306cc7aa7da02f144fe026e4fb6fe
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 00:24:50 2014 +0100

    Add the include dir also to tests.
    
    This worked with Typeable because Typeable from `base` instead of
    `containers` was used.


>---------------------------------------------------------------

040309f6915306cc7aa7da02f144fe026e4fb6fe
 containers.cabal | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/containers.cabal b/containers.cabal
index afd2e34..6c77693 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -85,6 +85,7 @@ Test-suite map-lazy-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -102,6 +103,7 @@ Test-suite map-strict-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -119,6 +121,7 @@ Test-suite set-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -136,6 +139,7 @@ Test-suite intmap-lazy-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -153,6 +157,7 @@ Test-suite intmap-strict-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -170,6 +175,7 @@ Test-suite intset-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -187,6 +193,7 @@ Test-suite deprecated-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -202,6 +209,7 @@ Test-suite seq-properties
 
     build-depends: base >= 4.2 && < 5, array, deepseq >= 1.2 && < 1.5, ghc-prim
     ghc-options: -O2
+    include-dirs: include
     extensions: MagicHash, DeriveDataTypeable, StandaloneDeriving, Rank2Types
 
     build-depends:
@@ -225,6 +233,7 @@ test-suite map-strictness-properties
     test-framework-quickcheck2 >= 0.2.9
 
   ghc-options: -Wall
+  include-dirs: include
 
 test-suite intmap-strictness-properties
   hs-source-dirs: tests, .
@@ -242,3 +251,4 @@ test-suite intmap-strictness-properties
     test-framework-quickcheck2 >= 0.2.9
 
   ghc-options: -Wall
+  include-dirs: include


From git at git.haskell.org  Sun Dec 20 16:23:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:18 +0000 (UTC)
Subject: [commit: packages/containers] master: Disable coercion tests for the
 time being. (bc74f91)
Message-ID: <20151220162318.5A9653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bc74f915a5c223ae976290161b1b2f4ef7ea5b41

>---------------------------------------------------------------

commit bc74f915a5c223ae976290161b1b2f4ef7ea5b41
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 09:38:16 2014 +0100

    Disable coercion tests for the time being.


>---------------------------------------------------------------

bc74f915a5c223ae976290161b1b2f4ef7ea5b41
 tests-ghc/all.T                                            | 5 -----
 tests-ghc/unreliable/README                                | 2 ++
 tests-ghc/{all.T => unreliable/coerce_tests}               | 7 -------
 tests-ghc/{ => unreliable}/mapcoerceintmap.hs              | 0
 tests-ghc/{ => unreliable}/mapcoerceintmap.stdout          | 0
 tests-ghc/{ => unreliable}/mapcoerceintmapstrict.hs        | 0
 tests-ghc/{ => unreliable}/mapcoerceintmapstrict.hs.stdout | 0
 tests-ghc/{ => unreliable}/mapcoercemap.hs                 | 0
 tests-ghc/{ => unreliable}/mapcoercemap.stdout             | 0
 tests-ghc/{ => unreliable}/mapcoerceseq.hs                 | 0
 tests-ghc/{ => unreliable}/mapcoerceseq.stdout             | 0
 tests-ghc/{ => unreliable}/mapcoercesmap.hs                | 0
 tests-ghc/{ => unreliable}/mapcoercesmap.stdout            | 0
 13 files changed, 2 insertions(+), 12 deletions(-)

diff --git a/tests-ghc/all.T b/tests-ghc/all.T
index eba1dcc..b7887dc 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/all.T
@@ -5,8 +5,3 @@ test('datamap001', normal, compile_and_run, ['-package containers'])
 test('datamap002', normal, compile_and_run, ['-package containers'])
 test('dataintset001', normal, compile_and_run, ['-package containers'])
 test('sequence001', normal, compile_and_run, ['-package containers'])
-test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoerceintmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
-test('mapcoerceintmapstrict', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/unreliable/README b/tests-ghc/unreliable/README
new file mode 100644
index 0000000..23240fe
--- /dev/null
+++ b/tests-ghc/unreliable/README
@@ -0,0 +1,2 @@
+These coerce tests depend on whether RULES are fired or not,
+so adding them to general GHC suite might cause testing failures.
diff --git a/tests-ghc/all.T b/tests-ghc/unreliable/coerce_tests
similarity index 55%
copy from tests-ghc/all.T
copy to tests-ghc/unreliable/coerce_tests
index eba1dcc..5cc72d0 100644
--- a/tests-ghc/all.T
+++ b/tests-ghc/unreliable/coerce_tests
@@ -1,10 +1,3 @@
-# This is a test script for use with GHC's testsuite framework, see
-# http://darcs.haskell.org/testsuite
-
-test('datamap001', normal, compile_and_run, ['-package containers'])
-test('datamap002', normal, compile_and_run, ['-package containers'])
-test('dataintset001', normal, compile_and_run, ['-package containers'])
-test('sequence001', normal, compile_and_run, ['-package containers'])
 test('mapcoerceseq', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercemap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
 test('mapcoercesmap', when(compiler_ge('ghc','7.9')), compile_and_run, ['-package containers'])
diff --git a/tests-ghc/mapcoerceintmap.hs b/tests-ghc/unreliable/mapcoerceintmap.hs
similarity index 100%
rename from tests-ghc/mapcoerceintmap.hs
rename to tests-ghc/unreliable/mapcoerceintmap.hs
diff --git a/tests-ghc/mapcoerceintmap.stdout b/tests-ghc/unreliable/mapcoerceintmap.stdout
similarity index 100%
rename from tests-ghc/mapcoerceintmap.stdout
rename to tests-ghc/unreliable/mapcoerceintmap.stdout
diff --git a/tests-ghc/mapcoerceintmapstrict.hs b/tests-ghc/unreliable/mapcoerceintmapstrict.hs
similarity index 100%
rename from tests-ghc/mapcoerceintmapstrict.hs
rename to tests-ghc/unreliable/mapcoerceintmapstrict.hs
diff --git a/tests-ghc/mapcoerceintmapstrict.hs.stdout b/tests-ghc/unreliable/mapcoerceintmapstrict.hs.stdout
similarity index 100%
rename from tests-ghc/mapcoerceintmapstrict.hs.stdout
rename to tests-ghc/unreliable/mapcoerceintmapstrict.hs.stdout
diff --git a/tests-ghc/mapcoercemap.hs b/tests-ghc/unreliable/mapcoercemap.hs
similarity index 100%
rename from tests-ghc/mapcoercemap.hs
rename to tests-ghc/unreliable/mapcoercemap.hs
diff --git a/tests-ghc/mapcoercemap.stdout b/tests-ghc/unreliable/mapcoercemap.stdout
similarity index 100%
rename from tests-ghc/mapcoercemap.stdout
rename to tests-ghc/unreliable/mapcoercemap.stdout
diff --git a/tests-ghc/mapcoerceseq.hs b/tests-ghc/unreliable/mapcoerceseq.hs
similarity index 100%
rename from tests-ghc/mapcoerceseq.hs
rename to tests-ghc/unreliable/mapcoerceseq.hs
diff --git a/tests-ghc/mapcoerceseq.stdout b/tests-ghc/unreliable/mapcoerceseq.stdout
similarity index 100%
rename from tests-ghc/mapcoerceseq.stdout
rename to tests-ghc/unreliable/mapcoerceseq.stdout
diff --git a/tests-ghc/mapcoercesmap.hs b/tests-ghc/unreliable/mapcoercesmap.hs
similarity index 100%
rename from tests-ghc/mapcoercesmap.hs
rename to tests-ghc/unreliable/mapcoercesmap.hs
diff --git a/tests-ghc/mapcoercesmap.stdout b/tests-ghc/unreliable/mapcoercesmap.stdout
similarity index 100%
rename from tests-ghc/mapcoercesmap.stdout
rename to tests-ghc/unreliable/mapcoercesmap.stdout


From git at git.haskell.org  Sun Dec 20 16:23:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:20 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove circular `toList`
 definition. (446e295)
Message-ID: <20151220162320.6257F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/446e295ee0db08bb10f6e5dca6f930669b565ffc

>---------------------------------------------------------------

commit 446e295ee0db08bb10f6e5dca6f930669b565ffc
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 11:11:07 2014 +0100

    Remove circular `toList` definition.
    
    When writing this, I assumed we have explicit `toList` as we have in
    other containers. We do not have `toList`, and even if we did, the code
    would not compile, as the two `toList`s (ours and `Foldable`) would
    collide.


>---------------------------------------------------------------

446e295ee0db08bb10f6e5dca6f930669b565ffc
 Data/Sequence.hs | 2 --
 1 file changed, 2 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 800ec46..b540978 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -247,8 +247,6 @@ instance Foldable Seq where
     {-# INLINE length #-}
     null   = null
     {-# INLINE null #-}
-    toList   = toList
-    {-# INLINE toList #-}
 #endif
 
 instance Traversable Seq where


From git at git.haskell.org  Sun Dec 20 16:23:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:22 +0000 (UTC)
Subject: [commit: packages/containers] master: Import only used class methods
 of Foldable. (6b026a7)
Message-ID: <20151220162322.6AA7A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6b026a7a730569d21b27ad2a8c18961cd8662a35

>---------------------------------------------------------------

commit 6b026a7a730569d21b27ad2a8c18961cd8662a35
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:12:37 2014 +0100

    Import only used class methods of Foldable.
    
    On GHC 7.8, the Foldable class contains also null and length, which
    conflicts with Data.Sequence{null,length}.


>---------------------------------------------------------------

6b026a7a730569d21b27ad2a8c18961cd8662a35
 tests/seq-properties.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index a64e66d..4cf0876 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -3,7 +3,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
 import Data.Array (listArray)
-import Data.Foldable (Foldable(..), toList, all, sum)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
 import Data.Monoid (Monoid(..))


From git at git.haskell.org  Sun Dec 20 16:23:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:24 +0000 (UTC)
Subject: [commit: packages/containers] master: It is perfectly fine to import
 class methods... (d288dc7)
Message-ID: <20151220162324.7222E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d288dc750949e476af221a832dea8d8c053808a4

>---------------------------------------------------------------

commit d288dc750949e476af221a832dea8d8c053808a4
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:16:20 2014 +0100

    It is perfectly fine to import class methods...
    
    ...without specifying the class, see Haskell 2010 5.2.1.
    That allows us to get rid of some conditional includes.
    
    Nevetheless, we still conditionally include foldr', as we do not
    use it for base <4.8.


>---------------------------------------------------------------

d288dc750949e476af221a832dea8d8c053808a4
 Data/Sequence.hs | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b540978..7d31f79 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -158,14 +158,9 @@ import Control.DeepSeq (NFData(rnf))
 import Control.Monad (MonadPlus(..), ap)
 import Data.Monoid (Monoid(..))
 import Data.Functor (Functor(..))
-#if MIN_VERSION_base(4,8,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl', foldr', toList))
-#else
-#if MIN_VERSION_base(4,6,0)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap, foldl'), toList)
-#else
 import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', toList)
-#endif
+#if MIN_VERSION_base(4,8,0)
+import Data.Foldable (foldr')
 #endif
 import Data.Traversable
 import Data.Typeable


From git at git.haskell.org  Sun Dec 20 16:23:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:26 +0000 (UTC)
Subject: [commit: packages/containers] master: Add forgotten foldMap to the
 imports. (4a6bbb1)
Message-ID: <20151220162326.78ED63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4a6bbb14e6d982825235a521510afd55c565cc59

>---------------------------------------------------------------

commit 4a6bbb14e6d982825235a521510afd55c565cc59
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:32:23 2014 +0100

    Add forgotten foldMap to the imports.
    
    The foldMap is in Prelude on base 4.8, that is why I missed it.


>---------------------------------------------------------------

4a6bbb14e6d982825235a521510afd55c565cc59
 tests/seq-properties.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 4cf0876..4f4f468 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -3,7 +3,7 @@ import Data.Sequence    -- needs to be compiled with -DTESTING for use here
 import Control.Applicative (Applicative(..))
 import Control.Arrow ((***))
 import Data.Array (listArray)
-import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1), toList, all, sum)
+import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), toList, all, sum)
 import Data.Functor ((<$>), (<$))
 import Data.Maybe
 import Data.Monoid (Monoid(..))


From git at git.haskell.org  Sun Dec 20 16:23:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:28 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.1
 (ddf4e4a)
Message-ID: <20151220162328.804EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ddf4e4a7abbfb81161251437a6a5bbe8167a7cde

>---------------------------------------------------------------

commit ddf4e4a7abbfb81161251437a6a5bbe8167a7cde
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 16 14:41:17 2014 +0100

    Bump version number to 0.5.6.1


>---------------------------------------------------------------

ddf4e4a7abbfb81161251437a6a5bbe8167a7cde
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 6c77693..169507a 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.0
+version: 0.5.6.1
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:23:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:30 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix efficiency claim for
 zipWith. (107ec12)
Message-ID: <20151220162330.866D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/107ec12d17aa98d8fd552276b81a94fe6f44224b

>---------------------------------------------------------------

commit 107ec12d17aa98d8fd552276b81a94fe6f44224b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 11:19:53 2014 -0500

    Fix efficiency claim for zipWith.


>---------------------------------------------------------------

107ec12d17aa98d8fd552276b81a94fe6f44224b
 Data/Sequence.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7d31f79..7675698 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1872,9 +1872,9 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- them up further and zip them with their matching pieces can be delayed until
 -- they're actually needed. We do the same thing for Digits (splitting into
 -- between one and four pieces) and Nodes (splitting into two or three). The
--- ultimate result is that we can index, or split at, any location in zs in
--- O(log(min{i,n-i})) time *immediately*, with only a constant-factor slowdown
--- as thunks are forced along the path.
+-- ultimate result is that we can index into, or split at, any location in zs
+-- in O((log(min{i,n-i}))^2) time *immediately*, while still being able to
+-- force all the thunks in O(n) time.
 --
 -- Benchmark info, and alternatives:
 --


From git at git.haskell.org  Sun Dec 20 16:23:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:32 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #101 from
 treeowl/zipdocfix (314f798)
Message-ID: <20151220162332.8DC453A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/314f7983819861c68e77f0f5798c86812b23fa39

>---------------------------------------------------------------

commit 314f7983819861c68e77f0f5798c86812b23fa39
Merge: ddf4e4a 107ec12
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 18 22:59:51 2014 +0100

    Merge pull request #101 from treeowl/zipdocfix
    
    Fix efficiency claim for zipWith.



>---------------------------------------------------------------

314f7983819861c68e77f0f5798c86812b23fa39
 Data/Sequence.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:23:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:34 +0000 (UTC)
Subject: [commit: packages/containers] master: Use fromList2 to implement
 fromListN in IsList (ace8f7f)
Message-ID: <20151220162334.9680D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ace8f7fd88e5458a8401804e32a2d921d653fdfa

>---------------------------------------------------------------

commit ace8f7fd88e5458a8401804e32a2d921d653fdfa
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Dec 19 15:09:03 2014 -0500

    Use fromList2 to implement fromListN in IsList


>---------------------------------------------------------------

ace8f7fd88e5458a8401804e32a2d921d653fdfa
 Data/Sequence.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7d31f79..b216b12 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1806,6 +1806,7 @@ fromList = Seq . mkTree 1 . map_elem
 instance GHC.Exts.IsList (Seq a) where
     type Item (Seq a) = a
     fromList = fromList
+    fromListN = fromList2
     toList = toList
 #endif
 


From git at git.haskell.org  Sun Dec 20 16:23:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:36 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix Arbitrary instance for
 FingerTree (0086aa7)
Message-ID: <20151220162336.9D0E03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0086aa753795237cec28be6d2a261708eb7dacf6

>---------------------------------------------------------------

commit 0086aa753795237cec28be6d2a261708eb7dacf6
Author: Ross Paterson <ross at soi.city.ac.uk>
Date:   Fri Dec 19 23:24:20 2014 +0000

    Fix Arbitrary instance for FingerTree
    
    The previous version never generated deep trees containing Empty.
    Also tweaked the size handling so that the tree size is closer to the
    specified size (though it can still run over a bit).


>---------------------------------------------------------------

0086aa753795237cec28be6d2a261708eb7dacf6
 tests/seq-properties.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 4f4f468..def17b3 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -112,7 +112,15 @@ instance (Arbitrary a, Sized a) => Arbitrary (FingerTree a) where
         arb :: (Arbitrary a, Sized a) => Int -> Gen (FingerTree a)
         arb 0 = return Empty
         arb 1 = Single <$> arbitrary
-        arb n = deep <$> arbitrary <*> arb (n `div` 2) <*> arbitrary
+        arb n = do
+            pr <- arbitrary
+            sf <- arbitrary
+            let n_pr = Prelude.length (toList pr)
+            let n_sf = Prelude.length (toList sf)
+            -- adding n `div` 7 ensures that n_m >= 0, and makes more Singles
+            let n_m = max (n `div` 7) ((n - n_pr - n_sf) `div` 3)
+            m <- arb n_m
+            return $ deep pr m sf
 
     shrink (Deep _ (One a) Empty (One b)) = [Single a, Single b]
     shrink (Deep _ pr m sf) =


From git at git.haskell.org  Sun Dec 20 16:23:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:38 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #108 from
 RossPaterson/master (54c3603)
Message-ID: <20151220162338.A479C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/54c36030839949659b9dd4d12b6e92ec22698d40

>---------------------------------------------------------------

commit 54c36030839949659b9dd4d12b6e92ec22698d40
Merge: 314f798 0086aa7
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 00:50:39 2014 +0100

    Merge pull request #108 from RossPaterson/master
    
    Fix Arbitrary instance for FingerTree



>---------------------------------------------------------------

54c36030839949659b9dd4d12b6e92ec22698d40
 tests/seq-properties.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:23:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:40 +0000 (UTC)
Subject: [commit: packages/containers] master: Add tests for Applicative and
 Monad instances (0decaa1)
Message-ID: <20151220162340.AB91C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/0decaa120039ff4bafbfd4cc62306925a2c31475

>---------------------------------------------------------------

commit 0decaa120039ff4bafbfd4cc62306925a2c31475
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 12:44:57 2014 -0500

    Add tests for Applicative and Monad instances
    
    Unfortunately, these tests are rather slow, so I hid them behind
    a SLOW_TESTS macro. I don't know nearly enough about cabal to know
    how to arrange for tests to be run conditionally, so hopefully
    someone else can set that up properly.


>---------------------------------------------------------------

0decaa120039ff4bafbfd4cc62306925a2c31475
 tests/seq-properties.hs | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index def17b3..2b4774d 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -17,6 +17,9 @@ import qualified Prelude
 import qualified Data.List
 import Test.QuickCheck hiding ((><))
 import Test.QuickCheck.Poly
+#ifdef SLOW_TESTS
+import Test.QuickCheck.Function
+#endif
 import Test.Framework
 import Test.Framework.Providers.QuickCheck2
 
@@ -93,6 +96,11 @@ main = defaultMain
        , testProperty "zipWith3" prop_zipWith3
        , testProperty "zip4" prop_zip4
        , testProperty "zipWith4" prop_zipWith4
+#ifdef SLOW_TESTS
+       , testProperty "<*>" prop_ap
+       , testProperty "*>" prop_then
+       , testProperty ">>=" prop_bind
+#endif
        ]
 
 ------------------------------------------------------------------------
@@ -588,6 +596,26 @@ prop_zipWith4 xs ys zs ts =
     toList' (zipWith4 f xs ys zs ts) ~= Data.List.zipWith4 f (toList xs) (toList ys) (toList zs) (toList ts)
   where f = (,,,)
 
+-- Applicative operations
+
+#ifdef SLOW_TESTS
+prop_ap :: Seq A -> Seq B -> Bool
+prop_ap xs ys =
+    toList' ((,) <$> xs <*> ys) ~= ( (,) <$> toList xs <*> toList ys )
+
+prop_then :: Seq A -> Seq B -> Bool
+prop_then xs ys =
+    toList' (xs *> ys) ~= (toList xs *> toList ys)
+#endif
+
+-- Monad operations
+
+#ifdef SLOW_TESTS
+prop_bind :: Seq A -> Fun A (Seq B) -> Bool
+prop_bind xs (Fun _ f) =
+    toList' (xs >>= f) ~= (toList xs >>= toList . f)
+#endif
+
 -- Simple test monad
 
 data M a = Action Int a


From git at git.haskell.org  Sun Dec 20 16:23:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:42 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove CPP (b2b55b0)
Message-ID: <20151220162342.B3AD53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/b2b55b01aa985bb190a3f1580bf55eb2c83eb18f

>---------------------------------------------------------------

commit b2b55b01aa985bb190a3f1580bf55eb2c83eb18f
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Dec 19 23:49:35 2014 -0500

    Remove CPP


>---------------------------------------------------------------

b2b55b01aa985bb190a3f1580bf55eb2c83eb18f
 tests/seq-properties.hs | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/tests/seq-properties.hs b/tests/seq-properties.hs
index 2b4774d..880d772 100644
--- a/tests/seq-properties.hs
+++ b/tests/seq-properties.hs
@@ -17,9 +17,7 @@ import qualified Prelude
 import qualified Data.List
 import Test.QuickCheck hiding ((><))
 import Test.QuickCheck.Poly
-#ifdef SLOW_TESTS
 import Test.QuickCheck.Function
-#endif
 import Test.Framework
 import Test.Framework.Providers.QuickCheck2
 
@@ -96,11 +94,9 @@ main = defaultMain
        , testProperty "zipWith3" prop_zipWith3
        , testProperty "zip4" prop_zip4
        , testProperty "zipWith4" prop_zipWith4
-#ifdef SLOW_TESTS
        , testProperty "<*>" prop_ap
        , testProperty "*>" prop_then
        , testProperty ">>=" prop_bind
-#endif
        ]
 
 ------------------------------------------------------------------------
@@ -598,7 +594,6 @@ prop_zipWith4 xs ys zs ts =
 
 -- Applicative operations
 
-#ifdef SLOW_TESTS
 prop_ap :: Seq A -> Seq B -> Bool
 prop_ap xs ys =
     toList' ((,) <$> xs <*> ys) ~= ( (,) <$> toList xs <*> toList ys )
@@ -606,15 +601,12 @@ prop_ap xs ys =
 prop_then :: Seq A -> Seq B -> Bool
 prop_then xs ys =
     toList' (xs *> ys) ~= (toList xs *> toList ys)
-#endif
 
 -- Monad operations
 
-#ifdef SLOW_TESTS
 prop_bind :: Seq A -> Fun A (Seq B) -> Bool
 prop_bind xs (Fun _ f) =
     toList' (xs >>= f) ~= (toList xs >>= toList . f)
-#endif
 
 -- Simple test monad
 


From git at git.haskell.org  Sun Dec 20 16:23:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:44 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #102 from
 treeowl/validation (5482318)
Message-ID: <20151220162344.BAE773A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5482318831df6f67bb3dffca98dfc72d1dcefc7a

>---------------------------------------------------------------

commit 5482318831df6f67bb3dffca98dfc72d1dcefc7a
Merge: 54c3603 b2b55b0
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 12:59:45 2014 +0100

    Merge pull request #102 from treeowl/validation
    
    Add tests for Applicative and Monad instances



>---------------------------------------------------------------

5482318831df6f67bb3dffca98dfc72d1dcefc7a
 tests/seq-properties.hs | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)


From git at git.haskell.org  Sun Dec 20 16:23:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:46 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #107 from
 treeowl/fromListN (ae97ceb)
Message-ID: <20151220162346.C5E783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ae97ceb44766fb5e78f23670e09a20a9625b0963

>---------------------------------------------------------------

commit ae97ceb44766fb5e78f23670e09a20a9625b0963
Merge: 5482318 ace8f7f
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Dec 20 13:06:44 2014 +0100

    Merge pull request #107 from treeowl/fromListN
    
    Use fromList2 to implement fromListN in IsList



>---------------------------------------------------------------

ae97ceb44766fb5e78f23670e09a20a9625b0963
 Data/Sequence.hs | 1 +
 1 file changed, 1 insertion(+)



From git at git.haskell.org  Sun Dec 20 16:23:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:48 +0000 (UTC)
Subject: [commit: packages/containers] master: Reimplement `<*>` (38b1b81)
Message-ID: <20151220162348.CFB1B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/38b1b81c8b5536525d0daad9bd8ee9821a3fb929

>---------------------------------------------------------------

commit 38b1b81c8b5536525d0daad9bd8ee9821a3fb929
Author: David Feuer <David.Feuer at gmail.com>
Date:   Thu Dec 18 16:31:10 2014 -0500

    Reimplement `<*>`
    
    Use `coerce` for the `Functor` instance of `Elem`
    
    Using `fmap = coerce` for `Elem` speeds up `<*>` by somewhere
    around 20%.
    
    Benchmark results:
    
    OLD:
    
    benchmarking <*>/ix1000/500000
    time                 11.47 ms   (11.37 ms .. 11.59 ms)
                         0.999 R?   (0.998 R? .. 1.000 R?)
    mean                 11.61 ms   (11.52 ms .. 11.73 ms)
    std dev              279.9 ?s   (209.5 ?s .. 385.6 ?s)
    
    benchmarking <*>/nf100/2500/rep
    time                 8.530 ms   (8.499 ms .. 8.568 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 8.511 ms   (8.498 ms .. 8.528 ms)
    std dev              40.40 ?s   (28.55 ?s .. 63.84 ?s)
    
    benchmarking <*>/nf100/2500/ff
    time                 27.13 ms   (26.16 ms .. 28.70 ms)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 26.49 ms   (26.29 ms .. 27.43 ms)
    std dev              697.1 ?s   (153.0 ?s .. 1.443 ms)
    
    benchmarking <*>/nf500/500/rep
    time                 8.421 ms   (8.331 ms .. 8.491 ms)
                         0.991 R?   (0.967 R? .. 1.000 R?)
    mean                 8.518 ms   (8.417 ms .. 9.003 ms)
    std dev              529.9 ?s   (40.37 ?s .. 1.176 ms)
    variance introduced by outliers: 32% (moderately inflated)
    
    benchmarking <*>/nf500/500/ff
    time                 33.71 ms   (33.58 ms .. 33.86 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 33.69 ms   (33.62 ms .. 33.76 ms)
    std dev              150.0 ?s   (119.0 ?s .. 191.0 ?s)
    
    benchmarking <*>/nf2500/100/rep
    time                 8.390 ms   (8.259 ms .. 8.456 ms)
                         0.997 R?   (0.992 R? .. 1.000 R?)
    mean                 8.544 ms   (8.441 ms .. 8.798 ms)
    std dev              402.6 ?s   (21.25 ?s .. 714.9 ?s)
    variance introduced by outliers: 23% (moderately inflated)
    
    benchmarking <*>/nf2500/100/ff
    time                 53.69 ms   (53.33 ms .. 54.08 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 53.59 ms   (53.38 ms .. 53.75 ms)
    std dev              341.2 ?s   (231.7 ?s .. 473.9 ?s)
    
    NEW
    
    benchmarking <*>/ix1000/500000
    time                 2.688 ?s   (2.607 ?s .. 2.798 ?s)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 2.632 ?s   (2.607 ?s .. 2.715 ?s)
    std dev              129.9 ns   (65.93 ns .. 242.8 ns)
    variance introduced by outliers: 64% (severely inflated)
    
    benchmarking <*>/nf100/2500/rep
    time                 8.371 ms   (8.064 ms .. 8.535 ms)
                         0.983 R?   (0.947 R? .. 1.000 R?)
    mean                 8.822 ms   (8.590 ms .. 9.463 ms)
    std dev              991.2 ?s   (381.3 ?s .. 1.809 ms)
    variance introduced by outliers: 61% (severely inflated)
    
    benchmarking <*>/nf100/2500/ff
    time                 22.84 ms   (22.74 ms .. 22.94 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 22.78 ms   (22.71 ms .. 22.86 ms)
    std dev              183.3 ?s   (116.3 ?s .. 291.3 ?s)
    
    benchmarking <*>/nf500/500/rep
    time                 8.320 ms   (8.102 ms .. 8.514 ms)
                         0.995 R?   (0.990 R? .. 0.999 R?)
    mean                 8.902 ms   (8.675 ms .. 9.407 ms)
    std dev              952.4 ?s   (435.5 ?s .. 1.672 ms)
    variance introduced by outliers: 58% (severely inflated)
    
    benchmarking <*>/nf500/500/ff
    time                 24.50 ms   (24.41 ms .. 24.58 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 24.44 ms   (24.41 ms .. 24.48 ms)
    std dev              75.08 ?s   (50.16 ?s .. 111.3 ?s)
    
    benchmarking <*>/nf2500/100/rep
    time                 8.419 ms   (8.366 ms .. 8.458 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 8.571 ms   (8.525 ms .. 8.670 ms)
    std dev              179.5 ?s   (112.0 ?s .. 278.1 ?s)
    
    benchmarking <*>/nf2500/100/ff
    time                 24.14 ms   (24.07 ms .. 24.26 ms)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 24.11 ms   (24.07 ms .. 24.17 ms)
    std dev              103.8 ?s   (68.34 ?s .. 142.0 ?s)


>---------------------------------------------------------------

38b1b81c8b5536525d0daad9bd8ee9821a3fb929
 Data/Sequence.hs | 261 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 file changed, 258 insertions(+), 3 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 38b1b81c8b5536525d0daad9bd8ee9821a3fb929

From git at git.haskell.org  Sun Dec 20 16:23:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:50 +0000 (UTC)
Subject: [commit: packages/containers] master: Add Applicative benchmarks
 (8b47db3)
Message-ID: <20151220162350.D6C313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/8b47db3af79c31fe5434e95143242a2ef3e1e184

>---------------------------------------------------------------

commit 8b47db3af79c31fe5434e95143242a2ef3e1e184
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 20 15:02:05 2014 -0500

    Add Applicative benchmarks


>---------------------------------------------------------------

8b47db3af79c31fe5434e95143242a2ef3e1e184
 benchmarks/Sequence.hs | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index b6b82fa..a152c3b 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -1,6 +1,7 @@
 -- > ghc -DTESTING --make -O2 -fforce-recomp -i.. Sequence.hs
 module Main where
 
+import Control.Applicative
 import Control.DeepSeq
 import Criterion.Main
 import Data.List (foldl')
@@ -44,6 +45,22 @@ main = do
          , bench "nf1000" $ nf (\s -> S.fromFunction s (+1)) 1000
          , bench "nf10000" $ nf (\s -> S.fromFunction s (+1)) 10000
          ]
+      , bgroup "<*>"
+         [ bench "ix1000/500000" $
+              nf (\s -> ((+) <$> s <*> s) `S.index` (S.length s `div` 2)) (S.fromFunction 1000 (+1))
+         , bench "nf100/2500/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (100,2500)
+         , bench "nf100/2500/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (100,2500)
+         , bench "nf500/500/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (500,500)
+         , bench "nf500/500/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (500,500)
+         , bench "nf2500/100/rep" $
+              nf (\(s,t) -> (,) <$> replicate s () <*> replicate t ()) (2500,100)
+         , bench "nf2500/100/ff" $
+              nf (\(s,t) -> (,) <$> S.fromFunction s (+1) <*> S.fromFunction t (*2)) (2500,100)
+         ]
       ]
 
 -- splitAt+append: repeatedly cut the sequence at a random point


From git at git.haskell.org  Sun Dec 20 16:23:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:52 +0000 (UTC)
Subject: [commit: packages/containers] master: Exploit some invariants
 (41b7cb4)
Message-ID: <20151220162352.DE92F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/41b7cb48a1f61911651fc4ea40ac552332de9e96

>---------------------------------------------------------------

commit 41b7cb48a1f61911651fc4ea40ac552332de9e96
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Sun Dec 21 16:37:11 2014 +0100

    Exploit some invariants
    
    Consequently, get rid of ApState.
    
    This speeds up the immediate-indexing test substantially:
    
    Old:
    
    benchmarking <*>/ix1000/500000
    time                 2.688 ?s   (2.607 ?s .. 2.798 ?s)
                         0.994 R?   (0.988 R? .. 1.000 R?)
    mean                 2.632 ?s   (2.607 ?s .. 2.715 ?s)
    std dev              129.9 ns   (65.93 ns .. 242.8 ns)
    variance introduced by outliers: 64% (severely inflated)
    
    New:
    
    benchmarking <*>/ix1000/500000
    time                 1.410 ?s   (1.402 ?s .. 1.417 ?s)
                         1.000 R?   (1.000 R? .. 1.000 R?)
    mean                 1.417 ?s   (1.411 ?s .. 1.425 ?s)
    std dev              21.45 ns   (16.80 ns .. 31.73 ns)
    variance introduced by outliers: 14% (moderately inflated)


>---------------------------------------------------------------

41b7cb48a1f61911651fc4ea40ac552332de9e96
 Data/Sequence.hs | 120 ++++++++++++++++++++++---------------------------------
 1 file changed, 47 insertions(+), 73 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 7a2de82..0a64c3e 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -277,7 +277,7 @@ apShort :: Seq (a -> b) -> Seq a -> Seq b
 apShort (Seq fs) xs = Seq $ case toList xs of
             [a,b] -> ap2FT fs (a,b)
             [a,b,c] -> ap3FT fs (a,b,c)
-            _ -> error "apShort: not 2-6"
+            _ -> error "apShort: not 2-3"
 
 ap2FT :: FingerTree (Elem (a->b)) -> (a,a) -> FingerTree (Elem b)
 ap2FT fs (x,y) = Deep (size fs * 2)
@@ -298,104 +298,85 @@ ap3FT fs (x,y,z) = Deep (size fs * 3)
 -- <*> when the length of each argument is at least four.
 apty :: Seq (a -> b) -> Seq a -> Seq b
 apty (Seq fs) (Seq xs at Deep{}) = Seq $
-    runApState (fmap firstf) (fmap lastf) fmap fs' (ApState xs' xs' xs')
+    Deep (s' * size fs)
+         (fmap (fmap firstf) pr')
+         (aptyMiddle (fmap firstf) (fmap lastf) fmap fs' xs')
+         (fmap (fmap lastf) sf')
   where
     (Elem firstf, fs', Elem lastf) = trimTree fs
-    xs' = rigidify xs
+    xs'@(Deep s' pr' _m' sf') = rigidify xs
 apty _ _ = error "apty: expects a Deep constructor"
 
-data ApState a = ApState (FingerTree a) (FingerTree a) (FingerTree a)
-
--- | 'runApState' uses three copies of the @xs@ tree to produce the @fs<*>xs@
--- tree. It pulls left digits off the left tree, right digits off the right tree,
--- and squashes down the other four digits. Once it gets to the bottom, it turns
--- the middle tree into a 2-3 tree, applies 'mapMulFT' to produce the main body,
--- and glues all the pieces together.
-runApState
+-- | 'aptyMiddle' does most of the hard work of computing @fs<*>xs at .
+-- It produces the center part of a finger tree, with a prefix corresponding
+-- to the prefix of @xs@ and a suffix corresponding to the suffix of @xs@
+-- omitted; the missing suffix and prefix are added by the caller.
+-- For the recursive call, it squashes the prefix and the suffix into
+-- the center tree. Once it gets to the bottom, it turns the tree into
+-- a 2-3 tree, applies 'mapMulFT' to produce the main body, and glues all
+-- the pieces together.
+aptyMiddle
   :: Sized c =>
      (c -> d)
      -> (c -> d)
      -> ((a -> b) -> c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState c
-     -> FingerTree d
+     -> FingerTree c
+     -> FingerTree (Node d)
 -- Not at the bottom yet
-runApState firstf
+aptyMiddle firstf
            lastf
            map23
            fs
-           (ApState
-              (Deep sl
-                    prl
-                    (Deep sml prml mml sfml)
-                    sfl)
-              (Deep sm
-                    prm
-                    (Deep _smm prmm mmm sfmm)
-                    sfm)
-              (Deep sr
-                    prr
-                    (Deep smr prmr mmr sfmr)
-                    sfr))
-    = Deep (sl + sr + sm * size fs)
-           (fmap firstf prl)
-           (runApState (fmap firstf)
+           (Deep s pr (Deep sm prm mm sfm) sf)
+    = Deep (sm + s * (size fs + 1)) -- note: sm = s - size pr - size sf
+           (fmap (fmap firstf) prm)
+           (aptyMiddle (fmap firstf)
                        (fmap lastf)
                        (\f -> fmap (map23 f))
                        fs
-                       nextState)
-           (fmap lastf sfr)
-     where nextState =
-             ApState
-               (Deep (sml + size sfl) prml mml (squashR sfml sfl))
-               (Deep sm (squashL prm prmm) mmm (squashR sfmm sfm))
-               (Deep (smr + size prr) (squashL prr prmr) mmr sfmr)
+                       (Deep s (squashL pr prm) mm (squashR sfm sf)))
+           (fmap (fmap lastf) sfm)
 
 -- At the bottom
-runApState firstf
+aptyMiddle firstf
            lastf
            map23
            fs
-           (ApState
-              (Deep sl prl ml sfl)
-              (Deep sm prm mm sfm)
-              (Deep sr prr mr sfr))
-      = Deep (sl + sr + sm * size fs)
-             (fmap firstf prl)
-             ((fmap (fmap firstf) ml `snocTree` fmap firstf (digitToNode sfl))
-              `appendTree0` middle `appendTree0`
-              (fmap lastf (digitToNode prr) `consTree`  fmap (fmap lastf) mr))
-             (fmap lastf sfr)
-    where middle = case trimTree $ mapMulFT sm (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
+           (Deep s pr m sf)
+      = (fmap (fmap firstf) m `snocTree` fmap firstf (digitToNode sf))
+        `appendTree0` middle `appendTree0`
+        (fmap lastf (digitToNode pr) `consTree`  fmap (fmap lastf) m)
+    where middle = case trimTree $ mapMulFT s (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
                      (firstMapped, restMapped, lastMapped) ->
                         Deep (size firstMapped + size restMapped + size lastMapped)
                              (nodeToDigit firstMapped) restMapped (nodeToDigit lastMapped)
-          converted = case mm of
-                                    Empty -> Node2 sm lconv rconv
-                                    Single q -> Node3 sm lconv q rconv
-                                    Deep{} -> error "runApState: a tree is shallower than the middle tree"
-          lconv = digitToNode prm
-          rconv = digitToNode sfm
+          converted = case m of
+                                    Empty -> Node2 s lconv rconv
+                                    Single q -> Node3 s lconv q rconv
+                                    Deep{} -> error "aptyMiddle: impossible"
+          lconv = digitToNode pr
+          rconv = digitToNode sf
 
-runApState _ _ _ _ _ = error "runApState: ApState must hold Deep finger trees of the same depth"
+aptyMiddle _ _ _ _ _ = error "aptyMiddle: expected Deep finger tree"
 
 {-# SPECIALIZE
- runApState
+ aptyMiddle
   :: (Node c -> d)
      -> (Node c -> d)
      -> ((a -> b) -> Node c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState (Node c)
-     -> FingerTree d
+     -> FingerTree (Node c)
+     -> FingerTree (Node d)
  #-}
 {-# SPECIALIZE
- runApState
+ aptyMiddle
   :: (Elem c -> d)
      -> (Elem c -> d)
      -> ((a -> b) -> Elem c -> d)
      -> FingerTree (Elem (a -> b))
-     -> ApState (Elem c)
-     -> FingerTree d
+     -> FingerTree (Elem c)
+     -> FingerTree (Node d)
  #-}
 
 digitToNode :: Sized a => Digit a -> Node a
@@ -2096,16 +2077,9 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- Mapping with a splittable value
 ------------------------------------------------------------------------
 
--- For zipping, and probably also for (<*>), it is useful to build a result by
+-- For zipping, it is useful to build a result by
 -- traversing a sequence while splitting up something else.  For zipping, we
--- traverse the first sequence while splitting up the second [and third [and
--- fourth]]. For fs <*> xs, we hope to traverse
---
--- > replicate (length fs * length xs) ()
---
--- while splitting something essentially equivalent to
---
--- > fmap (\f -> fmap f xs) fs
+-- traverse the first sequence while splitting up the second.
 --
 -- What makes all this crazy code a good idea:
 --
@@ -2129,8 +2103,8 @@ reverseNode f (Node3 s a b c) = Node3 s (f c) (f b) (f a)
 -- they're actually needed. We do the same thing for Digits (splitting into
 -- between one and four pieces) and Nodes (splitting into two or three). The
 -- ultimate result is that we can index into, or split at, any location in zs
--- in O((log(min{i,n-i}))^2) time *immediately*, while still being able to
--- force all the thunks in O(n) time.
+-- in polylogarithmic time *immediately*, while still being able to force all
+-- the thunks in O(n) time.
 --
 -- Benchmark info, and alternatives:
 --


From git at git.haskell.org  Sun Dec 20 16:23:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:54 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #104 from
 treeowl/ap (2546efe)
Message-ID: <20151220162354.E606A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2546efeadaca6c078b5ddc23557af71fd3d6966d

>---------------------------------------------------------------

commit 2546efeadaca6c078b5ddc23557af71fd3d6966d
Merge: ae97ceb 41b7cb4
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 11:13:16 2014 +0100

    Merge pull request #104 from treeowl/ap
    
    Make <*> fast



>---------------------------------------------------------------

2546efeadaca6c078b5ddc23557af71fd3d6966d
 Data/Sequence.hs       | 257 ++++++++++++++++++++++++++++++++++++++++++++++---
 benchmarks/Sequence.hs |  17 ++++
 2 files changed, 260 insertions(+), 14 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:23:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:56 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.2
 (924fafe)
Message-ID: <20151220162356.ED5093A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/924fafe1030301ee1d62d7acd576e86b50251157

>---------------------------------------------------------------

commit 924fafe1030301ee1d62d7acd576e86b50251157
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 11:54:05 2014 +0100

    Bump version number to 0.5.6.2


>---------------------------------------------------------------

924fafe1030301ee1d62d7acd576e86b50251157
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 169507a..c5d7523 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.1
+version: 0.5.6.2
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:23:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:23:58 +0000 (UTC)
Subject: [commit: packages/containers] master: update benchmarks Makefile
 (5f9af63)
Message-ID: <20151220162358.F3DEC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f9af637de232236abf1890f1e05a3df4421ef15

>---------------------------------------------------------------

commit 5f9af637de232236abf1890f1e05a3df4421ef15
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Sun Dec 21 21:01:11 2014 +0100

    update benchmarks Makefile


>---------------------------------------------------------------

5f9af637de232236abf1890f1e05a3df4421ef15
 benchmarks/Makefile | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/benchmarks/Makefile b/benchmarks/Makefile
index 1539a2a..aacccef 100644
--- a/benchmarks/Makefile
+++ b/benchmarks/Makefile
@@ -1,10 +1,12 @@
 all:
 
 bench-%: %.hs force
-	ghc -O2 -DTESTING $< -i../$(TOP) -o $@ -outputdir tmp -rtsopts
+	ghc -O2 -DTESTING $< -I../include -i../$(TOP) -o $@ -outputdir tmp -rtsopts
+
+.PRECIOUS: bench-%
 
 bench-%.csv: bench-%
-	./bench-$* $(BENCHMARK) -v -u bench-$*.csv
+	./bench-$* "$(BENCHMARK)" -v1 --csv bench-$*.csv
 
 .PHONY: force clean veryclean
 force:


From git at git.haskell.org  Sun Dec 20 16:24:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:01 +0000 (UTC)
Subject: [commit: packages/containers] master: update benchmarks to work with
 criterion-1.0 (5364bea)
Message-ID: <20151220162401.066273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5364beaa69609ba3c0868cec4380b9c36105b740

>---------------------------------------------------------------

commit 5364beaa69609ba3c0868cec4380b9c36105b740
Author: Bertram Felgenhauer <int-e at gmx.de>
Date:   Mon Dec 22 17:08:21 2014 +0100

    update benchmarks to work with criterion-1.0


>---------------------------------------------------------------

5364beaa69609ba3c0868cec4380b9c36105b740
 benchmarks/IntMap.hs   | 6 ++----
 benchmarks/IntSet.hs   | 6 ++----
 benchmarks/Map.hs      | 6 ++----
 benchmarks/Sequence.hs | 7 ++++---
 benchmarks/Set.hs      | 6 ++----
 5 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/benchmarks/IntMap.hs b/benchmarks/IntMap.hs
index 87465a7..38104c0 100644
--- a/benchmarks/IntMap.hs
+++ b/benchmarks/IntMap.hs
@@ -4,7 +4,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.IntMap as M
@@ -13,9 +12,8 @@ import Prelude hiding (lookup)
 
 main = do
     let m = M.fromAscList elems :: M.IntMap Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [m])
+    evaluate $ rnf [m]
+    defaultMain
         [ bench "lookup" $ whnf (lookup keys) m
         , bench "insert" $ whnf (ins elems) M.empty
         , bench "insertWith empty" $ whnf (insWith elems) M.empty
diff --git a/benchmarks/IntSet.hs b/benchmarks/IntSet.hs
index 7c16c91..a768a32 100644
--- a/benchmarks/IntSet.hs
+++ b/benchmarks/IntSet.hs
@@ -5,7 +5,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.IntSet as S
@@ -14,9 +13,8 @@ main = do
     let s = S.fromAscList elems :: S.IntSet
         s_even = S.fromAscList elems_even :: S.IntSet
         s_odd = S.fromAscList elems_odd :: S.IntSet
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [s, s_even, s_odd])
+    evaluate $ rnf [s, s_even, s_odd]
+    defaultMain
         [ bench "member" $ whnf (member elems) s
         , bench "insert" $ whnf (ins elems) S.empty
         , bench "map" $ whnf (S.map (+ 1)) s
diff --git a/benchmarks/Map.hs b/benchmarks/Map.hs
index d0d539a..60e7ace 100644
--- a/benchmarks/Map.hs
+++ b/benchmarks/Map.hs
@@ -4,7 +4,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Map as M
@@ -15,9 +14,8 @@ main = do
     let m = M.fromAscList elems :: M.Map Int Int
         m_even = M.fromAscList elems_even :: M.Map Int Int
         m_odd = M.fromAscList elems_odd :: M.Map Int Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [m, m_even, m_odd])
+    evaluate $ rnf [m, m_even, m_odd]
+    defaultMain
         [ bench "lookup absent" $ whnf (lookup evens) m_odd
         , bench "lookup present" $ whnf (lookup evens) m_even
         , bench "insert absent" $ whnf (ins elems_even) m_odd
diff --git a/benchmarks/Sequence.hs b/benchmarks/Sequence.hs
index a152c3b..7ccede9 100644
--- a/benchmarks/Sequence.hs
+++ b/benchmarks/Sequence.hs
@@ -3,6 +3,7 @@ module Main where
 
 import Control.Applicative
 import Control.DeepSeq
+import Control.Exception (evaluate)
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Sequence as S
@@ -14,19 +15,19 @@ main = do
         s100 = S.fromList [1..100] :: S.Seq Int
         s1000 = S.fromList [1..1000] :: S.Seq Int
         s10000 = S.fromList [1..10000] :: S.Seq Int
-    rnf [s10, s100, s1000, s10000] `seq` return ()
+    evaluate $ rnf [s10, s100, s1000, s10000]
     let g = mkStdGen 1
     let rlist n = map (`mod` (n+1)) (take 10000 (randoms g)) :: [Int]
         r10 = rlist 10
         r100 = rlist 100
         r1000 = rlist 1000
         r10000 = rlist 10000
-    rnf [r10, r100, r1000, r10000] `seq` return ()
+    evaluate $ rnf [r10, r100, r1000, r10000]
     let u10 = S.replicate 10 () :: S.Seq ()
         u100 = S.replicate 100 () :: S.Seq ()
         u1000 = S.replicate 1000 () :: S.Seq ()
         u10000 = S.replicate 10000 () :: S.Seq ()
-    rnf [u10, u100, u1000, u10000] `seq` return ()
+    evaluate $ rnf [u10, u100, u1000, u10000]
     defaultMain
       [ bgroup "splitAt/append"
          [ bench "10" $ nf (shuffle r10) s10
diff --git a/benchmarks/Set.hs b/benchmarks/Set.hs
index e21001c..3a6e8aa 100644
--- a/benchmarks/Set.hs
+++ b/benchmarks/Set.hs
@@ -6,7 +6,6 @@ module Main where
 import Control.DeepSeq
 import Control.Exception (evaluate)
 import Control.Monad.Trans (liftIO)
-import Criterion.Config
 import Criterion.Main
 import Data.List (foldl')
 import qualified Data.Set as S
@@ -15,9 +14,8 @@ main = do
     let s = S.fromAscList elems :: S.Set Int
         s_even = S.fromAscList elems_even :: S.Set Int
         s_odd = S.fromAscList elems_odd :: S.Set Int
-    defaultMainWith
-        defaultConfig
-        (liftIO . evaluate $ rnf [s, s_even, s_odd])
+    evaluate $ rnf [s, s_even, s_odd]
+    defaultMain
         [ bench "member" $ whnf (member elems) s
         , bench "insert" $ whnf (ins elems) S.empty
         , bench "map" $ whnf (S.map (+ 1)) s


From git at git.haskell.org  Sun Dec 20 16:24:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:03 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #110 from
 int-e/bench (55f65cd)
Message-ID: <20151220162403.0E3FC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/55f65cddc15bb30149795de2c5498e428381f2d2

>---------------------------------------------------------------

commit 55f65cddc15bb30149795de2c5498e428381f2d2
Merge: 924fafe 5364bea
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Dec 22 17:56:05 2014 +0100

    Merge pull request #110 from int-e/bench
    
    update benchmarks for criterion-1.0



>---------------------------------------------------------------

55f65cddc15bb30149795de2c5498e428381f2d2
 benchmarks/IntMap.hs   | 6 ++----
 benchmarks/IntSet.hs   | 6 ++----
 benchmarks/Makefile    | 6 ++++--
 benchmarks/Map.hs      | 6 ++----
 benchmarks/Sequence.hs | 7 ++++---
 benchmarks/Set.hs      | 6 ++----
 6 files changed, 16 insertions(+), 21 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:05 +0000 (UTC)
Subject: [commit: packages/containers] master: Make applicativeTree aim for
 safe digits (1e962fc)
Message-ID: <20151220162405.171FD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1e962fc2772008512509955316fb4d6eab2766e3

>---------------------------------------------------------------

commit 1e962fc2772008512509955316fb4d6eab2766e3
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 24 22:03:29 2014 -0500

    Make applicativeTree aim for safe digits
    
    As previously discussed, this gives the tree more flexibility and
    matches what other functions do.


>---------------------------------------------------------------

1e962fc2772008512509955316fb4d6eab2766e3
 Data/Sequence.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..c256a53 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -856,17 +856,14 @@ applicativeTree n mSize m = mSize `seq` case n of
     4 -> deepA two emptyTree two
     5 -> deepA three emptyTree two
     6 -> deepA three emptyTree three
-    7 -> deepA four emptyTree three
-    8 -> deepA four emptyTree four
     _ -> case n `quotRem` 3 of
            (q,0) -> deepA three (applicativeTree (q - 2) mSize' n3) three
-           (q,1) -> deepA four  (applicativeTree (q - 2) mSize' n3) three
-           (q,_) -> deepA four  (applicativeTree (q - 2) mSize' n3) four
+           (q,1) -> deepA two (applicativeTree (q - 1) mSize' n3) two
+           (q,_) -> deepA three (applicativeTree (q - 1) mSize' n3) two
   where
     one = fmap One m
     two = liftA2 Two m m
     three = liftA3 Three m m m
-    four = liftA3 Four m m m <*> m
     deepA = liftA3 (Deep (n * mSize))
     mSize' = 3 * mSize
     n3 = liftA3 (Node3 mSize') m m m
@@ -2335,7 +2332,7 @@ unstableSortBy cmp (Seq xs) =
         toPQ cmp (\ (Elem x) -> PQueue x Nil) xs
 
 -- | fromList2, given a list and its length, constructs a completely
--- balanced Seq whose elements are that list using the applicativeTree
+-- balanced Seq whose elements are that list using the replicateA
 -- generalization.
 fromList2 :: Int -> [a] -> Seq a
 fromList2 n = execState (replicateA n (State ht))


From git at git.haskell.org  Sun Dec 20 16:24:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:07 +0000 (UTC)
Subject: [commit: packages/containers] master: Clean up <*> development
 artifacts (f1e0f8e)
Message-ID: <20151220162407.1F2BD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830

>---------------------------------------------------------------

commit f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sat Dec 27 21:35:36 2014 -0500

    Clean up <*> development artifacts
    
    Some silly remnants of my thought process remained in the code.
    Remove them.


>---------------------------------------------------------------

f1e0f8e2b5df2be6852fb35ff2dd9559aaa4c830
 Data/Sequence.hs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..34504f5 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -338,15 +338,18 @@ aptyMiddle firstf
                        (Deep s (squashL pr prm) mm (squashR sfm sf)))
            (fmap (fmap lastf) sfm)
 
--- At the bottom
+-- At the bottom. Note that these appendTree0 calls are very cheap, because in
+-- each case, one of the arguments is guaranteed to be Empty or Single.
 aptyMiddle firstf
            lastf
            map23
            fs
            (Deep s pr m sf)
-      = (fmap (fmap firstf) m `snocTree` fmap firstf (digitToNode sf))
-        `appendTree0` middle `appendTree0`
-        (fmap lastf (digitToNode pr) `consTree`  fmap (fmap lastf) m)
+      = fmap (fmap firstf) m `appendTree0`
+        ((fmap firstf (digitToNode sf)
+            `consTree` middle)
+            `snocTree` fmap lastf (digitToNode pr))
+        `appendTree0`  fmap (fmap lastf) m
     where middle = case trimTree $ mapMulFT s (\(Elem f) -> fmap (fmap (map23 f)) converted) fs of
                      (firstMapped, restMapped, lastMapped) ->
                         Deep (size firstMapped + size restMapped + size lastMapped)
@@ -469,17 +472,16 @@ rigidify Single{} = error "rigidify: singleton"
 -- | /O(log n)/ (incremental) Rejigger a finger tree so the digits are all ones
 -- and twos.
 thin :: Sized a => FingerTree a -> FingerTree a
--- Note that 'thin' may call itself at most once before passing the job on to
--- 'thin12'. 'thin12' will produce a 'Deep' constructor immediately before
--- calling 'thin'.
+-- Note that 'thin12' will produce a 'Deep' constructor immediately before
+-- recursively calling 'thin'.
 thin Empty = Empty
 thin (Single a) = Single a
 thin t@(Deep s pr m sf) =
   case pr of
     One{} -> thin12 t
     Two{} -> thin12 t
-    Three a b c  -> thin $ Deep s (One a) (node2 b c `consTree` m) sf
-    Four a b c d -> thin $ Deep s (Two a b) (node2 c d `consTree` m) sf
+    Three a b c  -> thin12 $ Deep s (One a) (node2 b c `consTree` m) sf
+    Four a b c d -> thin12 $ Deep s (Two a b) (node2 c d `consTree` m) sf
 
 thin12 :: Sized a => FingerTree a -> FingerTree a
 thin12 (Deep s pr m sf at One{}) = Deep s pr (thin m) sf


From git at git.haskell.org  Sun Dec 20 16:24:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:09 +0000 (UTC)
Subject: [commit: packages/containers] master: Make `-Wall`-clean for
 base-4.8.0.0 (71f53cb)
Message-ID: <20151220162409.2AF3C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f

>---------------------------------------------------------------

commit 71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 28 09:36:44 2014 +0100

    Make `-Wall`-clean for base-4.8.0.0


>---------------------------------------------------------------

71f53cb8ea10cd2b50dbc0a7429e1f790fb62a0f
 Data/Graph.hs       |  2 ++
 Data/IntMap/Base.hs | 11 ++++++++---
 Data/IntSet/Base.hs |  4 +++-
 Data/Map/Base.hs    |  9 +++++++--
 Data/Sequence.hs    |  3 +++
 Data/Set/Base.hs    |  2 ++
 Data/Tree.hs        | 13 +++++++++----
 7 files changed, 34 insertions(+), 10 deletions(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index 5f2bc15..c02b3e3 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -75,7 +75,9 @@ import qualified Data.IntSet as Set
 import Data.Tree (Tree(Node), Forest)
 
 -- std interfaces
+#if !MIN_VERSION_base(4,8,0)
 import Control.Applicative
+#endif
 import Control.DeepSeq (NFData(rnf))
 import Data.Maybe
 import Data.Array
diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index d25cb9e..e15ed76 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,16 +216,21 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+import Data.Word (Word)
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (liftM)
 import Data.Bits
 import qualified Data.Foldable as Foldable
 import Data.Maybe (fromMaybe)
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
-import Data.Word (Word)
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
 import Data.IntSet.Base (Key)
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 6ddd0fb..c89bd18 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -169,9 +169,11 @@ import Control.DeepSeq (NFData(rnf))
 import Data.Bits
 import qualified Data.List as List
 import Data.Maybe (fromMaybe)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
-import Data.Typeable
 import Data.Word (Word)
+#endif
+import Data.Typeable
 import Prelude hiding (filter, foldr, foldl, null, map)
 
 import Data.Utils.BitUtil
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 815e54b..965a258 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,12 +270,17 @@ module Data.Map.Base (
     , filterLt
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+#else
 import Control.Applicative (Applicative(..), (<$>))
+import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
 import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
 import qualified Data.Foldable as Foldable
-import Data.Monoid (Monoid(..))
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Prelude hiding (lookup, map, filter, foldr, foldl, null)
 
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 0a64c3e..6b11266 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -147,6 +147,9 @@ module Data.Sequence (
 
 import Prelude hiding (
     Functor(..),
+#if MIN_VERSION_base(4,8,0)
+    Applicative, foldMap, Monoid,
+#endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
     takeWhile, dropWhile, iterate, reverse, filter, mapM, sum, all)
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 0dbc569..e1ebad3 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -192,7 +192,9 @@ module Data.Set.Base (
 import Prelude hiding (filter,foldl,foldr,null,map)
 import qualified Data.List as List
 import Data.Bits (shiftL, shiftR)
+#if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
+#endif
 import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
diff --git a/Data/Tree.hs b/Data/Tree.hs
index 4ee935b..abc9902 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -34,13 +34,19 @@ module Data.Tree(
     unfoldTreeM_BF, unfoldForestM_BF,
     ) where
 
+#if MIN_VERSION_base(4,8,0)
+import Control.Applicative ((<$>))
+import Data.Foldable (toList)
+#else
 import Control.Applicative (Applicative(..), (<$>))
-import Control.Monad (liftM)
+import Data.Foldable (Foldable(foldMap), toList)
 import Data.Monoid (Monoid(..))
+import Data.Traversable (Traversable(traverse))
+#endif
+
+import Control.Monad (liftM)
 import Data.Sequence (Seq, empty, singleton, (<|), (|>), fromList,
             ViewL(..), ViewR(..), viewl, viewr)
-import Data.Foldable (Foldable(foldMap), toList)
-import Data.Traversable (Traversable(traverse))
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
 
@@ -52,7 +58,6 @@ import Data.Data (Data)
 import Data.Coerce
 #endif
 
-
 -- | Multi-way trees, also known as /rose trees/.
 data Tree a = Node {
         rootLabel :: a,         -- ^ label value


From git at git.haskell.org  Sun Dec 20 16:24:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:11 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #119 from
 hvr/pr-base48 (a4df7f3)
Message-ID: <20151220162411.3544C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/a4df7f35d859634f321c05f574e268a1c47792be

>---------------------------------------------------------------

commit a4df7f35d859634f321c05f574e268a1c47792be
Merge: 55f65cd 71f53cb
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:42:22 2014 +0100

    Merge pull request #119 from hvr/pr-base48
    
    Make `-Wall`-clean for base-4.8.0.0



>---------------------------------------------------------------

a4df7f35d859634f321c05f574e268a1c47792be
 Data/Graph.hs       |  2 ++
 Data/IntMap/Base.hs | 11 ++++++++---
 Data/IntSet/Base.hs |  4 +++-
 Data/Map/Base.hs    |  9 +++++++--
 Data/Sequence.hs    |  3 +++
 Data/Set/Base.hs    |  2 ++
 Data/Tree.hs        | 13 +++++++++----
 7 files changed, 34 insertions(+), 10 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:13 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #116 from
 treeowl/balanceReplicate (e0cfb50)
Message-ID: <20151220162413.3E2763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e0cfb504ce356f75e59ca2b392dee3f93eae0e4b

>---------------------------------------------------------------

commit e0cfb504ce356f75e59ca2b392dee3f93eae0e4b
Merge: a4df7f3 1e962fc
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:49:36 2014 +0100

    Merge pull request #116 from treeowl/balanceReplicate
    
    Make applicativeTree aim for safe digits



>---------------------------------------------------------------

e0cfb504ce356f75e59ca2b392dee3f93eae0e4b
 Data/Sequence.hs | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)



From git at git.haskell.org  Sun Dec 20 16:24:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:15 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #118 from
 treeowl/apcleanup (202e2f2)
Message-ID: <20151220162415.465753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/202e2f2a28d1d914d19e177bc4b6e64597cf62f2

>---------------------------------------------------------------

commit 202e2f2a28d1d914d19e177bc4b6e64597cf62f2
Merge: e0cfb50 f1e0f8e
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Dec 30 14:55:09 2014 +0100

    Merge pull request #118 from treeowl/apcleanup
    
    Clean up <*> development artifacts



>---------------------------------------------------------------

202e2f2a28d1d914d19e177bc4b6e64597cf62f2
 Data/Sequence.hs | 20 +++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)



From git at git.haskell.org  Sun Dec 20 16:24:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:17 +0000 (UTC)
Subject: [commit: packages/containers] master: Add warning about Seq size.
 (74afe96)
Message-ID: <20151220162417.502CF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/74afe969cc792ab30715f6ad7399bddb492a1b66

>---------------------------------------------------------------

commit 74afe969cc792ab30715f6ad7399bddb492a1b66
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Dec 31 01:24:48 2014 -0500

    Add warning about Seq size.


>---------------------------------------------------------------

74afe969cc792ab30715f6ad7399bddb492a1b66
 Data/Map.hs        |  4 ++++
 Data/Map/Lazy.hs   |  4 ++++
 Data/Map/Strict.hs |  4 ++++
 Data/Sequence.hs   | 14 +++++++++++---
 Data/Set.hs        |  4 ++++
 Data/Set/Base.hs   |  4 ++++
 6 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/Data/Map.hs b/Data/Map.hs
index 1281f2f..e4af46a 100644
--- a/Data/Map.hs
+++ b/Data/Map.hs
@@ -45,6 +45,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 -----------------------------------------------------------------------------
diff --git a/Data/Map/Lazy.hs b/Data/Map/Lazy.hs
index 2705de5..17fa6fe 100644
--- a/Data/Map/Lazy.hs
+++ b/Data/Map/Lazy.hs
@@ -44,6 +44,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 -----------------------------------------------------------------------------
diff --git a/Data/Map/Strict.hs b/Data/Map/Strict.hs
index 7309041..623b1df 100644
--- a/Data/Map/Strict.hs
+++ b/Data/Map/Strict.hs
@@ -44,6 +44,10 @@
 -- first argument are always preferred to the second, for example in
 -- 'union' or 'insert'.
 --
+-- /Warning/: The size of the map must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
+--
 -- Operation comments contain the operation time complexity in
 -- the Big-O notation (<http://en.wikipedia.org/wiki/Big_O_notation>).
 --
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 11f1880..21c54d3 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -16,7 +16,8 @@
 -- Module      :  Data.Sequence
 -- Copyright   :  (c) Ross Paterson 2005
 --                (c) Louis Wasserman 2009
---                (c) David Feuer, Ross Paterson, and Milan Straka 2014
+--                (c) Bertram Felgenhauer, David Feuer, Ross Paterson, and
+--                    Milan Straka 2014
 -- License     :  BSD-style
 -- Maintainer  :  libraries at haskell.org
 -- Stability   :  experimental
@@ -29,7 +30,7 @@
 --
 -- An amortized running time is given for each operation, with /n/ referring
 -- to the length of the sequence and /i/ being the integral index used by
--- some operations.  These bounds hold even in a persistent (shared) setting.
+-- some operations. These bounds hold even in a persistent (shared) setting.
 --
 -- The implementation uses 2-3 finger trees annotated with sizes,
 -- as described in section 4.2 of
@@ -40,9 +41,16 @@
 --      <http://staff.city.ac.uk/~ross/papers/FingerTree.html>
 --
 -- /Note/: Many of these operations have the same names as similar
--- operations on lists in the "Prelude".  The ambiguity may be resolved
+-- operations on lists in the "Prelude". The ambiguity may be resolved
 -- using either qualification or the @hiding@ clause.
 --
+-- /Warning/: The size of a 'Seq' must not exceed @maxBound::Int at .  Violation
+-- of this condition is not detected and if the size limit is exceeded, the
+-- behaviour of the sequence is undefined.  This is unlikely to occur in most
+-- applications, but some care may be required when using '><', '<*>', '*>', or
+-- '>>', particularly repeatedly and particularly in combination with
+-- 'replicate' or 'fromFunction'.
+--
 -----------------------------------------------------------------------------
 
 module Data.Sequence (
diff --git a/Data/Set.hs b/Data/Set.hs
index 37366fe..fd8c8b9 100644
--- a/Data/Set.hs
+++ b/Data/Set.hs
@@ -38,6 +38,10 @@
 -- 'union' or 'insert'.  Of course, left-biasing can only be observed
 -- when equality is an equivalence relation instead of structural
 -- equality.
+--
+-- /Warning/: The size of the set must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
 -----------------------------------------------------------------------------
 
 module Data.Set (
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index e1ebad3..616d0eb 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -45,6 +45,10 @@
 -- 'union' or 'insert'.  Of course, left-biasing can only be observed
 -- when equality is an equivalence relation instead of structural
 -- equality.
+--
+-- /Warning/: The size of the set must not exceed @maxBound::Int at . Violation of
+-- this condition is not detected and if the size limit is exceeded, its
+-- behaviour is undefined.
 -----------------------------------------------------------------------------
 
 -- [Note: Using INLINABLE]


From git at git.haskell.org  Sun Dec 20 16:24:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:19 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #122 from
 treeowl/dangerdoc (d5f5582)
Message-ID: <20151220162419.586083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d5f5582709630c2a40ef998ffd727b8f739534df

>---------------------------------------------------------------

commit d5f5582709630c2a40ef998ffd727b8f739534df
Merge: 202e2f2 74afe96
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Jan 4 22:16:07 2015 +0100

    Merge pull request #122 from treeowl/dangerdoc
    
    Add warning about Seq size.



>---------------------------------------------------------------

d5f5582709630c2a40ef998ffd727b8f739534df
 Data/Map.hs        |  4 ++++
 Data/Map/Lazy.hs   |  4 ++++
 Data/Map/Strict.hs |  4 ++++
 Data/Sequence.hs   | 14 +++++++++++---
 Data/Set.hs        |  4 ++++
 Data/Set/Base.hs   |  4 ++++
 6 files changed, 31 insertions(+), 3 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:21 +0000 (UTC)
Subject: [commit: packages/containers] master: Add unnecessary call in
 fromArray to make (Ix i) constraint look needed. (6004065)
Message-ID: <20151220162421.602953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6004065c646a578fee51c8b6a35fb20514579507

>---------------------------------------------------------------

commit 6004065c646a578fee51c8b6a35fb20514579507
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Jan 10 14:25:35 2015 +0100

    Add unnecessary call in fromArray to make (Ix i) constraint look needed.


>---------------------------------------------------------------

6004065c646a578fee51c8b6a35fb20514579507
 Data/Sequence.hs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 21c54d3..b62b16a 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -186,6 +186,7 @@ import Data.Data
 
 -- Array stuff, with GHC.Arr on GHC
 import Data.Array (Ix, Array)
+import qualified Data.Array
 #ifdef __GLASGOW_HASKELL__
 import qualified GHC.Arr
 #endif
@@ -1649,6 +1650,10 @@ fromFunction len f | len < 0 = error "Data.Sequence.fromFunction called with neg
 fromArray :: Ix i => Array i a -> Seq a
 #ifdef __GLASGOW_HASKELL__
 fromArray a = fromFunction (GHC.Arr.numElements a) (GHC.Arr.unsafeAt a)
+ where
+  -- The following definition uses (Ix i) constraing, which is needed for the
+  -- other fromArray definition.
+  _ = Data.Array.rangeSize (Data.Array.bounds a)
 #else
 fromArray a = fromList2 (Data.Array.rangeSize (Data.Array.bounds a)) (Data.Array.elems a)
 #endif


From git at git.haskell.org  Sun Dec 20 16:24:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:23 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove unnecessary (Sized *)
 constraints. (5f519e6)
Message-ID: <20151220162423.68AE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f519e641aa7099c0dc6b12d3df08920e8496d04

>---------------------------------------------------------------

commit 5f519e641aa7099c0dc6b12d3df08920e8496d04
Author: Milan Straka <fox at ucw.cz>
Date:   Sat Jan 10 14:29:34 2015 +0100

    Remove unnecessary (Sized *) constraints.


>---------------------------------------------------------------

5f519e641aa7099c0dc6b12d3df08920e8496d04
 Data/Sequence.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index b62b16a..491dd6d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -640,13 +640,13 @@ deep            :: Sized a => Digit a -> FingerTree (Node a) -> Digit a -> Finge
 deep pr m sf    =  Deep (size pr + size m + size sf) pr m sf
 
 {-# INLINE pullL #-}
-pullL :: Sized a => Int -> FingerTree (Node a) -> Digit a -> FingerTree a
+pullL :: Int -> FingerTree (Node a) -> Digit a -> FingerTree a
 pullL s m sf = case viewLTree m of
     Nothing2        -> digitToTree' s sf
     Just2 pr m'     -> Deep s (nodeToDigit pr) m' sf
 
 {-# INLINE pullR #-}
-pullR :: Sized a => Int -> Digit a -> FingerTree (Node a) -> FingerTree a
+pullR :: Int -> Digit a -> FingerTree (Node a) -> FingerTree a
 pullR s pr m = case viewRTree m of
     Nothing2        -> digitToTree' s pr
     Just2 m' sf     -> Deep s pr m' (nodeToDigit sf)
@@ -1840,7 +1840,7 @@ initsNode (Node3 s a b c) = Node3 s (One a) (Two a b) (Three a b c)
 {-# SPECIALIZE tailsTree :: (FingerTree (Node a) -> Node b) -> FingerTree (Node a) -> FingerTree (Node b) #-}
 -- | Given a function to apply to tails of a tree, applies that function
 -- to every tail of the specified tree.
-tailsTree :: (Sized a, Sized b) => (FingerTree a -> b) -> FingerTree a -> FingerTree b
+tailsTree :: Sized a => (FingerTree a -> b) -> FingerTree a -> FingerTree b
 tailsTree _ Empty = Empty
 tailsTree f (Single x) = Single (f (Single x))
 tailsTree f (Deep n pr m sf) =
@@ -1855,7 +1855,7 @@ tailsTree f (Deep n pr m sf) =
 {-# SPECIALIZE initsTree :: (FingerTree (Node a) -> Node b) -> FingerTree (Node a) -> FingerTree (Node b) #-}
 -- | Given a function to apply to inits of a tree, applies that function
 -- to every init of the specified tree.
-initsTree :: (Sized a, Sized b) => (FingerTree a -> b) -> FingerTree a -> FingerTree b
+initsTree :: Sized a => (FingerTree a -> b) -> FingerTree a -> FingerTree b
 initsTree _ Empty = Empty
 initsTree f (Single x) = Single (f (Single x))
 initsTree f (Deep n pr m sf) =


From git at git.haskell.org  Sun Dec 20 16:24:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:25 +0000 (UTC)
Subject: [commit: packages/containers] master: Update .travis.yml per hvr's
 advice (d1c257a)
Message-ID: <20151220162425.6F76B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d1c257aa1385ebe6801a296e5b5decfb3b6e84f3

>---------------------------------------------------------------

commit d1c257aa1385ebe6801a296e5b5decfb3b6e84f3
Author: David Feuer <David.Feuer at gmail.com>
Date:   Wed Jan 14 22:47:19 2015 -0500

    Update .travis.yml per hvr's advice
    
    We want it to be able to build with 7.10 and head.


>---------------------------------------------------------------

d1c257aa1385ebe6801a296e5b5decfb3b6e84f3
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8af3116..9505f69 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,12 +7,13 @@ env:
  # no package for earlier cabal versions in the PPA
  - GHCVER=7.4.2 CABALVER=1.16
  - GHCVER=7.6.3 CABALVER=1.16
- - GHCVER=7.8.2 CABALVER=1.18
- - GHCVER=head  CABALVER=1.20
+ - GHCVER=7.8.4 CABALVER=1.18
+ - GHCVER=7.10.1 CABALVER=1.22
+ - GHCVER=head CABALVER=head
 
 matrix:
   allow_failures:
-   - env: GHCVER=head  CABALVER=1.20
+   - env: GHCVER=head CABALVER=head
 
 # Note: the distinction between `before_install` and `install` is not
 #       important.


From git at git.haskell.org  Sun Dec 20 16:24:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:27 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #132 from
 treeowl/travis-update (25c3fee)
Message-ID: <20151220162427.778273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/25c3fee44aa39b17ac3e74382591260c5edce1fa

>---------------------------------------------------------------

commit 25c3fee44aa39b17ac3e74382591260c5edce1fa
Merge: 5f519e6 d1c257a
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Jan 15 12:26:15 2015 +0100

    Merge pull request #132 from treeowl/travis-update
    
    Update .travis.yml per hvr's advice



>---------------------------------------------------------------

25c3fee44aa39b17ac3e74382591260c5edce1fa
 .travis.yml | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:29 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version number to 0.5.6.3
 (fabde6b)
Message-ID: <20151220162429.7DEF13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/fabde6b6381e459a49dee4ba1ac8b96848348542

>---------------------------------------------------------------

commit fabde6b6381e459a49dee4ba1ac8b96848348542
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Jan 15 12:41:01 2015 +0100

    Bump version number to 0.5.6.3


>---------------------------------------------------------------

fabde6b6381e459a49dee4ba1ac8b96848348542
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index c5d7523..d7db653 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.2
+version: 0.5.6.3
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:24:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:31 +0000 (UTC)
Subject: [commit: packages/containers] master: Improve MIN_VERSION_base
 fall-back (3dddb04)
Message-ID: <20151220162431.86B823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f

>---------------------------------------------------------------

commit 3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f
Author: David Feuer <David.Feuer at gmail.com>
Date:   Fri Jan 16 13:51:06 2015 -0500

    Improve MIN_VERSION_base fall-back
    
    Guess the base library version based on `__GLASGOW_HASKELL__`
    when compiling without Cabal.


>---------------------------------------------------------------

3dddb04bf514e37a87d7f8c5fd7ac58cda89d94f
 include/containers.h | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/include/containers.h b/include/containers.h
index ea895d1..b075799 100644
--- a/include/containers.h
+++ b/include/containers.h
@@ -51,11 +51,30 @@
 /*
  * We use cabal-generated MIN_VERSION_base to adapt to changes of base.
  * Nevertheless, as a convenience, we also allow compiling without cabal by
- * defining trivial MIN_VERSION_base if needed.
+ * defining an approximate MIN_VERSION_base if needed. The alternative version
+ * guesses the version of base using the version of GHC. This is usually
+ * sufficiently accurate. However, it completely ignores minor version numbers,
+ * and it makes the assumption that a pre-release version of GHC will ship with
+ * base libraries with the same version numbers as the final release. This
+ * assumption is violated in certain stages of GHC development, but in practice
+ * this should very rarely matter, and will not affect any released version.
  */
 #ifndef MIN_VERSION_base
-#define MIN_VERSION_base(major1,major2,minor) 0
+#if __GLASGOW_HASKELL__ >= 709
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=8)))
+#elif __GLASGOW_HASKELL__ >= 707
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=7)))
+#elif __GLASGOW_HASKELL__ >= 705
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=6)))
+#elif __GLASGOW_HASKELL__ >= 703
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=5)))
+#elif __GLASGOW_HASKELL__ >= 701
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=4)))
+#elif __GLASGOW_HASKELL__ >= 700
+#define MIN_VERSION_base(major1,major2,minor) (((major1)<4)||(((major1) == 4)&&((major2)<=3)))
+#else
+#define MIN_VERSION_base(major1,major2,minor) (0)
 #endif
+#endif // MIN_VERSION_base was not defined
 
-
-#endif
+#endif // This file was already included


From git at git.haskell.org  Sun Dec 20 16:24:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:33 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #133 from
 treeowl/minversionbase (414bd0e)
Message-ID: <20151220162433.8DFEF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/414bd0e566a7025d24678bee556f610b1f5637f5

>---------------------------------------------------------------

commit 414bd0e566a7025d24678bee556f610b1f5637f5
Merge: fabde6b 3dddb04
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Jan 19 09:49:31 2015 +0100

    Merge pull request #133 from treeowl/minversionbase
    
    Improve MIN_VERSION_base fall-back



>---------------------------------------------------------------

414bd0e566a7025d24678bee556f610b1f5637f5
 include/containers.h | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:35 +0000 (UTC)
Subject: [commit: packages/containers] master: typo in the doc for
 Data.Map.Base (72448b3)
Message-ID: <20151220162435.9642B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/72448b3272fd758ea3613f984f192c6a99ec7982

>---------------------------------------------------------------

commit 72448b3272fd758ea3613f984f192c6a99ec7982
Author: G. Allais <guillaume.allais at ens-lyon.org>
Date:   Thu Feb 19 21:29:53 2015 +0000

    typo in the doc for Data.Map.Base


>---------------------------------------------------------------

72448b3272fd758ea3613f984f192c6a99ec7982
 Data/Map/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 965a258..fccd6e0 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -1689,7 +1689,7 @@ mapWithKey f (Bin sx kx x l r) = Bin sx kx (f kx x) (mapWithKey f l) (mapWithKey
 #endif
 
 -- | /O(n)/.
--- @'traverseWithKey' f s == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
+-- @'traverseWithKey' f m == 'fromList' <$> 'traverse' (\(k, v) -> (,) k <$> f k v) ('toList' m)@
 -- That is, behaves exactly like a regular 'traverse' except that the traversing
 -- function also has access to the key associated with a value.
 --


From git at git.haskell.org  Sun Dec 20 16:24:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:37 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #139 from
 gallais/patch-1 (3fafcf9)
Message-ID: <20151220162437.9E3FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3fafcf96417473492fc411924c5c79d15440e76b

>---------------------------------------------------------------

commit 3fafcf96417473492fc411924c5c79d15440e76b
Merge: 414bd0e 72448b3
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Feb 20 06:00:59 2015 +0100

    Merge pull request #139 from gallais/patch-1
    
    typo in the doc for Data.Map.Base



>---------------------------------------------------------------

3fafcf96417473492fc411924c5c79d15440e76b
 Data/Map/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:24:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:39 +0000 (UTC)
Subject: [commit: packages/containers] master: Update the API
 changes/enhancements guide. (c0a076d)
Message-ID: <20151220162439.A49A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c0a076d4b3d48481fc7dc7a4aed9b3c57260c327

>---------------------------------------------------------------

commit c0a076d4b3d48481fc7dc7a4aed9b3c57260c327
Author: Milan Straka <fox at ucw.cz>
Date:   Fri Mar 6 23:15:51 2015 +0100

    Update the API changes/enhancements guide.
    
    Fix link to Library submission guide and also explictly mention the
    discussion on libraries at haskell.org mailing list.


>---------------------------------------------------------------

c0a076d4b3d48481fc7dc7a4aed9b3c57260c327
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 0eab2ca..de90d35 100644
--- a/README.md
+++ b/README.md
@@ -9,4 +9,4 @@ Contributing
 
 For reporting bugs (and maybe even the respective fix), please use the [GitHub issue tracker](https://github.com/haskell/containers/issues).
 
-For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](http://www.haskell.org/haskellwiki/Library_submissions#Guidance_for_proposers) (but use the GitHub facilities instead of GHC's Trac for submitting patches).
+For proposing API changes/enhancements, please follow the [guidelines outlined on the Haskell Wiki](https://wiki.haskell.org/Library_submissions#Guide_to_proposers). Especially note that all API changes/enhancements should be discussed on libraries at haskell.org mailing list.


From git at git.haskell.org  Sun Dec 20 16:24:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:41 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove comments after #endif.
 (dade165)
Message-ID: <20151220162441.AB9F93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/dade1658363660395c0f00b951cfcd71acee5b8c

>---------------------------------------------------------------

commit dade1658363660395c0f00b951cfcd71acee5b8c
Author: Milan Straka <fox at ucw.cz>
Date:   Tue Mar 10 23:08:17 2015 +0100

    Remove comments after #endif.
    
    They cause a lot of compilation warnings.


>---------------------------------------------------------------

dade1658363660395c0f00b951cfcd71acee5b8c
 include/containers.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/containers.h b/include/containers.h
index b075799..89f82d2 100644
--- a/include/containers.h
+++ b/include/containers.h
@@ -75,6 +75,6 @@
 #else
 #define MIN_VERSION_base(major1,major2,minor) (0)
 #endif
-#endif // MIN_VERSION_base was not defined
+#endif
 
-#endif // This file was already included
+#endif


From git at git.haskell.org  Sun Dec 20 16:24:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:43 +0000 (UTC)
Subject: [commit: packages/containers] master: Improve *> (c2b2048)
Message-ID: <20151220162443.B340E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/c2b20485f22202dc7227ef00ae28d706c8df8d4d

>---------------------------------------------------------------

commit c2b20485f22202dc7227ef00ae28d706c8df8d4d
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 19:57:49 2015 -0400

    Improve *>
    
    Use `applicativeTree` and techniques from `<*>` to make `*>`
    share as much as possible and offer immediate access with correct
    time bounds.


>---------------------------------------------------------------

c2b20485f22202dc7227ef00ae28d706c8df8d4d
 Data/Sequence.hs | 89 +++++++++++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 75 insertions(+), 14 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 9de2228..91c62d8 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -271,13 +271,13 @@ instance Monad Seq where
 
 instance Applicative Seq where
     pure = singleton
-    xs *> ys = replicateSeq (length xs) ys
+    xs *> ys = cycleN (length xs) ys
 
-    fs <*> xs = case viewl fs of
+    fs <*> xs@(Seq xsFT) = case viewl fs of
       EmptyL -> empty
       firstf :< fs' -> case viewr fs' of
         EmptyR -> fmap firstf xs
-        Seq fs''FT :> lastf -> case (rigidify . (\(Seq a) -> a)) xs of
+        Seq fs''FT :> lastf -> case rigidify xsFT of
              RigidEmpty -> empty
              RigidOne (Elem x) -> fmap ($x) fs
              RigidTwo (Elem x1) (Elem x2) ->
@@ -933,18 +933,79 @@ replicateM n x
   | n >= 0      = unwrapMonad (replicateA n (WrapMonad x))
   | otherwise   = error "replicateM takes a nonnegative integer argument"
 
--- | @'replicateSeq' n xs@ concatenates @n@ copies of @xs at .
-replicateSeq :: Int -> Seq a -> Seq a
-replicateSeq n s
-  | n < 0     = error "replicateSeq takes a nonnegative integer argument"
+-- | @'cycleN' n xs@ concatenates @n@ copies of @xs at .
+cycleN :: Int -> Seq a -> Seq a
+cycleN n xs
+  | n < 0     = error "cycleN takes a nonnegative integer argument"
   | n == 0    = empty
-  | otherwise = go n s
-  where
-    -- Invariant: k >= 1
-    go 1 xs = xs
-    go k xs | even k    = kxs
-            | otherwise = xs >< kxs
-            where kxs = go (k `quot` 2) $! (xs >< xs)
+  | n == 1    = xs
+cycleN n (Seq xsFT) = case rigidify xsFT of
+             RigidEmpty -> empty
+             RigidOne (Elem x) -> replicate n x
+             RigidTwo x1 x2 -> Seq $
+               Deep (n*2) pair
+                    (runIdentity $ applicativeTree (n-2) 2 (Identity (node2 x1 x2)))
+                    pair
+               where pair = Two x1 x2
+             RigidThree x1 x2 x3 -> Seq $
+               Deep (n*3) triple
+                    (runIdentity $ applicativeTree (n-2) 3 (Identity (node3 x1 x2 x3)))
+                    triple
+               where triple = Three x1 x2 x3
+             RigidFull r@(Rigid s pr _m sf) -> Seq $
+                   Deep (n*s)
+                        (nodeToDigit pr)
+                        (cycleNMiddle (n-2) r)
+                        (nodeToDigit sf)
+
+cycleNMiddle
+  :: Sized c => Int
+     -> Rigid c
+     -> FingerTree (Node c)
+
+STRICT_1_OF_2(cycleNMiddle)
+
+-- Not at the bottom yet
+
+cycleNMiddle n
+           (Rigid s pr (DeepTh sm prm mm sfm) sf)
+    = Deep (sm + s * (n + 1)) -- note: sm = s - size pr - size sf
+           (digit12ToDigit prm)
+           (cycleNMiddle n
+                       (Rigid s (squashL pr prm) mm (squashR sfm sf)))
+           (digit12ToDigit sfm)
+
+-- At the bottom
+
+cycleNMiddle n
+           (Rigid s pr EmptyTh sf)
+     = deep
+            (One sf)
+            (runIdentity $ applicativeTree n s (Identity converted))
+            (One pr)
+   where converted = node2 pr sf
+
+cycleNMiddle n
+           (Rigid s pr (SingleTh q) sf)
+     = deep
+            (Two q sf)
+            (runIdentity $ applicativeTree n s (Identity converted))
+            (Two pr q)
+   where converted = node3 pr q sf
+
+{-# SPECIALIZE
+ cycleNMiddle
+  :: Int
+     -> Rigid (Node c)
+     -> FingerTree (Node (Node c))
+ #-}
+{-# SPECIALIZE
+ cycleNMiddle
+  :: Int
+     -> Rigid (Elem c)
+     -> FingerTree (Node (Elem c))
+ #-}
+
 
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.


From git at git.haskell.org  Sun Dec 20 16:24:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:45 +0000 (UTC)
Subject: [commit: packages/containers] master: Clean up <*> some more (3a177c7)
Message-ID: <20151220162445.BCBD53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/3a177c7610201ed14f7de3142f3e1285c55c73bb

>---------------------------------------------------------------

commit 3a177c7610201ed14f7de3142f3e1285c55c73bb
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 11:30:10 2015 -0400

    Clean up <*> some more
    
    1. Remove all partial functions and all "impossible" errors.
    
    2. Simplify the way the sequence pieces are put together at the
    bottom.
    
    The immediate-indexing `<*>` test improves from 1.44 microseconds
    to 1.24 microseconds. The other `<*>` tests improve very slightly.


>---------------------------------------------------------------

3a177c7610201ed14f7de3142f3e1285c55c73bb
 Data/Sequence.hs | 269 +++++++++++++++++++++++++++++--------------------------
 1 file changed, 141 insertions(+), 128 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3a177c7610201ed14f7de3142f3e1285c55c73bb

From git at git.haskell.org  Sun Dec 20 16:24:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:47 +0000 (UTC)
Subject: [commit: packages/containers] master: Add header to bench-cmp.sh.
 (f6930e6)
Message-ID: <20151220162447.C431E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f6930e698853c46d2ed56ece4602fe88fc6e27bf

>---------------------------------------------------------------

commit f6930e698853c46d2ed56ece4602fe88fc6e27bf
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 10:33:47 2015 +0100

    Add header to bench-cmp.sh.
    
    Also remove the less command, it can be easily added manually.


>---------------------------------------------------------------

f6930e698853c46d2ed56ece4602fe88fc6e27bf
 benchmarks/bench-cmp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/bench-cmp.sh b/benchmarks/bench-cmp.sh
index 157b578..32f2b9c 100755
--- a/benchmarks/bench-cmp.sh
+++ b/benchmarks/bench-cmp.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-./bench-cmp.pl "$@" | column -nts\; | less -SR
+(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -nts\;


From git at git.haskell.org  Sun Dec 20 16:24:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:49 +0000 (UTC)
Subject: [commit: packages/containers] master: Make rigidify non-recursive
 (2562a65)
Message-ID: <20151220162449.CE0033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2562a659d8ca66cf7c0e814fc0e7f354a8261a42

>---------------------------------------------------------------

commit 2562a659d8ca66cf7c0e814fc0e7f354a8261a42
Author: David Feuer <David.Feuer at gmail.com>
Date:   Tue Mar 10 22:42:28 2015 -0400

    Make rigidify non-recursive
    
    `rigidify` would previously call itself at most once before
    producing a constructor. This made it somewhat hard to see that it
    had no infinite loops, and increased the number of tests required.
    
    Improve internal documentation.
    
    Rename the small immediate indexing benchmark to make some kind
    of sense. Add more and better immediate indexing benchmarks.
    
    Benchmarks:
    
    <*>/ix500/1000^2      -13.81%  1.40e-06
    <*>/ix500000/1000^2   -38.91%  5.14e-06
    <*>/ixBIG             -17.96%  1.61e-05
    <*>/nf100/2500/rep     +0.23%  8.58e-03
    <*>/nf100/2500/ff      -1.82%  2.37e-02
    <*>/nf500/500/rep      +0.01%  8.48e-03
    <*>/nf500/500/ff       -0.94%  2.46e-02
    <*>/nf2500/100/rep     -0.46%  8.53e-03
    <*>/nf2500/100/ff      -1.22%  2.45e-02


>---------------------------------------------------------------

2562a659d8ca66cf7c0e814fc0e7f354a8261a42
 Data/Sequence.hs       | 108 +++++++++++++++++++++++++------------------------
 benchmarks/Sequence.hs |   7 +++-
 2 files changed, 61 insertions(+), 54 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2562a659d8ca66cf7c0e814fc0e7f354a8261a42

From git at git.haskell.org  Sun Dec 20 16:24:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:51 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove Debian-specific -n
 column option. (98a4d50)
Message-ID: <20151220162451.D4C953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/98a4d503442b8a309de8bb09936272ee08249898

>---------------------------------------------------------------

commit 98a4d503442b8a309de8bb09936272ee08249898
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 15:41:22 2015 +0100

    Remove Debian-specific -n column option.
    
    It is not needed anyway here.


>---------------------------------------------------------------

98a4d503442b8a309de8bb09936272ee08249898
 benchmarks/bench-cmp.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/benchmarks/bench-cmp.sh b/benchmarks/bench-cmp.sh
index 32f2b9c..b72d0d0 100755
--- a/benchmarks/bench-cmp.sh
+++ b/benchmarks/bench-cmp.sh
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -nts\;
+(echo 'Benchmark;Runtime change;Original runtime'; ./bench-cmp.pl "$@") | column -ts\;


From git at git.haskell.org  Sun Dec 20 16:24:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:53 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #141 from
 treeowl/newapbottomtry (1d3156b)
Message-ID: <20151220162453.DC2833A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30

>---------------------------------------------------------------

commit 1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30
Merge: 98a4d50 2562a65
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 15:50:08 2015 +0100

    Merge pull request #141 from treeowl/newapbottomtry
    
    Clean up <*> some more



>---------------------------------------------------------------

1d3156b65e2ca43cc1968ebde5bdd9880a1dfc30
 Data/Sequence.hs       | 414 +++++++++++++++++++++++++++++--------------------
 benchmarks/Sequence.hs |   7 +-
 2 files changed, 251 insertions(+), 170 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:24:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:55 +0000 (UTC)
Subject: [commit: packages/containers] master: Minor typo fix in Data.Set.Base
 (6297b7b)
Message-ID: <20151220162455.E2F843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6297b7bad0a78c34c7336c74c69b1a0f9d7f3691

>---------------------------------------------------------------

commit 6297b7bad0a78c34c7336c74c69b1a0f9d7f3691
Author: Louis Wasserman <wasserman.louis at gmail.com>
Date:   Wed Mar 11 10:31:58 2015 -0700

    Minor typo fix in Data.Set.Base


>---------------------------------------------------------------

6297b7bad0a78c34c7336c74c69b1a0f9d7f3691
 Data/Set/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 616d0eb..02eb82c 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -853,7 +853,7 @@ foldlFB = foldl
 
 -- | /O(n*log n)/. Create a set from a list of elements.
 --
--- If the elemens are ordered, linear-time implementation is used,
+-- If the elements are ordered, a linear-time implementation is used,
 -- with the performance equal to 'fromDistinctAscList'.
 
 -- For some reason, when 'singleton' is used in fromList or in


From git at git.haskell.org  Sun Dec 20 16:24:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:57 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #142 from
 lowasser/patch-1 (08ca8ab)
Message-ID: <20151220162457.EA4C43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9

>---------------------------------------------------------------

commit 08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9
Merge: 1d3156b 6297b7b
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Mar 11 22:23:39 2015 +0100

    Merge pull request #142 from lowasser/patch-1
    
    Minor typo fix in Data.Set.Base



>---------------------------------------------------------------

08ca8ab2aad9ea2995f1a54ff0cb1b8242f789a9
 Data/Set/Base.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:24:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:24:59 +0000 (UTC)
Subject: [commit: packages/containers] master: Add IsString instance (7615e42)
Message-ID: <20151220162459.F31053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/7615e4238cd7968d4abc27539974afe9b0b5024b

>---------------------------------------------------------------

commit 7615e4238cd7968d4abc27539974afe9b0b5024b
Author: David Feuer <David.Feuer at gmail.com>
Date:   Sun Mar 15 21:27:31 2015 -0400

    Add IsString instance
    
    Add `instance IsString (Seq Char)` when compiling with GHC.


>---------------------------------------------------------------

7615e4238cd7968d4abc27539974afe9b0b5024b
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index db333c3..c06931b 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -1,6 +1,8 @@
 {-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__
-{-# LANGUAGE DeriveDataTypeable, StandaloneDeriving #-}
+{-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE StandaloneDeriving #-}
+{-# LANGUAGE FlexibleInstances #-}
 #endif
 #if __GLASGOW_HASKELL__ >= 703
 {-# LANGUAGE Trustworthy #-}
@@ -182,6 +184,7 @@ import GHC.Exts (build)
 import Text.Read (Lexeme(Ident), lexP, parens, prec,
     readPrec, readListPrec, readListPrecDefault)
 import Data.Data
+import Data.String (IsString(..))
 #endif
 
 -- Array stuff, with GHC.Arr on GHC
@@ -2137,6 +2140,11 @@ instance GHC.Exts.IsList (Seq a) where
     toList = toList
 #endif
 
+#ifdef __GLASGOW_HASKELL__
+instance IsString (Seq Char) where
+    fromString = fromList
+#endif
+
 ------------------------------------------------------------------------
 -- Reverse
 ------------------------------------------------------------------------


From git at git.haskell.org  Sun Dec 20 16:25:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:02 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #147 from
 treeowl/IsString (10f0a88)
Message-ID: <20151220162502.070603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/10f0a88088f0cdf5ea660c3340424cce4d34cecd

>---------------------------------------------------------------

commit 10f0a88088f0cdf5ea660c3340424cce4d34cecd
Merge: 08ca8ab 7615e42
Author: Milan Straka <fox at ucw.cz>
Date:   Mon Mar 16 16:02:26 2015 +0100

    Merge pull request #147 from treeowl/IsString
    
    Add IsString instance



>---------------------------------------------------------------

10f0a88088f0cdf5ea660c3340424cce4d34cecd
 Data/Sequence.hs | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:25:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:04 +0000 (UTC)
Subject: [commit: packages/containers] master: Removed unnecessary strictness
 in IntSet.foldl accumulator. (bdd7b33)
Message-ID: <20151220162504.0F61C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/bdd7b3378ebd218d935b62fdf980f76fd7d98a4b

>---------------------------------------------------------------

commit bdd7b3378ebd218d935b62fdf980f76fd7d98a4b
Author: Anton Dubovik <gunner.kade at gmail.com>
Date:   Fri May 15 00:45:50 2015 +0300

    Removed unnecessary strictness in IntSet.foldl accumulator.


>---------------------------------------------------------------

bdd7b3378ebd218d935b62fdf980f76fd7d98a4b
 Data/IntSet/Base.hs        |  1 -
 containers.cabal           | 18 ++++++++++++++++++
 tests/intset-strictness.hs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)

diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index c89bd18..3dc473c 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -882,7 +882,6 @@ foldl f z = \t ->      -- Use lambda t to be inlinable with two arguments only.
                         | otherwise -> go (go z l) r
             _ -> go z t
   where
-    STRICT_1_OF_2(go)
     go z' Nil           = z'
     go z' (Tip kx bm)   = foldlBits kx f z' bm
     go z' (Bin _ _ l r) = go (go z' l) r
diff --git a/containers.cabal b/containers.cabal
index d7db653..6f4baaf 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -252,3 +252,21 @@ test-suite intmap-strictness-properties
 
   ghc-options: -Wall
   include-dirs: include
+
+test-suite intset-strictness-properties
+  hs-source-dirs: tests, .
+  main-is: intset-strictness.hs
+  type: exitcode-stdio-1.0
+
+  build-depends:
+    array,
+    base >= 4.2 && < 5,
+    ChasingBottoms,
+    deepseq >= 1.2 && < 1.5,
+    QuickCheck >= 2.4.0.1,
+    ghc-prim,
+    test-framework >= 0.3.3,
+    test-framework-quickcheck2 >= 0.2.9
+
+  ghc-options: -Wall
+  include-dirs: include
diff --git a/tests/intset-strictness.hs b/tests/intset-strictness.hs
new file mode 100644
index 0000000..b7c4097
--- /dev/null
+++ b/tests/intset-strictness.hs
@@ -0,0 +1,46 @@
+{-# LANGUAGE FlexibleInstances, GeneralizedNewtypeDeriving #-}
+{-# OPTIONS_GHC -fno-warn-orphans #-}
+
+module Main (main) where
+
+import Prelude hiding (foldl)
+
+import Test.ChasingBottoms.IsBottom
+import Test.Framework (Test, defaultMain, testGroup)
+import Test.Framework.Providers.QuickCheck2 (testProperty)
+
+import Data.IntSet
+
+------------------------------------------------------------------------
+-- * Properties
+
+------------------------------------------------------------------------
+-- ** Lazy module
+
+pFoldlAccLazy :: Int -> Bool
+pFoldlAccLazy k =
+  isn'tBottom $ foldl (\_ x -> x) (bottom :: Int) (singleton k)
+
+------------------------------------------------------------------------
+-- * Test list
+
+tests :: [Test]
+tests =
+    [
+    -- Basic interface
+      testGroup "IntSet"
+      [ testProperty "foldl is lazy in accumulator" pFoldlAccLazy
+      ]
+    ]
+
+------------------------------------------------------------------------
+-- * Test harness
+
+main :: IO ()
+main = defaultMain tests
+
+------------------------------------------------------------------------
+-- * Utilities
+
+isn'tBottom :: a -> Bool
+isn'tBottom = not . isBottom


From git at git.haskell.org  Sun Dec 20 16:25:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:06 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #156 from
 adubovik/master (77e94c8)
Message-ID: <20151220162506.199633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/77e94c8966c24b65b2736bf84e3a2f7072e1c1b4

>---------------------------------------------------------------

commit 77e94c8966c24b65b2736bf84e3a2f7072e1c1b4
Merge: 10f0a88 bdd7b33
Author: Milan Straka <fox at ucw.cz>
Date:   Tue May 19 23:28:27 2015 +0200

    Merge pull request #156 from adubovik/master
    
    Removed unnecessary strictness in IntSet.foldl accumulator.



>---------------------------------------------------------------

77e94c8966c24b65b2736bf84e3a2f7072e1c1b4
 Data/IntSet/Base.hs        |  1 -
 containers.cabal           | 18 ++++++++++++++++++
 tests/intset-strictness.hs | 46 ++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 64 insertions(+), 1 deletion(-)


From git at git.haskell.org  Sun Dec 20 16:25:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:08 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix copy-paste typos. (32df5aa)
Message-ID: <20151220162508.207BF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/32df5aa4bc89111d2baf912df742df7324889920

>---------------------------------------------------------------

commit 32df5aa4bc89111d2baf912df742df7324889920
Author: Milan Straka <fox at ucw.cz>
Date:   Tue May 19 23:32:51 2015 +0200

    Fix copy-paste typos.


>---------------------------------------------------------------

32df5aa4bc89111d2baf912df742df7324889920
 Data/Map/Base.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index fccd6e0..41c3611 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -80,7 +80,7 @@
 
 -- [Note: Local 'go' functions and capturing]
 -- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
--- As opposed to IntMap, when 'go' function captures an argument, increased
+-- As opposed to Map, when 'go' function captures an argument, increased
 -- heap-allocation can occur: sometimes in a polymorphic function, the 'go'
 -- floats out of its enclosing function and then it heap-allocates the
 -- dictionary and the argument. Maybe it floats out too late and strictness
@@ -1413,7 +1413,7 @@ intersectionWithKey f t1 t2 = mergeWithKey (\k x1 x2 -> Just $ f k x1 x2) (const
 -- > myIntersectionWithKey f m1 m2 = mergeWithKey (\k x1 x2 -> Just (f k x1 x2)) (const empty) (const empty) m1 m2
 --
 -- When calling @'mergeWithKey' combine only1 only2@, a function combining two
--- 'IntMap's is created, such that
+-- 'Map's is created, such that
 --
 -- * if a key is present in both maps, it is passed with both corresponding
 --   values to the @combine@ function. Depending on the result, the key is either


From git at git.haskell.org  Sun Dec 20 16:25:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:10 +0000 (UTC)
Subject: [commit: packages/containers] master: Fix wrong complexity of
 IntMap.alter. (4634081)
Message-ID: <20151220162510.283A43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/4634081498663590925938663c0223d5e02eb8ff

>---------------------------------------------------------------

commit 4634081498663590925938663c0223d5e02eb8ff
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Aug 26 14:11:49 2015 +0200

    Fix wrong complexity of IntMap.alter.
    
    This resolves #165.


>---------------------------------------------------------------

4634081498663590925938663c0223d5e02eb8ff
 Data/IntMap/Strict.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Data/IntMap/Strict.hs b/Data/IntMap/Strict.hs
index 48ce1be..5165de0 100644
--- a/Data/IntMap/Strict.hs
+++ b/Data/IntMap/Strict.hs
@@ -505,7 +505,7 @@ updateLookupWithKey f0 k0 t0 = k0 `seq` toPair $ go f0 k0 t0
 
 
 
--- | /O(log n)/. The expression (@'alter' f k map@) alters the value @x@ at @k@, or absence thereof.
+-- | /O(min(n,W))/. The expression (@'alter' f k map@) alters the value @x@ at @k@, or absence thereof.
 -- 'alter' can be used to insert, delete, or update a value in an 'IntMap'.
 -- In short : @'lookup' k ('alter' f k m) = f ('lookup' k m)@.
 alter :: (Maybe a -> Maybe a) -> Key -> IntMap a -> IntMap a


From git at git.haskell.org  Sun Dec 20 16:25:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:12 +0000 (UTC)
Subject: [commit: packages/containers] master: canonicalise Monad instances
 (318bca7)
Message-ID: <20151220162512.305CE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/318bca71efa8eecf0e67c1da97eb2fca73da182e

>---------------------------------------------------------------

commit 318bca71efa8eecf0e67c1da97eb2fca73da182e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:25:42 2015 +0100

    canonicalise Monad instances


>---------------------------------------------------------------

318bca71efa8eecf0e67c1da97eb2fca73da182e
 Data/Graph.hs    | 2 +-
 Data/Sequence.hs | 7 ++++---
 Data/Tree.hs     | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Data/Graph.hs b/Data/Graph.hs
index c02b3e3..71d82c8 100644
--- a/Data/Graph.hs
+++ b/Data/Graph.hs
@@ -295,7 +295,7 @@ chop (Node v ts : us)
 newtype SetM s a = SetM { runSetM :: STArray s Vertex Bool -> ST s a }
 
 instance Monad (SetM s) where
-    return x     = SetM $ const (return x)
+    return = pure
     {-# INLINE return #-}
     SetM v >>= f = SetM $ \s -> do { x <- v s; runSetM (f x) s }
     {-# INLINE (>>=) #-}
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index c06931b..8fc2baf 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -267,7 +267,7 @@ instance NFData a => NFData (Seq a) where
     rnf (Seq xs) = rnf xs
 
 instance Monad Seq where
-    return = singleton
+    return = pure
     xs >>= f = foldl' add empty xs
       where add ys x = ys >< f x
     (>>) = (*>)
@@ -861,12 +861,13 @@ instance Functor (State s) where
 instance Monad (State s) where
     {-# INLINE return #-}
     {-# INLINE (>>=) #-}
-    return x = State $ \ s -> (s, x)
+    return = pure
     m >>= k = State $ \ s -> case runState m s of
         (s', x) -> runState (k x) s'
 
 instance Applicative (State s) where
-    pure = return
+    {-# INLINE pure #-}
+    pure x = State $ \ s -> (s, x)
     (<*>) = ap
 
 execState :: State s a -> s -> a
diff --git a/Data/Tree.hs b/Data/Tree.hs
index abc9902..c1b9d34 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -92,7 +92,7 @@ instance Applicative Tree where
         Node (f x) (map (f <$>) txs ++ map (<*> tx) tfs)
 
 instance Monad Tree where
-    return x = Node x []
+    return = pure
     Node x ts >>= f = Node x' (ts' ++ map (>>= f) ts)
       where Node x' ts' = f x
 


From git at git.haskell.org  Sun Dec 20 16:25:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:14 +0000 (UTC)
Subject: [commit: packages/containers] master: Make `-Wall` clean (5f232df)
Message-ID: <20151220162514.3B78D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/5f232df9781bc66dfd6e8aecc59c63e937df660d

>---------------------------------------------------------------

commit 5f232df9781bc66dfd6e8aecc59c63e937df660d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:37:20 2015 +0100

    Make `-Wall` clean
    
    Get rid of left-over redundant-import warnings from the last minute
    AMP-changes that occured in GHC 7.10


>---------------------------------------------------------------

5f232df9781bc66dfd6e8aecc59c63e937df660d
 Data/IntMap/Base.hs | 4 +---
 Data/Map/Base.hs    | 4 +---
 Data/Sequence.hs    | 2 +-
 Data/Tree.hs        | 1 -
 4 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index e15ed76..0a840f5 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -216,9 +216,7 @@ module Data.IntMap.Base (
     , highestBitMask
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(pure, (<*>)), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 41c3611..569b602 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -270,9 +270,7 @@ module Data.Map.Base (
     , filterLt
     ) where
 
-#if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
-#else
+#if !(MIN_VERSION_base(4,8,0))
 import Control.Applicative (Applicative(..), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 8fc2baf..bb86c95 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -158,7 +158,7 @@ module Data.Sequence (
 import Prelude hiding (
     Functor(..),
 #if MIN_VERSION_base(4,8,0)
-    Applicative, foldMap, Monoid,
+    Applicative, (<$>), foldMap, Monoid,
 #endif
     null, length, take, drop, splitAt, foldl, foldl1, foldr, foldr1,
     scanl, scanl1, scanr, scanr1, replicate, zip, zipWith, zip3, zipWith3,
diff --git a/Data/Tree.hs b/Data/Tree.hs
index c1b9d34..a6f64f9 100644
--- a/Data/Tree.hs
+++ b/Data/Tree.hs
@@ -35,7 +35,6 @@ module Data.Tree(
     ) where
 
 #if MIN_VERSION_base(4,8,0)
-import Control.Applicative ((<$>))
 import Data.Foldable (toList)
 #else
 import Control.Applicative (Applicative(..), (<$>))


From git at git.haskell.org  Sun Dec 20 16:25:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:16 +0000 (UTC)
Subject: [commit: packages/containers] master: Remove redundant constraints
 (e024991)
Message-ID: <20151220162516.43F293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e02499103d1c4e95f5f57c7e6571f8e3040712ca

>---------------------------------------------------------------

commit e02499103d1c4e95f5f57c7e6571f8e3040712ca
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:45:50 2015 +0100

    Remove redundant constraints
    
    GHC HEAD warns about those:
    
    ```
    Data/Sequence.hs:432:12: warning:
        ? Redundant constraint: Sized a
        ? In the type signature for:
               squashL :: Sized a =>
                          Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
    
    Data/Sequence.hs:437:12: warning:
        ? Redundant constraint: Sized a
        ? In the type signature for:
               squashR :: Sized a =>
                          Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
    ```


>---------------------------------------------------------------

e02499103d1c4e95f5f57c7e6571f8e3040712ca
 Data/Sequence.hs | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index bb86c95..6b42841 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -357,8 +357,7 @@ type Digit23 a = Node a
 -- class, but as it is we have to build up 'map23' explicitly through the
 -- recursion.
 aptyMiddle
-  :: Sized c =>
-     (c -> d)
+  :: (c -> d)
      -> (c -> d)
      -> ((a -> b) -> c -> d)
      -> FingerTree (Elem (a -> b))
@@ -429,12 +428,12 @@ digit12ToDigit (One12 a) = One a
 digit12ToDigit (Two12 a b) = Two a b
 
 -- Squash the first argument down onto the left side of the second.
-squashL :: Sized a => Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
+squashL :: Digit23 a -> Digit12 (Node a) -> Digit23 (Node a)
 squashL m (One12 n) = node2 m n
 squashL m (Two12 n1 n2) = node3 m n1 n2
 
 -- Squash the second argument down onto the right side of the first
-squashR :: Sized a => Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
+squashR :: Digit12 (Node a) -> Digit23 a -> Digit23 (Node a)
 squashR (One12 n) m = node2 n m
 squashR (Two12 n1 n2) m = node3 n1 n2 m
 
@@ -965,7 +964,7 @@ cycleN n (Seq xsFT) = case rigidify xsFT of
                         (nodeToDigit sf)
 
 cycleNMiddle
-  :: Sized c => Int
+  :: Int
      -> Rigid c
      -> FingerTree (Node c)
 


From git at git.haskell.org  Sun Dec 20 16:25:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:18 +0000 (UTC)
Subject: [commit: packages/containers] master: Drop seemingly ineffective
 SPECIALISE pragmas (2e3802f)
Message-ID: <20151220162518.4B8443A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/2e3802f1aa8eb8c5769b6f00697048485cb9abb2

>---------------------------------------------------------------

commit 2e3802f1aa8eb8c5769b6f00697048485cb9abb2
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Nov 25 08:49:03 2015 +0100

    Drop seemingly ineffective SPECIALISE pragmas
    
    GHC HEAD warns about these:
    
    ```
    Data/Sequence.hs:407:1: warning:
        SPECIALISE pragma for non-overloaded function ?aptyMiddle?
    
    Data/Sequence.hs:416:1: warning:
        SPECIALISE pragma for non-overloaded function ?aptyMiddle?
    
    Data/Sequence.hs:1001:1: warning:
        SPECIALISE pragma for non-overloaded function ?cycleNMiddle?
    
    Data/Sequence.hs:1007:1: warning:
        SPECIALISE pragma for non-overloaded function ?cycleNMiddle?
    ```


>---------------------------------------------------------------

2e3802f1aa8eb8c5769b6f00697048485cb9abb2
 Data/Sequence.hs | 32 --------------------------------
 1 file changed, 32 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 6b42841..089b292 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -404,25 +404,6 @@ aptyMiddle firstf
             (Two (fmap lastf pr) (fmap lastf q))
    where converted = node3 pr q sf
 
-{-# SPECIALIZE
- aptyMiddle
-  :: (Node c -> d)
-     -> (Node c -> d)
-     -> ((a -> b) -> Node c -> d)
-     -> FingerTree (Elem (a -> b))
-     -> Rigid (Node c)
-     -> FingerTree (Node d)
- #-}
-{-# SPECIALIZE
- aptyMiddle
-  :: (Elem c -> d)
-     -> (Elem c -> d)
-     -> ((a -> b) -> Elem c -> d)
-     -> FingerTree (Elem (a -> b))
-     -> Rigid (Elem c)
-     -> FingerTree (Node d)
- #-}
-
 digit12ToDigit :: Digit12 a -> Digit a
 digit12ToDigit (One12 a) = One a
 digit12ToDigit (Two12 a b) = Two a b
@@ -998,19 +979,6 @@ cycleNMiddle n
             (Two pr q)
    where converted = node3 pr q sf
 
-{-# SPECIALIZE
- cycleNMiddle
-  :: Int
-     -> Rigid (Node c)
-     -> FingerTree (Node (Node c))
- #-}
-{-# SPECIALIZE
- cycleNMiddle
-  :: Int
-     -> Rigid (Elem c)
-     -> FingerTree (Node (Elem c))
- #-}
-
 
 -- | /O(1)/. Add an element to the left end of a sequence.
 -- Mnemonic: a triangle with the single element at the pointy end.


From git at git.haskell.org  Sun Dec 20 16:25:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:20 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #168 from
 hvr/pr/minor-cleanups (94d1638)
Message-ID: <20151220162520.54D973A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/94d163808b0cc7facdd31de781b79839b1934546

>---------------------------------------------------------------

commit 94d163808b0cc7facdd31de781b79839b1934546
Merge: 4634081 5f232df
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Nov 25 09:30:03 2015 +0100

    Merge pull request #168 from hvr/pr/minor-cleanups
    
    Minor cleanups



>---------------------------------------------------------------

94d163808b0cc7facdd31de781b79839b1934546
 Data/Graph.hs       | 2 +-
 Data/IntMap/Base.hs | 4 +---
 Data/Map/Base.hs    | 4 +---
 Data/Sequence.hs    | 9 +++++----
 Data/Tree.hs        | 3 +--
 5 files changed, 9 insertions(+), 13 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:25:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:22 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #169 from
 hvr/pr/ghc-head-wall-clean (ce65000)
Message-ID: <20151220162522.5C8A53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/ce65000b92c71da6ae2bea664c13ba855bbe2d1d

>---------------------------------------------------------------

commit ce65000b92c71da6ae2bea664c13ba855bbe2d1d
Merge: 94d1638 2e3802f
Author: Milan Straka <fox at ucw.cz>
Date:   Wed Nov 25 09:31:26 2015 +0100

    Merge pull request #169 from hvr/pr/ghc-head-wall-clean
    
    GHC HEAD -Wall cleanups



>---------------------------------------------------------------

ce65000b92c71da6ae2bea664c13ba855bbe2d1d
 Data/Sequence.hs | 41 ++++-------------------------------------
 1 file changed, 4 insertions(+), 37 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:25:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:24 +0000 (UTC)
Subject: [commit: packages/containers] master: Define Semigroup instances for
 base>=4.9 (e0cfcea)
Message-ID: <20151220162524.685AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/e0cfceaf3b8d410343151bdc57f527515ecc94b5

>---------------------------------------------------------------

commit e0cfceaf3b8d410343151bdc57f527515ecc94b5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 28 22:13:54 2015 +0100

    Define Semigroup instances for base>=4.9
    
    See https://github.com/ekmett/semigroups/issues/56 for more details


>---------------------------------------------------------------

e0cfceaf3b8d410343151bdc57f527515ecc94b5
 Data/IntMap/Base.hs | 13 ++++++++++++-
 Data/IntSet/Base.hs | 13 ++++++++++++-
 Data/Map/Base.hs    | 13 ++++++++++++-
 Data/Sequence.hs    | 10 ++++++++++
 Data/Set/Base.hs    | 14 +++++++++++++-
 5 files changed, 59 insertions(+), 4 deletions(-)

diff --git a/Data/IntMap/Base.hs b/Data/IntMap/Base.hs
index 0a840f5..e22c46b 100644
--- a/Data/IntMap/Base.hs
+++ b/Data/IntMap/Base.hs
@@ -222,6 +222,9 @@ import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
 import Data.Word (Word)
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 
 import Control.DeepSeq (NFData(rnf))
 import Control.Monad (liftM)
@@ -305,8 +308,16 @@ infixl 9 \\{-This comment teaches CPP correct behaviour -}
 
 instance Monoid (IntMap a) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Semigroup (IntMap a) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 instance Foldable.Foldable IntMap where
   fold = go
diff --git a/Data/IntSet/Base.hs b/Data/IntSet/Base.hs
index 3dc473c..3df44cb 100644
--- a/Data/IntSet/Base.hs
+++ b/Data/IntSet/Base.hs
@@ -173,6 +173,9 @@ import Data.Maybe (fromMaybe)
 import Data.Monoid (Monoid(..))
 import Data.Word (Word)
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 import Data.Typeable
 import Prelude hiding (filter, foldr, foldl, null, map)
 
@@ -247,8 +250,16 @@ type Key    = Int
 
 instance Monoid IntSet where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Semigroup IntSet where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 #if __GLASGOW_HASKELL__
 
diff --git a/Data/Map/Base.hs b/Data/Map/Base.hs
index 569b602..5d80efe 100644
--- a/Data/Map/Base.hs
+++ b/Data/Map/Base.hs
@@ -275,6 +275,9 @@ import Control.Applicative (Applicative(..), (<$>))
 import Data.Monoid (Monoid(..))
 import Data.Traversable (Traversable(traverse))
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 
 import Control.DeepSeq (NFData(rnf))
 import Data.Bits (shiftL, shiftR)
@@ -340,8 +343,16 @@ type role Map nominal representational
 
 instance (Ord k) => Monoid (Map k v) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance (Ord k) => Semigroup (Map k v) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
 
 #if __GLASGOW_HASKELL__
 
diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 089b292..447688d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -175,6 +175,9 @@ import Data.Foldable (Foldable(foldl, foldl1, foldr, foldr1, foldMap), foldl', t
 #if MIN_VERSION_base(4,8,0)
 import Data.Foldable (foldr')
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>)))
+#endif
 import Data.Traversable
 import Data.Typeable
 
@@ -543,7 +546,14 @@ instance Read a => Read (Seq a) where
 
 instance Monoid (Seq a) where
     mempty = empty
+#if !(MIN_VERSION_base(4,9,0))
     mappend = (><)
+#else
+    mappend = (<>)
+
+instance Semigroup (Seq a) where
+    (<>)    = (><)
+#endif
 
 INSTANCE_TYPEABLE1(Seq,seqTc,"Seq")
 
diff --git a/Data/Set/Base.hs b/Data/Set/Base.hs
index 02eb82c..01c343a 100644
--- a/Data/Set/Base.hs
+++ b/Data/Set/Base.hs
@@ -199,6 +199,9 @@ import Data.Bits (shiftL, shiftR)
 #if !MIN_VERSION_base(4,8,0)
 import Data.Monoid (Monoid(..))
 #endif
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup (Semigroup((<>), stimes), stimesIdempotentMonoid)
+#endif
 import qualified Data.Foldable as Foldable
 import Data.Typeable
 import Control.DeepSeq (NFData(rnf))
@@ -245,8 +248,17 @@ type role Set nominal
 
 instance Ord a => Monoid (Set a) where
     mempty  = empty
-    mappend = union
     mconcat = unions
+#if !(MIN_VERSION_base(4,9,0))
+    mappend = union
+#else
+    mappend = (<>)
+
+instance Ord a => Semigroup (Set a) where
+    (<>)    = union
+    stimes  = stimesIdempotentMonoid
+#endif
+
 
 instance Foldable.Foldable Set where
     fold = go


From git at git.haskell.org  Sun Dec 20 16:25:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:25 +0000 (UTC)
Subject: [commit: ghc] master: Update containers submodule to v0.5.7.1 release
 tag (59cc32c)
Message-ID: <20151220162525.364683A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/59cc32c4e96920b0dc8432f08da1b10c9c771602/ghc

>---------------------------------------------------------------

commit 59cc32c4e96920b0dc8432f08da1b10c9c771602
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 17:23:04 2015 +0100

    Update containers submodule to v0.5.7.1 release tag
    
    This is the new designated release to go with GHC 8.0.1
    
    This is only a meta-data change relative to v0.5.7.0
    
    /cc @foxik


>---------------------------------------------------------------

59cc32c4e96920b0dc8432f08da1b10c9c771602
 libraries/containers                      | 2 +-
 testsuite/tests/driver/T10970.stdout      | 2 +-
 testsuite/tests/package/package01e.stderr | 4 ++--
 testsuite/tests/th/TH_Roles2.stderr       | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libraries/containers b/libraries/containers
index d86ba69..d08e47b 160000
--- a/libraries/containers
+++ b/libraries/containers
@@ -1 +1 @@
-Subproject commit d86ba69819e716d9ee021cf3b34ba7244f2e1649
+Subproject commit d08e47bf6895da8c8b5a7dd62496a2f4fe73631e
diff --git a/testsuite/tests/driver/T10970.stdout b/testsuite/tests/driver/T10970.stdout
index 18e75ef..fd35ddd 100644
--- a/testsuite/tests/driver/T10970.stdout
+++ b/testsuite/tests/driver/T10970.stdout
@@ -1,2 +1,2 @@
-0.5.7.0
+0.5.7.1
 OK
diff --git a/testsuite/tests/package/package01e.stderr b/testsuite/tests/package/package01e.stderr
index 103b0fe..ea5f2f6 100644
--- a/testsuite/tests/package/package01e.stderr
+++ b/testsuite/tests/package/package01e.stderr
@@ -1,10 +1,10 @@
 
 package01e.hs:2:1: error:
     Failed to load interface for ?Data.Map?
-    It is a member of the hidden package ?containers-0.5.7.0?.
+    It is a member of the hidden package ?containers-0.5.7.1?.
     Use -v to see a list of the files searched for.
 
 package01e.hs:3:1: error:
     Failed to load interface for ?Data.IntMap?
-    It is a member of the hidden package ?containers-0.5.7.0?.
+    It is a member of the hidden package ?containers-0.5.7.1?.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/th/TH_Roles2.stderr b/testsuite/tests/th/TH_Roles2.stderr
index 0eec5ac..174affe 100644
--- a/testsuite/tests/th/TH_Roles2.stderr
+++ b/testsuite/tests/th/TH_Roles2.stderr
@@ -6,7 +6,7 @@ TYPE CONSTRUCTORS
 COERCION AXIOMS
 Dependent modules: []
 Dependent packages: [array-0.5.1.0, base-4.9.0.0, binary-0.8.0.0,
-                     bytestring-0.10.7.0, containers-0.5.7.0, deepseq-1.4.2.0,
+                     bytestring-0.10.7.0, containers-0.5.7.1, deepseq-1.4.2.0,
                      ghc-boot-0.0.0.0, ghc-prim-0.5.0.0, integer-gmp-1.0.0.0,
                      pretty-1.1.3.2, template-haskell-2.11.0.0]
 


From git at git.haskell.org  Sun Dec 20 16:25:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:26 +0000 (UTC)
Subject: [commit: packages/containers] master: Rename local binding to avoid
 clash with `(<>)` (f9e530a)
Message-ID: <20151220162526.7001E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/f9e530ab014bbb78411d7f7660dcd4e78502dea4

>---------------------------------------------------------------

commit f9e530ab014bbb78411d7f7660dcd4e78502dea4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Nov 28 22:14:16 2015 +0100

    Rename local binding to avoid clash with `(<>)`


>---------------------------------------------------------------

f9e530ab014bbb78411d7f7660dcd4e78502dea4
 Data/Sequence.hs | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/Data/Sequence.hs b/Data/Sequence.hs
index 447688d..c3a1e1d 100644
--- a/Data/Sequence.hs
+++ b/Data/Sequence.hs
@@ -2459,28 +2459,28 @@ unrollPQ cmp = unrollPQ'
   where
     {-# INLINE unrollPQ' #-}
     unrollPQ' (PQueue x ts) = x:mergePQs0 ts
-    (<>) = mergePQ cmp
+    (<+>) = mergePQ cmp
     mergePQs0 Nil = []
     mergePQs0 (t :& Nil) = unrollPQ' t
-    mergePQs0 (t1 :& t2 :& ts) = mergePQs (t1 <> t2) ts
+    mergePQs0 (t1 :& t2 :& ts) = mergePQs (t1 <+> t2) ts
     mergePQs t ts = t `seq` case ts of
         Nil             -> unrollPQ' t
-        t1 :& Nil       -> unrollPQ' (t <> t1)
-        t1 :& t2 :& ts' -> mergePQs (t <> (t1 <> t2)) ts'
+        t1 :& Nil       -> unrollPQ' (t <+> t1)
+        t1 :& t2 :& ts' -> mergePQs (t <+> (t1 <+> t2)) ts'
 
 -- | 'toPQ', given an ordering function and a mechanism for queueifying
 -- elements, converts a 'FingerTree' to a 'PQueue'.
 toPQ :: (e -> e -> Ordering) -> (a -> PQueue e) -> FingerTree a -> Maybe (PQueue e)
 toPQ _ _ Empty = Nothing
 toPQ _ f (Single x) = Just (f x)
-toPQ cmp f (Deep _ pr m sf) = Just (maybe (pr' <> sf') ((pr' <> sf') <>) (toPQ cmp fNode m))
+toPQ cmp f (Deep _ pr m sf) = Just (maybe (pr' <+> sf') ((pr' <+> sf') <+>) (toPQ cmp fNode m))
   where
     fDigit digit = case fmap f digit of
         One a           -> a
-        Two a b         -> a <> b
-        Three a b c     -> a <> b <> c
-        Four a b c d    -> (a <> b) <> (c <> d)
-    (<>) = mergePQ cmp
+        Two a b         -> a <+> b
+        Three a b c     -> a <+> b <+> c
+        Four a b c d    -> (a <+> b) <+> (c <+> d)
+    (<+>) = mergePQ cmp
     fNode = fDigit . nodeToDigit
     pr' = fDigit pr
     sf' = fDigit sf


From git at git.haskell.org  Sun Dec 20 16:25:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:28 +0000 (UTC)
Subject: [commit: packages/containers] master: Merge pull request #171 from
 hvr/pr/semigroups (6405653)
Message-ID: <20151220162528.7A9403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/6405653480afa675eec804616547b8625244bc7c

>---------------------------------------------------------------

commit 6405653480afa675eec804616547b8625244bc7c
Merge: ce65000 f9e530a
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Nov 29 13:24:03 2015 +0100

    Merge pull request #171 from hvr/pr/semigroups
    
    Semigroup instances



>---------------------------------------------------------------

6405653480afa675eec804616547b8625244bc7c
 Data/IntMap/Base.hs | 13 ++++++++++++-
 Data/IntSet/Base.hs | 13 ++++++++++++-
 Data/Map/Base.hs    | 13 ++++++++++++-
 Data/Sequence.hs    | 28 +++++++++++++++++++---------
 Data/Set/Base.hs    | 14 +++++++++++++-
 5 files changed, 68 insertions(+), 13 deletions(-)


From git at git.haskell.org  Sun Dec 20 16:25:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:30 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump version to v0.5.7.0.
 (d86ba69)
Message-ID: <20151220162530.828E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d86ba69819e716d9ee021cf3b34ba7244f2e1649

>---------------------------------------------------------------

commit d86ba69819e716d9ee021cf3b34ba7244f2e1649
Author: Milan Straka <fox at ucw.cz>
Date:   Thu Dec 17 20:35:04 2015 +0100

    Bump version to v0.5.7.0.


>---------------------------------------------------------------

d86ba69819e716d9ee021cf3b34ba7244f2e1649
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 6f4baaf..281ced4 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.6.3
+version: 0.5.7.0
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:25:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:32 +0000 (UTC)
Subject: [commit: packages/containers] master: Add changelog. (32addff)
Message-ID: <20151220162532.8B2A43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/32addff0b2a65fbcca98deb69f6661cd41374515

>---------------------------------------------------------------

commit 32addff0b2a65fbcca98deb69f6661cd41374515
Author: Milan Straka <fox at ucw.cz>
Date:   Sun Dec 20 11:14:01 2015 +0100

    Add changelog.


>---------------------------------------------------------------

32addff0b2a65fbcca98deb69f6661cd41374515
 changelog.md | 154 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 154 insertions(+)

diff --git a/changelog.md b/changelog.md
new file mode 100644
index 0000000..d8c6d2b
--- /dev/null
+++ b/changelog.md
@@ -0,0 +1,154 @@
+# Changelog for [`containers` package](http://github.com/haskell/containers)
+
+## 0.5.7.1  *Dec 2015*
+
+  * Planned to bundle with GHC 8.0.1.
+
+  * Add `IsString` instance to `Data.Sequence`.
+
+  * Define `Semigroup` instances for ``Data.Map`, `Data.Set`, `Data.IntMap`,
+    `Data.IntSet` and `Data.Sequence`.
+
+## 0.5.6.2  *Dec 2014*
+
+  * Bundled with GHC 7.10.1.
+
+  * Add role annotations for `Data.Map` and `Data.Set`.
+
+  * Add `IsList` instances for `Data.Map`, `Data.Set`, `Data.IntMap` and
+    `Data.IntSet`.
+
+  * Several performance improvements for `Data.Sequence`.
+
+  * Add `Data.Sequence.fromFunction` and `Data.Sequence.fromArray`.
+
+## 0.5.4.0  *Jan 2014*
+
+  * Bundled with GHC 7.8.1.
+
+  * The `Data.Map.fromList` and `Data.Set.fromList` now use linear-time
+    algorithm if the input is sorted, without need to call `fromDistinctAscList`.
+
+  * Implement indexing operations (`lookupIndex`, `findIndex`, `elemAt`,
+    `deletaAt`) for `Data.Set` too.
+
+  * Add `Applicative` and `Alternative` instances for `Data.Sequence`.
+
+  * Add `foldMapWithKey` to `Data.Map` and `Data.IntMap`.
+
+  * Implement poly-kinded `Typeable`.
+
+  * Add `Functor` instance for `Data.Graph.SCC`.
+
+  * Add `Data.Map.splitRoot` and `Data.Set.splitRoot`.
+
+## 0.5.0.0  *May 2012*
+
+  * Bundled with GHC 7.6.1.
+
+  * Major improvements since last release:
+    * a clearer distinction between value-lazy and value-strict containers,
+    * performance improvements across the board,
+    * a big internal clean-up, and
+    * new functions for e.g. merging, updating, and searching containers.
+
+  * While the old `Data.Map` and
+    `Data.IntMap` modules will continue to exist for the foreseeable future, we've
+    abandoned the practice of having the strict and lazy versions of each
+    function distinguished by an apostrophe. The distinction is instead made at
+    the module level, by introducing four new modules:
+    * Data.Map.Strict
+    * Data.Map.Lazy
+    * Data.IntMap.Strict
+    * Data.IntMap.Lazy
+
+    This split has three benefits:
+    * It makes the choice between value-strict and value-lazy containers
+      more declarative; you pick once at import time, instead of having to
+      remember to use the strict or lazy versions of a function every time
+      you modify the container.
+    * It alleviates a common source of performance issues, by forcing the
+      user to think about the strictness properties upfront. For example,
+      using insertWith instead of insertWith' is a common source of
+      containers-related performance bugs.
+    * There are fewer functions per module, making it easier to get an
+      overview of each module.
+
+  * Note that the types used in the strict and lazy APIs are the same, so
+    you can still use the same container in a "mixed" manner, if needed.
+
+  * The `Data.IntSet` representation changed to store small sets using
+    bits in an `Word`. Larger sets are stored as a collection of such
+    dense small sets, connected together by a prefix trie.
+
+## 0.4.2.1  *Feb 2012*
+
+  * Bundled with GHC 7.4.1.
+
+  * `Data.Map now exports `foldr`, `foldr'`, `foldl` and `foldl'`.
+
+  * `Data.Set now exports `foldr`, `foldr'`, `foldl` and `foldl'`.
+
+  * `Data.IntMap now exports `foldr`, `foldr'`, `foldl`, `foldl'`, `foldrWithKey`, `foldrWithKey'`, `foldlWithKey` and `foldlWithKey'`.
+
+  * `Data.IntSet now exports `foldr`, `foldr'`, `foldl` and `foldl'`.
+
+  * `Data.Map.foldWithKey` is no longer deprecated, although it is expected to be deprecated again in the future.
+
+  * There are now `NFData` instance for `Data.Map.Map`, `Data.Set.Set`, `Data.IntMap.IntMap`, `Data.IntSet.IntSet` and `Data.Tree.Tree`.
+
+## 0.4.1.0  *Aug 2011*
+
+  * Bundled with GHC 7.2.1.
+
+  * `Data.Map` now exports new functions `foldrWithKey'` and `foldlWithKey'`, which are strict variants of `foldrWithKey` and `foldlWithKey` respectively.
+
+  * `Data.IntMap` now exports new functions `insertWith'` and `insertWithKey'`, which are strict variants of `insertWith` and `insertWithKey` respectively.
+
+## 0.4.0.0  *Nov 2010*
+
+  * Bundled with GHC 7.0.1.
+
+  * Strictness is now more consistent, with containers being strict in their elements even in singleton cases.
+
+  * There is a new function `insertLookupWithKey'` in `Data.Map`.
+
+  * The `foldWithKey` function in `Data.Map` has been deprecated in favour of `foldrWithKey`.
+
+## 0.3.0.0  *Dec 2009*
+
+  * Bundled with GHC 6.12.1.
+
+  * `mapAccumRWithKey` has been added to `Data.IntMap`.
+
+  * A `Traversable` instance has been added to `Data.IntMap.IntMap`.
+
+  * The types of `Data.IntMap.intersectionWith` and `Data.IntMap.intersectionWithKey` have been changed from
+    `intersectionWith :: (a -> b -> a) -> IntMap a -> IntMap b -> IntMap a`
+    `intersectionWithKey :: (Key -> a -> b -> a) -> IntMap a -> IntMap b -> IntMap a`
+    to
+    `intersectionWith :: (a -> b -> c) -> IntMap a -> IntMap b -> IntMap c`
+    `intersectionWithKey :: (Key -> a -> b -> c) -> IntMap a -> IntMap b -> IntMap c`
+
+  * The types of `Data.IntMap.findMin` and `Data.IntMap.findMax` have been changed from
+    `findMin :: IntMap a -> a`
+    `findMax :: IntMap a -> a`
+    to
+    `findMin :: IntMap a -> (Int,a)`
+    `findMax :: IntMap a -> (Int,a)`
+
+  * `Data.Map` now exports `mapAccumRWithKey`, `foldrWithKey`, `foldlWithKey` and `toDescList`.
+
+  * `Data.Sequence` now exports `replicate`, `replicateA`, `replicateM`, `iterateN`, `unfoldr`, `unfoldl`, `scanl`, `scanl1`, `scanr`, `scanr1`, `tails`, `inits`, `takeWhileL`, `takeWhileR`, `dropWhileL`, `dropWhileR`, `spanl`, `spanr`, `breakl`, `breakr`, `partition`, `filter`, `sort`, `sortBy`, `unstableSort`, `unstableSortBy`, `elemIndexL`, `elemIndicesL`, `elemIndexR`, `elemIndicesR`, `findIndexL`, `findIndicesL`, `findIndexR`, `findIndicesR`, `foldlWithIndex`, `foldrWithIndex`, `mapWithIndex`, `zip`, `zipWith`, `zip3`, `zipWith3`, `zip4` and `zipWith4`.
+
+## 0.2.0.0  *Nov 2008*
+
+  * Bundled with GHC 6.10.1.
+
+  * Various result type now use `Maybe` rather than allowing any `Monad`.
+
+## 0.1.0.0  *Nov 2007*
+
+  * Bundled with GHC 6.8.1.
+
+  * Initial split off from GHC base.


From git at git.haskell.org  Sun Dec 20 16:25:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:34 +0000 (UTC)
Subject: [commit: packages/containers] master: Bump to version v0.5.7.1.
 (d08e47b)
Message-ID: <20151220162534.92E9E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/d08e47bf6895da8c8b5a7dd62496a2f4fe73631e

>---------------------------------------------------------------

commit d08e47bf6895da8c8b5a7dd62496a2f4fe73631e
Author: Milan Straka <milan at strakovi.com>
Date:   Sun Dec 20 16:54:41 2015 +0100

    Bump to version v0.5.7.1.


>---------------------------------------------------------------

d08e47bf6895da8c8b5a7dd62496a2f4fe73631e
 containers.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/containers.cabal b/containers.cabal
index 281ced4..0f60736 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -1,5 +1,5 @@
 name: containers
-version: 0.5.7.0
+version: 0.5.7.1
 license: BSD3
 license-file: LICENSE
 maintainer: fox at ucw.cz


From git at git.haskell.org  Sun Dec 20 16:25:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 16:25:36 +0000 (UTC)
Subject: [commit: packages/containers] master: Add changelog.md to
 extra-source-files. (91fff04)
Message-ID: <20151220162536.991D73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/containers

On branch  : master
Link       : http://git.haskell.org/packages/containers.git/commitdiff/91fff043dd82ca1039c19f0d31b344e63c911f0b

>---------------------------------------------------------------

commit 91fff043dd82ca1039c19f0d31b344e63c911f0b
Author: Milan Straka <milan at strakovi.com>
Date:   Sun Dec 20 17:14:30 2015 +0100

    Add changelog.md to extra-source-files.


>---------------------------------------------------------------

91fff043dd82ca1039c19f0d31b344e63c911f0b
 containers.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/containers.cabal b/containers.cabal
index 0f60736..6e3ff8d 100644
--- a/containers.cabal
+++ b/containers.cabal
@@ -25,6 +25,7 @@ extra-source-files:
     benchmarks/SetOperations/*.hs
     benchmarks/LookupGE/Makefile
     benchmarks/LookupGE/*.hs
+    changelog.md
 
 source-repository head
     type:     git


From git at git.haskell.org  Sun Dec 20 19:22:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 19:22:37 +0000 (UTC)
Subject: [commit: ghc] master: Remove unused/redundant fields from ghc-cabal.
 (3b66960)
Message-ID: <20151220192237.042053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3b669606914b2c712c4f0cb86de695cfbf2decfc/ghc

>---------------------------------------------------------------

commit 3b669606914b2c712c4f0cb86de695cfbf2decfc
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Dec 20 11:22:50 2015 -0800

    Remove unused/redundant fields from ghc-cabal.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1662


>---------------------------------------------------------------

3b669606914b2c712c4f0cb86de695cfbf2decfc
 utils/ghc-cabal/Main.hs | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index ad18f2e..66ebd14 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -407,8 +407,6 @@ generate directory distdir dll0Modules config_args
       let xs = [variablePrefix ++ "_VERSION = " ++ display (pkgVersion (package pd)),
                 -- TODO: move inside withLibLBI
                 variablePrefix ++ "_COMPONENT_ID = " ++ display (localCompatPackageKey lbi),
-                -- copied from mkComponentsLocalBuildInfo
-                variablePrefix ++ "_COMPONENT_ID = " ++ display (localComponentId lbi),
                 variablePrefix ++ "_MODULES = " ++ unwords mods,
                 variablePrefix ++ "_HIDDEN_MODULES = " ++ unwords otherMods,
                 variablePrefix ++ "_SYNOPSIS =" ++ synopsis pd,
@@ -417,9 +415,7 @@ generate directory distdir dll0Modules config_args
                 variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids,
                 variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames,
                 variablePrefix ++ "_DEP_COMPONENT_IDS = " ++ unwords depLibNames,
-                variablePrefix ++ "_TRANSITIVE_DEPS = " ++ unwords transitiveDeps,
                 variablePrefix ++ "_TRANSITIVE_DEP_COMPONENT_IDS = " ++ unwords transitiveDepLibNames,
-                variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords transitiveDepNames,
                 variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi),
                 variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi),
                 variablePrefix ++ "_INSTALL_INCLUDES = " ++ unwords (installIncludes bi),


From git at git.haskell.org  Sun Dec 20 20:32:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 20:32:42 +0000 (UTC)
Subject: [commit: ghc] master: aclocal.m4: Fix llc/opt detection code (f7bd37e)
Message-ID: <20151220203242.5BFDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f7bd37ed6fc84a9d5d69850a83a983248729968a/ghc

>---------------------------------------------------------------

commit f7bd37ed6fc84a9d5d69850a83a983248729968a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 21:29:51 2015 +0100

    aclocal.m4: Fix llc/opt detection code
    
    Currently if llc/opt is missing, we get
    
      checking for llc-3.7... no
      checking for llc... no
      checking  is version 3.7... ./configure[7417]: --version:  not found
      no
      checking for opt-3.7... no
      checking for opt... no
      checking  is version 3.7... ./configure[7664]: --version:  not found
      no
      checking for llc... no
      checking for opt... no
    
    With this fix, the version is queried iff `llc`/`opt` has been detected
    at all, thereby avoiding the disturbing `--version: not found` error
    output.
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1674


>---------------------------------------------------------------

f7bd37ed6fc84a9d5d69850a83a983248729968a
 aclocal.m4 | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e50d008..45c94f7 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1975,15 +1975,17 @@ AC_DEFUN([XCODE_VERSION],[
 AC_DEFUN([FIND_LLVM_PROG],[
     # Test for program with version name.
     FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL_NOTARGET([$1], [$2], [$3-$4])
-    if test "$$1" = ""; then
+    if test -z "$$1"; then
         # Test for program without version name.
         FP_ARG_WITH_PATH_GNU_PROG_OPTIONAL_NOTARGET([$1], [$2], [$3])
-        AC_MSG_CHECKING([$$1 is version $4])
-        if test `$$1 --version | grep -c "version $4"` -gt 0 ; then
-            AC_MSG_RESULT(yes)
-        else
-            AC_MSG_RESULT(no)
-            $1=""
+        if test -n "$$1"; then
+            AC_MSG_CHECKING([$$1 is version $4])
+            if test `$$1 --version | grep -c "version $4"` -gt 0 ; then
+                AC_MSG_RESULT(yes)
+            else
+                AC_MSG_RESULT(no)
+                $1=""
+            fi
         fi
     fi
 ])


From git at git.haskell.org  Sun Dec 20 21:16:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:23 +0000 (UTC)
Subject: [commit: packages/binary] master: Add Binary (Data.Fixed a) instance
 (0b40acc)
Message-ID: <20151220211623.48D823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/0b40accf9ddf27b5dfbb27cfc621abd789641d3e

>---------------------------------------------------------------

commit 0b40accf9ddf27b5dfbb27cfc621abd789641d3e
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Tue Aug 25 23:08:25 2015 +0300

    Add Binary (Data.Fixed a) instance


>---------------------------------------------------------------

0b40accf9ddf27b5dfbb27cfc621abd789641d3e
 src/Data/Binary/Class.hs | 23 +++++++++++++++++++++++
 tests/QC.hs              |  3 +++
 2 files changed, 26 insertions(+)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index a022a42..28445c9 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -11,10 +11,18 @@
 #define HAS_VOID
 #endif
 
+#if MIN_VERSION_base(4,7,0)
+#define HAS_FIXED_CONSTRUCTOR
+#endif
+
 #if __GLASGOW_HASKELL__ >= 704
 #define HAS_GHC_FINGERPRINT
 #endif
 
+#ifndef HAS_FIXED_CONSTRUCTOR
+{-# LANGUAGE ScopedTypeVariables #-}
+#endif
+
 -----------------------------------------------------------------------------
 -- |
 -- Module      : Data.Binary.Class
@@ -78,6 +86,9 @@ import GHC.Generics
 #ifdef HAS_NATURAL
 import Numeric.Natural
 #endif
+
+import qualified Data.Fixed as Fixed
+
 --
 -- This isn't available in older Hugs or older GHC
 --
@@ -251,6 +262,18 @@ instance Binary Integer where
                     let v = roll bytes
                     return $! if sign == (1 :: Word8) then v else - v
 
+-- | /Since: 0.8.0.0/
+#ifdef HAS_FIXED_CONSTRUCTOR
+instance Binary (Fixed.Fixed a) where
+  put (Fixed.MkFixed a) = put a
+  get = Fixed.MkFixed `liftM` get
+#else
+instance forall a. Fixed.HasResolution a => Binary (Fixed.Fixed a) where
+  -- Using undefined :: Maybe a as a proxy, as Data.Proxy is introduced only in base-4.7
+  put x = put (truncate (x * fromInteger (Fixed.resolution (undefined :: Maybe a))) :: Integer)
+  get = (\x -> fromInteger x / fromInteger (Fixed.resolution (undefined :: Maybe a))) `liftM` get
+#endif
+
 --
 -- Fold and unfold an Integer to and from a list of its bytes
 --
diff --git a/tests/QC.hs b/tests/QC.hs
index 493d2aa..99f919c 100644
--- a/tests/QC.hs
+++ b/tests/QC.hs
@@ -28,6 +28,8 @@ import           Numeric.Natural
 import           GHC.Fingerprint
 #endif
 
+import qualified Data.Fixed as Fixed
+
 import           Test.Framework
 import           Test.Framework.Providers.QuickCheck2
 import           Test.QuickCheck
@@ -475,6 +477,7 @@ tests =
             , ("Word",       p (test :: T Word                   ))
             , ("Int",        p (test :: T Int                    ))
             , ("Integer",    p (test :: T Integer                ))
+            , ("Fixed",      p (test :: T (Fixed.Fixed Fixed.E3) ))
 #ifdef HAS_NATURAL
             , ("Natural",         prop_test_Natural               )
 #endif


From git at git.haskell.org  Sun Dec 20 21:16:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:25 +0000 (UTC)
Subject: [commit: packages/binary] master: Add Binary Version compatibility
 tests (a58e8cc)
Message-ID: <20151220211625.4DBE53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/a58e8ccffb7dc0b457d1ac6d6f8b8311b731b4ac

>---------------------------------------------------------------

commit a58e8ccffb7dc0b457d1ac6d6f8b8311b731b4ac
Author: Oleg Grenrus <oleg.grenrus at iki.fi>
Date:   Wed Nov 11 20:18:52 2015 +0200

    Add Binary Version compatibility tests


>---------------------------------------------------------------

a58e8ccffb7dc0b457d1ac6d6f8b8311b731b4ac
 tests/QC.hs | 35 +++++++++++++++++++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/tests/QC.hs b/tests/QC.hs
index 99f919c..94348ff 100644
--- a/tests/QC.hs
+++ b/tests/QC.hs
@@ -5,6 +5,10 @@ module Main ( main ) where
 #define HAS_NATURAL
 #endif
 
+#if MIN_VERSION_base(4,7,0)
+#define HAS_FIXED_CONSTRUCTOR
+#endif
+
 #if __GLASGOW_HASKELL__ >= 704
 #define HAS_GHC_FINGERPRINT
 #endif
@@ -400,6 +404,30 @@ instance Show Fingerprint where
 
 ------------------------------------------------------------------------
 
+#ifdef HAS_FIXED_CONSTRUCTOR
+
+fixedPut :: forall a. Fixed.HasResolution a => Fixed.Fixed a -> Put
+fixedPut x = put (truncate (x * fromInteger (Fixed.resolution (undefined :: Maybe a))) :: Integer)
+
+fixedGet :: forall a. Fixed.HasResolution a => Get (Fixed.Fixed a)
+fixedGet = (\x -> fromInteger x / fromInteger (Fixed.resolution (undefined :: Maybe a))) `liftA` get
+
+-- | Serialise using base >=4.7 and <4.7 methods agree
+prop_fixed_ser :: Fixed.Fixed Fixed.E3 -> Bool
+prop_fixed_ser x = runPut (put x) == runPut (fixedPut x)
+
+-- | Serialised with base >=4.7, unserialised with base <4.7 method roundtrip
+prop_fixed_constr_resolution :: Fixed.Fixed Fixed.E3 -> Bool
+prop_fixed_constr_resolution x = runGet fixedGet (runPut (put x)) == x
+
+-- | Serialised with base <4.7, unserialised with base >=4.7 method roundtrip
+prop_fixed_resolution_constr :: Fixed.Fixed Fixed.E3 -> Bool
+prop_fixed_resolution_constr x = runGet get (runPut (fixedPut x)) == x
+
+#endif
+
+------------------------------------------------------------------------
+
 type T a = a -> Property
 type B a = a -> Bool
 
@@ -539,4 +567,11 @@ tests =
             , ("L.ByteString invariant",   p (prop_invariant :: B L.ByteString                 ))
             , ("[L.ByteString] invariant", p (prop_invariant :: B [L.ByteString]               ))
             ]
+#ifdef HAS_FIXED_CONSTRUCTOR
+        , testGroup "Fixed"
+            [ testProperty "Serialisation same"       $ p prop_fixed_ser
+            , testProperty "MkFixed -> HasResolution" $ p prop_fixed_constr_resolution
+            , testProperty "HasResolution -> MkFixed" $ p prop_fixed_resolution_constr
+            ]
+#endif
         ]


From git at git.haskell.org  Sun Dec 20 21:16:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:27 +0000 (UTC)
Subject: [commit: packages/binary] master: Split GBinary into GBinaryGet and
 GBinaryPut, speeds up compilation. (c641061)
Message-ID: <20151220211627.541A23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/c641061fcf7886968218d25b7141bd7e0b60303a

>---------------------------------------------------------------

commit c641061fcf7886968218d25b7141bd7e0b60303a
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Thu Dec 17 17:05:29 2015 -0800

    Split GBinary into GBinaryGet and GBinaryPut, speeds up compilation.
    
    Consider:
    
        {-# LANGUAGE DeriveGeneric #-}
        module A where
        import Data.Binary
        import GHC.Generics
        data T = T
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         () () () () () () () () () ()
         deriving Generic
        instance Binary T
    
    Without this patch, on GHC 7.10.2, building this -O2 takes 6.7s.  With
    this patch, it takes 1.7s.  Amazing.  (There are modest improvements
    with other versions of GHC too.)
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>


>---------------------------------------------------------------

c641061fcf7886968218d25b7141bd7e0b60303a
 src/Data/Binary.hs         |  6 ++++--
 src/Data/Binary/Class.hs   | 15 +++++++++++----
 src/Data/Binary/Generic.hs | 41 +++++++++++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 18 deletions(-)

diff --git a/src/Data/Binary.hs b/src/Data/Binary.hs
index bb25ee5..9f8bed7 100644
--- a/src/Data/Binary.hs
+++ b/src/Data/Binary.hs
@@ -30,7 +30,8 @@
 -- If the specifics of the data format is not important to you, for example,
 -- you are more interested in serializing and deserializing values than
 -- in which format will be used, it is possible to derive 'Binary'
--- instances using the generic support. See 'GBinary'.
+-- instances using the generic support. See 'GBinaryGet' and
+-- 'GBinaryPut'.
 --
 -- If you have specific requirements about the encoding format, you can use
 -- the encoding and decoding primitives directly, see the modules
@@ -48,7 +49,8 @@ module Data.Binary (
 #ifdef GENERICS
     -- * Generic support
     -- $generics
-    , GBinary(..)
+    , GBinaryGet(..)
+    , GBinaryPut(..)
 #endif
 
     -- * The Get and Put monads
diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index ffb9734..2e6e19a 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -36,7 +36,8 @@ module Data.Binary.Class (
 
 #ifdef GENERICS
     -- * Support for generics
-    , GBinary(..)
+    , GBinaryGet(..)
+    , GBinaryPut(..)
 #endif
 
     ) where
@@ -98,8 +99,14 @@ import Data.Version (Version(..))
 ------------------------------------------------------------------------
 
 #ifdef GENERICS
-class GBinary f where
+-- Factored into two classes because this makes GHC optimize the
+-- instances faster.  This doesn't matter for builds of binary,
+-- but it matters a lot for end-users who write 'instance Binary T'.
+-- See also: https://ghc.haskell.org/trac/ghc/ticket/9630
+class GBinaryPut f where
     gput :: f t -> Put
+
+class GBinaryGet f where
     gget :: Get (f t)
 #endif
 
@@ -127,10 +134,10 @@ class Binary t where
     get :: Get t
 
 #ifdef GENERICS
-    default put :: (Generic t, GBinary (Rep t)) => t -> Put
+    default put :: (Generic t, GBinaryPut (Rep t)) => t -> Put
     put = gput . from
 
-    default get :: (Generic t, GBinary (Rep t)) => Get t
+    default get :: (Generic t, GBinaryGet (Rep t)) => Get t
     get = to `fmap` gget
 #endif
 
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index 3f8edb3..551047e 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -32,28 +32,38 @@ import GHC.Generics
 import Prelude -- Silence AMP warning.
 
 -- Type without constructors
-instance GBinary V1 where
+instance GBinaryPut V1 where
     gput _ = return ()
+
+instance GBinaryGet V1 where
     gget   = return undefined
 
 -- Constructor without arguments
-instance GBinary U1 where
+instance GBinaryPut U1 where
     gput U1 = return ()
+
+instance GBinaryGet U1 where
     gget    = return U1
 
 -- Product: constructor with parameters
-instance (GBinary a, GBinary b) => GBinary (a :*: b) where
+instance (GBinaryPut a, GBinaryPut b) => GBinaryPut (a :*: b) where
     gput (x :*: y) = gput x >> gput y
+
+instance (GBinaryGet a, GBinaryGet b) => GBinaryGet (a :*: b) where
     gget = (:*:) <$> gget <*> gget
 
 -- Metadata (constructor name, etc)
-instance GBinary a => GBinary (M1 i c a) where
+instance GBinaryPut a => GBinaryPut (M1 i c a) where
     gput = gput . unM1
+
+instance GBinaryGet a => GBinaryGet (M1 i c a) where
     gget = M1 <$> gget
 
 -- Constants, additional parameters, and rank-1 recursion
-instance Binary a => GBinary (K1 i a) where
+instance Binary a => GBinaryPut (K1 i a) where
     gput = put . unK1
+
+instance Binary a => GBinaryGet (K1 i a) where
     gget = K1 <$> get
 
 -- Borrowed from the cereal package.
@@ -69,14 +79,17 @@ instance Binary a => GBinary (K1 i a) where
 #define PUTSUM(WORD) GUARD(WORD) = putSum (0 :: WORD) (fromIntegral size)
 #define GETSUM(WORD) GUARD(WORD) = (get :: Get WORD) >>= checkGetSum (fromIntegral size)
 
-instance ( GSum     a, GSum     b
-         , GBinary a, GBinary b
-         , SumSize    a, SumSize    b) => GBinary (a :+: b) where
+instance ( GSumPut  a, GSumPut  b
+         , GBinaryPut a, GBinaryPut b
+         , SumSize    a, SumSize    b) => GBinaryPut (a :+: b) where
     gput | PUTSUM(Word8) | PUTSUM(Word16) | PUTSUM(Word32) | PUTSUM(Word64)
          | otherwise = sizeError "encode" size
       where
         size = unTagged (sumSize :: Tagged (a :+: b) Word64)
 
+instance ( GSumGet  a, GSumGet  b
+         , GBinaryGet a, GBinaryGet b
+         , SumSize    a, SumSize    b) => GBinaryGet (a :+: b) where
     gget | GETSUM(Word8) | GETSUM(Word16) | GETSUM(Word32) | GETSUM(Word64)
          | otherwise = sizeError "decode" size
       where
@@ -88,23 +101,26 @@ sizeError s size =
 
 ------------------------------------------------------------------------
 
-checkGetSum :: (Ord word, Num word, Bits word, GSum f)
+checkGetSum :: (Ord word, Num word, Bits word, GSumGet f)
             => word -> word -> Get (f a)
 checkGetSum size code | code < size = getSum code size
                       | otherwise   = fail "Unknown encoding for constructor"
 {-# INLINE checkGetSum #-}
 
-class GSum f where
+class GSumGet f where
     getSum :: (Ord word, Num word, Bits word) => word -> word -> Get (f a)
+
+class GSumPut f where
     putSum :: (Num w, Bits w, Binary w) => w -> w -> f a -> Put
 
-instance (GSum a, GSum b, GBinary a, GBinary b) => GSum (a :+: b) where
+instance (GSumGet a, GSumGet b, GBinaryGet a, GBinaryGet b) => GSumGet (a :+: b) where
     getSum !code !size | code < sizeL = L1 <$> getSum code           sizeL
                        | otherwise    = R1 <$> getSum (code - sizeL) sizeR
         where
           sizeL = size `shiftR` 1
           sizeR = size - sizeL
 
+instance (GSumPut a, GSumPut b, GBinaryPut a, GBinaryPut b) => GSumPut (a :+: b) where
     putSum !code !size s = case s of
                              L1 x -> putSum code           sizeL x
                              R1 x -> putSum (code + sizeL) sizeR x
@@ -112,9 +128,10 @@ instance (GSum a, GSum b, GBinary a, GBinary b) => GSum (a :+: b) where
           sizeL = size `shiftR` 1
           sizeR = size - sizeL
 
-instance GBinary a => GSum (C1 c a) where
+instance GBinaryGet a => GSumGet (C1 c a) where
     getSum _ _ = gget
 
+instance GBinaryPut a => GSumPut (C1 c a) where
     putSum !code _ x = put code *> gput x
 
 ------------------------------------------------------------------------


From git at git.haskell.org  Sun Dec 20 21:16:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:29 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #95 from
 ezyang/binary-splitg (9152958)
Message-ID: <20151220211629.5B8F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/915295868e7e1240a87e0e8cc89690f2f3f373cb

>---------------------------------------------------------------

commit 915295868e7e1240a87e0e8cc89690f2f3f373cb
Merge: 8429d6b c641061
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Fri Dec 18 16:00:20 2015 +0100

    Merge pull request #95 from ezyang/binary-splitg
    
    Split GBinary into GBinaryGet and GBinaryPut, speeds up compilation.



>---------------------------------------------------------------

915295868e7e1240a87e0e8cc89690f2f3f373cb
 src/Data/Binary.hs         |  6 ++++--
 src/Data/Binary/Class.hs   | 15 +++++++++++----
 src/Data/Binary/Generic.hs | 41 +++++++++++++++++++++++++++++------------
 3 files changed, 44 insertions(+), 18 deletions(-)


From git at git.haskell.org  Sun Dec 20 21:16:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:31 +0000 (UTC)
Subject: [commit: packages/binary] master: Canonicalise Monad instances
 (b8adfe6)
Message-ID: <20151220211631.61F1E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/b8adfe6d61d3152a947dd8efb87e8024e3faa7c6

>---------------------------------------------------------------

commit b8adfe6d61d3152a947dd8efb87e8024e3faa7c6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Nov 24 14:49:03 2015 +0100

    Canonicalise Monad instances
    
    This avoids potential performance issues as well as
    future proofing code.


>---------------------------------------------------------------

b8adfe6d61d3152a947dd8efb87e8024e3faa7c6
 src/Data/Binary/Get/Internal.hs |  2 +-
 src/Data/Binary/Put.hs          | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/Data/Binary/Get/Internal.hs b/src/Data/Binary/Get/Internal.hs
index 3669242..2c5def9 100644
--- a/src/Data/Binary/Get/Internal.hs
+++ b/src/Data/Binary/Get/Internal.hs
@@ -91,7 +91,7 @@ newtype Get a = C { runCont :: forall r.
 type Success a r = B.ByteString -> a -> Decoder r
 
 instance Monad Get where
-  return = returnG
+  return = pure
   (>>=) = bindG
   fail = failG
 
diff --git a/src/Data/Binary/Put.hs b/src/Data/Binary/Put.hs
index 5ada9b2..a05bfc7 100644
--- a/src/Data/Binary/Put.hs
+++ b/src/Data/Binary/Put.hs
@@ -84,27 +84,32 @@ instance Functor PutM where
         {-# INLINE fmap #-}
 
 instance Applicative PutM where
-        pure    = return
+        pure a  = Put $ PairS a mempty
+        {-# INLINE pure #-}
+
         m <*> k = Put $
             let PairS f w  = unPut m
                 PairS x w' = unPut k
             in PairS (f x) (w `mappend` w')
 
+        m *> k  = Put $
+            let PairS _ w  = unPut m
+                PairS b w' = unPut k
+            in PairS b (w `mappend` w')
+        {-# INLINE (*>) #-}
+
 -- Standard Writer monad, with aggressive inlining
 instance Monad PutM where
-    return a = Put $ PairS a mempty
-    {-# INLINE return #-}
-
     m >>= k  = Put $
         let PairS a w  = unPut m
             PairS b w' = unPut (k a)
         in PairS b (w `mappend` w')
     {-# INLINE (>>=) #-}
 
-    m >> k  = Put $
-        let PairS _ w  = unPut m
-            PairS b w' = unPut k
-        in PairS b (w `mappend` w')
+    return = pure
+    {-# INLINE return #-}
+
+    (>>) = (*>)
     {-# INLINE (>>) #-}
 
 tell :: Builder -> Put


From git at git.haskell.org  Sun Dec 20 21:16:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:33 +0000 (UTC)
Subject: [commit: packages/binary] master: Define Semigroup instance for
 base>=4.9 (f5cf518)
Message-ID: <20151220211633.6842D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/f5cf5188c868ef14b2fbc417761bf88cf1be3910

>---------------------------------------------------------------

commit f5cf5188c868ef14b2fbc417761bf88cf1be3910
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 11:23:22 2015 +0100

    Define Semigroup instance for base>=4.9
    
    This makes `binary` `-Wcompat`-clean for GHC 8.0


>---------------------------------------------------------------

f5cf5188c868ef14b2fbc417761bf88cf1be3910
 src/Data/Binary/Builder/Base.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Data/Binary/Builder/Base.hs b/src/Data/Binary/Builder/Base.hs
index a1f46b5..5480dd0 100644
--- a/src/Data/Binary/Builder/Base.hs
+++ b/src/Data/Binary/Builder/Base.hs
@@ -64,7 +64,11 @@ module Data.Binary.Builder.Base (
 
 import qualified Data.ByteString      as S
 import qualified Data.ByteString.Lazy as L
+#if MIN_VERSION_base(4,9,0)
+import Data.Semigroup
+#else
 import Data.Monoid
+#endif
 import Data.Word
 import Foreign
 
@@ -107,10 +111,20 @@ newtype Builder = Builder {
                    -> IO L.ByteString
     }
 
+#if MIN_VERSION_base(4,9,0)
+instance Semigroup Builder where
+    (<>) = append
+    {-# INLINE (<>) #-}
+#endif
+
 instance Monoid Builder where
     mempty  = empty
     {-# INLINE mempty #-}
+#if MIN_VERSION_base(4,9,0)
+    mappend = (<>)
+#else
     mappend = append
+#endif
     {-# INLINE mappend #-}
     mconcat = foldr mappend mempty
     {-# INLINE mconcat #-}


From git at git.haskell.org  Sun Dec 20 21:16:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:35 +0000 (UTC)
Subject: [commit: packages/binary] master: Drop redundant constraints (ebcb029)
Message-ID: <20151220211635.6FDD73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/ebcb0290a33d19d3b76b8547a58e7eefcd302548

>---------------------------------------------------------------

commit ebcb0290a33d19d3b76b8547a58e7eefcd302548
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Dec 19 11:34:52 2015 +0100

    Drop redundant constraints
    
    GHC HEAD warns about these


>---------------------------------------------------------------

ebcb0290a33d19d3b76b8547a58e7eefcd302548
 src/Data/Binary/Class.hs   | 4 ++--
 src/Data/Binary/Generic.hs | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/Data/Binary/Class.hs b/src/Data/Binary/Class.hs
index 2e6e19a..f94b9a2 100644
--- a/src/Data/Binary/Class.hs
+++ b/src/Data/Binary/Class.hs
@@ -268,13 +268,13 @@ instance Binary Integer where
 --
 -- Fold and unfold an Integer to and from a list of its bytes
 --
-unroll :: (Integral a, Num a, Bits a) => a -> [Word8]
+unroll :: (Integral a, Bits a) => a -> [Word8]
 unroll = unfoldr step
   where
     step 0 = Nothing
     step i = Just (fromIntegral i, i `shiftR` 8)
 
-roll :: (Integral a, Num a, Bits a) => [Word8] -> a
+roll :: (Integral a, Bits a) => [Word8] -> a
 roll   = foldl' unstep 0 . reverse
   where
     unstep a b = a `shiftL` 8 .|. fromIntegral b
diff --git a/src/Data/Binary/Generic.hs b/src/Data/Binary/Generic.hs
index 551047e..9967f95 100644
--- a/src/Data/Binary/Generic.hs
+++ b/src/Data/Binary/Generic.hs
@@ -80,7 +80,6 @@ instance Binary a => GBinaryGet (K1 i a) where
 #define GETSUM(WORD) GUARD(WORD) = (get :: Get WORD) >>= checkGetSum (fromIntegral size)
 
 instance ( GSumPut  a, GSumPut  b
-         , GBinaryPut a, GBinaryPut b
          , SumSize    a, SumSize    b) => GBinaryPut (a :+: b) where
     gput | PUTSUM(Word8) | PUTSUM(Word16) | PUTSUM(Word32) | PUTSUM(Word64)
          | otherwise = sizeError "encode" size
@@ -88,7 +87,6 @@ instance ( GSumPut  a, GSumPut  b
         size = unTagged (sumSize :: Tagged (a :+: b) Word64)
 
 instance ( GSumGet  a, GSumGet  b
-         , GBinaryGet a, GBinaryGet b
          , SumSize    a, SumSize    b) => GBinaryGet (a :+: b) where
     gget | GETSUM(Word8) | GETSUM(Word16) | GETSUM(Word32) | GETSUM(Word64)
          | otherwise = sizeError "decode" size
@@ -113,14 +111,14 @@ class GSumGet f where
 class GSumPut f where
     putSum :: (Num w, Bits w, Binary w) => w -> w -> f a -> Put
 
-instance (GSumGet a, GSumGet b, GBinaryGet a, GBinaryGet b) => GSumGet (a :+: b) where
+instance (GSumGet a, GSumGet b) => GSumGet (a :+: b) where
     getSum !code !size | code < sizeL = L1 <$> getSum code           sizeL
                        | otherwise    = R1 <$> getSum (code - sizeL) sizeR
         where
           sizeL = size `shiftR` 1
           sizeR = size - sizeL
 
-instance (GSumPut a, GSumPut b, GBinaryPut a, GBinaryPut b) => GSumPut (a :+: b) where
+instance (GSumPut a, GSumPut b) => GSumPut (a :+: b) where
     putSum !code !size s = case s of
                              L1 x -> putSum code           sizeL x
                              R1 x -> putSum (code + sizeL) sizeR x


From git at git.haskell.org  Sun Dec 20 21:16:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:37 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #84 from
 phadej/fixed (be46cd1)
Message-ID: <20151220211637.7736A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/be46cd1acf1cd04a1c0721fcf539405780d06371

>---------------------------------------------------------------

commit be46cd1acf1cd04a1c0721fcf539405780d06371
Merge: 9152958 a58e8cc
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 18:53:06 2015 +0100

    Merge pull request #84 from phadej/fixed
    
    Data.Fixed instance



>---------------------------------------------------------------

be46cd1acf1cd04a1c0721fcf539405780d06371
 src/Data/Binary/Class.hs | 23 +++++++++++++++++++++++
 tests/QC.hs              | 38 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 61 insertions(+)



From git at git.haskell.org  Sun Dec 20 21:16:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:39 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #93 from
 hvr/pr/canonical-monad-instances (f3978d9)
Message-ID: <20151220211639.7DD123A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/f3978d949f7468dee52df912c16aa468a73ad59d

>---------------------------------------------------------------

commit f3978d949f7468dee52df912c16aa468a73ad59d
Merge: be46cd1 b8adfe6
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 19:50:23 2015 +0100

    Merge pull request #93 from hvr/pr/canonical-monad-instances
    
    Canonicalise Monad instances



>---------------------------------------------------------------

f3978d949f7468dee52df912c16aa468a73ad59d
 src/Data/Binary/Get/Internal.hs |  2 +-
 src/Data/Binary/Put.hs          | 21 +++++++++++++--------
 2 files changed, 14 insertions(+), 9 deletions(-)


From git at git.haskell.org  Sun Dec 20 21:16:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:41 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #97 from
 hvr/pr/redundant-constraints (f45fda3)
Message-ID: <20151220211641.857843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/f45fda3f9361383942210d1989dd64b15826c204

>---------------------------------------------------------------

commit f45fda3f9361383942210d1989dd64b15826c204
Merge: f3978d9 ebcb029
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 21:09:13 2015 +0100

    Merge pull request #97 from hvr/pr/redundant-constraints
    
    Drop redundant constraints



>---------------------------------------------------------------

f45fda3f9361383942210d1989dd64b15826c204
 src/Data/Binary/Class.hs   | 4 ++--
 src/Data/Binary/Generic.hs | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)



From git at git.haskell.org  Sun Dec 20 21:16:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:43 +0000 (UTC)
Subject: [commit: packages/binary] master: Update changelog.md with recent
 changes. (e4daa97)
Message-ID: <20151220211643.8B3883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/e4daa97c3d99aed42056b79c860f59a9997aee71

>---------------------------------------------------------------

commit e4daa97c3d99aed42056b79c860f59a9997aee71
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 21:26:52 2015 +0100

    Update changelog.md with recent changes.


>---------------------------------------------------------------

e4daa97c3d99aed42056b79c860f59a9997aee71
 changelog.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index d9aaa3f..ffa4a43 100644
--- a/changelog.md
+++ b/changelog.md
@@ -5,7 +5,8 @@ binary-0.8.0.0
 --------------
 
 - Added binary instance for `Version` from `Data.Version`.
-- Added binary instance for `Void` (from `base >= 4.8`).
+- Added binary instance for `Void` from GHC 7.10.1.
+- Added binary instance for `(Data.Fixed a)` from GHC 7.8.1.
 
 binary-0.7.6.1
 --------------


From git at git.haskell.org  Sun Dec 20 21:16:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 21:16:45 +0000 (UTC)
Subject: [commit: packages/binary] master: Merge pull request #96 from
 hvr/pr/semigroup (1271e14)
Message-ID: <20151220211645.910273A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/1271e1454d3ce73a9e57e518abb155b511eeb0a8

>---------------------------------------------------------------

commit 1271e1454d3ce73a9e57e518abb155b511eeb0a8
Merge: e4daa97 f5cf518
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 21:27:52 2015 +0100

    Merge pull request #96 from hvr/pr/semigroup
    
    Define Semigroup instance for base>=4.9



>---------------------------------------------------------------

1271e1454d3ce73a9e57e518abb155b511eeb0a8
 src/Data/Binary/Builder/Base.hs | 14 ++++++++++++++
 1 file changed, 14 insertions(+)


From git at git.haskell.org  Sun Dec 20 22:30:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 22:30:43 +0000 (UTC)
Subject: [commit: packages/binary] master: Remove attempt to do clever fusion
 of code in applicative style. (11816f1)
Message-ID: <20151220223043.289B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/11816f1fb2400171d018b784b9522604819b8778

>---------------------------------------------------------------

commit 11816f1fb2400171d018b784b9522604819b8778
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 22:37:27 2015 +0100

    Remove attempt to do clever fusion of code in applicative style.
    
    Removing as it complicates binary and it's very hard for client code to
    trigger.


>---------------------------------------------------------------

11816f1fb2400171d018b784b9522604819b8778
 src/Data/Binary/Get.hs          |  3 ---
 src/Data/Binary/Get/Internal.hs | 17 +++--------------
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/Data/Binary/Get.hs b/src/Data/Binary/Get.hs
index de1a326..7773586 100644
--- a/src/Data/Binary/Get.hs
+++ b/src/Data/Binary/Get.hs
@@ -63,9 +63,6 @@
 --getTrade' = Trade '<$>' 'getWord32le' '<*>' 'getWord32le' '<*>' 'getWord16le'
 -- @
 --
--- The applicative style can sometimes result in faster code, as @binary@
--- will try to optimize the code by grouping the reads together.
---
 -- There are two kinds of ways to execute this decoder, the lazy input
 -- method and the incremental input method. Here we will use the lazy
 -- input method.
diff --git a/src/Data/Binary/Get/Internal.hs b/src/Data/Binary/Get/Internal.hs
index 2c5def9..74e8eba 100644
--- a/src/Data/Binary/Get/Internal.hs
+++ b/src/Data/Binary/Get/Internal.hs
@@ -95,10 +95,6 @@ instance Monad Get where
   (>>=) = bindG
   fail = failG
 
-returnG :: a -> Get a
-returnG a = C $ \s ks -> ks s a
-{-# INLINE [0] returnG #-}
-
 bindG :: Get a -> (a -> Get b) -> Get b
 bindG (C c) f = C $ \i ks -> c i (\i' a -> (runCont (f a)) i' ks)
 {-# INLINE bindG #-}
@@ -118,8 +114,8 @@ fmapG f m = C $ \i ks -> runCont m i (\i' a -> ks i' (f a))
 {-# INLINE fmapG #-}
 
 instance Applicative Get where
-  pure = returnG
-  {-# INLINE pure #-}
+  pure = \x -> C $ \s ks -> ks s x
+  {-# INLINE [0] pure #-}
   (<*>) = apG
   {-# INLINE (<*>) #-}
 
@@ -392,17 +388,10 @@ readN !n f = ensureN n >> unsafeReadN n f
 
 {-# RULES
 
-"<$> to <*>" forall f g.
-  (<$>) f g = returnG f <*> g
-
 "readN/readN merge" forall n m f g.
   apG (readN n f) (readN m g) = readN (n+m) (\bs -> f bs $ g (B.unsafeDrop n bs))
 
-"returnG/readN swap" [~1] forall f.
-  returnG f = readN 0 (const f)
-
-"readN 0/returnG swapback" [1] forall f.
-  readN 0 f = returnG (f B.empty) #-}
+ #-}
 
 -- | Ensure that there are at least @n@ bytes available. If not, the
 -- computation will escape with 'Partial'.


From git at git.haskell.org  Sun Dec 20 22:30:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 22:30:45 +0000 (UTC)
Subject: [commit: packages/binary] master: Changelog update. (ff78825)
Message-ID: <20151220223045.2E16F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

On branch  : master
Link       : http://git.haskell.org/packages/binary.git/commitdiff/ff78825668cf7ba243e301c070c5dfa0d8c8410a

>---------------------------------------------------------------

commit ff78825668cf7ba243e301c070c5dfa0d8c8410a
Author: Lennart Kolmodin <kolmodin at gmail.com>
Date:   Sun Dec 20 22:53:43 2015 +0100

    Changelog update.


>---------------------------------------------------------------

ff78825668cf7ba243e301c070c5dfa0d8c8410a
 changelog.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/changelog.md b/changelog.md
index ffa4a43..8244e66 100644
--- a/changelog.md
+++ b/changelog.md
@@ -7,6 +7,7 @@ binary-0.8.0.0
 - Added binary instance for `Version` from `Data.Version`.
 - Added binary instance for `Void` from GHC 7.10.1.
 - Added binary instance for `(Data.Fixed a)` from GHC 7.8.1.
+- Added semigroup instance for `Data.Binary.Builder` from GHC 8.0.
 
 binary-0.7.6.1
 --------------


From git at git.haskell.org  Sun Dec 20 22:31:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 22:31:21 +0000 (UTC)
Subject: [commit: ghc] master: Update binary submodule to final 0.8.0.0
 release (1a86413)
Message-ID: <20151220223121.C4C633A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1a86413e38bb726edd0b01e152361dcb7189e338/ghc

>---------------------------------------------------------------

commit 1a86413e38bb726edd0b01e152361dcb7189e338
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 20 23:12:41 2015 +0100

    Update binary submodule to final 0.8.0.0 release
    
    Also, `binary` now is almost warning free
    (except for inlinePerformIO deprecation warnings)
    
    /cc @kolmodin


>---------------------------------------------------------------

1a86413e38bb726edd0b01e152361dcb7189e338
 libraries/binary | 2 +-
 mk/warnings.mk   | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/libraries/binary b/libraries/binary
index 8429d6b..ff78825 160000
--- a/libraries/binary
+++ b/libraries/binary
@@ -1 +1 @@
-Subproject commit 8429d6b4a04970b8a0a151109a8299675ad5d190
+Subproject commit ff78825668cf7ba243e301c070c5dfa0d8c8410a
diff --git a/mk/warnings.mk b/mk/warnings.mk
index 4420601..cf22042 100644
--- a/mk/warnings.mk
+++ b/mk/warnings.mk
@@ -48,12 +48,13 @@ SRC_HC_WARNING_OPTS_STAGE2 += -Wnoncanonical-monad-instances
 libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-inline-rule-shadowing
 
 # Turn off import warnings for bad unused imports
-libraries/bytestring_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/vector_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 
 # haddock's attoparsec uses deprecated `inlinePerformIO`
 utils/haddock_dist_EXTRA_HC_OPTS += -Wno-deprecations
+# binary too
+libraries/binary_dist-install_EXTRA_HC_OPTS += -Wno-deprecations
 
 # On Windows, there are/were some unused import warnings
 ifeq "$(HostOS_CPP)" "mingw32"
@@ -65,9 +66,6 @@ libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-deprecations
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports
 libraries/haskeline_dist-install_EXTRA_HC_OPTS += -Wno-redundant-constraints
 
-# binary upstream has some warnings, so don't use -Werror for it
-libraries/binary_dist-boot_EXTRA_HC_OPTS += -Wwarn
-libraries/binary_dist-install_EXTRA_HC_OPTS += -Wwarn
 
 # temporarily turn off unused-imports warnings for pretty
 libraries/pretty_dist-install_EXTRA_HC_OPTS += -Wno-unused-imports


From git at git.haskell.org  Sun Dec 20 22:35:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 22:35:19 +0000 (UTC)
Subject: [commit: packages/binary] tag 'binary-0.8.0.0-release' created
Message-ID: <20151220223519.718623A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/binary

New tag    : binary-0.8.0.0-release
Referencing: 15e4206c5d06b22ff94614e29f704c4b2caf0efb

From git at git.haskell.org  Sun Dec 20 23:47:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 23:47:44 +0000 (UTC)
Subject: [commit: ghc] master: Disallow empty where bindings in pattern
 synonym declarations. (8d95412)
Message-ID: <20151220234744.A1D923A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8d954125604e4585167306c4f1d4807275be0a61/ghc

>---------------------------------------------------------------

commit 8d954125604e4585167306c4f1d4807275be0a61
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Sun Dec 20 23:45:28 2015 +0000

    Disallow empty where bindings in pattern synonym declarations.
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1665
    
    GHC Trac Issues: #10426


>---------------------------------------------------------------

8d954125604e4585167306c4f1d4807275be0a61
 compiler/parser/RdrHsSyn.hs                                      | 8 +++++++-
 testsuite/tests/patsyn/should_compile/all.T                      | 1 -
 testsuite/tests/patsyn/{should_compile => should_fail}/T10426.hs | 0
 testsuite/tests/patsyn/should_fail/T10426.stderr                 | 4 ++++
 testsuite/tests/patsyn/should_fail/all.T                         | 1 +
 5 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index cc8a8ec..7e61172 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -465,8 +465,9 @@ recordPatSynErr loc pat =
 mkPatSynMatchGroup :: Located RdrName
                    -> Located (OrdList (LHsDecl RdrName))
                    -> P (MatchGroup RdrName (LHsExpr RdrName))
-mkPatSynMatchGroup (L _ patsyn_name) (L _ decls) =
+mkPatSynMatchGroup (L loc patsyn_name) (L _ decls) =
     do { matches <- mapM fromDecl (fromOL decls)
+       ; when (length matches /= 1) (wrongNumberErr loc)
        ; return $ mkMatchGroup FromSource matches }
   where
     fromDecl (L loc decl@(ValD (PatBind pat@(L _ (ConPatIn (L _ name) details)) rhs _ _ _))) =
@@ -490,6 +491,11 @@ mkPatSynMatchGroup (L _ patsyn_name) (L _ decls) =
         text "pattern synonym 'where' clause must bind the pattern synonym's name" <+>
         quotes (ppr patsyn_name) $$ ppr decl
 
+    wrongNumberErr loc =
+      parseErrorSDoc loc $
+      text "pattern synonym 'where' clause can not be empty." $$
+      text "In the pattern synonym declaration for: " <+> ppr (patsyn_name)
+
 mkConDeclH98 :: Located RdrName -> Maybe [LHsTyVarBndr RdrName]
                 -> LHsContext RdrName -> HsConDeclDetails RdrName
                 -> ConDecl RdrName
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 4452711..7ab5ac7 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -24,7 +24,6 @@ test('T9889', normal, compile, [''])
 test('T9867', normal, compile, [''])
 test('T9975a', normal, compile_fail, [''])
 test('T9975b', normal, compile, [''])
-test('T10426', [expect_broken(10426)], compile, [''])
 test('T10747', normal, compile, [''])
 test('T10997', [extra_clean(['T10997a.hi', 'T10997a.o'])], multimod_compile, ['T10997', '-v0'])
 test('T10997_1', [extra_clean(['T10997_1a.hi', 'T10997_1a.o'])], multimod_compile, ['T10997_1', '-v0'])
diff --git a/testsuite/tests/patsyn/should_compile/T10426.hs b/testsuite/tests/patsyn/should_fail/T10426.hs
similarity index 100%
rename from testsuite/tests/patsyn/should_compile/T10426.hs
rename to testsuite/tests/patsyn/should_fail/T10426.hs
diff --git a/testsuite/tests/patsyn/should_fail/T10426.stderr b/testsuite/tests/patsyn/should_fail/T10426.stderr
new file mode 100644
index 0000000..9b03e11
--- /dev/null
+++ b/testsuite/tests/patsyn/should_fail/T10426.stderr
@@ -0,0 +1,4 @@
+
+T10426.hs:3:9: error:
+    pattern synonym 'where' clause can not be empty.
+    In the pattern synonym declaration for:  Id
diff --git a/testsuite/tests/patsyn/should_fail/all.T b/testsuite/tests/patsyn/should_fail/all.T
index 26c68ca..6ef64ae 100644
--- a/testsuite/tests/patsyn/should_fail/all.T
+++ b/testsuite/tests/patsyn/should_fail/all.T
@@ -26,3 +26,4 @@ test('export-super-class-fail', expect_broken(10653), compile_fail, [''])
 test('export-type-synonym', normal, compile_fail, [''])
 test('export-ps-rec-sel', normal, compile_fail, [''])
 test('T11053', normal, compile, ['-fwarn-missing-pat-syn-sigs'])
+test('T10426', normal, compile_fail, [''])


From git at git.haskell.org  Sun Dec 20 23:47:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 20 Dec 2015 23:47:48 +0000 (UTC)
Subject: [commit: ghc] master: Allow as-patterns in pattern synonym
 declarations. (44640af)
Message-ID: <20151220234748.26E7F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/44640af7afa1a01ff2e2357f7c1436b4804866fc/ghc

>---------------------------------------------------------------

commit 44640af7afa1a01ff2e2357f7c1436b4804866fc
Author: Matthew Pickering <matthewtpickering at gmail.com>
Date:   Sun Dec 20 23:46:40 2015 +0000

    Allow as-patterns in pattern synonym declarations.
    
    We can allow them if they contain no free variables. This patch just allows
    them in one direction and not to be used as builders as the original ticket
    suggests.
    
    Test Plan: ./validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1666
    
    GHC Trac Issues: ?#9739
    
    Conflicts:
    	testsuite/tests/patsyn/should_fail/all.T


>---------------------------------------------------------------

44640af7afa1a01ff2e2357f7c1436b4804866fc
 compiler/hsSyn/HsPat.hs                            | 32 ++++++++++++++++++++++
 compiler/typecheck/TcPatSyn.hs                     |  7 +++--
 testsuite/tests/patsyn/should_compile/T9793.hs     |  5 ++++
 testsuite/tests/patsyn/should_compile/all.T        |  1 +
 testsuite/tests/patsyn/should_fail/T9793-fail.hs   |  6 ++++
 .../tests/patsyn/should_fail/T9793-fail.stderr     |  4 +++
 testsuite/tests/patsyn/should_fail/all.T           |  1 +
 .../tests/patsyn/should_fail/as-pattern.stderr     |  4 +--
 8 files changed, 56 insertions(+), 4 deletions(-)

diff --git a/compiler/hsSyn/HsPat.hs b/compiler/hsSyn/HsPat.hs
index 0f65e4b..38f0626 100644
--- a/compiler/hsSyn/HsPat.hs
+++ b/compiler/hsSyn/HsPat.hs
@@ -34,6 +34,8 @@ module HsPat (
 
         collectEvVarsPats,
 
+        hasFreeVarsLPat, hasFreeVarsPat,
+
         pprParendLPat, pprConArgs
     ) where
 
@@ -656,3 +658,33 @@ collectEvVarsPat pat =
     ConPatIn _  _     -> panic "foldMapPatBag: ConPatIn"
     SigPatIn _ _      -> panic "foldMapPatBag: SigPatIn"
     _other_pat        -> emptyBag
+
+hasFreeVarsLPat :: LPat id -> Bool
+hasFreeVarsLPat (L _ pat) = hasFreeVarsPat pat
+
+-- | Checks whether a pattern contains any unbound variables from
+-- `VarPat`s or `AsPat`s.
+hasFreeVarsPat :: Pat id -> Bool
+hasFreeVarsPat pat =
+  case pat of
+    VarPat {}         -> True
+    AsPat {}          -> True
+    NPlusKPat {}      -> True
+    NPat {}           -> False
+    LitPat {}         -> False
+    WildPat {}        -> False
+    ViewPat _ p _     -> hasFreeVarsLPat p
+    LazyPat  p        -> hasFreeVarsLPat p
+    ParPat   p        -> hasFreeVarsLPat p
+    BangPat  p        -> hasFreeVarsLPat p
+    ListPat  ps _ _   -> any hasFreeVarsLPat ps
+    TuplePat ps _ _   -> any hasFreeVarsLPat ps
+    PArrPat  ps _     -> any hasFreeVarsLPat ps
+    ConPatOut {pat_args = ps}
+                      -> any hasFreeVarsLPat (hsConPatArgs ps)
+    SigPatOut p _     -> hasFreeVarsLPat p
+    CoPat _ p _       -> hasFreeVarsPat p
+    ConPatIn _ p      -> any hasFreeVarsLPat (hsConPatArgs p)
+    SigPatIn p _      -> hasFreeVarsLPat p
+
+    SplicePat {}      -> panic "hasFreVarsPat: SplicePat"
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index 5480ab8..61b54fd 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -558,7 +558,10 @@ tcCheckPatSynPat = go
     go1   (ConPatIn _ info)   = mapM_ go (hsConPatArgs info)
     go1   VarPat{}            = return ()
     go1   WildPat{}           = return ()
-    go1 p@(AsPat _ _)         = asPatInPatSynErr p
+    go1   pat@(AsPat _ p)     =
+      if hasFreeVarsLPat p
+        then asPatInPatSynErr pat
+        else go p
     go1   (LazyPat pat)       = go pat
     go1   (ParPat pat)        = go pat
     go1   (BangPat pat)       = go pat
@@ -578,7 +581,7 @@ tcCheckPatSynPat = go
 asPatInPatSynErr :: OutputableBndr name => Pat name -> TcM a
 asPatInPatSynErr pat
   = failWithTc $
-    hang (ptext (sLit "Pattern synonym definition cannot contain as-patterns (@):"))
+    hang (ptext (sLit "Pattern synonym definition cannot contain as-patterns (@) which contain free variables:"))
        2 (ppr pat)
 
 thInPatSynErr :: OutputableBndr name => Pat name -> TcM a
diff --git a/testsuite/tests/patsyn/should_compile/T9793.hs b/testsuite/tests/patsyn/should_compile/T9793.hs
new file mode 100644
index 0000000..230c861
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/T9793.hs
@@ -0,0 +1,5 @@
+{-#?LANGUAGE PatternSynonyms #-}
+module T9793 where
+
+pattern P :: [a] -> [a]
+pattern P x <- x@(_:_)
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 7ab5ac7..3793c0d 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -44,3 +44,4 @@ test('export-record-selector', normal, compile, [''])
 test('T10897', expect_broken(10897), multi_compile, ['T10897', [
                                        ('T10897a.hs','-c')
                                       ,('T10897b.hs', '-c')], ''])
+test('T9793', normal, compile, [''])
diff --git a/testsuite/tests/patsyn/should_fail/T9793-fail.hs b/testsuite/tests/patsyn/should_fail/T9793-fail.hs
new file mode 100644
index 0000000..2787a8d
--- /dev/null
+++ b/testsuite/tests/patsyn/should_fail/T9793-fail.hs
@@ -0,0 +1,6 @@
+{-#?LANGUAGE PatternSynonyms #-}
+
+module Foo where
+
+pattern P :: [a] -> [a]
+pattern P x <- x@(y:_)
diff --git a/testsuite/tests/patsyn/should_fail/T9793-fail.stderr b/testsuite/tests/patsyn/should_fail/T9793-fail.stderr
new file mode 100644
index 0000000..62713dc
--- /dev/null
+++ b/testsuite/tests/patsyn/should_fail/T9793-fail.stderr
@@ -0,0 +1,4 @@
+
+T9793-fail.hs:6:16: error:
+    Pattern synonym definition cannot contain as-patterns (@) which contain free variables:
+      x@(y : _)
diff --git a/testsuite/tests/patsyn/should_fail/all.T b/testsuite/tests/patsyn/should_fail/all.T
index 6ef64ae..6163da1 100644
--- a/testsuite/tests/patsyn/should_fail/all.T
+++ b/testsuite/tests/patsyn/should_fail/all.T
@@ -27,3 +27,4 @@ test('export-type-synonym', normal, compile_fail, [''])
 test('export-ps-rec-sel', normal, compile_fail, [''])
 test('T11053', normal, compile, ['-fwarn-missing-pat-syn-sigs'])
 test('T10426', normal, compile_fail, [''])
+test('T9793-fail', normal, compile_fail, [''])
diff --git a/testsuite/tests/patsyn/should_fail/as-pattern.stderr b/testsuite/tests/patsyn/should_fail/as-pattern.stderr
index 62db28f..caabd47 100644
--- a/testsuite/tests/patsyn/should_fail/as-pattern.stderr
+++ b/testsuite/tests/patsyn/should_fail/as-pattern.stderr
@@ -1,4 +1,4 @@
 
-as-pattern.hs:4:18:
-    Pattern synonym definition cannot contain as-patterns (@):
+as-pattern.hs:4:18: error:
+    Pattern synonym definition cannot contain as-patterns (@) which contain free variables:
       x@(Just y)


From git at git.haskell.org  Mon Dec 21 00:11:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 00:11:40 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Added a new flag (-guard-reasoning={simple,
 try, try-quiet, do}) (f86de30)
Message-ID: <20151221001140.7397D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/f86de30aedc0b042e170a0359dee40d58cfb9a34/ghc

>---------------------------------------------------------------

commit f86de30aedc0b042e170a0359dee40d58cfb9a34
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Dec 20 20:36:27 2015 +0100

    Added a new flag (-guard-reasoning={simple,try,try-quiet,do})
    
    Options:
    ~~~~~~~
      simple    : Like old times (see only `otherwise`)
      try       : Default: If guards>20, bail. Issue waring below.
      try-quiet : If too many guards, skip check, issue no warning
      do        : Run the check fully (but may use up all resources)
    
    Warning:
    ~~~~~~~
    Pattern match checking omitted for an equation for `opt_trans_rule'
    because it may be non-performant (too many guards)
    Use: -guard-reasoning=simple
           for a more efficient (but less expressive) pattern guard checking
         -guard-reasoning=try-quiet
           to suppress this warning for inefficiently checked matches
         -guard-reasoning=do
           to fully check the match (may run out of memory)
    
    If the guards are too many, the suggested strategy is the following:
    
    1) First try -guard-reasoning=simple. The simple version of the checker
       may still be able to emit the correct warnings.
    
    2) If you still get some warnings but you are confident that there
       shouldn't be any, try -guard-reasoning=do.
    
    3) If the compilation takes too long but you are sure that your match
       is exhaustive and nothing is redundant, you can either:
       * Disable the check for matches with many guards with
         -guard-reasoning=try-quiet (useful if you compile with -Werror) or
       * Do nothing, just keep the warning as a reminder.
    
    With the current state of GHC, the above warning is emitted only for:
    
    libraries/base/Foreign/C/Error.hs:472:5:      function `errType'
    compiler/nativeGen/Dwarf/Constants.hs:170:18: (case expression)
    compiler/ghci/RtClosureInspect.hs:497:4:      function `rep'
    (And would have been for compiler/types/OptCoercion.hs, for which the
    check is currently disabled)
    
    Note that for Error.hs, Constants.hs and RtClosureInspect.hs we can
    safely enable "-guard-reasoning=do". For OptCoercion.hs the full
    check takes forever to complete (and uses up all the memory) but with
    "-guard-reasoning=simple" we can both have it checked and in reasonable
    time.
    
    ("-guard-reasoning=do" not enabled in Error.hs because it is in a
    submodule. Left it to the library maintainer)


>---------------------------------------------------------------

f86de30aedc0b042e170a0359dee40d58cfb9a34
 compiler/deSugar/Check.hs             | 84 ++++++++++++++++++++++++++++++-----
 compiler/deSugar/Match.hs             | 37 ++++++++++++---
 compiler/ghci/RtClosureInspect.hs     |  3 ++
 compiler/main/DynFlags.hs             | 20 +++++++++
 compiler/nativeGen/Dwarf/Constants.hs |  4 ++
 compiler/types/OptCoercion.hs         |  5 ++-
 6 files changed, 136 insertions(+), 17 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f86de30aedc0b042e170a0359dee40d58cfb9a34

From git at git.haskell.org  Mon Dec 21 00:11:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 00:11:43 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Turn datatype `PmPat' into a GADT (594f5f5)
Message-ID: <20151221001143.209BD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/594f5f58d6a7d9e8056d9f52332b1b1c776ed20d/ghc

>---------------------------------------------------------------

commit 594f5f58d6a7d9e8056d9f52332b1b1c776ed20d
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Dec 20 20:37:26 2015 +0100

    Turn datatype `PmPat' into a GADT
    
    Use the same type (PmPat) for both patterns and value abstractions.
    This way, we can get rid of constructors `NonGuard' and `VA' (less
    obscure and slightly more performant).


>---------------------------------------------------------------

594f5f58d6a7d9e8056d9f52332b1b1c776ed20d
 compiler/deSugar/Check.hs | 265 ++++++++++++++++++++++------------------------
 1 file changed, 124 insertions(+), 141 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 594f5f58d6a7d9e8056d9f52332b1b1c776ed20d

From git at git.haskell.org  Mon Dec 21 00:11:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 00:11:45 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Change the flags + eliminate some warnings
 (351bbfd)
Message-ID: <20151221001145.C092E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/351bbfd7972f570cb0b5cb10e5f07efb6b734cad/ghc

>---------------------------------------------------------------

commit 351bbfd7972f570cb0b5cb10e5f07efb6b734cad
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Dec 21 00:19:55 2015 +0100

    Change the flags + eliminate some warnings


>---------------------------------------------------------------

351bbfd7972f570cb0b5cb10e5f07efb6b734cad
 compiler/deSugar/Check.hs             | 53 ++++++++++++++++++-----------------
 compiler/deSugar/Match.hs             | 37 +++++++++---------------
 compiler/ghci/RtClosureInspect.hs     |  2 +-
 compiler/main/DynFlags.hs             | 27 +++++-------------
 compiler/nativeGen/Dwarf/Constants.hs |  2 +-
 compiler/types/OptCoercion.hs         |  2 +-
 6 files changed, 50 insertions(+), 73 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 351bbfd7972f570cb0b5cb10e5f07efb6b734cad

From git at git.haskell.org  Mon Dec 21 00:11:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 00:11:48 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Change the flags + eliminate
 some warnings (351bbfd)
Message-ID: <20151221001148.7E9DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/gadtpm' now includes:

     0bf0cf9 Update Cabal submodule
     fcc6b1d Use idiomatic way to tell Autoconf the c compiler
     baed2f5 Don't pass CC= explicitly to `./configure` scripts
     65920c9 Some more typos in comments
     04ab55d Use Cxt for deriving clauses in TH (#10819)
     023f11f Suggest import Data.Kinds when * is out of scope
     419b6c0 Make binds in do-blocks strict when -XStrict (#11193)
     59d3948 Add testcase for #11216
     402bbe6 Add IsString Outputable.SDoc instance
     05fe546 Test #9632 in dependent/should_compile/T9632
     ddde542 DynFlags Remove -fwarn-context-quantification flag
     9017f16 Mention "handle is semi-closed" in error messages
     05a5ebe Fix runghc when $1_$2_SHELL_WRAPPER = NO
     6d9c18c DynFlags: remove Opt_Static
     33742db DynFlags: delete function that doesn't do anything
     f4dd486 Document -XOverloadedLabels
     8e6f9bf TysWiredIn: Fix a comment - Note [TYPE] is in TysPrim
     4c9d1ea Update expected test output for 32 bit platforms
     f4d90f9 Reset process submodule to v1.4.1.0 release tag
     d1ca5d2 Fix formatting complaint from Sphinx
     98cdaee Improve documentation for -XStrict
     b8ca645 Comments on equality types and classes
     6eabb6d Allow recursive (undecidable) superclasses
     947e44f Comment layout only
     e2c9173 Narrow scope of special-case for unqualified printing of names in core libraries
     758e6b3 base: NonEmpty: Fix documentation example
     a701694 Add testcase for #11224
     28638df primops: Mark actions evaluated by `catch*` as lazy
     c1e2553 Expose enabled language extensions to TH
     50c795c Update pretty submodule to v1.1.3.2 release
     3a48e6e Update binary submodule to binary-0.8 snapshot
     2206fa8 Add `-W(no-)xxx` aliases for `-f(no-)warn-xxx` flags
     437ebdd Start using `-W` instead of `-f(no-)warn` in some places
     d36e9e1 GHC.Stack: Fix Haddock markup
     4c7da9c Update haddock submodule
     ab79ed7 Improve detection of `fdatasync(2)` (re #11137)
     11b9ada Synchronize Haddock submodule with master branch
     efaa51d Look through type synonyms in GADT kind signatures
     046b47a Note [The equality types story] in TysPrim
     b35cc1f Update Cabal submodule to latest snapshot
     1687f99 Update transformers submodule to latest v0.5.0.0
     6c9258d Add test for #10897
     7221ad7 GHC doesn't have a way to ask for user-package-db, so Cabal reimplemented it.
     4905b83 Remote GHCi, -fexternal-interpreter
     a6d664c accept output
     dd3837a Fix tests when run in parallel
     acd447e Bump haddock expected performance numbers
     b20a65d testsuite: Add missing LiteralsTest2.hs
     786d528 TcTypeable: Don't use bogus fingerprints when suppress-uniques is enabled
     62e60bb Fix haddock hyperlinker
     27f47cd Fix libffi dependency, and remove redundant LibFFI.hsc
     0cc4aad Build system: Cabalize genapply
     86ad116 Add Shake configuration to configure.ac
     109d847 Build system: Make cGhcRtsWithLibdw flag a proper Bool
     e58a936 rules/haddock: Add EXTRA_HADDOCK_OPTS flag
     4f870f8 Conditionally show plural "s" in warnings
     cab1316 Fix #11232.
     4b161c9 Reify DuplicateRecordFields by label, rather than by selector
     d3dac4e Add -fprint-typechecker-elaboration flag (fixes #10662)
     575f0ad users_guide: Remove extraneous vertical whitespace
     e7f22bf Improve pretty-printing in pprIfaceIdBndr
     e32c2e1 Remove unused T10524.stderr
     89d70f9 Update Cabal submodule
     aee58e1 T9961 allocations crept further upwards
     e2e24f2 Disable recomp015 on ARM
     ece8aff Remove warning-suppression flags for Cabal
     a2f04a2 Testsuite: #10712 is fixed
     9d9c534 Lexer: update outdated comments [skip ci]
     1b6323b IO Handles: update comments [skip ci]
     ae86eb9 Fix tcTyClTyVars to handle SigTvs
     1722fa1 Fix #11230.
     c1bd3d4 Build system: also put scripts in libexecdir/bin
     272e1cc Testsuite: allow spaces in TEST_HC passed in by the user
     116ba5e Build system: allow bindist without docs
     f1fa383 Suppress warnings when compiling primitive and random
     bc436f9 Testsuite: mark frontend01 conditionally expect_broken on #10301
     e0e03d5 Move Data.Functor.(Classes,Compose,Product,Sum) into base
     c5c72aa Update containers submodule to v0.5.7.0 release
     3dd06d5 Random typo fixes
     06cb695 ghci: fix UNREG build (missing fromJust import)
     98ccb72 Testsuite: widen lazy-bs-alloc 3->5%
     8d45ccd Testsuite Windows: fix sigof01m, sigof012m and sigof02dm
     dc8b647 Testsuite Windows: fix ghcpkg03 and ghcpkg05
     34393d9 Documentation for -fexternal-interpreter
     77b7f24 Use `-Wno-tabs` more targetted
     ba80fc6 Fix PowerPC build
     55e9ab8 Update directory submodule to v1.2.5.0 release
     83e4140 Comments only
     ed3bfca Update Win32 submodule to fix 77b7f24543f fallout
     8946ee6 GHCi.Run: Remove redundant language pragma
     53a567c configure.ac: Rename shake/ to build/
     f857d27 configure.ac: Rename build/ to shake-build/
     9d921d6 Test Trac #11248, #11249
     ff752a1 tcCheckSatisfiability: less aggressive superclass expansion
     987426c SrcLoc: Eliminate constructors of RealSrcSpan
     d6b91ea Add test for T11122
     4198b81 ghc.cabal: Backpack directory no longer exists
     0e9a331 LLVM backend: Show expected LLVM version in warnings/errors
     e02a4c2 Fix build for AArch64/Arm64
     9356393 Update terminfo submodule to v0.4.0.2 release
     97281b4 Update terminfo submodule to v0.7.2.2 release
     ccc5a1a Build system: fix 'make sdist'
     d1416c3 Update .mailmap [skip ci]
     5431273 Bump hsc2hs submodule
     b2670fc fix typo
     2cc5b60 Documentation, tests for hsc2hs's new #alignment macro
     b028384 Add -Nmax<n> RTS feature (#10728)
     59de6e8 Add sparc64 a known architecture (Ticket #11211)
     7b8a822 Make ghc-boot Hackage-ready
     64b6a76 Fix typo in 7b8a8222e8f0
     d8c8902 First pass at cleaning up ghci.cabal
     34eaf2b Fix two occurences of `x86_HOST_ARCH`
     bcc213d Update time submodule to v1.6 release
     dd56eb1 Merge new commands from ghci-ng (re #10874)
     59cc32c Update containers submodule to v0.5.7.1 release tag
     3b66960 Remove unused/redundant fields from ghc-cabal.
     f86de30 Added a new flag (-guard-reasoning={simple,try,try-quiet,do})
     594f5f5 Turn datatype `PmPat' into a GADT
     351bbfd Change the flags + eliminate some warnings

From git at git.haskell.org  Mon Dec 21 01:24:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 01:24:04 +0000 (UTC)
Subject: [commit: ghc] master: DynFlags: call defaultWays when creating
 defaultFlags (29ca4a1)
Message-ID: <20151221012404.6AD8E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/29ca4a19a4aa2753817428ff893555e8e3a852af/ghc

>---------------------------------------------------------------

commit 29ca4a19a4aa2753817428ff893555e8e3a852af
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sun Dec 13 11:42:42 2015 +0100

    DynFlags: call defaultWays when creating defaultFlags
    
    Instead of duplicating its logic. Refactoring only.
    
    For reference, `defaultWays` looks like this:
    
      defaultWays :: Settings -> [Way]
      defaultWays settings = if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings)
                            then [WayDyn]
                            else []
    
    Reviewed by: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1675


>---------------------------------------------------------------

29ca4a19a4aa2753817428ff893555e8e3a852af
 compiler/main/DynFlags.hs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 84dc188..a23ecfa 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -3211,9 +3211,7 @@ defaultFlags settings
 
     ++ default_PIC platform
 
-    ++ (if pc_DYNAMIC_BY_DEFAULT (sPlatformConstants settings)
-        then wayGeneralFlags platform WayDyn
-        else [])
+    ++ concatMap (wayGeneralFlags platform) (defaultWays settings)
 
     where platform = sTargetPlatform settings
 


From git at git.haskell.org  Mon Dec 21 03:37:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 03:37:21 +0000 (UTC)
Subject: [commit: ghc] master: TcTyClsDecls: use zipWith3M_ instead of
 generating triplets (62155a6)
Message-ID: <20151221033721.667563A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/62155a606b2d32a088b8fcdf660d79f5d57b36c7/ghc

>---------------------------------------------------------------

commit 62155a606b2d32a088b8fcdf660d79f5d57b36c7
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Sun Dec 20 22:36:43 2015 -0500

    TcTyClsDecls: use zipWith3M_ instead of generating triplets


>---------------------------------------------------------------

62155a606b2d32a088b8fcdf660d79f5d57b36c7
 compiler/typecheck/TcTyClsDecls.hs | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 30447a4..c475382 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -2139,18 +2139,18 @@ checkValidDataCon dflags existential_ok tc con
           -- Check that UNPACK pragmas and bangs work out
           -- E.g.  reject   data T = MkT {-# UNPACK #-} Int     -- No "!"
           --                data T = MkT {-# UNPACK #-} !a      -- Can't unpack
-        ; mapM_ check_bang (zip3 (dataConSrcBangs con) (dataConImplBangs con) [1..])
+        ; zipWith3M_ check_bang (dataConSrcBangs con) (dataConImplBangs con) [1..]
 
         ; traceTc "Done validity of data con" (ppr con <+> ppr (dataConRepType con))
     }
   where
     ctxt = ConArgCtxt (dataConName con)
 
-    check_bang (HsSrcBang _ _ SrcLazy, _, n)
+    check_bang (HsSrcBang _ _ SrcLazy) _ n
       | not (xopt LangExt.StrictData dflags)
       = addErrTc
           (bad_bang n (ptext (sLit "Lazy annotation (~) without StrictData")))
-    check_bang (HsSrcBang _ want_unpack strict_mark, rep_bang, n)
+    check_bang (HsSrcBang _ want_unpack strict_mark) rep_bang n
       | isSrcUnpacked want_unpack, not is_strict
       = addWarnTc (bad_bang n (ptext (sLit "UNPACK pragma lacks '!'")))
       | isSrcUnpacked want_unpack
@@ -2164,7 +2164,7 @@ checkValidDataCon dflags existential_ok tc con
                       NoSrcStrict -> xopt LangExt.StrictData dflags
                       bang        -> isSrcStrict bang
 
-    check_bang _
+    check_bang _ _ _
       = return ()
 
     bad_bang n herald


From git at git.haskell.org  Mon Dec 21 03:37:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 03:37:24 +0000 (UTC)
Subject: [commit: ghc] master: TcTyClsDecls: Add a type annotation (850710a)
Message-ID: <20151221033724.066E13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/850710ab8c0fe69ea053d48583071fe1e5ffd067/ghc

>---------------------------------------------------------------

commit 850710ab8c0fe69ea053d48583071fe1e5ffd067
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Sun Dec 20 22:37:50 2015 -0500

    TcTyClsDecls: Add a type annotation


>---------------------------------------------------------------

850710ab8c0fe69ea053d48583071fe1e5ffd067
 compiler/typecheck/TcTyClsDecls.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index c475382..026c0db 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -2146,6 +2146,7 @@ checkValidDataCon dflags existential_ok tc con
   where
     ctxt = ConArgCtxt (dataConName con)
 
+    check_bang :: HsSrcBang -> HsImplBang -> Int -> TcM ()
     check_bang (HsSrcBang _ _ SrcLazy) _ n
       | not (xopt LangExt.StrictData dflags)
       = addErrTc


From git at git.haskell.org  Mon Dec 21 08:31:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 08:31:37 +0000 (UTC)
Subject: [commit: ghc] wip/T11224: More WIP (9fdc0ce)
Message-ID: <20151221083137.C3EF23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11224
Link       : http://ghc.haskell.org/trac/ghc/changeset/9fdc0ceb1f65bb1ce47d1e9573ecc62a749b7cff/ghc

>---------------------------------------------------------------

commit 9fdc0ceb1f65bb1ce47d1e9573ecc62a749b7cff
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 08:30:38 2015 +0000

    More WIP


>---------------------------------------------------------------

9fdc0ceb1f65bb1ce47d1e9573ecc62a749b7cff
 compiler/hsSyn/HsBinds.hs                       |  9 +--
 compiler/typecheck/TcBinds.hs                   | 89 ++++++++++++++++++-------
 compiler/typecheck/TcPatSyn.hs                  | 74 +++++++++-----------
 compiler/typecheck/TcRnTypes.hs                 | 12 ++--
 compiler/types/TyCoRep.hs                       | 29 ++++----
 testsuite/tests/patsyn/should_compile/MoreEx.hs | 20 ++++++
 testsuite/tests/patsyn/should_compile/all.T     |  1 +
 7 files changed, 144 insertions(+), 90 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9fdc0ceb1f65bb1ce47d1e9573ecc62a749b7cff

From git at git.haskell.org  Mon Dec 21 09:35:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 09:35:36 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/az-anndotdot' created
Message-ID: <20151221093536.145863A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/az-anndotdot
Referencing: 297eb90832999b44126402b14486b44af1a54220

From git at git.haskell.org  Mon Dec 21 09:35:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 09:35:38 +0000 (UTC)
Subject: [commit: ghc] wip/az-anndotdot: Add Location to RdrName in FieldOcc
 (3e0ee84)
Message-ID: <20151221093538.C61A53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/az-anndotdot
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e0ee8470152196716aa497597258d1ea27bcf3a/ghc

>---------------------------------------------------------------

commit 3e0ee8470152196716aa497597258d1ea27bcf3a
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Dec 20 10:56:24 2015 +0200

    Add Location to RdrName in FieldOcc
    
    Summary:
    Post #11019, there have been some new instances of RdrName that are not
    located, in particular
    
    data FieldOcc name = FieldOcc { rdrNameFieldOcc  :: RdrName
                                  , selectorFieldOcc :: PostRn name name
                                  }
    
    data AmbiguousFieldOcc name
      = Unambiguous RdrName (PostRn name name)
      | Ambiguous   RdrName (PostTc name name)
      deriving (Typeable)
    
    Add locations to them
    
    Test Plan: ./validate
    
    Reviewers: austin, goldfire, bgamari
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1670
    
    GHC Trac Issues: #11258


>---------------------------------------------------------------

3e0ee8470152196716aa497597258d1ea27bcf3a
 compiler/hsSyn/Convert.hs       | 21 +++++++++++++--------
 compiler/hsSyn/HsTypes.hs       | 16 +++++++++-------
 compiler/hsSyn/HsUtils.hs       |  7 +++++--
 compiler/parser/Parser.y        |  6 +++---
 compiler/rename/RnEnv.hs        | 16 +++++++++++-----
 compiler/rename/RnExpr.hs       |  3 ++-
 compiler/rename/RnNames.hs      |  4 ++--
 compiler/rename/RnPat.hs        | 19 ++++++++++++-------
 compiler/rename/RnSource.hs     |  2 +-
 compiler/rename/RnTypes.hs      |  2 +-
 compiler/typecheck/TcExpr.hs    | 27 ++++++++++++++++-----------
 compiler/typecheck/TcPat.hs     |  6 ++++--
 compiler/typecheck/TcTyDecls.hs |  4 ++--
 utils/haddock                   |  2 +-
 14 files changed, 82 insertions(+), 53 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3e0ee8470152196716aa497597258d1ea27bcf3a

From git at git.haskell.org  Mon Dec 21 09:35:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 09:35:41 +0000 (UTC)
Subject: [commit: ghc] wip/az-anndotdot: Fix AnnDotDot in module export
 (297eb90)
Message-ID: <20151221093541.66BB63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/az-anndotdot
Link       : http://ghc.haskell.org/trac/ghc/changeset/297eb90832999b44126402b14486b44af1a54220/ghc

>---------------------------------------------------------------

commit 297eb90832999b44126402b14486b44af1a54220
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 21 11:33:57 2015 +0200

    Fix AnnDotDot in module export
    
    The annotation for the ".." in
    
        module GADTRecords2 (H1(..)) where
    
    was in the wrong place


>---------------------------------------------------------------

297eb90832999b44126402b14486b44af1a54220
 compiler/parser/RdrHsSyn.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 7e61172..9b534d4 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -1411,7 +1411,7 @@ checkImportSpec ie@(L _ specs) =
 mkImpExpSubSpec :: [Located (Maybe RdrName)] -> P ([AddAnn], ImpExpSubSpec)
 mkImpExpSubSpec [] = return ([], ImpExpList [])
 mkImpExpSubSpec [L l Nothing] =
-  return ([\s -> addAnnotation l AnnDotdot s], ImpExpAll)
+  return ([\s -> addAnnotation s AnnDotdot l], ImpExpAll)
 mkImpExpSubSpec xs =
   if (any (isNothing . unLoc) xs)
     then return $ ([], ImpExpAllWith xs)


From git at git.haskell.org  Mon Dec 21 10:12:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 10:12:11 +0000 (UTC)
Subject: [commit: ghc] master: Add Location to RdrName in FieldOcc (d8ed20c)
Message-ID: <20151221101211.BCFED3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d8ed20c8772bee5eb83719c804121374157cf9b6/ghc

>---------------------------------------------------------------

commit d8ed20c8772bee5eb83719c804121374157cf9b6
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Sun Dec 20 10:56:24 2015 +0200

    Add Location to RdrName in FieldOcc
    
    Summary:
    Post #11019, there have been some new instances of RdrName that are not
    located, in particular
    
    ```#!hs
    data FieldOcc name = FieldOcc { rdrNameFieldOcc  :: RdrName
                                  , selectorFieldOcc :: PostRn name name
                                  }
    
    data AmbiguousFieldOcc name
      = Unambiguous RdrName (PostRn name name)
      | Ambiguous   RdrName (PostTc name name)
      deriving (Typeable)
    ```
    Add locations to them
    
    Updates haddock submodule to match
    
    Test Plan: ./validate
    
    Reviewers: goldfire, hvr, bgamari, austin
    
    Reviewed By: hvr
    
    Subscribers: hvr, thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1670
    
    GHC Trac Issues: #11258


>---------------------------------------------------------------

d8ed20c8772bee5eb83719c804121374157cf9b6
 compiler/hsSyn/Convert.hs       | 21 +++++++++++++--------
 compiler/hsSyn/HsTypes.hs       | 16 +++++++++-------
 compiler/hsSyn/HsUtils.hs       |  7 +++++--
 compiler/parser/Parser.y        |  6 +++---
 compiler/rename/RnEnv.hs        | 16 +++++++++++-----
 compiler/rename/RnExpr.hs       |  3 ++-
 compiler/rename/RnNames.hs      |  4 ++--
 compiler/rename/RnPat.hs        | 19 ++++++++++++-------
 compiler/rename/RnSource.hs     |  2 +-
 compiler/rename/RnTypes.hs      |  2 +-
 compiler/typecheck/TcExpr.hs    | 27 ++++++++++++++++-----------
 compiler/typecheck/TcPat.hs     |  6 ++++--
 compiler/typecheck/TcTyDecls.hs |  4 ++--
 utils/haddock                   |  2 +-
 14 files changed, 82 insertions(+), 53 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc d8ed20c8772bee5eb83719c804121374157cf9b6

From git at git.haskell.org  Mon Dec 21 10:16:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 10:16:01 +0000 (UTC)
Subject: [commit: ghc] wip/az-anndotdot: Fix AnnDotDot in module export
 (0bfa727)
Message-ID: <20151221101601.0FAC13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/az-anndotdot
Link       : http://ghc.haskell.org/trac/ghc/changeset/0bfa7276c9032fc34c41e733d4956b44bdc71526/ghc

>---------------------------------------------------------------

commit 0bfa7276c9032fc34c41e733d4956b44bdc71526
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 21 11:33:57 2015 +0200

    Fix AnnDotDot in module export
    
    The annotation for the ".." in
    
        module GADTRecords2 (H1(..)) where
    
    was in the wrong place


>---------------------------------------------------------------

0bfa7276c9032fc34c41e733d4956b44bdc71526
 compiler/parser/RdrHsSyn.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 7e61172..9b534d4 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -1411,7 +1411,7 @@ checkImportSpec ie@(L _ specs) =
 mkImpExpSubSpec :: [Located (Maybe RdrName)] -> P ([AddAnn], ImpExpSubSpec)
 mkImpExpSubSpec [] = return ([], ImpExpList [])
 mkImpExpSubSpec [L l Nothing] =
-  return ([\s -> addAnnotation l AnnDotdot s], ImpExpAll)
+  return ([\s -> addAnnotation s AnnDotdot l], ImpExpAll)
 mkImpExpSubSpec xs =
   if (any (isNothing . unLoc) xs)
     then return $ ([], ImpExpAllWith xs)


From git at git.haskell.org  Mon Dec 21 10:16:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 10:16:03 +0000 (UTC)
Subject: [commit: ghc] wip/az-anndotdot's head updated: Fix AnnDotDot in
 module export (0bfa727)
Message-ID: <20151221101603.4375C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/az-anndotdot' now includes:

     d8ed20c Add Location to RdrName in FieldOcc
     0bfa727 Fix AnnDotDot in module export

From git at git.haskell.org  Mon Dec 21 10:55:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 10:55:14 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Added a new flag (-guard-reasoning={simple,
 try, try-quiet, do}) (1ed992d)
Message-ID: <20151221105514.833383A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/1ed992d03456c2be3e15ee3ad9fd2b2e2104df7c/ghc

>---------------------------------------------------------------

commit 1ed992d03456c2be3e15ee3ad9fd2b2e2104df7c
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Dec 21 00:19:55 2015 +0100

    Added a new flag (-guard-reasoning={simple,try,try-quiet,do})
    
    Summary:
    Options:
    ~~~~~~~
      simple    : Like old times (see only `otherwise`)
      try       : Default: If guards>20, bail. Issue waring below.
      try-quiet : If too many guards, skip check, issue no warning
      do        : Run the check fully (but may use up all resources)
    
    Warning:
    ~~~~~~~
    Pattern match checking omitted for an equation for `opt_trans_rule'
    because it may be non-performant (too many guards)
    Use: -guard-reasoning=simple
           for a more efficient (but less expressive) pattern guard checking
         -guard-reasoning=try-quiet
           to suppress this warning for inefficiently checked matches
         -guard-reasoning=do
           to fully check the match (may run out of memory)
    
    If the guards are too many, the suggested strategy is the following:
    
    1) First try -guard-reasoning=simple. The simple version of the checker
       may still be able to emit the correct warnings.
    
    2) If you still get some warnings but you are confident that there
       shouldn't be any, try -guard-reasoning=do.
    
    3) If the compilation takes too long but you are sure that your match
       is exhaustive and nothing is redundant, you can either:
       * Disable the check for matches with many guards with
         -guard-reasoning=try-quiet (useful if you compile with -Werror) or
       * Do nothing, just keep the warning as a reminder.
    
    With the current state of GHC, the above warning is emitted only for:
    
    libraries/base/Foreign/C/Error.hs:472:5:      function `errType'
    compiler/nativeGen/Dwarf/Constants.hs:170:18: (case expression)
    compiler/ghci/RtClosureInspect.hs:497:4:      function `rep'
    (And would have been for compiler/types/OptCoercion.hs, for which the
    check is currently disabled)
    
    Note that for Error.hs, Constants.hs and RtClosureInspect.hs we can
    safely enable "-guard-reasoning=do". For OptCoercion.hs the full
    check takes forever to complete (and uses up all the memory) but with
    "-guard-reasoning=simple" we can both have it checked and in reasonable
    time.
    
    ("-guard-reasoning=do" not enabled in Error.hs because it is in a
    submodule. Left it to the library maintainer)
    
    Turn datatype `PmPat' into a GADT
    
    Use the same type (PmPat) for both patterns and value abstractions.
    This way, we can get rid of constructors `NonGuard' and `VA' (less
    obscure and slightly more performant).
    
    Change the flags + eliminate some warnings
    
    Test Plan: validate
    
    Reviewers: bgamari, austin, hvr, goldfire
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1676
    
    GHC Trac Issues: #11195


>---------------------------------------------------------------

1ed992d03456c2be3e15ee3ad9fd2b2e2104df7c
 compiler/deSugar/Check.hs             | 53 ++++++++++++++++++-----------------
 compiler/deSugar/Match.hs             | 37 +++++++++---------------
 compiler/ghci/RtClosureInspect.hs     |  2 +-
 compiler/main/DynFlags.hs             | 27 +++++-------------
 compiler/nativeGen/Dwarf/Constants.hs |  2 +-
 compiler/types/OptCoercion.hs         |  2 +-
 6 files changed, 50 insertions(+), 73 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1ed992d03456c2be3e15ee3ad9fd2b2e2104df7c

From git at git.haskell.org  Mon Dec 21 10:55:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 10:55:17 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Make hlint happy + address thomie's
 comments (3df7e1a)
Message-ID: <20151221105517.3F3553A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3df7e1aa43ffa23d154a8879eeb5427a439246db/ghc

>---------------------------------------------------------------

commit 3df7e1aa43ffa23d154a8879eeb5427a439246db
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Dec 21 11:54:02 2015 +0100

    Make hlint happy + address thomie's comments


>---------------------------------------------------------------

3df7e1aa43ffa23d154a8879eeb5427a439246db
 compiler/deSugar/Check.hs         | 9 +++++----
 compiler/types/OptCoercion.hs     | 9 +++++----
 libraries/base/Foreign/C/Error.hs | 1 +
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index a67b109..0795edc 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -655,10 +655,11 @@ process_guards  us  oversimplify gs
 -- of the first (or the single -WHEREVER IT IS- valid to use?) pattern
 pmPatType :: PmPat p -> Type
 pmPatType (PmCon { pm_con_con = con, pm_con_arg_tys = tys })
-                                      = mkTyConApp (dataConTyCon con) tys
-pmPatType (PmVar { pm_var_id  = x  }) = idType x
-pmPatType (PmLit { pm_lit_lit = l  }) = pmLitType l
-pmPatType (PmGrd { pm_grd_pv  = pv }) = ASSERT(patVecArity pv == 1) (pmPatType p)
+  = mkTyConApp (dataConTyCon con) tys
+pmPatType (PmVar { pm_var_id  = x }) = idType x
+pmPatType (PmLit { pm_lit_lit = l }) = pmLitType l
+pmPatType (PmGrd { pm_grd_pv  = pv })
+  = ASSERT(patVecArity pv == 1) (pmPatType p)
   where Just p = find ((==1) . patternArity) pv
 
 mkOneConFull :: Id -> UniqSupply -> DataCon -> (ValAbs, [PmConstraint])
diff --git a/compiler/types/OptCoercion.hs b/compiler/types/OptCoercion.hs
index d0f1402..41cec21 100644
--- a/compiler/types/OptCoercion.hs
+++ b/compiler/types/OptCoercion.hs
@@ -1,13 +1,14 @@
 -- (c) The University of Glasgow 2006
 
 {-# LANGUAGE CPP #-}
--- {-# OPTIONS_GHC -fno-warn-overlapping-patterns -fno-warn-incomplete-patterns #-}
 #if __GLASGOW_HASKELL__ > 710
 {-# OPTIONS_GHC -Wno-too-many-guards #-}
 #endif
- -- Inexplicably, this module takes 10GB of memory to compile with the new
- -- (Nov '15) pattern-match check. This needs to be fixed. But we need
- -- to be able to compile in the meantime.
+ -- This module used to take 10GB of memory to compile with the new
+ -- (Nov '15) pattern-match check. In order to be able to compile it,
+ -- do not enable -ffull-guard-reasoning. Instead, simplify the guards
+ -- (default behaviour when guards are too many) but suppress the
+ -- "too-many-guards" warning (-Werror is on).
 
 module OptCoercion ( optCoercion, checkAxInstCo ) where
 
diff --git a/libraries/base/Foreign/C/Error.hs b/libraries/base/Foreign/C/Error.hs
index 7614351..4607c37 100644
--- a/libraries/base/Foreign/C/Error.hs
+++ b/libraries/base/Foreign/C/Error.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE CPP, NoImplicitPrelude #-}
+{-# OPTIONS_GHC -ffull-guard-reasoning #-}
 
 -----------------------------------------------------------------------------
 -- |


From git at git.haskell.org  Mon Dec 21 11:59:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 11:59:35 +0000 (UTC)
Subject: [commit: ghc] master: Modify IsString String instance (fixes #10814)
 (b225b23)
Message-ID: <20151221115935.246EC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b225b234a6b11e42fef433dcd5d2a38bb4b466bf/ghc

>---------------------------------------------------------------

commit b225b234a6b11e42fef433dcd5d2a38bb4b466bf
Author: Dan Doel <dan.doel at gmail.com>
Date:   Mon Dec 21 12:28:16 2015 +0100

    Modify IsString String instance (fixes #10814)
    
    The new instance resolves to `s ~ [Char]` as soon as we know that `s ~
    [a]`, to avoid certain functions (like (++)) causing a situation where
    `a` is ambiguous and (currently) unable to be defaulted.
    
    Reviewers: #core_libraries_committee, hvr, austin, bgamari
    
    Reviewed By: hvr, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1572
    
    GHC Trac Issues: #10814


>---------------------------------------------------------------

b225b234a6b11e42fef433dcd5d2a38bb4b466bf
 libraries/base/Data/String.hs                      | 42 +++++++++++++++++++++-
 libraries/base/changelog.md                        | 13 +++----
 .../tests/{ado => overloadedstrings}/Makefile      |  0
 .../should_run}/Makefile                           |  0
 testsuite/tests/overloadedstrings/should_run/all.T |  1 +
 .../should_run/overloadedstringsrun01.hs           |  3 ++
 .../should_run/overloadedstringsrun01.stdout       |  1 +
 7 files changed, 50 insertions(+), 10 deletions(-)

diff --git a/libraries/base/Data/String.hs b/libraries/base/Data/String.hs
index a03569f..df410f0 100644
--- a/libraries/base/Data/String.hs
+++ b/libraries/base/Data/String.hs
@@ -1,5 +1,6 @@
 {-# LANGUAGE Trustworthy #-}
 {-# LANGUAGE NoImplicitPrelude, FlexibleInstances #-}
+{-# LANGUAGE TypeFamilies #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -34,6 +35,45 @@ import Data.List (lines, words, unlines, unwords)
 class IsString a where
     fromString :: String -> a
 
-instance IsString [Char] where
+{-
+Note [IsString String]
+~~~~~~~~~~~~~~~~~~~~~~
+Previously, the IsString instance that covered String was a flexible
+instance for [Char]. This is in some sense the most accurate choice,
+but there are cases where it can lead to an ambiguity, for instance:
+
+  show $ "foo" ++ "bar"
+
+The use of (++) ensures that "foo" and "bar" must have type [t] for
+some t, but a flexible instance for [Char] will _only_ match if
+something further determines t to be Char, and nothing in the above
+example actually does.
+
+So, the above example generates an error about the ambiguity of t,
+and what's worse, the above behavior can be generated by simply
+typing:
+
+   "foo" ++ "bar"
+
+into GHCi with the OverloadedStrings extension enabled.
+
+The new instance fixes this by defining an instance that matches all
+[a], and forces a to be Char. This instance, of course, overlaps
+with things that the [Char] flexible instance doesn't, but this was
+judged to be an acceptable cost, for the gain of providing a less
+confusing experience for people experimenting with overloaded strings.
+
+It may be possible to fix this via (extended) defaulting. Currently,
+the rules are not able to default t to Char in the above example. If
+a more flexible system that enabled this defaulting were put in place,
+then it would probably make sense to revert to the flexible [Char]
+instance, since extended defaulting is enabled in GHCi. However, it
+is not clear at the time of this note exactly what such a system
+would be, and it certainly hasn't been implemented.
+
+A test case (should_run/overloadedstringsrun01.hs) has been added to
+ensure the good behavior of the above example remains in the future.
+-}
+instance (a ~ Char) => IsString [a] where
     fromString xs = xs
 
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index a86a176..82def76 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -34,15 +34,7 @@
 
   * New `GHC.Generics.packageName` operation
 
-  * New `GHC.Stack.Types` module now contains the definition of
-    `CallStack` and `SrcLoc`
-
-  * New `GHC.Stack.Types.pushCallStack` function pushes a call-site onto a `CallStack`
-
-  * `GHC.SrcLoc` has been removed
-
-  * `GHC.Stack.showCallStack` and `GHC.SrcLoc.showSrcLoc` are now called
-    `GHC.Stack.prettyCallStack` and `GHC.Stack.prettySrcLoc` respectively
+  * New `GHC.Stack.CallStack` data type
 
   * `Complex` now has `Generic`, `Generic1`, `Functor`, `Foldable`, `Traversable`,
     `Applicative`, and `Monad` instances
@@ -109,6 +101,9 @@
   * Redesign `GHC.Generics` to use type-level literals to represent the
     metadata of generic representation types (#9766)
 
+  * The `IsString` instance for `[Char]` has been modified to eliminate
+    ambiguity arising from overloaded strings and functions like `(++)`.
+
 ## 4.8.2.0  *Oct 2015*
 
   * Bundled with GHC 7.10.3
diff --git a/testsuite/tests/ado/Makefile b/testsuite/tests/overloadedstrings/Makefile
similarity index 100%
copy from testsuite/tests/ado/Makefile
copy to testsuite/tests/overloadedstrings/Makefile
diff --git a/testsuite/tests/annotations/should_compile/Makefile b/testsuite/tests/overloadedstrings/should_run/Makefile
similarity index 100%
copy from testsuite/tests/annotations/should_compile/Makefile
copy to testsuite/tests/overloadedstrings/should_run/Makefile
diff --git a/testsuite/tests/overloadedstrings/should_run/all.T b/testsuite/tests/overloadedstrings/should_run/all.T
new file mode 100644
index 0000000..8248302
--- /dev/null
+++ b/testsuite/tests/overloadedstrings/should_run/all.T
@@ -0,0 +1 @@
+test('overloadedstringsrun01', normal, compile_and_run, [''])
diff --git a/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.hs b/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.hs
new file mode 100644
index 0000000..87b4303
--- /dev/null
+++ b/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.hs
@@ -0,0 +1,3 @@
+{-# LANGUAGE OverloadedStrings #-}
+
+main = print $ "hello" ++ " world."
diff --git a/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.stdout b/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.stdout
new file mode 100644
index 0000000..ff3e71d
--- /dev/null
+++ b/testsuite/tests/overloadedstrings/should_run/overloadedstringsrun01.stdout
@@ -0,0 +1 @@
+"hello world."


From git at git.haskell.org  Mon Dec 21 11:59:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 11:59:39 +0000 (UTC)
Subject: [commit: ghc] master: Warn about unused type variables in type
 families (eb7796f)
Message-ID: <20151221115939.3101D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/eb7796f13e701cce4e7d1d86f36c966aa17f1e9c/ghc

>---------------------------------------------------------------

commit eb7796f13e701cce4e7d1d86f36c966aa17f1e9c
Author: Micha? So?nicki <sosnicki.michal at gmail.com>
Date:   Mon Dec 21 12:29:03 2015 +0100

    Warn about unused type variables in type families
    
    The warnings are enabled with the flag -fwarn-unused-matches, the same
    one that enables warnings on the term level.
    
    Identifiers starting with an underscore are now always parsed as type
    variables.  When the NamedWildCards extension is enabled, the renamer
    replaces those variables with named wildcards.
    
    An additional NameSet nwcs is added to LocalRdrEnv. It's used to keep
    names of the type variables that should be replaced with wildcards.
    
    While renaming HsForAllTy, when a name is explicitly bound it is removed
    from the nwcs NameSet. As a result, the renamer doesn't replace them in
    the quantifier body. (Trac #11098)
    
    Fixes #10982, #11098
    
    Reviewers: alanz, bgamari, hvr, austin, jstolarek
    
    Reviewed By: jstolarek
    
    Subscribers: goldfire, mpickering, RyanGlScott, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1576
    
    GHC Trac Issues: #10982


>---------------------------------------------------------------

eb7796f13e701cce4e7d1d86f36c966aa17f1e9c
 compiler/basicTypes/RdrName.hs                     |  54 ++++--
 compiler/hsSyn/PlaceHolder.hs                      |  12 +-
 compiler/parser/Parser.y                           |  10 +-
 compiler/parser/RdrHsSyn.hs                        |   1 +
 compiler/rename/RnSource.hs                        |  14 +-
 compiler/rename/RnTypes.hs                         | 199 +++++++++++++++------
 compiler/typecheck/TcTyClsDecls.hs                 |  14 +-
 docs/users_guide/7.12.1-notes.rst                  |   5 +
 docs/users_guide/glasgow_exts.rst                  |  24 ++-
 docs/users_guide/using-warnings.rst                |   3 +-
 libraries/base/Data/Either.hs                      |   2 +-
 libraries/base/Data/Type/Bool.hs                   |  12 +-
 libraries/base/Data/Type/Equality.hs               |  16 +-
 libraries/base/GHC/Generics.hs                     |  18 +-
 libraries/base/GHC/TypeLits.hs                     |   8 +-
 .../tests/determinism/should_compile/determ004.hs  |   6 +-
 testsuite/tests/ghci/scripts/T11098.script         |  13 ++
 testsuite/tests/ghci/scripts/T11098.stdout         |   3 +
 testsuite/tests/ghci/scripts/all.T                 |   1 +
 .../tests/indexed-types/should_compile/T10931.hs   |   2 +-
 .../should_compile/UnusedTyVarWarnings.hs          |  39 ++++
 .../should_compile/UnusedTyVarWarnings.stderr      |  15 ++
 .../should_compile/UnusedTyVarWarningsNamedWCs.hs  |  39 ++++
 .../UnusedTyVarWarningsNamedWCs.stderr             |  12 ++
 testsuite/tests/indexed-types/should_compile/all.T |   2 +
 .../NamedWildcardInDataFamilyInstanceLHS.hs        |   0
 ...=> NamedWildcardInDataFamilyInstanceLHS.stderr} |   7 +-
 .../NamedWildcardInTypeFamilyInstanceLHS.hs        |   2 +-
 .../NamedWildcardInTypeFamilyInstanceLHS.stderr    |  14 ++
 .../should_compile/NamedWildcardsAsTyVars.hs       |  46 +++++
 testsuite/tests/partial-sigs/should_compile/all.T  |   3 +
 .../should_fail/NamedWildcardExplicitForall.hs     |  17 ++
 .../should_fail/NamedWildcardExplicitForall.stderr |  51 ++++++
 .../NamedWildcardInDataFamilyInstanceLHS.stderr    |   4 -
 .../NamedWildcardInTypeFamilyInstanceLHS.stderr    |   4 -
 .../should_fail/NamedWildcardInTypeSplice.stderr   |  10 +-
 .../should_fail/WildcardInADTContext2.stderr       |   4 +-
 testsuite/tests/partial-sigs/should_fail/all.T     |   3 +-
 .../tests/simplCore/should_compile/T10689a.hs      |   4 +-
 39 files changed, 544 insertions(+), 149 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc eb7796f13e701cce4e7d1d86f36c966aa17f1e9c

From git at git.haskell.org  Mon Dec 21 12:41:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 12:41:42 +0000 (UTC)
Subject: [commit: ghc] master: Move Const to own module in Data.Functor.Const
 and enable PolyKinds (edcf17b)
Message-ID: <20151221124142.C67F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/edcf17bd2ae503c2dda43ded40dca0950edfd018/ghc

>---------------------------------------------------------------

commit edcf17bd2ae503c2dda43ded40dca0950edfd018
Author: Shane O'Brien <shane at duairc.com>
Date:   Sun Dec 20 13:40:13 2015 +0100

    Move Const to own module in Data.Functor.Const and enable PolyKinds
    
    `Const` from `Control.Applicative` can trivially be made
    kind-polymorphic in its second argument. There has been a Trac issue
    about this for nearly a year now. It doesn't look like anybody objects
    to it, so I figured I might as well make a patch.
    
    Trac Issues: #10039, #10865, #11135
    
    Differential Revision: https://phabricator.haskell.org/D1630
    
    Reviewers: ekmett, hvr, bgamari
    
    Subscribers: RyanGlScott, thomie


>---------------------------------------------------------------

edcf17bd2ae503c2dda43ded40dca0950edfd018
 libraries/base/Control/Applicative.hs | 32 ++-----------------
 libraries/base/Data/Functor/Const.hs  | 60 +++++++++++++++++++++++++++++++++++
 libraries/base/base.cabal             |  1 +
 libraries/base/changelog.md           |  9 ++++++
 4 files changed, 73 insertions(+), 29 deletions(-)

diff --git a/libraries/base/Control/Applicative.hs b/libraries/base/Control/Applicative.hs
index 6770234..0892808 100644
--- a/libraries/base/Control/Applicative.hs
+++ b/libraries/base/Control/Applicative.hs
@@ -2,7 +2,6 @@
 {-# LANGUAGE DeriveGeneric #-}
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE NoImplicitPrelude #-}
-{-# LANGUAGE ScopedTypeVariables #-}
 
 -----------------------------------------------------------------------------
 -- |
@@ -56,38 +55,13 @@ import Data.Eq
 import Data.Ord
 import Data.Foldable (Foldable(..))
 import Data.Functor ((<$>))
+import Data.Functor.Const (Const(..))
 
 import GHC.Base
 import GHC.Generics
 import GHC.List (repeat, zipWith)
-import GHC.Read (Read(readsPrec), readParen, lex)
-import GHC.Show (Show(showsPrec), showParen, showString)
-
-newtype Const a b = Const { getConst :: a }
-                  deriving (Generic, Generic1, Monoid, Eq, Ord)
-
-instance Read a => Read (Const a b) where
-    readsPrec d = readParen (d > 10)
-        $ \r -> [(Const x,t) | ("Const", s) <- lex r, (x, t) <- readsPrec 11 s]
-
-instance Show a => Show (Const a b) where
-    showsPrec d (Const x) = showParen (d > 10) $
-                            showString "Const " . showsPrec 11 x
-
-instance Foldable (Const m) where
-    foldMap _ _ = mempty
-
-instance Functor (Const m) where
-    fmap _ (Const v) = Const v
-
-instance Monoid m => Applicative (Const m) where
-    pure _ = Const mempty
-    (<*>) = coerce (mappend :: m -> m -> m)
--- This is pretty much the same as
--- Const f <*> Const v = Const (f `mappend` v)
--- but guarantees that mappend for Const a b will have the same arity
--- as the one for a; it won't create a closure to raise the arity
--- to 2.
+import GHC.Read (Read)
+import GHC.Show (Show)
 
 newtype WrappedMonad m a = WrapMonad { unwrapMonad :: m a }
                          deriving (Generic, Generic1, Monad)
diff --git a/libraries/base/Data/Functor/Const.hs b/libraries/base/Data/Functor/Const.hs
new file mode 100644
index 0000000..21e6f85
--- /dev/null
+++ b/libraries/base/Data/Functor/Const.hs
@@ -0,0 +1,60 @@
+{-# LANGUAGE Trustworthy #-}
+{-# LANGUAGE DeriveGeneric #-}
+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
+{-# LANGUAGE NoImplicitPrelude #-}
+{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE ScopedTypeVariables #-}
+
+-----------------------------------------------------------------------------
+-- |
+-- Module      :  Data.Functor.Const
+-- Copyright   :  Conor McBride and Ross Paterson 2005
+-- License     :  BSD-style (see the LICENSE file in the distribution)
+--
+-- Maintainer  :  libraries at haskell.org
+-- Stability   :  experimental
+-- Portability :  portable
+
+-- The 'Const' functor.
+--
+-- @since 4.9.0.0
+
+module Data.Functor.Const (Const(..)) where
+
+import Data.Foldable (Foldable(foldMap))
+
+import GHC.Base
+import GHC.Generics (Generic, Generic1)
+import GHC.Read (Read(readsPrec), readParen, lex)
+import GHC.Show (Show(showsPrec), showParen, showString)
+
+-- | The 'Const' functor.
+newtype Const a b = Const { getConst :: a }
+                  deriving (Generic, Generic1, Monoid, Eq, Ord)
+
+-- | This instance would be equivalent to the derived instances of the
+-- 'Const' newtype if the 'runConst' field were removed
+instance Read a => Read (Const a b) where
+    readsPrec d = readParen (d > 10)
+        $ \r -> [(Const x,t) | ("Const", s) <- lex r, (x, t) <- readsPrec 11 s]
+
+-- | This instance would be equivalent to the derived instances of the
+-- 'Const' newtype if the 'runConst' field were removed
+instance Show a => Show (Const a b) where
+    showsPrec d (Const x) = showParen (d > 10) $
+                            showString "Const " . showsPrec 11 x
+
+instance Foldable (Const m) where
+    foldMap _ _ = mempty
+
+instance Functor (Const m) where
+    fmap _ (Const v) = Const v
+
+instance Monoid m => Applicative (Const m) where
+    pure _ = Const mempty
+    (<*>) = coerce (mappend :: m -> m -> m)
+-- This is pretty much the same as
+-- Const f <*> Const v = Const (f `mappend` v)
+-- but guarantees that mappend for Const a b will have the same arity
+-- as the one for a; it won't create a closure to raise the arity
+-- to 2.
diff --git a/libraries/base/base.cabal b/libraries/base/base.cabal
index cc85e9b..cd77e55 100644
--- a/libraries/base/base.cabal
+++ b/libraries/base/base.cabal
@@ -146,6 +146,7 @@ Library
         Data.Functor
         Data.Functor.Classes
         Data.Functor.Compose
+        Data.Functor.Const
         Data.Functor.Identity
         Data.Functor.Product
         Data.Functor.Sum
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 82def76..33a5114 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -104,6 +104,15 @@
   * The `IsString` instance for `[Char]` has been modified to eliminate
     ambiguity arising from overloaded strings and functions like `(++)`.
 
+  * Move `Const` from `Control.Applicative` to its own module in
+   `Data.Functor.Const`. (#11135)
+
+  * Enable `PolyKinds` in the `Data.Functor.Const` module to give `Const`
+    the kind `* -> k -> *`. (#10039)
+
+  * Re-export `Const` from `Control.Applicative` for backwards compatibility.
+
+
 ## 4.8.2.0  *Oct 2015*
 
   * Bundled with GHC 7.10.3


From git at git.haskell.org  Mon Dec 21 12:41:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 12:41:45 +0000 (UTC)
Subject: [commit: ghc] master: Implement phase 1 of expanded Floating (6457903)
Message-ID: <20151221124145.6CA183A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6457903e7671b6096d2cca5d965f43daee3572a6/ghc

>---------------------------------------------------------------

commit 6457903e7671b6096d2cca5d965f43daee3572a6
Author: Dan Doel <dan.doel at gmail.com>
Date:   Sun Dec 20 15:19:52 2015 +0100

    Implement phase 1 of expanded Floating
    
    - This part of the proposal is to add log1p, expm1, log1pexp and
      log1mexp to the Floating class, and export the full Floating class
      from Numeric
    
    Reviewers: ekmett, #core_libraries_committee, bgamari, hvr, austin
    
    Reviewed By: ekmett, #core_libraries_committee, bgamari
    
    Subscribers: Phyx, RyanGlScott, ekmett, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1605
    
    GHC Trac Issues: #11166


>---------------------------------------------------------------

6457903e7671b6096d2cca5d965f43daee3572a6
 libraries/base/Data/Complex.hs | 15 ++++++++
 libraries/base/GHC/Float.hs    | 86 ++++++++++++++++++++++++++++++++++++++++++
 libraries/base/Numeric.hs      |  1 +
 libraries/base/changelog.md    |  3 ++
 rts/RtsSymbols.c               |  4 ++
 5 files changed, 109 insertions(+)

diff --git a/libraries/base/Data/Complex.hs b/libraries/base/Data/Complex.hs
index 31550d5..dd831bb 100644
--- a/libraries/base/Data/Complex.hs
+++ b/libraries/base/Data/Complex.hs
@@ -37,6 +37,7 @@ module Data.Complex
         )  where
 
 import GHC.Generics (Generic, Generic1)
+import GHC.Float (Floating(..))
 import Data.Data (Data)
 import Foreign (Storable, castPtr, peek, poke, pokeElemOff, peekElemOff, sizeOf,
                 alignment)
@@ -195,6 +196,20 @@ instance  (RealFloat a) => Floating (Complex a) where
     acosh z        =  log (z + (z+1) * sqrt ((z-1)/(z+1)))
     atanh z        =  0.5 * log ((1.0+z) / (1.0-z))
 
+    log1p x@(a :+ b)
+      | abs a < 0.5 && abs b < 0.5
+      , u <- 2*a + a*a + b*b = log1p (u/(1 + sqrt(u+1))) :+ atan2 (1 + a) b
+      | otherwise = log (1 + x)
+    {-# INLINE log1p #-}
+
+    expm1 x@(a :+ b)
+      | a*a + b*b < 1
+      , u <- expm1 a
+      , v <- sin (b/2)
+      , w <- -2*v*v = (u*w + u + w) :+ (u+1)*sin b
+      | otherwise = exp x - 1
+    {-# INLINE expm1 #-}
+
 instance Storable a => Storable (Complex a) where
     sizeOf a       = 2 * sizeOf (realPart a)
     alignment a    = alignment (realPart a)
diff --git a/libraries/base/GHC/Float.hs b/libraries/base/GHC/Float.hs
index e6180af..ddf9cf0 100644
--- a/libraries/base/GHC/Float.hs
+++ b/libraries/base/GHC/Float.hs
@@ -4,6 +4,7 @@
            , MagicHash
            , UnboxedTuples
   #-}
+{-# LANGUAGE CApiFFI #-}
 -- We believe we could deorphan this module, by moving lots of things
 -- around, but we haven't got there yet:
 {-# OPTIONS_GHC -Wno-orphans #-}
@@ -61,6 +62,46 @@ class  (Fractional a) => Floating a  where
     sinh, cosh, tanh    :: a -> a
     asinh, acosh, atanh :: a -> a
 
+    -- | @'log1p' x@ computes @'log' (1 + x)@, but provides more precise
+    -- results for small (absolute) values of @x@ if possible.
+    --
+    -- @since 4.9.0.0
+    log1p               :: a -> a
+
+    -- | @'expm1' x@ computes @'exp' x - 1@, but provides more precise
+    -- results for small (absolute) values of @x@ if possible.
+    --
+    -- @since 4.9.0.0
+    expm1               :: a -> a
+
+    -- | @'log1pexp' x@ computes @'log' (1 + 'exp' x)@, but provides more
+    -- precise results if possible.
+    --
+    -- Examples:
+    --
+    -- * if @x@ is a large negative number, @'log' (1 + 'exp' x)@ will be
+    --   imprecise for the reasons given in 'log1p'.
+    --
+    -- * if @'exp' x@ is close to @-1@, @'log' (1 + 'exp' x)@ will be
+    --   imprecise for the reasons given in 'expm1'.
+    --
+    -- @since 4.9.0.0
+    log1pexp            :: a -> a
+
+    -- | @'log1mexp' x@ computes @'log' (1 - 'exp' x)@, but provides more
+    -- precise results if possible.
+    --
+    -- Examples:
+    --
+    -- * if @x@ is a large negative number, @'log' (1 - 'exp' x)@ will be
+    --   imprecise for the reasons given in 'log1p'.
+    --
+    -- * if @'exp' x@ is close to @1@, @'log' (1 - 'exp' x)@ will be
+    --   imprecise for the reasons given in 'expm1'.
+    --
+    -- @since 4.9.0.0
+    log1mexp            :: a -> a
+
     {-# INLINE (**) #-}
     {-# INLINE logBase #-}
     {-# INLINE sqrt #-}
@@ -72,6 +113,15 @@ class  (Fractional a) => Floating a  where
     tan  x              =  sin  x / cos  x
     tanh x              =  sinh x / cosh x
 
+    {-# INLINE log1p #-}
+    {-# INLINE expm1 #-}
+    {-# INLINE log1pexp #-}
+    {-# INLINE log1mexp #-}
+    log1p x = log (1 + x)
+    expm1 x = exp x - 1
+    log1pexp x = log1p (exp x)
+    log1mexp x = log1p (negate (exp x))
+
 -- | Efficient, machine-independent access to the components of a
 -- floating-point number.
 class  (RealFrac a, Floating a) => RealFloat a  where
@@ -307,6 +357,19 @@ instance  Floating Float  where
     acosh x = log (x + (x+1.0) * sqrt ((x-1.0)/(x+1.0)))
     atanh x = 0.5 * log ((1.0+x) / (1.0-x))
 
+    log1p = log1pFloat
+    expm1 = expm1Float
+
+    log1mexp a
+      | a <= log 2 = log (negate (expm1Float a))
+      | otherwise  = log1pFloat (negate (exp a))
+    {-# INLINE log1mexp #-}
+    log1pexp a
+      | a <= 18   = log1pFloat (exp a)
+      | a <= 100  = a + exp (negate a)
+      | otherwise = a
+    {-# INLINE log1pexp #-}
+
 instance  RealFloat Float  where
     floatRadix _        =  FLT_RADIX        -- from float.h
     floatDigits _       =  FLT_MANT_DIG     -- ditto
@@ -415,6 +478,19 @@ instance  Floating Double  where
     acosh x = log (x + (x+1.0) * sqrt ((x-1.0)/(x+1.0)))
     atanh x = 0.5 * log ((1.0+x) / (1.0-x))
 
+    log1p = log1pDouble
+    expm1 = expm1Double
+
+    log1mexp a
+      | a <= log 2 = log (negate (expm1Double a))
+      | otherwise  = log1pDouble (negate (exp a))
+    {-# INLINE log1mexp #-}
+    log1pexp a
+      | a <= 18   = log1pDouble (exp a)
+      | a <= 100  = a + exp (negate a)
+      | otherwise = a
+    {-# INLINE log1pexp #-}
+
 -- RULES for Integer and Int
 {-# RULES
 "properFraction/Double->Integer"    properFraction = properFractionDoubleInteger
@@ -1069,6 +1145,16 @@ foreign import ccall unsafe "isDoubleDenormalized" isDoubleDenormalized :: Doubl
 foreign import ccall unsafe "isDoubleNegativeZero" isDoubleNegativeZero :: Double -> Int
 foreign import ccall unsafe "isDoubleFinite" isDoubleFinite :: Double -> Int
 
+
+------------------------------------------------------------------------
+-- libm imports for extended floating
+------------------------------------------------------------------------
+foreign import capi unsafe "math.h log1p" log1pDouble :: Double -> Double
+foreign import capi unsafe "math.h expm1" expm1Double :: Double -> Double
+foreign import capi unsafe "math.h log1pf" log1pFloat :: Float -> Float
+foreign import capi unsafe "math.h expm1f" expm1Float :: Float -> Float
+
+
 ------------------------------------------------------------------------
 -- Coercion rules
 ------------------------------------------------------------------------
diff --git a/libraries/base/Numeric.hs b/libraries/base/Numeric.hs
index 4e24bfe..51be3a1 100644
--- a/libraries/base/Numeric.hs
+++ b/libraries/base/Numeric.hs
@@ -56,6 +56,7 @@ module Numeric (
         -- * Miscellaneous
 
         fromRat,
+        Floating(..)
 
         ) where
 
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 33a5114..fa57556 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -112,6 +112,9 @@
 
   * Re-export `Const` from `Control.Applicative` for backwards compatibility.
 
+  * Expand `Floating` class to include operations that allow for better
+    precision: `log1p`, `expm1`, `log1pexp` and `log1mexp`. These are not
+    available from `Prelude`, but the full class is exported from `Numeric`.
 
 ## 4.8.2.0  *Oct 2015*
 
diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index 8413d31..4b0a1d5 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -157,6 +157,10 @@
       SymI_HasProto(erfc)                                \
       SymI_HasProto(erff)                                \
       SymI_HasProto(erfcf)                               \
+      SymI_HasProto(expm1)                               \
+      SymI_HasProto(expm1f)                              \
+      SymI_HasProto(log1p)                               \
+      SymI_HasProto(log1pf)                              \
       SymI_HasProto(memcpy)                              \
       SymI_HasProto(rts_InstallConsoleEvent)             \
       SymI_HasProto(rts_ConsoleHandlerDone)              \


From git at git.haskell.org  Mon Dec 21 12:41:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 12:41:48 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: Add ClassOperator testcase (9f23dd9)
Message-ID: <20151221124148.9B3A83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9f23dd9d05eb0945fa7a60492d2f2721d364327b/ghc

>---------------------------------------------------------------

commit 9f23dd9d05eb0945fa7a60492d2f2721d364327b
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 20 15:21:10 2015 +0100

    testsuite: Add ClassOperator testcase
    
    This is derived from Haddock's `Operators` `html-test`, which appears to
    fail with GHC master yet compiles with 7.10.2
    
    Reviewers: simonpj, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1667
    
    GHC Trac Issues: #11264


>---------------------------------------------------------------

9f23dd9d05eb0945fa7a60492d2f2721d364327b
 .../tests/typecheck/should_compile/ClassOperator.hs | 21 +++++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T      |  1 +
 2 files changed, 22 insertions(+)

diff --git a/testsuite/tests/typecheck/should_compile/ClassOperator.hs b/testsuite/tests/typecheck/should_compile/ClassOperator.hs
new file mode 100644
index 0000000..6d41d11
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/ClassOperator.hs
@@ -0,0 +1,21 @@
+{-# LANGUAGE PatternSynonyms, TypeOperators, TypeFamilies, MultiParamTypeClasses, GADTs #-}
+
+module ClassOperator where
+
+-- | Class with fixity, including associated types
+class a ><> b where
+  type a <>< b :: *
+  data a ><< b
+  (>><), (<<>) :: a -> b -> ()
+
+  -- | Multiple fixities
+  (**>), (**<), (>**), (<**) :: a -> a -> ()
+
+infixr 1 ><>
+infixl 2 <><
+infixl 3 ><<
+infixr 4 >><
+infixl 5 <<>
+
+infixr 8 **>, >**
+infixl 8 **<, <**
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index ae2aa94..5b09782 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -481,3 +481,4 @@ test('T10935', normal, compile, [''])
 test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
+test('ClassOperator', expect_broken(11264), compile, [''])


From git at git.haskell.org  Mon Dec 21 13:53:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 13:53:18 +0000 (UTC)
Subject: [commit: ghc] master: Minor clean-up to ghc-bin.cabal.in (25db56c)
Message-ID: <20151221135318.E7F3A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/25db56c264c6cddb100a5df5e5eeb2fd32bfe7b6/ghc

>---------------------------------------------------------------

commit 25db56c264c6cddb100a5df5e5eeb2fd32bfe7b6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 14:38:27 2015 +0100

    Minor clean-up to ghc-bin.cabal.in
    
    This has been factored out of D1673


>---------------------------------------------------------------

25db56c264c6cddb100a5df5e5eeb2fd32bfe7b6
 ghc/ghc-bin.cabal.in | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index 885e587..dc303e5 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -33,12 +33,13 @@ Executable ghc
                    directory  >= 1   && < 1.3,
                    process    >= 1   && < 1.5,
                    filepath   >= 1   && < 1.5,
-                   ghc-boot,
+                   ghc-boot   == 0.0.*,
                    ghc
+
     if os(windows)
-        Build-Depends: Win32
+        Build-Depends: Win32  == 2.3.*
     else
-        Build-Depends: unix
+        Build-Depends: unix   == 2.7.*
 
     C-Sources: hschooks.c
 
@@ -46,10 +47,12 @@ Executable ghc
     if flag(ghci)
         -- NB: this is never built by the bootstrapping GHC+libraries
         Build-depends:
+            containers     == 0.5.*,
+            deepseq        == 1.4.*,
             ghci,
-            containers == 0.5.*,
-            deepseq    == 1.4.*,
-            time       == 1.6.*
+            haskeline      == 0.7.*,
+            time           == 1.6.*,
+            transformers   == 0.5.*
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing
         Other-Modules:
@@ -57,7 +60,6 @@ Executable ghc
             GhciMonad
             GhciTags
             InteractiveUI
-        Build-Depends: transformers, haskeline
         Other-Extensions:
             BangPatterns
             FlexibleInstances


From git at git.haskell.org  Mon Dec 21 14:33:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 14:33:44 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Add -Wno-too-many-guards for T783 (bcba1aa)
Message-ID: <20151221143344.BD1FB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/bcba1aa6205cb280a20f35e0451f3ebc7ac0d190/ghc

>---------------------------------------------------------------

commit bcba1aa6205cb280a20f35e0451f3ebc7ac0d190
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Mon Dec 21 15:18:56 2015 +0100

    Add -Wno-too-many-guards for T783


>---------------------------------------------------------------

bcba1aa6205cb280a20f35e0451f3ebc7ac0d190
 testsuite/tests/perf/compiler/T783.hs | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testsuite/tests/perf/compiler/T783.hs b/testsuite/tests/perf/compiler/T783.hs
index c3ea08d..fea814e 100644
--- a/testsuite/tests/perf/compiler/T783.hs
+++ b/testsuite/tests/perf/compiler/T783.hs
@@ -1,3 +1,7 @@
+#if __GLASGOW_HASKELL__ > 710
+{-# OPTIONS_GHC -Wno-too-many-guards #-}
+#endif
+
 module Test where
 
 foo :: Double -> Int


From git at git.haskell.org  Mon Dec 21 16:27:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 16:27:11 +0000 (UTC)
Subject: [commit: ghc] master: Fix AnnDotDot in module export (e29ee49)
Message-ID: <20151221162711.0B2C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e29ee4947bc9a765f1aaff4ba0cb3076a7b09c3d/ghc

>---------------------------------------------------------------

commit e29ee4947bc9a765f1aaff4ba0cb3076a7b09c3d
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 21 11:33:57 2015 +0200

    Fix AnnDotDot in module export
    
    The annotation for the ".." in
    
        module GADTRecords2 (H1(..)) where
    
    was in the wrong place


>---------------------------------------------------------------

e29ee4947bc9a765f1aaff4ba0cb3076a7b09c3d
 compiler/parser/RdrHsSyn.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 6de79fc..39a3d0e 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -1412,7 +1412,7 @@ checkImportSpec ie@(L _ specs) =
 mkImpExpSubSpec :: [Located (Maybe RdrName)] -> P ([AddAnn], ImpExpSubSpec)
 mkImpExpSubSpec [] = return ([], ImpExpList [])
 mkImpExpSubSpec [L l Nothing] =
-  return ([\s -> addAnnotation l AnnDotdot s], ImpExpAll)
+  return ([\s -> addAnnotation s AnnDotdot l], ImpExpAll)
 mkImpExpSubSpec xs =
   if (any (isNothing . unLoc) xs)
     then return $ ([], ImpExpAllWith xs)


From git at git.haskell.org  Mon Dec 21 17:10:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 17:10:02 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/ghc-8.0' created
Message-ID: <20151221171002.D31323A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/ghc-8.0
Referencing: 7838e2a9c84916418ae77811f0381d7889acbcfa

From git at git.haskell.org  Mon Dec 21 17:10:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 17:10:05 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0: Bump GHC version to 8.0.0 (7838e2a)
Message-ID: <20151221171005.812943A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/7838e2a9c84916418ae77811f0381d7889acbcfa/ghc

>---------------------------------------------------------------

commit 7838e2a9c84916418ae77811f0381d7889acbcfa
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0


>---------------------------------------------------------------

7838e2a9c84916418ae77811f0381d7889acbcfa
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 69cdd2b..44054c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Mon Dec 21 17:25:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 17:25:23 +0000 (UTC)
Subject: [commit: ghc] wip/T11224: More WIP; basically done now. (0f34a92)
Message-ID: <20151221172523.C00313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T11224
Link       : http://ghc.haskell.org/trac/ghc/changeset/0f34a921beaf90241060da6fad16a18d59730b61/ghc

>---------------------------------------------------------------

commit 0f34a921beaf90241060da6fad16a18d59730b61
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 17:24:33 2015 +0000

    More WIP; basically done now.


>---------------------------------------------------------------

0f34a921beaf90241060da6fad16a18d59730b61
 compiler/parser/Parser.y                         |  21 +--
 compiler/typecheck/Inst.hs                       |   4 +-
 compiler/typecheck/TcBinds.hs                    |  75 +---------
 compiler/typecheck/TcExpr.hs                     |   8 +-
 compiler/typecheck/TcHsType.hs                   |   2 +-
 compiler/typecheck/TcMType.hs                    |  55 ++++---
 compiler/typecheck/TcPat.hs                      |   6 +-
 compiler/typecheck/TcPatSyn.hs                   | 179 ++++++++++++++++++++++-
 compiler/typecheck/TcPatSyn.hs-boot              |   5 +-
 compiler/typecheck/TcUnify.hs                    |   4 +-
 testsuite/tests/patsyn/should_compile/T11224b.hs |   7 +-
 testsuite/tests/patsyn/should_fail/T11010.stderr |  20 ++-
 12 files changed, 243 insertions(+), 143 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 0f34a921beaf90241060da6fad16a18d59730b61

From git at git.haskell.org  Mon Dec 21 17:38:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 17:38:39 +0000 (UTC)
Subject: [commit: ghc] master: Fix-up GHC 7.12 artifacts (99b956e)
Message-ID: <20151221173839.CBB9C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/99b956ef1d4bbb2252c0bbaa956094c2f837d111/ghc

>---------------------------------------------------------------

commit 99b956ef1d4bbb2252c0bbaa956094c2f837d111
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:37:37 2015 +0100

    Fix-up GHC 7.12 artifacts
    
    The haddock submodule also still assumed that GHC 7.12 would be the next
    major release (rather than GHC 8.0)


>---------------------------------------------------------------

99b956ef1d4bbb2252c0bbaa956094c2f837d111
 libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +-
 utils/haddock                                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index 96a58a3..71e614b 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -471,7 +471,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
 --   3. remove the FamFlavour data type from Syntax module
 --   4. make sure that all references to FamFlavour are gone from DsMeta,
 --      Convert, TcSplice (follows from 3)
-#if __GLASGOW_HASKELL__ > 712
+#if __GLASGOW_HASKELL__ > 800
 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD
 #endif
 
diff --git a/utils/haddock b/utils/haddock
index 105869f..a8d1ea9 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 105869f209f49721794e3ff5e35822178db72895
+Subproject commit a8d1ea9a6735209746b184001e40da26a83f0509


From git at git.haskell.org  Mon Dec 21 18:09:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 18:09:11 +0000 (UTC)
Subject: [commit: ghc] master: Encode strictness in GHC generics metadata
 (ee6fba8)
Message-ID: <20151221180911.F10DC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ee6fba89b066fdf8408e6a18db343a4177e613f6/ghc

>---------------------------------------------------------------

commit ee6fba89b066fdf8408e6a18db343a4177e613f6
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Mon Dec 21 16:11:25 2015 +0100

    Encode strictness in GHC generics metadata
    
    This augments `MetaSel` with a `Bang` field, which gives generic
    programmers access to the following information about each field
    selector:
    
    * `SourceUnpackedness`: whether a field was marked `{-# NOUNPACK #-}`,
      `{-# UNPACK #-}`, or not
    * `SourceStrictness`: whether a field was given a strictness (`!`) or
      laziness (`~`) annotation
    * `DecidedStrictness`: what strictness GHC infers for a field during
      compilation, which may be influenced by optimization levels,
      `-XStrictData`, `-funbox-strict-fields`, etc.
    
    Unlike in Phab:D1603, generics does not grant a programmer the ability
    to "splice" in metadata, so there is no issue including
    `DecidedStrictness` with `Bang` (whereas in Template Haskell, it had to
    be split off).
    
    One consequence of this is that `MetaNoSel` had to be removed, since it
    became redundant. The `NoSelector` empty data type was also removed for
    similar reasons.
    
    Fixes #10716.
    
    Test Plan: ./validate
    
    Reviewers: dreixel, goldfire, kosmikus, austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1646
    
    GHC Trac Issues: #10716


>---------------------------------------------------------------

ee6fba89b066fdf8408e6a18db343a4177e613f6
 compiler/prelude/PrelNames.hs                      |  48 +++-
 compiler/prelude/TysWiredIn.hs                     |   8 +-
 compiler/typecheck/TcGenGenerics.hs                |  72 ++++--
 docs/users_guide/7.12.1-notes.rst                  |   3 +
 docs/users_guide/glasgow_exts.rst                  |  34 ++-
 libraries/base/GHC/Generics.hs                     | 283 +++++++++++++++++----
 libraries/base/changelog.md                        |   5 +
 testsuite/tests/generics/GFullyStrict.hs           |  57 +++++
 .../GFullyStrict.stdout}                           |   0
 testsuite/tests/generics/GenDerivOutput.stderr     |  50 +++-
 testsuite/tests/generics/GenDerivOutput1_0.stderr  |  28 +-
 testsuite/tests/generics/GenDerivOutput1_1.stderr  | 200 ++++++++++-----
 testsuite/tests/generics/all.T                     |   2 +
 13 files changed, 618 insertions(+), 172 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ee6fba89b066fdf8408e6a18db343a4177e613f6

From git at git.haskell.org  Mon Dec 21 18:50:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 18:50:59 +0000 (UTC)
Subject: [commit: ghc] master: Maintain cost-centre stacks in the interpreter
 (c8c44fd)
Message-ID: <20151221185059.F0B8E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c8c44fd91b509b9eb644c826497ed5268e89363a/ghc

>---------------------------------------------------------------

commit c8c44fd91b509b9eb644c826497ed5268e89363a
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Sat Oct 31 17:38:34 2015 +0000

    Maintain cost-centre stacks in the interpreter
    
    Summary:
    Breakpoints become SCCs, so we have detailed call-stack info for
    interpreted code.  Currently this only works when GHC is compiled with
    -prof, but D1562 (Remote GHCi) removes this constraint so that in the
    future call stacks will be available without building your own GHCi.
    
    How can you get a stack trace?
    
    * programmatically: GHC.Stack.currentCallStack
    * I've added an experimental :where command that shows the stack when
      stopped at a breakpoint
    * `error` attaches a call stack automatically, although since calls to
      `error` are often lifted out to the top level, this is less useful
      than it might be (ImplicitParams still works though).
    * Later we might attach call stacks to all exceptions
    
    Other related changes in this diff:
    
    * I reduced the number of places that get ticks attached for
      breakpoints.  In particular there was a breakpoint around the whole
      declaration, which was often redundant because it bound no variables.
      This reduces clutter in the stack traces and speeds up compilation.
    
    * I tidied up some RealSrcSpan stuff in InteractiveUI, and made a few
      other small cleanups
    
    Test Plan: validate
    
    Reviewers: ezyang, bgamari, austin, hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1595
    
    GHC Trac Issues: #11047


>---------------------------------------------------------------

c8c44fd91b509b9eb644c826497ed5268e89363a
 compiler/codeGen/StgCmmProf.hs                     |   2 +-
 compiler/deSugar/Coverage.hs                       | 121 ++++++++------
 compiler/deSugar/Desugar.hs                        |   4 +-
 compiler/ghci/ByteCodeAsm.hs                       |  21 +--
 compiler/ghci/ByteCodeGen.hs                       |  40 +++--
 compiler/ghci/ByteCodeInstr.hs                     |   7 +-
 compiler/ghci/ByteCodeTypes.hs                     |   3 +-
 compiler/ghci/GHCi.hs                              |  14 +-
 compiler/ghci/Linker.hs                            |  16 +-
 compiler/main/BreakArray.hs                        |  83 +++++-----
 compiler/main/DynFlags.hs                          |  11 ++
 compiler/main/GHC.hs                               |   3 +-
 compiler/main/HscTypes.hs                          |  16 +-
 compiler/main/InteractiveEval.hs                   |  34 ++--
 compiler/main/InteractiveEvalTypes.hs              |  13 +-
 compiler/prelude/primops.txt.pp                    |   8 +
 ghc/GhciMonad.hs                                   |   2 +-
 ghc/InteractiveUI.hs                               | 166 ++++++++++++-------
 includes/rts/prof/CCS.h                            |   1 +
 includes/stg/MiscClosures.h                        |   1 +
 libraries/base/GHC/Stack.hs                        |   1 +
 libraries/base/GHC/Stack/CCS.hsc                   |   4 +
 libraries/ghci/GHCi/Message.hs                     |  91 +++++-----
 libraries/ghci/GHCi/Run.hs                         |  26 ++-
 rts/Disassembler.c                                 |   5 +-
 rts/Interpreter.c                                  | 184 ++++++++++++++++++---
 rts/PrimOps.cmm                                    |  13 +-
 rts/Printer.c                                      |  90 +++++-----
 rts/Printer.h                                      |   1 -
 rts/Profiling.c                                    |   9 +
 rts/RtsSymbols.c                                   |   2 +
 testsuite/tests/ghci.debugger/scripts/T2740.script |   1 -
 testsuite/tests/ghci.debugger/scripts/T2740.stdout |   4 +-
 .../tests/ghci.debugger/scripts/break001.script    |   2 -
 .../tests/ghci.debugger/scripts/break001.stdout    |  12 +-
 .../tests/ghci.debugger/scripts/break003.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break005.stdout    |   7 +-
 .../tests/ghci.debugger/scripts/break006.script    |   2 -
 .../tests/ghci.debugger/scripts/break006.stderr    |   8 +-
 .../tests/ghci.debugger/scripts/break006.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/break008.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break009.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break010.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/break011.stdout    |  10 +-
 .../tests/ghci.debugger/scripts/break012.script    |   1 -
 .../tests/ghci.debugger/scripts/break012.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/break013.script    |   1 -
 .../tests/ghci.debugger/scripts/break013.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/break014.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break017.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break018.script    |   1 -
 .../tests/ghci.debugger/scripts/break018.stdout    |  13 +-
 .../tests/ghci.debugger/scripts/break020.stdout    |  12 +-
 .../tests/ghci.debugger/scripts/break021.script    |   5 -
 .../tests/ghci.debugger/scripts/break021.stdout    |  68 ++------
 .../ghci.debugger/scripts/break022/break022.script |   1 -
 .../ghci.debugger/scripts/break022/break022.stdout |  11 +-
 .../ghci.debugger/scripts/break023/break023.stdout |   4 +-
 .../tests/ghci.debugger/scripts/break024.stdout    |   8 +-
 .../tests/ghci.debugger/scripts/break025.stdout    |   2 +-
 .../tests/ghci.debugger/scripts/break026.script    |   6 -
 .../tests/ghci.debugger/scripts/break026.stdout    |  30 +---
 .../tests/ghci.debugger/scripts/break027.script    |   1 -
 .../tests/ghci.debugger/scripts/break027.stdout    |   9 +-
 .../tests/ghci.debugger/scripts/break028.stdout    |   7 +-
 .../tests/ghci.debugger/scripts/dynbrk002.stdout   |   2 +-
 .../tests/ghci.debugger/scripts/dynbrk007.stdout   |  10 +-
 .../tests/ghci.debugger/scripts/dynbrk008.script   |   1 -
 .../tests/ghci.debugger/scripts/dynbrk008.stdout   |  10 +-
 .../tests/ghci.debugger/scripts/dynbrk009.script   |   1 -
 .../tests/ghci.debugger/scripts/dynbrk009.stdout   |   9 +-
 .../tests/ghci.debugger/scripts/getargs.stdout     |   2 +-
 .../tests/ghci.debugger/scripts/hist001.stdout     |  34 ++--
 .../ghci.debugger/scripts/listCommand001.stdout    |   1 -
 .../ghci.debugger/scripts/listCommand002.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print005.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/print018.script    |   1 -
 .../tests/ghci.debugger/scripts/print018.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print020.stdout    |  33 ++--
 .../tests/ghci.debugger/scripts/print022.script    |   1 -
 .../tests/ghci.debugger/scripts/print022.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print025.script    |   1 -
 .../tests/ghci.debugger/scripts/print025.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print029.script    |   1 -
 .../tests/ghci.debugger/scripts/print029.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print030.script    |   1 -
 .../tests/ghci.debugger/scripts/print030.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print031.script    |   1 -
 .../tests/ghci.debugger/scripts/print031.stdout    |   6 +-
 .../tests/ghci.debugger/scripts/print032.script    |   1 -
 .../tests/ghci.debugger/scripts/print032.stdout    |   7 +-
 .../tests/ghci.debugger/scripts/result001.stdout   |   2 +-
 92 files changed, 814 insertions(+), 595 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c8c44fd91b509b9eb644c826497ed5268e89363a

From git at git.haskell.org  Mon Dec 21 19:06:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 19:06:20 +0000 (UTC)
Subject: [commit: ghc] master: TcTyClsDecls: Remove invalid comments about
 list monads (4bb9f88)
Message-ID: <20151221190620.ECDF43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bb9f881fe07634b94cafa7504c7a02dc9d554dd/ghc

>---------------------------------------------------------------

commit 4bb9f881fe07634b94cafa7504c7a02dc9d554dd
Author: ?mer Sinan A?acan <omeragacan at gmail.com>
Date:   Mon Dec 21 14:03:26 2015 -0500

    TcTyClsDecls: Remove invalid comments about list monads


>---------------------------------------------------------------

4bb9f881fe07634b94cafa7504c7a02dc9d554dd
 compiler/typecheck/TcTyClsDecls.hs | 11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index 8a8f112..47b2fc2 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -396,10 +396,8 @@ getInitialKind decl@(ClassDecl { tcdLName = L _ name, tcdTyVars = ktvs, tcdATs =
 getInitialKind decl@(DataDecl { tcdLName = L _ name
                               , tcdTyVars = ktvs
                               , tcdDataDefn = HsDataDefn { dd_kindSig = m_sig
-                                                         , dd_cons = cons' } })
-  = let cons = cons' -- AZ list monad coming
-    in
-     do { (decl_kind, _) <-
+                                                         , dd_cons = cons } })
+  = do  { (decl_kind, _) <-
            kcHsTyVarBndrs (hsDeclHasCusk decl) ktvs $ \_ _ ->
            do { res_k <- case m_sig of
                            Just ksig -> tcLHsKind ksig
@@ -867,9 +865,8 @@ tcDataDefn rec_info     -- Knot-tied; don't look at this eagerly
            tc_name tvs tycon_kind res_kind
          (HsDataDefn { dd_ND = new_or_data, dd_cType = cType
                      , dd_ctxt = ctxt, dd_kindSig = mb_ksig
-                     , dd_cons = cons' })
- = let cons = cons' -- AZ List monad coming
-   in do { extra_tvs <- tcDataKindSig res_kind
+                     , dd_cons = cons })
+ =  do { extra_tvs <- tcDataKindSig res_kind
        ; let final_tvs  = tvs `chkAppend` extra_tvs
              roles      = rti_roles rec_info tc_name
 


From git at git.haskell.org  Mon Dec 21 19:22:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 19:22:29 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: Add testcase for #8316 (a61e717)
Message-ID: <20151221192229.9CF7B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a61e717fcff9108337b1d35783ea3afbf591d3c6/ghc

>---------------------------------------------------------------

commit a61e717fcff9108337b1d35783ea3afbf591d3c6
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Dec 21 20:22:49 2015 +0100

    testsuite: Add testcase for #8316
    
    This is still broken but really out to be fixed. At least know we'll
    know if someone fixes it inadvertently.
    
    Test Plan: validate
    
    Reviewers: austin
    
    Reviewed By: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1682
    
    GHC Trac Issues: #8316


>---------------------------------------------------------------

a61e717fcff9108337b1d35783ea3afbf591d3c6
 testsuite/tests/ghci/scripts/T8316.hs     | 5 +++++
 testsuite/tests/ghci/scripts/T8316.script | 4 ++++
 testsuite/tests/ghci/scripts/all.T        | 1 +
 3 files changed, 10 insertions(+)

diff --git a/testsuite/tests/ghci/scripts/T8316.hs b/testsuite/tests/ghci/scripts/T8316.hs
new file mode 100644
index 0000000..f77a8ab
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T8316.hs
@@ -0,0 +1,5 @@
+whnf :: a -> IO ()
+whnf a = a `seq` (return ())
+
+foo :: [Int]
+foo = [1..]
diff --git a/testsuite/tests/ghci/scripts/T8316.script b/testsuite/tests/ghci/scripts/T8316.script
new file mode 100644
index 0000000..faece15
--- /dev/null
+++ b/testsuite/tests/ghci/scripts/T8316.script
@@ -0,0 +1,4 @@
+:b foo
+foo
+:p foo
+whnf _t1
\ No newline at end of file
diff --git a/testsuite/tests/ghci/scripts/all.T b/testsuite/tests/ghci/scripts/all.T
index 5d57f4e..da0ea0d 100755
--- a/testsuite/tests/ghci/scripts/all.T
+++ b/testsuite/tests/ghci/scripts/all.T
@@ -231,3 +231,4 @@ test('T10989',
     ],
     ghci_script, ['T10989.script'])
 test('T11098', normal, ghci_script, ['T11098.script'])
+test('T8316', expect_broken(8316), ghci_script, ['T8316.script'])


From git at git.haskell.org  Mon Dec 21 19:22:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 19:22:32 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/ClassOperator: This actually
 should_fail (fd1b5ae)
Message-ID: <20151221192232.44CAA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fd1b5ae701bf3f0de5d2a56a7320b68d4f66b510/ghc

>---------------------------------------------------------------

commit fd1b5ae701bf3f0de5d2a56a7320b68d4f66b510
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 21 19:13:17 2015 +0100

    testsuite/ClassOperator: This actually should_fail
    
    See #11264 for details.


>---------------------------------------------------------------

fd1b5ae701bf3f0de5d2a56a7320b68d4f66b510
 testsuite/tests/typecheck/should_compile/all.T                         | 1 -
 .../tests/typecheck/{should_compile => should_fail}/ClassOperator.hs   | 0
 testsuite/tests/typecheck/should_fail/all.T                            | 3 +--
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 5b09782..ae2aa94 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -481,4 +481,3 @@ test('T10935', normal, compile, [''])
 test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
-test('ClassOperator', expect_broken(11264), compile, [''])
diff --git a/testsuite/tests/typecheck/should_compile/ClassOperator.hs b/testsuite/tests/typecheck/should_fail/ClassOperator.hs
similarity index 100%
rename from testsuite/tests/typecheck/should_compile/ClassOperator.hs
rename to testsuite/tests/typecheck/should_fail/ClassOperator.hs
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 2670ba4..fc89ad9 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -394,5 +394,4 @@ test('CustomTypeErrors01', normal, compile_fail, [''])
 test('CustomTypeErrors02', normal, compile_fail, [''])
 test('CustomTypeErrors03', normal, compile_fail, [''])
 test('T11112', normal, compile_fail, [''])
-
-
+test('ClassOperator', expect_broken(11264), compile, [''])


From git at git.haskell.org  Mon Dec 21 19:47:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 19:47:02 +0000 (UTC)
Subject: [commit: ghc] master: Add proper GADTs support to Template Haskell
 (eeecb86)
Message-ID: <20151221194702.A1BDC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/eeecb8647585ad9eea0554b2f97a3645d2c59f88/ghc

>---------------------------------------------------------------

commit eeecb8647585ad9eea0554b2f97a3645d2c59f88
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Nov 11 10:49:22 2015 +0100

    Add proper GADTs support to Template Haskell
    
    Until now GADTs were supported in Template Haskell by encoding them using
    normal data types.  This patch adds proper support for representing GADTs
    in TH.
    
    Test Plan: T10828
    
    Reviewers: goldfire, austin, bgamari
    
    Subscribers: thomie, mpickering
    
    Differential Revision: https://phabricator.haskell.org/D1465
    
    GHC Trac Issues: #10828


>---------------------------------------------------------------

eeecb8647585ad9eea0554b2f97a3645d2c59f88
 compiler/deSugar/DsMeta.hs                         | 346 +++++++++------------
 compiler/hsSyn/Convert.hs                          | 101 ++++--
 compiler/hsSyn/HsDecls.hs                          |   5 +-
 compiler/hsSyn/HsPat.hs                            |  21 +-
 compiler/hsSyn/HsTypes.hs                          |  55 +++-
 compiler/parser/RdrHsSyn.hs                        |   4 +-
 compiler/prelude/THNames.hs                        |  23 +-
 compiler/rename/RnNames.hs                         |  10 +-
 compiler/rename/RnTypes.hs                         |   5 +-
 compiler/typecheck/TcSplice.hs                     | 120 ++++---
 compiler/typecheck/TcTyClsDecls.hs                 |  32 +-
 docs/users_guide/7.12.1-notes.rst                  |   5 +
 libraries/template-haskell/Language/Haskell/TH.hs  |   4 +-
 .../template-haskell/Language/Haskell/TH/Lib.hs    |  33 +-
 .../template-haskell/Language/Haskell/TH/Ppr.hs    | 131 ++++++--
 .../template-haskell/Language/Haskell/TH/PprLib.hs |  11 +-
 .../template-haskell/Language/Haskell/TH/Syntax.hs |  48 ++-
 .../tests/overloadedrecflds/should_fail/T11103.hs  |   2 +-
 .../should_run/overloadedrecfldsrun04.hs           |   5 +-
 testsuite/tests/rts/T7919A.hs                      |   1 +
 .../tests/safeHaskell/safeLanguage/SafeLang11_B.hs |   2 +-
 .../tests/safeHaskell/safeLanguage/SafeLang12_B.hs |   2 +-
 testsuite/tests/th/T10819_Lib.hs                   |   3 +-
 testsuite/tests/th/T10828.hs                       |  61 ++++
 testsuite/tests/th/T10828.stderr                   | 100 ++++++
 testsuite/tests/th/T10828a.hs                      |  17 +
 testsuite/tests/th/T10828a.stderr                  |   4 +
 testsuite/tests/th/T10828b.hs                      |  25 ++
 testsuite/tests/th/T10828b.stderr                  |   7 +
 testsuite/tests/th/T4188.stderr                    |  13 +-
 testsuite/tests/th/T5217.hs                        |   2 -
 testsuite/tests/th/T5217.stderr                    |   9 +-
 testsuite/tests/th/T5290.hs                        |   2 +-
 testsuite/tests/th/T5290.stderr                    |   6 +-
 testsuite/tests/th/T5665a.hs                       |   3 +-
 testsuite/tests/th/T5984_Lib.hs                    |   5 +-
 testsuite/tests/th/T7241.hs                        |   2 +-
 testsuite/tests/th/T7532a.hs                       |   2 +-
 testsuite/tests/th/T8499.hs                        |   2 +-
 testsuite/tests/th/T8624.hs                        |   3 +-
 testsuite/tests/th/T8624.stdout                    |   2 +-
 testsuite/tests/th/TH_RichKinds2.stderr            |   7 +-
 testsuite/tests/th/TH_Roles1.hs                    |   2 +-
 testsuite/tests/th/TH_Roles2.hs                    |   3 +-
 testsuite/tests/th/TH_dataD1.hs                    |   3 +-
 testsuite/tests/th/TH_genExLib.hs                  |   2 +-
 testsuite/tests/th/TH_spliceDecl1.hs               |   2 +-
 testsuite/tests/th/TH_spliceDecl3_Lib.hs           |   5 +-
 testsuite/tests/th/all.T                           |   7 +
 49 files changed, 812 insertions(+), 453 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc eeecb8647585ad9eea0554b2f97a3645d2c59f88

From git at git.haskell.org  Mon Dec 21 19:50:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 19:50:09 +0000 (UTC)
Subject: [commit: ghc] master: Rename GHCi's UI modules into GHCi.UI(.*)
 (55250a6)
Message-ID: <20151221195009.3C1EB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/55250a63cc3f285fb479f1ef396e88dc0c58b218/ghc

>---------------------------------------------------------------

commit 55250a63cc3f285fb479f1ef396e88dc0c58b218
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 15:17:42 2015 +0100

    Rename GHCi's UI modules into GHCi.UI(.*)
    
    Further work refactoring and enhancing GHCi will make it desirable to
    split up GHCi's code-base into multiple modules with specific functions,
    and rather than have several top-level 'Ghci*' modules, it's nicer to
    have a common namespace. This commit is provides the basis for that.
    
    Note that the remaining GHCi.* namespace belongs to the new `ghci`
    package.
    
    Differential Revision: https://phabricator.haskell.org/D1593


>---------------------------------------------------------------

55250a63cc3f285fb479f1ef396e88dc0c58b218
 ghc/{InteractiveUI.hs => GHCi/UI.hs}   | 12 ++++++------
 ghc/{GhciInfo.hs => GHCi/UI/Info.hs}   |  2 +-
 ghc/{GhciMonad.hs => GHCi/UI/Monad.hs} |  4 ++--
 ghc/{GhciTags.hs => GHCi/UI/Tags.hs}   |  5 ++---
 ghc/Main.hs                            |  2 +-
 ghc/ghc-bin.cabal.in                   |  8 ++++----
 6 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/ghc/InteractiveUI.hs b/ghc/GHCi/UI.hs
similarity index 99%
rename from ghc/InteractiveUI.hs
rename to ghc/GHCi/UI.hs
index 9e22560..986c119 100644
--- a/ghc/InteractiveUI.hs
+++ b/ghc/GHCi/UI.hs
@@ -20,7 +20,7 @@
 --
 -----------------------------------------------------------------------------
 
-module InteractiveUI (
+module GHCi.UI (
         interactiveUI,
         GhciSettings(..),
         defaultGhciSettings,
@@ -31,10 +31,10 @@ module InteractiveUI (
 #include "HsVersions.h"
 
 -- GHCi
-import qualified GhciMonad ( args, runStmt )
-import GhciMonad hiding ( args, runStmt )
-import GhciTags
-import GhciInfo
+import qualified GHCi.UI.Monad as GhciMonad ( args, runStmt, runDecls )
+import GHCi.UI.Monad hiding ( args, runStmt, runDecls )
+import GHCi.UI.Tags
+import GHCi.UI.Info
 import Debugger
 
 -- The GHC interface
@@ -434,7 +434,7 @@ interactiveUI config srcs maybe_exprs = do
    eval_wrapper <- mkEvalWrapper default_progname default_args
    startGHCi (runGHCi srcs maybe_exprs)
         GHCiState{ progname           = default_progname,
-                   GhciMonad.args     = default_args,
+                   args               = default_args,
                    evalWrapper        = eval_wrapper,
                    prompt             = defPrompt config,
                    prompt2            = defPrompt2 config,
diff --git a/ghc/GhciInfo.hs b/ghc/GHCi/UI/Info.hs
similarity index 99%
rename from ghc/GhciInfo.hs
rename to ghc/GHCi/UI/Info.hs
index 2fa9a95..2c44e3f 100644
--- a/ghc/GhciInfo.hs
+++ b/ghc/GHCi/UI/Info.hs
@@ -4,7 +4,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 
 -- | Get information on modules, expreesions, and identifiers
-module GhciInfo
+module GHCi.UI.Info
     ( ModInfo(..)
     , SpanInfo(..)
     , spanInfoFromRealSrcSpan
diff --git a/ghc/GhciMonad.hs b/ghc/GHCi/UI/Monad.hs
similarity index 99%
rename from ghc/GhciMonad.hs
rename to ghc/GHCi/UI/Monad.hs
index 993a758..2a2372d 100644
--- a/ghc/GhciMonad.hs
+++ b/ghc/GHCi/UI/Monad.hs
@@ -10,7 +10,7 @@
 --
 -----------------------------------------------------------------------------
 
-module GhciMonad (
+module GHCi.UI.Monad (
         GHCi(..), startGHCi,
         GHCiState(..), setGHCiState, getGHCiState, modifyGHCiState,
         GHCiOption(..), isOptionSet, setOption, unsetOption,
@@ -31,7 +31,7 @@ module GhciMonad (
 
 #include "HsVersions.h"
 
-import GhciInfo (ModInfo)
+import GHCi.UI.Info (ModInfo)
 import qualified GHC
 import GhcMonad         hiding (liftIO)
 import Outputable       hiding (printForUser, printForUserPartWay)
diff --git a/ghc/GhciTags.hs b/ghc/GHCi/UI/Tags.hs
similarity index 99%
rename from ghc/GhciTags.hs
rename to ghc/GHCi/UI/Tags.hs
index fa94ea6..8a06eb3 100644
--- a/ghc/GhciTags.hs
+++ b/ghc/GHCi/UI/Tags.hs
@@ -7,7 +7,7 @@
 -----------------------------------------------------------------------------
 
 {-# OPTIONS_GHC -fno-warn-name-shadowing #-}
-module GhciTags (
+module GHCi.UI.Tags (
   createCTagsWithLineNumbersCmd,
   createCTagsWithRegExesCmd,
   createETagsFileCmd
@@ -15,7 +15,7 @@ module GhciTags (
 
 import Exception
 import GHC
-import GhciMonad
+import GHCi.UI.Monad
 import Outputable
 
 -- ToDo: figure out whether we need these, and put something appropriate
@@ -213,4 +213,3 @@ showETag TagInfo{ tagName = tag, tagLine = lineNo, tagCol = colNo,
     ++ "\x01" ++ show lineNo
     ++ "," ++ show charPos
 showETag _ = throwGhcException (CmdLineError "missing source file info in showETag")
-
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 7d4e1e2..a47678b 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -25,7 +25,7 @@ import HscMain          ( newHscEnv )
 import DriverPipeline   ( oneShot, compileFile )
 import DriverMkDepend   ( doMkDependHS )
 #ifdef GHCI
-import InteractiveUI    ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings )
+import GHCi.UI          ( interactiveUI, ghciWelcomeMsg, defaultGhciSettings )
 #endif
 
 -- Frontend plugins
diff --git a/ghc/ghc-bin.cabal.in b/ghc/ghc-bin.cabal.in
index dc303e5..adf81b3 100644
--- a/ghc/ghc-bin.cabal.in
+++ b/ghc/ghc-bin.cabal.in
@@ -56,10 +56,10 @@ Executable ghc
         CPP-Options: -DGHCI
         GHC-Options: -fno-warn-name-shadowing
         Other-Modules:
-            GhciInfo
-            GhciMonad
-            GhciTags
-            InteractiveUI
+            GHCi.UI
+            GHCi.UI.Info
+            GHCi.UI.Monad
+            GHCi.UI.Tags
         Other-Extensions:
             BangPatterns
             FlexibleInstances


From git at git.haskell.org  Mon Dec 21 21:16:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:16:02 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: configure.ac: AArch64 is now
 registerised (4f5ba6e)
Message-ID: <20151221211602.3E0D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f5ba6e25ee13b14f26d86b868884faa4eb1fa6a/ghc

>---------------------------------------------------------------

commit 4f5ba6e25ee13b14f26d86b868884faa4eb1fa6a
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Sun Jul 5 11:22:24 2015 +0000

    configure.ac: AArch64 is now registerised


>---------------------------------------------------------------

4f5ba6e25ee13b14f26d86b868884faa4eb1fa6a
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 69cdd2b..e8ba693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,7 +240,7 @@ AC_SUBST(SOLARIS_BROKEN_SHLD)
 dnl ** Do an unregisterised build?
 dnl --------------------------------------------------------------
 case "$HostArch" in
-    i386|x86_64|powerpc|powerpc64|powerpc64le|arm)
+    i386|x86_64|powerpc|powerpc64|powerpc64le|arm|aarch64)
         UnregisterisedDefault=NO
         ;;
     *)


From git at git.haskell.org  Mon Dec 21 21:16:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:16:04 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts/StgCRun.c: Add d15 to clobbered
 regs (8e91e82)
Message-ID: <20151221211604.D4A283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e91e82b0d1deea5f15b389967cfb1508a968341/ghc

>---------------------------------------------------------------

commit 8e91e82b0d1deea5f15b389967cfb1508a968341
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Tue Oct 13 09:45:39 2015 +1100

    rts/StgCRun.c: Add d15 to clobbered regs


>---------------------------------------------------------------

8e91e82b0d1deea5f15b389967cfb1508a968341
 rts/StgCRun.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index c9bbef0..9e80d02 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -834,7 +834,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
         "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
         "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
         "%x30",
-        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14", "%d15"
+        /* Since all these registers listed as clobbered are being explicitly
+         * saved and restored, they should probably not be listed as
+         * clobbered. Leaving them as is for now while I debug other
+         * issues.
+         */
     );
     return r;
 }


From git at git.haskell.org  Mon Dec 21 21:16:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:16:10 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: Linker: WIP on supporting
 Arm64/AArch64 (4bb9b54)
Message-ID: <20151221211610.493F13A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/4bb9b54ea708070b55384a01304ade64960f3ec4/ghc

>---------------------------------------------------------------

commit 4bb9b54ea708070b55384a01304ade64960f3ec4
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Fri Oct 23 14:35:20 2015 +1100

    Linker: WIP on supporting Arm64/AArch64


>---------------------------------------------------------------

4bb9b54ea708070b55384a01304ade64960f3ec4
 rts/Linker.c | 69 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 file changed, 62 insertions(+), 7 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 7ca7e94..5a1a991 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4131,16 +4131,24 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #define FALSE 0
 #define TRUE  1
 
-#if defined(sparc_HOST_ARCH)
+#if sparc_HOST_ARCH
 #  define ELF_TARGET_SPARC  /* Used inside <elf.h> */
-#elif defined(i386_HOST_ARCH)
+#elif i386_HOST_ARCH
 #  define ELF_TARGET_386    /* Used inside <elf.h> */
-#elif defined(x86_64_HOST_ARCH)
+#elif x86_64_HOST_ARCH
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
-#elif defined(powerpc64_HOST_ARCH)
+#elif powerpc64_HOST_ARCH
+#  define ELF_64BIT
+#elif aarch64_HOST_ARCH
 #  define ELF_64BIT
+#elif (arm_HOST_ARCH || arm_HOST_ARCH_PRE_ARMv7 || arm_HOST_ARCH_PRE_ARMv7 \
+		|| powerpc_HOST_ARCH)
+   /* Nothing here */
+#else
+	/* Need this so that new architectures get a compile error. */
+# error "Unknown HOST_ARCH"
 #endif
 
 #if !defined(openbsd_HOST_OS)
@@ -4471,6 +4479,10 @@ ocVerifyImage_ELF ( ObjectCode* oc )
 #elif defined(EM_AMD64)
       case EM_AMD64: IF_DEBUG(linker,debugBelch( "amd64" )); break;
 #endif
+#ifdef EM_AARCH64
+      case EM_AARCH64: IF_DEBUG(linker,debugBelch( "aarch64" )); break;
+#endif
+
       default:       IF_DEBUG(linker,debugBelch( "unknown" ));
                      errorBelch("%s: unknown architecture (e_machine == %d)"
                                 , oc->fileName, ehdr->e_machine);
@@ -5272,7 +5284,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
 #if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
 #endif
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
 #endif
@@ -5290,7 +5302,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    }
 
    for (j = 0; j < nent; j++) {
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH) || defined(aarch64_HOST_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
       Elf_Addr  offset = rtab[j].r_offset;
       Elf_Addr  P      = targ + offset;
@@ -5595,12 +5607,55 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
       }
 #endif
 
+	case R_AARCH64_ABS64:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ABS64");
+          *(Elf64_Xword *)P = S + A;
+          break;
+
+	case R_AARCH64_ADR_PREL_PG_HI21:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADR_PREL_PG_HI21");
+          {
+            uint64_t final_address = (uint64_t) rtab + rtab[j].r_offset ;
+            // Operation: Page(S+A) - Page(P)
+            uint64_t result = ((S + A) & ~0xfffULL) - (final_address & ~0xfffULL);
+
+printf ("ehdrC: %p\nrtab : %p\n\n", ehdrC, rtab) ;
+
+printf ("rtab 0x%lx + 0x%lx -> 0x%lx\n", (uint64_t) rtab, (uint64_t) rtab[j].r_offset, final_address) ;
+printf ("S 0x%lx + A 0x%lx : 0x%lx\n", S, A, S + A) ;
+printf ("result 0x%lx\n", result) ;
+
+            // Check that -2^32 <= X < 2^32
+            if (result >> 32)
+                 barf ("%s: overflow check failed for relocation", oc->fileName);
+
+            *(Elf64_Xword *)P &= 0x9f00001fU;
+            // Immediate goes in bits 30:29 + 5:23 of ADRP instruction, taken
+            // from bits 32:12 of X.
+            *(Elf64_Xword *)P |= ((result & 0x3000U) << (29 - 12));
+            *(Elf64_Xword *)P |= ((result & 0x1ffffc000ULL) >> (14 - 5));
+          }
+          break;
+
+	case R_AARCH64_CALL26:
+	case R_AARCH64_JUMP26:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_CALL26/JUMP64");
+          {
+              // These two are handled in the same way.
+          }
+          break;
+
+	case R_AARCH64_ADD_ABS_LO12_NC:
+          puts ("\n\nAArch64: ELF relocation(RelA) R_AARCH64_ADD_ABS_LO12_NC");
+          {
+          }
+          break;
+
          default:
             errorBelch("%s: unhandled ELF relocation(RelA) type %" FMT_Word "\n",
                   oc->fileName, (W_)ELF_R_TYPE(info));
             return 0;
       }
-
    }
    return 1;
 }


From git at git.haskell.org  Mon Dec 21 21:16:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:16:07 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd: rts: Fix clobbered regs list for
 aarch64 StgRun (ffdb74d)
Message-ID: <20151221211607.856063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/aarch64-regd
Link       : http://ghc.haskell.org/trac/ghc/changeset/ffdb74d327a415a2f4e774b709c09fc6822667e9/ghc

>---------------------------------------------------------------

commit ffdb74d327a415a2f4e774b709c09fc6822667e9
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Jun 3 05:54:23 2015 +0000

    rts: Fix clobbered regs list for aarch64 StgRun


>---------------------------------------------------------------

ffdb74d327a415a2f4e774b709c09fc6822667e9
 rts/StgCRun.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/rts/StgCRun.c b/rts/StgCRun.c
index 0a010d4..c9bbef0 100644
--- a/rts/StgCRun.c
+++ b/rts/StgCRun.c
@@ -829,8 +829,12 @@ StgRun(StgFunPtr f, StgRegTable *basereg) {
 
       : "=r" (r)
       : "r" (f), "r" (basereg), "i" (RESERVED_C_STACK_BYTES)
-        : "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25", "%x26", "%x27", "%x28",
-          "%x16", "%x17", "%x30"
+
+      : "%x16", "%x17", /* Exclude %r18 (platform/temporary register) */
+        "%x19", "%x20", "%x21", "%x22", "%x23", "%x24", "%x25",
+        "%x26", "%x27", "%x28", /* Exclude %x29 (frame pointer) */
+        "%x30",
+        "%d8", "%d9", "%d10", "%d11", "%d12", "%d13", "%d14"
     );
     return r;
 }


From git at git.haskell.org  Mon Dec 21 21:16:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:16:12 +0000 (UTC)
Subject: [commit: ghc] wip/aarch64-regd's head updated: Linker: WIP on
 supporting Arm64/AArch64 (4bb9b54)
Message-ID: <20151221211612.C32D73A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/aarch64-regd' now includes:

     c5c72aa Update containers submodule to v0.5.7.0 release
     3dd06d5 Random typo fixes
     06cb695 ghci: fix UNREG build (missing fromJust import)
     98ccb72 Testsuite: widen lazy-bs-alloc 3->5%
     8d45ccd Testsuite Windows: fix sigof01m, sigof012m and sigof02dm
     dc8b647 Testsuite Windows: fix ghcpkg03 and ghcpkg05
     34393d9 Documentation for -fexternal-interpreter
     77b7f24 Use `-Wno-tabs` more targetted
     ba80fc6 Fix PowerPC build
     55e9ab8 Update directory submodule to v1.2.5.0 release
     83e4140 Comments only
     ed3bfca Update Win32 submodule to fix 77b7f24543f fallout
     8946ee6 GHCi.Run: Remove redundant language pragma
     53a567c configure.ac: Rename shake/ to build/
     f857d27 configure.ac: Rename build/ to shake-build/
     9d921d6 Test Trac #11248, #11249
     ff752a1 tcCheckSatisfiability: less aggressive superclass expansion
     987426c SrcLoc: Eliminate constructors of RealSrcSpan
     d6b91ea Add test for T11122
     4198b81 ghc.cabal: Backpack directory no longer exists
     0e9a331 LLVM backend: Show expected LLVM version in warnings/errors
     e02a4c2 Fix build for AArch64/Arm64
     9356393 Update terminfo submodule to v0.4.0.2 release
     97281b4 Update terminfo submodule to v0.7.2.2 release
     ccc5a1a Build system: fix 'make sdist'
     d1416c3 Update .mailmap [skip ci]
     5431273 Bump hsc2hs submodule
     b2670fc fix typo
     2cc5b60 Documentation, tests for hsc2hs's new #alignment macro
     b028384 Add -Nmax<n> RTS feature (#10728)
     59de6e8 Add sparc64 a known architecture (Ticket #11211)
     7b8a822 Make ghc-boot Hackage-ready
     64b6a76 Fix typo in 7b8a8222e8f0
     d8c8902 First pass at cleaning up ghci.cabal
     34eaf2b Fix two occurences of `x86_HOST_ARCH`
     bcc213d Update time submodule to v1.6 release
     dd56eb1 Merge new commands from ghci-ng (re #10874)
     59cc32c Update containers submodule to v0.5.7.1 release tag
     3b66960 Remove unused/redundant fields from ghc-cabal.
     f7bd37e aclocal.m4: Fix llc/opt detection code
     1a86413 Update binary submodule to final 0.8.0.0 release
     8d95412 Disallow empty where bindings in pattern synonym declarations.
     44640af Allow as-patterns in pattern synonym declarations.
     29ca4a1 DynFlags: call defaultWays when creating defaultFlags
     62155a6 TcTyClsDecls: use zipWith3M_ instead of generating triplets
     850710a TcTyClsDecls: Add a type annotation
     d8ed20c Add Location to RdrName in FieldOcc
     b225b23 Modify IsString String instance (fixes #10814)
     eb7796f Warn about unused type variables in type families
     edcf17b Move Const to own module in Data.Functor.Const and enable PolyKinds
     6457903 Implement phase 1 of expanded Floating
     9f23dd9 testsuite: Add ClassOperator testcase
     25db56c Minor clean-up to ghc-bin.cabal.in
     e29ee49 Fix AnnDotDot in module export
     99b956e Fix-up GHC 7.12 artifacts
     ee6fba8 Encode strictness in GHC generics metadata
     c8c44fd Maintain cost-centre stacks in the interpreter
     4bb9f88 TcTyClsDecls: Remove invalid comments about list monads
     fd1b5ae testsuite/ClassOperator: This actually should_fail
     a61e717 testsuite: Add testcase for #8316
     eeecb86 Add proper GADTs support to Template Haskell
     55250a6 Rename GHCi's UI modules into GHCi.UI(.*)
     ffdb74d rts: Fix clobbered regs list for aarch64 StgRun
     4f5ba6e configure.ac: AArch64 is now registerised
     8e91e82 rts/StgCRun.c: Add d15 to clobbered regs
     4bb9b54 Linker: WIP on supporting Arm64/AArch64

From git at git.haskell.org  Mon Dec 21 21:44:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:44:13 +0000 (UTC)
Subject: [commit: ghc] master: Added missing instances for Identity and Const
 (#11210) (2dff6c1)
Message-ID: <20151221214413.BE1043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2dff6c184f97fa564c72c73374378a65e12984d8/ghc

>---------------------------------------------------------------

commit 2dff6c184f97fa564c72c73374378a65e12984d8
Author: Shane O'Brien <shane at duairc.com>
Date:   Mon Dec 21 20:25:19 2015 +0100

    Added missing instances for Identity and Const (#11210)
    
    The following instances are added
    
        instance Bounded a => Bounded (Const a b)
        instance Enum a => Enum (Const a b)
        instance Ix a => Ix (Const a b)
        instance Storable a => Storable (Const a b)
    
        instance Bounded a => Bounded (Identity a)
        instance Enum a => Enum (Identity a)
        instance Ix a => Ix (Identity a)
        instance Semigroup a => Semigroup (Identity a)
        instance Storable a => Storable (Identity a)
    
    Reviewers: ekmett, RyanGlScott, rwbarton, hvr, austin, bgamari
    
    Reviewed By: RyanGlScott, hvr
    
    Subscribers: rwbarton, RyanGlScott, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1626
    
    GHC Trac Issues: #11210


>---------------------------------------------------------------

2dff6c184f97fa564c72c73374378a65e12984d8
 libraries/base/Data/Functor/Const.hs    | 6 +++++-
 libraries/base/Data/Functor/Identity.hs | 6 +++++-
 libraries/base/changelog.md             | 6 +++++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/libraries/base/Data/Functor/Const.hs b/libraries/base/Data/Functor/Const.hs
index 21e6f85..7457951 100644
--- a/libraries/base/Data/Functor/Const.hs
+++ b/libraries/base/Data/Functor/Const.hs
@@ -22,15 +22,19 @@
 module Data.Functor.Const (Const(..)) where
 
 import Data.Foldable (Foldable(foldMap))
+import Foreign.Storable (Storable)
 
+import GHC.Arr (Ix)
 import GHC.Base
+import GHC.Enum (Bounded, Enum)
 import GHC.Generics (Generic, Generic1)
 import GHC.Read (Read(readsPrec), readParen, lex)
 import GHC.Show (Show(showsPrec), showParen, showString)
 
 -- | The 'Const' functor.
 newtype Const a b = Const { getConst :: a }
-                  deriving (Generic, Generic1, Monoid, Eq, Ord)
+                  deriving ( Generic, Generic1, Bounded, Enum, Eq, Ix, Ord
+                           , Monoid, Storable)
 
 -- | This instance would be equivalent to the derived instances of the
 -- 'Const' newtype if the 'runConst' field were removed
diff --git a/libraries/base/Data/Functor/Identity.hs b/libraries/base/Data/Functor/Identity.hs
index 46fb666..df424f2 100644
--- a/libraries/base/Data/Functor/Identity.hs
+++ b/libraries/base/Data/Functor/Identity.hs
@@ -39,13 +39,17 @@ import Control.Monad.Zip
 import Data.Coerce
 import Data.Data (Data)
 import Data.Foldable
+import Data.Ix (Ix)
+import Data.Semigroup (Semigroup)
+import Foreign.Storable (Storable)
 import GHC.Generics (Generic, Generic1)
 
 -- | Identity functor and monad. (a non-strict monad)
 --
 -- @since 4.8.0.0
 newtype Identity a = Identity { runIdentity :: a }
-    deriving (Eq, Ord, Data, Monoid, Traversable, Generic, Generic1)
+    deriving ( Bounded, Enum, Eq, Ix, Ord, Data, Monoid, Semigroup
+             , Storable, Traversable, Generic, Generic1)
 
 -- | This instance would be equivalent to the derived instances of the
 -- 'Identity' newtype if the 'runIdentity' field were removed
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 96df6bb..a4472df 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -24,7 +24,11 @@
 
   * `ZipList` now has `Foldable` and `Traversable` instances
 
-  * `Identity` now has a `Monoid` instance
+  * `Identity` now has `Semigroup` and `Monoid` instances
+
+  * `Identity` and `Const` now have `Bounded`, `Enum` and `Ix` instances
+
+  * `Identity` and `Const` now have `Storable` instances
 
   * `()` now has a `Storable` instance
 


From git at git.haskell.org  Mon Dec 21 21:44:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:44:16 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/ClassOperator: Mark as compile_fail
 instead of should_fail (1fcdcae)
Message-ID: <20151221214416.A7BE93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1fcdcae013eb9d24f2af69998c78b40cf28ed49a/ghc

>---------------------------------------------------------------

commit 1fcdcae013eb9d24f2af69998c78b40cf28ed49a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 21 20:34:40 2015 +0100

    testsuite/ClassOperator: Mark as compile_fail instead of should_fail


>---------------------------------------------------------------

1fcdcae013eb9d24f2af69998c78b40cf28ed49a
 .../typecheck/should_fail/ClassOperator.stderr     | 52 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_fail/all.T        |  2 +-
 2 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/typecheck/should_fail/ClassOperator.stderr b/testsuite/tests/typecheck/should_fail/ClassOperator.stderr
new file mode 100644
index 0000000..29ac2d2
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/ClassOperator.stderr
@@ -0,0 +1,52 @@
+
+ClassOperator.hs:12:3: error:
+    ? Could not deduce (a ><> b0)
+      from the context: a ><> b
+        bound by the type signature for:
+                   (**>) :: (a ><> b) => a -> a -> ()
+        at ClassOperator.hs:12:3-44
+      The type variable ?b0? is ambiguous
+    ? In the ambiguity check for ?**>?
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the class method:
+        (**>) :: forall a b. (a ><> b) => a -> a -> ()
+      In the class declaration for ?><>?
+
+ClassOperator.hs:12:3: error:
+    ? Could not deduce (a ><> b0)
+      from the context: a ><> b
+        bound by the type signature for:
+                   (**<) :: (a ><> b) => a -> a -> ()
+        at ClassOperator.hs:12:3-44
+      The type variable ?b0? is ambiguous
+    ? In the ambiguity check for ?**<?
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the class method:
+        (**<) :: forall a b. (a ><> b) => a -> a -> ()
+      In the class declaration for ?><>?
+
+ClassOperator.hs:12:3: error:
+    ? Could not deduce (a ><> b0)
+      from the context: a ><> b
+        bound by the type signature for:
+                   (>**) :: (a ><> b) => a -> a -> ()
+        at ClassOperator.hs:12:3-44
+      The type variable ?b0? is ambiguous
+    ? In the ambiguity check for ?>**?
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the class method:
+        (>**) :: forall a b. (a ><> b) => a -> a -> ()
+      In the class declaration for ?><>?
+
+ClassOperator.hs:12:3: error:
+    ? Could not deduce (a ><> b0)
+      from the context: a ><> b
+        bound by the type signature for:
+                   (<**) :: (a ><> b) => a -> a -> ()
+        at ClassOperator.hs:12:3-44
+      The type variable ?b0? is ambiguous
+    ? In the ambiguity check for ?<**?
+      To defer the ambiguity check to use sites, enable AllowAmbiguousTypes
+      When checking the class method:
+        (<**) :: forall a b. (a ><> b) => a -> a -> ()
+      In the class declaration for ?><>?
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index fc89ad9..27aa70b 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -394,4 +394,4 @@ test('CustomTypeErrors01', normal, compile_fail, [''])
 test('CustomTypeErrors02', normal, compile_fail, [''])
 test('CustomTypeErrors03', normal, compile_fail, [''])
 test('T11112', normal, compile_fail, [''])
-test('ClassOperator', expect_broken(11264), compile, [''])
+test('ClassOperator', normal, compile_fail, [''])


From git at git.haskell.org  Mon Dec 21 21:44:19 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:44:19 +0000 (UTC)
Subject: [commit: ghc] master: base: Add sections to changelog (fb3302c)
Message-ID: <20151221214419.4E5CA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fb3302c9d41ba7ff5178f9df45b8e174d39151cc/ghc

>---------------------------------------------------------------

commit fb3302c9d41ba7ff5178f9df45b8e174d39151cc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 21 21:12:30 2015 +0100

    base: Add sections to changelog


>---------------------------------------------------------------

fb3302c9d41ba7ff5178f9df45b8e174d39151cc
 libraries/base/changelog.md | 135 +++++++++++++++++++++++---------------------
 1 file changed, 70 insertions(+), 65 deletions(-)

diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index a4472df..92685ca7 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -7,31 +7,6 @@
   * The restore operation provided by `mask` and `uninterruptibleMask` now
     restores the previous masking state whatever the current masking state is.
 
-  * `Alt`, `Dual`, `First`, `Last`, `Product`, and `Sum` now have `Data`,
-    `MonadZip`, and `MonadFix` instances
-
-  * `Maybe` now has a `MonadZip` instance
-
-  * `All` and `Any` now have `Data` instances
-
-  * `Dual`, `First`, `Last`, `Product`, and `Sum` now have `Foldable` and
-    `Traversable` instances
-
-  * `Dual`, `Product`, and `Sum` now have `Functor`, `Applicative`, and
-    `Monad` instances
-
-  * `(,) a` now has a `Monad` instance
-
-  * `ZipList` now has `Foldable` and `Traversable` instances
-
-  * `Identity` now has `Semigroup` and `Monoid` instances
-
-  * `Identity` and `Const` now have `Bounded`, `Enum` and `Ix` instances
-
-  * `Identity` and `Const` now have `Storable` instances
-
-  * `()` now has a `Storable` instance
-
   * Redundant typeclass constraints have been removed:
      - `Data.Ratio.{denominator,numerator}` have no `Integral` constraint anymore
      - **TODO**
@@ -40,22 +15,28 @@
 
   * New `GHC.Stack.CallStack` data type
 
-  * `Complex` now has `Generic`, `Generic1`, `Functor`, `Foldable`, `Traversable`,
-    `Applicative`, and `Monad` instances
+  * add `Data.List.NonEmpty` and `Data.Semigroup` (to become
+    super-class of `Monoid` in the future). These modules were
+    provided by the `semigroups` package previously. (#10365)
 
-  * `System.Exit.ExitCode` now has a `Generic` instance
+  * Add `selSourceUnpackedness`, `selSourceStrictness`, and
+    `selDecidedStrictness`, three functions which look up strictness
+    information of a field in a data constructor, to the `Selector` type class
+    in `GHC.Generics` (#10716)
 
-  * `Data.Version.Version` now has a `Generic` instance
+  * Add `URec`, `UAddr`, `UChar`, `UDouble`, `UFloat`, `UInt`, and `UWord` to
+    `GHC.Generics` as part of making GHC generics capable of handling
+    unlifted types (#10868)
 
-  * `IO` now has a `Monoid` instance
+  * Keep `shift{L,R}` on `Integer` with negative shift-arguments from
+    segfaulting (#10571)
 
-  * Generalize `Debug.Trace.{traceM, traceShowM}` from `Monad` to `Applicative`
-    (#10023)
+  * Add `forkOSWithUnmask` to `Control.Concurrent`, which is like
+    `forkIOWithUnmask`, but the child is run in a bound thread.
 
-  * Generalise `forever` from `Monad` to `Applicative`
+  * The `MINIMAL` definition of `Arrow` is now `arr AND (first OR (***))`.
 
-  * Generalize `filterM`, `mapAndUnzipM`, `zipWithM`, `zipWithM_`, `replicateM`,
-    `replicateM` from `Monad` to `Applicative` (#10168)
+  * The `MINIMAL` definition of `ArrowChoice` is now `left OR (+++)`.
 
   * Exported `GiveGCStats`, `DoCostCentres`, `DoHeapProfile`, `DoTrace`,
     `RtsTime`, and `RtsNat` from `GHC.RTS.Flags`
@@ -76,54 +57,78 @@
   * New module `Control.Monad.Fail` providing new `MonadFail(fail)`
     class (#10751)
 
-  * The `Generic` instance for `Proxy` is now poly-kinded (#10775)
+  * Add `GHC.TypeLits.TypeError` and `ErrorMessage` to allow users
+    to define custom compile-time error messages.
 
-  * add `Data.List.NonEmpty` and `Data.Semigroup` (to become
-    super-class of `Monoid` in the future). These modules were
-    provided by the `semigroups` package previously. (#10365)
+  * Redesign `GHC.Generics` to use type-level literals to represent the
+    metadata of generic representation types (#9766)
 
-  * Add `selSourceUnpackedness`, `selSourceStrictness`, and
-    `selDecidedStrictness`, three functions which look up strictness
-    information of a field in a data constructor, to the `Selector` type class
-    in `GHC.Generics` (#10716)
+  * The `IsString` instance for `[Char]` has been modified to eliminate
+    ambiguity arising from overloaded strings and functions like `(++)`.
 
-  * Add `URec`, `UAddr`, `UChar`, `UDouble`, `UFloat`, `UInt`, and `UWord` to
-    `GHC.Generics` as part of making GHC generics capable of handling
-    unlifted types (#10868)
+  * Move `Const` from `Control.Applicative` to its own module in
+   `Data.Functor.Const`. (#11135)
 
-  * Keep `shift{L,R}` on `Integer` with negative shift-arguments from
-    segfaulting (#10571)
+  * Re-export `Const` from `Control.Applicative` for backwards compatibility.
 
-  * Add `forkOSWithUnmask` to `Control.Concurrent`, which is like
-    `forkIOWithUnmask`, but the child is run in a bound thread.
+  * Expand `Floating` class to include operations that allow for better
+    precision: `log1p`, `expm1`, `log1pexp` and `log1mexp`. These are not
+    available from `Prelude`, but the full class is exported from `Numeric`.
 
-  * The `MINIMAL` definition of `Arrow` is now `arr AND (first OR (***))`.
+### New instances
 
-  * The `MINIMAL` definition of `ArrowChoice` is now `left OR (+++)`.
+  * `Alt`, `Dual`, `First`, `Last`, `Product`, and `Sum` now have `Data`,
+    `MonadZip`, and `MonadFix` instances
+
+  * `Maybe` now has a `MonadZip` instance
+
+  * `All` and `Any` now have `Data` instances
+
+  * `Dual`, `First`, `Last`, `Product`, and `Sum` now have `Foldable` and
+    `Traversable` instances
+
+  * `Dual`, `Product`, and `Sum` now have `Functor`, `Applicative`, and
+    `Monad` instances
+
+  * `(,) a` now has a `Monad` instance
+
+  * `ZipList` now has `Foldable` and `Traversable` instances
+
+  * `Identity` now has `Semigroup` and `Monoid` instances
+
+  * `Identity` and `Const` now have `Bounded`, `Enum` and `Ix` instances
+
+  * `Identity` and `Const` now have `Storable` instances
+
+  * `()` now has a `Storable` instance
+
+  * `Complex` now has `Generic`, `Generic1`, `Functor`, `Foldable`, `Traversable`,
+    `Applicative`, and `Monad` instances
+
+  * `System.Exit.ExitCode` now has a `Generic` instance
+
+  * `Data.Version.Version` now has a `Generic` instance
+
+  * `IO` now has a `Monoid` instance
 
   * Add `MonadPlus IO` and `Alternative IO` instances
     (previously orphans in `transformers`) (#10755)
 
-  * Add `GHC.TypeLits.TypeError` and `ErrorMessage` to allow users
-    to define custom compile-time error messages.
+### Generalizations
 
-  * Redesign `GHC.Generics` to use type-level literals to represent the
-    metadata of generic representation types (#9766)
+  * Generalize `Debug.Trace.{traceM, traceShowM}` from `Monad` to `Applicative`
+    (#10023)
 
-  * The `IsString` instance for `[Char]` has been modified to eliminate
-    ambiguity arising from overloaded strings and functions like `(++)`.
+  * Generalise `forever` from `Monad` to `Applicative`
 
-  * Move `Const` from `Control.Applicative` to its own module in
-   `Data.Functor.Const`. (#11135)
+  * Generalize `filterM`, `mapAndUnzipM`, `zipWithM`, `zipWithM_`, `replicateM`,
+    `replicateM_` from `Monad` to `Applicative` (#10168)
+
+  * The `Generic` instance for `Proxy` is now poly-kinded (#10775)
 
   * Enable `PolyKinds` in the `Data.Functor.Const` module to give `Const`
     the kind `* -> k -> *`. (#10039)
 
-  * Re-export `Const` from `Control.Applicative` for backwards compatibility.
-
-  * Expand `Floating` class to include operations that allow for better
-    precision: `log1p`, `expm1`, `log1pexp` and `log1mexp`. These are not
-    available from `Prelude`, but the full class is exported from `Numeric`.
 
 ## 4.8.2.0  *Oct 2015*
 


From git at git.haskell.org  Mon Dec 21 21:44:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:44:21 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11256 by not immediately erroring if we
 can't find a module. (ff3f918)
Message-ID: <20151221214421.EBD053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff3f918d1c9685857d3ba4bb0dc119616e89cbe6/ghc

>---------------------------------------------------------------

commit ff3f918d1c9685857d3ba4bb0dc119616e89cbe6
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Mon Dec 21 20:25:08 2015 +0100

    Fix #11256 by not immediately erroring if we can't find a module.
    
    Test Plan: validate
    
    Reviewers: austin, bgamari, thomie
    
    Reviewed By: bgamari, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1669
    
    GHC Trac Issues: #11256


>---------------------------------------------------------------

ff3f918d1c9685857d3ba4bb0dc119616e89cbe6
 compiler/main/GhcMake.hs                      | 8 +++-----
 testsuite/tests/cabal/cabal07/cabal07.stderr  | 6 +++---
 testsuite/tests/driver/driver063.stderr       | 4 ++--
 testsuite/tests/ghc-e/should_run/T2636.stderr | 4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 41d4f1c..843def1 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -1886,13 +1886,11 @@ summariseModule hsc_env old_summary_map is_boot (L loc wanted_mod)
                 | isJust (ml_hs_file location) ->
                         -- Home package
                          just_found location mod
-                | otherwise ->
-                        -- Drop external-pkg
-                        ASSERT(moduleUnitId mod /= thisPackage dflags)
-                        return Nothing
 
-             err -> return $ Just $ Left $ noModError dflags loc wanted_mod err
+             _ -> return Nothing
                         -- Not found
+                        -- (If it is TRULY not found at all, we'll
+                        -- error when we actually try to compile)
 
     just_found location mod = do
                 -- Adjust location to point to the hs-boot source file,
diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr
index 097f23f..b3cfe5b 100644
--- a/testsuite/tests/cabal/cabal07/cabal07.stderr
+++ b/testsuite/tests/cabal/cabal07/cabal07.stderr
@@ -1,6 +1,6 @@
 
-Q.hs:3:8: error:
-    Could not find module ?Data.Set?
-    It is a member of the hidden package ?containers-0.5.6.3 at containers-0.5.6.3?.
+Q.hs:3:1: error:
+    Failed to load interface for ?Data.Set?
+    It is a member of the hidden package ?containers-0.5.7.0?.
     Perhaps you need to add ?containers? to the build-depends in your .cabal file.
     Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/driver/driver063.stderr b/testsuite/tests/driver/driver063.stderr
index 25488b8..84ff5b6 100644
--- a/testsuite/tests/driver/driver063.stderr
+++ b/testsuite/tests/driver/driver063.stderr
@@ -1,4 +1,4 @@
 
-D063.hs:2:8:
-    Could not find module ?A063?
+D063.hs:2:1: error:
+    Failed to load interface for ?A063?
     It is not a module in the current program, or in any known package.
diff --git a/testsuite/tests/ghc-e/should_run/T2636.stderr b/testsuite/tests/ghc-e/should_run/T2636.stderr
index 98c109e..1a79127 100644
--- a/testsuite/tests/ghc-e/should_run/T2636.stderr
+++ b/testsuite/tests/ghc-e/should_run/T2636.stderr
@@ -1,4 +1,4 @@
 
-T2636.hs:1:8:
-    Could not find module ?MissingModule?
+T2636.hs:1:1: error:
+    Failed to load interface for ?MissingModule?
     Use -v to see a list of the files searched for.


From git at git.haskell.org  Mon Dec 21 21:44:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 21:44:24 +0000 (UTC)
Subject: [commit: ghc] master: users_guide: Synchronize relnotes with base
 changelog (083b700)
Message-ID: <20151221214424.9A3FF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/083b7006f69c0f58aa237b66831bc648c88fdfaf/ghc

>---------------------------------------------------------------

commit 083b7006f69c0f58aa237b66831bc648c88fdfaf
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Mon Dec 21 21:13:34 2015 +0100

    users_guide: Synchronize relnotes with base changelog


>---------------------------------------------------------------

083b7006f69c0f58aa237b66831bc648c88fdfaf
 docs/users_guide/7.12.1-notes.rst | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index 14af3a0..2437abf 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -243,7 +243,7 @@ GHCi
 ~~~~
 
 -  ``Main`` with an explicit module header but without ``main`` is now
-   an error (#7765).
+   an error (:ghc-ticket:`7765`).
 
 -  The ``:back`` and ``:forward`` commands now take an optional count
    allowing the user to move forward or backward in history several
@@ -251,16 +251,16 @@ GHCi
 
 -  Added commands ``:load!`` and ``:reload!``, effectively setting
    "-fdefer-type-errors" before loading a module and unsetting it after
-   loading if it has not been set before (#8353).
+   loading if it has not been set before (:ghc-ticket:`8353`).
 
--  ``ghci -e`` now behaves like ``ghc -e`` (#9360).
+-  ``ghci -e`` now behaves like ``ghc -e`` (:ghc-ticket:`9360`).
 
--  Added support for top-level function declarations (#7253).
+-  Added support for top-level function declarations (:ghc-ticket:`7253`).
 
 -  The new commands ``:all-types``, ``:loc-at``, ``:type-at``, and
    ``:uses`` designed for editor-integration
    (such as Emacs' ``haskell-mode``) originally premiered by ``ghci-ng``
-   have been integrated into GHCi (#10874).
+   have been integrated into GHCi (:ghc-ticket:`10874`).
 
 Template Haskell
 ~~~~~~~~~~~~~~~~
@@ -379,6 +379,8 @@ array
 base
 ~~~~
 
+See ``changelog.md`` in the ``base`` package for full release notes.
+
 -  Version number 4.9.0.0 (was 4.7.0.0)
 
 -  ``GHC.Stack`` exports two new types ``SrcLoc`` and ``CallStack``. A
@@ -408,9 +410,36 @@ base
   ``Applicative``. If this causes performance regressions, try to make the
   implementation of ``(*>)`` match that of ``(>>)``.
 
+- Add ``URec``, ``UAddr``, ``UChar``, ``UDouble``, ``UFloat``, ``UInt``, and ``UWord`` to
+  ``GHC.Generics`` as part of making GHC generics capable of handling unlifted
+  types (:ghc-ticket:`10868`)
+
+- Expand ``Floating`` class to include operations that allow for better
+  precision: ``log1p``, ``expm1``, ``log1pexp`` and ``log1mexp``. These are not
+  available from ``Prelude``, but the full class is exported from ``Numeric``.
+
+- Add ``Data.List.NonEmpty`` and ``Data.Semigroup`` (to become
+  super-class of ``Monoid`` in the future). These modules were
+  provided by the ``semigroups`` package previously. (:ghc-ticket:`10365`)
+
+- The constraints of various functions in ``Control.Monad`` have been
+  generalized from ``Monad`` to ``Applicative`` including ``filterM``,
+  ``zipWithM`` and ``replicateM_`` (see :ghc-ticket:`10168`).
+
 - Add ``GHC.TypeLits.TypeError`` and ``ErrorMessage`` to allow users
   to define custom compile-time error messages.
 
+- The ``Generic`` instance for ``Proxy`` is now poly-kinded (see :ghc-ticket:`10775`)
+
+- The ``IsString`` instance for ``[Char]`` has been modified to eliminate
+  ambiguity arising from overloaded strings and functions like ``(++)``.
+
+- Move ``Const`` from ``Control.Applicative`` to its own module in
+  ``Data.Functor.Const``. (see :ghc-ticket:`11135`)
+
+- Enable ``PolyKinds`` in the ``Data.Functor.Const`` module to give ``Const``
+  the kind ``* -> k -> *`` (see :ghc-ticket:`10039`).
+
 binary
 ~~~~~~
 


From git at git.haskell.org  Mon Dec 21 22:10:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:10:32 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0: Bump GHC version to 8.0.0 (f8296b4)
Message-ID: <20151221221032.8AA7B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/f8296b439f91673e8b612a8265af60d8a921b5e6/ghc

>---------------------------------------------------------------

commit f8296b439f91673e8b612a8265af60d8a921b5e6
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0
    
    Test Plan: testing whether we need to fixup something for the version bump
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1679


>---------------------------------------------------------------

f8296b439f91673e8b612a8265af60d8a921b5e6
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 69cdd2b..44054c2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Mon Dec 21 22:10:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:10:35 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0's head updated: Bump GHC version to 8.0.0
 (f8296b4)
Message-ID: <20151221221035.089AD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/ghc-8.0' now includes:

     99b956e Fix-up GHC 7.12 artifacts
     ee6fba8 Encode strictness in GHC generics metadata
     c8c44fd Maintain cost-centre stacks in the interpreter
     4bb9f88 TcTyClsDecls: Remove invalid comments about list monads
     fd1b5ae testsuite/ClassOperator: This actually should_fail
     a61e717 testsuite: Add testcase for #8316
     eeecb86 Add proper GADTs support to Template Haskell
     55250a6 Rename GHCi's UI modules into GHCi.UI(.*)
     ff3f918 Fix #11256 by not immediately erroring if we can't find a module.
     2dff6c1 Added missing instances for Identity and Const (#11210)
     1fcdcae testsuite/ClassOperator: Mark as compile_fail instead of should_fail
     fb3302c base: Add sections to changelog
     083b700 users_guide: Synchronize relnotes with base changelog
     f8296b4 Bump GHC version to 8.0.0

From git at git.haskell.org  Mon Dec 21 22:12:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:37 +0000 (UTC)
Subject: [commit: packages/hoopl] tag 'v3.10.2.1' created
Message-ID: <20151221221237.5DAF73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

New tag    : v3.10.2.1
Referencing: e517f24d8f811f7e1e9834706e7d458b06cb6fcb

From git at git.haskell.org  Mon Dec 21 22:12:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:39 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Bump cabal version (a8429fd)
Message-ID: <20151221221239.6640A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/a8429fd7a8423029fec6632aac07632fdfcd2b6f

>---------------------------------------------------------------

commit a8429fd7a8423029fec6632aac07632fdfcd2b6f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 14 09:42:05 2015 +0200

    Bump cabal version
    
    The recent visible change in b38e92f67cabfa0d0ed12ac93c2d431f2391de70
    made this minor version bump necessary


>---------------------------------------------------------------

a8429fd7a8423029fec6632aac07632fdfcd2b6f
 changelog.md | 4 ++++
 hoopl.cabal  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index b5b6382..ae13393 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
+## 3.10.1.0  **TBA**
+
+ - Remove redundant constraints
+
 ## 3.10.0.2  *Dec 2014*
 
  - Add support for `base-4.8.0.0` package version
diff --git a/hoopl.cabal b/hoopl.cabal
index 559c443..39e6920 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,5 +1,5 @@
 Name:                hoopl
-Version:             3.10.0.2
+Version:             3.10.1.0
 -- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library


From git at git.haskell.org  Mon Dec 21 22:12:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:41 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Update Travis CI job file (ce6cec3)
Message-ID: <20151221221241.6EF043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/ce6cec31b14195388290d9318e9683a934f00c2b

>---------------------------------------------------------------

commit ce6cec31b14195388290d9318e9683a934f00c2b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 14 09:52:24 2015 +0200

    Update Travis CI job file


>---------------------------------------------------------------

ce6cec31b14195388290d9318e9683a934f00c2b
 .travis.yml | 56 ++++++++++++++++++++++++++------------------------------
 1 file changed, 26 insertions(+), 30 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 4a3071d..05f9706 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,40 +1,36 @@
+language: c
+sudo: required
+
 env:
- - GHCVER=7.0.1
- - GHCVER=7.0.2
- - GHCVER=7.0.3
- - GHCVER=7.0.4
- - GHCVER=7.2.2
- - GHCVER=7.4.1
- - GHCVER=7.4.2
- - GHCVER=7.6.1
- - GHCVER=7.6.2
- - GHCVER=7.6.3
- - GHCVER=head
+ - CABALVER=1.16 GHCVER=7.0.1
+ - CABALVER=1.16 GHCVER=7.0.4
+ - CABALVER=1.16 GHCVER=7.2.2
+ - CABALVER=1.16 GHCVER=7.4.2
+ - CABALVER=1.16 GHCVER=7.6.3
+ - CABALVER=1.18 GHCVER=7.8.4
+ - CABALVER=1.20 GHCVER=7.10.1
+ - CABALVER=head GHCVER=head
 
 matrix:
   allow_failures:
-   - env: GHCVER=head
+   - env: CABALVER=head GHCVER=head
 
 before_install:
- - sudo add-apt-repository -y ppa:hvr/ghc
- - sudo apt-get update
- - sudo apt-get install cabal-install-1.18 ghc-$GHCVER
- - export PATH=/opt/ghc/$GHCVER/bin:$PATH
+ - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
+ - travis_retry sudo apt-get update
+ - travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER
+ - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
+ - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 
 install:
- - cabal-1.18 update
- - ghc --version
+ - cabal --version
+ - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - travis_retry cabal update
 
 script:
- - cabal-1.18 configure -v2
- - cabal-1.18 build
- - cabal-1.18 check
- - cabal-1.18 sdist
- - export SRC_TGZ=$(cabal-1.18 info . | awk '{print $2 ".tar.gz";exit}') ;
-   cd dist/;
-   if [ -f "$SRC_TGZ" ]; then
-      cabal-1.18 install "$SRC_TGZ";
-   else
-      echo "expected '$SRC_TGZ' not found";
-      exit 1;
-   fi
+ - cabal configure -v2
+ - cabal build
+ - cabal check
+ - cabal sdist
+ - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
+   cd dist && cabal install --force-reinstalls "$SRC_TGZ"
\ No newline at end of file


From git at git.haskell.org  Mon Dec 21 22:12:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:43 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Fix typos in .travis.yml (9bd6f11)
Message-ID: <20151221221243.758F13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/9bd6f111357261d31e36989f21d2fd49b056e85f

>---------------------------------------------------------------

commit 9bd6f111357261d31e36989f21d2fd49b056e85f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Apr 14 10:14:37 2015 +0200

    Fix typos in .travis.yml


>---------------------------------------------------------------

9bd6f111357261d31e36989f21d2fd49b056e85f
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 05f9706..1c62b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -8,7 +8,7 @@ env:
  - CABALVER=1.16 GHCVER=7.4.2
  - CABALVER=1.16 GHCVER=7.6.3
  - CABALVER=1.18 GHCVER=7.8.4
- - CABALVER=1.20 GHCVER=7.10.1
+ - CABALVER=1.22 GHCVER=7.10.1
  - CABALVER=head GHCVER=head
 
 matrix:
@@ -18,7 +18,6 @@ matrix:
 before_install:
  - travis_retry sudo add-apt-repository -y ppa:hvr/ghc
  - travis_retry sudo apt-get update
- - travis_retry sudo apt-get install cabal-install-1.18 ghc-$GHCVER
  - travis_retry sudo apt-get install cabal-install-$CABALVER ghc-$GHCVER
  - export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
 


From git at git.haskell.org  Mon Dec 21 22:12:45 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:45 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Re-export runWithFuel. (1874596)
Message-ID: <20151221221245.7C5B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/1874596c2af1b57f6d3614d400a473968e7c2d12

>---------------------------------------------------------------

commit 1874596c2af1b57f6d3614d400a473968e7c2d12
Author: Andreas Voellmy <andreas.voellmy at gmail.com>
Date:   Tue Apr 14 20:50:06 2015 -0400

    Re-export runWithFuel.


>---------------------------------------------------------------

1874596c2af1b57f6d3614d400a473968e7c2d12
 src/Compiler/Hoopl.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler/Hoopl.hs b/src/Compiler/Hoopl.hs
index 4903851..7858f42 100644
--- a/src/Compiler/Hoopl.hs
+++ b/src/Compiler/Hoopl.hs
@@ -27,7 +27,7 @@ import Compiler.Hoopl.Combinators
 import Compiler.Hoopl.Dataflow hiding ( wrapFR, wrapFR2, wrapBR, wrapBR2
                                       )
 import Compiler.Hoopl.Debug
-import Compiler.Hoopl.Fuel hiding (withFuel, getFuel, setFuel, runWithFuel)
+import Compiler.Hoopl.Fuel hiding (withFuel, getFuel, setFuel)
 import Compiler.Hoopl.Block
 import Compiler.Hoopl.Graph hiding (splice, gSplice)
 import Compiler.Hoopl.Label hiding (uniqueToLbl, lblToUnique)


From git at git.haskell.org  Mon Dec 21 22:12:47 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:47 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Bump version (54e4786)
Message-ID: <20151221221247.841AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/54e4786810dc8305e694f06d320aa9dd299d5813

>---------------------------------------------------------------

commit 54e4786810dc8305e694f06d320aa9dd299d5813
Author: Andreas Voellmy <andreas.voellmy at gmail.com>
Date:   Thu Apr 16 09:35:13 2015 -0400

    Bump version
    
    Bump version so we can release on hackage. The 3rd digit is updated
    since this version re-exports a function (expanding the interface)
    from Compiler.Hoopl.


>---------------------------------------------------------------

54e4786810dc8305e694f06d320aa9dd299d5813
 changelog.md | 4 ++++
 hoopl.cabal  | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index ae13393..77b0854 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
+## 3.10.2.0 *Apr 2015*
+
+ - Re-export runWithFuel from Compiler.Hoopl.
+
 ## 3.10.1.0  **TBA**
 
  - Remove redundant constraints
diff --git a/hoopl.cabal b/hoopl.cabal
index 39e6920..bd423c9 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,5 +1,5 @@
 Name:                hoopl
-Version:             3.10.1.0
+Version:             3.10.2.0
 -- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library


From git at git.haskell.org  Mon Dec 21 22:12:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:49 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Change maintainers. (d860915)
Message-ID: <20151221221249.8AE373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/d86091562dac91e4954b4a99e0aa480b7667b687

>---------------------------------------------------------------

commit d86091562dac91e4954b4a99e0aa480b7667b687
Author: Andreas Voellmy <andreas.voellmy at gmail.com>
Date:   Fri Apr 24 09:13:47 2015 -0400

    Change maintainers.


>---------------------------------------------------------------

d86091562dac91e4954b4a99e0aa480b7667b687
 hoopl.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index bd423c9..0fee9e2 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -10,7 +10,7 @@ Description:
 License:             BSD3
 License-File:        LICENSE
 Author:              Norman Ramsey, Joao Dias, Simon Marlow and Simon Peyton Jones
-Maintainer:          nr at cs.tufts.edu
+Maintainer:          nr at cs.tufts.edu, andreas.voellmy at gmail.com, email at ningwang.org
 Homepage:            http://ghc.cs.tufts.edu/hoopl/
 Bug-Reports:         http://ghc.haskell.org/trac/ghc/newticket?component=libraries/hoopl
 Build-Type:          Simple


From git at git.haskell.org  Mon Dec 21 22:12:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:51 +0000 (UTC)
Subject: [commit: packages/hoopl] master: 1. remove the dependency on mk to
 run the tests;
 2. make Ast an instance of Eq such that we can compare the transformed results
 against the expected results in Haskell;
 3. add a module to convert IR back to Ast to make the above comparison
 possible.4. remove Norman from the maintainer field, and add Andreas and Ning
 as the maintainers;
 5. Add #if CABAL macro to several hoop files to conditionally include the
 macro generated by Cabal such that we can build hoopl and all the tests in
 ghci (8778a37)
Message-ID: <20151221221251.98C0C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/8778a37982204df2a4594732dd570f68ee7eb313

>---------------------------------------------------------------

commit 8778a37982204df2a4594732dd570f68ee7eb313
Author: Ning Wang <email at ningwang.org>
Date:   Fri Apr 24 21:04:16 2015 -0700

    1. remove the dependency on mk to run the tests; 2. make Ast an instance of Eq such that we can compare the transformed results against the expected results in Haskell; 3. add a module to convert IR back to Ast to make the above comparison possible.4. remove Norman from the maintainer field, and add Andreas and Ning as the maintainers; 5. Add #if CABAL macro to several hoop files to conditionally include the macro generated by Cabal such that we can build hoopl and all the tests in ghci


>---------------------------------------------------------------

8778a37982204df2a4594732dd570f68ee7eb313
 .gitignore                                    |   2 +-
 README                                        |   4 +
 hoopl.cabal                                   |  14 ++-
 src/Compiler/Hoopl.hs                         |   2 +-
 src/Compiler/Hoopl/Fuel.hs                    |   5 ++
 src/Compiler/Hoopl/Graph.hs                   |   4 +
 src/Compiler/Hoopl/Unique.hs                  |   5 ++
 testing/Ast.hs                                |  43 +++++++--
 testing/Ast2ir.hs                             |  10 ++-
 testing/Expr.hs                               |   5 +-
 testing/Ir2ast.hs                             |  88 +++++++++++++++++++
 testing/Main.hs                               |  11 ++-
 testing/README                                |   4 +-
 testing/Test.hs                               |  64 +++++++++++---
 testing/mkfile                                |  22 -----
 testing/tests/ExpectedOutput                  | 121 ++++++++++++++++++++++++--
 testing/tests/if-test.expected                |   6 ++
 testing/tests/{if-test2 => if-test2.expected} |  12 +--
 testing/tests/{if-test3 => if-test3.expected} |   8 +-
 testing/tests/{if-test4 => if-test4.expected} |   0
 testing/tests/test1.expected                  |   4 +
 testing/tests/{test2 => test2.expected}       |   0
 testing/tests/{test3 => test3.expected}       |   0
 testing/tests/test4.expected                  |   9 ++
 validate                                      |   8 --
 25 files changed, 368 insertions(+), 83 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 8778a37982204df2a4594732dd570f68ee7eb313

From git at git.haskell.org  Mon Dec 21 22:12:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:53 +0000 (UTC)
Subject: [commit: packages/hoopl] master: update changelog.md to include all
 the changes made in the previous cl (48da9a5)
Message-ID: <20151221221253.A47AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/48da9a5f58b7129eebbd9df6958a3c8f10bdb9ac

>---------------------------------------------------------------

commit 48da9a5f58b7129eebbd9df6958a3c8f10bdb9ac
Merge: 8778a37 d860915
Author: Ning Wang <email at ningwang.org>
Date:   Fri Apr 24 21:19:15 2015 -0700

    update changelog.md to include all the changes made in the previous cl



>---------------------------------------------------------------

48da9a5f58b7129eebbd9df6958a3c8f10bdb9ac
 changelog.md | 9 +++++++++
 hoopl.cabal  | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --cc changelog.md
index ae13393,77b0854..9718736
--- a/changelog.md
+++ b/changelog.md
@@@ -1,5 -1,9 +1,14 @@@
  # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
  
++## 3.10.2.1 *Apr 2015*
++ - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
++ - Change the test code (testing/*) to compare the converted graphs against the expected graphs in AST form 
++ - Update the cabal file to run tests and generate a test coverage report 
++
+ ## 3.10.2.0 *Apr 2015*
+ 
+  - Re-export runWithFuel from Compiler.Hoopl.
+ 
  ## 3.10.1.0  **TBA**
  
   - Remove redundant constraints


From git at git.haskell.org  Mon Dec 21 22:12:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:55 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Markdownify and extend README
 (3c40e86)
Message-ID: <20151221221255.AC2E83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/3c40e86bd95e4199b779c6c4c3339a67383e1365

>---------------------------------------------------------------

commit 3c40e86bd95e4199b779c6c4c3339a67383e1365
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Apr 27 08:29:51 2015 +0200

    Markdownify and extend README


>---------------------------------------------------------------

3c40e86bd95e4199b779c6c4c3339a67383e1365
 README      | 28 ----------------------------
 README.md   | 41 +++++++++++++++++++++++++++++++++++++++++
 hoopl.cabal |  2 +-
 3 files changed, 42 insertions(+), 29 deletions(-)

diff --git a/README b/README
deleted file mode 100644
index 3de87b1..0000000
--- a/README
+++ /dev/null
@@ -1,28 +0,0 @@
-This repository contains things related to
-
-              Hoopl: A Higher-Order OPtimization Library
-
-** The closest thing we have to a SAMPLE CLIENT is in ./testing **
-
-Directory     Contents
-
-paper/        A paper about Hoopl
-prototypes/   A sampling of prototypes and early designs
-src/          The current official sources to the Cabal package
-testing/      Tests, including a sample client.  See ./testing/README.
-
-To build the library, change to the src directory and run
-
-  cabal configure --prefix=$HOME --user   # we have no idea what this means
-  cabal build
-  cabal install --enable-documentation
-
-You'll need a Haskell Platform, which should include appropriate
-versions of Cabal and GHC.
-
-To upload to Hackage,
-
-  cabal sdist
-  cabal upload dist/something.tar.gz
-
-Developers, please see HOWTO-BRANCHES
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..d4b0129
--- /dev/null
+++ b/README.md
@@ -0,0 +1,41 @@
+The `hoopl` Package  [![Hackage](https://img.shields.io/hackage/v/hoopl.svg)](https://hackage.haskell.org/package/hoopl) [![Build Status](https://travis-ci.org/haskell/hoopl.svg)](https://travis-ci.org/haskell/hoopl)
+===================
+
+## Hoopl: A Higher-Order OPtimization Library
+
+API documentation can be found on [Hackage](https://hackage.haskell.org/package/directory).
+
+| Directory      | Contents
+| -------------- | ---------
+| `paper/`       | A paper about Hoopl
+| `prototypes/`  | A sampling of prototypes and early designs
+| `src/`         | The current official sources to the Cabal package
+| `testing/`     | Tests, including a sample client.  See [`testing/README`](testing/README)
+
+### Development Notes
+
+To build the library, change to the src directory and run
+
+    cabal configure --prefix=$HOME --user   # we have no idea what this means
+    cabal build
+    cabal install --enable-documentation
+
+You'll need a Haskell Platform, which should include appropriate
+versions of Cabal and GHC.
+
+### Checklist for Making Releases
+
+1. Make sure `hoopl` passes Travis for all GHC versions in the build-matrix
+2. Update Changelog (& `git commit`)
+3. Generate source tarball via `cabal sdist` and upload a candidate to Hackage (see note below), and inspect the result. 
+4. If everything checks out, make an annotated and GPG-signed Git release tag: `git tag -a -s v${VER} -m "hoopl ${VER}"`
+5. Publish (there's a button for that on Hackage) the package candidate
+6. Work on next release
+
+Note: To upload to Hackage,
+
+    cabal sdist
+    cabal upload dist/hoopl-*.tar.gz
+
+However, it's recommended use the Hackage feature for
+[uploading a candidate](http://hackage.haskell.org/packages/candidates/upload).
diff --git a/hoopl.cabal b/hoopl.cabal
index 0fee9e2..9c88ae9 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -18,7 +18,7 @@ Cabal-Version:       >=1.10
 Synopsis:            A library to support dataflow analysis and optimization
 Category:            Compilers/Interpreters
 Tested-With:         GHC>=7.0.1
-Extra-Source-Files:  README, hoopl.pdf, changelog.md
+Extra-Source-Files:  README.md, hoopl.pdf, changelog.md
 
 Source-repository head
   Type:       git


From git at git.haskell.org  Mon Dec 21 22:12:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:57 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Add note about version bumping
 (1de5d86)
Message-ID: <20151221221257.B45193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/1de5d863650739e606319009a02cfe95e67244fc

>---------------------------------------------------------------

commit 1de5d863650739e606319009a02cfe95e67244fc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Apr 27 08:33:10 2015 +0200

    Add note about version bumping


>---------------------------------------------------------------

1de5d863650739e606319009a02cfe95e67244fc
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d4b0129..042c57b 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ The `hoopl` Package  [![Hackage](https://img.shields.io/hackage/v/hoopl.svg)](ht
 
 ## Hoopl: A Higher-Order OPtimization Library
 
-API documentation can be found on [Hackage](https://hackage.haskell.org/package/directory).
+API documentation can be found on [Hackage](https://hackage.haskell.org/package/hoopl).
 
 | Directory      | Contents
 | -------------- | ---------
@@ -25,6 +25,8 @@ versions of Cabal and GHC.
 
 ### Checklist for Making Releases
 
+In order to facilitate GHC development's workflow, the version in [`hoopl.cabal`](hoopl.cabal) is to be bumped as soon as a change requires a respective version bump (according to the PVP) relative to the last released `hoopl` version.
+
 1. Make sure `hoopl` passes Travis for all GHC versions in the build-matrix
 2. Update Changelog (& `git commit`)
 3. Generate source tarball via `cabal sdist` and upload a candidate to Hackage (see note below), and inspect the result. 


From git at git.haskell.org  Mon Dec 21 22:12:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:12:59 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Undo version bump from
 54e4786810dc8305e694f06d (96c32cc)
Message-ID: <20151221221259.BAABD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/96c32cccf37578ac6b832ed9147273b09f37c004

>---------------------------------------------------------------

commit 96c32cccf37578ac6b832ed9147273b09f37c004
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Apr 27 08:37:05 2015 +0200

    Undo version bump from 54e4786810dc8305e694f06d
    
    `hoopl` follows the early-version-bump strategy, so its version was
    already (minor version) incremented relative to the last released
    version


>---------------------------------------------------------------

96c32cccf37578ac6b832ed9147273b09f37c004
 changelog.md | 4 +---
 hoopl.cabal  | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 77b0854..0182960 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,11 +1,9 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
-## 3.10.2.0 *Apr 2015*
+## 3.10.1.0 *Apr 2015*
 
  - Re-export runWithFuel from Compiler.Hoopl.
 
-## 3.10.1.0  **TBA**
-
  - Remove redundant constraints
 
 ## 3.10.0.2  *Dec 2014*
diff --git a/hoopl.cabal b/hoopl.cabal
index 9c88ae9..ff189de 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,5 +1,5 @@
 Name:                hoopl
-Version:             3.10.2.0
+Version:             3.10.1.0
 -- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library


From git at git.haskell.org  Mon Dec 21 22:13:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:01 +0000 (UTC)
Subject: [commit: packages/hoopl] master: sync up and mergewith upstream
 (dcd563d)
Message-ID: <20151221221301.C6BB23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/dcd563d69f9bcc614c73a40b9f8bfca684281d22

>---------------------------------------------------------------

commit dcd563d69f9bcc614c73a40b9f8bfca684281d22
Merge: 48da9a5 96c32cc
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 10:53:48 2015 -0700

    sync up and mergewith upstream



>---------------------------------------------------------------

dcd563d69f9bcc614c73a40b9f8bfca684281d22
 README                | 32 --------------------------------
 README.md             | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 changelog.md          | 11 +++++++----
 hoopl.cabal           |  4 ++--
 src/Compiler/Hoopl.hs |  2 +-
 5 files changed, 58 insertions(+), 39 deletions(-)

diff --cc README.md
index 0000000,042c57b..c648876
mode 000000,100644..100644
--- a/README.md
+++ b/README.md
@@@ -1,0 -1,43 +1,48 @@@
+ The `hoopl` Package  [![Hackage](https://img.shields.io/hackage/v/hoopl.svg)](https://hackage.haskell.org/package/hoopl) [![Build Status](https://travis-ci.org/haskell/hoopl.svg)](https://travis-ci.org/haskell/hoopl)
+ ===================
+ 
+ ## Hoopl: A Higher-Order OPtimization Library
+ 
+ API documentation can be found on [Hackage](https://hackage.haskell.org/package/hoopl).
+ 
+ | Directory      | Contents
+ | -------------- | ---------
+ | `paper/`       | A paper about Hoopl
+ | `prototypes/`  | A sampling of prototypes and early designs
+ | `src/`         | The current official sources to the Cabal package
+ | `testing/`     | Tests, including a sample client.  See [`testing/README`](testing/README)
+ 
+ ### Development Notes
+ 
+ To build the library, change to the src directory and run
+ 
+     cabal configure --prefix=$HOME --user   # we have no idea what this means
+     cabal build
+     cabal install --enable-documentation
+ 
++To run the tests in the folder testing/, change to the src directory and run 
++
++    cabal configure --enable-tests
++    cabal test
++
+ You'll need a Haskell Platform, which should include appropriate
+ versions of Cabal and GHC.
+ 
+ ### Checklist for Making Releases
+ 
+ In order to facilitate GHC development's workflow, the version in [`hoopl.cabal`](hoopl.cabal) is to be bumped as soon as a change requires a respective version bump (according to the PVP) relative to the last released `hoopl` version.
+ 
+ 1. Make sure `hoopl` passes Travis for all GHC versions in the build-matrix
+ 2. Update Changelog (& `git commit`)
+ 3. Generate source tarball via `cabal sdist` and upload a candidate to Hackage (see note below), and inspect the result. 
+ 4. If everything checks out, make an annotated and GPG-signed Git release tag: `git tag -a -s v${VER} -m "hoopl ${VER}"`
+ 5. Publish (there's a button for that on Hackage) the package candidate
+ 6. Work on next release
+ 
+ Note: To upload to Hackage,
+ 
+     cabal sdist
+     cabal upload dist/hoopl-*.tar.gz
+ 
+ However, it's recommended use the Hackage feature for
+ [uploading a candidate](http://hackage.haskell.org/packages/candidates/upload).
diff --cc changelog.md
index 9718736,0182960..b8a6d5c
--- a/changelog.md
+++ b/changelog.md
@@@ -1,15 -1,8 +1,18 @@@
  # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
  
- ## 3.10.2.1 *Apr 2015*
++## 3.10.1.1 *Apr 2015*
++
 + - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
++
 + - Change the test code (testing/*) to compare the converted graphs against the expected graphs in AST form 
++
 + - Update the cabal file to run tests and generate a test coverage report 
 + 
- ## 3.10.2.0 *Apr 2015*
++ - Unhide gSplice of Hoopl.Graph
 +
-  - Re-export runWithFuel from Compiler.Hoopl.
+ ## 3.10.1.0 *Apr 2015*
  
- ## 3.10.1.0  **TBA**
+  - Re-export runWithFuel from Compiler.Hoopl.
  
   - Remove redundant constraints
  
diff --cc src/Compiler/Hoopl.hs
index 27a81a2,7858f42..7a9cd89
--- a/src/Compiler/Hoopl.hs
+++ b/src/Compiler/Hoopl.hs
@@@ -29,7 -29,7 +29,7 @@@ import Compiler.Hoopl.Dataflow hiding 
  import Compiler.Hoopl.Debug
  import Compiler.Hoopl.Fuel hiding (withFuel, getFuel, setFuel)
  import Compiler.Hoopl.Block
- import Compiler.Hoopl.Graph hiding (splice{-, gSplice-})
 -import Compiler.Hoopl.Graph hiding (splice, gSplice)
++import Compiler.Hoopl.Graph hiding (splice)
  import Compiler.Hoopl.Label hiding (uniqueToLbl, lblToUnique)
  import Compiler.Hoopl.MkGraph
  import Compiler.Hoopl.Pointed


From git at git.haskell.org  Mon Dec 21 22:13:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:03 +0000 (UTC)
Subject: [commit: packages/hoopl] master: 1. add an option to enable the test
 coverage report. 2. fix errors in expected files,
 and introduced a mismatch in the expected file to test if Travis CI can catch
 this error. (a08668c)
Message-ID: <20151221221303.CCC4E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/a08668c41a8d8442f0575b73a4bf93714b6252e4

>---------------------------------------------------------------

commit a08668c41a8d8442f0575b73a4bf93714b6252e4
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 16:48:05 2015 -0700

    1. add an option to enable the test coverage report. 2. fix errors in expected files, and introduced a mismatch in the expected file to test if Travis CI can catch this error.


>---------------------------------------------------------------

a08668c41a8d8442f0575b73a4bf93714b6252e4
 README.md                      |  5 +++++
 hoopl.cabal                    | 11 ++++++++++-
 testing/tests/if-test.expected |  2 +-
 testing/tests/test4.expected   |  6 +++---
 4 files changed, 19 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index c648876..383e1d7 100644
--- a/README.md
+++ b/README.md
@@ -25,6 +25,11 @@ To run the tests in the folder testing/, change to the src directory and run
     cabal configure --enable-tests
     cabal test
 
+To run the tests with the test coverage report, change to the src directory and run 
+
+    cabal configure --enable-tests -f testcoverage
+    cabal test
+
 You'll need a Haskell Platform, which should include appropriate
 versions of Cabal and GHC.
 
diff --git a/hoopl.cabal b/hoopl.cabal
index 1059927..aad6bc3 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -24,6 +24,12 @@ Source-repository head
   Type:       git
   Location:   http://git.haskell.org/packages/hoopl.git
 
+flag testcoverage {
+  description: Enable test coverage report
+  default: False
+}
+
+
 Library
   Default-Language:  Haskell2010
   Other-Extensions:  CPP
@@ -73,8 +79,11 @@ Test-Suite hoopl-test
   Type:              exitcode-stdio-1.0
   Main-Is:           Main.hs
   Hs-Source-Dirs:    testing src
-  Ghc-Options:       -fhpc -Wall
+  Ghc-Options:       -Wall
   Build-Depends:     base >= 4.3 && < 4.9, 
                      containers >= 0.4 && < 0.6,
                      parsec >= 3.1.7,
                      mtl >= 2.1.3.1
+  if flag(testcoverage) {
+    Ghc-Options: -fhpc
+  }
diff --git a/testing/tests/if-test.expected b/testing/tests/if-test.expected
index 9957111..de9ab62 100644
--- a/testing/tests/if-test.expected
+++ b/testing/tests/if-test.expected
@@ -1,6 +1,6 @@
 f() {
 L0:
-  goto "L1"
+  goto L1
 L1:
   ret (1)
 }
diff --git a/testing/tests/test4.expected b/testing/tests/test4.expected
index e0b9da1..8575f47 100644
--- a/testing/tests/test4.expected
+++ b/testing/tests/test4.expected
@@ -1,9 +1,9 @@
 f(x) {
 L100:
-  goto "L101"
+  goto L101
 L101:
-  goto "L103"
+  goto L103
 L103:
-  ret ((x + 5) + 4)
+  ret ((x + 5) + 3)
 }
 


From git at git.haskell.org  Mon Dec 21 22:13:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:05 +0000 (UTC)
Subject: [commit: packages/hoopl] master: enable the test in Travis CI
 (d1d3188)
Message-ID: <20151221221305.D40ED3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/d1d3188b632b921d7a79f5be132f04ce0f8dfb4c

>---------------------------------------------------------------

commit d1d3188b632b921d7a79f5be132f04ce0f8dfb4c
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 16:51:26 2015 -0700

    enable the test in Travis CI


>---------------------------------------------------------------

d1d3188b632b921d7a79f5be132f04ce0f8dfb4c
 .travis.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1c62b4e..b56e4e5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,9 @@ install:
  - travis_retry cabal update
 
 script:
- - cabal configure -v2
+ - cabal configure -v2 --enable-tests
  - cabal build
+ - cabal test
  - cabal check
  - cabal sdist
  - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&


From git at git.haskell.org  Mon Dec 21 22:13:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:07 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Travis still run ghc-7.0.1 to
 compile this package,
 and --enable-tests failed the CI. I don't know whether the ancient cabal and
 ghc caused this failure, so I disable it now until I find a solution (5b92105)
Message-ID: <20151221221307.DB8903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/5b92105053690dd7c75855787147da7698e8bd8d

>---------------------------------------------------------------

commit 5b92105053690dd7c75855787147da7698e8bd8d
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 18:00:12 2015 -0700

    Travis still run ghc-7.0.1 to compile this package, and --enable-tests failed the CI. I don't know whether the ancient cabal and ghc caused this failure, so I disable it now until I find a solution


>---------------------------------------------------------------

5b92105053690dd7c75855787147da7698e8bd8d
 .travis.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b56e4e5..1c62b4e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,9 +27,8 @@ install:
  - travis_retry cabal update
 
 script:
- - cabal configure -v2 --enable-tests
+ - cabal configure -v2
  - cabal build
- - cabal test
  - cabal check
  - cabal sdist
  - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&


From git at git.haskell.org  Mon Dec 21 22:13:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:09 +0000 (UTC)
Subject: [commit: packages/hoopl] master: The test needs extra modulars. I add
 the command to install dependencies before running cabal configure. (572e5e1)
Message-ID: <20151221221309.E323D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/572e5e10fa28872c8d04bc032f796706e163c482

>---------------------------------------------------------------

commit 572e5e10fa28872c8d04bc032f796706e163c482
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 18:27:32 2015 -0700

    The test needs extra modulars. I add the command to install dependencies before running cabal configure.


>---------------------------------------------------------------

572e5e10fa28872c8d04bc032f796706e163c482
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 1c62b4e..7d29550 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,10 @@ install:
  - travis_retry cabal update
 
 script:
- - cabal configure -v2
+ - cabal install --only-dependencies --enable-tests
+ - cabal configure -v2 --enable-tests
  - cabal build
+ - cabal test
  - cabal check
  - cabal sdist
  - SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&


From git at git.haskell.org  Mon Dec 21 22:13:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:11 +0000 (UTC)
Subject: [commit: packages/hoopl] master: fix this expected file that is
 intentionally changed to mismatch the result to test Travis CI (2081ada)
Message-ID: <20151221221311.E92F53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/2081adaa950304e454e81e119b5dff7122e7dc71

>---------------------------------------------------------------

commit 2081adaa950304e454e81e119b5dff7122e7dc71
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 18:36:02 2015 -0700

    fix this expected file that is intentionally changed to mismatch the result to test Travis CI


>---------------------------------------------------------------

2081adaa950304e454e81e119b5dff7122e7dc71
 testing/tests/test4.expected | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/tests/test4.expected b/testing/tests/test4.expected
index 8575f47..8476609 100644
--- a/testing/tests/test4.expected
+++ b/testing/tests/test4.expected
@@ -4,6 +4,6 @@ L100:
 L101:
   goto L103
 L103:
-  ret ((x + 5) + 3)
+  ret ((x + 5) + 4)
 }
 


From git at git.haskell.org  Mon Dec 21 22:13:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:13 +0000 (UTC)
Subject: [commit: packages/hoopl] master: ghc-7.10 does not like Monad
 instances that are not Functor and Applicative instances. Made them instances
 of Functor and Applicative so the build can pass in Travis CI. (814d4ef)
Message-ID: <20151221221313.F03763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/814d4ef37ef3b5f2dfeddced3875cbd3e8b375b1

>---------------------------------------------------------------

commit 814d4ef37ef3b5f2dfeddced3875cbd3e8b375b1
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 19:10:33 2015 -0700

    ghc-7.10 does not like Monad instances that are not Functor and Applicative instances. Made them instances of Functor and Applicative so the build can pass in Travis CI.


>---------------------------------------------------------------

814d4ef37ef3b5f2dfeddced3875cbd3e8b375b1
 testing/Ast2ir.hs     | 20 +++++++++++++++++++-
 testing/EvalMonad.hs  | 19 ++++++++++++++++++-
 testing/OptSupport.hs | 18 +++++++++++++++++-
 3 files changed, 54 insertions(+), 3 deletions(-)

diff --git a/testing/Ast2ir.hs b/testing/Ast2ir.hs
index ff227e8..56f0778 100644
--- a/testing/Ast2ir.hs
+++ b/testing/Ast2ir.hs
@@ -1,11 +1,19 @@
 {-# OPTIONS_GHC -Wall #-}
-{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns #-}
+{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns #-}
 module Ast2ir (astToIR, IdLabelMap) where
 
 import           Compiler.Hoopl
 import           Control.Monad
 import qualified Data.Map       as M
 
+#if CABAL
+#if !MIN_VERSION_base(4,8,0)
+import qualified Control.Applicative as AP (Applicative(..))
+#endif
+#else
+import qualified Control.Applicative as AP (Applicative(..)) 
+#endif
+
 import qualified Ast as A
 import qualified IR  as I
 
@@ -67,11 +75,21 @@ toLast (A.Return es)      = return $ I.Return es
 
 type IdLabelMap = M.Map String Label
 data LabelMapM a = LabelMapM (IdLabelMap -> I.M (IdLabelMap, a))
+
 instance Monad LabelMapM where
   return x = LabelMapM (\m -> return (m, x))
   LabelMapM f1 >>= k = LabelMapM (\m -> do (m', x) <- f1 m
                                            let (LabelMapM f2) = k x
                                            f2 m')
+                       
+instance Functor LabelMapM where                       
+  fmap = liftM
+  
+instance AP.Applicative LabelMapM where  
+  pure = return
+  (<*>) = ap
+
+  
 labelFor l = LabelMapM f
   where f m = case M.lookup l m of
                 Just l' -> return (m, l')
diff --git a/testing/EvalMonad.hs b/testing/EvalMonad.hs
index 024d585..628a1f9 100644
--- a/testing/EvalMonad.hs
+++ b/testing/EvalMonad.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wall #-}
-{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
+{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 module EvalMonad (ErrorM, VarEnv, B, State,
                   EvalM, runProg, inNewFrame, get_proc, get_block,
@@ -10,6 +10,14 @@ import Control.Monad.Error
 import qualified Data.Map as M
 import Prelude hiding (succ)
 
+#if CABAL
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative (Applicative(..))
+#endif
+#else
+import Control.Applicative (Applicative(..))
+#endif
+
 import Compiler.Hoopl
 import IR
 
@@ -26,6 +34,15 @@ instance Monad (EvalM v) where
   EvalM f >>= k = EvalM $ \s -> do (s', x) <- f s
                                    let EvalM f' = k x
                                    f' s'
+
+instance Functor (EvalM v) where
+  fmap = liftM
+
+instance Applicative (EvalM v) where
+  pure = return
+  (<*>) = ap
+
+
 instance MonadError String (EvalM v) where
   throwError e = EvalM (\s -> throwError (s, e))
   catchError (EvalM f) handler =
diff --git a/testing/OptSupport.hs b/testing/OptSupport.hs
index 11eaa63..dacbcc4 100644
--- a/testing/OptSupport.hs
+++ b/testing/OptSupport.hs
@@ -1,4 +1,4 @@
-{-# LANGUAGE GADTs, RankNTypes #-}
+{-# LANGUAGE CPP, GADTs, RankNTypes #-}
 {-# OPTIONS_GHC -Wall -fno-warn-name-shadowing #-}
 module OptSupport (mapVE, mapEE, mapEN, mapVN, fold_EE, fold_EN, insnToG) where
 
@@ -6,6 +6,14 @@ import Control.Monad
 import Data.Maybe
 import Prelude hiding (succ)
 
+#if CABAL
+#if !MIN_VERSION_base(4,8,0)
+import Control.Applicative (Applicative(..))
+#endif
+#else
+import Control.Applicative (Applicative(..))
+#endif
+
 import Compiler.Hoopl
 import IR
 
@@ -34,6 +42,14 @@ instance Monad Mapped where
     where asNew (Old a)   = New a
           asNew m@(New _) = m
 
+instance Functor Mapped where
+  fmap = liftM
+  
+instance Applicative Mapped where
+  pure = return
+  (<*>) = ap
+
+
 makeTotal :: (a -> Maybe a) -> (a -> Mapped a)
 makeTotal f a = case f a of Just a' -> New a'
                             Nothing -> Old a


From git at git.haskell.org  Mon Dec 21 22:13:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:16 +0000 (UTC)
Subject: [commit: packages/hoopl] master: 1. <*> is included the Prelude of
 7.10,
 it conflicts with Hoopl's def. change the code to use a qualified version. 2.
 we don't need to see warnings again in test, disable them. (a1a9a9e)
Message-ID: <20151221221316.0327C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/a1a9a9e768e560a8320c946f7a108c55429b93fa

>---------------------------------------------------------------

commit a1a9a9e768e560a8320c946f7a108c55429b93fa
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 19:21:38 2015 -0700

    1. <*> is included the Prelude of 7.10, it conflicts with Hoopl's def.  change the code to use a qualified version. 2. we don't need to see warnings again in test, disable them.


>---------------------------------------------------------------

a1a9a9e768e560a8320c946f7a108c55429b93fa
 hoopl.cabal           | 1 -
 testing/Ast2ir.hs     | 6 ++++--
 testing/EvalMonad.hs  | 2 +-
 testing/OptSupport.hs | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index aad6bc3..ac77173 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -79,7 +79,6 @@ Test-Suite hoopl-test
   Type:              exitcode-stdio-1.0
   Main-Is:           Main.hs
   Hs-Source-Dirs:    testing src
-  Ghc-Options:       -Wall
   Build-Depends:     base >= 4.3 && < 4.9, 
                      containers >= 0.4 && < 0.6,
                      parsec >= 3.1.7,
diff --git a/testing/Ast2ir.hs b/testing/Ast2ir.hs
index 56f0778..5647dfe 100644
--- a/testing/Ast2ir.hs
+++ b/testing/Ast2ir.hs
@@ -2,7 +2,9 @@
 {-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns #-}
 module Ast2ir (astToIR, IdLabelMap) where
 
-import           Compiler.Hoopl
+
+import           Compiler.Hoopl hiding ((<*>))
+import qualified Compiler.Hoopl as H ((<*>))
 import           Control.Monad
 import qualified Data.Map       as M
 
@@ -52,7 +54,7 @@ toBlock (A.Block { A.first = f, A.mids = ms, A.last = l }) =
   do f'  <- toFirst f
      ms' <- mapM toMid ms
      l'  <- toLast l
-     return $ mkFirst f' <*> mkMiddles ms' <*> mkLast l'
+     return $ mkFirst f' H.<*> mkMiddles ms' H.<*> mkLast l'
 
 toFirst :: A.Lbl -> LabelMapM (I.Insn C O)
 toFirst = liftM I.Label . labelFor
diff --git a/testing/EvalMonad.hs b/testing/EvalMonad.hs
index 628a1f9..64d9ecf 100644
--- a/testing/EvalMonad.hs
+++ b/testing/EvalMonad.hs
@@ -18,7 +18,7 @@ import Control.Applicative (Applicative(..))
 import Control.Applicative (Applicative(..))
 #endif
 
-import Compiler.Hoopl
+import Compiler.Hoopl hiding ((<*>))
 import IR
 
 type ErrorM        = Either String
diff --git a/testing/OptSupport.hs b/testing/OptSupport.hs
index dacbcc4..a5c5fb9 100644
--- a/testing/OptSupport.hs
+++ b/testing/OptSupport.hs
@@ -14,7 +14,7 @@ import Control.Applicative (Applicative(..))
 import Control.Applicative (Applicative(..))
 #endif
 
-import Compiler.Hoopl
+import Compiler.Hoopl hiding ((<*>))
 import IR
 
 ----------------------------------------------


From git at git.haskell.org  Mon Dec 21 22:13:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:18 +0000 (UTC)
Subject: [commit: packages/hoopl] master: FlexibleContexts extension is
 required 7.10. Add this to play nice with 7.10. (01ab999)
Message-ID: <20151221221318.0A4883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/01ab99942dd08c409c8110fbdb4741b188fb12da

>---------------------------------------------------------------

commit 01ab99942dd08c409c8110fbdb4741b188fb12da
Author: Ning Wang <email at ningwang.org>
Date:   Tue May 5 19:36:01 2015 -0700

    FlexibleContexts extension is required 7.10. Add this to play nice with 7.10.


>---------------------------------------------------------------

01ab99942dd08c409c8110fbdb4741b188fb12da
 testing/Eval.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testing/Eval.hs b/testing/Eval.hs
index 529bc4a..9eaca6e 100644
--- a/testing/Eval.hs
+++ b/testing/Eval.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wall -fno-warn-name-shadowing #-}
-{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances,  FlexibleContexts #-}
 
 module Eval (evalProg, ErrorM) where
 


From git at git.haskell.org  Mon Dec 21 22:13:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:20 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Remove prototypes directory (ticket
 #6) (96b439a)
Message-ID: <20151221221320.1376B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/96b439a5dd35b8db8a8efd45ac69f4940113c214

>---------------------------------------------------------------

commit 96b439a5dd35b8db8a8efd45ac69f4940113c214
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Fri May 29 12:49:10 2015 +0200

    Remove prototypes directory (ticket #6)
    
    Most of the prototypes don't compile and keeping them in the
    repository might be more confusing than helpful.


>---------------------------------------------------------------

96b439a5dd35b8db8a8efd45ac69f4940113c214
 prototypes/.gitignore          |   3 -
 prototypes/Cunning3.hs         | 347 -------------------
 prototypes/CunningTransfers.hs | 419 -----------------------
 prototypes/Hoopl.hs            | 459 -------------------------
 prototypes/Hoopl1.hs           | 470 -------------------------
 prototypes/Hoopl4.hs           | 528 -----------------------------
 prototypes/Hoopl5.hs           | 739 ----------------------------------------
 prototypes/Hoopl6.hs           | 753 -----------------------------------------
 prototypes/Hoopl7.hs           | 692 -------------------------------------
 prototypes/RG.hs               |  21 --
 prototypes/Zipper.hs           |  90 -----
 11 files changed, 4521 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 96b439a5dd35b8db8a8efd45ac69f4940113c214

From git at git.haskell.org  Mon Dec 21 22:13:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:22 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Remove private directory (ticket #6)
 (5dc6bb9)
Message-ID: <20151221221322.1BC5D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/5dc6bb980f97740bed4ff66bb0a049c1487d2469

>---------------------------------------------------------------

commit 5dc6bb980f97740bed4ff66bb0a049c1487d2469
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Fri May 29 12:51:39 2015 +0200

    Remove private directory (ticket #6)
    
    It contained reviews from ICFP and POPL, which are not really useful
    (at least now) and probably shouldn't have been made public in the
    first place.


>---------------------------------------------------------------

5dc6bb980f97740bed4ff66bb0a049c1487d2469
 private/authors-response     |  56 --------
 private/icfp09.reviews       | 186 --------------------------
 private/popl-response.txt    |  72 -----------
 private/popl10-reviews.txt   | 302 -------------------------------------------
 private/popl2010-reviews.txt | 292 -----------------------------------------
 5 files changed, 908 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 5dc6bb980f97740bed4ff66bb0a049c1487d2469

From git at git.haskell.org  Mon Dec 21 22:13:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:24 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Migrate testing/Main.hs to
 TestFramework (75d9163)
Message-ID: <20151221221324.234C83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/75d9163cca3ea4cce83433736cdf11db31b1d236

>---------------------------------------------------------------

commit 75d9163cca3ea4cce83433736cdf11db31b1d236
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sat May 30 14:18:26 2015 +0200

    Migrate testing/Main.hs to TestFramework
    
    This is (hopefully) a first step to cleaning up and extending
    Hoopl's testsuite. In the future I'd like to add some QuickCheck
    tests, so I wanted to use a testing framework that would make
    it easy to handle both HUnit and QuickCheck tests.
    
    Note that we considered using tasty (instead of test-framework),
    but it doesn't support GHC <7.4, which Hoopl does support.


>---------------------------------------------------------------

75d9163cca3ea4cce83433736cdf11db31b1d236
 hoopl.cabal     |  5 ++++-
 testing/Main.hs | 45 +++++++++++++++++++++++++++++++--------------
 testing/Test.hs |  4 ----
 3 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index ac77173..200b438 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -81,8 +81,11 @@ Test-Suite hoopl-test
   Hs-Source-Dirs:    testing src
   Build-Depends:     base >= 4.3 && < 4.9, 
                      containers >= 0.4 && < 0.6,
+                     filepath,
+                     mtl >= 2.1.3.1,
                      parsec >= 3.1.7,
-                     mtl >= 2.1.3.1
+                     test-framework < 0.9,
+                     test-framework-hunit < 0.4
   if flag(testcoverage) {
     Ghc-Options: -fhpc
   }
diff --git a/testing/Main.hs b/testing/Main.hs
index a6f90f0..8b5d0ca 100644
--- a/testing/Main.hs
+++ b/testing/Main.hs
@@ -1,20 +1,37 @@
 module Main (main) where
 
-import Test
-import System.IO
+import qualified System.FilePath as FilePath
 
--- Hardcoding test locations for now
-tests = map (\t -> "testing" ++ "/" ++ "tests" ++ "/" ++ t)
-        (["test1", "test2", "test3", "test4"] ++
-             ["if-test", "if-test2", "if-test3", "if-test4"])
-        
-test_expected_results = map (\t -> "testing" ++ "/" ++ "tests" ++ "/" ++ t)
-                        (["test1.expected", "test2.expected", "test3.expected", "test4.expected"] ++
-                         ["if-test.expected", "if-test2.expected", "if-test3.expected", "if-test4.expected"])
+import qualified Test.Framework as Framework
+import qualified Test.Framework.Providers.HUnit as HUnit
 
+import qualified Test
 
 main :: IO ()
-main = do hSetBuffering stdout NoBuffering
-          hSetBuffering stderr NoBuffering
-          mapM (\(x, ex) -> putStrLn ("Test:" ++ x) >> parseTest x >> optTest x ex) (zip tests test_expected_results)
-          return ()
+main = Framework.defaultMain tests
+
+tests :: [Framework.Test]
+tests = [goldensTests]
+
+-- | All the tests that depend on reading an input file with a simple program,
+-- parsing and optimizing it and then comparing with an expected output.
+goldensTests :: Framework.Test
+goldensTests = Framework.testGroup "Goldens tests"
+    [ HUnit.testCase inputFile $ compareWithExpected inputFile expectedFile
+    | (inputFile, expectedFile) <- zip inputFiles expectedFiles ]
+  where
+    compareWithExpected = Test.optTest
+    inputFiles = [ basePath FilePath.</> test | test <- testFileNames ]
+    expectedFiles = [ basePath FilePath.</> test FilePath.<.> "expected"
+                    | test <- testFileNames ]
+    basePath = "testing" FilePath.</> "tests"
+    testFileNames =
+        [ "test1"
+        , "test2"
+        , "test3"
+        , "test4"
+        , "if-test"
+        , "if-test2"
+        , "if-test3"
+        , "if-test4"
+        ]
diff --git a/testing/Test.hs b/testing/Test.hs
index f007b49..1f83c72 100644
--- a/testing/Test.hs
+++ b/testing/Test.hs
@@ -15,8 +15,6 @@ import IR
 import Live
 import Parse (parseCode)
 import Simplify
-import Debug.Trace
-
 parse :: String -> String -> ErrorM (M [(IdLabelMap, Proc)])
 parse file text =
   case parseCode file text of
@@ -55,7 +53,6 @@ optTest' procs =
     optProc proc@(Proc {entry, body, args}) =
       do { (body',  _, _) <- analyzeAndRewriteFwd fwd (JustC [entry]) body
                              (mapSingleton entry (initFact args))
-         ; trace (showProc (proc {body=body'})) $ return ()
          ; (body'', _, _) <- analyzeAndRewriteBwd bwd (JustC [entry]) body' mapEmpty
          ; return $ proc { body = body'' } }
     -- With debugging info: 
@@ -115,7 +112,6 @@ optTest file expectedFile =
            Right p  -> do { let opted = runSimpleUniqueMonad $ runWithFuel fuel p
                                 lbmaps = runSimpleUniqueMonad $ runWithFuel fuel (liftM (fst . unzip) lps)
                                 expected = runSimpleUniqueMonad $ runWithFuel fuel exps
-                          ; mapM_ (putStrLn . showProc) opted
                           ; compareAst (toAst (zip lbmaps opted)) (toAst expected)
                           }
   where


From git at git.haskell.org  Mon Dec 21 22:13:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:26 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Merge branch 'cleanups/2' of
 https://github.com/michalt/hoopl into michalt-cleanups/2 (b927cac)
Message-ID: <20151221221326.2A1BE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/b927cacfde5d814d25c29430555ca33537d97dbe

>---------------------------------------------------------------

commit b927cacfde5d814d25c29430555ca33537d97dbe
Merge: 5dc6bb9 75d9163
Author: Ning Wang <email at ningwang.org>
Date:   Sun May 31 15:36:16 2015 -0700

    Merge branch 'cleanups/2' of https://github.com/michalt/hoopl into michalt-cleanups/2



>---------------------------------------------------------------

b927cacfde5d814d25c29430555ca33537d97dbe
 hoopl.cabal     |  5 ++++-
 testing/Main.hs | 45 +++++++++++++++++++++++++++++++--------------
 testing/Test.hs |  4 ----
 3 files changed, 35 insertions(+), 19 deletions(-)


From git at git.haskell.org  Mon Dec 21 22:13:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:28 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Fix all warnings in testing/
 (d9e9cee)
Message-ID: <20151221221328.30A143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/d9e9cee04b9821a263633f81d1943374012be724

>---------------------------------------------------------------

commit d9e9cee04b9821a263633f81d1943374012be724
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sun Jun 7 20:01:24 2015 +0200

    Fix all warnings in testing/


>---------------------------------------------------------------

d9e9cee04b9821a263633f81d1943374012be724
 testing/Ast.hs       | 4 ++--
 testing/Eval.hs      | 2 +-
 testing/EvalMonad.hs | 5 +----
 testing/Ir2ast.hs    | 2 +-
 testing/Test.hs      | 2 +-
 5 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/testing/Ast.hs b/testing/Ast.hs
index e7333d2..0f27727 100644
--- a/testing/Ast.hs
+++ b/testing/Ast.hs
@@ -51,8 +51,8 @@ instance Show Control where
   show (Branch lbl)       = ind $ "goto " ++ lbl
   show (Cond e t f)       =
     ind $ "if " ++ show e ++ " then goto " ++ t ++ " else goto " ++ f
-  show (Call ress f cargs succ) =
-    ind $ tuple ress ++ " = " ++ f ++ tuple (map show cargs) ++ " goto " ++ succ
+  show (Call ress f cargs successor) =
+    ind $ tuple ress ++ " = " ++ f ++ tuple (map show cargs) ++ " goto " ++ successor
   show (Return      rargs) = ind $ "ret " ++ tuple (map show rargs)
 
 ind :: String -> String
diff --git a/testing/Eval.hs b/testing/Eval.hs
index 9eaca6e..4c25a5d 100644
--- a/testing/Eval.hs
+++ b/testing/Eval.hs
@@ -3,7 +3,7 @@
 
 module Eval (evalProg, ErrorM) where
 
-import Control.Monad.Error
+import Control.Monad.Except
 import qualified Data.Map    as M
 import Prelude hiding (succ)
 
diff --git a/testing/EvalMonad.hs b/testing/EvalMonad.hs
index 64d9ecf..0878dfa 100644
--- a/testing/EvalMonad.hs
+++ b/testing/EvalMonad.hs
@@ -6,7 +6,7 @@ module EvalMonad (ErrorM, VarEnv, B, State,
                          get_var, set_var, get_heap, set_heap,
                   Event (..), event) where
 
-import Control.Monad.Error
+import Control.Monad.Except
 import qualified Data.Map as M
 import Prelude hiding (succ)
 
@@ -23,9 +23,6 @@ import IR
 
 type ErrorM        = Either String
 type InnerErrorM v = Either (State v, String)
-instance Error (State v, String) where
-  noMsg      = (undefined, "")
-  strMsg str = (undefined, str)
 
 data EvalM v a = EvalM (State v -> InnerErrorM v (State v, a))
 
diff --git a/testing/Ir2ast.hs b/testing/Ir2ast.hs
index fdc9c77..c16cb2c 100644
--- a/testing/Ir2ast.hs
+++ b/testing/Ir2ast.hs
@@ -50,7 +50,7 @@ fromBlock blk = foldBlockNodesF3 (fromIrInstCO, fromIrInstOO, fromIrInstOC) blk
 
   
 fromIrInstCO :: I.Insn C O -> () -> Rm (A.Lbl, [A.Insn])
-fromIrInstCO inst p = case inst of
+fromIrInstCO inst _ = case inst of
   I.Label l -> strLabelFor l >>= \x -> return (x, [])
 
   
diff --git a/testing/Test.hs b/testing/Test.hs
index 1f83c72..94b0f06 100644
--- a/testing/Test.hs
+++ b/testing/Test.hs
@@ -3,7 +3,7 @@
 module Test (parseTest, evalTest, optTest) where
 
 import Compiler.Hoopl
-import Control.Monad.Error
+import Control.Monad.Except
 import System.Exit
 
 import qualified Ast as A


From git at git.haskell.org  Mon Dec 21 22:13:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:30 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Remove trailing whitespace in
 testing/ (9c07a4b)
Message-ID: <20151221221330.395A73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/9c07a4b7b8283b6057c1b3739ae556bd0cf48695

>---------------------------------------------------------------

commit 9c07a4b7b8283b6057c1b3739ae556bd0cf48695
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sun Jun 7 20:04:48 2015 +0200

    Remove trailing whitespace in testing/


>---------------------------------------------------------------

9c07a4b7b8283b6057c1b3739ae556bd0cf48695
 testing/Ast.hs        | 0
 testing/Ast2ir.hs     | 0
 testing/ConstProp.hs  | 0
 testing/Eval.hs       | 0
 testing/EvalMonad.hs  | 0
 testing/Expr.hs       | 0
 testing/Ir2ast.hs     | 0
 testing/Live.hs       | 0
 testing/OptSupport.hs | 0
 testing/Parse.hs      | 0
 testing/Test.hs       | 0
 11 files changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Mon Dec 21 22:13:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:32 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Test: crash on errors (cda3ec8)
Message-ID: <20151221221332.3EB723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/cda3ec8d331bbed7b2acfb30976f8930641a440b

>---------------------------------------------------------------

commit cda3ec8d331bbed7b2acfb30976f8930641a440b
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sat Jun 27 16:29:59 2015 +0200

    Test: crash on errors
    
    Previously Test would only print any errors (e.g., parsing errors).
    Now it'll simply crash, making the failure obvious.


>---------------------------------------------------------------

cda3ec8d331bbed7b2acfb30976f8930641a440b
 testing/Test.hs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/testing/Test.hs b/testing/Test.hs
index 7e8cb4a..85d15e7 100644
--- a/testing/Test.hs
+++ b/testing/Test.hs
@@ -25,7 +25,7 @@ parseTest :: String -> IO ()
 parseTest file =
   do text <- readFile file
      case parse file text of
-       Left err -> putStrLn err
+       Left err -> error err
        Right p  -> mapM (putStrLn . showProc . snd) (runSimpleUniqueMonad $ runWithFuel 0 p) >> return ()
 
 evalTest' :: String -> String -> ErrorM String
@@ -43,7 +43,7 @@ evalTest :: String -> IO ()
 evalTest file =
   do text    <- readFile file
      case evalTest' file text of
-       Left err -> putStrLn err
+       Left err -> error err
        Right  s -> putStrLn s
 
 optTest' :: M [Proc] -> ErrorM (M [Proc])
@@ -104,11 +104,11 @@ optTest file expectedFile =
   do text    <- readFile file
      expectedText <- readFile expectedFile
      case (parse file text, parse expectedFile expectedText) of
-       (Left err, _) -> putStrLn err
-       (_, Left err) -> putStrLn err
+       (Left err, _) -> error err
+       (_, Left err) -> error err
        (Right lps, Right exps) ->
          case optTest' (liftM (snd . unzip) lps) of
-           Left err -> putStrLn err
+           Left err -> error err
            Right p  -> do { let opted = runSimpleUniqueMonad $ runWithFuel fuel p
                                 lbmaps = runSimpleUniqueMonad $ runWithFuel fuel (liftM (fst . unzip) lps)
                                 expected = runSimpleUniqueMonad $ runWithFuel fuel exps


From git at git.haskell.org  Mon Dec 21 22:13:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:34 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Fix parsing of memory accesses in
 tests (19526cc)
Message-ID: <20151221221334.481A03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/19526cc258a8bef851d828ad038a4a40ab5b3c06

>---------------------------------------------------------------

commit 19526cc258a8bef851d828ad038a4a40ab5b3c06
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sat Jun 27 16:32:12 2015 +0200

    Fix parsing of memory accesses in tests
    
    Apparently the current parser would fail on any memory accesses, both
    loads and stores. In case of the former it's enough to try parsing the
    memory accesses before variables. For stores, we can use backtracking
    so that we don't consume the initial "m" of memory assignemnt thinking
    that it's a variable identifier.


>---------------------------------------------------------------

19526cc258a8bef851d828ad038a4a40ab5b3c06
 testing/Main.hs              |  1 +
 testing/Parse.hs             | 14 ++++++--------
 testing/tests/test5          |  6 ++++++
 testing/tests/test5.expected |  6 ++++++
 4 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/testing/Main.hs b/testing/Main.hs
index 8b5d0ca..3728be6 100644
--- a/testing/Main.hs
+++ b/testing/Main.hs
@@ -30,6 +30,7 @@ goldensTests = Framework.testGroup "Goldens tests"
         , "test2"
         , "test3"
         , "test4"
+        , "test5"
         , "if-test"
         , "if-test2"
         , "if-test3"
diff --git a/testing/Parse.hs b/testing/Parse.hs
index 2d8594d..121734b 100644
--- a/testing/Parse.hs
+++ b/testing/Parse.hs
@@ -47,6 +47,9 @@ reservedOp = P.reservedOp lexer
 whitespace :: CharParser () ()
 whitespace = P.whiteSpace lexer
 
+brackets :: CharParser () a -> CharParser () a
+brackets = P.brackets lexer
+
 -- Expressions:
 expr :: Parser Expr
 expr = buildExpressionParser table factor
@@ -60,8 +63,8 @@ expr = buildExpressionParser table factor
     op o f assoc = Infix (do {reservedOp o; return f} <?> "operator") assoc
     factor =   parens expr
            <|> lit
-           <|> fetchVar
            <|> load
+           <|> fetchVar
            <?> "simple Expression"
 
 bool :: Parser Bool
@@ -75,12 +78,7 @@ lit =  (natural >>= (return . Lit . Int))
    <?> "lit"
 
 loc :: Char -> Parser x -> Parser x
-loc s addr = try (lexeme (do { char' s
-                             ; char' '['
-                             ; a <- addr
-                             ; char' ']'
-                             ; return a
-                             }))
+loc s addr = try (lexeme (char' s >> brackets addr))
           <?> "loc"
 
 var :: Parser String
@@ -104,7 +102,7 @@ labl = lexeme (do { id <- identifier
   <?> "label"
 
 mid :: Parser Insn
-mid =   asst
+mid =   try asst
     <|> store
     <?> "assignment or store"
 
diff --git a/testing/tests/test5 b/testing/tests/test5
new file mode 100644
index 0000000..49423b3
--- /dev/null
+++ b/testing/tests/test5
@@ -0,0 +1,6 @@
+-- Tests parsing of memory stores and loads.
+procName(mm, aa) {
+L0:
+  m[aa] = m[mm] + m[aa]
+  ret(m[aa])
+}
diff --git a/testing/tests/test5.expected b/testing/tests/test5.expected
new file mode 100644
index 0000000..49423b3
--- /dev/null
+++ b/testing/tests/test5.expected
@@ -0,0 +1,6 @@
+-- Tests parsing of memory stores and loads.
+procName(mm, aa) {
+L0:
+  m[aa] = m[mm] + m[aa]
+  ret(m[aa])
+}


From git at git.haskell.org  Mon Dec 21 22:13:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:36 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Fix dead code elimination used in
 tests (782ffec)
Message-ID: <20151221221336.4FF883A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/782ffec38719d723be775eb00a5d527f81b75a7b

>---------------------------------------------------------------

commit 782ffec38719d723be775eb00a5d527f81b75a7b
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sun Jun 28 17:03:45 2015 +0200

    Fix dead code elimination used in tests
    
    The helper functions to fold over instructions and expressions in
    test/OptSupport have a bug where they would not recurse for complex
    expressions. And since testing/Live module depends on it, complex
    expressions would not be fully analyzed, leading to removal of code
    that is *not* dead, e.g.,
      var1 = m[0]
      var1 = m[var1] + m[var1]
    would get rewritten to just
      var1 = m[var1] + m[var1]
    which is clearly wrong.
    
    Note that this bug affects only Hoopl's tests.


>---------------------------------------------------------------

782ffec38719d723be775eb00a5d527f81b75a7b
 testing/Main.hs              | 1 +
 testing/OptSupport.hs        | 7 +++++--
 testing/tests/test6          | 9 +++++++++
 testing/tests/test6.expected | 8 ++++++++
 4 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/testing/Main.hs b/testing/Main.hs
index 3728be6..000c7ac 100644
--- a/testing/Main.hs
+++ b/testing/Main.hs
@@ -31,6 +31,7 @@ goldensTests = Framework.testGroup "Goldens tests"
         , "test3"
         , "test4"
         , "test5"
+        , "test6"
         , "if-test"
         , "if-test2"
         , "if-test3"
diff --git a/testing/OptSupport.hs b/testing/OptSupport.hs
index 7d587cc..cb9826d 100644
--- a/testing/OptSupport.hs
+++ b/testing/OptSupport.hs
@@ -114,8 +114,11 @@ fold_EN :: (a -> Expr -> a) -> a -> Insn e x -> a
 
 fold_EE f z e@(Lit _)         = f z e
 fold_EE f z e@(Var _)         = f z e
-fold_EE f z e@(Load addr)     = f (f z addr) e
-fold_EE f z e@(Binop _ e1 e2) = f (f (f z e2) e1) e
+fold_EE f z e@(Load addr)     = f (fold_EE f z addr) e
+fold_EE f z e@(Binop _ e1 e2) =
+  let afterE1 = fold_EE f z e1
+      afterE2 = fold_EE f afterE1 e2
+  in f afterE2 e
 
 fold_EN _ z (Label _)       = z
 fold_EN f z (Assign _ e)    = f z e
diff --git a/testing/tests/test6 b/testing/tests/test6
new file mode 100644
index 0000000..b6fb8b8
--- /dev/null
+++ b/testing/tests/test6
@@ -0,0 +1,9 @@
+-- Tests that we don't remove any of var1 as dead code.
+procName(var1, var2) {
+L0:
+  var1 = m[var2]
+  var1 = m[m[var1]]
+  var1 = m[var1 + var1]
+  var1 = m[m[var1]] - m[var1 + var1]
+  ret(var1)
+}
diff --git a/testing/tests/test6.expected b/testing/tests/test6.expected
new file mode 100644
index 0000000..813cb9a
--- /dev/null
+++ b/testing/tests/test6.expected
@@ -0,0 +1,8 @@
+procName(var1, var2) {
+L0:
+  var1 = m[var2]
+  var1 = m[m[var1]]
+  var1 = m[var1 + var1]
+  var1 = m[m[var1]] - m[var1 + var1]
+  ret(var1)
+}


From git at git.haskell.org  Mon Dec 21 22:13:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:38 +0000 (UTC)
Subject: [commit: packages/hoopl] master: test/Simplify: don't crash on divide
 by zero (4dccb47)
Message-ID: <20151221221338.58E903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/4dccb47429c9bb7a41cb735e572d27182061e87e

>---------------------------------------------------------------

commit 4dccb47429c9bb7a41cb735e572d27182061e87e
Author: Michal Terepeta <michal.terepeta at gmail.com>
Date:   Sun Jul 5 14:43:42 2015 +0200

    test/Simplify: don't crash on divide by zero
    
    Currently test/Simplify would not check for 0 before trying to do
    constant folding, which is quite bad since it simply crashes the
    program.
    
    The fix is to simply avoid evaluating the expression if there is a
    division by zero.


>---------------------------------------------------------------

4dccb47429c9bb7a41cb735e572d27182061e87e
 testing/Main.hs              | 1 +
 testing/Simplify.hs          | 2 ++
 testing/tests/test7          | 6 ++++++
 testing/tests/test7.expected | 5 +++++
 4 files changed, 14 insertions(+)

diff --git a/testing/Main.hs b/testing/Main.hs
index 000c7ac..47dbcd5 100644
--- a/testing/Main.hs
+++ b/testing/Main.hs
@@ -32,6 +32,7 @@ goldensTests = Framework.testGroup "Goldens tests"
         , "test4"
         , "test5"
         , "test6"
+        , "test7"
         , "if-test"
         , "if-test2"
         , "if-test3"
diff --git a/testing/Simplify.hs b/testing/Simplify.hs
index 20b4ab2..bb00dc6 100644
--- a/testing/Simplify.hs
+++ b/testing/Simplify.hs
@@ -27,6 +27,8 @@ simplify = deepFwdRw simp
     = Just $ Lit $ Int $ n1 + n2
     -- ... more cases for constant folding
 -- @ end cprop.tex
+  s_exp (Binop Div _lhs (Lit (Int 0)))
+    = Nothing
   s_exp (Binop opr e1 e2)
     | (Just op, Lit (Int i1), Lit (Int i2)) <- (intOp opr, e1, e2) =
         Just $ Lit $ Int  $ op i1 i2
diff --git a/testing/tests/test7 b/testing/tests/test7
new file mode 100644
index 0000000..9558250
--- /dev/null
+++ b/testing/tests/test7
@@ -0,0 +1,6 @@
+-- Test that we don't crash on divide by zero.
+procName() {
+L0:
+  reg1 = 42 / 0
+  ret(reg1)
+}
diff --git a/testing/tests/test7.expected b/testing/tests/test7.expected
new file mode 100644
index 0000000..e9f7ffd
--- /dev/null
+++ b/testing/tests/test7.expected
@@ -0,0 +1,5 @@
+procName() {
+L0:
+  reg1 = 42 / 0
+  ret(reg1)
+}


From git at git.haskell.org  Mon Dec 21 22:13:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:40 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Export 'Showing' from Hoopl.Show
 (8cae627)
Message-ID: <20151221221340.5F1A93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/8cae627dfd17e90c0caaa7c242970176ff8cdb95

>---------------------------------------------------------------

commit 8cae627dfd17e90c0caaa7c242970176ff8cdb95
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Aug 8 13:41:54 2015 +0200

    Export 'Showing' from Hoopl.Show
    
    GHC Trac user nimnul reports in
    https://ghc.haskell.org/trac/ghc/ticket/10540:
    
      Hoopl exports
    
        showGraph :: Showing n -> Graph n e x -> String
    
      But it doesn't export Showing. This doesn't make sense, as it's a
      user-supplied function. So to know what I should pass to showGraph I can only
      look at the source. :i Showing doesn't work.
    
      Below is a patch to export the innocent type synonym:


>---------------------------------------------------------------

8cae627dfd17e90c0caaa7c242970176ff8cdb95
 src/Compiler/Hoopl/Show.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Compiler/Hoopl/Show.hs b/src/Compiler/Hoopl/Show.hs
index 8a8b35f..66172b0 100644
--- a/src/Compiler/Hoopl/Show.hs
+++ b/src/Compiler/Hoopl/Show.hs
@@ -4,7 +4,7 @@
 #endif
 
 module Compiler.Hoopl.Show 
-  ( showGraph, showFactBase
+  ( showGraph, showFactBase, Showing
   )
 where
 


From git at git.haskell.org  Mon Dec 21 22:13:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:42 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Merge pull request #13 from
 thomie/master (2cdcbf5)
Message-ID: <20151221221342.654463A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/2cdcbf5f7f7b6323128ec86b605bc1c2c3354fc2

>---------------------------------------------------------------

commit 2cdcbf5f7f7b6323128ec86b605bc1c2c3354fc2
Merge: 4dccb47 8cae627
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Aug 8 14:55:22 2015 +0200

    Merge pull request #13 from thomie/master
    
    Export 'Showing' from Hoopl.Show



>---------------------------------------------------------------

2cdcbf5f7f7b6323128ec86b605bc1c2c3354fc2
 src/Compiler/Hoopl/Show.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Mon Dec 21 22:13:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:44 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Update bug tracker URL (cca20ad)
Message-ID: <20151221221344.6C2E63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/cca20ad0c2606db16dd548900aaaacc7ec601a55

>---------------------------------------------------------------

commit cca20ad0c2606db16dd548900aaaacc7ec601a55
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Aug 8 14:56:08 2015 +0200

    Update bug tracker URL


>---------------------------------------------------------------

cca20ad0c2606db16dd548900aaaacc7ec601a55
 hoopl.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index 200b438..60587c3 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -12,7 +12,7 @@ License-File:        LICENSE
 Author:              Norman Ramsey, Joao Dias, Simon Marlow and Simon Peyton Jones
 Maintainer:          nr at cs.tufts.edu, andreas.voellmy at gmail.com, email at ningwang.org
 Homepage:            http://ghc.cs.tufts.edu/hoopl/
-Bug-Reports:         http://ghc.haskell.org/trac/ghc/newticket?component=libraries/hoopl
+Bug-Reports:         https://github.com/haskell/hoopl/issues/
 Build-Type:          Simple
 Cabal-Version:       >=1.10
 Synopsis:            A library to support dataflow analysis and optimization


From git at git.haskell.org  Mon Dec 21 22:13:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:46 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Squashed commit of the following:
 (9d82c8b)
Message-ID: <20151221221346.72CF43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/9d82c8be0dbd677f31b38e7fae70f24385f2d571

>---------------------------------------------------------------

commit 9d82c8be0dbd677f31b38e7fae70f24385f2d571
Author: Ning Wang <email at ningwang.org>
Date:   Sat Aug 8 20:33:43 2015 -0700

    Squashed commit of the following:
    
        1. update changelog.md
        2. bump up the minior version number


>---------------------------------------------------------------

9d82c8be0dbd677f31b38e7fae70f24385f2d571
 changelog.md |  6 +++++-
 hoopl.cabal  | 12 ++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/changelog.md b/changelog.md
index b8a6d5c..336df98 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,6 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
-## 3.10.1.1 *Apr 2015*
+## 3.10.1.1 *Aug 2015*
 
  - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
 
@@ -10,6 +10,10 @@
  
  - Unhide gSplice of Hoopl.Graph
 
+ - Expose Showing of Hoopl.Show
+
+ - Some fixes of testing
+
 ## 3.10.1.0 *Apr 2015*
 
  - Re-export runWithFuel from Compiler.Hoopl.
diff --git a/hoopl.cabal b/hoopl.cabal
index 60587c3..8a549f8 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,5 +1,5 @@
 Name:                hoopl
-Version:             3.10.1.0
+Version:             3.10.2.0
 -- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library
@@ -24,10 +24,9 @@ Source-repository head
   Type:       git
   Location:   http://git.haskell.org/packages/hoopl.git
 
-flag testcoverage {
+flag testcoverage 
   description: Enable test coverage report
   default: False
-}
 
 
 Library
@@ -85,7 +84,8 @@ Test-Suite hoopl-test
                      mtl >= 2.1.3.1,
                      parsec >= 3.1.7,
                      test-framework < 0.9,
-                     test-framework-hunit < 0.4
-  if flag(testcoverage) {
+                     test-framework-hunit < 0.4,
+                     mtl >= 2.1.3.1
+
+  if flag(testcoverage) 
     Ghc-Options: -fhpc
-  }


From git at git.haskell.org  Mon Dec 21 22:13:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:48 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Rewrite Applicative/Monad instances
 into normal-form (20fad2e)
Message-ID: <20151221221348.7A6F83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/20fad2ed91cd78ed8b9bd92aae1ecfdfb8350d2f

>---------------------------------------------------------------

commit 20fad2ed91cd78ed8b9bd92aae1ecfdfb8350d2f
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Oct 17 19:33:35 2015 +0200

    Rewrite Applicative/Monad instances into normal-form
    
    I.e. make sure `return` is defined in terms of `pure` rather than the
    other way round.


>---------------------------------------------------------------

20fad2ed91cd78ed8b9bd92aae1ecfdfb8350d2f
 src/Compiler/Hoopl/Fuel.hs   | 8 ++++----
 src/Compiler/Hoopl/Graph.hs  | 4 ++--
 src/Compiler/Hoopl/Unique.hs | 8 ++++----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/Compiler/Hoopl/Fuel.hs b/src/Compiler/Hoopl/Fuel.hs
index da6d490..5916200 100644
--- a/src/Compiler/Hoopl/Fuel.hs
+++ b/src/Compiler/Hoopl/Fuel.hs
@@ -64,11 +64,11 @@ instance Monad m => Functor (CheckingFuelMonad m) where
   fmap  = liftM
 
 instance Monad m => Applicative (CheckingFuelMonad m) where
-  pure  = return
+  pure a = FM (\f -> return (a, f))
   (<*>) = ap
 
 instance Monad m => Monad (CheckingFuelMonad m) where
-  return a = FM (\f -> return (a, f))
+  return = pure
   fm >>= k = FM (\f -> do { (a, f') <- unFM fm f; unFM (k a) f' })
 
 instance CheckpointMonad m => CheckpointMonad (CheckingFuelMonad m) where
@@ -96,11 +96,11 @@ instance Monad m => Functor (InfiniteFuelMonad m) where
   fmap  = liftM
 
 instance Monad m => Applicative (InfiniteFuelMonad m) where
-  pure  = return
+  pure a = IFM $ return a
   (<*>) = ap
 
 instance Monad m => Monad (InfiniteFuelMonad m) where
-  return a = IFM $ return a
+  return = pure
   m >>= k  = IFM $ do { a <- unIFM m; unIFM (k a) }
 
 instance UniqueMonad m => UniqueMonad (InfiniteFuelMonad m) where
diff --git a/src/Compiler/Hoopl/Graph.hs b/src/Compiler/Hoopl/Graph.hs
index 80add5c..3d9831a 100644
--- a/src/Compiler/Hoopl/Graph.hs
+++ b/src/Compiler/Hoopl/Graph.hs
@@ -358,11 +358,11 @@ instance Functor VM where
   fmap  = liftM
 
 instance Applicative VM where
-  pure  = return
+  pure a = VM $ \visited -> (a, visited)
   (<*>) = ap
 
 instance Monad VM where
-  return a = VM $ \visited -> (a, visited)
+  return = pure
   m >>= k  = VM $ \visited -> let (a, v') = unVM m visited in unVM (k a) v'
 
 marked :: Label -> VM Bool
diff --git a/src/Compiler/Hoopl/Unique.hs b/src/Compiler/Hoopl/Unique.hs
index 0744f3d..5727fb4 100644
--- a/src/Compiler/Hoopl/Unique.hs
+++ b/src/Compiler/Hoopl/Unique.hs
@@ -123,11 +123,11 @@ instance Functor SimpleUniqueMonad where
   fmap = liftM
 
 instance Applicative SimpleUniqueMonad where
-  pure  = return
+  pure a = SUM $ \us -> (a, us)
   (<*>) = ap
 
 instance Monad SimpleUniqueMonad where
-  return a = SUM $ \us -> (a, us)
+  return = pure
   m >>= k  = SUM $ \us -> let (a, us') = unSUM m us in
                               unSUM (k a) us'
 
@@ -152,11 +152,11 @@ instance Monad m => Functor (UniqueMonadT m) where
   fmap  = liftM
 
 instance Monad m => Applicative (UniqueMonadT m) where
-  pure  = return
+  pure a = UMT $ \us -> return (a, us)
   (<*>) = ap
 
 instance Monad m => Monad (UniqueMonadT m) where
-  return a = UMT $ \us -> return (a, us)
+  return = pure
   m >>= k  = UMT $ \us -> do { (a, us') <- unUMT m us; unUMT (k a) us' }
 
 instance Monad m => UniqueMonad (UniqueMonadT m) where


From git at git.haskell.org  Mon Dec 21 22:13:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:50 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Relax upper bound on `base` to allow
 base-4.9 (d72c509)
Message-ID: <20151221221350.80BEA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/d72c509927e60c9ca487d2fb85af4ea0702ebfe7

>---------------------------------------------------------------

commit d72c509927e60c9ca487d2fb85af4ea0702ebfe7
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Oct 31 11:51:05 2015 +0100

    Relax upper bound on `base` to allow base-4.9
    
    GHC 8.0 is going to ship with base-4.9.0.0


>---------------------------------------------------------------

d72c509927e60c9ca487d2fb85af4ea0702ebfe7
 hoopl.cabal | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hoopl.cabal b/hoopl.cabal
index 8a549f8..732d8c2 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -45,7 +45,7 @@ Library
     Other-Extensions: Safe Trustworthy
 
   Hs-Source-Dirs:    src
-  Build-Depends:     base >= 4.3 && < 4.9, containers >= 0.4 && < 0.6
+  Build-Depends:     base >= 4.3 && < 4.10, containers >= 0.4 && < 0.6
   Exposed-Modules:   Compiler.Hoopl,
                      Compiler.Hoopl.Internals,
                      Compiler.Hoopl.Wrappers,
@@ -78,7 +78,7 @@ Test-Suite hoopl-test
   Type:              exitcode-stdio-1.0
   Main-Is:           Main.hs
   Hs-Source-Dirs:    testing src
-  Build-Depends:     base >= 4.3 && < 4.9, 
+  Build-Depends:     base >= 4.3 && < 4.10, 
                      containers >= 0.4 && < 0.6,
                      filepath,
                      mtl >= 2.1.3.1,


From git at git.haskell.org  Mon Dec 21 22:13:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:52 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Get rid of `#if CABAL` conditionals
 (8b2e414)
Message-ID: <20151221221352.8892A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/8b2e4142eb9dfb6f996204ec5613c6b1453a8cd3

>---------------------------------------------------------------

commit 8b2e4142eb9dfb6f996204ec5613c6b1453a8cd3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sat Oct 31 12:18:37 2015 +0100

    Get rid of `#if CABAL` conditionals
    
    Those were introduced via 814d4ef37ef3b5f2dfeddced3875cbd3e8b375b1
    but there's actually a more elegant way to avoid redundant imports
    in combination with MRP-style refactoring
    (as started in 20fad2ed91cd78ed8b9bd92aae1ecfdfb8350d2f)


>---------------------------------------------------------------

8b2e4142eb9dfb6f996204ec5613c6b1453a8cd3
 changelog.md                 |  4 ++++
 src/Compiler/Hoopl/Fuel.hs   | 11 ++---------
 src/Compiler/Hoopl/Graph.hs  | 10 ++--------
 src/Compiler/Hoopl/Unique.hs | 11 ++---------
 testing/Ast2ir.hs            | 17 +++++------------
 testing/EvalMonad.hs         | 16 ++++------------
 testing/OptSupport.hs        | 15 +++++----------
 7 files changed, 24 insertions(+), 60 deletions(-)

diff --git a/changelog.md b/changelog.md
index 336df98..5603e4b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,9 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
+## ...
+
+ - replace `#if CABAL` macro by no CPP at all
+
 ## 3.10.1.1 *Aug 2015*
 
  - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
diff --git a/src/Compiler/Hoopl/Fuel.hs b/src/Compiler/Hoopl/Fuel.hs
index 5916200..66743de 100644
--- a/src/Compiler/Hoopl/Fuel.hs
+++ b/src/Compiler/Hoopl/Fuel.hs
@@ -21,14 +21,7 @@ where
 import Compiler.Hoopl.Checkpoint
 import Compiler.Hoopl.Unique
 
-#if CABAL
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative (Applicative(..))
-#endif
-#else
-import Control.Applicative (Applicative(..))
-#endif
-
+import Control.Applicative as AP (Applicative(..))
 import Control.Monad (ap,liftM)
 
 class Monad m => FuelMonad m where
@@ -68,7 +61,7 @@ instance Monad m => Applicative (CheckingFuelMonad m) where
   (<*>) = ap
 
 instance Monad m => Monad (CheckingFuelMonad m) where
-  return = pure
+  return = AP.pure
   fm >>= k = FM (\f -> do { (a, f') <- unFM fm f; unFM (k a) f' })
 
 instance CheckpointMonad m => CheckpointMonad (CheckingFuelMonad m) where
diff --git a/src/Compiler/Hoopl/Graph.hs b/src/Compiler/Hoopl/Graph.hs
index 3d9831a..9c1cc3c 100644
--- a/src/Compiler/Hoopl/Graph.hs
+++ b/src/Compiler/Hoopl/Graph.hs
@@ -46,13 +46,7 @@ import Compiler.Hoopl.Collections
 import Compiler.Hoopl.Block
 import Compiler.Hoopl.Label
 
-#if CABAL
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative (Applicative(..))
-#endif
-#else
-import Control.Applicative (Applicative(..))
-#endif
+import Control.Applicative as AP (Applicative(..))
 import Control.Monad (ap,liftM,liftM2)
 
 -- -----------------------------------------------------------------------------
@@ -362,7 +356,7 @@ instance Applicative VM where
   (<*>) = ap
 
 instance Monad VM where
-  return = pure
+  return = AP.pure
   m >>= k  = VM $ \visited -> let (a, v') = unVM m visited in unVM (k a) v'
 
 marked :: Label -> VM Bool
diff --git a/src/Compiler/Hoopl/Unique.hs b/src/Compiler/Hoopl/Unique.hs
index 5727fb4..79a7c7c 100644
--- a/src/Compiler/Hoopl/Unique.hs
+++ b/src/Compiler/Hoopl/Unique.hs
@@ -24,14 +24,7 @@ import Compiler.Hoopl.Collections
 import qualified Data.IntMap as M
 import qualified Data.IntSet as S
 
-#ifdef CABAL
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative
-#endif
-#else
-import Control.Applicative
-#endif
-
+import Control.Applicative as AP
 import Control.Monad (ap,liftM)
 
 -----------------------------------------------------------------------------
@@ -127,7 +120,7 @@ instance Applicative SimpleUniqueMonad where
   (<*>) = ap
 
 instance Monad SimpleUniqueMonad where
-  return = pure
+  return = AP.pure
   m >>= k  = SUM $ \us -> let (a, us') = unSUM m us in
                               unSUM (k a) us'
 
diff --git a/testing/Ast2ir.hs b/testing/Ast2ir.hs
index cda8435..380abf5 100644
--- a/testing/Ast2ir.hs
+++ b/testing/Ast2ir.hs
@@ -1,5 +1,5 @@
 {-# OPTIONS_GHC -Wall #-}
-{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns #-}
 module Ast2ir (astToIR, IdLabelMap) where
 
 
@@ -8,13 +8,7 @@ import qualified Compiler.Hoopl as H ((<*>))
 import           Control.Monad
 import qualified Data.Map       as M
 
-#if CABAL
-#if !MIN_VERSION_base(4,8,0)
-import qualified Control.Applicative as AP (Applicative(..))
-#endif
-#else
-import qualified Control.Applicative as AP (Applicative(..))
-#endif
+import           Control.Applicative as AP (Applicative(..))
 
 import qualified Ast as A
 import qualified IR  as I
@@ -79,7 +73,7 @@ type IdLabelMap = M.Map String Label
 data LabelMapM a = LabelMapM (IdLabelMap -> I.M (IdLabelMap, a))
 
 instance Monad LabelMapM where
-  return x = LabelMapM (\m -> return (m, x))
+  return = AP.pure
   LabelMapM f1 >>= k = LabelMapM (\m -> do (m', x) <- f1 m
                                            let (LabelMapM f2) = k x
                                            f2 m')
@@ -87,11 +81,10 @@ instance Monad LabelMapM where
 instance Functor LabelMapM where
   fmap = liftM
 
-instance AP.Applicative LabelMapM where
-  pure = return
+instance Applicative LabelMapM where
+  pure x = LabelMapM (\m -> return (m, x))
   (<*>) = ap
 
-
 labelFor l = LabelMapM f
   where f m = case M.lookup l m of
                 Just l' -> return (m, l')
diff --git a/testing/EvalMonad.hs b/testing/EvalMonad.hs
index c6efc9b..4ea5f0e 100644
--- a/testing/EvalMonad.hs
+++ b/testing/EvalMonad.hs
@@ -1,23 +1,16 @@
 {-# OPTIONS_GHC -Wall #-}
-{-# LANGUAGE CPP, RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
+{-# LANGUAGE RankNTypes, ScopedTypeVariables, GADTs, EmptyDataDecls, PatternGuards, TypeFamilies, NamedFieldPuns , FlexibleInstances, MultiParamTypeClasses, TypeSynonymInstances #-}
 
 module EvalMonad (ErrorM, VarEnv, B, State,
                   EvalM, runProg, inNewFrame, get_proc, get_block,
                          get_var, set_var, get_heap, set_heap,
                   Event (..), event) where
 
+import Control.Applicative as AP (Applicative(..))
 import Control.Monad.Except
 import qualified Data.Map as M
 import Prelude hiding (succ)
 
-#if CABAL
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative (Applicative(..))
-#endif
-#else
-import Control.Applicative (Applicative(..))
-#endif
-
 import Compiler.Hoopl hiding ((<*>))
 import IR
 
@@ -27,7 +20,7 @@ type InnerErrorM v = Either (State v, String)
 data EvalM v a = EvalM (State v -> InnerErrorM v (State v, a))
 
 instance Monad (EvalM v) where
-  return x = EvalM (\s -> return (s, x))
+  return = AP.pure
   EvalM f >>= k = EvalM $ \s -> do (s', x) <- f s
                                    let EvalM f' = k x
                                    f' s'
@@ -36,10 +29,9 @@ instance Functor (EvalM v) where
   fmap = liftM
 
 instance Applicative (EvalM v) where
-  pure = return
+  pure x = EvalM (\s -> return (s, x))
   (<*>) = ap
 
-
 instance MonadError String (EvalM v) where
   throwError e = EvalM (\s -> throwError (s, e))
   catchError (EvalM f) handler =
diff --git a/testing/OptSupport.hs b/testing/OptSupport.hs
index cb9826d..663400b 100644
--- a/testing/OptSupport.hs
+++ b/testing/OptSupport.hs
@@ -6,14 +6,7 @@ import Control.Monad
 import Data.Maybe
 import Prelude hiding (succ)
 
-#if CABAL
-#if !MIN_VERSION_base(4,8,0)
-import Control.Applicative (Applicative(..))
-#endif
-#else
-import Control.Applicative (Applicative(..))
-#endif
-
+import Control.Applicative as AP (Applicative(..))
 import Compiler.Hoopl hiding ((<*>))
 import IR
 
@@ -35,8 +28,10 @@ mapVE _ _       = Nothing
 
 
 data Mapped a = Old a | New a
+
 instance Monad Mapped where
-  return = Old
+  return = AP.pure
+
   Old a >>= k = k a
   New a >>= k = asNew (k a)
     where asNew (Old a)   = New a
@@ -46,7 +41,7 @@ instance Functor Mapped where
   fmap = liftM
 
 instance Applicative Mapped where
-  pure = return
+  pure = Old
   (<*>) = ap
 
 


From git at git.haskell.org  Mon Dec 21 22:13:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:54 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Merge pull request #18 from
 hvr/pr/de-cpp (84255f0)
Message-ID: <20151221221354.8E7373A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/84255f0fe07f3fd1f5bc96e60b64c582394edcf1

>---------------------------------------------------------------

commit 84255f0fe07f3fd1f5bc96e60b64c582394edcf1
Merge: d72c509 8b2e414
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 10:47:05 2015 +0100

    Merge pull request #18 from hvr/pr/de-cpp
    
    Get rid of `#if CABAL` conditionals again



>---------------------------------------------------------------

84255f0fe07f3fd1f5bc96e60b64c582394edcf1
 changelog.md                 |  4 ++++
 src/Compiler/Hoopl/Fuel.hs   | 11 ++---------
 src/Compiler/Hoopl/Graph.hs  | 10 ++--------
 src/Compiler/Hoopl/Unique.hs | 11 ++---------
 testing/Ast2ir.hs            | 17 +++++------------
 testing/EvalMonad.hs         | 16 ++++------------
 testing/OptSupport.hs        | 15 +++++----------
 7 files changed, 24 insertions(+), 60 deletions(-)


From git at git.haskell.org  Mon Dec 21 22:13:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:56 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Guard redundant equations (5405469)
Message-ID: <20151221221356.95F3F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/5405469b2357580a653ceb41c15c33091b2d1a06

>---------------------------------------------------------------

commit 5405469b2357580a653ceb41c15c33091b2d1a06
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 13:45:07 2015 -0500

    Guard redundant equations
    
    GHC's exhaustiveness checker used to be quite rudimentary. As of GHC
    8.0 we have a new exhaustiveness checker which correctly recognizes the
    cases covered by these equations as invalid.


>---------------------------------------------------------------

5405469b2357580a653ceb41c15c33091b2d1a06
 src/Compiler/Hoopl/Dataflow.hs | 4 ++++
 src/Compiler/Hoopl/Graph.hs    | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/src/Compiler/Hoopl/Dataflow.hs b/src/Compiler/Hoopl/Dataflow.hs
index d798f82..ca5eb8c 100644
--- a/src/Compiler/Hoopl/Dataflow.hs
+++ b/src/Compiler/Hoopl/Dataflow.hs
@@ -247,7 +247,9 @@ arfGraph pass at FwdPass { fp_lattice = lattice,
                 -> Fact e f -> m (DG f n e C, Fact C f)
              c NothingC (JustO entry)   = block entry `cat` body (successors entry) bdy
              c (JustC entries) NothingO = body entries bdy
+#if __GLASGOW_HASKELL__ < 711
              c _ _ = error "bogus GADT pattern match failure"
+#endif
 
     -- Lift from nodes to blocks
 -- @ start block.tex -2
@@ -439,7 +441,9 @@ arbGraph pass at BwdPass { bp_lattice  = lattice,
                 -> Fact C f -> m (DG f n e C, Fact e f)
              c NothingC (JustO entry)   = block entry `cat` body (successors entry) bdy
              c (JustC entries) NothingO = body entries bdy
+#if __GLASGOW_HASKELL__ < 711
              c _ _ = error "bogus GADT pattern match failure"
+#endif
 
     -- Lift from nodes to blocks
     block BNil          = \f -> return (dgnil, f)
diff --git a/src/Compiler/Hoopl/Graph.hs b/src/Compiler/Hoopl/Graph.hs
index 9c1cc3c..c0e6b04 100644
--- a/src/Compiler/Hoopl/Graph.hs
+++ b/src/Compiler/Hoopl/Graph.hs
@@ -193,7 +193,9 @@ splice bcat = sp
         sp (GMany e1 b1 NothingO) (GMany NothingO b2 x2)
           = {-# SCC "sp5" #-} (GMany e1 $! b1 `bodyUnion` b2) x2
 
+#if __GLASGOW_HASKELL__ < 711
         sp _ _ = error "bogus GADT match failure"
+#endif
 
 gSplice :: NonLocal n => Graph n e a -> Graph n a x -> Graph n e x
 gSplice = splice blockAppend


From git at git.haskell.org  Mon Dec 21 22:13:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:13:58 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Merge pull request #19 from
 bgamari/master (d829642)
Message-ID: <20151221221358.9D6B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/d829642b40abaa351646879c6f7ebefac84c2f39

>---------------------------------------------------------------

commit d829642b40abaa351646879c6f7ebefac84c2f39
Merge: 84255f0 5405469
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 3 21:16:16 2015 +0100

    Merge pull request #19 from bgamari/master
    
    Guard redundant equations



>---------------------------------------------------------------

d829642b40abaa351646879c6f7ebefac84c2f39
 src/Compiler/Hoopl/Dataflow.hs | 4 ++++
 src/Compiler/Hoopl/Graph.hs    | 2 ++
 2 files changed, 6 insertions(+)


From git at git.haskell.org  Mon Dec 21 22:14:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:14:00 +0000 (UTC)
Subject: [commit: packages/hoopl] master: Prefix unused type variables with an
 underscore. (b4f4761)
Message-ID: <20151221221400.A34723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/b4f47611084f9e22aeecb4d49659e900848e157e

>---------------------------------------------------------------

commit b4f47611084f9e22aeecb4d49659e900848e157e
Author: Micha? So?nicki <sosnicki.michal at gmail.com>
Date:   Mon Dec 7 00:41:55 2015 +0100

    Prefix unused type variables with an underscore.


>---------------------------------------------------------------

b4f47611084f9e22aeecb4d49659e900848e157e
 src/Compiler/Hoopl/Block.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Compiler/Hoopl/Block.hs b/src/Compiler/Hoopl/Block.hs
index de3b4c3..92ee28d 100644
--- a/src/Compiler/Hoopl/Block.hs
+++ b/src/Compiler/Hoopl/Block.hs
@@ -58,8 +58,8 @@ data C
 
 -- | Either type indexed by closed/open using type families
 type family IndexedCO ex a b :: *
-type instance IndexedCO C a b = a
-type instance IndexedCO O a b = b
+type instance IndexedCO C a _b = a
+type instance IndexedCO O _a b = b
 
 -- | Maybe type indexed by open/closed
 data MaybeO ex t where


From git at git.haskell.org  Mon Dec 21 22:14:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:14:02 +0000 (UTC)
Subject: [commit: packages/hoopl] master: documents the changes for 3.10.2.1
 release, and bump up the version # (b4477e8)
Message-ID: <20151221221402.A9D193A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hoopl

On branch  : master
Link       : http://git.haskell.org/packages/hoopl.git/commitdiff/b4477e825a93373124ec5cf29b9850df9608f5bd

>---------------------------------------------------------------

commit b4477e825a93373124ec5cf29b9850df9608f5bd
Author: Ning Wang <email at ningwang.org>
Date:   Mon Dec 21 13:53:38 2015 -0800

    documents the changes for 3.10.2.1 release, and bump up the version #


>---------------------------------------------------------------

b4477e825a93373124ec5cf29b9850df9608f5bd
 changelog.md | 15 ++++++++++++---
 hoopl.cabal  |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/changelog.md b/changelog.md
index 5603e4b..8685e9b 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,10 +1,19 @@
 # Changelog for [`hoopl` package](http://hackage.haskell.org/package/hoopl)
 
-## ...
+## 3.10.2.1 *Dec 2015*
+  This release includes only non-functional changes.
 
- - replace `#if CABAL` macro by no CPP at all
+ - Rewrite Applicative/Monad instances into normal-form
 
-## 3.10.1.1 *Aug 2015*
+ - Relax the upper bound constraint of base to include 4.9
+
+ - Replace `#if CABAL` macro by no CPP at all
+
+ - Wrap redudant wild card pattens in conditional compilation 
+
+ - Prefix unused type variables with underscores. 
+
+## 3.10.2.0 *Aug 2015*
 
  - Add #if CABAL macro to several hoopl source files such that the Cabal generated macro is not included when building in ghci
 
diff --git a/hoopl.cabal b/hoopl.cabal
index 732d8c2..ccbe486 100644
--- a/hoopl.cabal
+++ b/hoopl.cabal
@@ -1,5 +1,5 @@
 Name:                hoopl
-Version:             3.10.2.0
+Version:             3.10.2.1
 -- NOTE: Don't forget to update ./changelog.md
 Description:
   Higher-order optimization library


From git at git.haskell.org  Mon Dec 21 22:16:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 21 Dec 2015 22:16:40 +0000 (UTC)
Subject: [commit: ghc] master: Update hoopl submodule to final 3.10.2.1
 release (c12fc2e)
Message-ID: <20151221221640.800B93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c12fc2e68d0781c82241fb895f6022518321b5ad/ghc

>---------------------------------------------------------------

commit c12fc2e68d0781c82241fb895f6022518321b5ad
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 23:14:19 2015 +0100

    Update hoopl submodule to final 3.10.2.1 release
    
    This is the designated release to go with GHC 8.0.1
    
    /cc @mlite


>---------------------------------------------------------------

c12fc2e68d0781c82241fb895f6022518321b5ad
 libraries/hoopl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/hoopl b/libraries/hoopl
index b4f4761..b4477e8 160000
--- a/libraries/hoopl
+++ b/libraries/hoopl
@@ -1 +1 @@
-Subproject commit b4f47611084f9e22aeecb4d49659e900848e157e
+Subproject commit b4477e825a93373124ec5cf29b9850df9608f5bd


From git at git.haskell.org  Tue Dec 22 05:21:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 05:21:08 +0000 (UTC)
Subject: [commit: ghc] master: Fix GHCi segfault in Windows 32bit (aa7fb9a)
Message-ID: <20151222052108.2851E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/aa7fb9a64da740eb42e56e085adc445f0103e743/ghc

>---------------------------------------------------------------

commit aa7fb9a64da740eb42e56e085adc445f0103e743
Author: Tamar Christina <tamar at zhox.com>
Date:   Mon Dec 21 21:02:46 2015 +0100

    Fix GHCi segfault in Windows 32bit
    
    Summary:
    Add missing calling convention to function pointer,
    incorrect `cdecl` calling convention which should be `stdcall`
    on x86 was causing the stack to be corrupted. When it tried to
    return from the function the return pointer would be invalid.
    
    Test Plan: ./validate
    
    Reviewers: austin, erikd, bgamari, thomie
    
    Reviewed By: bgamari, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1683
    
    GHC Trac Issues: #11234


>---------------------------------------------------------------

aa7fb9a64da740eb42e56e085adc445f0103e743
 rts/Linker.c | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 7ca7e94..a082ba7 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -242,8 +242,8 @@ static void machoInitSymbolsWithoutUnderscore( void );
 
 #if defined(OBJFORMAT_PEi386)
 // MingW-w64 is missing these from the implementation. So we have to look them up
-typedef DLL_DIRECTORY_COOKIE(*LPAddDLLDirectory)(PCWSTR NewDirectory);
-typedef WINBOOL(*LPRemoveDLLDirectory)(DLL_DIRECTORY_COOKIE Cookie);
+typedef DLL_DIRECTORY_COOKIE(WINAPI *LPAddDLLDirectory)(PCWSTR NewDirectory);
+typedef WINBOOL(WINAPI *LPRemoveDLLDirectory)(DLL_DIRECTORY_COOKIE Cookie);
 #endif
 
 static void freeProddableBlocks (ObjectCode *oc);
@@ -920,7 +920,6 @@ error:
 */
 pathchar* findSystemLibrary(pathchar* dll_name)
 {
-
     IF_DEBUG(linker, debugBelch("\nfindSystemLibrary: dll_name = `%" PATH_FMT "'\n", dll_name));
 
 #if defined(OBJFORMAT_PEi386)
@@ -941,7 +940,6 @@ pathchar* findSystemLibrary(pathchar* dll_name)
     }
 
     return result;
-
 #else
     (void)(dll_name); // Function not implemented for other platforms.
     return NULL;
@@ -1064,9 +1062,7 @@ HsBool removeLibrarySearchPath(HsPtr dll_path_index)
         else
         {
             warnMissingKBLibraryPaths();
-
             result = SetEnvironmentVariableW(L"PATH", (LPCWSTR)dll_path_index);
-
             free(dll_path_index);
         }
 


From git at git.haskell.org  Tue Dec 22 08:11:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 08:11:52 +0000 (UTC)
Subject: [commit: ghc] master: Make HsAppsType contents Located (ff92395)
Message-ID: <20151222081152.4801D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff923954023bb35012c398cc8c3156257c10546b/ghc

>---------------------------------------------------------------

commit ff923954023bb35012c398cc8c3156257c10546b
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Mon Dec 21 22:30:45 2015 +0200

    Make HsAppsType contents Located
    
    An HsAppInfix can carry a qconop/varop preceded by a SIMPLEQUOTE as a
    Located RdrName.
    
    In this case AnnSimpleQuote is attached to the Located HsAppType.
    
        | SIMPLEQUOTE qconop            {% ams (sLL $1 $> $ HsAppInfix $2)
                                               [mj AnnSimpleQuote $1] }
        | SIMPLEQUOTE varop             {% ams (sLL $1 $> $ HsAppInfix $2)
                                               [mj AnnSimpleQuote $1] }
    
    This patch changes
    
        data HsType name
          ...
          | HsAppsTy [HsAppType name]
    
    to
    
        data HsType name
          ...
          | HsAppsTy [LHsAppType name]
    
    so that the annotation is not discarded when it reaches the ParsedSource


>---------------------------------------------------------------

ff923954023bb35012c398cc8c3156257c10546b
 compiler/hsSyn/Convert.hs                          |  6 +++---
 compiler/hsSyn/HsTypes.hs                          | 21 ++++++++++++---------
 compiler/hsSyn/HsUtils.hs                          | 12 +++++++-----
 compiler/parser/Parser.y                           |  8 ++++----
 compiler/parser/RdrHsSyn.hs                        | 20 ++++++++++++--------
 compiler/rename/RnNames.hs                         |  4 +++-
 compiler/rename/RnTypes.hs                         | 11 ++++++-----
 testsuite/tests/ghc-api/landmines/landmines.stdout |  4 ++--
 8 files changed, 49 insertions(+), 37 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ff923954023bb35012c398cc8c3156257c10546b

From git at git.haskell.org  Tue Dec 22 08:49:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 08:49:09 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule to latest snapshot
 (44de66b)
Message-ID: <20151222084909.8CFDF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/44de66b644221f6e60611e87b52c89749d45ab80/ghc

>---------------------------------------------------------------

commit 44de66b644221f6e60611e87b52c89749d45ab80
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 22 09:16:12 2015 +0100

    Update Cabal submodule to latest snapshot
    
    The addition of several new Semigroup instances caused
    a Haddock allocation increase.


>---------------------------------------------------------------

44de66b644221f6e60611e87b52c89749d45ab80
 libraries/Cabal                    | 2 +-
 testsuite/tests/perf/haddock/all.T | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 50ccb66..679812d 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 50ccb668e866ccbe35a1982bf81750cec7aea382
+Subproject commit 679812d2b679af952a7c9ab45a9a3a3476874a07
diff --git a/testsuite/tests/perf/haddock/all.T b/testsuite/tests/perf/haddock/all.T
index d8f75eb..5a99333 100644
--- a/testsuite/tests/perf/haddock/all.T
+++ b/testsuite/tests/perf/haddock/all.T
@@ -50,7 +50,7 @@ test('haddock.base',
 test('haddock.Cabal',
      [unless(in_tree_compiler(), skip), req_haddock
      ,stats_num_field('bytes allocated',
-          [(wordsize(64), 9982130512, 5)
+          [(wordsize(64), 10519532424, 5)
             # 2012-08-14: 3255435248 (amd64/Linux)
             # 2012-08-29: 3324606664 (amd64/Linux, new codegen)
             # 2012-10-08: 3373401360 (amd64/Linux)
@@ -73,6 +73,7 @@ test('haddock.Cabal',
             # 2015-06-29: 7413958344 (x86_64/Linux) - due to #10482, not yet investigated
             # 2015-12-11: 8114833312 (amd64/Linux) - TypeInType (See #11196)
             # 2015-12-17: 9982130512 (amd64/Linux) - Update Haddock to master
+            # 2015-12-22: 10519532424 (amd64/Linux) - Lots of new Semigroup instances in Cabal
 
           ,(platform('i386-unknown-mingw32'), 3293415576, 5)
             # 2012-10-30:                     1733638168 (x86/Windows)


From git at git.haskell.org  Tue Dec 22 10:04:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 10:04:10 +0000 (UTC)
Subject: [commit: ghc] master: Comments only, about coercion holes (ea3f733)
Message-ID: <20151222100410.4F8173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ea3f733a24840c0d9d9a89b85e2699fabb633a8f/ghc

>---------------------------------------------------------------

commit ea3f733a24840c0d9d9a89b85e2699fabb633a8f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 10:03:14 2015 +0000

    Comments only, about coercion holes
    
    Richard, pls take a look


>---------------------------------------------------------------

ea3f733a24840c0d9d9a89b85e2699fabb633a8f
 compiler/typecheck/TcRnTypes.hs |   1 +
 compiler/types/TyCoRep.hs       | 272 ++++++++++++++++++++++++----------------
 2 files changed, 167 insertions(+), 106 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc ea3f733a24840c0d9d9a89b85e2699fabb633a8f

From git at git.haskell.org  Tue Dec 22 11:48:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 11:48:53 +0000 (UTC)
Subject: [commit: ghc] master: Retain AnnTilde in splitTildeApps (b407bd7)
Message-ID: <20151222114853.DFE433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b407bd775d9241023b4694b3142a756df0082ea2/ghc

>---------------------------------------------------------------

commit b407bd775d9241023b4694b3142a756df0082ea2
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Tue Dec 22 12:35:22 2015 +0200

    Retain AnnTilde in splitTildeApps
    
    splitTildeApps can introduce a new HsAppInfix for a tilde, with a fresh
    SrcSpan, disconnecting its existing AnnTilde API Annotation.
    
    A tilde needs AnnTilde to render properly, this patch adds a new one on
    the fresh SrcSpan


>---------------------------------------------------------------

b407bd775d9241023b4694b3142a756df0082ea2
 compiler/parser/Parser.y    |  3 ++-
 compiler/parser/RdrHsSyn.hs | 21 +++++++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index d6255a3..2b4e779 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -1652,7 +1652,8 @@ typedoc :: { LHsType RdrName }
 
 -- See Note [Parsing ~]
 btype :: { LHsType RdrName }
-        : tyapps                      { sL1 $1 $ HsAppsTy (splitTildeApps (reverse (unLoc $1))) }
+        : tyapps                      {%  splitTildeApps (reverse (unLoc $1)) >>=
+                                          \ts -> return $ sL1 $1 $ HsAppsTy ts }
 
 -- Used for parsing Haskell98-style data constructors,
 -- in order to forbid the blasphemous
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index c3c356a..222641b 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -93,6 +93,7 @@ import Util
 import ApiAnnotation
 import Data.List
 import qualified GHC.LanguageExtensions as LangExt
+import MonadUtils
 
 #if __GLASGOW_HASKELL__ < 709
 import Control.Applicative ((<$>))
@@ -1071,21 +1072,25 @@ splitTilde t = go t
 
 -- | Transform tyapps with strict_marks into uses of twiddle
 -- [~a, ~b, c, ~d] ==> (~a) ~ b c ~ d
-splitTildeApps :: [LHsAppType RdrName] -> [LHsAppType RdrName]
-splitTildeApps []         = []
-splitTildeApps (t : rest) = t : concatMap go rest
+splitTildeApps :: [LHsAppType RdrName] -> P [LHsAppType RdrName]
+splitTildeApps []         = return []
+splitTildeApps (t : rest) = do
+  rest' <- concatMapM go rest
+  return (t : rest')
   where go (L l (HsAppPrefix
             (L loc (HsBangTy
                     (HsSrcBang Nothing NoSrcUnpack SrcLazy)
                     ty))))
-          = [L tilde_loc (HsAppInfix (L tilde_loc eqTyCon_RDR)),
-             L l (HsAppPrefix ty)]
-             -- NOTE: no annotation is attached to an HsAppPrefix, so the
-             --       surrounding SrcSpan is not critical
+          = addAnnotation l AnnTilde l >>
+            return
+              [L tilde_loc (HsAppInfix (L tilde_loc eqTyCon_RDR)),
+               L l (HsAppPrefix ty)]
+               -- NOTE: no annotation is attached to an HsAppPrefix, so the
+               --       surrounding SrcSpan is not critical
           where
             tilde_loc = srcSpanFirstCharacter loc
 
-        go t = [t]
+        go t = return [t]
 
 
 


From git at git.haskell.org  Tue Dec 22 12:21:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 12:21:43 +0000 (UTC)
Subject: [commit: ghc] master: Rework Template Haskell's handling of
 strictness (f975b0b)
Message-ID: <20151222122143.7F9DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f975b0b10b2971d00b6e1986e0a2af2bf759a4f4/ghc

>---------------------------------------------------------------

commit f975b0b10b2971d00b6e1986e0a2af2bf759a4f4
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Tue Dec 22 11:25:59 2015 +0100

    Rework Template Haskell's handling of strictness
    
    Currently, Template Haskell's treatment of strictness is not enough to
    cover all possible combinations of unpackedness and strictness. In
    addition, it isn't equipped to deal with new features (such as
    `-XStrictData`) which can change a datatype's fields' strictness during
    compilation.
    
    To address this, I replaced TH's `Strict` datatype with
    `SourceUnpackedness` and `SourceStrictness` (which give the programmer a
    more complete toolkit to configure a datatype field's strictness than
    just `IsStrict`, `IsLazy`, and `Unpack`). I also added the ability to
    reify a constructor fields' strictness post-compilation through the
    `reifyConStrictness` function.
    
    Fixes #10697.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, goldfire, bgamari, austin
    
    Reviewed By: goldfire, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1603
    
    GHC Trac Issues: #10697


>---------------------------------------------------------------

f975b0b10b2971d00b6e1986e0a2af2bf759a4f4
 compiler/deSugar/DsMeta.hs                         |  35 +++--
 compiler/hsSyn/Convert.hs                          |  24 ++-
 compiler/prelude/THNames.hs                        |  98 ++++++++-----
 compiler/typecheck/TcSplice.hs                     |  43 ++++--
 docs/users_guide/7.12.1-notes.rst                  |   3 +
 libraries/ghci/GHCi/Message.hs                     |  29 ++--
 libraries/ghci/GHCi/TH.hs                          |   1 +
 libraries/ghci/GHCi/TH/Binary.hs                   |   5 +-
 libraries/template-haskell/Language/Haskell/TH.hs  |  16 +-
 .../template-haskell/Language/Haskell/TH/Lib.hs    |  97 +++++++-----
 .../template-haskell/Language/Haskell/TH/Ppr.hs    |  66 +++++++--
 .../template-haskell/Language/Haskell/TH/Syntax.hs | 162 ++++++++++++++-------
 libraries/template-haskell/changelog.md            |  12 ++
 .../should_run/overloadedrecfldsrun04.hs           |   5 +-
 testsuite/tests/rts/T7919A.hs                      |   4 +-
 testsuite/tests/th/T10697_decided_1.hs             |  11 ++
 testsuite/tests/th/T10697_decided_1.stdout         |   1 +
 testsuite/tests/th/T10697_decided_2.hs             |  11 ++
 testsuite/tests/th/T10697_decided_2.stdout         |   1 +
 testsuite/tests/th/T10697_decided_3.hs             |  11 ++
 testsuite/tests/th/T10697_decided_3.stdout         |   1 +
 testsuite/tests/th/T10697_source.hs                |  57 ++++++++
 .../th/{T1830_3.stdout => T10697_source.stdout}    |   2 +
 testsuite/tests/th/T10697_sourceUtil.hs            |  35 +++++
 testsuite/tests/th/T10819_Lib.hs                   |   4 +-
 testsuite/tests/th/T10828.hs                       |  20 ++-
 testsuite/tests/th/T10828a.hs                      |   9 +-
 testsuite/tests/th/T10828b.hs                      |  30 +++-
 testsuite/tests/th/T5290.hs                        |   3 +-
 testsuite/tests/th/T5290.stderr                    |  10 +-
 testsuite/tests/th/T5665a.hs                       |   4 +-
 testsuite/tests/th/T5984_Lib.hs                    |   7 +-
 testsuite/tests/th/T7532.hs                        |   2 +-
 testsuite/tests/th/T7532.stderr                    |   4 +-
 testsuite/tests/th/T7532a.hs                       |   4 +-
 testsuite/tests/th/TH_genExLib.hs                  |   3 +-
 testsuite/tests/th/all.T                           |   9 ++
 37 files changed, 615 insertions(+), 224 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f975b0b10b2971d00b6e1986e0a2af2bf759a4f4

From git at git.haskell.org  Tue Dec 22 12:55:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 12:55:42 +0000 (UTC)
Subject: [commit: packages/stm] master: Bump to version 2.4.4.1 and prepare
 for release (b49b506)
Message-ID: <20151222125543.009A73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

On branch  : master
Link       : http://git.haskell.org/packages/stm.git/commitdiff/b49b5060d5e78a9ee2fa6a069a7195654ebdf08a

>---------------------------------------------------------------

commit b49b5060d5e78a9ee2fa6a069a7195654ebdf08a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 22 13:49:22 2015 +0100

    Bump to version 2.4.4.1 and prepare for release


>---------------------------------------------------------------

b49b5060d5e78a9ee2fa6a069a7195654ebdf08a
 changelog.md |  6 ++++++
 stm.cabal    | 10 +++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/changelog.md b/changelog.md
index 92b2a7f..a08e2c5 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,5 +1,11 @@
 # Changelog for [`stm` package](http://hackage.haskell.org/package/stm)
 
+## 2.4.4.1  *Dec 2015*
+
+  * Add support for `base-4.9.0.0`
+
+  * Drop support for GHC 6.12 / `base-4.2`
+
 ## 2.4.4  *Dec 2014*
 
   * Add support for `base-4.8.0.0`
diff --git a/stm.cabal b/stm.cabal
index 9700138..9378d29 100644
--- a/stm.cabal
+++ b/stm.cabal
@@ -1,16 +1,16 @@
 name:           stm
-version:        2.4.4
+version:        2.4.4.1
 -- don't forget to update changelog.md file!
 license:        BSD3
 license-file:   LICENSE
 maintainer:     libraries at haskell.org
-bug-reports:    http://ghc.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29&keywords=stm
+bug-reports:    https://ghc.haskell.org/trac/ghc/newticket?component=libraries%20%28other%29&keywords=stm
 synopsis:       Software Transactional Memory
 category:       Concurrency
 description:    A modular composable concurrency abstraction.
 build-type:     Simple
 cabal-version:  >=1.10
-tested-with:    GHC==7.6.3, GHC==7.6.2, GHC==7.6.1, GHC==7.4.2, GHC==7.4.1, GHC==7.2.2, GHC==7.2.1, GHC==7.0.4, GHC==7.0.3, GHC==7.0.2, GHC==7.0.1, GHC==6.12.3
+tested-with:    GHC==7.10.*, GHC==7.8.*, GHC==7.6.*, GHC==7.4.*, GHC==7.2.*, GHC==7.0.*
 
 extra-source-files:
     changelog.md
@@ -20,7 +20,7 @@ source-repository head
     location: http://git.haskell.org/packages/stm.git
 
 library
-    default-language: Haskell98
+    default-language: Haskell2010
     other-extensions:
         CPP
         DeriveDataTypeable
@@ -34,7 +34,7 @@ library
         other-extensions: Safe
 
     build-depends:
-        base  >= 4.2 && < 4.10,
+        base  >= 4.3 && < 4.10,
         array >= 0.3 && < 0.6
 
     exposed-modules:


From git at git.haskell.org  Tue Dec 22 12:56:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 12:56:40 +0000 (UTC)
Subject: [commit: packages/stm] tag 'v2.4.4.1' created
Message-ID: <20151222125640.76D0D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

New tag    : v2.4.4.1
Referencing: eb1ef354ca2edb907fc46eca0d79964999ba87cd

From git at git.haskell.org  Tue Dec 22 13:00:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 13:00:38 +0000 (UTC)
Subject: [commit: ghc] master: Update stm submodule to v2.4.4.1 release
 (6eabd93)
Message-ID: <20151222130038.B20603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6eabd93d3cfaffab838830cf9a2618565ff04254/ghc

>---------------------------------------------------------------

commit 6eabd93d3cfaffab838830cf9a2618565ff04254
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 22 13:59:36 2015 +0100

    Update stm submodule to v2.4.4.1 release
    
    This `stm` release also addresses #10967


>---------------------------------------------------------------

6eabd93d3cfaffab838830cf9a2618565ff04254
 libraries/stm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/stm b/libraries/stm
index 9870cf1..b49b506 160000
--- a/libraries/stm
+++ b/libraries/stm
@@ -1 +1 @@
-Subproject commit 9870cf156e5e7e21785b236da41f2466bf9f4b29
+Subproject commit b49b5060d5e78a9ee2fa6a069a7195654ebdf08a


From git at git.haskell.org  Tue Dec 22 13:33:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 13:33:52 +0000 (UTC)
Subject: [commit: ghc] master: Fix grouping for pattern synonyms (29928f2)
Message-ID: <20151222133352.DED433A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/29928f29d53cfc7aceb7e8ab81967f784cf06159/ghc

>---------------------------------------------------------------

commit 29928f29d53cfc7aceb7e8ab81967f784cf06159
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 14:33:23 2015 +0100

    Fix grouping for pattern synonyms
    
    When grouping pattern synonyms in the desugarer, to find when a single
    match will work for the whole group, we use `Match.sameGroup`.  But this
    function was declaring two pattern-synonym matches equal to often.
    Result: Lint errors and broken semantics.
    
    The fix is easy.  See Note [Pattern synonym groups].
    
    Re-do typechecking for pattern synonym signatures
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: thomie, mpickering, simonpj
    
    Differential Revision: https://phabricator.haskell.org/D1684


>---------------------------------------------------------------

29928f29d53cfc7aceb7e8ab81967f784cf06159
 compiler/deSugar/Match.hs | 86 +++++++++++++++++++++++++++++------------------
 1 file changed, 54 insertions(+), 32 deletions(-)

diff --git a/compiler/deSugar/Match.hs b/compiler/deSugar/Match.hs
index f551fa4..b5a50e7 100644
--- a/compiler/deSugar/Match.hs
+++ b/compiler/deSugar/Match.hs
@@ -196,15 +196,15 @@ match vars@(v:_) ty eqns    -- Eqns *can* be empty
     match_group [] = panic "match_group"
     match_group eqns@((group,_) : _)
         = case group of
-            PgCon _    -> matchConFamily  vars ty (subGroup [(c,e) | (PgCon c, e) <- eqns])
-            PgSyn _    -> matchPatSyn     vars ty (dropGroup eqns)
-            PgLit _    -> matchLiterals   vars ty (subGroup [(l,e) | (PgLit l, e) <- eqns])
-            PgAny      -> matchVariables  vars ty (dropGroup eqns)
-            PgN _      -> matchNPats      vars ty (dropGroup eqns)
-            PgNpK _    -> matchNPlusKPats vars ty (dropGroup eqns)
-            PgBang     -> matchBangs      vars ty (dropGroup eqns)
-            PgCo _     -> matchCoercion   vars ty (dropGroup eqns)
-            PgView _ _ -> matchView       vars ty (dropGroup eqns)
+            PgCon {}  -> matchConFamily  vars ty (subGroup [(c,e) | (PgCon c, e) <- eqns])
+            PgSyn {}  -> matchPatSyn     vars ty (dropGroup eqns)
+            PgLit {}  -> matchLiterals   vars ty (subGroup [(l,e) | (PgLit l, e) <- eqns])
+            PgAny     -> matchVariables  vars ty (dropGroup eqns)
+            PgN {}    -> matchNPats      vars ty (dropGroup eqns)
+            PgNpK {}  -> matchNPlusKPats vars ty (dropGroup eqns)
+            PgBang    -> matchBangs      vars ty (dropGroup eqns)
+            PgCo {}   -> matchCoercion   vars ty (dropGroup eqns)
+            PgView {} -> matchView       vars ty (dropGroup eqns)
             PgOverloadedList -> matchOverloadedList vars ty (dropGroup eqns)
 
     -- FIXME: we should also warn about view patterns that should be
@@ -789,7 +789,7 @@ data PatGroup
   = PgAny               -- Immediate match: variables, wildcards,
                         --                  lazy patterns
   | PgCon DataCon       -- Constructor patterns (incl list, tuple)
-  | PgSyn PatSyn
+  | PgSyn PatSyn [Type] -- See Note [Pattern synonym groups]
   | PgLit Literal       -- Literal patterns
   | PgN   Literal       -- Overloaded literals
   | PgNpK Literal       -- n+k patterns
@@ -828,7 +828,28 @@ subGroup group
     -- pg_map :: Map a [EquationInfo]
     -- Equations seen so far in reverse order of appearance
 
-{-
+{- Note [Pattern synonym groups]
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+If we see
+  f (P a) = e1
+  f (P b) = e2
+    ...
+where P is a pattern synonym, can we put (P a -> e1) and (P b -> e2) in the
+same group?  We can if P is a constructor, but /not/ if P is a pattern synonym.
+Consider (Trac #11224)
+   -- readMaybe :: Read a => String -> Maybe a
+   pattern PRead :: Read a => () => a -> String
+   pattern PRead a <- (readMaybe -> Just a)
+
+   f (PRead (x::Int))  = e1
+   f (PRead (y::Bool)) = e2
+This is all fine: we match the string by trying to read an Int; if that
+fails we try to read a Bool. But clearly we can't combine the two into a single
+match.
+
+Conclusion: we can combine when we invoke PRead /at the same type/.  Hence
+in PgSyn we record the instantiaing types, and use them in sameGroup.
+
 Note [Take care with pattern order]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 In the subGroup function we must be very careful about pattern re-ordering,
@@ -841,14 +862,15 @@ sameGroup :: PatGroup -> PatGroup -> Bool
 -- Same group means that a single case expression
 -- or test will suffice to match both, *and* the order
 -- of testing within the group is insignificant.
-sameGroup PgAny      PgAny      = True
-sameGroup PgBang     PgBang     = True
-sameGroup (PgCon _)  (PgCon _)  = True          -- One case expression
-sameGroup (PgSyn p1) (PgSyn p2) = p1==p2
-sameGroup (PgLit _)  (PgLit _)  = True          -- One case expression
-sameGroup (PgN l1)   (PgN l2)   = l1==l2        -- Order is significant
-sameGroup (PgNpK l1) (PgNpK l2) = l1==l2        -- See Note [Grouping overloaded literal patterns]
-sameGroup (PgCo t1)  (PgCo t2)  = t1 `eqType` t2
+sameGroup PgAny         PgAny         = True
+sameGroup PgBang        PgBang        = True
+sameGroup (PgCon _)     (PgCon _)     = True    -- One case expression
+sameGroup (PgSyn p1 t1) (PgSyn p2 t2) = p1==p2 && eqTypes t1 t2
+                                                -- eqTypes: See Note [Pattern synonym groups]
+sameGroup (PgLit _)     (PgLit _)     = True    -- One case expression
+sameGroup (PgN l1)      (PgN l2)      = l1==l2  -- Order is significant
+sameGroup (PgNpK l1)    (PgNpK l2)    = l1==l2  -- See Note [Grouping overloaded literal patterns]
+sameGroup (PgCo t1)     (PgCo t2)     = t1 `eqType` t2
         -- CoPats are in the same goup only if the type of the
         -- enclosed pattern is the same. The patterns outside the CoPat
         -- always have the same type, so this boils down to saying that
@@ -956,19 +978,19 @@ viewLExprEq (e1,_) (e2,_) = lexp e1 e2
     eq_list eq (x:xs) (y:ys) = eq x y && eq_list eq xs ys
 
 patGroup :: DynFlags -> Pat Id -> PatGroup
-patGroup _      (WildPat {})                  = PgAny
-patGroup _      (BangPat {})                  = PgBang
-patGroup _      (ConPatOut { pat_con = con }) = case unLoc con of
-    RealDataCon dcon -> PgCon dcon
-    PatSynCon psyn -> PgSyn psyn
-patGroup dflags (LitPat lit)                  = PgLit (hsLitKey dflags lit)
-patGroup _      (NPat (L _ olit) mb_neg _)
-                                     = PgN   (hsOverLitKey olit (isJust mb_neg))
-patGroup _      (NPlusKPat _ (L _ olit) _ _)  = PgNpK (hsOverLitKey olit False)
-patGroup _      (CoPat _ p _)                 = PgCo  (hsPatType p) -- Type of innelexp pattern
-patGroup _      (ViewPat expr p _)            = PgView expr (hsPatType (unLoc p))
-patGroup _      (ListPat _ _ (Just _))        = PgOverloadedList
-patGroup _      pat                           = pprPanic "patGroup" (ppr pat)
+patGroup _ (ConPatOut { pat_con = L _ con
+                      , pat_arg_tys = tys })
+ | RealDataCon dcon <- con              = PgCon dcon
+ | PatSynCon psyn <- con                = PgSyn psyn tys
+patGroup _ (WildPat {})                 = PgAny
+patGroup _ (BangPat {})                 = PgBang
+patGroup _ (NPat (L _ olit) mb_neg _)   = PgN   (hsOverLitKey olit (isJust mb_neg))
+patGroup _ (NPlusKPat _ (L _ olit) _ _) = PgNpK (hsOverLitKey olit False)
+patGroup _ (CoPat _ p _)                = PgCo  (hsPatType p) -- Type of innelexp pattern
+patGroup _ (ViewPat expr p _)           = PgView expr (hsPatType (unLoc p))
+patGroup _ (ListPat _ _ (Just _))       = PgOverloadedList
+patGroup dflags (LitPat lit)            = PgLit (hsLitKey dflags lit)
+patGroup _ pat                          = pprPanic "patGroup" (ppr pat)
 
 {-
 Note [Grouping overloaded literal patterns]


From git at git.haskell.org  Tue Dec 22 13:33:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 13:33:56 +0000 (UTC)
Subject: [commit: ghc] master: Fix typechecking for pattern synonym signatures
 (f40e122)
Message-ID: <20151222133356.7816B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f40e122b7709c11d4ad20fd5cb26bf719235dbf1/ghc

>---------------------------------------------------------------

commit f40e122b7709c11d4ad20fd5cb26bf719235dbf1
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 14:33:35 2015 +0100

    Fix typechecking for pattern synonym signatures
    
    Various tickets have revealed bad shortcomings in the typechecking of
    pattern type synonyms.  Discussed a lot in (the latter part of)
    Trac #11224.
    
    This patch fixes the most complex issues:
    
    - Both parser and renamer now treat pattern synonyms as an
      ordinary LHsSigType.  Nothing special.  Hooray.
    
    - tcPatSynSig (now in TcPatSyn) typechecks the signature, and
      decomposes it into its pieces.
      See Note [Pattern synonym signatures]
    
    - tcCheckPatSyn has had a lot of refactoring.
      See Note [Checking against a pattern signature]
    
    The result is a lot tidier and more comprehensible.
    Plus, it actually works!
    
    NB: this patch doesn't actually address the precise
        target of #11224, namely "inlining pattern synonym
        does not preserve semantics".  That's an unrelated
        bug, with a separate patch.
    
    ToDo: better documentation in the user manual
    
    Test Plan: Validate
    
    Reviewers: austin, hvr, goldfire
    
    Subscribers: goldfire, mpickering, thomie, simonpj
    
    Differential Revision: https://phabricator.haskell.org/D1685
    
    GHC Trac Issues: #11224


>---------------------------------------------------------------

f40e122b7709c11d4ad20fd5cb26bf719235dbf1
 compiler/basicTypes/PatSyn.hs                      |   2 +-
 compiler/ghci/RtClosureInspect.hs                  |   2 +-
 compiler/hsSyn/HsBinds.hs                          |   9 +-
 compiler/parser/Parser.y                           |  21 +-
 compiler/typecheck/Inst.hs                         |   4 +-
 compiler/typecheck/TcBinds.hs                      |  44 +--
 compiler/typecheck/TcExpr.hs                       |   8 +-
 compiler/typecheck/TcHsType.hs                     |   4 +-
 compiler/typecheck/TcMType.hs                      |  55 +--
 compiler/typecheck/TcPat.hs                        |   6 +-
 compiler/typecheck/TcPatSyn.hs                     | 378 +++++++++++++++------
 compiler/typecheck/TcPatSyn.hs-boot                |   5 +-
 compiler/typecheck/TcRnTypes.hs                    |  13 +-
 compiler/typecheck/TcUnify.hs                      |   4 +-
 compiler/types/TyCoRep.hs                          |  29 +-
 testsuite/tests/patsyn/should_compile/MoreEx.hs    |  20 ++
 testsuite/tests/patsyn/should_compile/T11224b.hs   |  17 +
 testsuite/tests/patsyn/should_compile/all.T        |   3 +
 testsuite/tests/patsyn/should_fail/T11010.stderr   |  20 +-
 .../tests/patsyn/should_fail/T9793-fail.stderr     |   5 +-
 .../tests/patsyn/should_fail/as-pattern.stderr     |   5 +-
 testsuite/tests/patsyn/should_run/T11224.hs        |   7 +-
 testsuite/tests/patsyn/should_run/all.T            |   1 +
 23 files changed, 418 insertions(+), 244 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f40e122b7709c11d4ad20fd5cb26bf719235dbf1

From git at git.haskell.org  Tue Dec 22 14:21:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 14:21:59 +0000 (UTC)
Subject: [commit: ghc] master: Remove duplicate T11224 test definition
 (51d8330)
Message-ID: <20151222142159.CE7023A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/51d833027efcadb2a75df24e067f51860b2e82f5/ghc

>---------------------------------------------------------------

commit 51d833027efcadb2a75df24e067f51860b2e82f5
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 22 09:18:31 2015 -0500

    Remove duplicate T11224 test definition


>---------------------------------------------------------------

51d833027efcadb2a75df24e067f51860b2e82f5
 testsuite/tests/patsyn/should_run/all.T | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testsuite/tests/patsyn/should_run/all.T b/testsuite/tests/patsyn/should_run/all.T
index 618dd69..a0bd3ce 100644
--- a/testsuite/tests/patsyn/should_run/all.T
+++ b/testsuite/tests/patsyn/should_run/all.T
@@ -12,5 +12,4 @@ test('match-unboxed', normal, compile_and_run, [''])
 test('unboxed-wrapper', normal, compile_and_run, [''])
 test('records-run', normal, compile_and_run, [''])
 test('ghci', just_ghci, ghci_script, ['ghci.script'])
-test('T11224', [expect_broken(11224)], compile_and_run, [''])
 test('T11224', normal, compile_and_run, [''])


From git at git.haskell.org  Tue Dec 22 16:12:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 16:12:51 +0000 (UTC)
Subject: [commit: ghc] master: Localize API Annotation in LInjectivtyAnn
 (7966eea)
Message-ID: <20151222161251.430C03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7966eea9814bfab437e6c9ce210459e1dd936630/ghc

>---------------------------------------------------------------

commit 7966eea9814bfab437e6c9ce210459e1dd936630
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Tue Dec 22 15:12:41 2015 +0200

    Localize API Annotation in LInjectivtyAnn
    
    The injectivity_cond production in Parser.y returns the annotation for
    the '->' to the calling production, rather than applying it directly.
    
    Rather apply it directly, so LInjectivityAnn can be rendered as a unit
    from the API Annotations.


>---------------------------------------------------------------

7966eea9814bfab437e6c9ce210459e1dd936630
 compiler/parser/Parser.y | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index be36b4e..777bae0 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -940,13 +940,13 @@ overlap_pragma :: { Maybe (Located OverlapMode) }
 
 opt_injective_info :: { Located ([AddAnn], Maybe (LInjectivityAnn RdrName)) }
         : {- empty -}               { noLoc ([], Nothing) }
-        | '|' injectivity_cond      { sLL $1 $> ( mj AnnVbar $1 : fst (unLoc $2)
-                                                , Just (snd (unLoc $2))) }
+        | '|' injectivity_cond      { sLL $1 $> ([mj AnnVbar $1]
+                                                , Just ($2)) }
 
-injectivity_cond :: { Located ([AddAnn], LInjectivityAnn RdrName) }
+injectivity_cond :: { LInjectivityAnn RdrName }
         : tyvarid '->' inj_varids
-           { sLL $1 $> ( [mu AnnRarrow $2]
-                       , (sLL $1 $> (InjectivityAnn $1 (reverse (unLoc $3))))) }
+           {% ams (sLL $1 $> (InjectivityAnn $1 (reverse (unLoc $3))))
+                  [mu AnnRarrow $2] }
 
 inj_varids :: { Located [Located RdrName] }
         : inj_varids tyvarid  { sLL $1 $> ($2 : unLoc $1) }
@@ -1084,8 +1084,8 @@ opt_at_kind_inj_sig :: { Located ([AddAnn], ( LFamilyResultSig RdrName
         | '::' kind  { sLL $1 $> ( [mu AnnDcolon $1]
                                  , (sLL $2 $> (KindSig $2), Nothing)) }
         | '='  tv_bndr '|' injectivity_cond
-                { sLL $1 $> ( mj AnnEqual $1 : mj AnnVbar $3 : fst (unLoc $4)
-                            , (sLL $1 $2 (TyVarSig $2), Just (snd (unLoc $4))))}
+                { sLL $1 $> ([mj AnnEqual $1, mj AnnVbar $3]
+                            , (sLL $1 $2 (TyVarSig $2), Just $4))}
 
 -- tycl_hdr parses the header of a class or data type decl,
 -- which takes the form


From git at git.haskell.org  Tue Dec 22 16:22:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 16:22:50 +0000 (UTC)
Subject: [commit: ghc] master: Remove another duplicate test (01b0461)
Message-ID: <20151222162250.E4F7F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/01b0461e923788e825392d55d625f70c36ca3c20/ghc

>---------------------------------------------------------------

commit 01b0461e923788e825392d55d625f70c36ca3c20
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 22 17:23:31 2015 +0100

    Remove another duplicate test


>---------------------------------------------------------------

01b0461e923788e825392d55d625f70c36ca3c20
 testsuite/tests/patsyn/should_compile/all.T | 1 -
 1 file changed, 1 deletion(-)

diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index f3d90ac..074e129 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -24,7 +24,6 @@ test('T9889', normal, compile, [''])
 test('T9867', normal, compile, [''])
 test('T9975a', normal, compile_fail, [''])
 test('T9975b', normal, compile, [''])
-test('T10426', [expect_broken(10426)], compile, [''])
 test('T10747', normal, compile, [''])
 test('T10997', [extra_clean(['T10997a.hi', 'T10997a.o'])], multimod_compile, ['T10997', '-v0'])
 test('T10997_1', [extra_clean(['T10997_1a.hi', 'T10997_1a.o'])], multimod_compile, ['T10997_1', '-v0'])


From git at git.haskell.org  Tue Dec 22 17:27:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 17:27:30 +0000 (UTC)
Subject: [commit: ghc] master: Refactor named wildcards (again) (575a98e)
Message-ID: <20151222172730.099B03A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/575a98e4d245c1e60526ed6d6711d96cea08e9d2/ghc

>---------------------------------------------------------------

commit 575a98e4d245c1e60526ed6d6711d96cea08e9d2
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 16:28:50 2015 +0000

    Refactor named wildcards (again)
    
    Michal's work on #10982, #11098, refactored the handling of named
    wildcards by making them more like ordinary type variables.
    
    This patch takes the same idea to its logical conclusion, resulting
    in a much tidier, tighter implementation.
    
    Read Note [The wildcard story for types] in HsTypes.
    
    Changes:
    
     * Named wildcards are ordinary type variables, throughout
    
     * HsType no longer has a data constructor for named wildcards
       (was NamedWildCard in HsWildCardInfo).  Named wildcards are
       simply HsTyVars
    
     * Similarly named wildcards disappear from Template Haskell
    
     * I refactored RnTypes to avoid polluting LocalRdrEnv with something
       as narrow as named wildcards.  Instead the named wildcard set is
       carried in RnTyKiEnv.
    
    There is a submodule update for Haddock.


>---------------------------------------------------------------

575a98e4d245c1e60526ed6d6711d96cea08e9d2
 compiler/basicTypes/RdrName.hs                     |  32 +-
 compiler/deSugar/DsMeta.hs                         |   7 -
 compiler/hsSyn/Convert.hs                          |   6 +-
 compiler/hsSyn/HsTypes.hs                          |  83 ++-
 compiler/prelude/THNames.hs                        |   9 +-
 compiler/rename/RnSource.hs                        |   2 +-
 compiler/rename/RnTypes.hs                         | 702 ++++++++++-----------
 .../template-haskell/Language/Haskell/TH/Lib.hs    |   5 +-
 .../template-haskell/Language/Haskell/TH/Ppr.hs    |   2 +-
 .../template-haskell/Language/Haskell/TH/Syntax.hs |   2 +-
 testsuite/tests/ghci/scripts/T11098.stdout         |   2 +-
 .../tests/partial-sigs/should_compile/Splices.hs   |   4 +-
 .../partial-sigs/should_compile/SplicesUsed.hs     |   4 +-
 .../should_fail/NamedExtraConstraintsWildcard.hs   |   2 +-
 .../NamedExtraConstraintsWildcard.stderr           |  14 +-
 utils/haddock                                      |   2 +-
 16 files changed, 410 insertions(+), 468 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 575a98e4d245c1e60526ed6d6711d96cea08e9d2

From git at git.haskell.org  Tue Dec 22 19:37:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 19:37:46 +0000 (UTC)
Subject: [commit: ghc] master: APIAnnotations:AnnComma in wrong place in
 qcnames1 (721d56d)
Message-ID: <20151222193746.155E43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/721d56d596848f9c772d08ef8693dff8ab9417b6/ghc

>---------------------------------------------------------------

commit 721d56d596848f9c772d08ef8693dff8ab9417b6
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Tue Dec 22 21:03:58 2015 +0200

    APIAnnotations:AnnComma in wrong place in qcnames1
    
    The list is reversed when it is used, so the comma must be added to the
    item at the front of it, to be following it when used.


>---------------------------------------------------------------

721d56d596848f9c772d08ef8693dff8ab9417b6
 compiler/parser/Parser.y | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 777bae0..ead81ac 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -653,7 +653,7 @@ qcnames1 :: { ([AddAnn], [Located (Maybe RdrName)]) }     -- A reversed list
                                                     l@(L _ Nothing) ->
                                                       return ([mj AnnComma $2, mj AnnDotdot l]
                                                               ,($3  : snd $1))
-                                                    l -> (aa l (AnnComma, $2) >>
+                                                    l -> (aa (head (snd $1)) (AnnComma, $2) >>
                                                           return (fst $1, $3 : snd $1)) }
 
 


From git at git.haskell.org  Tue Dec 22 20:07:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 20:07:39 +0000 (UTC)
Subject: [commit: ghc] master: Tweak comments around UnivCos. (d3ce417)
Message-ID: <20151222200739.D0D9F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d3ce41729890db851ea1d2c9a03efd979c2526c2/ghc

>---------------------------------------------------------------

commit d3ce41729890db851ea1d2c9a03efd979c2526c2
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 22 15:08:04 2015 -0500

    Tweak comments around UnivCos.


>---------------------------------------------------------------

d3ce41729890db851ea1d2c9a03efd979c2526c2
 compiler/types/TyCoRep.hs | 34 ++++++++++++++++++----------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index c53a012..01946ba 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -880,18 +880,19 @@ role and kind, which is done in the UnivCo constructor.
 
 -- | For simplicity, we have just one UnivCo that represents a coercion from
 -- some type to some other type, with (in general) no restrictions on the
--- type. To make better sense of these, we tag a UnivCo with a
--- UnivCoProvenance. This provenance is rarely consulted and is more
--- for debugging info than anything else.
--- An important exception to this rule is that we also use a UnivCo
--- for coercion holes. See Note [Coercion holes].
+-- type. The UnivCoProvenance specifies more exactly what the coercion really
+-- is and why a program should (or shouldn't!) trust the coercion.
+-- It is reasonable to consider each constructor of 'UnivCoProvenance'
+-- as a totally independent coercion form; their only commonality is
+-- that they don't tell you what types they coercion between. (That info
+-- is in the 'UnivCo' constructor of 'Coercion'.
 data UnivCoProvenance
   = UnsafeCoerceProv   -- ^ From @unsafeCoerce#@. These are unsound.
 
-  | PhantomProv Coercion -- ^ See Note [Phantom coercions]
+  | PhantomProv CoercionN -- ^ See Note [Phantom coercions]
 
-  | ProofIrrelProv Coercion  -- ^ From the fact that any two coercions are
-                             --   considered equivalent. See Note [ProofIrrelProv]
+  | ProofIrrelProv CoercionN  -- ^ From the fact that any two coercions are
+                              --   considered equivalent. See Note [ProofIrrelProv]
 
   | PluginProv String  -- ^ From a plugin, which asserts that this coercion
                        --   is sound. The string is for the use of the plugin.
@@ -929,10 +930,11 @@ Consider
      data T a = T1 | T2
 Then we have
      T s ~R T t
-for any old s,t. The witness for this is a phantom coercion built with
-PhantomProv.  The role ofthe UnivCo is always representational.  The
-Coercion stored is the (nominal) kind coercion between the types
-   kind(T s) ~ kind (T t)
+for any old s,t. The witness for this is (TyConAppCo T Rep co),
+where (co :: s ~P t) is a phantom coercion built with PhantomProv.
+The role of the UnivCo is always Phantom.  The Coercion stored is the
+(nominal) kind coercion between the types
+   kind(s) ~N kind (t)
 
 Note [Coercion holes]
 ~~~~~~~~~~~~~~~~~~~~~~~~
@@ -947,14 +949,14 @@ During typechecking, constraint solving for type classes works by
 For equality constraints we use a different strategy.  See Note [The
 equality types story] in TysPrim for background on equality constraints.
   - For boxed equality constraints, (t1 ~N t2) and (t1 ~R t2), it's just
-    liek type classes above
-  - But for /unxboxed/ equality constraints (t1 ~R# t2) and (t1 ~N# t2)
+    like type classes above. (Indeed, boxed equality constraints *are* classes.)
+  - But for /unboxed/ equality constraints (t1 ~R# t2) and (t1 ~N# t2)
     we use a different plan
 
 For unboxed equalities:
   - Generate a CoercionHole, a mutable variable just like a unification
     variable
-  - Wrap the CoercionHole in a Wanted constraint; see TcRnType.TcEvDest
+  - Wrap the CoercionHole in a Wanted constraint; see TcRnTypes.TcEvDest
   - Use the CoercionHole in a Coercion, via HoleProv
   - Solve the constraint later
   - When solved, fill in the CoercionHole by side effect, instead of
@@ -992,7 +994,7 @@ Other notes about HoleCo:
 
 Note [ProofIrrelProv]
 ~~~~~~~~~~~~~~~~~~~~~
-A ProofIreelProv is a coercion between coercions. For example:
+A ProofIrrelProv is a coercion between coercions. For example:
 
   data G a where
     MkG :: G Bool


From git at git.haskell.org  Tue Dec 22 20:30:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 20:30:14 +0000 (UTC)
Subject: [commit: ghc] master: CoercionN is not in scope in TyCoRep (21b25df)
Message-ID: <20151222203014.4B9033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/21b25dffc72fdc45c3c621922e376958f2070058/ghc

>---------------------------------------------------------------

commit 21b25dffc72fdc45c3c621922e376958f2070058
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 22 15:29:57 2015 -0500

    CoercionN is not in scope in TyCoRep


>---------------------------------------------------------------

21b25dffc72fdc45c3c621922e376958f2070058
 compiler/types/TyCoRep.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index 01946ba..d64b03f 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -889,10 +889,10 @@ role and kind, which is done in the UnivCo constructor.
 data UnivCoProvenance
   = UnsafeCoerceProv   -- ^ From @unsafeCoerce#@. These are unsound.
 
-  | PhantomProv CoercionN -- ^ See Note [Phantom coercions]
+  | PhantomProv Coercion -- ^ See Note [Phantom coercions]
 
-  | ProofIrrelProv CoercionN  -- ^ From the fact that any two coercions are
-                              --   considered equivalent. See Note [ProofIrrelProv]
+  | ProofIrrelProv Coercion  -- ^ From the fact that any two coercions are
+                             --   considered equivalent. See Note [ProofIrrelProv]
 
   | PluginProv String  -- ^ From a plugin, which asserts that this coercion
                        --   is sound. The string is for the use of the plugin.


From git at git.haskell.org  Tue Dec 22 23:23:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 23:23:14 +0000 (UTC)
Subject: [commit: ghc] master: Refactor package flags into several distinct
 types. (998739d)
Message-ID: <20151222232314.AD8793A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/998739df630cbee7d006329a76786239e3e2c0be/ghc

>---------------------------------------------------------------

commit 998739df630cbee7d006329a76786239e3e2c0be
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Dec 18 12:09:36 2015 -0800

    Refactor package flags into several distinct types.
    
    Summary:
    Previously, all package flags (-package, -trust-package,
    -ignore-package) were bundled up into a single packageFlags
    field in DynFlags, under a single type.  This commit separates
    them based on what they do.
    
    This is a nice improvement, because it means that Packages can
    then be refactored so that a number of functions are "tighter":
    
        - We know longer have to partition PackageFlags into
          the ignore flag and other flags; ignore flags are just
          put into their own field.
    
        - Trust flags modify the package database, but exposed
          flags do not (they modify the visibility map); now
          applyPackageFlag and applyTrustFlag have tighter signatures
          which reflect this.
    
    This patch was motivated by the need to have a separate visibility
    map for plugin packages, which will be in a companion patch.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, bgamari, duncan
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1659


>---------------------------------------------------------------

998739df630cbee7d006329a76786239e3e2c0be
 compiler/main/DynFlags.hs |  23 ++++--
 compiler/main/Packages.hs | 199 +++++++++++++++++++++++++++-------------------
 2 files changed, 136 insertions(+), 86 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 998739df630cbee7d006329a76786239e3e2c0be

From git at git.haskell.org  Tue Dec 22 23:23:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 23:23:18 +0000 (UTC)
Subject: [commit: ghc] master: Implement -hide-all-plugin-packages and
 -plugin-package(-id), fixing #11244 (1faf1fc)
Message-ID: <20151222232318.20AA93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1faf1fcaebb2871f8085b01d0c6d19eec11dc808/ghc

>---------------------------------------------------------------

commit 1faf1fcaebb2871f8085b01d0c6d19eec11dc808
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Fri Dec 18 18:29:52 2015 -0800

    Implement -hide-all-plugin-packages and -plugin-package(-id), fixing #11244
    
    Summary:
    The basic idea is that we have a new set of "exposed modules"
    which are /only/ used for plugins, i.e. -fplugin Foo and
    --frontend Foo.  You can interact with this namespace
    using the flags -plugin-package-id and -plugin-package.
    By default, this namespace contains all modules in the
    user namespace (as before), but you can toggle that using
    -hide-all-plugin-packages.
    
    There is one nasty hack: GhcMake respects -fplugin in
    GHC_OPTIONS to make local plugins work correctly.  It also
    bails out of you have an import of a module which doesn't
    exist locally or in the package database.  The upshot is
    that we need to be sure to check in the plugin modules
    too, so we don't give a spurious failure when a plugin
    is in the plugin namespace but not the main namespace.
    A better way to fix this would be to distinguish between
    plugin and normal dependencies in ModSummary.
    
    I cheated a little and tweaked a few existing plugins
    tests to exercise the new code paths.
    
    TODO: Documentation
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: bgamari, austin, simonpj, duncan
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1661
    
    GHC Trac Issues: #11244


>---------------------------------------------------------------

1faf1fcaebb2871f8085b01d0c6d19eec11dc808
 compiler/main/DynFlags.hs                          |  49 ++++++---
 compiler/main/DynamicLoading.hs                    |   6 +-
 compiler/main/Finder.hs                            |  27 ++++-
 compiler/main/Packages.hs                          | 111 ++++++++++++++++-----
 docs/users_guide/extending_ghc.rst                 |  51 +++++++++-
 docs/users_guide/packages.rst                      |   2 +-
 ghc/GHCi/UI.hs                                     |  12 ++-
 testsuite/.gitignore                               |   1 +
 testsuite/tests/ghc-api/T9595.hs                   |   3 +-
 testsuite/tests/plugins/Makefile                   |  16 ++-
 .../should_fail/tcfail008.hs => plugins/T11244.hs} |   2 -
 testsuite/tests/plugins/T11244.stderr              |   3 +
 testsuite/tests/plugins/all.T                      |   6 ++
 13 files changed, 232 insertions(+), 57 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1faf1fcaebb2871f8085b01d0c6d19eec11dc808

From git at git.haskell.org  Tue Dec 22 23:46:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 22 Dec 2015 23:46:00 +0000 (UTC)
Subject: [commit: ghc] master: Update filepath submodule to latest snapshot
 (3e99980)
Message-ID: <20151222234600.BA70F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3e99980b072b45147c3066e8d7c3aa0fcdf5b0c8/ghc

>---------------------------------------------------------------

commit 3e99980b072b45147c3066e8d7c3aa0fcdf5b0c8
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 22 23:49:39 2015 +0100

    Update filepath submodule to latest snapshot


>---------------------------------------------------------------

3e99980b072b45147c3066e8d7c3aa0fcdf5b0c8
 libraries/filepath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/filepath b/libraries/filepath
index 564c5a7..a38cc73 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit 564c5a78d028ebde6a27f61ff9f686fce490c809
+Subproject commit a38cc733674497875ad76240c24a17ec1a0d568b


From git at git.haskell.org  Wed Dec 23 06:43:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 06:43:15 +0000 (UTC)
Subject: [commit: ghc] master: - fix tests on OpenBSD which requires _DYNAMIC
 symbol (5f08681)
Message-ID: <20151223064315.482963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5f08681639814bd3ff383b56734bba76d06a3cdc/ghc

>---------------------------------------------------------------

commit 5f08681639814bd3ff383b56734bba76d06a3cdc
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Tue Dec 22 23:00:24 2015 +0100

    - fix tests on OpenBSD which requires _DYNAMIC symbol
    
    Summary:
    This patch adds _DYNAMIC symbol to the list of OpenBSD symbols.
    The patch fixes unknown _DYNAMIC symbol runtime linker error caused
    by recent update of unix library.
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1689


>---------------------------------------------------------------

5f08681639814bd3ff383b56734bba76d06a3cdc
 rts/RtsSymbols.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rts/RtsSymbols.c b/rts/RtsSymbols.c
index ffb5c39..395a5f1 100644
--- a/rts/RtsSymbols.c
+++ b/rts/RtsSymbols.c
@@ -458,7 +458,8 @@
 
 #if defined(openbsd_HOST_OS)
 #define RTS_OPENBSD_ONLY_SYMBOLS                            \
-     SymE_NeedsProto(__guard_local)
+     SymE_NeedsProto(__guard_local)                         \
+     SymE_NeedsProto(_DYNAMIC)
 #else
 #define RTS_OPENBSD_ONLY_SYMBOLS
 #endif


From git at git.haskell.org  Wed Dec 23 07:45:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:45:59 +0000 (UTC)
Subject: [commit: ghc] master: Comments and white space (1963250)
Message-ID: <20151223074559.500693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/19632501654cac9d84088c69bd4291009292c5c3/ghc

>---------------------------------------------------------------

commit 19632501654cac9d84088c69bd4291009292c5c3
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 14:17:31 2015 +0000

    Comments and white space


>---------------------------------------------------------------

19632501654cac9d84088c69bd4291009292c5c3
 compiler/deSugar/DsExpr.hs | 2 +-
 compiler/deSugar/DsMeta.hs | 6 +++---
 compiler/hsSyn/HsUtils.hs  | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/compiler/deSugar/DsExpr.hs b/compiler/deSugar/DsExpr.hs
index 2fc3974..3b9a4cf 100644
--- a/compiler/deSugar/DsExpr.hs
+++ b/compiler/deSugar/DsExpr.hs
@@ -81,7 +81,7 @@ dsLocalBinds (HsIPBinds binds)  body = dsIPBinds  binds body
 -------------------------
 dsValBinds :: HsValBinds Id -> CoreExpr -> DsM CoreExpr
 dsValBinds (ValBindsOut binds _) body = foldrM ds_val_bind body binds
-dsValBinds (ValBindsIn  _     _) _    = panic "dsValBinds ValBindsIn"
+dsValBinds (ValBindsIn {})       _    = panic "dsValBinds ValBindsIn"
 
 -------------------------
 dsIPBinds :: HsIPBinds Id -> CoreExpr -> DsM CoreExpr
diff --git a/compiler/deSugar/DsMeta.hs b/compiler/deSugar/DsMeta.hs
index 5153dd9..3035e9f 100644
--- a/compiler/deSugar/DsMeta.hs
+++ b/compiler/deSugar/DsMeta.hs
@@ -665,9 +665,9 @@ repBangTy ty = do
 
 repDerivs :: HsDeriving Name -> DsM (Core TH.CxtQ)
 repDerivs deriv = do
-    let clauses
-          | Just (L _ ctxt) <- deriv = ctxt
-          | otherwise                = []
+    let clauses = case deriv of
+                    Nothing         -> []
+                    Just (L _ ctxt) -> ctxt
     tys <- repList typeQTyConName
                    (rep_deriv . hsSigType)
                    clauses
diff --git a/compiler/hsSyn/HsUtils.hs b/compiler/hsSyn/HsUtils.hs
index c37785b..9e8ea9a 100644
--- a/compiler/hsSyn/HsUtils.hs
+++ b/compiler/hsSyn/HsUtils.hs
@@ -749,7 +749,7 @@ collect_out_binds :: Bool -> [(RecFlag, LHsBinds id)] -> [id]
 collect_out_binds ps = foldr (collect_binds ps . snd) []
 
 collect_binds :: Bool -> LHsBindsLR idL idR -> [idL] -> [idL]
--- Collect Ids, or Ids + patter synonyms, depending on boolean flag
+-- Collect Ids, or Ids + pattern synonyms, depending on boolean flag
 collect_binds ps binds acc = foldrBag (collect_bind ps . unLoc) acc binds
 
 collect_bind :: Bool -> HsBindLR idL idR -> [idL] -> [idL]


From git at git.haskell.org  Wed Dec 23 07:46:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:02 +0000 (UTC)
Subject: [commit: ghc] master: Wibble to error message in Trac #10426 (b55ad1b)
Message-ID: <20151223074602.0686B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b55ad1b33a30996a2ec4f85382f9c1cdca42e30f/ghc

>---------------------------------------------------------------

commit b55ad1b33a30996a2ec4f85382f9c1cdca42e30f
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 14:15:09 2015 +0000

    Wibble to error message in Trac #10426


>---------------------------------------------------------------

b55ad1b33a30996a2ec4f85382f9c1cdca42e30f
 compiler/parser/RdrHsSyn.hs                      | 2 +-
 testsuite/tests/patsyn/should_fail/T10426.stderr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index 222641b..e84f8af 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -494,7 +494,7 @@ mkPatSynMatchGroup (L loc patsyn_name) (L _ decls) =
 
     wrongNumberErr loc =
       parseErrorSDoc loc $
-      text "pattern synonym 'where' clause can not be empty." $$
+      text "pattern synonym 'where' clause cannot be empty" $$
       text "In the pattern synonym declaration for: " <+> ppr (patsyn_name)
 
 mkConDeclH98 :: Located RdrName -> Maybe [LHsTyVarBndr RdrName]
diff --git a/testsuite/tests/patsyn/should_fail/T10426.stderr b/testsuite/tests/patsyn/should_fail/T10426.stderr
index 9b03e11..263f927 100644
--- a/testsuite/tests/patsyn/should_fail/T10426.stderr
+++ b/testsuite/tests/patsyn/should_fail/T10426.stderr
@@ -1,4 +1,4 @@
 
 T10426.hs:3:9: error:
-    pattern synonym 'where' clause can not be empty.
+    pattern synonym 'where' clause cannot be empty
     In the pattern synonym declaration for:  Id


From git at git.haskell.org  Wed Dec 23 07:46:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:04 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (99eb002)
Message-ID: <20151223074604.A36393A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/99eb002d0813638be0967bad714d504e26021f5c/ghc

>---------------------------------------------------------------

commit 99eb002d0813638be0967bad714d504e26021f5c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 09:06:47 2015 +0000

    Comments only


>---------------------------------------------------------------

99eb002d0813638be0967bad714d504e26021f5c
 libraries/base/Data/String.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/base/Data/String.hs b/libraries/base/Data/String.hs
index df410f0..9e1f5f3 100644
--- a/libraries/base/Data/String.hs
+++ b/libraries/base/Data/String.hs
@@ -35,9 +35,8 @@ import Data.List (lines, words, unlines, unwords)
 class IsString a where
     fromString :: String -> a
 
-{-
-Note [IsString String]
-~~~~~~~~~~~~~~~~~~~~~~
+{- Note [IsString String]
+~~~~~~~~~~~~~~~~~~~~~~~~~
 Previously, the IsString instance that covered String was a flexible
 instance for [Char]. This is in some sense the most accurate choice,
 but there are cases where it can lead to an ambiguity, for instance:
@@ -74,6 +73,8 @@ would be, and it certainly hasn't been implemented.
 A test case (should_run/overloadedstringsrun01.hs) has been added to
 ensure the good behavior of the above example remains in the future.
 -}
+
 instance (a ~ Char) => IsString [a] where
+         -- See Note [IsString String]
     fromString xs = xs
 


From git at git.haskell.org  Wed Dec 23 07:46:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:07 +0000 (UTC)
Subject: [commit: ghc] master: Tidy up and comment wildcards in family
 instances (6eb9dc9)
Message-ID: <20151223074607.5837C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6eb9dc9cf44794e772fc09695bdbe62bb9c9216b/ghc

>---------------------------------------------------------------

commit 6eb9dc9cf44794e772fc09695bdbe62bb9c9216b
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 09:08:28 2015 +0000

    Tidy up and comment wildcards in family instances
    
    I found it was possible to do this a bit more nicely
    See Note [Family instance declaration binders] in HsDecls, and
        Note [Wildcards in family instances] in RnSource


>---------------------------------------------------------------

6eb9dc9cf44794e772fc09695bdbe62bb9c9216b
 compiler/hsSyn/HsDecls.hs          | 50 +++++++++++++----------
 compiler/rename/RnSource.hs        | 82 +++++++++++++++++++++++++++++++-------
 compiler/typecheck/TcTyClsDecls.hs | 48 ++--------------------
 3 files changed, 100 insertions(+), 80 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 6eb9dc9cf44794e772fc09695bdbe62bb9c9216b

From git at git.haskell.org  Wed Dec 23 07:46:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:10 +0000 (UTC)
Subject: [commit: ghc] master: Test Trac #11274 (ed213ea)
Message-ID: <20151223074610.8BA823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/ed213ead5e92aa3c2ae830a00f06684a1028d3ad/ghc

>---------------------------------------------------------------

commit ed213ead5e92aa3c2ae830a00f06684a1028d3ad
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Tue Dec 22 15:49:24 2015 +0000

    Test Trac #11274


>---------------------------------------------------------------

ed213ead5e92aa3c2ae830a00f06684a1028d3ad
 testsuite/tests/typecheck/should_fail/T11274.hs     | 10 ++++++++++
 testsuite/tests/typecheck/should_fail/T11274.stderr |  5 +++++
 testsuite/tests/typecheck/should_fail/all.T         |  1 +
 3 files changed, 16 insertions(+)

diff --git a/testsuite/tests/typecheck/should_fail/T11274.hs b/testsuite/tests/typecheck/should_fail/T11274.hs
new file mode 100644
index 0000000..2109cdf
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T11274.hs
@@ -0,0 +1,10 @@
+{-# OPTIONS_GHC -fdefer-typed-holes #-}
+
+module T11274 where
+
+data Asd = Asd
+
+someHole = _asd
+
+missingInstance :: Asd -> Asd -> Bool
+missingInstance x y = x == y
diff --git a/testsuite/tests/typecheck/should_fail/T11274.stderr b/testsuite/tests/typecheck/should_fail/T11274.stderr
new file mode 100644
index 0000000..f731317
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T11274.stderr
@@ -0,0 +1,5 @@
+
+T11274.hs:10:25: error:
+    ? No instance for (Eq Asd) arising from a use of ?==?
+    ? In the expression: x == y
+      In an equation for ?missingInstance?: missingInstance x y = x == y
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index 27aa70b..8d8d430 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -395,3 +395,4 @@ test('CustomTypeErrors02', normal, compile_fail, [''])
 test('CustomTypeErrors03', normal, compile_fail, [''])
 test('T11112', normal, compile_fail, [''])
 test('ClassOperator', normal, compile_fail, [''])
+test('T11274', normal, compile_fail, [''])


From git at git.haskell.org  Wed Dec 23 07:46:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:14 +0000 (UTC)
Subject: [commit: ghc] master: Add a pattern-syn form of PromotionErr (c069be8)
Message-ID: <20151223074614.182833A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c069be815aa0bce2eb2c9621a36f114badda2318/ghc

>---------------------------------------------------------------

commit c069be815aa0bce2eb2c9621a36f114badda2318
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 14:18:32 2015 +0000

    Add a pattern-syn form of PromotionErr
    
    The main change is to add PatSynPE to PromotionErr, so that
    when we get an ill-staged use of a pattern synonym we get a
    civilised error message.
    
    We were already doing this in half-baked form in tcValBinds, but
    this patch tidies up the impl (which previously used a hack rather
    than APromotionErr), and does it in tcTyClsInstDecls too.


>---------------------------------------------------------------

c069be815aa0bce2eb2c9621a36f114badda2318
 compiler/hsSyn/HsBinds.hs                         |  15 ----
 compiler/typecheck/TcBinds.hs                     |  53 +++--------
 compiler/typecheck/TcEnv.hs                       | 103 +++++++++++++++++++++-
 compiler/typecheck/TcHsType.hs                    |   1 +
 compiler/typecheck/TcRnDriver.hs                  |  80 ++++++-----------
 compiler/typecheck/TcRnTypes.hs                   |   5 ++
 testsuite/tests/patsyn/should_fail/T11265.hs      |   6 ++
 testsuite/tests/patsyn/should_fail/T11265.stderr  |   6 ++
 testsuite/tests/patsyn/should_fail/T9161-1.stderr |   7 +-
 testsuite/tests/patsyn/should_fail/T9161-2.stderr |   3 +-
 testsuite/tests/patsyn/should_fail/all.T          |   1 +
 11 files changed, 163 insertions(+), 117 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc c069be815aa0bce2eb2c9621a36f114badda2318

From git at git.haskell.org  Wed Dec 23 07:46:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 07:46:16 +0000 (UTC)
Subject: [commit: ghc] master: Revert "Allow as-patterns in pattern synonym
 declarations." (48e0634)
Message-ID: <20151223074616.CD8E93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/48e06346805ab882a54088e01e5224111182f5df/ghc

>---------------------------------------------------------------

commit 48e06346805ab882a54088e01e5224111182f5df
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Mon Dec 21 10:34:41 2015 +0000

    Revert "Allow as-patterns in pattern synonym declarations."
    
    I'm reverting this until we agree a design.
    See comment:5 in Trac #9793.
    
    Incidentally the reference to Trac #9739 in the reverted
    patch is bogus; it shold have said #9793.
    
    This reverts commit 44640af7afa1a01ff2e2357f7c1436b4804866fc.


>---------------------------------------------------------------

48e06346805ab882a54088e01e5224111182f5df
 compiler/hsSyn/HsPat.hs                            | 32 ----------------------
 compiler/typecheck/TcPatSyn.hs                     |  7 ++---
 testsuite/tests/patsyn/should_compile/T9793.hs     |  5 ----
 testsuite/tests/patsyn/should_compile/all.T        |  1 -
 testsuite/tests/patsyn/should_fail/T9793-fail.hs   |  6 ----
 .../tests/patsyn/should_fail/T9793-fail.stderr     |  5 ----
 testsuite/tests/patsyn/should_fail/all.T           |  1 -
 .../tests/patsyn/should_fail/as-pattern.stderr     |  2 +-
 8 files changed, 3 insertions(+), 56 deletions(-)

diff --git a/compiler/hsSyn/HsPat.hs b/compiler/hsSyn/HsPat.hs
index 1751b96..ff1ce1e 100644
--- a/compiler/hsSyn/HsPat.hs
+++ b/compiler/hsSyn/HsPat.hs
@@ -33,8 +33,6 @@ module HsPat (
 
         collectEvVarsPats,
 
-        hasFreeVarsLPat, hasFreeVarsPat,
-
         pprParendLPat, pprConArgs
     ) where
 
@@ -641,33 +639,3 @@ collectEvVarsPat pat =
     ConPatIn _  _     -> panic "foldMapPatBag: ConPatIn"
     SigPatIn _ _      -> panic "foldMapPatBag: SigPatIn"
     _other_pat        -> emptyBag
-
-hasFreeVarsLPat :: LPat id -> Bool
-hasFreeVarsLPat (L _ pat) = hasFreeVarsPat pat
-
--- | Checks whether a pattern contains any unbound variables from
--- `VarPat`s or `AsPat`s.
-hasFreeVarsPat :: Pat id -> Bool
-hasFreeVarsPat pat =
-  case pat of
-    VarPat {}         -> True
-    AsPat {}          -> True
-    NPlusKPat {}      -> True
-    NPat {}           -> False
-    LitPat {}         -> False
-    WildPat {}        -> False
-    ViewPat _ p _     -> hasFreeVarsLPat p
-    LazyPat  p        -> hasFreeVarsLPat p
-    ParPat   p        -> hasFreeVarsLPat p
-    BangPat  p        -> hasFreeVarsLPat p
-    ListPat  ps _ _   -> any hasFreeVarsLPat ps
-    TuplePat ps _ _   -> any hasFreeVarsLPat ps
-    PArrPat  ps _     -> any hasFreeVarsLPat ps
-    ConPatOut {pat_args = ps}
-                      -> any hasFreeVarsLPat (hsConPatArgs ps)
-    SigPatOut p _     -> hasFreeVarsLPat p
-    CoPat _ p _       -> hasFreeVarsPat p
-    ConPatIn _ p      -> any hasFreeVarsLPat (hsConPatArgs p)
-    SigPatIn p _      -> hasFreeVarsLPat p
-
-    SplicePat {}      -> panic "hasFreVarsPat: SplicePat"
diff --git a/compiler/typecheck/TcPatSyn.hs b/compiler/typecheck/TcPatSyn.hs
index d7477ee..5f92250 100644
--- a/compiler/typecheck/TcPatSyn.hs
+++ b/compiler/typecheck/TcPatSyn.hs
@@ -721,10 +721,7 @@ tcCheckPatSynPat = go
     go1   (ConPatIn _ info)   = mapM_ go (hsConPatArgs info)
     go1   VarPat{}            = return ()
     go1   WildPat{}           = return ()
-    go1   pat@(AsPat _ p)     =
-      if hasFreeVarsLPat p
-        then asPatInPatSynErr pat
-        else go p
+    go1 p@(AsPat _ _)         = asPatInPatSynErr p
     go1   (LazyPat pat)       = go pat
     go1   (ParPat pat)        = go pat
     go1   (BangPat pat)       = go pat
@@ -744,7 +741,7 @@ tcCheckPatSynPat = go
 asPatInPatSynErr :: OutputableBndr name => Pat name -> TcM a
 asPatInPatSynErr pat
   = failWithTc $
-    hang (ptext (sLit "Pattern synonym definition cannot contain as-patterns (@) which contain free variables:"))
+    hang (ptext (sLit "Pattern synonym definition cannot contain as-patterns (@):"))
        2 (ppr pat)
 
 thInPatSynErr :: OutputableBndr name => Pat name -> TcM a
diff --git a/testsuite/tests/patsyn/should_compile/T9793.hs b/testsuite/tests/patsyn/should_compile/T9793.hs
deleted file mode 100644
index 230c861..0000000
--- a/testsuite/tests/patsyn/should_compile/T9793.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-{-#?LANGUAGE PatternSynonyms #-}
-module T9793 where
-
-pattern P :: [a] -> [a]
-pattern P x <- x@(_:_)
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index 074e129..dd2bbf4 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -44,6 +44,5 @@ test('export-record-selector', normal, compile, [''])
 test('T10897', expect_broken(10897), multi_compile, ['T10897', [
                                        ('T10897a.hs','-c')
                                       ,('T10897b.hs', '-c')], ''])
-test('T9793', normal, compile, [''])
 test('T11224b', normal, compile, [''])
 test('MoreEx', normal, compile, [''])
diff --git a/testsuite/tests/patsyn/should_fail/T9793-fail.hs b/testsuite/tests/patsyn/should_fail/T9793-fail.hs
deleted file mode 100644
index 2787a8d..0000000
--- a/testsuite/tests/patsyn/should_fail/T9793-fail.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-{-#?LANGUAGE PatternSynonyms #-}
-
-module Foo where
-
-pattern P :: [a] -> [a]
-pattern P x <- x@(y:_)
diff --git a/testsuite/tests/patsyn/should_fail/T9793-fail.stderr b/testsuite/tests/patsyn/should_fail/T9793-fail.stderr
deleted file mode 100644
index 23122f9..0000000
--- a/testsuite/tests/patsyn/should_fail/T9793-fail.stderr
+++ /dev/null
@@ -1,5 +0,0 @@
-
-T9793-fail.hs:6:16: error:
-    ? Pattern synonym definition cannot contain as-patterns (@) which contain free variables:
-        x@(y : _)
-    ? In the declaration for pattern synonym ?P?
diff --git a/testsuite/tests/patsyn/should_fail/all.T b/testsuite/tests/patsyn/should_fail/all.T
index 6163da1..6ef64ae 100644
--- a/testsuite/tests/patsyn/should_fail/all.T
+++ b/testsuite/tests/patsyn/should_fail/all.T
@@ -27,4 +27,3 @@ test('export-type-synonym', normal, compile_fail, [''])
 test('export-ps-rec-sel', normal, compile_fail, [''])
 test('T11053', normal, compile, ['-fwarn-missing-pat-syn-sigs'])
 test('T10426', normal, compile_fail, [''])
-test('T9793-fail', normal, compile_fail, [''])
diff --git a/testsuite/tests/patsyn/should_fail/as-pattern.stderr b/testsuite/tests/patsyn/should_fail/as-pattern.stderr
index 00ea6c8..61df617 100644
--- a/testsuite/tests/patsyn/should_fail/as-pattern.stderr
+++ b/testsuite/tests/patsyn/should_fail/as-pattern.stderr
@@ -1,5 +1,5 @@
 
 as-pattern.hs:4:18: error:
-    ? Pattern synonym definition cannot contain as-patterns (@) which contain free variables:
+    ? Pattern synonym definition cannot contain as-patterns (@):
         x@(Just y)
     ? In the declaration for pattern synonym ?P?


From git at git.haskell.org  Wed Dec 23 09:04:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 09:04:52 +0000 (UTC)
Subject: [commit: ghc] master: Modify Nmax to maxN Trac #10728 (7ed0da6)
Message-ID: <20151223090452.596903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7ed0da6cde909e662d09e1f39c3fccfa10f91a7f/ghc

>---------------------------------------------------------------

commit 7ed0da6cde909e662d09e1f39c3fccfa10f91a7f
Author: MarcelineVQ <matthewnhyatt at gmail.com>
Date:   Wed Dec 23 01:23:33 2015 +0100

    Modify Nmax to maxN Trac #10728
    
    Added test and changed -Nmax to -maxN, -n was taken
    
    Noticed strange -m behavoir and fixed -m from quietly
    ignoring being passed invalid opts, e.g. "-msasd"
    
    Reviewers: simonmar, hvr, austin, thomie, bgamari
    
    Reviewed By: hvr, thomie, bgamari
    
    Subscribers: bgamari, hvr, thomie, simonmar
    
    Differential Revision: https://phabricator.haskell.org/D1677
    
    GHC Trac Issues: #10728


>---------------------------------------------------------------

7ed0da6cde909e662d09e1f39c3fccfa10f91a7f
 docs/users_guide/7.12.1-notes.rst     |  5 ++++
 docs/users_guide/using-concurrent.rst |  9 +++---
 rts/RtsFlags.c                        | 54 ++++++++++++++++++++++++++---------
 testsuite/.gitignore                  |  1 +
 testsuite/tests/rts/T10728.hs         | 40 ++++++++++++++++++++++++++
 testsuite/tests/rts/T10728.stdout     |  1 +
 testsuite/tests/rts/all.T             |  3 ++
 7 files changed, 95 insertions(+), 18 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 7ed0da6cde909e662d09e1f39c3fccfa10f91a7f

From git at git.haskell.org  Wed Dec 23 09:23:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 09:23:11 +0000 (UTC)
Subject: [commit: ghc] master: Delete incorrect *-ws-32 expected test output
 (dab8e34)
Message-ID: <20151223092311.1B4443A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dab8e34d279e8c8ccc2b44f1c00c6798c820731d/ghc

>---------------------------------------------------------------

commit dab8e34d279e8c8ccc2b44f1c00c6798c820731d
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Wed Dec 23 20:23:24 2015 +1100

    Delete incorrect *-ws-32 expected test output
    
    Summary:
    The *-ws-32 file were too difficult to keep up-to-date so @bgamari
    updated the test outut normalization code in commit 786d528e8f949d
    to make these files un-necessary.
    
    Test Plan: test on PowerPC
    
    Reviewers: hvr, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1690


>---------------------------------------------------------------

dab8e34d279e8c8ccc2b44f1c00c6798c820731d
 .../deSugar/should_compile/T2431.stderr-ws-32      |  57 -------
 .../tests/roles/should_compile/Roles1.stderr-ws-32 |  43 ------
 .../roles/should_compile/Roles13.stderr-ws-32      |  74 ---------
 .../roles/should_compile/Roles14.stderr-ws-32      |  18 ---
 .../tests/roles/should_compile/Roles2.stderr-ws-32 |  19 ---
 .../tests/roles/should_compile/Roles3.stderr-ws-32 |  43 ------
 .../tests/roles/should_compile/Roles4.stderr-ws-32 |  24 ---
 .../tests/roles/should_compile/T8958.stderr-ws-32  |  48 ------
 .../simplCore/should_compile/T7360.stderr-ws-32    | 166 ---------------------
 testsuite/tests/th/TH_Roles2.stderr-ws-32          |  21 ---
 10 files changed, 513 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc dab8e34d279e8c8ccc2b44f1c00c6798c820731d

From git at git.haskell.org  Wed Dec 23 09:42:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 09:42:12 +0000 (UTC)
Subject: [commit: ghc] master: - fix gc_thread related compilation failure on
 Solaris/i386 platform (84f6739)
Message-ID: <20151223094212.BB8253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/84f673961942c90e28c215e2c31a62444fbc8237/ghc

>---------------------------------------------------------------

commit 84f673961942c90e28c215e2c31a62444fbc8237
Author: Karel Gardas <karel.gardas at centrum.cz>
Date:   Tue Dec 22 22:53:00 2015 +0100

    - fix gc_thread related compilation failure on Solaris/i386 platform
    
    Summary:
    This patch fixes gc_thread related compilation failure
    on Solaris/i386 platform. It uses Linux way of __thread declared
    gc_thread variable for register starving i386 from now.
    
    Reviewers: bgamari, austin, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1688


>---------------------------------------------------------------

84f673961942c90e28c215e2c31a62444fbc8237
 rts/sm/GCTDecl.h | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/rts/sm/GCTDecl.h b/rts/sm/GCTDecl.h
index 5602cb8..f1f9516 100644
--- a/rts/sm/GCTDecl.h
+++ b/rts/sm/GCTDecl.h
@@ -78,7 +78,8 @@ extern __thread gc_thread* gct;
    x86/Linux, because we have too few registers available. In my
    tests it was worth about 5% in GC performance, but of course that
    might change as gcc improves. -- SDM 2009/04/03 */
-#elif (defined(i386_HOST_ARCH) && defined(linux_HOST_OS))
+#elif (defined(i386_HOST_ARCH) && (defined(linux_HOST_OS) \
+                                   || defined(solaris2_HOST_OS)))
 extern __thread gc_thread* gct;
 #define SET_GCT(to) gct = (to)
 #define DECLARE_GCT __thread gc_thread* gct;


From git at git.haskell.org  Wed Dec 23 10:13:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:13:18 +0000 (UTC)
Subject: [commit: ghc] master: Fix ASSERT in buildPatSyn,
 and T10897 test (7824870)
Message-ID: <20151223101318.35FCF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/78248702b0b8189d73f08c89d86f5cb7a3c6ae8c/ghc

>---------------------------------------------------------------

commit 78248702b0b8189d73f08c89d86f5cb7a3c6ae8c
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 23 10:13:26 2015 +0000

    Fix ASSERT in buildPatSyn, and T10897 test
    
    This closes Trac #10897


>---------------------------------------------------------------

78248702b0b8189d73f08c89d86f5cb7a3c6ae8c
 compiler/iface/BuildTyCl.hs                              | 16 ++++++++++------
 .../patsyn/should_compile/{T10897b.hs => T10897.hs}      |  2 +-
 testsuite/tests/patsyn/should_compile/all.T              |  4 ++--
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/compiler/iface/BuildTyCl.hs b/compiler/iface/BuildTyCl.hs
index 7c62bc2..d370d37 100644
--- a/compiler/iface/BuildTyCl.hs
+++ b/compiler/iface/BuildTyCl.hs
@@ -182,12 +182,14 @@ buildPatSyn :: Name -> Bool
 buildPatSyn src_name declared_infix matcher@(matcher_id,_) builder
             (univ_tvs, req_theta) (ex_tvs, prov_theta) arg_tys
             pat_ty field_labels
-  = ASSERT2((and [ univ_tvs == univ_tvs1
-                 , ex_tvs == ex_tvs1
-                 , pat_ty `eqType` pat_ty1
-                 , prov_theta `eqTypes` prov_theta1
-                 , req_theta `eqTypes` req_theta1
-                 , arg_tys `eqTypes` arg_tys1
+  = -- The assertion checks that the matcher is
+    -- compatible with the pattern synonym
+    ASSERT2((and [ univ_tvs `equalLength` univ_tvs1
+                 , ex_tvs `equalLength` ex_tvs1
+                 , pat_ty `eqType` substTy subst pat_ty1
+                 , prov_theta `eqTypes` substTys subst prov_theta1
+                 , req_theta `eqTypes` substTys subst req_theta1
+                 , arg_tys `eqTypes` substTys subst arg_tys1
                  ])
             , (vcat [ ppr univ_tvs <+> twiddle <+> ppr univ_tvs1
                     , ppr ex_tvs <+> twiddle <+> ppr ex_tvs1
@@ -205,6 +207,8 @@ buildPatSyn src_name declared_infix matcher@(matcher_id,_) builder
     (ex_tvs1, prov_theta1, cont_tau) = tcSplitSigmaTy cont_sigma
     (arg_tys1, _) = tcSplitFunTys cont_tau
     twiddle = char '~'
+    subst = zipTopTCvSubst (univ_tvs1 ++ ex_tvs1)
+                           (mkTyVarTys (univ_tvs ++ ex_tvs))
 
 ------------------------------------------------------
 type TcMethInfo = (Name, Type, Maybe (DefMethSpec Type))
diff --git a/testsuite/tests/patsyn/should_compile/T10897b.hs b/testsuite/tests/patsyn/should_compile/T10897.hs
similarity index 61%
rename from testsuite/tests/patsyn/should_compile/T10897b.hs
rename to testsuite/tests/patsyn/should_compile/T10897.hs
index 6b506b8..e34f146 100644
--- a/testsuite/tests/patsyn/should_compile/T10897b.hs
+++ b/testsuite/tests/patsyn/should_compile/T10897.hs
@@ -1,4 +1,4 @@
-module B where
+module T10897 where
 import T10897a
 
 Single y = True
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index dd2bbf4..e1c8243 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -41,8 +41,8 @@ test('poly-export3', normal, compile, [''])
 test('multi-export', normal, compile, [''])
 test('export-super-class', normal, compile, [''])
 test('export-record-selector', normal, compile, [''])
-test('T10897', expect_broken(10897), multi_compile, ['T10897', [
+test('T10897', normal, multi_compile, ['T10897', [
                                        ('T10897a.hs','-c')
-                                      ,('T10897b.hs', '-c')], ''])
+                                      ], '-v0'])
 test('T11224b', normal, compile, [''])
 test('MoreEx', normal, compile, [''])


From git at git.haskell.org  Wed Dec 23 10:13:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:13:21 +0000 (UTC)
Subject: [commit: ghc] master: Fix super-class cycle check (f13de71)
Message-ID: <20151223101321.3DA2D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f13de71b4684ab7702de3ad01eb212d81f7c4a5d/ghc

>---------------------------------------------------------------

commit f13de71b4684ab7702de3ad01eb212d81f7c4a5d
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 23 10:11:11 2015 +0000

    Fix super-class cycle check
    
    Fixes Trac #11278


>---------------------------------------------------------------

f13de71b4684ab7702de3ad01eb212d81f7c4a5d
 compiler/prelude/TysWiredIn.hs      |  1 +
 compiler/typecheck/TcTyDecls.hs     | 40 ++++++++++++++++++++++++-------------
 compiler/typecheck/TcType.hs        |  5 ++++-
 testsuite/tests/polykinds/T11278.hs |  6 ++++++
 testsuite/tests/polykinds/all.T     |  2 +-
 5 files changed, 38 insertions(+), 16 deletions(-)

diff --git a/compiler/prelude/TysWiredIn.hs b/compiler/prelude/TysWiredIn.hs
index 368a56f..c26521d 100644
--- a/compiler/prelude/TysWiredIn.hs
+++ b/compiler/prelude/TysWiredIn.hs
@@ -517,6 +517,7 @@ cTupleTyConNameSet :: NameSet
 cTupleTyConNameSet = mkNameSet cTupleTyConNames
 
 isCTupleTyConName :: Name -> Bool
+-- Use Type.isCTupleClass where possible
 isCTupleTyConName n
  = ASSERT2( isExternalName n, ppr n )
    nameModule n == gHC_CLASSES
diff --git a/compiler/typecheck/TcTyDecls.hs b/compiler/typecheck/TcTyDecls.hs
index 8c80519..51d6fc7 100644
--- a/compiler/typecheck/TcTyDecls.hs
+++ b/compiler/typecheck/TcTyDecls.hs
@@ -189,7 +189,8 @@ checkClassCycles :: Class -> Maybe SDoc
 -- Nothing  <=> ok
 -- Just err <=> possible cycle error
 checkClassCycles cls
-  = do { (definite_cycle, err) <- go emptyNameSet cls
+  = do { (definite_cycle, err) <- go (unitNameSet (getName cls))
+                                     cls (mkTyVarTys (classTyVars cls))
        ; let herald | definite_cycle = ptext (sLit "Superclass cycle for")
                     | otherwise      = ptext (sLit "Potential superclass cycle for")
        ; return (vcat [ herald <+> quotes (ppr cls)
@@ -197,42 +198,53 @@ checkClassCycles cls
   where
     hint = ptext (sLit "Use UndecidableSuperClasses to accept this")
 
-    go :: NameSet -> Class -> Maybe (Bool, SDoc)
-    go so_far cls = firstJusts $
-                    map (go_pred (so_far `extendNameSet` getName cls)) $
-                    classSCTheta cls
+    -- Expand superclasses starting with (C a b), complaining
+    -- if you find the same class a second time, or a type function
+    -- or predicate headed by a type variable
+    --
+    -- NB: this code duplicates TcType.transSuperClasses, but
+    --     with more error message generation clobber
+    -- Make sure the two stay in sync.
+    go :: NameSet -> Class -> [Type] -> Maybe (Bool, SDoc)
+    go so_far cls tys = firstJusts $
+                        map (go_pred so_far) $
+                        immSuperClasses cls tys
 
     go_pred :: NameSet -> PredType -> Maybe (Bool, SDoc)
        -- Nothing <=> ok
        -- Just (True, err)  <=> definite cycle
        -- Just (False, err) <=> possible cycle
     go_pred so_far pred  -- NB: tcSplitTyConApp looks through synonyms
-       | Just (tc, _) <- tcSplitTyConApp_maybe pred
-       = go_tc so_far pred tc
+       | Just (tc, tys) <- tcSplitTyConApp_maybe pred
+       = go_tc so_far pred tc tys
        | hasTyVarHead pred
        = Just (False, hang (ptext (sLit "one of whose superclass constraints is headed by a type variable:"))
                          2 (quotes (ppr pred)))
        | otherwise
        = Nothing
 
-    go_tc :: NameSet -> PredType -> TyCon -> Maybe (Bool, SDoc)
-    go_tc so_far pred tc
+    go_tc :: NameSet -> PredType -> TyCon -> [Type] -> Maybe (Bool, SDoc)
+    go_tc so_far pred tc tys
       | isFamilyTyCon tc
       = Just (False, hang (ptext (sLit "one of whose superclass constraints is headed by a type family:"))
                         2 (quotes (ppr pred)))
       | Just cls <- tyConClass_maybe tc
-      = go_cls so_far cls
+      = go_cls so_far cls tys
       | otherwise   -- Equality predicate, for example
       = Nothing
 
-    go_cls :: NameSet -> Class -> Maybe (Bool, SDoc)
-    go_cls so_far cls
-       | getName cls  `elemNameSet` so_far
+    go_cls :: NameSet -> Class -> [Type] -> Maybe (Bool, SDoc)
+    go_cls so_far cls tys
+       | cls_nm `elemNameSet` so_far
        = Just (True, ptext (sLit "one of whose superclasses is") <+> quotes (ppr cls))
+       | isCTupleClass cls
+       = go so_far cls tys
        | otherwise
-       = do { (b,err) <- go so_far cls
+       = do { (b,err) <- go  (so_far `extendNameSet` cls_nm) cls tys
           ; return (b, ptext (sLit "one of whose superclasses is") <+> quotes (ppr cls)
                        $$ err) }
+       where
+         cls_nm = getName cls
 
 {-
 ************************************************************************
diff --git a/compiler/typecheck/TcType.hs b/compiler/typecheck/TcType.hs
index bbd7bc2..82431c3 100644
--- a/compiler/typecheck/TcType.hs
+++ b/compiler/typecheck/TcType.hs
@@ -1616,7 +1616,10 @@ Notice that
       (Eq a, (Ord a, Ix a))
    And this is try of any class that we can statically guarantee
    as non-recursive (in some sense).  For now, we just make a special
-   case for tuples
+   case for tuples.  Somthing better would be cool.
+
+See also TcTyDecls.checkClassCycles.
+
 
 ************************************************************************
 *                                                                      *
diff --git a/testsuite/tests/polykinds/T11278.hs b/testsuite/tests/polykinds/T11278.hs
new file mode 100644
index 0000000..25c43cd
--- /dev/null
+++ b/testsuite/tests/polykinds/T11278.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE ConstraintKinds #-}
+
+module A where
+
+type K a = (Show a, Read a)
+class K a => C a where
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index fd7b216..6387d17 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -129,4 +129,4 @@ test('SigTvKinds2', expect_broken(11203), compile_fail, [''])
 test('T9017', normal, compile_fail, [''])
 test('T11249', normal, compile, [''])
 test('T11248', normal, compile, [''])
-
+test('T11278', normal, compile, [''])


From git at git.haskell.org  Wed Dec 23 10:13:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:13:23 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (b37f216)
Message-ID: <20151223101323.DECDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b37f2164c08bfc1623ca4d9cab7cc4c2ebbc2e40/ghc

>---------------------------------------------------------------

commit b37f2164c08bfc1623ca4d9cab7cc4c2ebbc2e40
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 23 10:11:56 2015 +0000

    Comments only


>---------------------------------------------------------------

b37f2164c08bfc1623ca4d9cab7cc4c2ebbc2e40
 compiler/rename/RnTypes.hs | 34 +++++++++++++++++++++++++++++++---
 1 file changed, 31 insertions(+), 3 deletions(-)

diff --git a/compiler/rename/RnTypes.hs b/compiler/rename/RnTypes.hs
index 1731ef7..52a164f 100644
--- a/compiler/rename/RnTypes.hs
+++ b/compiler/rename/RnTypes.hs
@@ -349,6 +349,35 @@ and
 as our lists. We can then do normal fixity resolution on these. The fixities
 must come along for the ride just so that the list stays in sync with the
 operators.
+
+Note [QualTy in kinds]
+~~~~~~~~~~~~~~~~~~~~~~
+I was wondering whether QualTy could occur only at TypeLevel.  But no,
+we can have a qualified type in a kind too. Here is an example:
+
+  type family F a where
+    F Bool = Nat
+    F Nat  = Type
+
+  type family G a where
+    G Type = Type -> Type
+    G ()   = Nat
+
+  data X :: forall k1 k2. (F k1 ~ G k2) => k1 -> k2 -> Type where
+    MkX :: X 'True '()
+
+See that k1 becomes Bool and k2 becomes (), so the equality is
+satisfied. If I write MkX :: X 'True 'False, compilation fails with a
+suitable message:
+
+  MkX :: X 'True '()
+    ? Couldn't match kind ?G Bool? with ?Nat?
+      Expected kind: G Bool
+        Actual kind: F Bool
+
+However: in a kind, the constraints in the QualTy must all be
+equalities; or at least, any kinds with a class constraint are
+uninhabited.
 -}
 
 data RnTyKiEnv
@@ -436,9 +465,8 @@ rnHsTyKi env ty@(HsForAllTy { hst_bndrs = tyvars, hst_body  = tau })
        ; return ( HsForAllTy { hst_bndrs = tyvars', hst_body =  tau' }
                 , fvs) } }
 
-rnHsTyKi env ty@(HsQualTy { hst_ctxt = lctxt
-                          , hst_body = tau })
-  = do { checkTypeInType env ty
+rnHsTyKi env ty@(HsQualTy { hst_ctxt = lctxt, hst_body = tau })
+  = do { checkTypeInType env ty  -- See Note [QualTy in kinds]
        ; (ctxt', fvs1) <- rnTyKiContext env lctxt
        ; (tau',  fvs2) <- rnLHsTyKi env tau
        ; return (HsQualTy { hst_ctxt = ctxt', hst_body =  tau' }


From git at git.haskell.org  Wed Dec 23 10:24:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:24:27 +0000 (UTC)
Subject: [commit: packages/array] master: Update testsuite for frozen
 callstacks (6551ad9)
Message-ID: <20151223102427.A69A93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/array

On branch  : master
Link       : http://git.haskell.org/packages/array.git/commitdiff/6551ad9edaca1634a8149ad9c27a72feb456d4e1

>---------------------------------------------------------------

commit 6551ad9edaca1634a8149ad9c27a72feb456d4e1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 23 05:21:32 2015 -0500

    Update testsuite for frozen callstacks


>---------------------------------------------------------------

6551ad9edaca1634a8149ad9c27a72feb456d4e1
 tests/T2120.stdout | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/tests/T2120.stdout b/tests/T2120.stdout
index 4ed3067..518a3e8 100644
--- a/tests/T2120.stdout
+++ b/tests/T2120.stdout
@@ -1,6 +1,2 @@
 Ix{Int}.index: Index (5) out of range ((1,4))
-CallStack (from ImplicitParams):
-  error, called at libraries/base/GHC/Arr.hs:176:5 in base:GHC.Arr
 Error in array index
-CallStack (from ImplicitParams):
-  error, called at libraries/base/GHC/Arr.hs:182:22 in base:GHC.Arr


From git at git.haskell.org  Wed Dec 23 10:24:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:24:58 +0000 (UTC)
Subject: [commit: packages/stm] master: Update tests for frozen callstacks
 (844f84c)
Message-ID: <20151223102458.55E0A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/stm

On branch  : master
Link       : http://git.haskell.org/packages/stm.git/commitdiff/844f84c21f94282187f35a6684d3c3c9f32cf2df

>---------------------------------------------------------------

commit 844f84c21f94282187f35a6684d3c3c9f32cf2df
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 23 05:22:05 2015 -0500

    Update tests for frozen callstacks


>---------------------------------------------------------------

844f84c21f94282187f35a6684d3c3c9f32cf2df
 tests/stm060.stdout | 2 --
 1 file changed, 2 deletions(-)

diff --git a/tests/stm060.stdout b/tests/stm060.stdout
index 17302b9..b476708 100644
--- a/tests/stm060.stdout
+++ b/tests/stm060.stdout
@@ -24,8 +24,6 @@ Caught: Exn raised in invariant
 
 Adding a trivially false invariant (no TVar access)
 Caught: Transactional invariant violation
-CallStack (from ImplicitParams):
-  error, called at libraries/base/GHC/Conc/Sync.hs:767:61 in base:GHC.Conc.Sync
 
 Adding a trivially false invariant (with TVar access)
 Caught: Exn raised in invariant


From git at git.haskell.org  Wed Dec 23 10:30:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 10:30:33 +0000 (UTC)
Subject: [commit: ghc] master: Allow CallStacks to be frozen (380b25e)
Message-ID: <20151223103033.3F1B83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/380b25ea4754c2aea683538ffdb179f8946219a0/ghc

>---------------------------------------------------------------

commit 380b25ea4754c2aea683538ffdb179f8946219a0
Author: Eric Seidel <gridaphobe at gmail.com>
Date:   Wed Dec 23 10:10:04 2015 +0100

    Allow CallStacks to be frozen
    
    This introduces "freezing," an operation which prevents further
    locations from being appended to a CallStack.  Library authors may want
    to prevent CallStacks from exposing implementation details, as a matter
    of hygiene. For example, in
    
    ```
    head [] = error "head: empty list"
    
    ghci> head []
    *** Exception: head: empty list
    CallStack (from implicit params):
      error, called at ...
    ```
    
    including the call-site of `error` in `head` is not strictly necessary
    as the error message already specifies clearly where the error came
    from.
    
    So we add a function `freezeCallStack` that wraps an existing CallStack,
    preventing further call-sites from being pushed onto it. In other words,
    
    ```
    pushCallStack callSite (freezeCallStack callStack) = freezeCallStack callStack
    ```
    
    Now we can define `head` to not produce a CallStack at all
    
    ```
    head [] =
      let ?callStack = freezeCallStack emptyCallStack
      in error "head: empty list"
    
    ghci> head []
    *** Exception: head: empty list
    CallStack (from implicit params):
      error, called at ...
    ```
    
    ---
    
    1. We add the `freezeCallStack` and `emptyCallStack` and update the
       definition of `CallStack` to support this functionality.
    
    2. We add `errorWithoutStackTrace`, a variant of `error` that does not
       produce a stack trace, using this feature. I think this is a sensible
       wrapper function to provide in case users want it.
    
    3. We replace uses of `error` in base with `errorWithoutStackTrace`. The
       rationale is that base does not export any functions that use CallStacks
       (except for `error` and `undefined`) so there's no way for the stack
       traces (from Implicit CallStacks) to include user-defined functions.
       They'll only contain the call to `error` itself. As base already has a
       good habit of providing useful error messages that name the triggering
       function, the stack trace really just adds noise to the error. (I don't
       have a strong opinion on whether we should include this third commit,
       but the change was very mechanical so I thought I'd include it anyway in
       case there's interest)
    
    4. Updates tests in `array` and `stm` submodules
    
    Test Plan: ./validate, new test is T11049
    
    Reviewers: simonpj, nomeata, goldfire, austin, hvr, bgamari
    
    Reviewed By: simonpj
    
    Subscribers: thomie
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1628
    
    GHC Trac Issues: #11049


>---------------------------------------------------------------

380b25ea4754c2aea683538ffdb179f8946219a0
 compiler/deSugar/DsBinds.hs                        | 34 ++------
 compiler/prelude/PrelNames.hs                      | 11 ++-
 docs/users_guide/7.12.1-notes.rst                  |  2 +-
 docs/users_guide/glasgow_exts.rst                  | 28 +++++--
 libraries/array                                    |  2 +-
 libraries/base/Control/Concurrent.hs               |  8 +-
 libraries/base/Control/Exception/Base.hs           |  4 +-
 libraries/base/Control/Monad/Fix.hs                |  6 +-
 libraries/base/Control/Monad/ST/Lazy/Imp.hs        |  2 +-
 libraries/base/Data/Bits.hs                        |  2 +-
 libraries/base/Data/Char.hs                        |  2 +-
 libraries/base/Data/Data.hs                        | 96 +++++++++++-----------
 libraries/base/Data/Dynamic.hs                     |  2 +-
 libraries/base/Data/Foldable.hs                    | 12 +--
 libraries/base/Data/List/NonEmpty.hs               |  4 +-
 libraries/base/Data/Maybe.hs                       |  2 +-
 libraries/base/Data/OldList.hs                     |  8 +-
 libraries/base/Data/Proxy.hs                       |  6 +-
 libraries/base/Data/Semigroup.hs                   | 14 ++--
 libraries/base/Data/Type/Coercion.hs               |  2 +-
 libraries/base/Data/Type/Equality.hs               |  2 +-
 libraries/base/GHC/Arr.hs                          | 14 ++--
 libraries/base/GHC/Base.hs                         |  6 +-
 libraries/base/GHC/Char.hs                         |  2 +-
 libraries/base/GHC/Conc/IO.hs                      |  2 +-
 libraries/base/GHC/Conc/Signal.hs                  |  2 +-
 libraries/base/GHC/Conc/Sync.hs                    |  2 +-
 libraries/base/GHC/Conc/Windows.hs                 |  4 +-
 libraries/base/GHC/ConsoleHandler.hs               |  6 +-
 libraries/base/GHC/Enum.hs                         | 34 ++++----
 libraries/base/GHC/Err.hs                          | 31 ++++++-
 libraries/base/GHC/Event/Array.hs                  |  6 +-
 libraries/base/GHC/Event/Control.hs                |  4 +-
 libraries/base/GHC/Event/EPoll.hsc                 |  2 +-
 libraries/base/GHC/Event/KQueue.hsc                |  4 +-
 libraries/base/GHC/Event/Manager.hs                |  6 +-
 libraries/base/GHC/Event/PSQ.hs                    |  2 +-
 libraries/base/GHC/Event/Poll.hsc                  |  6 +-
 libraries/base/GHC/Event/TimerManager.hs           |  4 +-
 libraries/base/GHC/Exts.hs                         |  4 +-
 libraries/base/GHC/Fingerprint.hs                  |  2 +-
 libraries/base/GHC/Float.hs                        |  4 +-
 libraries/base/GHC/ForeignPtr.hs                   | 22 ++---
 libraries/base/GHC/IO/Buffer.hs                    |  2 +-
 libraries/base/GHC/IO/Encoding/CodePage/API.hs     | 12 +--
 libraries/base/GHC/IO/Handle.hs                    |  4 +-
 libraries/base/GHC/IO/Handle/Internals.hs          |  6 +-
 libraries/base/GHC/IO/Handle/Text.hs               |  2 +-
 libraries/base/GHC/IO/Handle/Types.hs              |  4 +-
 libraries/base/GHC/List.hs                         | 10 +--
 libraries/base/GHC/Natural.hs                      | 16 ++--
 libraries/base/GHC/Pack.hs                         |  2 +-
 libraries/base/GHC/RTS/Flags.hsc                   |  8 +-
 libraries/base/GHC/Real.hs                         |  6 +-
 libraries/base/GHC/Show.hs                         |  6 +-
 libraries/base/GHC/Stack.hs                        | 30 ++++++-
 libraries/base/GHC/Stack/Types.hs                  | 54 ++++++++++--
 libraries/base/Numeric.hs                          |  6 +-
 libraries/base/Prelude.hs                          |  2 +-
 .../base/System/Environment/ExecutablePath.hsc     |  6 +-
 libraries/base/System/IO.hs                        |  2 +-
 libraries/base/Text/ParserCombinators/ReadP.hs     |  2 +-
 libraries/base/Text/Printf.hs                      |  2 +-
 libraries/base/Text/Read.hs                        |  2 +-
 libraries/base/Text/Read/Lex.hs                    |  4 +-
 libraries/base/changelog.md                        | 28 ++++++-
 libraries/base/codepages/MakeTable.hs              |  8 +-
 libraries/base/tests/readFloat.stderr              |  2 -
 libraries/stm                                      |  2 +-
 testsuite/.gitignore                               |  1 +
 testsuite/tests/array/should_run/arr003.stderr     |  2 -
 testsuite/tests/array/should_run/arr004.stderr     |  2 -
 testsuite/tests/array/should_run/arr007.stderr     |  2 -
 testsuite/tests/array/should_run/arr008.stderr     |  2 -
 testsuite/tests/ffi/should_run/fptrfail01.stderr   |  2 -
 .../tests/ghci.debugger/scripts/break009.stdout    |  2 -
 testsuite/tests/ghci/scripts/T10501.stderr         |  4 +-
 .../tests/simplCore/should_compile/EvalTest.stdout |  2 +-
 testsuite/tests/th/TH_exn2.stderr                  |  2 -
 testsuite/tests/typecheck/should_run/T11049.hs     | 17 ++++
 testsuite/tests/typecheck/should_run/T11049.stderr |  1 +
 testsuite/tests/typecheck/should_run/T11049.stdout |  2 +
 testsuite/tests/typecheck/should_run/all.T         |  1 +
 83 files changed, 406 insertions(+), 282 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 380b25ea4754c2aea683538ffdb179f8946219a0

From git at git.haskell.org  Wed Dec 23 11:28:51 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 11:28:51 +0000 (UTC)
Subject: [commit: ghc] master: API Annotaions:add name in PatBind Match
 (cb989e2)
Message-ID: <20151223112851.273F43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/cb989e2f71bbd31aa6b3729030034167d8f8a1ca/ghc

>---------------------------------------------------------------

commit cb989e2f71bbd31aa6b3729030034167d8f8a1ca
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Dec 23 12:44:23 2015 +0200

    API Annotaions:add name in PatBind Match
    
    A PatBind operates similarly to a FunBind, and so the RdrName and
    infix/prefix state needs to be captured for use in API Annotations.


>---------------------------------------------------------------

cb989e2f71bbd31aa6b3729030034167d8f8a1ca
 compiler/parser/RdrHsSyn.hs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index e84f8af..d8c8b3a 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -471,13 +471,13 @@ mkPatSynMatchGroup (L loc patsyn_name) (L _ decls) =
        ; when (length matches /= 1) (wrongNumberErr loc)
        ; return $ mkMatchGroup FromSource matches }
   where
-    fromDecl (L loc decl@(ValD (PatBind pat@(L _ (ConPatIn (L _ name) details)) rhs _ _ _))) =
+    fromDecl (L loc decl@(ValD (PatBind pat@(L _ (ConPatIn ln@(L _ name) details)) rhs _ _ _))) =
         do { unless (name == patsyn_name) $
                wrongNameBindingErr loc decl
            ; match <- case details of
-               PrefixCon pats -> return $ Match NonFunBindMatch pats Nothing rhs
+               PrefixCon pats -> return $ Match (FunBindMatch ln False) pats Nothing rhs
                InfixCon pat1 pat2 ->
-                         return $ Match NonFunBindMatch [pat1, pat2] Nothing rhs
+                         return $ Match (FunBindMatch ln True) [pat1, pat2] Nothing rhs
                RecCon{} -> recordPatSynErr loc pat
            ; return $ L loc match }
     fromDecl (L loc decl) = extraDeclErr loc decl


From git at git.haskell.org  Wed Dec 23 12:09:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 12:09:21 +0000 (UTC)
Subject: [commit: ghc] master: Update tests for Trac #11039 (d1e9f82)
Message-ID: <20151223120921.22E7D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d1e9f827c36f6f552a643c2e537abdf74d87c893/ghc

>---------------------------------------------------------------

commit d1e9f827c36f6f552a643c2e537abdf74d87c893
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Wed Dec 23 12:09:32 2015 +0000

    Update tests for Trac #11039


>---------------------------------------------------------------

d1e9f827c36f6f552a643c2e537abdf74d87c893
 testsuite/tests/patsyn/should_fail/T11039.hs     |  4 +++-
 testsuite/tests/patsyn/should_fail/T11039.stderr | 11 +++++++++++
 testsuite/tests/patsyn/should_fail/T11039a.hs    |  8 ++++++++
 testsuite/tests/patsyn/should_fail/all.T         |  3 ++-
 4 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/patsyn/should_fail/T11039.hs b/testsuite/tests/patsyn/should_fail/T11039.hs
index 69e8d2b..fab5824 100644
--- a/testsuite/tests/patsyn/should_fail/T11039.hs
+++ b/testsuite/tests/patsyn/should_fail/T11039.hs
@@ -1,7 +1,9 @@
 {-# LANGUAGE PatternSynonyms #-}
-module Foo () where
+module T11039 where
 
 data A a = A a
 
+-- This should fail
 pattern Q :: () => (A ~ f) => a -> f a
 pattern Q a = A a
+
diff --git a/testsuite/tests/patsyn/should_fail/T11039.stderr b/testsuite/tests/patsyn/should_fail/T11039.stderr
new file mode 100644
index 0000000..2c7c663
--- /dev/null
+++ b/testsuite/tests/patsyn/should_fail/T11039.stderr
@@ -0,0 +1,11 @@
+
+T11039.hs:8:15: error:
+    ? Couldn't match type ?f? with ?A?
+      ?f? is a rigid type variable bound by
+        the type signature for pattern synonym ?Q?:
+          forall (f :: * -> *) a. a -> f a
+        at T11039.hs:7:14
+      Expected type: f a
+        Actual type: A a
+    ? In the pattern: A a
+      In the declaration for pattern synonym ?Q?
diff --git a/testsuite/tests/patsyn/should_fail/T11039a.hs b/testsuite/tests/patsyn/should_fail/T11039a.hs
new file mode 100644
index 0000000..527a90f
--- /dev/null
+++ b/testsuite/tests/patsyn/should_fail/T11039a.hs
@@ -0,0 +1,8 @@
+{-# LANGUAGE PatternSynonyms #-}
+module T11039a where
+
+data A a = A a
+
+-- This should succeed
+pattern Q2 :: (A ~ f) => a -> f a
+pattern Q2 a = A a
diff --git a/testsuite/tests/patsyn/should_fail/all.T b/testsuite/tests/patsyn/should_fail/all.T
index eeb405b..fbe5d58 100644
--- a/testsuite/tests/patsyn/should_fail/all.T
+++ b/testsuite/tests/patsyn/should_fail/all.T
@@ -16,7 +16,8 @@ test('records-mixing-fields', normal, compile_fail, [''])
 test('records-exquant', normal, compile_fail, [''])
 test('records-poly-update', normal, compile_fail, [''])
 test('mixed-pat-syn-record-sels', normal, compile_fail, [''])
-test('T11039', [expect_broken(11039)], compile_fail, [''])
+test('T11039', normal, compile_fail, [''])
+test('T11039a', normal, compile, [''])
 test('export-type', normal, compile_fail, [''])
 test('export-syntax', normal, compile_fail, [''])
 test('import-syntax', normal, compile_fail, [''])


From git at git.haskell.org  Wed Dec 23 12:11:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 12:11:39 +0000 (UTC)
Subject: [commit: ghc] master: Test #10432 (f141f41)
Message-ID: <20151223121139.C4EDB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f141f416714acf9a88e89bcde49fe79d59395d00/ghc

>---------------------------------------------------------------

commit f141f416714acf9a88e89bcde49fe79d59395d00
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Dec 23 09:35:36 2015 +0100

    Test #10432
    
    Summary: A regression test for #10432, which seems to already be fixed.
    
    Test Plan: ./validate
    
    Reviewers: simonpj, austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1691
    
    GHC Trac Issues: #10432


>---------------------------------------------------------------

f141f416714acf9a88e89bcde49fe79d59395d00
 testsuite/tests/typecheck/should_compile/T10432.hs | 17 +++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 2 files changed, 18 insertions(+)

diff --git a/testsuite/tests/typecheck/should_compile/T10432.hs b/testsuite/tests/typecheck/should_compile/T10432.hs
new file mode 100644
index 0000000..7a9821e
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T10432.hs
@@ -0,0 +1,17 @@
+{-# LANGUAGE ExistentialQuantification, PolyKinds,
+             DataKinds, RankNTypes, GADTs, TypeOperators #-}
+module T10432 where
+
+import Data.Type.Equality
+
+data WrappedType = forall a. WrapType a;
+
+matchReflK :: forall (a :: ka) (b :: kb) (r :: *).
+  ('WrapType a :~: 'WrapType b) -> (('WrapType a ~ 'WrapType b) => r) -> r;
+  matchReflK Refl r = r;
+
+matchReflK2 :: forall (a :: ka) (b :: kb) (r :: *).
+               ('WrapType a :~: 'WrapType b) ->  r
+matchReflK2 x = let foo :: ('WrapType a ~ 'WrapType b) => r
+                    foo = undefined
+                in undefined
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index ae2aa94..a969a4c 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -461,6 +461,7 @@ test('T10009', normal, compile, [''])
 test('T10390', normal, compile, [''])
 test('T8555', normal, compile, [''])
 test('T8799', normal, compile, [''])
+test('T10432', normal, compile, [''])
 test('T10423', normal, compile, [''])
 test('T10489', unless(compiler_debugged(), skip), compile, [''])
 test('T10348', normal, compile, [''])


From git at git.haskell.org  Wed Dec 23 14:35:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 14:35:59 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/T10832-generalised-injectivity' created
Message-ID: <20151223143559.AC8A93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : wip/T10832-generalised-injectivity
Referencing: 332bc0d3af0a208ad310ce28cf798d4682423329

From git at git.haskell.org  Wed Dec 23 14:36:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 14:36:02 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity: Generalized
 injective type families (332bc0d)
Message-ID: <20151223143602.74E243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/332bc0d3af0a208ad310ce28cf798d4682423329/ghc

>---------------------------------------------------------------

commit 332bc0d3af0a208ad310ce28cf798d4682423329
Author: Jan Stolarek <jan.stolarek at p.lodz.pl>
Date:   Wed Dec 23 10:18:44 2015 +0000

    Generalized injective type families
    
    (As modified onto HEAD, 23 Dec 15)
    
    Summary:
    Generalization of injective type families to match the expressiveness of
    functional dependencies, as briefly outlined in Section 7 of "Injective type
    families for Haskell" Haskell Symposium 2015 paper.  See also injectivity of
    type C described on the wiki page
    https://ghc.haskell.org/trac/ghc/wiki/InjectiveTypeFamilies
    
    Test Plan: ./validate
    
    Reviewers: simonpj, austin, goldfire, bgamari
    
    Subscribers: thomie, mpickering
    
    Projects: #ghc
    
    Differential Revision: https://phabricator.haskell.org/D1287
    
    GHC Trac Issues: #10832


>---------------------------------------------------------------

332bc0d3af0a208ad310ce28cf798d4682423329
 compiler/deSugar/DsMeta.hs                         | 18 +++++--
 compiler/hsSyn/Convert.hs                          | 15 ++++--
 compiler/hsSyn/HsDecls.hs                          | 21 ++++++--
 compiler/iface/IfaceSyn.hs                         | 18 ++++---
 compiler/parser/Parser.y                           | 31 +++++++----
 compiler/prelude/THNames.hs                        | 61 ++++++++++++----------
 compiler/rename/RnSource.hs                        | 35 +++++++++----
 compiler/typecheck/FamInst.hs                      | 57 ++++++++++++--------
 compiler/typecheck/TcInteract.hs                   | 47 +++++++++++------
 compiler/typecheck/TcSplice.hs                     | 11 ++--
 compiler/typecheck/TcTyClsDecls.hs                 | 29 +++++++---
 compiler/typecheck/TcValidity.hs                   | 15 +++---
 compiler/types/FamInstEnv.hs                       | 27 +++++-----
 compiler/types/TyCon.hs                            | 11 ++--
 compiler/types/Unify.hs                            | 15 +++---
 libraries/ghci/GHCi/TH/Binary.hs                   |  2 +-
 libraries/template-haskell/Language/Haskell/TH.hs  |  4 +-
 .../template-haskell/Language/Haskell/TH/Lib.hs    | 10 ++--
 .../template-haskell/Language/Haskell/TH/Ppr.hs    | 10 ++--
 .../template-haskell/Language/Haskell/TH/Syntax.hs |  5 +-
 20 files changed, 285 insertions(+), 157 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 332bc0d3af0a208ad310ce28cf798d4682423329

From git at git.haskell.org  Wed Dec 23 21:18:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 21:18:53 +0000 (UTC)
Subject: [commit: ghc] master: Docs: -interactive-print should reside in
 registered package (7cddcde)
Message-ID: <20151223211853.92E8D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7cddcde52cf27c55223b1dbb995df623498d0f70/ghc

>---------------------------------------------------------------

commit 7cddcde52cf27c55223b1dbb995df623498d0f70
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Dec 23 22:14:57 2015 +0100

    Docs: -interactive-print should reside in registered package
    
    Since commit 03c4893e355948fe865bc52c744359c42e4b06d7, ic_int_print is
    retained from registered packages after `:reload`.
    
    Fixes #11159.


>---------------------------------------------------------------

7cddcde52cf27c55223b1dbb995df623498d0f70
 docs/users_guide/ghci.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst
index 347bb87..7fedf21 100644
--- a/docs/users_guide/ghci.rst
+++ b/docs/users_guide/ghci.rst
@@ -1068,7 +1068,9 @@ contains strings with non-ascii characters.
 The ``-interactive-print`` flag allows to specify any function of type
 ``C a => a -> IO ()``, for some constraint ``C``, as the function for
 printing evaluated expressions. The function can reside in any loaded
-module or any registered package.
+module or any registered package, but only when it resides in a registered
+package will it survive a ``:cd``, ``:add``, ``:load``, ``:reload`` or
+``:set``.
 
 As an example, suppose we have following special printing module:
 


From git at git.haskell.org  Wed Dec 23 21:59:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 21:59:21 +0000 (UTC)
Subject: [commit: ghc] master: Make testsuite work again with Py3 (3221599)
Message-ID: <20151223215921.E8E4F3A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/32215996528779f71a636350a36c01a8b3ccb1bf/ghc

>---------------------------------------------------------------

commit 32215996528779f71a636350a36c01a8b3ccb1bf
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 23 22:37:42 2015 +0100

    Make testsuite work again with Py3
    
    Python 3 support seems to have mildly bitrotten since #9184 was closed.
    Luckily, only some minor tweaks seem necessary.


>---------------------------------------------------------------

32215996528779f71a636350a36c01a8b3ccb1bf
 testsuite/driver/testlib.py  | 11 ++++++++---
 testsuite/driver/testutil.py |  2 +-
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 4e9a1fb..33e134d 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -23,6 +23,11 @@ import subprocess
 from testglobals import *
 from testutil import *
 
+try:
+    basestring
+except: # Python 3
+    basestring = (str,bytes)
+
 if config.use_threads:
     import threading
     try:
@@ -691,8 +696,8 @@ def test_common_work (name, opts, func, args):
         elif config.speed > 0:
             # However, if we EXPLICITLY asked for a way (with extra_ways)
             # please test it!
-            explicit_ways = filter(lambda way: way in opts.extra_ways, do_ways)
-            other_ways = filter(lambda way: way not in opts.extra_ways, do_ways)
+            explicit_ways = list(filter(lambda way: way in opts.extra_ways, do_ways))
+            other_ways = list(filter(lambda way: way not in opts.extra_ways, do_ways))
             do_ways = other_ways[:1] + explicit_ways
 
         if not config.clean_only:
@@ -1721,7 +1726,7 @@ def normalise_errmsg( str ):
     # Also filter out bullet characters.  This is because bullets are used to
     # separate error sections, and tests shouldn't be sensitive to how the
     # the division happens.
-    bullet = u'?'.encode('utf8')
+    bullet = u'?'.encode('utf8') if isinstance(str, bytes) else u'?'
     str = str.replace(bullet, '')
     return str
 
diff --git a/testsuite/driver/testutil.py b/testsuite/driver/testutil.py
index 2f037f0..029a3b6 100644
--- a/testsuite/driver/testutil.py
+++ b/testsuite/driver/testutil.py
@@ -33,6 +33,6 @@ def getStdout(cmd_and_args):
     r = p.wait()
     if r != 0:
         raise Exception("Command failed: " + str(cmd_and_args))
-    if stderr != '':
+    if stderr:
         raise Exception("stderr from command: " + str(cmd_and_args))
     return stdout


From git at git.haskell.org  Wed Dec 23 22:51:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 23 Dec 2015 22:51:50 +0000 (UTC)
Subject: [commit: ghc] master: config.mk.in: Disable stripping by default on
 ARM (353e97a)
Message-ID: <20151223225150.6B7DA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/353e97a37da98ccd174429fad348efbf01ace96c/ghc

>---------------------------------------------------------------

commit 353e97a37da98ccd174429fad348efbf01ace96c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Wed Dec 23 23:51:02 2015 +0100

    config.mk.in: Disable stripping by default on ARM
    
    The Cortex A8 hardware apparently has a bug which ld.gold will try to
    correct; however in order to do so it must have unstripped executables
    lest we see warnings of the form (see #10376, #10464),
    
        /usr/bin/ld.gold: warning: cannot scan executable section 1 of ...
        for Cortex-A8 erratum because it has no mapping symbols.
    
    Consequently we disabling stripping by default on this architecture.
    
    A bit more discussion about this issue can be found in this [Android
    issue](http://code.google.com/p/android/issues/detail?id=40794).
    
    Test Plan: Try validating on ARM
    
    Reviewers: erikd, austin, thomie
    
    Reviewed By: austin, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1599
    
    GHC Trac Issues: #10376, #10464


>---------------------------------------------------------------

353e97a37da98ccd174429fad348efbf01ace96c
 mk/config.mk.in | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/mk/config.mk.in b/mk/config.mk.in
index d7cd05b..fd0bb51 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -755,6 +755,17 @@ endif
 
 ifeq "$(TARGETPLATFORM)" "x86_64-unknown-mingw32"
 STRIP_CMD      = $(TOP)/inplace/mingw/bin/strip.exe
+else ifeq "$(TARGETPLATFORM)" "arm-unknown-linux"
+# The Cortex A8 hardware apparently has a bug which ld.gold will check for;
+# however in order to do so it must have unstripped executables lest we
+# see warnings of the form (see #10376, #10464),
+#
+#     /usr/bin/ld.gold: warning: cannot scan executable section 1 of ... for
+#     Cortex-A8 erratum because it has no mapping symbols.
+#
+# Consequently we disabling stripping by default on this architecture.
+# The hack of using `:` to disable stripping is implemented by ghc-cabal.
+STRIP_CMD      = :
 else
 STRIP_CMD      = strip
 endif


From git at git.haskell.org  Thu Dec 24 12:39:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 12:39:35 +0000 (UTC)
Subject: [commit: ghc] master: ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
 (3017cbc)
Message-ID: <20151224123935.2F7E13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3017cbcfd10fe0a364cc8b039c07a94c3b9e61cc/ghc

>---------------------------------------------------------------

commit 3017cbcfd10fe0a364cc8b039c07a94c3b9e61cc
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Dec 24 13:39:28 2015 +0100

    ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
    
    This is still needed by the Shake build system until things have been
    reworked to use Cabal directly.


>---------------------------------------------------------------

3017cbcfd10fe0a364cc8b039c07a94c3b9e61cc
 utils/ghc-cabal/Main.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 66ebd14..680c573 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -415,6 +415,7 @@ generate directory distdir dll0Modules config_args
                 variablePrefix ++ "_DEP_IPIDS = " ++ unwords dep_ipids,
                 variablePrefix ++ "_DEP_NAMES = " ++ unwords depNames,
                 variablePrefix ++ "_DEP_COMPONENT_IDS = " ++ unwords depLibNames,
+                variablePrefix ++ "_TRANSITIVE_DEP_NAMES = " ++ unwords transitiveDepNames,
                 variablePrefix ++ "_TRANSITIVE_DEP_COMPONENT_IDS = " ++ unwords transitiveDepLibNames,
                 variablePrefix ++ "_INCLUDE_DIRS = " ++ unwords (includeDirs bi),
                 variablePrefix ++ "_INCLUDES = " ++ unwords (includes bi),


From git at git.haskell.org  Thu Dec 24 14:23:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 14:23:53 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity: Big wad of
 refactoring (952b11f)
Message-ID: <20151224142353.BEC603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/952b11f2383f80bb1960ad2b1ce055258907f7ac/ghc

>---------------------------------------------------------------

commit 952b11f2383f80bb1960ad2b1ce055258907f7ac
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 14:21:20 2015 +0000

    Big wad of refactoring
    
    The main starting point is the representation of injectivity
    in TyCon.  See Note [Injecivity information] in TyCon


>---------------------------------------------------------------

952b11f2383f80bb1960ad2b1ce055258907f7ac
 compiler/hsSyn/HsDecls.hs                          | 179 +++++++++++----------
 compiler/iface/IfaceSyn.hs                         |  30 ++--
 compiler/iface/TcIface.hs                          |   2 +-
 compiler/prelude/TysPrim.hs                        |   4 +-
 compiler/typecheck/FamInst.hs                      |  59 ++++---
 compiler/typecheck/TcInteract.hs                   |  44 ++---
 compiler/typecheck/TcSplice.hs                     |  41 ++---
 compiler/typecheck/TcTyClsDecls.hs                 |  46 +++---
 compiler/typecheck/TcTypeNats.hs                   | 109 ++++++-------
 compiler/typecheck/TcValidity.hs                   |   6 +-
 compiler/types/FamInstEnv.hs                       |  42 +++--
 compiler/types/TyCoRep.hs                          |  10 +-
 compiler/types/TyCoRep.hs-boot                     |   1 +
 compiler/types/TyCon.hs                            | 151 ++++++++++++-----
 compiler/types/Type.hs                             |  25 +--
 compiler/types/Type.hs-boot                        |   4 +-
 compiler/types/Unify.hs                            |  20 ++-
 compiler/utils/Pair.hs                             |   7 +-
 .../template-haskell/Language/Haskell/TH/Syntax.hs |   2 +-
 19 files changed, 429 insertions(+), 353 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 952b11f2383f80bb1960ad2b1ce055258907f7ac

From git at git.haskell.org  Thu Dec 24 15:00:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:00:43 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity: Fix scoping of
 result tyvar in tcInjectivity (6dac3e8)
Message-ID: <20151224150043.289063A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/6dac3e824ab6216b83d437224da40e1828a3ffe5/ghc

>---------------------------------------------------------------

commit 6dac3e824ab6216b83d437224da40e1828a3ffe5
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 15:01:17 2015 +0000

    Fix scoping of result tyvar in tcInjectivity


>---------------------------------------------------------------

6dac3e824ab6216b83d437224da40e1828a3ffe5
 compiler/typecheck/TcTyClsDecls.hs | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/compiler/typecheck/TcTyClsDecls.hs b/compiler/typecheck/TcTyClsDecls.hs
index db263fe..c7ec4eb 100644
--- a/compiler/typecheck/TcTyClsDecls.hs
+++ b/compiler/typecheck/TcTyClsDecls.hs
@@ -718,11 +718,11 @@ tcFamDecl1 :: Maybe Class -> FamilyDecl Name -> TcM TyCon
 tcFamDecl1 parent (FamilyDecl { fdInfo = OpenTypeFamily, fdLName = L _ tc_name
                               , fdTyVars = tvs, fdResultSig = L _ sig
                               , fdInjectivityAnn = inj })
-  = tcTyClTyVars tc_name tvs $ \ kvs' tvs' full_kind _res_kind -> do
+  = tcTyClTyVars tc_name tvs $ \ kvs' tvs' full_kind res_kind -> do
   { traceTc "open type family:" (ppr tc_name)
   ; checkFamFlag tc_name
   ; let all_tvs = kvs' ++ tvs'
-  ; inj' <- tcInjectivity all_tvs inj
+  ; inj' <- tcInjectivity all_tvs sig res_kind inj
   ; let tycon = mkFamilyTyCon tc_name full_kind all_tvs
                                OpenSynFamilyTyCon parent
                                (resultVariableName sig) inj'
@@ -738,9 +738,9 @@ tcFamDecl1 parent
          -- the variables in the header scope only over the injectivity
          -- declaration but this is not involved here
        ; (tvs', inj', kind) <- tcTyClTyVars tc_name tvs
-                               $ \ kvs' tvs' full_kind _res_kind ->
+                               $ \ kvs' tvs' full_kind res_kind ->
                                do { let all_tvs = kvs' ++ tvs'
-                                  ; inj' <- tcInjectivity all_tvs inj
+                                  ; inj' <- tcInjectivity all_tvs sig res_kind inj
                                   ; return (all_tvs, inj', full_kind) }
 
        ; checkFamFlag tc_name -- make sure we have -XTypeFamilies
@@ -809,9 +809,11 @@ tcFamDecl1 parent
 -- True on position
 -- N means that a function is injective in its Nth argument. False means it is
 -- not.
-tcInjectivity :: [TyVar] -> Maybe (LInjectivityAnn Name)
+tcInjectivity :: [TyVar]
+              -> FamilyResultSig Name -> Kind
+              -> Maybe (LInjectivityAnn Name)
               -> TcM Injectivity
-tcInjectivity _ Nothing
+tcInjectivity _ _ _ Nothing
   = return []
 
   -- User provided an injectivity annotation, so for each tyvar argument we
@@ -832,9 +834,14 @@ tcInjectivity _ Nothing
   -- therefore we can always infer the result kind if we know the result type.
   -- But this does not seem to be useful in any way so we don't do it.  (Another
   -- reason is that the implementation would not be straightforward.)
-tcInjectivity tvs (Just (L loc (InjectivityAnn injConds)))
+tcInjectivity tvs res_sig res_kind (Just (L loc (InjectivityAnn injConds)))
   = setSrcSpan loc $
+    tcExtendTyVarEnv res_tv $
     mapM (tcInjectivityCond tvs) injConds
+  where
+    res_tv = case res_sig of
+               TyVarSig res_tv -> [mkTyVar (hsLTyVarName res_tv) res_kind]
+               _               -> []
 
 tcInjectivityCond :: [TyVar] -> LInjectivityCond Name
                   -> TcM InjCondition


From git at git.haskell.org  Thu Dec 24 15:01:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:01:12 +0000 (UTC)
Subject: [commit: ghc] master: Improve tracing a bit in CoreSubst (fcc7498)
Message-ID: <20151224150112.046C73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fcc7498f9b36c7c47d4d7aea8c277fe7a5699f51/ghc

>---------------------------------------------------------------

commit fcc7498f9b36c7c47d4d7aea8c277fe7a5699f51
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 14:44:16 2015 +0000

    Improve tracing a bit in CoreSubst


>---------------------------------------------------------------

fcc7498f9b36c7c47d4d7aea8c277fe7a5699f51
 compiler/coreSyn/CoreSubst.hs | 50 ++++++++++++++++++++++++-------------------
 1 file changed, 28 insertions(+), 22 deletions(-)

diff --git a/compiler/coreSyn/CoreSubst.hs b/compiler/coreSyn/CoreSubst.hs
index e77886b..0b48bbf 100644
--- a/compiler/coreSyn/CoreSubst.hs
+++ b/compiler/coreSyn/CoreSubst.hs
@@ -364,19 +364,19 @@ instance Outputable Subst where
 -- Do *not* attempt to short-cut in the case of an empty substitution!
 -- See Note [Extending the Subst]
 substExprSC :: SDoc -> Subst -> CoreExpr -> CoreExpr
-substExprSC _doc subst orig_expr
+substExprSC doc subst orig_expr
   | isEmptySubst subst = orig_expr
   | otherwise          = -- pprTrace "enter subst-expr" (doc $$ ppr orig_expr) $
-                         subst_expr subst orig_expr
+                         subst_expr doc subst orig_expr
 
 substExpr :: SDoc -> Subst -> CoreExpr -> CoreExpr
-substExpr _doc subst orig_expr = subst_expr subst orig_expr
+substExpr doc subst orig_expr = subst_expr doc subst orig_expr
 
-subst_expr :: Subst -> CoreExpr -> CoreExpr
-subst_expr subst expr
+subst_expr :: SDoc -> Subst -> CoreExpr -> CoreExpr
+subst_expr doc subst expr
   = go expr
   where
-    go (Var v)         = lookupIdSubst (text "subst_expr") subst v
+    go (Var v)         = lookupIdSubst (doc $$ text "subst_expr") subst v
     go (Type ty)       = Type (substTy subst ty)
     go (Coercion co)   = Coercion (substCo subst co)
     go (Lit lit)       = Lit lit
@@ -389,11 +389,11 @@ subst_expr subst expr
        --         lose a binder. We optimise the LHS of rules at
        --         construction time
 
-    go (Lam bndr body) = Lam bndr' (subst_expr subst' body)
+    go (Lam bndr body) = Lam bndr' (subst_expr doc subst' body)
                        where
                          (subst', bndr') = substBndr subst bndr
 
-    go (Let bind body) = Let bind' (subst_expr subst' body)
+    go (Let bind body) = Let bind' (subst_expr doc subst' body)
                        where
                          (subst', bind') = substBind subst bind
 
@@ -401,7 +401,7 @@ subst_expr subst expr
                                  where
                                  (subst', bndr') = substBndr subst bndr
 
-    go_alt subst (con, bndrs, rhs) = (con, bndrs', subst_expr subst' rhs)
+    go_alt subst (con, bndrs, rhs) = (con, bndrs', subst_expr doc subst' rhs)
                                  where
                                    (subst', bndrs') = substBndrs subst bndrs
 
@@ -421,18 +421,22 @@ substBindSC subst bind    -- Short-cut if the substitution is empty
           where
             (bndrs, rhss)    = unzip pairs
             (subst', bndrs') = substRecBndrs subst bndrs
-            rhss' | isEmptySubst subst' = rhss
-                  | otherwise           = map (subst_expr subst') rhss
+            rhss' | isEmptySubst subst'
+                  = rhss
+                  | otherwise
+                  = map (subst_expr (text "substBindSC") subst') rhss
 
-substBind subst (NonRec bndr rhs) = (subst', NonRec bndr' (subst_expr subst rhs))
-                                  where
-                                    (subst', bndr') = substBndr subst bndr
+substBind subst (NonRec bndr rhs)
+  = (subst', NonRec bndr' (subst_expr (text "substBind") subst rhs))
+  where
+    (subst', bndr') = substBndr subst bndr
 
-substBind subst (Rec pairs) = (subst', Rec (bndrs' `zip` rhss'))
-                            where
-                                (bndrs, rhss)    = unzip pairs
-                                (subst', bndrs') = substRecBndrs subst bndrs
-                                rhss' = map (subst_expr subst') rhss
+substBind subst (Rec pairs)
+   = (subst', Rec (bndrs' `zip` rhss'))
+   where
+       (bndrs, rhss)    = unzip pairs
+       (subst', bndrs') = substRecBndrs subst bndrs
+       rhss' = map (subst_expr (text "substBind") subst') rhss
 
 -- | De-shadowing the program is sometimes a useful pre-pass. It can be done simply
 -- by running over the bindings with an empty substitution, because substitution
@@ -736,8 +740,10 @@ substDVarSet subst fvs
 
 ------------------
 substTickish :: Subst -> Tickish Id -> Tickish Id
-substTickish subst (Breakpoint n ids) = Breakpoint n (map do_one ids)
- where do_one = getIdFromTrivialExpr . lookupIdSubst (text "subst_tickish") subst
+substTickish subst (Breakpoint n ids)
+   = Breakpoint n (map do_one ids)
+ where
+    do_one = getIdFromTrivialExpr . lookupIdSubst (text "subst_tickish") subst
 substTickish _subst other = other
 
 {- Note [Substitute lazily]
@@ -1457,7 +1463,7 @@ pushCoercionIntoLambda in_scope x e co
           subst = extendIdSubst (mkEmptySubst in_scope')
                                 x
                                 (mkCast (Var x') co1)
-      in Just (x', subst_expr subst e `mkCast` co2)
+      in Just (x', subst_expr (text "pushCoercionIntoLambda") subst e `mkCast` co2)
     | otherwise
     = pprTrace "exprIsLambda_maybe: Unexpected lambda in case" (ppr (Lam x e))
       Nothing


From git at git.haskell.org  Thu Dec 24 15:01:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:01:20 +0000 (UTC)
Subject: [commit: ghc] master: Refactoring only (1af0d36)
Message-ID: <20151224150120.0CCA43A302@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1af0d36be801a2039ba5c3c1546f06b6dad9b7a1/ghc

>---------------------------------------------------------------

commit 1af0d36be801a2039ba5c3c1546f06b6dad9b7a1
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 14:55:35 2015 +0000

    Refactoring only
    
    This moves code around to more sensible places.
    
    - Construction for CoAxiom is localised in FamInstEnv
    
    - orphNamesOfxx moves to CoreFVs
    
    - roughMatchTcs, instanceCantMatch moves to Unify
    
    - mkNewTypeCo moves from Coercion to FamInstEnv, and is
      renamed mkNewTypeCoAxiom, which makes more sense


>---------------------------------------------------------------

1af0d36be801a2039ba5c3c1546f06b6dad9b7a1
 compiler/coreSyn/CoreFVs.hs        | 103 ++++++++++++++++++++++++++++++++++++-
 compiler/iface/BuildTyCl.hs        |   9 ++--
 compiler/iface/IfaceSyn.hs         |   2 +-
 compiler/main/InteractiveEval.hs   |   3 +-
 compiler/prelude/TysWiredIn.hs     |   4 +-
 compiler/typecheck/Inst.hs         |   1 +
 compiler/typecheck/TcHsType.hs     |   4 +-
 compiler/typecheck/TcRnDriver.hs   |   1 +
 compiler/typecheck/TcTyClsDecls.hs |   4 +-
 compiler/typecheck/TcType.hs       |  88 +------------------------------
 compiler/types/CoAxiom.hs          |  17 +++---
 compiler/types/Coercion.hs         |  23 +--------
 compiler/types/FamInstEnv.hs       |  92 +++++++++++++++++++--------------
 compiler/types/InstEnv.hs          |  58 ++++++++-------------
 compiler/types/TyCoRep.hs          |   5 +-
 compiler/types/Type.hs             |   7 ++-
 compiler/types/Unify.hs            |  32 ++++++++++++
 17 files changed, 247 insertions(+), 206 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1af0d36be801a2039ba5c3c1546f06b6dad9b7a1

From git at git.haskell.org  Thu Dec 24 15:01:17 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:01:17 +0000 (UTC)
Subject: [commit: ghc] master: Improve SimplUtils.interestingArg (6ec236b)
Message-ID: <20151224150117.3F9363A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6ec236b589d541e72eea8df84628206d26e93862/ghc

>---------------------------------------------------------------

commit 6ec236b589d541e72eea8df84628206d26e93862
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 14:40:08 2015 +0000

    Improve SimplUtils.interestingArg
    
    There were two problems here:
     - We were looking under a lambda without extending
       the in-scope env, which triggered a WARNING
       But there's no need to look under a lambda.
    
     - We were looking under a letrec without extending
       the in-scope env, which triggered the same WARNING
       Solution: extend the in-scope env


>---------------------------------------------------------------

6ec236b589d541e72eea8df84628206d26e93862
 compiler/simplCore/SimplUtils.hs | 29 ++++++++++++++++-------------
 1 file changed, 16 insertions(+), 13 deletions(-)

diff --git a/compiler/simplCore/SimplUtils.hs b/compiler/simplCore/SimplUtils.hs
index 29336c1..09fd1e4 100644
--- a/compiler/simplCore/SimplUtils.hs
+++ b/compiler/simplCore/SimplUtils.hs
@@ -633,20 +633,23 @@ interestingArg env e = go env 0 e
            Just (DoneEx e)             -> go (zapSubstEnv env)             n e
            Just (ContEx tvs cvs ids e) -> go (setSubstEnv env tvs cvs ids) n e
 
-    go _   _ (Lit {})              = ValueArg
-    go _   _ (Type _)              = TrivArg
-    go _   _ (Coercion _)          = TrivArg
-    go env n (App fn (Type _))     = go env n fn
-    go env n (App fn (Coercion _)) = go env n fn
-    go env n (App fn _)            = go env (n+1) fn
-    go env n (Tick _ a)            = go env n a
-    go env n (Cast e _)            = go env n e
+    go _   _ (Lit {})          = ValueArg
+    go _   _ (Type _)          = TrivArg
+    go _   _ (Coercion _)      = TrivArg
+    go env n (App fn (Type _)) = go env n fn
+    go env n (App fn _)        = go env (n+1) fn
+    go env n (Tick _ a)        = go env n a
+    go env n (Cast e _)        = go env n e
     go env n (Lam v e)
-       | isTyVar v                 = go env n     e
-       | n>0                       = go env (n-1) e
-       | otherwise                 = ValueArg
-    go env n (Let _ e)             = case go env n e of { ValueArg -> ValueArg; _ -> NonTrivArg }
-    go _ _ (Case {})               = NonTrivArg
+       | isTyVar v             = go env n e
+       | n>0                   = NonTrivArg     -- (\x.b) e   is NonTriv
+       | otherwise             = ValueArg
+    go _ _ (Case {})           = NonTrivArg
+    go env n (Let b e)         = case go env' n e of
+                                   ValueArg -> ValueArg
+                                   _        -> NonTrivArg
+                               where
+                                 env' = env `addNewInScopeIds` bindersOf b
 
     go_var n v
        | isConLikeId v     = ValueArg   -- Experimenting with 'conlike' rather that


From git at git.haskell.org  Thu Dec 24 15:01:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:01:14 +0000 (UTC)
Subject: [commit: ghc] master: Improve the runRW magic in CorePrep (d990354)
Message-ID: <20151224150114.9D82F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d990354473239943d83ee90f8906f3737b53fe65/ghc

>---------------------------------------------------------------

commit d990354473239943d83ee90f8906f3737b53fe65
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 14:42:34 2015 +0000

    Improve the runRW magic in CorePrep
    
    Instead of substituting, just augment the environment.
    Less code, more efficient.
    
    And the previous version had a bogus in-scope set which
    triggered a WARNING


>---------------------------------------------------------------

d990354473239943d83ee90f8906f3737b53fe65
 compiler/coreSyn/CorePrep.hs | 20 ++++++++------------
 1 file changed, 8 insertions(+), 12 deletions(-)

diff --git a/compiler/coreSyn/CorePrep.hs b/compiler/coreSyn/CorePrep.hs
index 70eb1a1..8b4b13b 100644
--- a/compiler/coreSyn/CorePrep.hs
+++ b/compiler/coreSyn/CorePrep.hs
@@ -516,15 +516,11 @@ cpeRhsE env (Var f `App` _{-type-} `App` arg)
   | f `hasKey` lazyIdKey          -- Replace (lazy a) by a
   = cpeRhsE env arg               -- See Note [lazyId magic] in MkId
 
-cpeRhsE env (Var f `App` _{-levity-} `App` _{-type-} `App` arg)
+cpeRhsE env (Var f `App` _levity `App` _type `App` arg)
     -- See Note [runRW magic] in MkId
   | f `hasKey` runRWKey           -- Replace (runRW# f) by (f realWorld#),
   = case arg of                   -- beta reducing if possible
-      Lam s body -> cpeRhsE env (substExpr (text "runRW#") subst body)
-        where subst = extendIdSubst emptySubst s (Var realWorldPrimId)
-                      -- XXX I think we can use emptySubst here
-                      -- because realWorldPrimId is a global variable
-                      -- and so cannot be bound by a lambda in body
+      Lam s body -> cpeRhsE (extendCorePrepEnv env s realWorldPrimId) body
       _          -> cpeRhsE env (arg `App` Var realWorldPrimId)
 
 cpeRhsE env expr@(App {}) = cpeApp env expr
@@ -1161,12 +1157,12 @@ allLazyNested is_rec (Floats IfUnboxedOk _) = isNonRec is_rec
 --                      The environment
 -- ---------------------------------------------------------------------------
 
-data CorePrepEnv = CPE {
-                       cpe_dynFlags    :: DynFlags,
-                       cpe_env         :: (IdEnv Id), -- Clone local Ids
-                       cpe_mkIntegerId :: Id,
-                       cpe_integerSDataCon :: Maybe DataCon
-                   }
+data CorePrepEnv
+  = CPE { cpe_dynFlags        :: DynFlags
+        , cpe_env             :: IdEnv Id   -- Clone local Ids
+        , cpe_mkIntegerId     :: Id
+        , cpe_integerSDataCon :: Maybe DataCon
+    }
 
 lookupMkIntegerName :: DynFlags -> HscEnv -> IO Id
 lookupMkIntegerName dflags hsc_env


From git at git.haskell.org  Thu Dec 24 15:03:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:03:34 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity: Merge
 remote-tracking branch 'origin/master' into
 wip/T10832-generalised-injectivity (272fc85)
Message-ID: <20151224150334.665C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/272fc85d99a096010523e317e46201fd31523c79/ghc

>---------------------------------------------------------------

commit 272fc85d99a096010523e317e46201fd31523c79
Merge: 6dac3e8 1af0d36
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 15:03:32 2015 +0000

    Merge remote-tracking branch 'origin/master' into wip/T10832-generalised-injectivity



>---------------------------------------------------------------


Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 272fc85d99a096010523e317e46201fd31523c79

From git at git.haskell.org  Thu Dec 24 15:03:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:03:36 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity's head updated:
 Merge remote-tracking branch 'origin/master' into
 wip/T10832-generalised-injectivity (272fc85)
Message-ID: <20151224150336.BE5C83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/T10832-generalised-injectivity' now includes:

     380b25e Allow CallStacks to be frozen
     cb989e2 API Annotaions:add name in PatBind Match
     d1e9f82 Update tests for Trac #11039
     f141f41 Test #10432
     7cddcde Docs: -interactive-print should reside in registered package
     3221599 Make testsuite work again with Py3
     353e97a config.mk.in: Disable stripping by default on ARM
     3017cbc ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
     6ec236b Improve SimplUtils.interestingArg
     d990354 Improve the runRW magic in CorePrep
     fcc7498 Improve tracing a bit in CoreSubst
     1af0d36 Refactoring only
     272fc85 Merge remote-tracking branch 'origin/master' into wip/T10832-generalised-injectivity

From git at git.haskell.org  Thu Dec 24 15:09:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 15:09:54 +0000 (UTC)
Subject: [commit: ghc] wip/T10832-generalised-injectivity: Wibbles in TH
 (d822e28)
Message-ID: <20151224150954.47CB23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/T10832-generalised-injectivity
Link       : http://ghc.haskell.org/trac/ghc/changeset/d822e2879db15f1ebd5b8aed756f1609c17969b6/ghc

>---------------------------------------------------------------

commit d822e2879db15f1ebd5b8aed756f1609c17969b6
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 24 15:10:35 2015 +0000

    Wibbles in TH


>---------------------------------------------------------------

d822e2879db15f1ebd5b8aed756f1609c17969b6
 libraries/template-haskell/Language/Haskell/TH/Lib.hs | 12 ++++++------
 libraries/template-haskell/Language/Haskell/TH/Ppr.hs |  4 ++--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index 886e8bd..a2d26d2 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -461,12 +461,12 @@ dataFamilyD tc tvs kind
     = return $ DataFamilyD tc tvs kind
 
 openTypeFamilyD :: Name -> [TyVarBndr] -> FamilyResultSig
-                -> Maybe InjectivityAnn -> DecQ
+                -> InjectivityAnn -> DecQ
 openTypeFamilyD tc tvs res inj
     = return $ OpenTypeFamilyD (TypeFamilyHead tc tvs res inj)
 
 closedTypeFamilyD :: Name -> [TyVarBndr] -> FamilyResultSig
-                  -> Maybe InjectivityAnn -> [TySynEqnQ] -> DecQ
+                  -> InjectivityAnn -> [TySynEqnQ] -> DecQ
 closedTypeFamilyD tc tvs result injectivity eqns =
   do eqns1 <- sequence eqns
      return (ClosedTypeFamilyD (TypeFamilyHead tc tvs result injectivity) eqns1)
@@ -487,14 +487,14 @@ closedTypeFamilyD tc tvs result injectivity eqns =
 familyNoKindD :: FamFlavour -> Name -> [TyVarBndr] -> DecQ
 familyNoKindD flav tc tvs =
     case flav of
-      TypeFam -> return $ OpenTypeFamilyD (TypeFamilyHead tc tvs NoSig Nothing)
+      TypeFam -> return $ OpenTypeFamilyD (TypeFamilyHead tc tvs NoSig [])
       DataFam -> return $ DataFamilyD tc tvs Nothing
 
 familyKindD :: FamFlavour -> Name -> [TyVarBndr] -> Kind -> DecQ
 familyKindD flav tc tvs k =
     case flav of
       TypeFam ->
-        return $ OpenTypeFamilyD (TypeFamilyHead tc tvs (KindSig k) Nothing)
+        return $ OpenTypeFamilyD (TypeFamilyHead tc tvs (KindSig k) [])
       DataFam -> return $ DataFamilyD tc tvs (Just k)
 
 {-# DEPRECATED closedTypeFamilyNoKindD, closedTypeFamilyKindD
@@ -502,12 +502,12 @@ familyKindD flav tc tvs k =
 closedTypeFamilyNoKindD :: Name -> [TyVarBndr] -> [TySynEqnQ] -> DecQ
 closedTypeFamilyNoKindD tc tvs eqns =
  do eqns1 <- sequence eqns
-    return (ClosedTypeFamilyD (TypeFamilyHead tc tvs NoSig Nothing) eqns1)
+    return (ClosedTypeFamilyD (TypeFamilyHead tc tvs NoSig []) eqns1)
 
 closedTypeFamilyKindD :: Name -> [TyVarBndr] -> Kind -> [TySynEqnQ] -> DecQ
 closedTypeFamilyKindD tc tvs kind eqns =
  do eqns1 <- sequence eqns
-    return (ClosedTypeFamilyD (TypeFamilyHead tc tvs (KindSig kind) Nothing)
+    return (ClosedTypeFamilyD (TypeFamilyHead tc tvs (KindSig kind) [])
             eqns1)
 
 roleAnnotD :: Name -> [Role] -> DecQ
diff --git a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
index f74c997..040669e 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Ppr.hs
@@ -393,8 +393,8 @@ ppr_tf_head :: TypeFamilyHead -> Doc
 ppr_tf_head (TypeFamilyHead tc tvs res inj)
   = ppr tc <+> hsep (map ppr tvs) <+> ppr res <+> maybeInj
   where
-    maybeInj | (Just inj') <- inj = ppr inj'
-             | otherwise          = empty
+    maybeInj | null inj  = empty
+             | otherwise = ppr inj
 
 ------------------------------
 instance Ppr FunDep where


From git at git.haskell.org  Thu Dec 24 17:13:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 17:13:58 +0000 (UTC)
Subject: [commit: ghc] master: Fix normalisation of TyCon representations
 (e338376)
Message-ID: <20151224171358.2B4EA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e33837677fc4d1d9bd6fdad4e9fd8c61a639f52e/ghc

>---------------------------------------------------------------

commit e33837677fc4d1d9bd6fdad4e9fd8c61a639f52e
Author: Erik de Castro Lopo <erikd at mega-nerd.com>
Date:   Thu Dec 24 14:41:53 2015 +0100

    Fix normalisation of TyCon representations
    
    Test Plan: run tests on powerpc and x86_64
    
    Reviewers: hvr, austin, thomie, bgamari
    
    Reviewed By: thomie, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1694


>---------------------------------------------------------------

e33837677fc4d1d9bd6fdad4e9fd8c61a639f52e
 testsuite/driver/testlib.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 33e134d..44eebd6 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1698,7 +1698,7 @@ def normalise_callstacks(str):
 
 def normalise_type_reps(str):
     """ Normalise out fingerprints from Typeable TyCon representations """
-    return re.sub(r'TyCon\s*\d+\#\#\s*\d+\#\#\s*',
+    return re.sub(r'TyCon\s*\d+L?\#\#\s*\d+L?\#\#\s*',
                   'TyCon FINGERPRINT FINGERPRINT ',
                   str,
                   flags=re.MULTILINE)


From git at git.haskell.org  Thu Dec 24 18:52:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 18:52:32 +0000 (UTC)
Subject: [commit: ghc] master: Don't drop last char of file if -osuf contains
 dot (48db13d)
Message-ID: <20151224185232.803D13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/48db13d279d592ed3044cbaf3513854bcb0d3dce/ghc

>---------------------------------------------------------------

commit 48db13d279d592ed3044cbaf3513854bcb0d3dce
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Wed Mar 18 20:08:08 2015 +0100

    Don't drop last char of file if -osuf contains dot
    
    Given:
     * `file = "foo.a.b"`
     * `osuf = ".a.b"`  -- Note the initial dot.
     * `new_osuf = "c"`
    
    Before (bad, the last character of the filename is dropped):
      `dropTail (length osuf + 1) file <.> new_osuf == "fo.c"`
    After (good):
      `stripExtension osuf file <.> new_osuf` == "foo.c"
    
    This regression was introduced in commit c489af73 (#5554). That commit
    fixed a similar but different bug, and care has been taken to not
    reintroduce it (using the the newly introduced
    `System.Filepath.stripExtension`).
    
    Given:
     * `file = "foo.a.b"`
     * `osuf = "a.b"`
     * `new_osuf = "c"`
    
    Before c489af73 (bad, the full suffix should get replaced):
      `replaceExtension file new_osuf == "foo.a.c"`
    After c489af73 (good):
      `dropTail (length osuf + 1) file <.> new_osuf == "foo.c"`
    After this commit (still good):
      `stripExtension osuf file <.> new_osuf == "foo.c"`
    
    Reviewed by: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1692
    
    GHC Trac Issues: #9760


>---------------------------------------------------------------

48db13d279d592ed3044cbaf3513854bcb0d3dce
 compiler/ghci/Linker.hs     | 2 +-
 testsuite/driver/testlib.py | 1 +
 testsuite/tests/th/Makefile | 6 ++++--
 testsuite/tests/th/all.T    | 2 ++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/compiler/ghci/Linker.hs b/compiler/ghci/Linker.hs
index a95120d..7e86e11 100644
--- a/compiler/ghci/Linker.hs
+++ b/compiler/ghci/Linker.hs
@@ -683,7 +683,7 @@ getLinkDeps hsc_env hpt pls replace_osuf span mods
 
             adjust_ul new_osuf (DotO file) = do
                 MASSERT(osuf `isSuffixOf` file)
-                let file_base = dropTail (length osuf + 1) file
+                let file_base = fromJust (stripExtension osuf file)
                     new_file = file_base <.> new_osuf
                 ok <- doesFileExist new_file
                 if (not ok)
diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 44eebd6..cf5a226 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -125,6 +125,7 @@ def req_haddock( name, opts ):
         opts.expect = 'missing-lib'
 
 def req_profiling( name, opts ):
+    '''Require the profiling libraries (add 'GhcLibWays += p' to mk/build.mk)'''
     if not config.have_profiling:
         opts.expect = 'fail'
 
diff --git a/testsuite/tests/th/Makefile b/testsuite/tests/th/Makefile
index b759a81..4fb508f 100644
--- a/testsuite/tests/th/Makefile
+++ b/testsuite/tests/th/Makefile
@@ -15,9 +15,11 @@ T7445:
 HC_OPTS = -XTemplateHaskell -package template-haskell
 
 TH_spliceE5_prof::
-	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.p.o 
+	$(RM) TH_spliceE5_prof*.o TH_spliceE5_prof*.hi TH_spliceE5_prof*.dyn_o TH_spliceE5_prof*.dyn_hi TH_spliceE5_prof
 	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) $(ghcThWayFlags) --make -v0 TH_spliceE5_prof.hs -c
-	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf p.o -o $@
+	# Using `-osuf .p.o` should work. Note the dot before the `p` (#9760), and
+	# the dot between the `p` and the `o` (#5554).
+	'$(TEST_HC)' $(TEST_HC_OPTS) $(HC_OPTS) --make -v0 TH_spliceE5_prof.hs -prof -auto-all -osuf .p.o -o $@
 	./$@
 
 # With -fexternal-interpreter, we don't have to build the non-profiled
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 9d00d8e..fb429bc 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -47,6 +47,8 @@ test('TH_spliceE5_prof',
      [req_profiling,
       omit_ways(['ghci']),
       extra_clean(['TH_spliceE5_prof_Lib.p.o', 'TH_spliceE5_prof_Lib.hi',
+                   'TH_spliceE5_prof_Lib.dyn_o', 'TH_spliceE5_prof_Lib.dyn_hi',
+                   'TH_spliceE5_prof.dyn_o', 'TH_spliceE5_prof.dyn_hi',
                    'TH_spliceE5_prof_Lib.o','TH_spliceE5_prof.p.o'])],
      run_command,
      ['$MAKE -s --no-print-directory TH_spliceE5_prof'])


From git at git.haskell.org  Thu Dec 24 19:37:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 24 Dec 2015 19:37:11 +0000 (UTC)
Subject: [commit: ghc] master: Visible type application (2db18b8)
Message-ID: <20151224193711.ED2333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2db18b8135335da2da9918b722699df684097be9/ghc

>---------------------------------------------------------------

commit 2db18b8135335da2da9918b722699df684097be9
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Thu Dec 24 14:33:19 2015 -0500

    Visible type application
    
    This re-working of the typechecker algorithm is based on
    the paper "Visible type application", by Richard Eisenberg,
    Stephanie Weirich, and Hamidhasan Ahmed, to be published at
    ESOP'16.
    
    This patch introduces -XTypeApplications, which allows users
    to say, for example `id @Int`, which has type `Int -> Int`. See
    the changes to the user manual for details.
    
    This patch addresses tickets #10619, #5296, #10589.


>---------------------------------------------------------------

2db18b8135335da2da9918b722699df684097be9
 compiler/basicTypes/DataCon.hs                     |   6 +-
 compiler/basicTypes/MkId.hs                        |  36 +-
 compiler/basicTypes/PatSyn.hs                      |   6 +-
 compiler/coreSyn/MkCore.hs                         |  12 +-
 compiler/deSugar/Coverage.hs                       |   6 +-
 compiler/deSugar/DsArrows.hs                       |   4 +-
 compiler/deSugar/DsBinds.hs                        |  30 +-
 compiler/deSugar/DsExpr.hs                         |   8 +-
 compiler/deSugar/Match.hs                          |   2 +-
 compiler/hsSyn/HsBinds.hs                          |  39 +-
 compiler/hsSyn/HsExpr.hs                           |  35 +-
 compiler/hsSyn/HsUtils.hs                          |  26 +-
 compiler/hsSyn/PlaceHolder.hs                      |   5 +-
 compiler/iface/IfaceSyn.hs                         |   2 +-
 compiler/iface/IfaceType.hs                        |  15 +-
 compiler/main/DynFlags.hs                          |   2 +
 compiler/main/PprTyThing.hs                        |  12 +-
 compiler/parser/Lexer.x                            |  48 +-
 compiler/parser/Parser.y                           |   9 +
 compiler/prelude/PrimOp.hs                         |   2 +-
 compiler/prelude/TysPrim.hs                        |  16 +-
 compiler/prelude/TysWiredIn.hs                     |   6 +-
 compiler/rename/RnExpr.hs                          |  13 +-
 compiler/rename/RnSplice.hs                        |   4 +-
 compiler/rename/RnTypes.hs                         |   3 +-
 compiler/typecheck/Inst.hs                         | 126 +++-
 compiler/typecheck/TcArrows.hs                     |   6 +-
 compiler/typecheck/TcBinds.hs                      | 298 ++++++--
 compiler/typecheck/TcClassDcl.hs                   |   9 +-
 compiler/typecheck/TcErrors.hs                     |   8 +-
 compiler/typecheck/TcEvidence.hs                   |  53 +-
 compiler/typecheck/TcExpr.hs                       | 831 ++++++++++++---------
 compiler/typecheck/TcExpr.hs-boot                  |   6 +-
 compiler/typecheck/TcGenDeriv.hs                   |   8 +-
 compiler/typecheck/TcHsSyn.hs                      |  28 +-
 compiler/typecheck/TcHsType.hs                     |  27 +-
 compiler/typecheck/TcInstDcls.hs                   |  23 +-
 compiler/typecheck/TcMType.hs                      |  30 +-
 compiler/typecheck/TcMatches.hs                    | 162 ++--
 compiler/typecheck/TcPat.hs                        | 143 ++--
 compiler/typecheck/TcPatSyn.hs                     |  60 +-
 compiler/typecheck/TcRnDriver.hs                   |   2 +-
 compiler/typecheck/TcRnMonad.hs                    |  14 +-
 compiler/typecheck/TcRnTypes.hs                    |  95 ++-
 compiler/typecheck/TcSplice.hs                     |  15 +-
 compiler/typecheck/TcTyDecls.hs                    |  40 +-
 compiler/typecheck/TcType.hs                       |  77 +-
 compiler/typecheck/TcUnify.hs                      | 475 ++++++++----
 compiler/typecheck/TcValidity.hs                   |  15 +-
 compiler/types/TyCoRep.hs                          | 152 +++-
 compiler/types/Type.hs                             |  28 +-
 docs/users_guide/7.12.1-notes.rst                  |   5 +
 docs/users_guide/glasgow_exts.rst                  |  50 ++
 libraries/base/tests/T9681.stderr                  |   2 +-
 libraries/ghc-boot/GHC/LanguageExtensions.hs       |   1 +
 testsuite/tests/ado/ado002.stderr                  | 108 ++-
 .../tests/annotations/should_fail/annfail08.stderr |   2 +-
 testsuite/tests/arrows/should_fail/T5380.stderr    |   3 +
 testsuite/tests/boxy/all.T                         |   4 +-
 .../tests/deSugar/should_compile/T2431.stderr      |   8 +-
 testsuite/tests/driver/T2182.stderr                |   4 +-
 testsuite/tests/driver/T4437.hs                    |   3 +-
 testsuite/tests/driver/werror.stderr               |  20 +-
 testsuite/tests/gadt/T3169.stderr                  |   3 +
 testsuite/tests/gadt/gadt-escape1.stderr           |   4 +-
 testsuite/tests/gadt/gadt13.stderr                 |   9 +-
 testsuite/tests/gadt/gadt7.stderr                  |   1 +
 testsuite/tests/gadt/rw.stderr                     |  11 +-
 testsuite/tests/ghc-api/annotations/T10280.stderr  |   4 +-
 testsuite/tests/ghc-api/annotations/T10357.stderr  |  24 +-
 .../tests/ghci.debugger/scripts/break003.stderr    |   6 +-
 .../tests/ghci.debugger/scripts/break003.stdout    |   8 +-
 .../tests/ghci.debugger/scripts/break005.stdout    |   4 +-
 .../tests/ghci.debugger/scripts/break006.stderr    |  12 +-
 .../tests/ghci.debugger/scripts/break006.stdout    |  10 +-
 .../tests/ghci.debugger/scripts/hist001.stdout     |  28 +-
 testsuite/tests/ghci/scripts/Defer02.stderr        |  11 +-
 testsuite/tests/ghci/scripts/T10122.stdout         |   2 +-
 testsuite/tests/ghci/scripts/T10508.stderr         |  18 +-
 testsuite/tests/ghci/scripts/T7627.stdout          |  10 +-
 testsuite/tests/ghci/scripts/T8649.stderr          |   1 +
 testsuite/tests/ghci/scripts/T8959b.stderr         |  26 +-
 testsuite/tests/ghci/scripts/ghci013.stdout        |   2 +-
 testsuite/tests/ghci/scripts/ghci025.stdout        |  24 +-
 testsuite/tests/ghci/scripts/ghci047.stderr        |   6 +-
 testsuite/tests/ghci/scripts/ghci050.stderr        |  22 +-
 testsuite/tests/ghci/scripts/ghci052.stderr        |   3 +
 testsuite/tests/ghci/scripts/ghci053.stderr        |   2 +
 testsuite/tests/ghci/scripts/ghci055.stdout        |   2 +-
 .../should_compile/PushedInAsGivens.stderr         |   1 +
 .../indexed-types/should_fail/GADTwrong1.stderr    |   1 +
 .../tests/indexed-types/should_fail/T2544.stderr   |  38 +-
 .../tests/indexed-types/should_fail/T2693.stderr   |   8 +
 .../tests/indexed-types/should_fail/T3330a.stderr  |   2 +
 .../tests/indexed-types/should_fail/T3330c.stderr  |   3 +-
 .../tests/indexed-types/should_fail/T3440.stderr   |   1 +
 .../tests/indexed-types/should_fail/T4099.stderr   |  40 +-
 .../tests/indexed-types/should_fail/T4179.stderr   |  13 +-
 .../tests/indexed-types/should_fail/T4485.stderr   |  53 +-
 .../tests/indexed-types/should_fail/T5439.stderr   |   4 +
 .../tests/indexed-types/should_fail/T7010.stderr   |  13 +-
 .../tests/indexed-types/should_fail/T7194.stderr   |   1 +
 .../tests/indexed-types/should_fail/T7354.stderr   |  19 +-
 .../tests/indexed-types/should_fail/T7354a.stderr  |  11 +-
 .../tests/indexed-types/should_fail/T7729.stderr   |  19 +-
 .../tests/indexed-types/should_fail/T7729a.stderr  |  23 +-
 .../tests/indexed-types/should_fail/T7788.stderr   |  17 +-
 .../tests/indexed-types/should_fail/T8227.stderr   |   2 +
 .../tests/indexed-types/should_fail/T8518.stderr   |  56 +-
 .../tests/indexed-types/should_fail/T9554.stderr   |  42 +-
 .../tests/indexed-types/should_fail/T9662.stderr   |   9 +-
 testsuite/tests/module/mod121.stderr               |   4 +-
 testsuite/tests/module/mod147.stderr               |   0
 testsuite/tests/module/mod160.stderr               |   6 +-
 testsuite/tests/module/mod69.stderr                |   4 +-
 testsuite/tests/module/mod70.stderr                |   4 +-
 .../should_fail/overloadedrecfldsfail07.stderr     |  11 +-
 testsuite/tests/parser/should_compile/T2245.stderr |   6 +-
 testsuite/tests/parser/should_compile/VtaParse.hs  |  63 ++
 testsuite/tests/parser/should_compile/all.T        |   1 +
 .../tests/parser/should_compile/read014.stderr     |   8 +-
 .../tests/parser/should_fail/readFail003.stderr    |   4 +-
 .../partial-sigs/should_compile/T10403.stderr      |   5 +-
 .../partial-sigs/should_compile/T10438.stderr      |   2 +-
 ...ConstraintsWildcardInExpressionSignature.stderr |   2 +-
 ...traConstraintsWildcardInPatternSignature.stderr |   2 +-
 .../partial-sigs/should_fail/Forall1Bad.stderr     |   8 +-
 .../should_fail/NamedWildcardExplicitForall.stderr |   7 +-
 .../should_fail/NamedWildcardsNotEnabled.stderr    |   1 +
 .../should_fail/ScopedNamedWildcardsBad.stderr     |   9 +-
 .../patsyn/should_fail/records-poly-update.stderr  |   7 +-
 testsuite/tests/perf/compiler/all.T                |   3 +-
 testsuite/tests/polykinds/T10503.stderr            |   2 -
 testsuite/tests/polykinds/T6068.stdout             |   0
 testsuite/tests/polykinds/T7438.stderr             |   8 +-
 testsuite/tests/polykinds/T7594.stderr             |   1 +
 testsuite/tests/polykinds/T9144.stderr             |  14 +-
 testsuite/tests/polykinds/TidyClassKinds.hs        |  13 +
 testsuite/tests/polykinds/TidyClassKinds.stderr    |   8 +
 testsuite/tests/polykinds/all.T                    |   1 +
 testsuite/tests/rename/should_compile/T3823.stderr |   3 +-
 testsuite/tests/rename/should_fail/T10618.stderr   |   8 +-
 testsuite/tests/rename/should_fail/T2993.stderr    |   4 +-
 testsuite/tests/rename/should_fail/T7937.stderr    |   4 +-
 testsuite/tests/rename/should_fail/mc13.stderr     |   0
 .../tests/rename/should_fail/rnfail016.stderr      |   8 +-
 .../tests/rename/should_fail/rnfail051.stderr      |   3 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |  74 +-
 testsuite/tests/roles/should_compile/T8958.stderr  |   2 +
 testsuite/tests/rts/T9045.hs                       |   2 +-
 testsuite/tests/safeHaskell/ghci/p16.stderr        |  12 +-
 testsuite/tests/safeHaskell/ghci/p6.stderr         |  12 +-
 .../tests/simplCore/should_compile/T7360.stderr    |  24 +-
 .../tests/simplCore/should_compile/simpl017.stderr |  58 +-
 testsuite/tests/th/T10945.stderr                   |  59 +-
 testsuite/tests/th/T8577.stderr                    |   3 +-
 testsuite/tests/typecheck/bug1465/bug1465.stderr   |   1 +
 .../tests/typecheck/should_compile/FD1.stderr      |   2 +-
 .../tests/typecheck/should_compile/FD2.stderr      |  15 +-
 .../tests/typecheck/should_compile/PushHRIf.hs     |   7 +
 .../tests/typecheck/should_compile/T10072.stderr   |  10 +-
 .../tests/typecheck/should_compile/T10971a.stderr  |   4 +-
 .../tests/typecheck/should_compile/T2494.stderr    |  58 +-
 testsuite/tests/typecheck/should_compile/Vta1.hs   |  95 +++
 testsuite/tests/typecheck/should_compile/Vta2.hs   |  14 +
 testsuite/tests/typecheck/should_compile/all.T     |   3 +
 .../tests/typecheck/should_compile/holes.stderr    |  48 +-
 .../tests/typecheck/should_compile/holes3.stderr   |  54 +-
 .../tests/typecheck/should_compile/tc141.stderr    |  16 +-
 .../tests/typecheck/should_compile/tc168.stderr    |  20 +-
 .../tests/typecheck/should_compile/tc211.stderr    |  77 +-
 .../tests/typecheck/should_compile/tc243.stderr    |   4 +-
 .../should_fail/CustomTypeErrors01.stderr          |   8 +-
 .../typecheck/should_fail/ExpandSynsFail2.stderr   |  19 +-
 .../tests/typecheck/should_fail/T10495.stderr      |  13 +-
 .../tests/typecheck/should_fail/T10971d.stderr     |  25 +-
 .../tests/typecheck/should_fail/T11274.stderr      |   2 +-
 testsuite/tests/typecheck/should_fail/T1899.stderr |   1 +
 testsuite/tests/typecheck/should_fail/T2414.stderr |  13 +-
 testsuite/tests/typecheck/should_fail/T2534.stderr |  15 +-
 testsuite/tests/typecheck/should_fail/T2688.stderr |  20 +-
 .../tests/typecheck/should_fail/T2846b.stderr      |   8 +-
 testsuite/tests/typecheck/should_fail/T3102.stderr |  19 +-
 testsuite/tests/typecheck/should_fail/T3613.stderr |  30 +-
 testsuite/tests/typecheck/should_fail/T3950.stderr |  15 +-
 testsuite/tests/typecheck/should_fail/T5095.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T5689.stderr |  14 +-
 testsuite/tests/typecheck/should_fail/T5853.stderr |   2 +-
 testsuite/tests/typecheck/should_fail/T6069.stderr |  39 +-
 testsuite/tests/typecheck/should_fail/T7264.stderr |  21 +-
 testsuite/tests/typecheck/should_fail/T7368.stderr |   1 +
 testsuite/tests/typecheck/should_fail/T7453.stderr |  26 +-
 testsuite/tests/typecheck/should_fail/T7734.stderr |   2 +
 testsuite/tests/typecheck/should_fail/T7851.stderr |  19 +-
 testsuite/tests/typecheck/should_fail/T8142.stderr |  43 +-
 testsuite/tests/typecheck/should_fail/T8428.stderr |  16 +-
 testsuite/tests/typecheck/should_fail/T8603.stderr |  15 +-
 testsuite/tests/typecheck/should_fail/T9109.stderr |   7 +-
 testsuite/tests/typecheck/should_fail/T9774.stderr |  14 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |  12 +-
 .../should_fail/TcStaticPointersFail01.stderr      |  11 +-
 testsuite/tests/typecheck/should_fail/VtaFail.hs   |  57 ++
 .../tests/typecheck/should_fail/VtaFail.stderr     |  94 +++
 testsuite/tests/typecheck/should_fail/all.T        |   3 +-
 testsuite/tests/typecheck/should_fail/mc19.stderr  |  19 +-
 testsuite/tests/typecheck/should_fail/mc21.stderr  |  20 +-
 testsuite/tests/typecheck/should_fail/mc22.stderr  |  43 +-
 testsuite/tests/typecheck/should_fail/mc23.stderr  |  17 +-
 testsuite/tests/typecheck/should_fail/mc24.stderr  |  18 +-
 testsuite/tests/typecheck/should_fail/mc25.stderr  |  30 +-
 .../tests/typecheck/should_fail/tcfail001.stderr   |  13 +-
 .../tests/typecheck/should_fail/tcfail002.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail004.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail005.stderr   |   6 +-
 .../tests/typecheck/should_fail/tcfail007.stderr   |  14 +-
 .../tests/typecheck/should_fail/tcfail010.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail013.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail014.stderr   |   1 +
 .../tests/typecheck/should_fail/tcfail016.stderr   |  42 +-
 .../tests/typecheck/should_fail/tcfail018.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail029.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail032.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail033.stderr   |  17 +-
 .../tests/typecheck/should_fail/tcfail034.stderr   |  26 +-
 .../tests/typecheck/should_fail/tcfail065.stderr   |  11 +-
 .../tests/typecheck/should_fail/tcfail068.stderr   |  47 +-
 .../tests/typecheck/should_fail/tcfail076.stderr   |   1 +
 .../tests/typecheck/should_fail/tcfail099.stderr   |   1 +
 .../tests/typecheck/should_fail/tcfail103.stderr   |  41 +-
 .../tests/typecheck/should_fail/tcfail104.stderr   |  24 +-
 .../tests/typecheck/should_fail/tcfail131.stderr   |   7 +-
 .../tests/typecheck/should_fail/tcfail133.stderr   |   3 +-
 .../tests/typecheck/should_fail/tcfail140.stderr   |   8 +-
 .../tests/typecheck/should_fail/tcfail143.stderr   |  14 +-
 .../tests/typecheck/should_fail/tcfail153.stderr   |  33 +-
 testsuite/tests/typecheck/should_fail/tcfail165.hs |   3 +-
 .../tests/typecheck/should_fail/tcfail165.stderr   |  12 -
 .../tests/typecheck/should_fail/tcfail168.stderr   |  28 +-
 testsuite/tests/typecheck/should_fail/tcfail174.hs |   2 +-
 .../tests/typecheck/should_fail/tcfail174.stderr   |  61 +-
 .../tests/typecheck/should_fail/tcfail175.stderr   |   4 +-
 .../tests/typecheck/should_fail/tcfail178.stderr   |  26 +-
 .../tests/typecheck/should_fail/tcfail179.stderr   |  11 +-
 .../tests/typecheck/should_fail/tcfail181.stderr   |  29 +-
 .../tests/typecheck/should_fail/tcfail185.stderr   |  26 +-
 .../tests/typecheck/should_fail/tcfail189.stderr   |  16 +-
 .../tests/typecheck/should_fail/tcfail191.stderr   |  20 +-
 .../tests/typecheck/should_fail/tcfail193.stderr   |  19 +-
 .../tests/typecheck/should_fail/tcfail198.stderr   |  24 +-
 .../tests/typecheck/should_fail/tcfail201.stderr   |  11 +-
 .../tests/typecheck/should_fail/tcfail204.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail206.stderr   |  86 +--
 .../tests/typecheck/should_fail/tcfail208.stderr   |  16 +-
 testsuite/tests/typecheck/should_run/all.T         |   2 +-
 .../tests/typecheck/should_run/tcrun035.stderr     |  11 -
 .../tests/warnings/should_compile/PluralS.stderr   |   2 +-
 .../tests/warnings/should_compile/T11077.stderr    |   2 +-
 257 files changed, 4055 insertions(+), 2269 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2db18b8135335da2da9918b722699df684097be9

From git at git.haskell.org  Fri Dec 25 13:21:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 25 Dec 2015 13:21:42 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: fix qq005 and qq006 (#11279)
 (2032635)
Message-ID: <20151225132142.B97803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2032635b80d8fc34dc168e2c22f51f8a69d97a1c/ghc

>---------------------------------------------------------------

commit 2032635b80d8fc34dc168e2c22f51f8a69d97a1c
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 25 14:10:35 2015 +0100

    Testsuite: fix qq005 and qq006 (#11279)
    
    With 399a5b46591dfbee0499d6afa1bb80ad2fd52598, the old `[$foo| ... |]`
    syntax for quasi-quotes is no longer allowed.


>---------------------------------------------------------------

2032635b80d8fc34dc168e2c22f51f8a69d97a1c
 testsuite/tests/quasiquotation/qq005/Expr.hs      | 20 ++++++++++++++++++--
 testsuite/tests/quasiquotation/qq005/Main.hs      |  6 +++---
 testsuite/tests/quasiquotation/qq006/Expr.hs      | 20 ++++++++++++++++++--
 testsuite/tests/quasiquotation/qq006/Main.hs      |  6 +++---
 testsuite/tests/quasiquotation/qq006/qq006.stderr |  8 +++++---
 5 files changed, 47 insertions(+), 13 deletions(-)

diff --git a/testsuite/tests/quasiquotation/qq005/Expr.hs b/testsuite/tests/quasiquotation/qq005/Expr.hs
index d628e8d..1c51d9d 100644
--- a/testsuite/tests/quasiquotation/qq005/Expr.hs
+++ b/testsuite/tests/quasiquotation/qq005/Expr.hs
@@ -1,7 +1,9 @@
 {-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Expr where
 
-import Data.Generics
+import Data.Data
+import Data.Typeable
 import Language.Haskell.TH as TH
 import Language.Haskell.TH.Quote
 
@@ -29,6 +31,7 @@ eval (BinopExpr op x y) = (opToFun op) (eval x) (eval y)
     opToFun MulOp = (*)
     opToFun DivOp = (div)
 
+small :: CharParser st Char
 small   = lower <|> char '_'
 large   = upper
 idchar  = small <|> large <|> digit <|> char '\''
@@ -74,7 +77,8 @@ parseExpr (Loc {loc_filename = file, loc_start = (line,col)}) s =
             eof
             return e
 
-expr = QuasiQuoter { quoteExp = parseExprExp, quotePat = parseExprPat }
+expr = QuasiQuoter { quoteExp = parseExprExp, quotePat = parseExprPat,
+                     quoteType = undefined, quoteDec = undefined }
 
 parseExprExp :: String -> Q Exp
 parseExprExp s =  do  loc <- location
@@ -97,3 +101,15 @@ antiExprPat  (AntiIntExpr v)  = Just $ conP  (mkName "IntExpr")
                                                 [varP (mkName v)]
 antiExprPat  (AntiExpr v)     = Just $ varP  (mkName v)
 antiExprPat  _                = Nothing
+
+-- Copied from syb for the test
+
+-- | Extend a generic query by a type-specific case
+extQ :: ( Typeable a
+        , Typeable b
+        )
+     => (a -> q)
+     -> (b -> q)
+     -> a
+     -> q
+extQ f g a = maybe (f a) g (cast a)
diff --git a/testsuite/tests/quasiquotation/qq005/Main.hs b/testsuite/tests/quasiquotation/qq005/Main.hs
index d8c8a34..7b2de89 100644
--- a/testsuite/tests/quasiquotation/qq005/Main.hs
+++ b/testsuite/tests/quasiquotation/qq005/Main.hs
@@ -7,7 +7,7 @@ main :: IO ()
 main = do  print $ eval [expr|1 + 3 + 5|]
            case [expr|2|] of
              [expr|$n|] -> print n
-             _           -> return ()
-           case [$expr|1 + 2|] of
+             _          -> return ()
+           case [expr|1 + 2|] of
              [expr|$x + $y|] -> putStrLn $ show x ++ " + " ++ show y
-             _                -> return ()
+             _               -> return ()
diff --git a/testsuite/tests/quasiquotation/qq006/Expr.hs b/testsuite/tests/quasiquotation/qq006/Expr.hs
index d628e8d..1c51d9d 100644
--- a/testsuite/tests/quasiquotation/qq006/Expr.hs
+++ b/testsuite/tests/quasiquotation/qq006/Expr.hs
@@ -1,7 +1,9 @@
 {-# LANGUAGE DeriveDataTypeable #-}
+{-# LANGUAGE FlexibleContexts #-}
 module Expr where
 
-import Data.Generics
+import Data.Data
+import Data.Typeable
 import Language.Haskell.TH as TH
 import Language.Haskell.TH.Quote
 
@@ -29,6 +31,7 @@ eval (BinopExpr op x y) = (opToFun op) (eval x) (eval y)
     opToFun MulOp = (*)
     opToFun DivOp = (div)
 
+small :: CharParser st Char
 small   = lower <|> char '_'
 large   = upper
 idchar  = small <|> large <|> digit <|> char '\''
@@ -74,7 +77,8 @@ parseExpr (Loc {loc_filename = file, loc_start = (line,col)}) s =
             eof
             return e
 
-expr = QuasiQuoter { quoteExp = parseExprExp, quotePat = parseExprPat }
+expr = QuasiQuoter { quoteExp = parseExprExp, quotePat = parseExprPat,
+                     quoteType = undefined, quoteDec = undefined }
 
 parseExprExp :: String -> Q Exp
 parseExprExp s =  do  loc <- location
@@ -97,3 +101,15 @@ antiExprPat  (AntiIntExpr v)  = Just $ conP  (mkName "IntExpr")
                                                 [varP (mkName v)]
 antiExprPat  (AntiExpr v)     = Just $ varP  (mkName v)
 antiExprPat  _                = Nothing
+
+-- Copied from syb for the test
+
+-- | Extend a generic query by a type-specific case
+extQ :: ( Typeable a
+        , Typeable b
+        )
+     => (a -> q)
+     -> (b -> q)
+     -> a
+     -> q
+extQ f g a = maybe (f a) g (cast a)
diff --git a/testsuite/tests/quasiquotation/qq006/Main.hs b/testsuite/tests/quasiquotation/qq006/Main.hs
index 7e21acc..686b849 100644
--- a/testsuite/tests/quasiquotation/qq006/Main.hs
+++ b/testsuite/tests/quasiquotation/qq006/Main.hs
@@ -4,6 +4,6 @@ module Main where
 import Expr
 
 main :: IO ()
-main = do  case [$expr|1 + 2|] of
-             [$expr|$x + $x|] -> print x
-             _                -> return ()
+main = do  case [expr|1 + 2|] of
+             [expr|$x + $x|] -> print x
+             _               -> return ()
diff --git a/testsuite/tests/quasiquotation/qq006/qq006.stderr b/testsuite/tests/quasiquotation/qq006/qq006.stderr
index 3eb5182..3fd0d01 100644
--- a/testsuite/tests/quasiquotation/qq006/qq006.stderr
+++ b/testsuite/tests/quasiquotation/qq006/qq006.stderr
@@ -1,4 +1,6 @@
 
-Main.hs:8:20:
-    Conflicting definitions for `x'
-    In a case alternative
+Main.hs:8:20: error:
+    ? Conflicting definitions for ?x?
+      Bound at: Main.hs:8:20-28
+                Main.hs:8:20-28
+    ? In a case alternative


From git at git.haskell.org  Fri Dec 25 14:12:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Fri, 25 Dec 2015 14:12:10 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: mark T7681 expect_broken (#11287)
 (bc8cac1)
Message-ID: <20151225141210.2C4B53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bc8cac12f54bf032eb8578f6b112403bee5cb2de/ghc

>---------------------------------------------------------------

commit bc8cac12f54bf032eb8578f6b112403bee5cb2de
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Fri Dec 25 15:11:05 2015 +0100

    Testsuite: mark T7681 expect_broken (#11287)
    
    When compiler_debugged only. This makes the Travis build green again.


>---------------------------------------------------------------

bc8cac12f54bf032eb8578f6b112403bee5cb2de
 testsuite/tests/th/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index fb429bc..2a82a23 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -272,7 +272,7 @@ test('T7532',
      ['T7532', '-v0 ' + config.ghc_th_way_flags])
 test('T2222', normal, compile, ['-v0'])
 test('T1849', normal, ghci_script, ['T1849.script'])
-test('T7681', normal, compile, ['-v0'])
+test('T7681', when(compiler_debugged(), expect_broken(11287)), compile, ['-v0'])
 test('T7910', normal, compile_and_run, ['-v0'])
 
 test('ClosedFam1TH', normal, compile, ['-dsuppress-uniques -v0'])


From git at git.haskell.org  Sat Dec 26 17:07:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 17:07:31 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Added CPP pragma for test
 perf/compiler/T783.hs (3c6e8d5)
Message-ID: <20151226170731.3CA823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c6e8d5142d7e2f6bf36205470d86c2301180a4b/ghc

>---------------------------------------------------------------

commit 3c6e8d5142d7e2f6bf36205470d86c2301180a4b
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Thu Dec 24 23:36:57 2015 +0100

    Added CPP pragma for test perf/compiler/T783.hs


>---------------------------------------------------------------

3c6e8d5142d7e2f6bf36205470d86c2301180a4b
 testsuite/tests/perf/compiler/T783.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/testsuite/tests/perf/compiler/T783.hs b/testsuite/tests/perf/compiler/T783.hs
index fea814e..cfd6b62 100644
--- a/testsuite/tests/perf/compiler/T783.hs
+++ b/testsuite/tests/perf/compiler/T783.hs
@@ -1,3 +1,4 @@
+{-# LANGUAGE CPP #-}
 #if __GLASGOW_HASKELL__ > 710
 {-# OPTIONS_GHC -Wno-too-many-guards #-}
 #endif


From git at git.haskell.org  Sat Dec 26 17:07:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 17:07:33 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Improved message for -W(no-)too-many-guards
 (3a42ace)
Message-ID: <20151226170733.D3EDA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/3a42acef70c6fc671ae423aaddc2e976505cb196/ghc

>---------------------------------------------------------------

commit 3a42acef70c6fc671ae423aaddc2e976505cb196
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Fri Dec 25 01:07:18 2015 +0100

    Improved message for -W(no-)too-many-guards


>---------------------------------------------------------------

3a42acef70c6fc671ae423aaddc2e976505cb196
 compiler/deSugar/Check.hs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 0795edc..af37de5 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -1338,8 +1338,9 @@ warnManyGuards (DsMatchContext kind loc)
   where
     opt_1 = hang (ptext (sLit "-Wno-too-many-guards")) 2 $
       ptext (sLit "to suppress this warning")
-    opt_2 = hang (ptext (sLit "-ffull-guard-reasoning")) 2 $
-      ptext (sLit "to run the full checker (may be non-performant)")
+    opt_2 = hang (ptext (sLit "-ffull-guard-reasoning")) 2 $ vcat
+      [ ptext (sLit "to run the full checker (may increase")
+      , ptext (sLit "compilation time and memory consumption)") ]
 
 dsPmWarn :: DynFlags -> DsMatchContext -> DsM PmResult -> DsM ()
 dsPmWarn dflags ctx@(DsMatchContext kind loc) mPmResult


From git at git.haskell.org  Sat Dec 26 17:07:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 17:07:36 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Some documentation about -Wtoo-many-guards
 and -ffull-guard-reasoning (e812750)
Message-ID: <20151226170736.B93073A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/e8127508f0c810795bfc2da632e0957b74790401/ghc

>---------------------------------------------------------------

commit e8127508f0c810795bfc2da632e0957b74790401
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Dec 26 18:07:19 2015 +0100

    Some documentation about -Wtoo-many-guards and -ffull-guard-reasoning


>---------------------------------------------------------------

e8127508f0c810795bfc2da632e0957b74790401
 docs/users_guide/7.12.1-notes.rst         |  9 +++++++++
 docs/users_guide/bugs.rst                 | 14 +++++++++-----
 docs/users_guide/using-warnings.rst       | 30 ++++++++++++++++++++++++++++++
 utils/mkUserGuidePart/Options/Warnings.hs | 13 +++++++++++++
 4 files changed, 61 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/7.12.1-notes.rst
index a1a9d0e..5891f57 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/7.12.1-notes.rst
@@ -231,6 +231,15 @@ Compiler
    a warning when a pattern synonym definition doesn't have a type signature.
    It is turned off by default but enabled by ``-Wall``.
 
+-  Added the ``-Wtoo-many-guards`` flag. When enabled, this will issue a
+   warning if a pattern match contains too many guards (over 20 at the
+   moment). It is enabled by default but makes a difference only if pattern
+   match checking is also enabled.
+
+-  Added the ``-ffull-guard-reasoning`` flag. When enabled, pattern match
+   checking tries its best to reason about guards, which needs exponential
+   time and memory in the general case. It is turned off by default.
+
 GHCi
 ~~~~
 
diff --git a/docs/users_guide/bugs.rst b/docs/users_guide/bugs.rst
index b287378..cef03d4 100644
--- a/docs/users_guide/bugs.rst
+++ b/docs/users_guide/bugs.rst
@@ -381,11 +381,15 @@ Bugs in GHC
    yield points are inserted at every function entrypoint (at the expense of a
    bit of performance).
 
--  GHC can warn about non-exhaustive or overlapping patterns (see
-   :ref:`options-sanity`), and usually does so correctly. But not
-   always. It gets confused by string patterns, and by guards, and can
-   then emit bogus warnings. The entire overlap-check code needs an
-   overhaul really.
+-  GHC's updated exhaustiveness and coverage checker (see
+   :ref:`options-sanity`) is quite expressive but with a rather high
+   performance cost (in terms of both time and memory consumption), mainly
+   due to guards. Two flags have been introduced to give more control to
+   the user over guard reasoning: ``-Wtoo-many-guards``
+   and ``-ffull-guard-reasoning`` (see :ref:`options-sanity`).
+   When ``-ffull-guard-reasoning`` is on, pattern match checking for guards
+   runs in full power, which may run out of memory/substantially increase
+   compilation time.
 
 -  GHC does not allow you to have a data type with a context that
    mentions type variables that are not data type parameters. For
diff --git a/docs/users_guide/using-warnings.rst b/docs/users_guide/using-warnings.rst
index 9748e47..8bb654c 100644
--- a/docs/users_guide/using-warnings.rst
+++ b/docs/users_guide/using-warnings.rst
@@ -538,6 +538,36 @@ of ``-W(no-)*``.
     This option isn't enabled by default because it can be very noisy,
     and it often doesn't indicate a bug in the program.
 
+``-Wtoo-many-guards``
+    .. index::
+       single: -Wtoo-many-guards
+       single: too many guards, warning
+
+    The option ``-Wtoo-many-guards`` warns about places where a
+    pattern match contains too many guards (over 20 at the moment).
+    It is enabled by default but has an effect only if any form of
+    exhaustivness/overlapping checking is enabled (one of
+    ``-Wincomplete-patterns``,
+    ``-Wincomplete-uni-patterns``,
+    ``-Wincomplete-record-updates``,
+    ``-Woverlapping-patterns``). The warning can be suppressed by
+    enabling either ``-Wno-too-many-guards``, which just hides the
+    warning, or ``-ffull-guard-reasoning``.
+
+``-ffull-guard-reasoning``
+    .. index::
+       single: -ffull-guard-reasoning
+       single: guard reasoning, warning
+
+    The option ``-ffull-guard-reasoning`` forces pattern match checking
+    to run in full. This gives more precise warnings concerning pattern
+    guards but in most cases increases memory consumption and
+    compilation time. Hence, it is off by default. Enabling
+    ``-ffull-guard-reasoning`` also implies ``-Wno-too-many-guards``.
+    Note that (like ``-Wtoo-many-guards``) ``-ffull-guard-reasoning``
+    makes a difference only if pattern match checking is already
+    enabled.
+
 ``-Wmissing-fields``
     .. index::
        single: -Wmissing-fields
diff --git a/utils/mkUserGuidePart/Options/Warnings.hs b/utils/mkUserGuidePart/Options/Warnings.hs
index e56e041..c775af4 100644
--- a/utils/mkUserGuidePart/Options/Warnings.hs
+++ b/utils/mkUserGuidePart/Options/Warnings.hs
@@ -222,6 +222,11 @@ warningsOptions =
          , flagType = DynamicFlag
          , flagReverse = "-Wno-tabs"
          }
+  , flag { flagName = "-Wtoo-many-guards"
+         , flagDescription = "warn when a match has too many guards"
+         , flagType = DynamicFlag
+         , flagReverse = "-Wno-too-many-guards"
+         }
   , flag { flagName = "-Wtype-defaults"
          , flagDescription = "warn when defaulting happens"
          , flagType = DynamicFlag
@@ -364,4 +369,12 @@ warningsOptions =
          , flagType = DynamicFlag
          , flagReverse = "-Wno-deriving-typeable"
          }
+  , flag { flagName = "-ffull-guard-reasoning"
+         , flagDescription =
+           "enable the full reasoning of the pattern match checker "++
+           "concerning guards, for more precise exhaustiveness/coverage "++
+           "warnings"
+         , flagType = DynamicFlag
+         , flagReverse = "-fno-full-guard-reasoning"
+         }
   ]


From git at git.haskell.org  Sat Dec 26 19:42:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 19:42:07 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Up-to-date with master + Squash recent
 commits (9f9dd57)
Message-ID: <20151226194207.6B5233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/9f9dd57d9ff250a312c8bc7515bdd1419960e8d3/ghc

>---------------------------------------------------------------

commit 9f9dd57d9ff250a312c8bc7515bdd1419960e8d3
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sat Dec 26 20:42:35 2015 +0100

    Up-to-date with master + Squash recent commits


>---------------------------------------------------------------

9f9dd57d9ff250a312c8bc7515bdd1419960e8d3
 compiler/deSugar/Check.hs                 | 358 +++++++++++++++++-------------
 compiler/deSugar/Match.hs                 |  26 ++-
 compiler/ghci/RtClosureInspect.hs         |   3 +
 compiler/main/DynFlags.hs                 |   9 +-
 compiler/nativeGen/Dwarf/Constants.hs     |   4 +
 compiler/types/OptCoercion.hs             |  12 +-
 docs/users_guide/7.12.1-notes.rst         |  10 +
 docs/users_guide/bugs.rst                 |  14 +-
 docs/users_guide/using-warnings.rst       |  30 +++
 libraries/base/Foreign/C/Error.hs         |   1 +
 testsuite/tests/perf/compiler/T783.hs     |   5 +
 utils/mkUserGuidePart/Options/Warnings.hs |  13 ++
 12 files changed, 315 insertions(+), 170 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 9f9dd57d9ff250a312c8bc7515bdd1419960e8d3

From git at git.haskell.org  Sat Dec 26 19:42:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 19:42:09 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Up-to-date with master +
 Squash recent commits (9f9dd57)
Message-ID: <20151226194209.E98283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/gadtpm' now includes:

     f7bd37e aclocal.m4: Fix llc/opt detection code
     1a86413 Update binary submodule to final 0.8.0.0 release
     8d95412 Disallow empty where bindings in pattern synonym declarations.
     44640af Allow as-patterns in pattern synonym declarations.
     29ca4a1 DynFlags: call defaultWays when creating defaultFlags
     62155a6 TcTyClsDecls: use zipWith3M_ instead of generating triplets
     850710a TcTyClsDecls: Add a type annotation
     d8ed20c Add Location to RdrName in FieldOcc
     b225b23 Modify IsString String instance (fixes #10814)
     eb7796f Warn about unused type variables in type families
     edcf17b Move Const to own module in Data.Functor.Const and enable PolyKinds
     6457903 Implement phase 1 of expanded Floating
     9f23dd9 testsuite: Add ClassOperator testcase
     25db56c Minor clean-up to ghc-bin.cabal.in
     e29ee49 Fix AnnDotDot in module export
     99b956e Fix-up GHC 7.12 artifacts
     ee6fba8 Encode strictness in GHC generics metadata
     c8c44fd Maintain cost-centre stacks in the interpreter
     4bb9f88 TcTyClsDecls: Remove invalid comments about list monads
     fd1b5ae testsuite/ClassOperator: This actually should_fail
     a61e717 testsuite: Add testcase for #8316
     eeecb86 Add proper GADTs support to Template Haskell
     55250a6 Rename GHCi's UI modules into GHCi.UI(.*)
     ff3f918 Fix #11256 by not immediately erroring if we can't find a module.
     2dff6c1 Added missing instances for Identity and Const (#11210)
     1fcdcae testsuite/ClassOperator: Mark as compile_fail instead of should_fail
     fb3302c base: Add sections to changelog
     083b700 users_guide: Synchronize relnotes with base changelog
     c12fc2e Update hoopl submodule to final 3.10.2.1 release
     aa7fb9a Fix GHCi segfault in Windows 32bit
     ff92395 Make HsAppsType contents Located
     44de66b Update Cabal submodule to latest snapshot
     ea3f733 Comments only, about coercion holes
     b407bd7 Retain AnnTilde in splitTildeApps
     f975b0b Rework Template Haskell's handling of strictness
     6eabd93 Update stm submodule to v2.4.4.1 release
     29928f2 Fix grouping for pattern synonyms
     f40e122 Fix typechecking for pattern synonym signatures
     51d8330 Remove duplicate T11224 test definition
     7966eea Localize API Annotation in LInjectivtyAnn
     01b0461 Remove another duplicate test
     575a98e Refactor named wildcards (again)
     721d56d APIAnnotations:AnnComma in wrong place in qcnames1
     d3ce417 Tweak comments around UnivCos.
     21b25df CoercionN is not in scope in TyCoRep
     998739d Refactor package flags into several distinct types.
     1faf1fc Implement -hide-all-plugin-packages and -plugin-package(-id), fixing #11244
     3e99980 Update filepath submodule to latest snapshot
     5f08681 - fix tests on OpenBSD which requires _DYNAMIC symbol
     48e0634 Revert "Allow as-patterns in pattern synonym declarations."
     b55ad1b Wibble to error message in Trac #10426
     1963250 Comments and white space
     c069be8 Add a pattern-syn form of PromotionErr
     99eb002 Comments only
     6eb9dc9 Tidy up and comment wildcards in family instances
     ed213ea Test Trac #11274
     7ed0da6 Modify Nmax to maxN Trac #10728
     dab8e34 Delete incorrect *-ws-32 expected test output
     84f6739 - fix gc_thread related compilation failure on Solaris/i386 platform
     f13de71 Fix super-class cycle check
     b37f216 Comments only
     7824870 Fix ASSERT in buildPatSyn, and T10897 test
     380b25e Allow CallStacks to be frozen
     cb989e2 API Annotaions:add name in PatBind Match
     d1e9f82 Update tests for Trac #11039
     f141f41 Test #10432
     7cddcde Docs: -interactive-print should reside in registered package
     3221599 Make testsuite work again with Py3
     353e97a config.mk.in: Disable stripping by default on ARM
     3017cbc ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
     6ec236b Improve SimplUtils.interestingArg
     d990354 Improve the runRW magic in CorePrep
     fcc7498 Improve tracing a bit in CoreSubst
     1af0d36 Refactoring only
     e338376 Fix normalisation of TyCon representations
     48db13d Don't drop last char of file if -osuf contains dot
     2db18b8 Visible type application
     2032635 Testsuite: fix qq005 and qq006 (#11279)
     bc8cac1 Testsuite: mark T7681 expect_broken (#11287)
     9f9dd57 Up-to-date with master + Squash recent commits

From git at git.haskell.org  Sat Dec 26 21:02:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:37 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11255. (5e4e9e0)
Message-ID: <20151226210237.6279D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5e4e9e00dd36bf6316a406a14bc9482c7bcff527/ghc

>---------------------------------------------------------------

commit 5e4e9e00dd36bf6316a406a14bc9482c7bcff527
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Dec 18 15:53:26 2015 -0500

    Fix #11255.
    
    We need to instantiate types in tuples. Quite straightforward.


>---------------------------------------------------------------

5e4e9e00dd36bf6316a406a14bc9482c7bcff527
 compiler/typecheck/TcHsType.hs      | 13 ++++++++-----
 testsuite/tests/polykinds/T11255.hs |  6 ++++++
 testsuite/tests/polykinds/all.T     |  1 +
 3 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/compiler/typecheck/TcHsType.hs b/compiler/typecheck/TcHsType.hs
index 6214a8a..7e4e1d6 100644
--- a/compiler/typecheck/TcHsType.hs
+++ b/compiler/typecheck/TcHsType.hs
@@ -600,13 +600,16 @@ tc_hs_type mode (HsExplicitListTy _k tys) exp_kind
     mk_nil  k     = mkTyConApp (promoteDataCon nilDataCon) [k]
 
 tc_hs_type mode (HsExplicitTupleTy _ tys) exp_kind
-  = do { tks <- mapM (tc_infer_lhs_type mode) tys
-       ; let n          = length tys
-             kind_con   = tupleTyCon           Boxed n
-             ty_con     = promotedTupleDataCon Boxed n
-             (taus, ks) = unzip tks
+  -- using newMetaKindVar means that we force instantiations of any polykinded
+  -- types. At first, I just used tc_infer_lhs_type, but that led to #11255.
+  = do { ks   <- replicateM arity newMetaKindVar
+       ; taus <- zipWithM (tc_lhs_type mode) tys ks
+       ; let kind_con   = tupleTyCon           Boxed arity
+             ty_con     = promotedTupleDataCon Boxed arity
              tup_k      = mkTyConApp kind_con ks
        ; checkExpectedKind (mkTyConApp ty_con (ks ++ taus)) tup_k exp_kind }
+  where
+    arity = length tys
 
 --------- Constraint types
 tc_hs_type mode (HsIParamTy n ty) exp_kind
diff --git a/testsuite/tests/polykinds/T11255.hs b/testsuite/tests/polykinds/T11255.hs
new file mode 100644
index 0000000..0126132
--- /dev/null
+++ b/testsuite/tests/polykinds/T11255.hs
@@ -0,0 +1,6 @@
+{-# LANGUAGE TypeFamilies, PolyKinds, DataKinds, UndecidableInstances #-}
+
+module T11255 where
+
+type family Default :: k
+type instance Default = '(Default, Default)
diff --git a/testsuite/tests/polykinds/all.T b/testsuite/tests/polykinds/all.T
index 5a8a904..5a11ac7 100644
--- a/testsuite/tests/polykinds/all.T
+++ b/testsuite/tests/polykinds/all.T
@@ -131,3 +131,4 @@ test('TidyClassKinds', normal, compile_fail, ['-fprint-explicit-kinds'])
 test('T11249', normal, compile, [''])
 test('T11248', normal, compile, [''])
 test('T11278', normal, compile, [''])
+test('T11255', normal, compile, [''])


From git at git.haskell.org  Sat Dec 26 21:02:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:40 +0000 (UTC)
Subject: [commit: ghc] master: Test #11254 in typecheck/should_compile/T11254
 (bd7ab66)
Message-ID: <20151226210240.8DA7E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bd7ab66875bb567693020279df2f8b5834bd24bb/ghc

>---------------------------------------------------------------

commit bd7ab66875bb567693020279df2f8b5834bd24bb
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 22 13:34:52 2015 -0500

    Test #11254 in typecheck/should_compile/T11254


>---------------------------------------------------------------

bd7ab66875bb567693020279df2f8b5834bd24bb
 testsuite/tests/typecheck/should_compile/T11254.hs | 19 +++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 2 files changed, 20 insertions(+)

diff --git a/testsuite/tests/typecheck/should_compile/T11254.hs b/testsuite/tests/typecheck/should_compile/T11254.hs
new file mode 100644
index 0000000..fcaae9c
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T11254.hs
@@ -0,0 +1,19 @@
+-- /tmp/panic.hs
+{-# LANGUAGE FlexibleContexts        #-}
+{-# LANGUAGE FlexibleInstances       #-}
+{-# LANGUAGE InstanceSigs            #-}
+{-# LANGUAGE TypeFamilies            #-}
+{-# LANGUAGE TypeSynonymInstances    #-}
+{-# LANGUAGE UndecidableSuperClasses #-}
+{-# OPTIONS_GHC -fdefer-type-errors #-}
+
+module T11254 where
+
+class (Frac (Frac a) ~ Frac a, Fractional (Frac a), ID (Frac a)) => ID a where
+  type Frac a
+  embed :: a -> Frac a
+
+instance ID Rational where
+  type Frac Rational = Int
+  embed :: Rational -> Rational
+  embed = undefined
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 8002299..20ef3a7 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -485,3 +485,4 @@ test('T10935', normal, compile, [''])
 test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
+test('T11254', expect_broken(11254), compile, [''])


From git at git.haskell.org  Sat Dec 26 21:02:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:43 +0000 (UTC)
Subject: [commit: ghc] master: Note [TyBinder] in TyCoRep (1411eaf)
Message-ID: <20151226210243.34BA23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1411eaf1bb75e549331d3b1a2d3152702d2c054c/ghc

>---------------------------------------------------------------

commit 1411eaf1bb75e549331d3b1a2d3152702d2c054c
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 22 13:35:33 2015 -0500

    Note [TyBinder] in TyCoRep


>---------------------------------------------------------------

1411eaf1bb75e549331d3b1a2d3152702d2c054c
 compiler/types/TyCoRep.hs | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/compiler/types/TyCoRep.hs b/compiler/types/TyCoRep.hs
index fd39a17..d9bbfdb 100644
--- a/compiler/types/TyCoRep.hs
+++ b/compiler/types/TyCoRep.hs
@@ -196,7 +196,7 @@ data Type
         TyBinder
         Type            -- ^ A ? type.
                         -- This includes arrow types, constructed with
-                        -- @ForAllTy (Anon ...)@.
+                        -- @ForAllTy (Anon ...)@. See also Note [TyBinder].
 
   | LitTy TyLit     -- ^ Type literals are similar to type constructors.
 
@@ -225,6 +225,7 @@ data TyLit
 
 -- | A 'TyBinder' represents an argument to a function. TyBinders can be dependent
 -- ('Named') or nondependent ('Anon'). They may also be visible or not.
+-- See also Note [TyBinder]
 data TyBinder
   = Named TyVar VisibilityFlag
   | Anon Type   -- visibility is determined by the type (Constraint vs. *)
@@ -264,6 +265,20 @@ type KindOrType = Type -- See Note [Arguments to type constructors]
 type Kind = Type
 
 {-
+Note [TyBinder]
+~~~~~~~~~~~~~~~
+This represents the type of binders -- that is, the type of an argument
+to a Pi-type. GHC Core currently supports two different Pi-types:
+a non-dependent function, written with ->, and a dependent compile-time-only
+polytype, written with forall. Both Pi-types classify terms/types that
+take an argument. In other words, if `x` is either a function or a polytype,
+`x arg` makes sense (for an appropriate `arg`). It is thus often convenient
+to group Pi-types together. This is ForAllTy.
+
+The two constructors for TyBinder sort out the two different possibilities.
+`Named` builds a polytype, while `Anon` builds an ordinary function.
+(ForAllTy (Anon arg) res used to be called FunTy arg res.)
+
 Note [The kind invariant]
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 The kinds


From git at git.haskell.org  Sat Dec 26 21:02:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:46 +0000 (UTC)
Subject: [commit: ghc] master: Have mkCastTy look more closely for
 reflexivity. (52da6bd)
Message-ID: <20151226210246.6795B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/52da6bdc17bb491d6d2f462b3680eb44b9be92e5/ghc

>---------------------------------------------------------------

commit 52da6bdc17bb491d6d2f462b3680eb44b9be92e5
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Dec 26 09:11:33 2015 -0500

    Have mkCastTy look more closely for reflexivity.
    
    This may have performance implications.


>---------------------------------------------------------------

52da6bdc17bb491d6d2f462b3680eb44b9be92e5
 compiler/coreSyn/CoreSubst.hs                      |  13 +-
 compiler/typecheck/TcForeign.hs                    |   2 +-
 compiler/types/Coercion.hs                         |  31 +-
 compiler/types/Coercion.hs-boot                    |   1 +
 compiler/types/Type.hs                             |  15 +-
 testsuite/tests/dependent/should_compile/all.T     |   1 +
 .../dependent/should_compile/dynamic-paper.hs      | 341 +++++++++++++++++++++
 7 files changed, 392 insertions(+), 12 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 52da6bdc17bb491d6d2f462b3680eb44b9be92e5

From git at git.haskell.org  Sat Dec 26 21:02:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:49 +0000 (UTC)
Subject: [commit: ghc] master: Test #10619 in typecheck/should_fail/T10619
 (05e3541)
Message-ID: <20151226210249.A28053A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/05e35414219c29d2eaf4bb29b6dd6fb8a8388e9b/ghc

>---------------------------------------------------------------

commit 05e35414219c29d2eaf4bb29b6dd6fb8a8388e9b
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Dec 26 13:55:42 2015 -0500

    Test #10619 in typecheck/should_fail/T10619


>---------------------------------------------------------------

05e35414219c29d2eaf4bb29b6dd6fb8a8388e9b
 testsuite/tests/typecheck/should_fail/T10619.hs    | 20 ++++++
 .../tests/typecheck/should_fail/T10619.stderr      | 72 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_fail/all.T        |  1 +
 3 files changed, 93 insertions(+)

diff --git a/testsuite/tests/typecheck/should_fail/T10619.hs b/testsuite/tests/typecheck/should_fail/T10619.hs
new file mode 100644
index 0000000..d29c62f
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T10619.hs
@@ -0,0 +1,20 @@
+{-# LANGUAGE RankNTypes #-}
+
+module T10619 where
+
+-- tests that type checking doesn't care about order. all of these
+-- should fail and be reported.
+
+foo _ = if True
+        then ((\x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+        else \y -> y
+
+bar _ = if True
+        then \y -> y
+        else ((\x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+
+baz True  = (\x -> x) :: (forall a. a -> a) -> forall b. b -> b
+baz False = \y -> y
+
+quux False = \y -> y
+quux True  = (\x -> x) :: (forall a. a -> a) -> forall b. b -> b
diff --git a/testsuite/tests/typecheck/should_fail/T10619.stderr b/testsuite/tests/typecheck/should_fail/T10619.stderr
new file mode 100644
index 0000000..5ed7cfe
--- /dev/null
+++ b/testsuite/tests/typecheck/should_fail/T10619.stderr
@@ -0,0 +1,72 @@
+
+T10619.hs:9:15: error:
+    ? Couldn't match type ?forall a. a -> a? with ?b -> b?
+      Expected type: (b -> b) -> b -> b
+        Actual type: (forall a. a -> a) -> b -> b
+    ? In the expression:
+        ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+      In the expression:
+        if True then
+            ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+        else
+            \ y -> y
+      In an equation for ?foo?:
+          foo _
+            = if True then
+                  ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+              else
+                  \ y -> y
+    ? Relevant bindings include
+        foo :: r -> (b -> b) -> b -> b (bound at T10619.hs:8:1)
+
+T10619.hs:14:15: error:
+    ? Couldn't match type ?b? with ?a?
+        because type variable ?a? would escape its scope
+      This (rigid, skolem) type variable is bound by
+        a type expected by the context:
+          a -> a
+        at T10619.hs:14:15-65
+      Expected type: (b -> b) -> b -> b
+        Actual type: (forall a. a -> a) -> forall b. b -> b
+    ? In the expression:
+        ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+      In the expression:
+        if True then
+            \ y -> y
+        else
+            ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+      In an equation for ?bar?:
+          bar _
+            = if True then
+                  \ y -> y
+              else
+                  ((\ x -> x) :: (forall a. a -> a) -> forall b. b -> b)
+    ? Relevant bindings include
+        bar :: r -> (b -> b) -> b -> b (bound at T10619.hs:12:1)
+
+T10619.hs:16:13: error:
+    ? Couldn't match type ?forall a. a -> a? with ?b -> b?
+      Expected type: (b -> b) -> b -> b
+        Actual type: (forall a. a -> a) -> b -> b
+    ? In the expression:
+          (\ x -> x) :: (forall a. a -> a) -> forall b. b -> b
+      In an equation for ?baz?:
+          baz True = (\ x -> x) :: (forall a. a -> a) -> forall b. b -> b
+    ? Relevant bindings include
+        baz :: Bool -> (b -> b) -> b -> b (bound at T10619.hs:16:1)
+
+T10619.hs:20:14: error:
+    ? Couldn't match type ?b? with ?a?
+        because type variable ?a? would escape its scope
+      This (rigid, skolem) type variable is bound by
+        a type expected by the context:
+          a -> a
+        at T10619.hs:20:14-64
+      Expected type: (b -> b) -> b -> b
+        Actual type: (forall a. a -> a) -> forall b. b -> b
+    ? In the expression:
+          (\ x -> x) :: (forall a. a -> a) -> forall b. b -> b
+      In an equation for ?quux?:
+          quux True = (\ x -> x) :: (forall a. a -> a) -> forall b. b -> b
+    ? Relevant bindings include
+        quux :: Bool -> (b -> b) -> b -> b (bound at T10619.hs:19:1)
diff --git a/testsuite/tests/typecheck/should_fail/all.T b/testsuite/tests/typecheck/should_fail/all.T
index aa43cce..4279950 100644
--- a/testsuite/tests/typecheck/should_fail/all.T
+++ b/testsuite/tests/typecheck/should_fail/all.T
@@ -397,3 +397,4 @@ test('CustomTypeErrors03', normal, compile_fail, [''])
 test('T11112', normal, compile_fail, [''])
 test('ClassOperator', normal, compile_fail, [''])
 test('T11274', normal, compile_fail, [''])
+test('T10619', normal, compile_fail, [''])


From git at git.haskell.org  Sat Dec 26 21:02:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:52 +0000 (UTC)
Subject: [commit: ghc] master: Test #10589 in typecheck/should_compile/T10589
 (b218241)
Message-ID: <20151226210252.BE6603A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b218241d6ba8c1a8dff3e9dbb461dbbc1d2ab412/ghc

>---------------------------------------------------------------

commit b218241d6ba8c1a8dff3e9dbb461dbbc1d2ab412
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Dec 26 13:04:44 2015 -0500

    Test #10589 in typecheck/should_compile/T10589


>---------------------------------------------------------------

b218241d6ba8c1a8dff3e9dbb461dbbc1d2ab412
 testsuite/tests/typecheck/should_compile/T10589.hs | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/testsuite/tests/typecheck/should_compile/T10589.hs b/testsuite/tests/typecheck/should_compile/T10589.hs
new file mode 100644
index 0000000..5ba1c4f
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T10589.hs
@@ -0,0 +1,9 @@
+{-# LANGUAGE LambdaCase, TypeFamilies #-}
+
+module T10589 where
+
+type family F a where
+  F a = Bool -> a
+
+foo = (\case True -> 5
+             False -> 6) :: F Int


From git at git.haskell.org  Sat Dec 26 21:02:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sat, 26 Dec 2015 21:02:55 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11287. (da69358)
Message-ID: <20151226210255.774843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/da69358bfb1b71c6455c420399fd6a18a02ee5df/ghc

>---------------------------------------------------------------

commit da69358bfb1b71c6455c420399fd6a18a02ee5df
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Sat Dec 26 12:58:03 2015 -0500

    Fix #11287.
    
    Happily, the fix is simply deleting some old code. I love it when
    that happens.


>---------------------------------------------------------------

da69358bfb1b71c6455c420399fd6a18a02ee5df
 compiler/coreSyn/CoreUtils.hs   |  2 +-
 compiler/typecheck/TcMatches.hs | 10 +---------
 testsuite/tests/th/all.T        |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index 9d887ec..f31eac6 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -616,7 +616,7 @@ refineDefaultAlt us tycon tys imposs_deflt_cons all_alts
         -- Check for no data constructors
         -- This can legitimately happen for abstract types and type families,
         -- so don't report that
-  = pprTrace "prepareDefault" (ppr tycon) (False, all_alts)
+  = (False, all_alts)
 
   | otherwise      -- The common case
   = (False, all_alts)
diff --git a/compiler/typecheck/TcMatches.hs b/compiler/typecheck/TcMatches.hs
index 2e4078b..f7bb726 100644
--- a/compiler/typecheck/TcMatches.hs
+++ b/compiler/typecheck/TcMatches.hs
@@ -117,13 +117,6 @@ tcMatchesCase :: (Outputable (body Name)) =>
                  -- wrapper goes from MatchGroup's ty to expected ty
 
 tcMatchesCase ctxt scrut_ty matches res_ty
-  | isEmptyMatchGroup matches   -- Allow empty case expressions
-  = return (MG { mg_alts = noLoc []
-               , mg_arg_tys = [scrut_ty]
-               , mg_res_ty = res_ty
-               , mg_origin = mg_origin matches })
-
-  | otherwise
   = do { res_ty <- tauifyMultipleMatches matches res_ty
        ; tcMatches ctxt [scrut_ty] res_ty matches }
 
@@ -220,8 +213,7 @@ data TcMatchCtxt body   -- c.f. TcStmtCtxt, also in this module
 
 tcMatches ctxt pat_tys rhs_ty (MG { mg_alts = L l matches
                                   , mg_origin = origin })
-  = ASSERT( not (null matches) )        -- Ensure that rhs_ty is filled in
-    do { matches' <- mapM (tcMatch ctxt pat_tys rhs_ty) matches
+  = do { matches' <- mapM (tcMatch ctxt pat_tys rhs_ty) matches
        ; return (MG { mg_alts = L l matches'
                     , mg_arg_tys = pat_tys
                     , mg_res_ty = rhs_ty
diff --git a/testsuite/tests/th/all.T b/testsuite/tests/th/all.T
index 2a82a23..fb429bc 100644
--- a/testsuite/tests/th/all.T
+++ b/testsuite/tests/th/all.T
@@ -272,7 +272,7 @@ test('T7532',
      ['T7532', '-v0 ' + config.ghc_th_way_flags])
 test('T2222', normal, compile, ['-v0'])
 test('T1849', normal, ghci_script, ['T1849.script'])
-test('T7681', when(compiler_debugged(), expect_broken(11287)), compile, ['-v0'])
+test('T7681', normal, compile, ['-v0'])
 test('T7910', normal, compile_and_run, ['-v0'])
 
 test('ClosedFam1TH', normal, compile, ['-dsuppress-uniques -v0'])


From git at git.haskell.org  Sun Dec 27 00:42:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:22 +0000 (UTC)
Subject: [commit: ghc] master: Bump Haddock submodule again (0fda908)
Message-ID: <20151227004222.B7D693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0fda9084e0f5dfce9d80967f0e11c852e301d335/ghc

>---------------------------------------------------------------

commit 0fda9084e0f5dfce9d80967f0e11c852e301d335
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Fri Dec 25 11:11:50 2015 +0100

    Bump Haddock submodule again
    
    Merged a few outstanding pull requests. Still need to work through
    haddock testsuite issues.


>---------------------------------------------------------------

0fda9084e0f5dfce9d80967f0e11c852e301d335
 utils/haddock | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/utils/haddock b/utils/haddock
index fef5e32..80f2f98 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit fef5e32ca541eb70b22d8e8da611e4a2b797e00c
+Subproject commit 80f2f9805b61e8cea291bae8ce22db626dc11f21


From git at git.haskell.org  Sun Dec 27 00:42:25 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:25 +0000 (UTC)
Subject: [commit: ghc] master: Linker: Fix cut-and-paste error in debug output
 (8bf2d8f)
Message-ID: <20151227004225.73A7B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8bf2d8f6360a13b68a55ed29865c09c106665409/ghc

>---------------------------------------------------------------

commit 8bf2d8f6360a13b68a55ed29865c09c106665409
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 26 12:55:12 2015 +0100

    Linker: Fix cut-and-paste error in debug output


>---------------------------------------------------------------

8bf2d8f6360a13b68a55ed29865c09c106665409
 rts/Linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index a082ba7..9905d7d 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -3617,7 +3617,7 @@ ocGetNames_PEi386 ( ObjectCode* oc )
    sections = (Section*)stgCallocBytes(
        sizeof(Section),
        hdr->NumberOfSections + 1, /* +1 for the global BSS section see below */
-       "ocGetNames_ELF(sections)");
+       "ocGetNames_PEi386(sections)");
    oc->sections = sections;
    oc->n_sections = hdr->NumberOfSections + 1;
 


From git at git.haskell.org  Sun Dec 27 00:42:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:28 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/T8274: Remove 32-bit test output
 (e39d10f)
Message-ID: <20151227004228.430763A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e39d10f4f99360ce4c670a36337964c8edd846ce/ghc

>---------------------------------------------------------------

commit e39d10f4f99360ce4c670a36337964c8edd846ce
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 26 22:41:42 2015 +0100

    testsuite/T8274: Remove 32-bit test output
    
    It appears that this was only necessary on account of the varying types
    of type representation fingerprints, which has been resolved in
    Phab:D1529.


>---------------------------------------------------------------

e39d10f4f99360ce4c670a36337964c8edd846ce
 testsuite/tests/simplCore/should_compile/T8274.stdout-ws-32 | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/testsuite/tests/simplCore/should_compile/T8274.stdout-ws-32 b/testsuite/tests/simplCore/should_compile/T8274.stdout-ws-32
deleted file mode 100644
index 57199d6..0000000
--- a/testsuite/tests/simplCore/should_compile/T8274.stdout-ws-32
+++ /dev/null
@@ -1,10 +0,0 @@
-T8274.$trModule2 = TrNameS "main"#
-T8274.$trModule1 = TrNameS "T8274"#
-T8274.$tcP1 = TrNameS "P"#
-    11095028091707994303L##
-    9476557054198009608L##
-T8274.$tcN1 = TrNameS "N"#
-    7479687563082171902L##
-    17616649989360543185L##
-p = T8274.Positives 42# 4.23# 4.23## '4'# 4##
-n = T8274.Negatives -4# -4.0# -4.0##


From git at git.haskell.org  Sun Dec 27 00:42:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:30 +0000 (UTC)
Subject: [commit: ghc] master: T10518: Ensure literal has 64-bit type (422107e)
Message-ID: <20151227004230.E1F8F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/422107ecb943fd1d7e6dfc83e09518627da5d57a/ghc

>---------------------------------------------------------------

commit 422107ecb943fd1d7e6dfc83e09518627da5d57a
Author: Ben Gamari <bgamari at smart-cactus.org>
Date:   Mon Oct 26 09:12:13 2015 +0000

    T10518: Ensure literal has 64-bit type
    
    Otherwise we get a C-- lint error due to mismatched RHS and
    variable types.


>---------------------------------------------------------------

422107ecb943fd1d7e6dfc83e09518627da5d57a
 testsuite/tests/codeGen/should_compile/T10518.cmm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/codeGen/should_compile/T10518.cmm b/testsuite/tests/codeGen/should_compile/T10518.cmm
index 966cd4a..cea4639 100644
--- a/testsuite/tests/codeGen/should_compile/T10518.cmm
+++ b/testsuite/tests/codeGen/should_compile/T10518.cmm
@@ -1,5 +1,5 @@
 foo() {
     bits64 a;
-    a = 0x10000000000000000; // overflows 64 bits
+    a = (0x10000000000000000 :: bits64); // overflows 64 bits
     return (a);
 }


From git at git.haskell.org  Sun Dec 27 00:42:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:33 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/codegen: Add missing dummy Makefiles
 (fb5d26d)
Message-ID: <20151227004233.95BE43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fb5d26d9658908ae3e8416077246c2fb405875e1/ghc

>---------------------------------------------------------------

commit fb5d26d9658908ae3e8416077246c2fb405875e1
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 26 22:47:45 2015 +0100

    testsuite/codegen: Add missing dummy Makefiles


>---------------------------------------------------------------

fb5d26d9658908ae3e8416077246c2fb405875e1
 testsuite/tests/{annotations => primops}/should_compile/Makefile          | 0
 .../tests/{annotations/should_compile => primops/should_run}/Makefile     | 0
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/testsuite/tests/annotations/should_compile/Makefile b/testsuite/tests/primops/should_compile/Makefile
similarity index 100%
copy from testsuite/tests/annotations/should_compile/Makefile
copy to testsuite/tests/primops/should_compile/Makefile
diff --git a/testsuite/tests/annotations/should_compile/Makefile b/testsuite/tests/primops/should_run/Makefile
similarity index 100%
copy from testsuite/tests/annotations/should_compile/Makefile
copy to testsuite/tests/primops/should_run/Makefile


From git at git.haskell.org  Sun Dec 27 00:42:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:36 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/T9430: Fix word-size dependence
 (0b0652f)
Message-ID: <20151227004236.4657C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0b0652f1e9183e92be10de5aa2b44d9c12c5a68e/ghc

>---------------------------------------------------------------

commit 0b0652f1e9183e92be10de5aa2b44d9c12c5a68e
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 26 23:23:03 2015 +0100

    testsuite/T9430: Fix word-size dependence
    
    Summary: This test was wrong.
    
    Test Plan: Validate
    
    Reviewers: erikd, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1702
    
    GHC Trac Issues: #11294


>---------------------------------------------------------------

0b0652f1e9183e92be10de5aa2b44d9c12c5a68e
 testsuite/tests/primops/should_run/T9430.hs | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

diff --git a/testsuite/tests/primops/should_run/T9430.hs b/testsuite/tests/primops/should_run/T9430.hs
index eedc0a7..4fa6769 100644
--- a/testsuite/tests/primops/should_run/T9430.hs
+++ b/testsuite/tests/primops/should_run/T9430.hs
@@ -3,8 +3,12 @@
 
 module Main where
 
+import Data.Bits
 import GHC.Exts
 
+wordWidth :: Int
+wordWidth = finiteBitSize (0 :: Word)
+
 checkI
     :: (Int, Int)                          -- ^ expected results
     -> (Int# -> Int# -> (# Int#, Int# #))  -- ^ primop
@@ -96,10 +100,10 @@ main = do
     check "timesWord2# maxBound 1" $ checkW (0, maxBound) timesWord2# maxBound 1
     check "timesWord2# 1 maxBound" $ checkW (0, maxBound) timesWord2# 1 maxBound
     -- Overflows
-    check "timesWord2# " $ checkW (1, 0) timesWord2# (2 ^ 63) 2
-    check "timesWord2# " $ checkW (2, 0) timesWord2# (2 ^ 63) (2 ^ 2)
-    check "timesWord2# " $ checkW (4, 0) timesWord2# (2 ^ 63) (2 ^ 3)
-    check "timesWord2# " $ checkW (8, 0) timesWord2# (2 ^ 63) (2 ^ 4)
+    check "timesWord2# (2^(N-1)) 2"   $ checkW (1, 0) timesWord2# (2 ^ (wordWidth-1)) 2
+    check "timesWord2# (2^(N-1)) 2^2" $ checkW (2, 0) timesWord2# (2 ^ (wordWidth-1)) (2 ^ 2)
+    check "timesWord2# (2^(N-1)) 2^3" $ checkW (4, 0) timesWord2# (2 ^ (wordWidth-1)) (2 ^ 3)
+    check "timesWord2# (2^(N-1)) 2^4" $ checkW (8, 0) timesWord2# (2 ^ (wordWidth-1)) (2 ^ 4)
     check "timesWord2# maxBound 2" $
       checkW (1, maxBound - 1) timesWord2# maxBound 2
     check "timesWord2# 2 maxBound" $
@@ -112,17 +116,17 @@ main = do
     check "quotRemWord2# 0 0 1" $ checkW2 (0, 0) quotRemWord2# 0 0 1
     check "quotRemWord2# 0 4 2" $ checkW2 (2, 0) quotRemWord2# 0 4 2
     check "quotRemWord2# 0 7 3" $ checkW2 (2, 1) quotRemWord2# 0 7 3
-    check "quotRemWord2# 1 0 (2 ^ 63)" $
-      checkW2 (2, 0) quotRemWord2# 1 0 (2 ^ 63)
-    check "quotRemWord2# 1 1 (2 ^ 63)" $
-      checkW2 (2, 1) quotRemWord2# 1 1 (2 ^ 63)
+    check "quotRemWord2# 1 0 (2^(N-1))" $
+      checkW2 (2, 0) quotRemWord2# 1 0 (2 ^ (wordWidth-1))
+    check "quotRemWord2# 1 1 (2^(N-1))" $
+      checkW2 (2, 1) quotRemWord2# 1 1 (2 ^ (wordWidth-1))
     check "quotRemWord2# 1 0 maxBound" $
       checkW2 (1, 1) quotRemWord2# 1 0 maxBound
     check "quotRemWord2# 2 0 maxBound" $
       checkW2 (2, 2) quotRemWord2# 2 0 maxBound
     check "quotRemWord2# 1 maxBound maxBound" $
       checkW2 (2, 1) quotRemWord2# 1 maxBound maxBound
-    check "quotRemWord2# (2 ^ 63) 0 maxBound" $
-      checkW2 (2 ^ 63, 2 ^ 63) quotRemWord2# (2 ^ 63) 0 maxBound
-    check "quotRemWord2# (2 ^ 63) maxBound maxBound" $
-      checkW2 (2 ^ 63 + 1, 2 ^ 63) quotRemWord2# (2 ^ 63) maxBound maxBound
+    check "quotRemWord2# (2^(N-1)) 0 maxBound" $
+      checkW2 (2 ^ (wordWidth-1), 2 ^ (wordWidth-1)) quotRemWord2# (2 ^ (wordWidth-1)) 0 maxBound
+    check "quotRemWord2# (2^(N-1)) maxBound maxBound" $
+      checkW2 (2 ^ (wordWidth-1) + 1, 2 ^ (wordWidth-1)) quotRemWord2# (2 ^ (wordWidth-1)) maxBound maxBound


From git at git.haskell.org  Sun Dec 27 00:42:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:38 +0000 (UTC)
Subject: [commit: ghc] master: Linker: Reenable Thumb support (b62215d)
Message-ID: <20151227004238.F03313A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b62215d822d69926798e6cff2fd162ae87adb36d/ghc

>---------------------------------------------------------------

commit b62215d822d69926798e6cff2fd162ae87adb36d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sat Dec 26 13:32:56 2015 +0100

    Linker: Reenable Thumb support
    
    I believe this ought to be okay now since we only produce ARM-encoded
    objects. Added a Note describing the state of things.


>---------------------------------------------------------------

b62215d822d69926798e6cff2fd162ae87adb36d
 rts/Linker.c | 28 ++++++++++++++++++++++++----
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 9905d7d..e411e4d 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -326,6 +326,30 @@ static void m32_allocator_init(struct m32_allocator_t *m32);
 #endif
 
 /*
+  Note [The ARM/Thumb Story]
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  Support for the ARM architecture is complicated by the fact that ARM has not
+  one but several instruction encodings. The two relevant ones here are the original
+  ARM encoding and Thumb, a more dense variant of ARM supporting only a subset
+  of the instruction set.
+
+  How the CPU decodes a particular instruction is determined by a mode bit. This
+  mode bit is set on jump instructions, the value being determined by the low
+  bit of the target address: An odd address means the target is a procedure
+  encoded in the Thumb encoding whereas an even address means it's a traditional
+  ARM procedure (the actual address jumped to is even regardless of the encoding bit).
+
+  Interoperation between Thumb- and ARM-encoded object code (known as "interworking")
+  is tricky. If the linker needs to link a call by an ARM object into Thumb code
+  (or vice-versa) it will produce a jump island. This, however, is incompatible with
+  GHC's tables-next-to-code. For this reason, it is critical that GHC emit
+  exclusively ARM or Thumb objects for all Haskell code.
+
+  We still do, however, need to worry about foreign code.
+*/
+
+/*
  * Due to the small memory model (see above), on x86_64 we have to map
  * all our non-PIC object files into the low 2Gb of the address space
  * (why 2Gb and not 4Gb?  Because all addresses must be reachable
@@ -5023,10 +5047,6 @@ do_Elf_Rel_relocations ( ObjectCode* oc, char* ehdrC,
          // Thumb instructions have bit 0 of symbol's st_value set
          is_target_thm = S & 0x1;
 
-         if (is_target_thm)
-            errorBelch( "Symbol `%s' requires Thumb linkage which is not "
-                        "currently supported.\n", symbol );
-
          T = sym.st_info & STT_FUNC && is_target_thm;
 
          // Make sure we clear bit 0. Strictly speaking we should have done


From git at git.haskell.org  Sun Dec 27 00:42:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:41 +0000 (UTC)
Subject: [commit: ghc] master: Linker(ELF): Fix addProddableBlocks usage
 (909bbdb)
Message-ID: <20151227004241.99CA33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd/ghc

>---------------------------------------------------------------

commit 909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 27 01:13:39 2015 +0100

    Linker(ELF): Fix addProddableBlocks usage
    
    The range marked as proddable didn't actually match the range that we
    mapped. This fixed `ghc-api/T8628` et al on ARM.
    
    Test Plan: Validate
    
    Reviewers: austin, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1700
    
    GHC Trac Issues: #11289


>---------------------------------------------------------------

909bbdb59700b7d5c8aa6a3f9b4797003d9e62bd
 rts/Linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index e411e4d..3bd12b3 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4809,7 +4809,7 @@ ocGetNames_ELF ( ObjectCode* oc )
               if (start == NULL) goto fail;
               alloc = SECTION_MMAP;
           }
-          addProddableBlock(oc, ehdrC + offset, size);
+          addProddableBlock(oc, start, size);
       }
 
       addSection(&sections[i], kind, alloc, start, size,


From git at git.haskell.org  Sun Dec 27 00:42:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:44 +0000 (UTC)
Subject: [commit: ghc] master: libraries/ghci: Implement mkJumpToAddr for
 ppc64 (e8672e5)
Message-ID: <20151227004244.4A2D53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e8672e5e6cd4db6bbe3a1183f4fbf5496292621c/ghc

>---------------------------------------------------------------

commit e8672e5e6cd4db6bbe3a1183f4fbf5496292621c
Author: Peter Trommler <ptrommler at acm.org>
Date:   Sun Dec 27 01:12:51 2015 +0100

    libraries/ghci: Implement mkJumpToAddr for ppc64
    
    Test Plan: validated on powerpc64 and powerpc64le
    
    Reviewers: austin, erikd, simonmar, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1680
    
    GHC Trac Issues: #11257


>---------------------------------------------------------------

e8672e5e6cd4db6bbe3a1183f4fbf5496292621c
 libraries/ghci/GHCi/InfoTable.hsc | 49 ++++++++++++++++++++++++++++++++++++++-
 1 file changed, 48 insertions(+), 1 deletion(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index 34604ea..14e1698 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -57,7 +57,7 @@ funPtrToInt :: FunPtr a -> Int
 funPtrToInt (FunPtr a) = I## (addr2Int## a)
 
 data Arch = ArchSPARC | ArchPPC | ArchX86 | ArchX86_64 | ArchAlpha | ArchARM
-          | ArchARM64
+          | ArchARM64 | ArchPPC64 | ArchPPC64LE
  deriving Show
 
 platform :: Arch
@@ -76,6 +76,10 @@ platform =
        ArchARM
 #elif defined(aarch64_HOST_ARCH)
        ArchARM64
+#elif defined(powerpc64_HOST_ARCH)
+       ArchPPC64
+#elif defined(powerpc64le_HOST_ARCH)
+       ArchPPC64LE
 #else
 #error Unknown architecture
 #endif
@@ -197,6 +201,49 @@ mkJumpToAddr a = case platform of
                 , 0xd61f0020
                 , fromIntegral w64
                 , fromIntegral (w64 `shiftR` 32) ]
+    ArchPPC64 ->
+        -- We use the compiler's register r12 to read the function
+        -- descriptor and the linker's register r11 as a temporary
+        -- register to hold the function entry point.
+        -- In the medium code model the function descriptor
+        -- is located in the first two gigabytes, i.e. the address
+        -- of the function pointer is a non-negative 32 bit number.
+        -- 0x0EADBEEF stands for the address of the function pointer:
+        --    0:   3d 80 0e ad     lis     r12,0x0EAD
+        --    4:   61 8c be ef     ori     r12,r12,0xBEEF
+        --    8:   e9 6c 00 00     ld      r11,0(r12)
+        --    c:   e8 4c 00 08     ld      r2,8(r12)
+        --   10:   7d 69 03 a6     mtctr   r11
+        --   14:   e9 6c 00 10     ld      r11,16(r12)
+        --   18:   4e 80 04 20     bctr
+       let  w32 = fromIntegral (funPtrToInt a)
+            hi16 x = (x `shiftR` 16) .&. 0xFFFF
+            lo16 x = x .&. 0xFFFF
+       in Right [ 0x3D800000 .|. hi16 w32,
+                  0x618C0000 .|. lo16 w32,
+                  0xE96C0000,
+                  0xE84C0008,
+                  0x7D6903A6,
+                  0xE96C0010,
+                  0x4E800420]
+
+    ArchPPC64LE ->
+        -- The ABI requires r12 to point to the function's entry point.
+        -- We use the medium code model where code resides in the first
+        -- two gigabytes, so loading a non-negative32 bit address
+        -- with lis followed by ori is fine.
+        -- 0x0EADBEEF stands for the address:
+        -- 3D800EAD lis r12,0x0EAD
+        -- 618CBEEF ori r12,r12,0xBEEF
+        -- 7D8903A6 mtctr r12
+        -- 4E800420 bctr
+
+        let w32 = fromIntegral (funPtrToInt a)
+            hi16 x = (x `shiftR` 16) .&. 0xFFFF
+            lo16 x = x .&. 0xFFFF
+        in Right [ 0x3D800000 .|. hi16 w32,
+                   0x618C0000 .|. lo16 w32,
+                   0x7D8903A6, 0x4E800420 ]
 
 byte0 :: (Integral w) => w -> Word8
 byte0 w = fromIntegral w


From git at git.haskell.org  Sun Dec 27 00:42:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 00:42:46 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/joao-circular: Clean up test results
 (da5e693)
Message-ID: <20151227004246.E47CE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/da5e693275f41d34872aba31cdf320711422ed9c/ghc

>---------------------------------------------------------------

commit da5e693275f41d34872aba31cdf320711422ed9c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 27 01:14:00 2015 +0100

    testsuite/joao-circular: Clean up test results
    
    Eliminate redundant pattern which resulted in warning. Also increase the
    compile timeout multiplier since this test tends to take quite a while
    to build. I have seen it fail numerous times during Harbormaster builds
    and have never seen it pass on ARM.
    
    Test Plan: Validate
    
    Reviewers: austin, thomie
    
    Reviewed By: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1699


>---------------------------------------------------------------

da5e693275f41d34872aba31cdf320711422ed9c
 testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs | 1 -
 testsuite/tests/programs/joao-circular/test.T               | 3 +++
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
index ec47769..d542e4f 100644
--- a/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
+++ b/testsuite/tests/programs/joao-circular/Funcs_Parser_Lazy.hs
@@ -1280,7 +1280,6 @@ happyNewToken action sts stk (tk:tks) =
 	TIdent happy_dollar_dollar -> cont 51;
 	TintVal happy_dollar_dollar -> cont 52;
 	TrealVal happy_dollar_dollar -> cont 53;
-	_ -> happyError tks
 	}
 
 happyThen = \m k -> k m
diff --git a/testsuite/tests/programs/joao-circular/test.T b/testsuite/tests/programs/joao-circular/test.T
index 3fbf054..589add0 100644
--- a/testsuite/tests/programs/joao-circular/test.T
+++ b/testsuite/tests/programs/joao-circular/test.T
@@ -7,6 +7,9 @@ test('joao-circular',
                    'LrcPrelude.hi',        'LrcPrelude.o',
                    'Main.hi',              'Main.o',
                    'Visfun_Lazy.hi',       'Visfun_Lazy.o']),
+      # This can take a while to compile, especially with
+      # LLVM backend (as is necessary on, e.g., ARM)
+      compile_timeout_multiplier(3.0),
       extra_run_opts('inp 40')],
      multimod_compile_and_run,
      ['Main', '-O'])


From git at git.haskell.org  Sun Dec 27 01:30:21 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 01:30:21 +0000 (UTC)
Subject: [commit: ghc] master: Clean up a botched merge. (a3b34b6)
Message-ID: <20151227013021.56C3F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a3b34b64136143fc117e572fab81e7b564b26f8e/ghc

>---------------------------------------------------------------

commit a3b34b64136143fc117e572fab81e7b564b26f8e
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sat Dec 26 15:48:13 2015 -0800

    Clean up a botched merge.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: VAlidate
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1703


>---------------------------------------------------------------

a3b34b64136143fc117e572fab81e7b564b26f8e
 compiler/main/DriverPipeline.hs | 19 +++----------------
 1 file changed, 3 insertions(+), 16 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 1234a2f..ee07d54 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -130,22 +130,6 @@ compileOne' m_tc_result mHscMessage
             hsc_env0 summary mod_index nmods mb_old_iface maybe_old_linkable
             source_modified0
  = do
-   let dflags0     = ms_hspp_opts summary
-       this_mod    = ms_mod summary
-       src_flavour = ms_hsc_src summary
-       location    = ms_location summary
-       input_fnpp  = ms_hspp_file summary
-       mod_graph   = hsc_mod_graph hsc_env0
-       needsTH     = any (xopt LangExt.TemplateHaskell . ms_hspp_opts) mod_graph
-       needsQQ     = any (xopt LangExt.QuasiQuotes     . ms_hspp_opts) mod_graph
-       needsLinker = needsTH || needsQQ
-       isDynWay    = any (== WayDyn) (ways dflags0)
-       isProfWay   = any (== WayProf) (ways dflags0)
-   -- #8180 - when using TemplateHaskell, switch on -dynamic-too so
-   -- the linker can correctly load the object files.
-   let dflags1 = if needsLinker && dynamicGhc && not isDynWay && not isProfWay
-                  then gopt_set dflags0 Opt_BuildDynamicToo
-                  else dflags0
 
    debugTraceMsg dflags1 2 (text "compile: input file" <+> text input_fnpp)
 
@@ -229,8 +213,11 @@ compileOne' m_tc_result mHscMessage
             return hmi0 { hm_linkable = Just linkable }
 
  where dflags0     = ms_hspp_opts summary
+
+       this_mod    = ms_mod summary
        location    = ms_location summary
        input_fn    = expectJust "compile:hs" (ml_hs_file location)
+       input_fnpp  = ms_hspp_file summary
        mod_graph   = hsc_mod_graph hsc_env0
        needsTH     = any (xopt LangExt.TemplateHaskell . ms_hspp_opts) mod_graph
        needsQQ     = any (xopt LangExt.QuasiQuotes     . ms_hspp_opts) mod_graph


From git at git.haskell.org  Sun Dec 27 12:54:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 12:54:37 +0000 (UTC)
Subject: [commit: ghc] master: testsuite/CmmSwitchTest: Mark as broken on
 32-bit platforms (d1ebbb0)
Message-ID: <20151227125437.4B0503A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d1ebbb0c5929038d0eeb28009bd03c18262dce7d/ghc

>---------------------------------------------------------------

commit d1ebbb0c5929038d0eeb28009bd03c18262dce7d
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Sun Dec 27 12:11:39 2015 +0100

    testsuite/CmmSwitchTest: Mark as broken on 32-bit platforms
    
    As pointed out in #11297 this test is broken on 32-bit platforms.


>---------------------------------------------------------------

d1ebbb0c5929038d0eeb28009bd03c18262dce7d
 testsuite/tests/codeGen/should_run/all.T | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/testsuite/tests/codeGen/should_run/all.T b/testsuite/tests/codeGen/should_run/all.T
index e9296e9..0574d01 100644
--- a/testsuite/tests/codeGen/should_run/all.T
+++ b/testsuite/tests/codeGen/should_run/all.T
@@ -130,7 +130,9 @@ test('T9013', omit_ways(['ghci']),  # ghci doesn't support unboxed tuples
      compile_and_run, [''])
 test('T9340', normal, compile_and_run, [''])
 test('cgrun074', normal, compile_and_run, [''])
-test('CmmSwitchTest', when(fast(), skip), compile_and_run, [''])
+test('CmmSwitchTest',
+     [when(fast(), skip), when(wordsize(32), expect_broken(11297))],
+     compile_and_run, [''])
 # Skipping WAY=ghci, because it is not broken.
 test('T10245', [omit_ways(['ghci']), expect_broken(10246)], compile_and_run, [''])
 test('T10246', expect_broken(10246), compile_and_run, [''])


From git at git.haskell.org  Sun Dec 27 17:47:03 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 17:47:03 +0000 (UTC)
Subject: [commit: ghc] master: Add testcase for getSizeofMutableByteArray#
 (11778f7)
Message-ID: <20151227174703.C5CFA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/11778f74da669b13e3748191e89e3c3cafed903b/ghc

>---------------------------------------------------------------

commit 11778f74da669b13e3748191e89e3c3cafed903b
Author: Ben Gamari <bgamari at smart-cactus.org>
Date:   Sun Dec 27 17:49:03 2015 +0100

    Add testcase for getSizeofMutableByteArray#
    
    In an attempt to track down #11296. Unfortunately the primop appears
    to be working as expected.
    
    Test Plan: validate
    
    Reviewers: hvr, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1706
    
    GHC Trac Issues: #11296


>---------------------------------------------------------------

11778f74da669b13e3748191e89e3c3cafed903b
 testsuite/tests/primops/should_run/T11296.hs       | 30 ++++++++++++++++++++++
 .../tests/primops/should_run/T11296.stdout         |  0
 testsuite/tests/primops/should_run/all.T           |  1 +
 3 files changed, 31 insertions(+)

diff --git a/testsuite/tests/primops/should_run/T11296.hs b/testsuite/tests/primops/should_run/T11296.hs
new file mode 100644
index 0000000..c487974
--- /dev/null
+++ b/testsuite/tests/primops/should_run/T11296.hs
@@ -0,0 +1,30 @@
+{-# LANGUAGE MagicHash #-}
+{-# LANGUAGE UnboxedTuples #-}
+
+import Control.Monad (unless)
+import GHC.Exts
+import GHC.Types
+
+data ByteArray s = BA (MutableByteArray# s)
+
+main :: IO ()
+main = do
+    ba# <- IO (\s0 -> case newByteArray# 256# s0 of
+                        (# s1, ba# #) -> (# s1, BA ba# #))
+    let go n = do
+            shrink ba# n
+            sz <- getSize ba#
+            unless (sz == n) $ print (sz, n)
+    mapM go [128, 64, 63, 32, 2, 1]
+    return ()
+
+shrink :: ByteArray RealWorld -> Int -> IO ()
+shrink (BA ba#) (I# n#) = IO (\s ->
+    case shrinkMutableByteArray# ba# n# s of
+      s' -> (# s', () #))
+
+getSize :: ByteArray RealWorld -> IO Int
+getSize (BA ba#) = IO (\s ->
+    case getSizeofMutableByteArray# ba# s of
+      (# s', n# #) -> (# s', I# n# #))
+
diff --git a/libraries/base/tests/IO/misc001.stdout b/testsuite/tests/primops/should_run/T11296.stdout
similarity index 100%
copy from libraries/base/tests/IO/misc001.stdout
copy to testsuite/tests/primops/should_run/T11296.stdout
diff --git a/testsuite/tests/primops/should_run/all.T b/testsuite/tests/primops/should_run/all.T
index 2003fc3..68a2d56 100644
--- a/testsuite/tests/primops/should_run/all.T
+++ b/testsuite/tests/primops/should_run/all.T
@@ -12,3 +12,4 @@ test('T10678',
       only_ways('normal')
      ],
      compile_and_run, ['-O'])
+test('T11296', normal, compile_and_run, [''])


From git at git.haskell.org  Sun Dec 27 17:47:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 17:47:06 +0000 (UTC)
Subject: [commit: ghc] master: integer-gmp: Fix #11296 (07b3be7)
Message-ID: <20151227174706.6FE113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/07b3be76a14a061a43846ef41f1dd7819603be4e/ghc

>---------------------------------------------------------------

commit 07b3be76a14a061a43846ef41f1dd7819603be4e
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 27 17:49:10 2015 +0100

    integer-gmp: Fix #11296
    
    This was introduced by a mental fumble in
    9e8562ae02701270e2c1dfcee3279d862dc5b7b6 wherein I replaced
    `getSizeofMutableByteArray` with `getSizeofMutBigNat`. This was noticed
    by invalid integers being produced on 32-bit machines in #11296.
    
    Test Plan: Validate
    
    Reviewers: hvr, goldfire, austin
    
    Reviewed By: hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1707
    
    GHC Trac Issues: #11296


>---------------------------------------------------------------

07b3be76a14a061a43846ef41f1dd7819603be4e
 libraries/integer-gmp/src/GHC/Integer/Type.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libraries/integer-gmp/src/GHC/Integer/Type.hs b/libraries/integer-gmp/src/GHC/Integer/Type.hs
index 167492d..3e563dc 100644
--- a/libraries/integer-gmp/src/GHC/Integer/Type.hs
+++ b/libraries/integer-gmp/src/GHC/Integer/Type.hs
@@ -1659,7 +1659,7 @@ resizeMutBigNat# (MBN# mba0#) nsz# s
         (# s'', mba# #) -> (# s'', MBN# mba# #)
   where
     bsz# = nsz# `uncheckedIShiftL#` GMP_LIMB_SHIFT#
-    (# s', n# #) = getSizeofMutBigNat# (MBN# mba0#) s
+    (# s', n# #) = getSizeofMutableByteArray# mba0# s
 
 shrinkMutBigNat# :: MutBigNat s -> GmpSize# -> State# s -> State# s
 shrinkMutBigNat# (MBN# mba0#) nsz# s
@@ -1667,7 +1667,7 @@ shrinkMutBigNat# (MBN# mba0#) nsz# s
   | True                  = shrinkMutableByteArray# mba0# bsz# s'
   where
     bsz# = nsz# `uncheckedIShiftL#` GMP_LIMB_SHIFT#
-    (# s', n# #) = getSizeofMutBigNat# (MBN# mba0#) s
+    (# s', n# #) = getSizeofMutableByteArray# mba0# s
 
 unsafeSnocFreezeBigNat# :: MutBigNat s -> GmpLimb# -> S s BigNat
 unsafeSnocFreezeBigNat# mbn0@(MBN# mba0#) limb# s = go s'


From git at git.haskell.org  Sun Dec 27 22:29:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 22:29:26 +0000 (UTC)
Subject: [commit: ghc] master: Adding flags: -ffull-guard-reasoning and
 too-many-guards (bec5350)
Message-ID: <20151227222926.636BE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bec5350da09fde51231004b1b7d33641ac51800e/ghc

>---------------------------------------------------------------

commit bec5350da09fde51231004b1b7d33641ac51800e
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Sun Dec 27 23:05:02 2015 +0100

    Adding flags: -ffull-guard-reasoning and too-many-guards
    
    Introduction of two new flags, for more precise control over the new
    pattern match checker's behaviour when reasoning about guards. This is
    supposed to address #11195 (and maybe more performance bugs related to
    the NP-Hardness of coverage checking).
    
    Expected behaviour:
    
      * When `-ffull-guard-reasoning` is on, run the new pattern match
        checker in its full power
    
      * When `-ffull-guard-reasoning` is off (the default), for every
        match, check a metric to see whether pattern match checking for it
        has high probability of being non performant (at the the moment we
        check whether the number of guards is over 20 but I would like to
        use a more precise measure in the future). If the probability is
        high:
    
        - Oversimplify the guards (less expressive but more performant)
          and run the checker, and
    
        - Issue a warning about the simplification that happened.
    
    A new flag `-Wtoo-many-guards/-Wno-too-many-guards` suppresses the
    warning about the simplification (useful when combined with -Werror).
    
    Test Plan: validate
    
    Reviewers: goldfire, austin, hvr, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: mpickering, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1676
    
    GHC Trac Issues: #11195


>---------------------------------------------------------------

bec5350da09fde51231004b1b7d33641ac51800e
 compiler/deSugar/Check.hs                 | 358 +++++++++++++++++-------------
 compiler/deSugar/Match.hs                 |  26 ++-
 compiler/ghci/RtClosureInspect.hs         |   3 +
 compiler/main/DynFlags.hs                 |   9 +-
 compiler/nativeGen/Dwarf/Constants.hs     |   4 +
 compiler/types/OptCoercion.hs             |  12 +-
 docs/users_guide/7.12.1-notes.rst         |  10 +
 docs/users_guide/bugs.rst                 |  14 +-
 docs/users_guide/using-warnings.rst       |  30 +++
 libraries/base/Foreign/C/Error.hs         |   1 +
 testsuite/tests/perf/compiler/T783.hs     |   5 +
 utils/mkUserGuidePart/Options/Warnings.hs |  13 ++
 12 files changed, 315 insertions(+), 170 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc bec5350da09fde51231004b1b7d33641ac51800e

From git at git.haskell.org  Sun Dec 27 22:53:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 22:53:54 +0000 (UTC)
Subject: [commit: ghc] master: RTS: Detect powerpc64le as ELF 64-bit system
 (c8d0af3)
Message-ID: <20151227225354.A59BF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c8d0af3107d4a01b73f813e31ac9b989772a2288/ghc

>---------------------------------------------------------------

commit c8d0af3107d4a01b73f813e31ac9b989772a2288
Author: Peter Trommler <ptrommler at acm.org>
Date:   Sun Dec 27 23:53:18 2015 +0100

    RTS: Detect powerpc64le as ELF 64-bit system
    
    
    Test Plan: validate
    
    Reviewers: simonmar, erikd, austin, bgamari
    
    Reviewed By: austin, bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1672
    
    GHC Trac Issues: #11269


>---------------------------------------------------------------

c8d0af3107d4a01b73f813e31ac9b989772a2288
 rts/Linker.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 3bd12b3..2ee3cbc 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4159,7 +4159,7 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #  define ELF_TARGET_X64_64
 #  define ELF_64BIT
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
-#elif defined(powerpc64_HOST_ARCH)
+#elif defined(powerpc64_HOST_ARCH) || defined(powerpc64le_HOST_ARCH)
 #  define ELF_64BIT
 #endif
 


From git at git.haskell.org  Sun Dec 27 23:14:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 23:14:11 +0000 (UTC)
Subject: [commit: ghc] master: The -package flag should select match from
 right-most package db. (1b00016)
Message-ID: <20151227231411.1EDCB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/1b0001680ef66a2853103974d3f3f956bb0560a3/ghc

>---------------------------------------------------------------

commit 1b0001680ef66a2853103974d3f3f956bb0560a3
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Sun Dec 27 23:57:18 2015 +0100

    The -package flag should select match from right-most package db.
    
    The shadowing and default behavior (in the absence of
    -hide-all-packages) prefers packages that come from "later" package
    databases.  So for example if tmp1.d and tmp2.d both expose p-1.0, then
    
        ghc -package-db tmp1.d -package-db tmp2.d
    
    brings the p-1.0 from tmp2.d into scope (and if they have the same IPID,
    tmp2.d shadows tmp1.d).  HOWEVER, -package flags do NOT respect this
    behavior.
    
        ghc -package-db tmp1.d -package-db tmp2.d -package p-1.0
    
    this will force the p-1.0 from tmp1.d to be exposed!  This is
    confusing, so this patch makes the behavior of -package flags
    consistent.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1709


>---------------------------------------------------------------

1b0001680ef66a2853103974d3f3f956bb0560a3
 compiler/main/Packages.hs                          |  4 ++-
 testsuite/.gitignore                               |  3 ++
 testsuite/tests/cabal/cabal08/Main.hs              |  2 ++
 testsuite/tests/cabal/cabal08/Makefile             | 32 ++++++++++++++++++++++
 .../tests/cabal/{cabal05 => cabal08}/Setup.hs      |  0
 testsuite/tests/cabal/{cabal06 => cabal08}/all.T   |  4 +--
 testsuite/tests/cabal/cabal08/cabal08.stdout       |  6 ++++
 testsuite/tests/cabal/cabal08/p1/ChangeLog.md      |  5 ++++
 .../tests/cabal/cabal08/p1}/LICENSE                |  4 +--
 .../tests/cabal/{cabal06/p-1.0 => cabal08/p1}/P.hs |  3 +-
 .../tests/cabal/{cabal05 => cabal08/p1}/Setup.hs   |  0
 .../cabal/{cabal06/p-1.0 => cabal08/p1}/p.cabal    |  8 ++++--
 testsuite/tests/cabal/cabal08/p2/ChangeLog.md      |  5 ++++
 .../tests/cabal/cabal08/p2}/LICENSE                |  4 +--
 .../tests/cabal/{cabal06/p-1.0 => cabal08/p2}/P.hs |  3 +-
 .../tests/cabal/{cabal05 => cabal08/p2}/Setup.hs   |  0
 .../cabal/{cabal06/p-1.0 => cabal08/p2}/p.cabal    |  6 ++--
 17 files changed, 73 insertions(+), 16 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1b0001680ef66a2853103974d3f3f956bb0560a3

From git at git.haskell.org  Sun Dec 27 23:14:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Sun, 27 Dec 2015 23:14:13 +0000 (UTC)
Subject: [commit: ghc] master: rts/Linker(ARM): Ensure all code sections are
 flushed from cache (0054bcd)
Message-ID: <20151227231413.D62333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0054bcd42260d248e391ed01d6b3da4fefdad45c/ghc

>---------------------------------------------------------------

commit 0054bcd42260d248e391ed01d6b3da4fefdad45c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Sun Dec 27 23:59:59 2015 +0100

    rts/Linker(ARM): Ensure all code sections are flushed from cache
    
    Test Plan: Validate with T12299
    
    Reviewers: hsyl20, austin, erikd
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1708
    
    GHC Trac Issues: #11299


>---------------------------------------------------------------

0054bcd42260d248e391ed01d6b3da4fefdad45c
 rts/Linker.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index 2ee3cbc..c0ab664 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -2747,8 +2747,16 @@ static int ocAllocateSymbolExtras( ObjectCode* oc, int count, int first )
 static void
 ocFlushInstructionCache( ObjectCode *oc )
 {
+    int i;
     // Object code
-    __clear_cache(oc->image, oc->image + oc->fileSize);
+    for (i=0; i < oc->n_sections; i++) {
+        Section *s = &oc->sections[i];
+        // This is a bit too broad but we don't have any way to determine what
+        // is certainly code
+        if (s->kind == SECTIONKIND_CODE_OR_RODATA)
+            __clear_cache(s->start, (void*) ((uintptr_t) s->start + s->size));
+    }
+
     // Jump islands
     __clear_cache(oc->symbol_extras, &oc->symbol_extras[oc->n_symbol_extras]);
 }


From git at git.haskell.org  Mon Dec 28 09:23:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 09:23:09 +0000 (UTC)
Subject: [commit: ghc] master: Synchronise ghci-package version with
 ghc-package (01299ca)
Message-ID: <20151228092309.BD9723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/01299ca83996710ec1572c952917157b1c2d139e/ghc

>---------------------------------------------------------------

commit 01299ca83996710ec1572c952917157b1c2d139e
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Dec 27 09:03:44 2015 +0100

    Synchronise ghci-package version with ghc-package
    
    In order to simplify the task, the version munging logic has
    been radically simplified:
    
    Previously, in cases where the version contained dates as version components,
    the build-system would munge the version of the stage1 ghc package before
    registering the `ghc` package.
    
    However, this hack was already questionable at the time of its introduction
    (c.f. 7b45c46cbabe1288ea87bd9b94c57e010ed17e60).
    Simplifying the build-systems by avoiding such hacks may also help the
    shaking-up-ghc effort.
    
    So now we simply munge directly via the `.cabal` files, which gives a simpler
    picture, as now every stage is munged the same. Munging is only active when
    the first patch-level version component is a date. So stable snapshots and release
    candidates are unaffacted (as those have the date in the second patch-level
    version component)
    
    Reviewers: simonmar, bgamari, austin, thomie, ezyang
    
    Reviewed By: bgamari, thomie, ezyang
    
    Differential Revision: https://phabricator.haskell.org/D1673


>---------------------------------------------------------------

01299ca83996710ec1572c952917157b1c2d139e
 .gitignore                                         |  2 +
 aclocal.m4                                         | 16 ++++++-
 boot                                               |  6 ++-
 compiler/ghc.cabal.in                              | 18 ++++----
 compiler/ghc.mk                                    | 53 ----------------------
 configure.ac                                       |  2 +-
 ghc.mk                                             |  1 +
 ghc/ghc-bin.cabal.in                               |  8 ++--
 ghc/ghc.mk                                         |  9 ----
 iserv/iserv-bin.cabal                              |  2 +-
 .../ghc-boot/{ghc-boot.cabal => ghc-boot.cabal.in} |  6 ++-
 libraries/ghci/{ghci.cabal => ghci.cabal.in}       | 29 ++++++------
 libraries/template-haskell/template-haskell.cabal  |  2 +-
 rules/build-package-data.mk                        |  2 -
 rules/foreachLibrary.mk                            |  1 +
 testsuite/tests/th/all.T                           |  5 +-
 16 files changed, 64 insertions(+), 98 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 01299ca83996710ec1572c952917157b1c2d139e

From git at git.haskell.org  Mon Dec 28 09:40:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 09:40:38 +0000 (UTC)
Subject: [commit: packages/hpc] master: Patch-level increment to 0.6.0.3
 (7cead32)
Message-ID: <20151228094038.EF9123A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/hpc

On branch  : master
Link       : http://git.haskell.org/packages/hpc.git/commitdiff/7cead32fc1f9929d69861d1b09e710bd6d374363

>---------------------------------------------------------------

commit 7cead32fc1f9929d69861d1b09e710bd6d374363
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 10:41:17 2015 +0100

    Patch-level increment to 0.6.0.3


>---------------------------------------------------------------

7cead32fc1f9929d69861d1b09e710bd6d374363
 changelog.md | 4 +++-
 hpc.cabal    | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/changelog.md b/changelog.md
index 6312fa8..3659b30 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,6 +1,8 @@
 # Changelog for [`hpc` package](http://hackage.haskell.org/package/hpc)
 
-## 0.6.0.3  *Unreleased*
+## 0.6.0.3  *Jan 2016*
+
+  * Bundled with GHC 8.0.1
 
   * Improved error messages (#10529)
 
diff --git a/hpc.cabal b/hpc.cabal
index b6ca16a..240b5d6 100644
--- a/hpc.cabal
+++ b/hpc.cabal
@@ -1,5 +1,5 @@
 name:         hpc
-version:      0.6.0.2
+version:      0.6.0.3
 -- NOTE: Don't forget to update ./changelog.md
 license:      BSD3
 license-file: LICENSE
@@ -10,7 +10,7 @@ category:     Control
 synopsis:     Code Coverage Library for Haskell
 build-type:   Simple
 cabal-version:>=1.10
-tested-with:  GHC==7.6.3, GHC==7.6.2, GHC==7.6.1, GHC==7.4.2, GHC==7.4.1, GHC==7.2.2
+tested-with:  GHC==7.10.*, GHC==7.8.*, GHC==7.6.*, GHC==7.4.*, GHC==7.2.2
 description:
     This package provides the code coverage library for Haskell.
     .


From git at git.haskell.org  Mon Dec 28 10:20:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 10:20:48 +0000 (UTC)
Subject: [commit: ghc] master: Patch-level increment integer-simple version
 0.1.1.1 (e01aa22)
Message-ID: <20151228102048.2BF333A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e01aa221202822d5ea0aa957e16481d301db3633/ghc

>---------------------------------------------------------------

commit e01aa221202822d5ea0aa957e16481d301db3633
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 10:40:37 2015 +0100

    Patch-level increment integer-simple version 0.1.1.1


>---------------------------------------------------------------

e01aa221202822d5ea0aa957e16481d301db3633
 libraries/integer-simple/integer-simple.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/integer-simple/integer-simple.cabal b/libraries/integer-simple/integer-simple.cabal
index d18a182..f958aa8 100644
--- a/libraries/integer-simple/integer-simple.cabal
+++ b/libraries/integer-simple/integer-simple.cabal
@@ -1,5 +1,5 @@
 name:           integer-simple
-version:        0.1.1.0
+version:        0.1.1.1
 -- GHC 7.6.1 released with 0.1.0.1
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Mon Dec 28 10:20:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 10:20:50 +0000 (UTC)
Subject: [commit: ghc] master: Patch-level increment integer-gmp to 1.0.0.1
 (4a10ecb)
Message-ID: <20151228102050.E3C293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4a10ecba82ca6ac48bf252eb0f98fcc6acfdb7d5/ghc

>---------------------------------------------------------------

commit 4a10ecba82ca6ac48bf252eb0f98fcc6acfdb7d5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 10:39:31 2015 +0100

    Patch-level increment integer-gmp to 1.0.0.1
    
    and update changelog.md


>---------------------------------------------------------------

4a10ecba82ca6ac48bf252eb0f98fcc6acfdb7d5
 libraries/integer-gmp/changelog.md          | 10 ++++++++++
 libraries/integer-gmp/integer-gmp.cabal     |  2 +-
 testsuite/tests/ghci/scripts/ghci025.stdout |  6 +++---
 3 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/libraries/integer-gmp/changelog.md b/libraries/integer-gmp/changelog.md
index cb55b80..5245e23 100644
--- a/libraries/integer-gmp/changelog.md
+++ b/libraries/integer-gmp/changelog.md
@@ -1,5 +1,15 @@
 # Changelog for [`integer-gmp` package](http://hackage.haskell.org/package/integer-gmp)
 
+## 1.0.0.1  *Feb 2016*
+
+  * Bundled with GHC 8.0.1
+
+  * Optimise `bitBigNat`/`bigInteger`
+
+  * Fix minor issue in `eqBigNatWord#`
+
+  * Various minor optimisations
+
 ## 1.0.0.0  *Mar 2015*
 
   * Bundled with GHC 7.10.1
diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal
index 4833704..5b5fb56 100644
--- a/libraries/integer-gmp/integer-gmp.cabal
+++ b/libraries/integer-gmp/integer-gmp.cabal
@@ -1,5 +1,5 @@
 name:                integer-gmp
-version:             1.0.0.0
+version:             1.0.0.1
 synopsis:            Integer library based on GMP
 license:             BSD3
 license-file:        LICENSE
diff --git a/testsuite/tests/ghci/scripts/ghci025.stdout b/testsuite/tests/ghci/scripts/ghci025.stdout
index 7cea3e9..dd3a757 100644
--- a/testsuite/tests/ghci/scripts/ghci025.stdout
+++ b/testsuite/tests/ghci/scripts/ghci025.stdout
@@ -59,9 +59,9 @@ Prelude.length ::
   Data.Foldable.Foldable t => forall a. t a -> GHC.Types.Int
 -- imported via T
 data T.Integer
-  = integer-gmp-1.0.0.0:GHC.Integer.Type.S# !GHC.Prim.Int#
-  | integer-gmp-1.0.0.0:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat
-  | integer-gmp-1.0.0.0:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp-1.0.0.0:GHC.Integer.Type.BigNat
+  = integer-gmp-1.0.0.1:GHC.Integer.Type.S# !GHC.Prim.Int#
+  | integer-gmp-1.0.0.1:GHC.Integer.Type.Jp# {-# UNPACK #-}integer-gmp-1.0.0.1:GHC.Integer.Type.BigNat
+  | integer-gmp-1.0.0.1:GHC.Integer.Type.Jn# {-# UNPACK #-}integer-gmp-1.0.0.1:GHC.Integer.Type.BigNat
 T.length :: Data.ByteString.Internal.ByteString -> GHC.Types.Int
 :browse! T
 -- defined locally


From git at git.haskell.org  Mon Dec 28 10:20:53 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 10:20:53 +0000 (UTC)
Subject: [commit: ghc] master: Update hpc submodule to 0.6.0.3 version
 (c7830bd)
Message-ID: <20151228102053.939233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c7830bdb14e0a85a78617314156d101155fdf7aa/ghc

>---------------------------------------------------------------

commit c7830bdb14e0a85a78617314156d101155fdf7aa
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 10:42:38 2015 +0100

    Update hpc submodule to 0.6.0.3 version


>---------------------------------------------------------------

c7830bdb14e0a85a78617314156d101155fdf7aa
 libraries/hpc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/hpc b/libraries/hpc
index a6dee68..7cead32 160000
--- a/libraries/hpc
+++ b/libraries/hpc
@@ -1 +1 @@
-Subproject commit a6dee68551ce931e2d2184c47c0e64180618450a
+Subproject commit 7cead32fc1f9929d69861d1b09e710bd6d374363


From git at git.haskell.org  Mon Dec 28 20:39:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:05 +0000 (UTC)
Subject: [commit: packages/filepath] tag 'v1.4.1.0' created
Message-ID: <20151228203905.D901F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

New tag    : v1.4.1.0
Referencing: 2d70128b54c4d616f6973481fa8413a8c2fdcff0

From git at git.haskell.org  Mon Dec 28 20:39:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:07 +0000 (UTC)
Subject: [commit: packages/filepath] master: #44,
 isValid \0 now returns False (73b0a99)
Message-ID: <20151228203907.E1F1D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/73b0a99fd10918eb419dda91475b3057ccbcd4f6

>---------------------------------------------------------------

commit 73b0a99fd10918eb419dda91475b3057ccbcd4f6
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Thu Apr 23 15:19:35 2015 +0100

    #44, isValid \0 now returns False


>---------------------------------------------------------------

73b0a99fd10918eb419dda91475b3057ccbcd4f6
 System/FilePath/Internal.hs | 7 +++++--
 changelog.md                | 2 ++
 tests/TestGen.hs            | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 051e44c..42bc19b 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -843,6 +843,7 @@ badElements = ["CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5
 -- | Is a FilePath valid, i.e. could you create a file like it?
 --
 -- >          isValid "" == False
+-- >          isValid "\0" == False
 -- > Posix:   isValid "/random_ path:*" == True
 -- > Posix:   isValid x == not (null x)
 -- > Windows: isValid "c:\\test" == True
@@ -856,6 +857,7 @@ badElements = ["CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5
 -- > Windows: isValid "\\\\?\\D:file" == False
 isValid :: FilePath -> Bool
 isValid "" = False
+isValid x | '\0' `elem` x = False
 isValid _ | isPosix = True
 isValid path =
         not (any (`elem` badCharacters) x2) &&
@@ -872,6 +874,7 @@ isValid path =
 -- > isValid (makeValid x)
 -- > isValid x ==> makeValid x == x
 -- > makeValid "" == "_"
+-- > makeValid "file\0name" == "file_name"
 -- > Windows: makeValid "c:\\already\\/valid" == "c:\\already\\/valid"
 -- > Windows: makeValid "c:\\test:of_test" == "c:\\test_of_test"
 -- > Windows: makeValid "test*" == "test_"
@@ -884,7 +887,7 @@ isValid path =
 makeValid :: FilePath -> FilePath
 makeValid "" = "_"
 makeValid path
-        | isPosix = path
+        | isPosix = map (\x -> if x == '\0' then '_' else x) path
         | isJust (readDriveShare drv) && all isPathSeparator drv = take 2 drv ++ "drive"
         | isJust (readDriveUNC drv) && not (hasTrailingPathSeparator drv) =
             makeValid (drv ++ [pathSeparator] ++ pth)
@@ -893,7 +896,7 @@ makeValid path
         (drv,pth) = splitDrive path
 
         validChars = map f
-        f x | x `elem` badCharacters = '_'
+        f x | x `elem` badCharacters || x == '\0' = '_'
             | otherwise = x
 
         validElements x = joinPath $ map g $ splitPath x
diff --git a/changelog.md b/changelog.md
index 6c36406..902754e 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,8 @@
 
 _Note: below all `FilePath` values are unquoted, so `\\` really means two backslashes._
 
+ * Bug fix: `isValid "\0"` now returns `False`, instead of `True`
+
 ## 1.4.0.0  *Mar 2015*
 
   * Bundled with GHC 7.10.1
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index a96ad54..9bb3ebe 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -369,6 +369,8 @@ tests =
     ,("P.normalise \"//home\" == \"/home\"", test $ P.normalise "//home" == "/home")
     ,("P.isValid \"\" == False", test $ P.isValid "" == False)
     ,("W.isValid \"\" == False", test $ W.isValid "" == False)
+    ,("P.isValid \"\\0\" == False", test $ P.isValid "\0" == False)
+    ,("W.isValid \"\\0\" == False", test $ W.isValid "\0" == False)
     ,("P.isValid \"/random_ path:*\" == True", test $ P.isValid "/random_ path:*" == True)
     ,("P.isValid x == not (null x)", test $ \(QFilePath x) -> P.isValid x == not (null x))
     ,("W.isValid \"c:\\\\test\" == True", test $ W.isValid "c:\\test" == True)
@@ -386,6 +388,8 @@ tests =
     ,("W.isValid x ==> W.makeValid x == x", test $ \(QFilePath x) -> W.isValid x ==> W.makeValid x == x)
     ,("P.makeValid \"\" == \"_\"", test $ P.makeValid "" == "_")
     ,("W.makeValid \"\" == \"_\"", test $ W.makeValid "" == "_")
+    ,("P.makeValid \"file\\0name\" == \"file_name\"", test $ P.makeValid "file\0name" == "file_name")
+    ,("W.makeValid \"file\\0name\" == \"file_name\"", test $ W.makeValid "file\0name" == "file_name")
     ,("W.makeValid \"c:\\\\already\\\\/valid\" == \"c:\\\\already\\\\/valid\"", test $ W.makeValid "c:\\already\\/valid" == "c:\\already\\/valid")
     ,("W.makeValid \"c:\\\\test:of_test\" == \"c:\\\\test_of_test\"", test $ W.makeValid "c:\\test:of_test" == "c:\\test_of_test")
     ,("W.makeValid \"test*\" == \"test_\"", test $ W.makeValid "test*" == "test_")


From git at git.haskell.org  Mon Dec 28 20:39:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:09 +0000 (UTC)
Subject: [commit: packages/filepath] master: #44,
 clarify that isValid doesn't check length limits (f8fb100)
Message-ID: <20151228203909.EA7903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/f8fb100351b250a5e126bb6aefcb017174fd320c

>---------------------------------------------------------------

commit f8fb100351b250a5e126bb6aefcb017174fd320c
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Thu Apr 23 20:53:39 2015 +0100

    #44, clarify that isValid doesn't check length limits


>---------------------------------------------------------------

f8fb100351b250a5e126bb6aefcb017174fd320c
 System/FilePath/Internal.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 42bc19b..57355d1 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -840,7 +840,9 @@ badElements :: [FilePath]
 badElements = ["CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", "CLOCK$"]
 
 
--- | Is a FilePath valid, i.e. could you create a file like it?
+-- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,
+--   and invalid characters, but does not check if length limits are exceeded, as these are typically
+--   filesystem dependent.
 --
 -- >          isValid "" == False
 -- >          isValid "\0" == False


From git at git.haskell.org  Mon Dec 28 20:39:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:11 +0000 (UTC)
Subject: [commit: packages/filepath] master: Fix the spelling of "example"
 (d6f9c5a)
Message-ID: <20151228203911.F19773A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/d6f9c5a449f8e58f17f5646a32d0b63fa697a00b

>---------------------------------------------------------------

commit d6f9c5a449f8e58f17f5646a32d0b63fa697a00b
Author: kraai <kraai at ftbfs.org>
Date:   Thu May 14 15:27:28 2015 +0000

    Fix the spelling of "example"


>---------------------------------------------------------------

d6f9c5a449f8e58f17f5646a32d0b63fa697a00b
 System/FilePath/Internal.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 57355d1..1337fb3 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -19,7 +19,7 @@
 -- A library for 'FilePath' manipulations, using MODULE_NAME style paths on
 -- all platforms. Importing "System.FilePath" is usually better.
 --
--- Given the eample 'FilePath': @\/directory\/file.ext@
+-- Given the example 'FilePath': @\/directory\/file.ext@
 --
 -- We can use the following functions to extract pieces.
 --


From git at git.haskell.org  Mon Dec 28 20:39:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:14 +0000 (UTC)
Subject: [commit: packages/filepath] master: Merge pull request #45 from
 kraai/patch-1 (35e5708)
Message-ID: <20151228203914.052123A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/35e570862ed747433ae74b045b472533ba63aa02

>---------------------------------------------------------------

commit 35e570862ed747433ae74b045b472533ba63aa02
Merge: f8fb100 d6f9c5a
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Thu May 14 16:29:31 2015 +0100

    Merge pull request #45 from kraai/patch-1
    
    Fix the spelling of "example"



>---------------------------------------------------------------

35e570862ed747433ae74b045b472533ba63aa02
 System/FilePath/Internal.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)


From git at git.haskell.org  Mon Dec 28 20:39:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:16 +0000 (UTC)
Subject: [commit: packages/filepath] master: #46,
 fix a documentation mistake (598e03a)
Message-ID: <20151228203916.0BC843A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/598e03aeebc6503cad455cecf7615b047f0cd138

>---------------------------------------------------------------

commit 598e03aeebc6503cad455cecf7615b047f0cd138
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Wed May 20 15:03:42 2015 +0100

    #46, fix a documentation mistake


>---------------------------------------------------------------

598e03aeebc6503cad455cecf7615b047f0cd138
 System/FilePath/Internal.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 1337fb3..34cc156 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -254,7 +254,7 @@ takeExtension = snd . splitExtension
 (-<.>) :: FilePath -> String -> FilePath
 (-<.>) = replaceExtension
 
--- | Set the extension of a file, overwriting one if already present, equivalent to '<.>'.
+-- | Set the extension of a file, overwriting one if already present, equivalent to '-<.>'.
 --
 -- > replaceExtension "/directory/path.txt" "ext" == "/directory/path.ext"
 -- > replaceExtension "/directory/path.txt" ".ext" == "/directory/path.ext"


From git at git.haskell.org  Mon Dec 28 20:39:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:18 +0000 (UTC)
Subject: [commit: packages/filepath] master: Create appveyor.yml (b0fe2dd)
Message-ID: <20151228203918.122A63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/b0fe2dd33dae4cfae07952e592b97dc88e724e23

>---------------------------------------------------------------

commit b0fe2dd33dae4cfae07952e592b97dc88e724e23
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Oct 26 21:11:22 2015 +0000

    Create appveyor.yml


>---------------------------------------------------------------

b0fe2dd33dae4cfae07952e592b97dc88e724e23
 appveyor.yml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/appveyor.yml b/appveyor.yml
new file mode 100644
index 0000000..fdc2a3d
--- /dev/null
+++ b/appveyor.yml
@@ -0,0 +1,19 @@
+cache:
+- "c:\\sr" # stack root, short paths == less problems
+
+build: off
+
+before_test:
+- curl -ostack.zip -L --insecure http://www.stackage.org/stack/windows-i386
+- 7z x stack.zip stack.exe
+
+clone_folder: "c:\\project"
+environment:
+  global:
+    STACK_ROOT: "c:\\sr"
+
+test_script:
+- stack init
+- stack setup > nul
+- echo "" | stack --no-terminal build
+- stack runhaskell Generate.hs


From git at git.haskell.org  Mon Dec 28 20:39:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:20 +0000 (UTC)
Subject: [commit: packages/filepath] master: Move the doc files to
 extra-doc-files (6069e26)
Message-ID: <20151228203920.187083A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/6069e26f77c705caf13e625e7ce66bff8541854c

>---------------------------------------------------------------

commit 6069e26f77c705caf13e625e7ce66bff8541854c
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Oct 26 21:19:30 2015 +0000

    Move the doc files to extra-doc-files


>---------------------------------------------------------------

6069e26f77c705caf13e625e7ce66bff8541854c
 filepath.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/filepath.cabal b/filepath.cabal
index 0841a0d..5690f9a 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -26,6 +26,7 @@ description:
 
 extra-source-files:
     System/FilePath/Internal.hs
+extra-doc-files:
     README.md
     changelog.md
 


From git at git.haskell.org  Mon Dec 28 20:39:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:22 +0000 (UTC)
Subject: [commit: packages/filepath] master: Allow testsuite failures on GHC
 HEAD (efae217)
Message-ID: <20151228203922.1EA403A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/efae217559376d50cd74096be67e4bd5859282ef

>---------------------------------------------------------------

commit efae217559376d50cd74096be67e4bd5859282ef
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Oct 26 21:27:53 2015 +0000

    Allow testsuite failures on GHC HEAD


>---------------------------------------------------------------

efae217559376d50cd74096be67e4bd5859282ef
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ebae307..20d31e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,9 @@ env:
  - GHCVER=7.10.1
  - GHCVER=head
 
+matrix:
+  allow_failures:
+   - env: GHCVER=head
+
 script:
  - wget https://raw.github.com/ndmitchell/neil/master/travis.sh -O - --no-check-certificate --quiet | sh


From git at git.haskell.org  Mon Dec 28 20:39:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:24 +0000 (UTC)
Subject: [commit: packages/filepath] master: Use the correct stack command
 (b65c2e4)
Message-ID: <20151228203924.253783A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/b65c2e4b948bad139f01c2c6876f8585c1a131cb

>---------------------------------------------------------------

commit b65c2e4b948bad139f01c2c6876f8585c1a131cb
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Oct 27 06:40:25 2015 +0000

    Use the correct stack command


>---------------------------------------------------------------

b65c2e4b948bad139f01c2c6876f8585c1a131cb
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fdc2a3d..79b35ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -16,4 +16,4 @@ test_script:
 - stack init
 - stack setup > nul
 - echo "" | stack --no-terminal build
-- stack runhaskell Generate.hs
+- stack runghc Generate.hs


From git at git.haskell.org  Mon Dec 28 20:39:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:26 +0000 (UTC)
Subject: [commit: packages/filepath] master: Updated badges (33465ad)
Message-ID: <20151228203926.2C1FD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/33465add7f517f1d90d135bab5c8eed6f0640d7c

>---------------------------------------------------------------

commit 33465add7f517f1d90d135bab5c8eed6f0640d7c
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Wed Oct 28 16:07:53 2015 +0000

    Updated badges


>---------------------------------------------------------------

33465add7f517f1d90d135bab5c8eed6f0640d7c
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 33fdce7..f2ff622 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-# FilePath [![Hackage version](https://img.shields.io/hackage/v/filepath.svg?style=flat)](https://hackage.haskell.org/package/filepath) [![Build Status](https://img.shields.io/travis/haskell/filepath.svg?style=flat)](https://travis-ci.org/haskell/filepath)
+# FilePath [![Hackage version](https://img.shields.io/hackage/v/filepath.svg?label=Hackage)](https://hackage.haskell.org/package/filepath) [![Linux Build Status](https://img.shields.io/travis/haskell/filepath.svg?label=Linux%20build)](https://travis-ci.org/haskell/filepath) [![Windows Build Status](https://img.shields.io/appveyor/ci/ndmitchell/filepath.svg?label=Windows%20build)](https://ci.appveyor.com/project/ndmitchell/filepath)
 
 The `filepath` package provides functionality for manipulating `FilePath` values, and is shipped with both [GHC](https://www.haskell.org/ghc/) and the [Haskell Platform](https://www.haskell.org/platform/). It provides three modules:
 


From git at git.haskell.org  Mon Dec 28 20:39:28 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:28 +0000 (UTC)
Subject: [commit: packages/filepath] master: Relax upper bound on `base` to
 allow base-4.9 (32e8dba)
Message-ID: <20151228203928.32E5B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/32e8dba40bd2ff3ae0b1c16ea2c0db05c5d4b63c

>---------------------------------------------------------------

commit 32e8dba40bd2ff3ae0b1c16ea2c0db05c5d4b63c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Sun Nov 1 09:24:45 2015 +0100

    Relax upper bound on `base` to allow base-4.9
    
    GHC 8.0 is going to bundle `base-4.9.0.0`


>---------------------------------------------------------------

32e8dba40bd2ff3ae0b1c16ea2c0db05c5d4b63c
 filepath.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filepath.cabal b/filepath.cabal
index 5690f9a..3af8920 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -43,7 +43,7 @@ library
         System.FilePath.Windows
 
     build-depends:
-        base >= 4 && < 4.9
+        base >= 4 && < 4.10
 
     ghc-options: -Wall
 


From git at git.haskell.org  Mon Dec 28 20:39:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:30 +0000 (UTC)
Subject: [commit: packages/filepath] master: Update the version number
 (564c5a7)
Message-ID: <20151228203930.396323A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/564c5a78d028ebde6a27f61ff9f686fce490c809

>---------------------------------------------------------------

commit 564c5a78d028ebde6a27f61ff9f686fce490c809
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Nov 2 12:05:08 2015 +0000

    Update the version number


>---------------------------------------------------------------

564c5a78d028ebde6a27f61ff9f686fce490c809
 filepath.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filepath.cabal b/filepath.cabal
index 3af8920..9c0a457 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -1,5 +1,5 @@
 name:           filepath
-version:        1.4.0.0
+version:        1.4.1.0
 -- NOTE: Don't forget to update ./changelog.md
 license:        BSD3
 license-file:   LICENSE


From git at git.haskell.org  Mon Dec 28 20:39:32 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:32 +0000 (UTC)
Subject: [commit: packages/filepath] master: Don't allow GHC HEAD failures
 (687b48b)
Message-ID: <20151228203932.3FA903A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/687b48b9f6e2e5f17b5517421a2148ac8050b6ed

>---------------------------------------------------------------

commit 687b48b9f6e2e5f17b5517421a2148ac8050b6ed
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Fri Dec 18 12:13:01 2015 +0000

    Don't allow GHC HEAD failures


>---------------------------------------------------------------

687b48b9f6e2e5f17b5517421a2148ac8050b6ed
 .travis.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 20d31e0..ebae307 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,9 +6,5 @@ env:
  - GHCVER=7.10.1
  - GHCVER=head
 
-matrix:
-  allow_failures:
-   - env: GHCVER=head
-
 script:
  - wget https://raw.github.com/ndmitchell/neil/master/travis.sh -O - --no-check-certificate --quiet | sh


From git at git.haskell.org  Mon Dec 28 20:39:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:34 +0000 (UTC)
Subject: [commit: packages/filepath] master: #51,
 add some documentation around splitSearchPath (1a4b108)
Message-ID: <20151228203934.46E753A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/1a4b108c244eb77e1207f94c472ca25ccd34a84c

>---------------------------------------------------------------

commit 1a4b108c244eb77e1207f94c472ca25ccd34a84c
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 07:27:45 2015 +0000

    #51, add some documentation around splitSearchPath


>---------------------------------------------------------------

1a4b108c244eb77e1207f94c472ca25ccd34a84c
 System/FilePath/Internal.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 34cc156..52020f6 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -188,6 +188,8 @@ isExtSeparator = (== extSeparator)
 -- Path methods (environment $PATH)
 
 -- | Take a string, split it on the 'searchPathSeparator' character.
+--   Blank items are ignored on Windows, and converted to @.@ on Posix.
+--   On Windows path elements are stripped of quotes.
 --
 --   Follows the recommendations in
 --   <http://www.opengroup.org/onlinepubs/009695399/basedefs/xbd_chap08.html>


From git at git.haskell.org  Mon Dec 28 20:39:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:36 +0000 (UTC)
Subject: [commit: packages/filepath] master: #12,
 add notes on why FilePath isn't abstract (59b8639)
Message-ID: <20151228203936.4CF893A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/59b8639890fbf246d46a66147191458d1587fb98

>---------------------------------------------------------------

commit 59b8639890fbf246d46a66147191458d1587fb98
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 07:51:11 2015 +0000

    #12, add notes on why FilePath isn't abstract


>---------------------------------------------------------------

59b8639890fbf246d46a66147191458d1587fb98
 README.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/README.md b/README.md
index f2ff622..536f88c 100644
--- a/README.md
+++ b/README.md
@@ -7,3 +7,12 @@ The `filepath` package provides functionality for manipulating `FilePath` values
 * [`System.FilePath`](http://hackage.haskell.org/package/filepath/docs/System-FilePath.html) is an alias for the module appropriate to your platform.
 
 All three modules provide the same API, and the same documentation (calling out differences in the different variants).
+
+### Should `FilePath` be an abstract data type?
+
+The answer for this library is "no". While an abstract `FilePath` has some advantages (mostly type safety), it also has some disadvantages:
+
+* In Haskell the definition is `type FilePath = String`, and all file-orientated functions operate on this type alias, e.g. `readFile`/`writeFile`. Any abstract type would require wrappers for these functions or lots of casts between `String` and the abstraction.
+* It is not immediately obvious what a `FilePath` is, and what is just a pure `String`. For example, `/path/file.ext` is a `FilePath`. Is `/`? `/path`? `path`? `file.ext`? `.ext`? `file`?
+* Often it is useful to represent invalid files, e.g. `/foo/*.txt` probably isn't an actual file, but a glob pattern. Other programs use `foo//bar` for globs, which is definitely not a file, but might want to be stored as a `FilePath`.
+* Some programs use syntactic non-semantic details of the `FilePath` to change their behaviour. For example, `foo`, `foo/` and `foo/.` are all similar, and refer to the same location on disk, but may behave differently when passed to command-line tools.


From git at git.haskell.org  Mon Dec 28 20:39:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:38 +0000 (UTC)
Subject: [commit: packages/filepath] master: #50,
 document makeRelative and explain why it doesn't introduce .. paths
 (19ff17a)
Message-ID: <20151228203938.540703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/19ff17aa5c9df155381381fb3d10dc835587c7ea

>---------------------------------------------------------------

commit 19ff17aa5c9df155381381fb3d10dc835587c7ea
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:02:30 2015 +0000

    #50, document makeRelative and explain why it doesn't introduce .. paths


>---------------------------------------------------------------

19ff17aa5c9df155381381fb3d10dc835587c7ea
 System/FilePath/Internal.hs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 52020f6..60903cc 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -729,7 +729,10 @@ equalFilePath a b = f a == f b
             | otherwise = dropTrailingPathSeparator $ normalise x
 
 
--- | Contract a filename, based on a relative path.
+-- | Contract a filename, based on a relative path. Note that the resulting path
+--   will never introduce @..@ paths, as the presence of symlinks means @..\/b@
+--   may not reach @a\/b@ if it starts from @a\/c at . For a worked example see
+--   <http://neilmitchell.blogspot.co.uk/2015/10/filepaths-are-subtle-symlinks-are-hard.html this blog post>.
 --
 --   The corresponding @makeAbsolute@ function can be found in
 --   @System.Directory at .


From git at git.haskell.org  Mon Dec 28 20:39:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:40 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 fix up the Haddock markup in the docs for combine (575ccc2)
Message-ID: <20151228203940.5B1F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/575ccc2bbdf0bef7e35a8d927b5dc2e4cee04508

>---------------------------------------------------------------

commit 575ccc2bbdf0bef7e35a8d927b5dc2e4cee04508
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:06:22 2015 +0000

    #49, fix up the Haddock markup in the docs for combine


>---------------------------------------------------------------

575ccc2bbdf0bef7e35a8d927b5dc2e4cee04508
 System/FilePath/Internal.hs | 27 +++++++++++++++------------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 60903cc..1e95d17 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -604,35 +604,38 @@ replaceDirectory x dir = combineAlways dir (takeFileName x)
 
 
 -- | Combine two paths, if the second path starts with a path separator or a
--- drive letter, then it returns the second.
+--   drive letter, then it returns the second.
 --
 -- > Valid x => combine (takeDirectory x) (takeFileName x) `equalFilePath` x
 --
--- Combined:
+--   Combined:
+--
 -- > Posix:   combine "/" "test" == "/test"
 -- > Posix:   combine "home" "bob" == "home/bob"
 -- > Posix:   combine "x:" "foo" == "x:/foo"
 -- > Windows: combine "C:\\foo" "bar" == "C:\\foo\\bar"
 -- > Windows: combine "home" "bob" == "home\\bob"
 --
--- Not combined:
+--   Not combined:
+--
 -- > Posix:   combine "home" "/bob" == "/bob"
 -- > Windows: combine "home" "C:\\bob" == "C:\\bob"
 --
--- Not combined (tricky):
--- On Windows, if a filepath starts with a single slash, it is relative to the
--- root of the current drive. In [1], this is (confusingly) referred to as an
--- absolute path.
--- The current behavior of @combine@ is to never combine these forms.
+--   Not combined (tricky):
+--
+--   On Windows, if a filepath starts with a single slash, it is relative to the
+--   root of the current drive. In [1], this is (confusingly) referred to as an
+--   absolute path.
+--   The current behavior of @combine@ is to never combine these forms.
 --
 -- > Windows: combine "home" "/bob" == "/bob"
 -- > Windows: combine "home" "\\bob" == "\\bob"
 -- > Windows: combine "C:\\home" "\\bob" == "\\bob"
 --
--- On Windows, from [1]: "If a file name begins with only a disk designator
--- but not the backslash after the colon, it is interpreted as a relative path
--- to the current directory on the drive with the specified letter."
--- The current behavior of @combine@ is to never combine these forms.
+--   On Windows, from [1]: "If a file name begins with only a disk designator
+--   but not the backslash after the colon, it is interpreted as a relative path
+--   to the current directory on the drive with the specified letter."
+--   The current behavior of @combine@ is to never combine these forms.
 --
 -- > Windows: combine "D:\\foo" "C:bar" == "C:bar"
 -- > Windows: combine "C:\\foo" "C:bar" == "C:bar"


From git at git.haskell.org  Mon Dec 28 20:39:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:42 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 move the docs from </> to combine, so its all in one place (a479073)
Message-ID: <20151228203942.620DF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/a479073cd0236a811fbf293f063f355962d3289e

>---------------------------------------------------------------

commit a479073cd0236a811fbf293f063f355962d3289e
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:07:21 2015 +0000

    #49, move the docs from </> to combine, so its all in one place


>---------------------------------------------------------------

a479073cd0236a811fbf293f063f355962d3289e
 System/FilePath/Internal.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 1e95d17..c67b0eb 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -606,6 +606,8 @@ replaceDirectory x dir = combineAlways dir (takeFileName x)
 -- | Combine two paths, if the second path starts with a path separator or a
 --   drive letter, then it returns the second.
 --
+-- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
+-- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
 -- > Valid x => combine (takeDirectory x) (takeFileName x) `equalFilePath` x
 --
 --   Combined:
@@ -654,9 +656,6 @@ combineAlways a b | null a = b
 
 
 -- | Join two values with a path separator. For examples and caveats see the equivalent function 'combine'.
---
--- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
--- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
 (</>) :: FilePath -> FilePath -> FilePath
 (</>) = combine
 


From git at git.haskell.org  Mon Dec 28 20:39:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:44 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 move the docs from combine to </>, which is the one most people use (a5518ec)
Message-ID: <20151228203944.685823A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/a5518ec65e8894d4c34371e59a801490fd3c179f

>---------------------------------------------------------------

commit a5518ec65e8894d4c34371e59a801490fd3c179f
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:10:35 2015 +0000

    #49, move the docs from combine to </>, which is the one most people use


>---------------------------------------------------------------

a5518ec65e8894d4c34371e59a801490fd3c179f
 System/FilePath/Internal.hs | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index c67b0eb..eb27e03 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -603,8 +603,23 @@ replaceDirectory :: FilePath -> String -> FilePath
 replaceDirectory x dir = combineAlways dir (takeFileName x)
 
 
--- | Combine two paths, if the second path starts with a path separator or a
---   drive letter, then it returns the second.
+-- | An alias for '</>'.
+combine :: FilePath -> FilePath -> FilePath
+combine a b | hasLeadingPathSeparator b || hasDrive b = b
+            | otherwise = combineAlways a b
+
+-- | Combine two paths, assuming rhs is NOT absolute.
+combineAlways :: FilePath -> FilePath -> FilePath
+combineAlways a b | null a = b
+                  | null b = a
+                  | hasTrailingPathSeparator a = a ++ b
+                  | otherwise = case a of
+                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
+                      _ -> a ++ [pathSeparator] ++ b
+
+
+-- | Combine two paths with a path separator.
+--   If the second path starts with a path separator or a drive letter, then it returns the second.
 --
 -- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
 -- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
@@ -641,21 +656,6 @@ replaceDirectory x dir = combineAlways dir (takeFileName x)
 --
 -- > Windows: combine "D:\\foo" "C:bar" == "C:bar"
 -- > Windows: combine "C:\\foo" "C:bar" == "C:bar"
-combine :: FilePath -> FilePath -> FilePath
-combine a b | hasLeadingPathSeparator b || hasDrive b = b
-            | otherwise = combineAlways a b
-
--- | Combine two paths, assuming rhs is NOT absolute.
-combineAlways :: FilePath -> FilePath -> FilePath
-combineAlways a b | null a = b
-                  | null b = a
-                  | hasTrailingPathSeparator a = a ++ b
-                  | otherwise = case a of
-                      [a1,':'] | isWindows && isLetter a1 -> a ++ b
-                      _ -> a ++ [pathSeparator] ++ b
-
-
--- | Join two values with a path separator. For examples and caveats see the equivalent function 'combine'.
 (</>) :: FilePath -> FilePath -> FilePath
 (</>) = combine
 


From git at git.haskell.org  Mon Dec 28 20:39:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:46 +0000 (UTC)
Subject: [commit: packages/filepath] master: #12,
 note that this library helps move towards an abstract filepath type
 (10553c6)
Message-ID: <20151228203946.6EF8D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/10553c6bb145e9c29f5bece3db88c3904eb9cb91

>---------------------------------------------------------------

commit 10553c6bb145e9c29f5bece3db88c3904eb9cb91
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:12:43 2015 +0000

    #12, note that this library helps move towards an abstract filepath type


>---------------------------------------------------------------

10553c6bb145e9c29f5bece3db88c3904eb9cb91
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 536f88c..6c3ca0c 100644
--- a/README.md
+++ b/README.md
@@ -16,3 +16,4 @@ The answer for this library is "no". While an abstract `FilePath` has some advan
 * It is not immediately obvious what a `FilePath` is, and what is just a pure `String`. For example, `/path/file.ext` is a `FilePath`. Is `/`? `/path`? `path`? `file.ext`? `.ext`? `file`?
 * Often it is useful to represent invalid files, e.g. `/foo/*.txt` probably isn't an actual file, but a glob pattern. Other programs use `foo//bar` for globs, which is definitely not a file, but might want to be stored as a `FilePath`.
 * Some programs use syntactic non-semantic details of the `FilePath` to change their behaviour. For example, `foo`, `foo/` and `foo/.` are all similar, and refer to the same location on disk, but may behave differently when passed to command-line tools.
+* A useful step to introducing an abstract `FilePath` is to reduce the amount of manipulating `FilePath` values like lists. This library hopes to help in that effort.


From git at git.haskell.org  Mon Dec 28 20:39:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:48 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 document the specific case requested in the ticket (df048ab)
Message-ID: <20151228203948.75B2C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/df048ab322f76a7eba0f9fa003ae1df6d00917d1

>---------------------------------------------------------------

commit df048ab322f76a7eba0f9fa003ae1df6d00917d1
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:18:12 2015 +0000

    #49, document the specific case requested in the ticket


>---------------------------------------------------------------

df048ab322f76a7eba0f9fa003ae1df6d00917d1
 System/FilePath/Internal.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index eb27e03..fa0b521 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -623,6 +623,7 @@ combineAlways a b | null a = b
 --
 -- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
 -- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
+-- >          "directory" </> "/file.ext" == "/file.ext"
 -- > Valid x => combine (takeDirectory x) (takeFileName x) `equalFilePath` x
 --
 --   Combined:


From git at git.haskell.org  Mon Dec 28 20:39:50 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:50 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 change to use </> in all the docs (93ad049)
Message-ID: <20151228203950.7C5113A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/93ad049a7e095b5b7e6c622eaab5ce9ede4682c9

>---------------------------------------------------------------

commit 93ad049a7e095b5b7e6c622eaab5ce9ede4682c9
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:19:47 2015 +0000

    #49, change to use </> in all the docs


>---------------------------------------------------------------

93ad049a7e095b5b7e6c622eaab5ce9ede4682c9
 System/FilePath/Internal.hs | 32 ++++++++++++++++----------------
 tests/TestGen.hs            | 30 ++++++++++++++++--------------
 2 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index fa0b521..abb4e97 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -461,7 +461,7 @@ isDrive x = not (null x) && null (dropDrive x)
 ---------------------------------------------------------------------
 -- Operations on a filepath, as a list of directories
 
--- | Split a filename into directory and file. 'combine' is the inverse.
+-- | Split a filename into directory and file. '</>' is the inverse.
 --   The first component will often end with a trailing slash.
 --
 -- > splitFileName "/directory/file.ext" == ("/directory/","file.ext")
@@ -624,39 +624,39 @@ combineAlways a b | null a = b
 -- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
 -- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"
 -- >          "directory" </> "/file.ext" == "/file.ext"
--- > Valid x => combine (takeDirectory x) (takeFileName x) `equalFilePath` x
+-- > Valid x => (takeDirectory x </> takeFileName x) `equalFilePath` x
 --
 --   Combined:
 --
--- > Posix:   combine "/" "test" == "/test"
--- > Posix:   combine "home" "bob" == "home/bob"
--- > Posix:   combine "x:" "foo" == "x:/foo"
--- > Windows: combine "C:\\foo" "bar" == "C:\\foo\\bar"
--- > Windows: combine "home" "bob" == "home\\bob"
+-- > Posix:   "/" </> "test" == "/test"
+-- > Posix:   "home" </> "bob" == "home/bob"
+-- > Posix:   "x:" </> "foo" == "x:/foo"
+-- > Windows: "C:\\foo" </> "bar" == "C:\\foo\\bar"
+-- > Windows: "home" </> "bob" == "home\\bob"
 --
 --   Not combined:
 --
--- > Posix:   combine "home" "/bob" == "/bob"
--- > Windows: combine "home" "C:\\bob" == "C:\\bob"
+-- > Posix:   "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "C:\\bob" == "C:\\bob"
 --
 --   Not combined (tricky):
 --
 --   On Windows, if a filepath starts with a single slash, it is relative to the
 --   root of the current drive. In [1], this is (confusingly) referred to as an
 --   absolute path.
---   The current behavior of @combine@ is to never combine these forms.
+--   The current behavior of @</>@ is to never combine these forms.
 --
--- > Windows: combine "home" "/bob" == "/bob"
--- > Windows: combine "home" "\\bob" == "\\bob"
--- > Windows: combine "C:\\home" "\\bob" == "\\bob"
+-- > Windows: "home" </> "/bob" == "/bob"
+-- > Windows: "home" </> "\\bob" == "\\bob"
+-- > Windows: "C:\\home" </> "\\bob" == "\\bob"
 --
 --   On Windows, from [1]: "If a file name begins with only a disk designator
 --   but not the backslash after the colon, it is interpreted as a relative path
 --   to the current directory on the drive with the specified letter."
---   The current behavior of @combine@ is to never combine these forms.
+--   The current behavior of @</>@ is to never combine these forms.
 --
--- > Windows: combine "D:\\foo" "C:bar" == "C:bar"
--- > Windows: combine "C:\\foo" "C:bar" == "C:bar"
+-- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
+-- > Windows: "C:\\foo" </> "C:bar" == "C:bar"
 (</>) :: FilePath -> FilePath -> FilePath
 (</>) = combine
 
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index 9bb3ebe..7dfaffc 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -265,22 +265,24 @@ tests =
     ,("W.replaceDirectory \"root/file.ext\" \"/directory/\" == \"/directory/file.ext\"", test $ W.replaceDirectory "root/file.ext" "/directory/" == "/directory/file.ext")
     ,("P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x", test $ \(QFilePathValidP x) -> P.replaceDirectory x (P.takeDirectory x) `P.equalFilePath` x)
     ,("W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x", test $ \(QFilePathValidW x) -> W.replaceDirectory x (W.takeDirectory x) `W.equalFilePath` x)
-    ,("P.combine (P.takeDirectory x) (P.takeFileName x) `P.equalFilePath` x", test $ \(QFilePathValidP x) -> P.combine (P.takeDirectory x) (P.takeFileName x) `P.equalFilePath` x)
-    ,("W.combine (W.takeDirectory x) (W.takeFileName x) `W.equalFilePath` x", test $ \(QFilePathValidW x) -> W.combine (W.takeDirectory x) (W.takeFileName x) `W.equalFilePath` x)
-    ,("P.combine \"/\" \"test\" == \"/test\"", test $ P.combine "/" "test" == "/test")
-    ,("P.combine \"home\" \"bob\" == \"home/bob\"", test $ P.combine "home" "bob" == "home/bob")
-    ,("P.combine \"x:\" \"foo\" == \"x:/foo\"", test $ P.combine "x:" "foo" == "x:/foo")
-    ,("W.combine \"C:\\\\foo\" \"bar\" == \"C:\\\\foo\\\\bar\"", test $ W.combine "C:\\foo" "bar" == "C:\\foo\\bar")
-    ,("W.combine \"home\" \"bob\" == \"home\\\\bob\"", test $ W.combine "home" "bob" == "home\\bob")
-    ,("P.combine \"home\" \"/bob\" == \"/bob\"", test $ P.combine "home" "/bob" == "/bob")
-    ,("W.combine \"home\" \"C:\\\\bob\" == \"C:\\\\bob\"", test $ W.combine "home" "C:\\bob" == "C:\\bob")
-    ,("W.combine \"home\" \"/bob\" == \"/bob\"", test $ W.combine "home" "/bob" == "/bob")
-    ,("W.combine \"home\" \"\\\\bob\" == \"\\\\bob\"", test $ W.combine "home" "\\bob" == "\\bob")
-    ,("W.combine \"C:\\\\home\" \"\\\\bob\" == \"\\\\bob\"", test $ W.combine "C:\\home" "\\bob" == "\\bob")
-    ,("W.combine \"D:\\\\foo\" \"C:bar\" == \"C:bar\"", test $ W.combine "D:\\foo" "C:bar" == "C:bar")
-    ,("W.combine \"C:\\\\foo\" \"C:bar\" == \"C:bar\"", test $ W.combine "C:\\foo" "C:bar" == "C:bar")
     ,("\"/directory\" P.</> \"file.ext\" == \"/directory/file.ext\"", test $ "/directory" P.</> "file.ext" == "/directory/file.ext")
     ,("\"/directory\" W.</> \"file.ext\" == \"/directory\\\\file.ext\"", test $ "/directory" W.</> "file.ext" == "/directory\\file.ext")
+    ,("\"directory\" P.</> \"/file.ext\" == \"/file.ext\"", test $ "directory" P.</> "/file.ext" == "/file.ext")
+    ,("\"directory\" W.</> \"/file.ext\" == \"/file.ext\"", test $ "directory" W.</> "/file.ext" == "/file.ext")
+    ,("(P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x", test $ \(QFilePathValidP x) -> (P.takeDirectory x P.</> P.takeFileName x) `P.equalFilePath` x)
+    ,("(W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x", test $ \(QFilePathValidW x) -> (W.takeDirectory x W.</> W.takeFileName x) `W.equalFilePath` x)
+    ,("\"/\" P.</> \"test\" == \"/test\"", test $ "/" P.</> "test" == "/test")
+    ,("\"home\" P.</> \"bob\" == \"home/bob\"", test $ "home" P.</> "bob" == "home/bob")
+    ,("\"x:\" P.</> \"foo\" == \"x:/foo\"", test $ "x:" P.</> "foo" == "x:/foo")
+    ,("\"C:\\\\foo\" W.</> \"bar\" == \"C:\\\\foo\\\\bar\"", test $ "C:\\foo" W.</> "bar" == "C:\\foo\\bar")
+    ,("\"home\" W.</> \"bob\" == \"home\\\\bob\"", test $ "home" W.</> "bob" == "home\\bob")
+    ,("\"home\" P.</> \"/bob\" == \"/bob\"", test $ "home" P.</> "/bob" == "/bob")
+    ,("\"home\" W.</> \"C:\\\\bob\" == \"C:\\\\bob\"", test $ "home" W.</> "C:\\bob" == "C:\\bob")
+    ,("\"home\" W.</> \"/bob\" == \"/bob\"", test $ "home" W.</> "/bob" == "/bob")
+    ,("\"home\" W.</> \"\\\\bob\" == \"\\\\bob\"", test $ "home" W.</> "\\bob" == "\\bob")
+    ,("\"C:\\\\home\" W.</> \"\\\\bob\" == \"\\\\bob\"", test $ "C:\\home" W.</> "\\bob" == "\\bob")
+    ,("\"D:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", test $ "D:\\foo" W.</> "C:bar" == "C:bar")
+    ,("\"C:\\\\foo\" W.</> \"C:bar\" == \"C:bar\"", test $ "C:\\foo" W.</> "C:bar" == "C:bar")
     ,("P.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", test $ P.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
     ,("W.splitPath \"/directory/file.ext\" == [\"/\", \"directory/\", \"file.ext\"]", test $ W.splitPath "/directory/file.ext" == ["/", "directory/", "file.ext"])
     ,("concat (P.splitPath x) == x", test $ \(QFilePath x) -> concat (P.splitPath x) == x)


From git at git.haskell.org  Mon Dec 28 20:39:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:54 +0000 (UTC)
Subject: [commit: packages/filepath] master: Update the changelog (e1eaaff)
Message-ID: <20151228203954.89C113A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/e1eaaff03ab64dc49f2671aa38d73b5c874f0d44

>---------------------------------------------------------------

commit e1eaaff03ab64dc49f2671aa38d73b5c874f0d44
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 10:20:28 2015 +0000

    Update the changelog


>---------------------------------------------------------------

e1eaaff03ab64dc49f2671aa38d73b5c874f0d44
 changelog.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/changelog.md b/changelog.md
index 902754e..4e753af 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,6 +2,10 @@
 
 _Note: below all `FilePath` values are unquoted, so `\\` really means two backslashes._
 
+## 1.4.1.0  *Unreleased*
+
+ * Improve the documentation.
+
  * Bug fix: `isValid "\0"` now returns `False`, instead of `True`
 
 ## 1.4.0.0  *Mar 2015*


From git at git.haskell.org  Mon Dec 28 20:39:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:56 +0000 (UTC)
Subject: [commit: packages/filepath] master: other-extensions hygiene (2d074eb)
Message-ID: <20151228203956.8F0023A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/2d074ebc0d6f8f65f9e17839a37ea92b544480be

>---------------------------------------------------------------

commit 2d074ebc0d6f8f65f9e17839a37ea92b544480be
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 22 11:36:28 2015 +0100

    other-extensions hygiene


>---------------------------------------------------------------

2d074ebc0d6f8f65f9e17839a37ea92b544480be
 filepath.cabal | 1 +
 1 file changed, 1 insertion(+)

diff --git a/filepath.cabal b/filepath.cabal
index 9c0a457..49404bc 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -34,6 +34,7 @@ library
     default-language: Haskell98
     other-extensions:
         CPP
+        PatternGuards
     if impl(GHC >= 7.2)
         other-extensions: Safe
 


From git at git.haskell.org  Mon Dec 28 20:39:52 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:52 +0000 (UTC)
Subject: [commit: packages/filepath] master: #49,
 add @rwbarton's intuition/example, translated to Haskell (65202e4)
Message-ID: <20151228203952.832953A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/65202e4aabc00477d8fc73a412c523ccec0fa6bf

>---------------------------------------------------------------

commit 65202e4aabc00477d8fc73a412c523ccec0fa6bf
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 08:27:10 2015 +0000

    #49, add @rwbarton's intuition/example, translated to Haskell


>---------------------------------------------------------------

65202e4aabc00477d8fc73a412c523ccec0fa6bf
 System/FilePath/Internal.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index abb4e97..e659921 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -620,6 +620,8 @@ combineAlways a b | null a = b
 
 -- | Combine two paths with a path separator.
 --   If the second path starts with a path separator or a drive letter, then it returns the second.
+--   The intention is that @setCurrentDirectory dir; readFile file@ will access the same file as
+--   @readFile (dir '</>' file)@.
 --
 -- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
 -- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"


From git at git.haskell.org  Mon Dec 28 20:39:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:39:58 +0000 (UTC)
Subject: [commit: packages/filepath] master: Merge pull request #52 from
 hvr/pr/other-extensions (ef9eddd)
Message-ID: <20151228203958.959CE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/ef9eddd9e9bec7d9093004e48b08718dd62a3a77

>---------------------------------------------------------------

commit ef9eddd9e9bec7d9093004e48b08718dd62a3a77
Merge: e1eaaff 2d074eb
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 10:40:16 2015 +0000

    Merge pull request #52 from hvr/pr/other-extensions
    
    other-extensions hygiene



>---------------------------------------------------------------

ef9eddd9e9bec7d9093004e48b08718dd62a3a77
 filepath.cabal | 1 +
 1 file changed, 1 insertion(+)


From git at git.haskell.org  Mon Dec 28 20:40:00 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:00 +0000 (UTC)
Subject: [commit: packages/filepath] master: Flush the appveyor cache (6f07db1)
Message-ID: <20151228204000.9BE3C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/6f07db10d53832c862be830157bb50635985d889

>---------------------------------------------------------------

commit 6f07db10d53832c862be830157bb50635985d889
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 10:45:17 2015 +0000

    Flush the appveyor cache


>---------------------------------------------------------------

6f07db10d53832c862be830157bb50635985d889
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 79b35ca..fe96cbd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 cache:
-- "c:\\sr" # stack root, short paths == less problems
+- "c:\\sr -> appveyor.yml" # stack root, short paths == less problems
 
 build: off
 


From git at git.haskell.org  Mon Dec 28 20:40:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:02 +0000 (UTC)
Subject: [commit: packages/filepath] master: Remove cache clearing (9fe78c3)
Message-ID: <20151228204002.A20E73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/9fe78c3473a6fc47ad2e3f03214a3d60b7373b29

>---------------------------------------------------------------

commit 9fe78c3473a6fc47ad2e3f03214a3d60b7373b29
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 10:58:33 2015 +0000

    Remove cache clearing


>---------------------------------------------------------------

9fe78c3473a6fc47ad2e3f03214a3d60b7373b29
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index fe96cbd..79b35ca 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 cache:
-- "c:\\sr -> appveyor.yml" # stack root, short paths == less problems
+- "c:\\sr" # stack root, short paths == less problems
 
 build: off
 


From git at git.haskell.org  Mon Dec 28 20:40:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:04 +0000 (UTC)
Subject: [commit: packages/filepath] master: #47,
 reformat badElements so it's easier to see what they are (63eaad2)
Message-ID: <20151228204004.A98343A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/63eaad27f3620993bdae0806a5f71c9a91714c2a

>---------------------------------------------------------------

commit 63eaad27f3620993bdae0806a5f71c9a91714c2a
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 11:24:53 2015 +0000

    #47, reformat badElements so it's easier to see what they are


>---------------------------------------------------------------

63eaad27f3620993bdae0806a5f71c9a91714c2a
 System/FilePath/Internal.hs | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index e659921..4228376 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -846,8 +846,12 @@ normaliseDrive drive = if isJust $ readDriveLetter x2
 -- Information for validity functions on Windows. See [1].
 badCharacters :: [Char]
 badCharacters = ":*?><|\""
+
 badElements :: [FilePath]
-badElements = ["CON", "PRN", "AUX", "NUL", "COM1", "COM2", "COM3", "COM4", "COM5", "COM6", "COM7", "COM8", "COM9", "LPT1", "LPT2", "LPT3", "LPT4", "LPT5", "LPT6", "LPT7", "LPT8", "LPT9", "CLOCK$"]
+badElements =
+    ["CON","PRN","AUX","NUL","CLOCK$"
+    ,"COM1","COM2","COM3","COM4","COM5","COM6","COM7","COM8","COM9"
+    ,"LPT1","LPT2","LPT3","LPT4","LPT5","LPT6","LPT7","LPT8","LPT9"]
 
 
 -- | Is a FilePath valid, i.e. could you create a file like it? This function checks for invalid names,


From git at git.haskell.org  Mon Dec 28 20:40:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:06 +0000 (UTC)
Subject: [commit: packages/filepath] master: #47,
 make isValid detect more invalid characters (dd13bb3)
Message-ID: <20151228204006.B0BE53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/dd13bb32b7b563248fa2bfa232891e05759d6506

>---------------------------------------------------------------

commit dd13bb32b7b563248fa2bfa232891e05759d6506
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 11:41:53 2015 +0000

    #47, make isValid detect more invalid characters


>---------------------------------------------------------------

dd13bb32b7b563248fa2bfa232891e05759d6506
 System/FilePath/Internal.hs | 10 +++++-----
 tests/TestGen.hs            |  1 +
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 4228376..30ee372 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -844,8 +844,8 @@ normaliseDrive drive = if isJust $ readDriveLetter x2
         repSlash x = if isPathSeparator x then pathSeparator else x
 
 -- Information for validity functions on Windows. See [1].
-badCharacters :: [Char]
-badCharacters = ":*?><|\""
+isBadCharacter :: Char -> Bool
+isBadCharacter x = x >= '\0' && x <= '\31' || x `elem` ":*?><|\""
 
 badElements :: [FilePath]
 badElements =
@@ -871,12 +871,13 @@ badElements =
 -- > Windows: isValid "\\\\" == False
 -- > Windows: isValid "\\\\\\foo" == False
 -- > Windows: isValid "\\\\?\\D:file" == False
+-- > Windows: isValid "foo\tbar" == False
 isValid :: FilePath -> Bool
 isValid "" = False
 isValid x | '\0' `elem` x = False
 isValid _ | isPosix = True
 isValid path =
-        not (any (`elem` badCharacters) x2) &&
+        not (any isBadCharacter x2) &&
         not (any f $ splitDirectories x2) &&
         not (isJust (readDriveShare x1) && all isPathSeparator x1) &&
         not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
@@ -912,8 +913,7 @@ makeValid path
         (drv,pth) = splitDrive path
 
         validChars = map f
-        f x | x `elem` badCharacters || x == '\0' = '_'
-            | otherwise = x
+        f x = if isBadCharacter x then '_' else x
 
         validElements x = joinPath $ map g $ splitPath x
         g x = h a ++ b
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index 7dfaffc..c3b1acd 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -384,6 +384,7 @@ tests =
     ,("W.isValid \"\\\\\\\\\" == False", test $ W.isValid "\\\\" == False)
     ,("W.isValid \"\\\\\\\\\\\\foo\" == False", test $ W.isValid "\\\\\\foo" == False)
     ,("W.isValid \"\\\\\\\\?\\\\D:file\" == False", test $ W.isValid "\\\\?\\D:file" == False)
+    ,("W.isValid \"foo\\tbar\" == False", test $ W.isValid "foo\tbar" == False)
     ,("P.isValid (P.makeValid x)", test $ \(QFilePath x) -> P.isValid (P.makeValid x))
     ,("W.isValid (W.makeValid x)", test $ \(QFilePath x) -> W.isValid (W.makeValid x))
     ,("P.isValid x ==> P.makeValid x == x", test $ \(QFilePath x) -> P.isValid x ==> P.makeValid x == x)


From git at git.haskell.org  Mon Dec 28 20:40:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:08 +0000 (UTC)
Subject: [commit: packages/filepath] master: #47,
 isValid now detects invalid files like "nul .txt" on Windows (71f02bc)
Message-ID: <20151228204008.B75893A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/71f02bc8decfe4561cbd30946e62116e75b6dafd

>---------------------------------------------------------------

commit 71f02bc8decfe4561cbd30946e62116e75b6dafd
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 11:43:16 2015 +0000

    #47, isValid now detects invalid files like "nul .txt" on Windows


>---------------------------------------------------------------

71f02bc8decfe4561cbd30946e62116e75b6dafd
 System/FilePath/Internal.hs | 7 +++++--
 changelog.md                | 2 ++
 tests/TestGen.hs            | 3 +++
 3 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 30ee372..8f0acdd 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -872,6 +872,8 @@ badElements =
 -- > Windows: isValid "\\\\\\foo" == False
 -- > Windows: isValid "\\\\?\\D:file" == False
 -- > Windows: isValid "foo\tbar" == False
+-- > Windows: isValid "nul .txt" == False
+-- > Windows: isValid " nul.txt" == True
 isValid :: FilePath -> Bool
 isValid "" = False
 isValid x | '\0' `elem` x = False
@@ -883,7 +885,7 @@ isValid path =
         not (isJust (readDriveUNC x1) && not (hasTrailingPathSeparator x1))
     where
         (x1,x2) = splitDrive path
-        f x = map toUpper (dropExtensions x) `elem` badElements
+        f x = map toUpper (dropWhileEnd (== ' ') $ dropExtensions x) `elem` badElements
 
 
 -- | Take a FilePath and make it valid; does not change already valid FilePaths.
@@ -901,6 +903,7 @@ isValid path =
 -- > Windows: makeValid "c:\\nul\\file" == "c:\\nul_\\file"
 -- > Windows: makeValid "\\\\\\foo" == "\\\\drive"
 -- > Windows: makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file"
+-- > Windows: makeValid "nul .txt" == "nul _.txt"
 makeValid :: FilePath -> FilePath
 makeValid "" = "_"
 makeValid path
@@ -918,7 +921,7 @@ makeValid path
         validElements x = joinPath $ map g $ splitPath x
         g x = h a ++ b
             where (a,b) = break isPathSeparator x
-        h x = if map toUpper a `elem` badElements then a ++ "_" <.> b else x
+        h x = if map toUpper (dropWhileEnd (== ' ') a) `elem` badElements then a ++ "_" <.> b else x
             where (a,b) = splitExtensions x
 
 
diff --git a/changelog.md b/changelog.md
index 4e753af..e749e3f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,8 @@ _Note: below all `FilePath` values are unquoted, so `\\` really means two backsl
 
 ## 1.4.1.0  *Unreleased*
 
+ * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.
+
  * Improve the documentation.
 
  * Bug fix: `isValid "\0"` now returns `False`, instead of `True`
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index c3b1acd..ead85d8 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -385,6 +385,8 @@ tests =
     ,("W.isValid \"\\\\\\\\\\\\foo\" == False", test $ W.isValid "\\\\\\foo" == False)
     ,("W.isValid \"\\\\\\\\?\\\\D:file\" == False", test $ W.isValid "\\\\?\\D:file" == False)
     ,("W.isValid \"foo\\tbar\" == False", test $ W.isValid "foo\tbar" == False)
+    ,("W.isValid \"nul .txt\" == False", test $ W.isValid "nul .txt" == False)
+    ,("W.isValid \" nul.txt\" == True", test $ W.isValid " nul.txt" == True)
     ,("P.isValid (P.makeValid x)", test $ \(QFilePath x) -> P.isValid (P.makeValid x))
     ,("W.isValid (W.makeValid x)", test $ \(QFilePath x) -> W.isValid (W.makeValid x))
     ,("P.isValid x ==> P.makeValid x == x", test $ \(QFilePath x) -> P.isValid x ==> P.makeValid x == x)
@@ -402,6 +404,7 @@ tests =
     ,("W.makeValid \"c:\\\\nul\\\\file\" == \"c:\\\\nul_\\\\file\"", test $ W.makeValid "c:\\nul\\file" == "c:\\nul_\\file")
     ,("W.makeValid \"\\\\\\\\\\\\foo\" == \"\\\\\\\\drive\"", test $ W.makeValid "\\\\\\foo" == "\\\\drive")
     ,("W.makeValid \"\\\\\\\\?\\\\D:file\" == \"\\\\\\\\?\\\\D:\\\\file\"", test $ W.makeValid "\\\\?\\D:file" == "\\\\?\\D:\\file")
+    ,("W.makeValid \"nul .txt\" == \"nul _.txt\"", test $ W.makeValid "nul .txt" == "nul _.txt")
     ,("W.isRelative \"path\\\\test\" == True", test $ W.isRelative "path\\test" == True)
     ,("W.isRelative \"c:\\\\test\" == False", test $ W.isRelative "c:\\test" == False)
     ,("W.isRelative \"c:test\" == True", test $ W.isRelative "c:test" == True)


From git at git.haskell.org  Mon Dec 28 20:40:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:10 +0000 (UTC)
Subject: [commit: packages/filepath] master: Temporarily allow GHC head
 failures, since I don't understand them at all (c4e1668)
Message-ID: <20151228204010.BD4533A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/c4e16687ded3506787e619a90964edd4870e638e

>---------------------------------------------------------------

commit c4e16687ded3506787e619a90964edd4870e638e
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 11:45:36 2015 +0000

    Temporarily allow GHC head failures, since I don't understand them at all


>---------------------------------------------------------------

c4e16687ded3506787e619a90964edd4870e638e
 .travis.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index ebae307..20d31e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,5 +6,9 @@ env:
  - GHCVER=7.10.1
  - GHCVER=head
 
+matrix:
+  allow_failures:
+   - env: GHCVER=head
+
 script:
  - wget https://raw.github.com/ndmitchell/neil/master/travis.sh -O - --no-check-certificate --quiet | sh


From git at git.haskell.org  Mon Dec 28 20:40:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:12 +0000 (UTC)
Subject: [commit: packages/filepath] master: Merge branch 'master' of
 https://github.com/haskell/filepath (e32ff18)
Message-ID: <20151228204012.C3A6E3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/e32ff18f30179d33269cdf6510c0698c20fae78c

>---------------------------------------------------------------

commit e32ff18f30179d33269cdf6510c0698c20fae78c
Merge: c4e1668 9fe78c3
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 12:02:25 2015 +0000

    Merge branch 'master' of https://github.com/haskell/filepath



>---------------------------------------------------------------

e32ff18f30179d33269cdf6510c0698c20fae78c
 filepath.cabal | 1 +
 1 file changed, 1 insertion(+)


From git at git.haskell.org  Mon Dec 28 20:40:14 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:14 +0000 (UTC)
Subject: [commit: packages/filepath] master: #48,
 tweak the docs following suggestion from @rwbarton (ff4dba5)
Message-ID: <20151228204014.CA9033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/ff4dba521bee9fb71d5f92c26c27740f8a5b6d7e

>---------------------------------------------------------------

commit ff4dba521bee9fb71d5f92c26c27740f8a5b6d7e
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 12:43:04 2015 +0000

    #48, tweak the docs following suggestion from @rwbarton


>---------------------------------------------------------------

ff4dba521bee9fb71d5f92c26c27740f8a5b6d7e
 System/FilePath/Internal.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 8f0acdd..27f2af8 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -620,8 +620,8 @@ combineAlways a b | null a = b
 
 -- | Combine two paths with a path separator.
 --   If the second path starts with a path separator or a drive letter, then it returns the second.
---   The intention is that @setCurrentDirectory dir; readFile file@ will access the same file as
---   @readFile (dir '</>' file)@.
+--   The intention is that @readFile (dir '</>' file)@ will access the same file as
+--   @setCurrentDirectory dir; readFile file at .
 --
 -- > Posix:   "/directory" </> "file.ext" == "/directory/file.ext"
 -- > Windows: "/directory" </> "file.ext" == "/directory\\file.ext"


From git at git.haskell.org  Mon Dec 28 20:40:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:16 +0000 (UTC)
Subject: [commit: packages/filepath] master: #42,
 add replaceExtensions (10318a7)
Message-ID: <20151228204016.D1D6B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/10318a79d2028e8178057c0136bb08c52768c049

>---------------------------------------------------------------

commit 10318a79d2028e8178057c0136bb08c52768c049
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 13:21:02 2015 +0000

    #42, add replaceExtensions


>---------------------------------------------------------------

10318a79d2028e8178057c0136bb08c52768c049
 System/FilePath/Internal.hs | 13 ++++++++++++-
 changelog.md                |  2 ++
 tests/TestGen.hs            |  4 ++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 27f2af8..2757c10 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -75,7 +75,7 @@ module System.FilePath.MODULE_NAME
     -- * Extension functions
     splitExtension,
     takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
-    splitExtensions, dropExtensions, takeExtensions,
+    splitExtensions, dropExtensions, takeExtensions, replaceExtensions,
 
     -- * Filename\/directory functions
     splitFileName,
@@ -340,6 +340,17 @@ takeExtensions :: FilePath -> String
 takeExtensions = snd . splitExtensions
 
 
+-- | Replace all extensions of a file with a new extension. Note
+--   that 'replaceExtension' and 'addExtension' both work for adding
+--   multiple extensions, so only required when you need to drop
+--   all extensions first.
+--
+-- > replaceExtensions "file.fred.bob" "txt" == "file.txt"
+-- > replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz"
+replaceExtensions :: FilePath -> String -> FilePath
+replaceExtensions x y = dropExtensions x <.> y
+
+
 
 ---------------------------------------------------------------------
 -- Drive methods
diff --git a/changelog.md b/changelog.md
index e749e3f..976d006 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,8 @@ _Note: below all `FilePath` values are unquoted, so `\\` really means two backsl
 
 ## 1.4.1.0  *Unreleased*
 
+ * Add `replaceExtensions` function.
+
  * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.
 
  * Improve the documentation.
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index ead85d8..93733e6 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -127,6 +127,10 @@ tests =
     ,("W.takeExtensions \"/directory/path.ext\" == \".ext\"", test $ W.takeExtensions "/directory/path.ext" == ".ext")
     ,("P.takeExtensions \"file.tar.gz\" == \".tar.gz\"", test $ P.takeExtensions "file.tar.gz" == ".tar.gz")
     ,("W.takeExtensions \"file.tar.gz\" == \".tar.gz\"", test $ W.takeExtensions "file.tar.gz" == ".tar.gz")
+    ,("P.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", test $ P.replaceExtensions "file.fred.bob" "txt" == "file.txt")
+    ,("W.replaceExtensions \"file.fred.bob\" \"txt\" == \"file.txt\"", test $ W.replaceExtensions "file.fred.bob" "txt" == "file.txt")
+    ,("P.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", test $ P.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
+    ,("W.replaceExtensions \"file.fred.bob\" \"tar.gz\" == \"file.tar.gz\"", test $ W.replaceExtensions "file.fred.bob" "tar.gz" == "file.tar.gz")
     ,("uncurry (++) (P.splitDrive x) == x", test $ \(QFilePath x) -> uncurry (++) (P.splitDrive x) == x)
     ,("uncurry (++) (W.splitDrive x) == x", test $ \(QFilePath x) -> uncurry (++) (W.splitDrive x) == x)
     ,("W.splitDrive \"file\" == (\"\", \"file\")", test $ W.splitDrive "file" == ("", "file"))


From git at git.haskell.org  Mon Dec 28 20:40:18 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:18 +0000 (UTC)
Subject: [commit: packages/filepath] master: #43,
 make the generator aware of some more Prelude functions (cdf4bd8)
Message-ID: <20151228204018.D7E643A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/cdf4bd87f9328a8e04151a86c4e097fd929a1bf1

>---------------------------------------------------------------

commit cdf4bd87f9328a8e04151a86c4e097fd929a1bf1
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 13:59:25 2015 +0000

    #43, make the generator aware of some more Prelude functions


>---------------------------------------------------------------

cdf4bd87f9328a8e04151a86c4e097fd929a1bf1
 Generate.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Generate.hs b/Generate.hs
index f0972fc..04c83c6 100755
--- a/Generate.hs
+++ b/Generate.hs
@@ -83,7 +83,7 @@ qualify pw str
     | otherwise = str
     where
         prelude = ["elem","uncurry","snd","fst","not","null","if","then","else"
-                  ,"True","False","concat","isPrefixOf","isSuffixOf","any"]
+                  ,"True","False","Just","Nothing","fromJust","concat","isPrefixOf","isSuffixOf","any"]
         fpops = ["</>","<.>","-<.>"]
 
 


From git at git.haskell.org  Mon Dec 28 20:40:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:20 +0000 (UTC)
Subject: [commit: packages/filepath] master: #43,
 allow the tests to make use of Maybe functions (143b102)
Message-ID: <20151228204020.DDF643A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/143b102ed8ee0e3875a11e50105f1850115852bf

>---------------------------------------------------------------

commit 143b102ed8ee0e3875a11e50105f1850115852bf
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 13:59:44 2015 +0000

    #43, allow the tests to make use of Maybe functions


>---------------------------------------------------------------

143b102ed8ee0e3875a11e50105f1850115852bf
 tests/TestUtil.hs | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/TestUtil.hs b/tests/TestUtil.hs
index 021238a..e72b4e9 100644
--- a/tests/TestUtil.hs
+++ b/tests/TestUtil.hs
@@ -3,11 +3,13 @@ module TestUtil(
     (==>), QFilePath(..), QFilePathValidW(..), QFilePathValidP(..),
     test, Test,
     module Test.QuickCheck,
-    module Data.List
+    module Data.List,
+    module Data.Maybe
     ) where
 
 import Test.QuickCheck hiding ((==>))
 import Data.List
+import Data.Maybe
 import Control.Monad
 import qualified System.FilePath.Windows as W
 import qualified System.FilePath.Posix as P


From git at git.haskell.org  Mon Dec 28 20:40:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:22 +0000 (UTC)
Subject: [commit: packages/filepath] master: #43, add stripExtension (2566d68)
Message-ID: <20151228204022.E533B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/2566d68dc7e96513f8a1d2e5ff6799f26b948360

>---------------------------------------------------------------

commit 2566d68dc7e96513f8a1d2e5ff6799f26b948360
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:05:03 2015 +0000

    #43, add stripExtension


>---------------------------------------------------------------

2566d68dc7e96513f8a1d2e5ff6799f26b948360
 System/FilePath/Internal.hs | 32 ++++++++++++++++++++++++++++++++
 changelog.md                |  2 +-
 tests/TestGen.hs            | 18 ++++++++++++++++++
 3 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 2757c10..4572ae7 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -76,6 +76,7 @@ module System.FilePath.MODULE_NAME
     splitExtension,
     takeExtension, replaceExtension, (-<.>), dropExtension, addExtension, hasExtension, (<.>),
     splitExtensions, dropExtensions, takeExtensions, replaceExtensions,
+    stripExtension,
 
     -- * Filename\/directory functions
     splitFileName,
@@ -104,6 +105,7 @@ module System.FilePath.MODULE_NAME
 
 import Data.Char(toLower, toUpper, isAsciiLower, isAsciiUpper)
 import Data.Maybe(isJust)
+import Data.List(stripPrefix)
 
 import System.Environment(getEnv)
 
@@ -310,6 +312,30 @@ hasExtension :: FilePath -> Bool
 hasExtension = any isExtSeparator . takeFileName
 
 
+-- | Drop the given extension from a FilePath, and the \".\" preceding it.
+--
+-- It returns Nothing if the FilePath does not have the extension given, or
+-- Just the part before the extension, if it does.
+--
+-- It is safer to use this function than System.FilePath.dropExtensions,
+-- because FilePath might be something like 'file.name.ext1.ext2', where we
+-- want to only drop the 'ext1.ext2' part, but keep the full 'file.name' part.
+--
+-- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
+-- > stripExtension "hi.o" "foo.x.hs.o" == Nothing
+-- > dropExtension x == fromJust (stripExtension (takeExtension x) x)
+-- > dropExtensions x == fromJust (stripExtension (takeExtensions x) x)
+-- > stripExtension ".c.d" "a.b.c.d"  == Just "a.b"
+-- > stripExtension ".c.d" "a.b..c.d" == Just "a.b."
+-- > stripExtension "baz"  "foo.bar"  == Nothing
+-- > stripExtension "bar"  "foobar"   == Nothing
+-- > stripExtension ""     x          == Just x
+stripExtension :: String -> FilePath -> Maybe FilePath
+stripExtension []        path = Just path
+stripExtension ext@(x:_) path = stripSuffix dotExt path
+    where dotExt = if isExtSeparator x then ext else '.':ext
+
+
 -- | Split on all extensions.
 --
 -- > splitExtensions "/directory/path.ext" == ("/directory/path",".ext")
@@ -996,3 +1022,9 @@ spanEnd p xs = (dropWhileEnd p xs, takeWhileEnd p xs)
 -- breakEnd (< 2) [1,2,3,4,1,2,3,4] == ([1,2,3,4,1],[2,3,4])
 breakEnd :: (a -> Bool) -> [a] -> ([a], [a])
 breakEnd p = spanEnd (not . p)
+
+-- | The stripSuffix function drops the given suffix from a list. It returns
+-- Nothing if the list did not end with the suffix given, or Just the list
+-- before the suffix, if it does.
+stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
+stripSuffix xs ys = reverse <$> stripPrefix (reverse xs) (reverse ys)
diff --git a/changelog.md b/changelog.md
index 976d006..7d3f943 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,7 +4,7 @@ _Note: below all `FilePath` values are unquoted, so `\\` really means two backsl
 
 ## 1.4.1.0  *Unreleased*
 
- * Add `replaceExtensions` function.
+ * Add `replaceExtensions` and `stripExtension` functions.
 
  * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.
 
diff --git a/tests/TestGen.hs b/tests/TestGen.hs
index 93733e6..ce5b21c 100755
--- a/tests/TestGen.hs
+++ b/tests/TestGen.hs
@@ -105,6 +105,24 @@ tests =
     ,("W.hasExtension \"/directory/path\" == False", test $ W.hasExtension "/directory/path" == False)
     ,("null (P.takeExtension x) == not (P.hasExtension x)", test $ \(QFilePath x) -> null (P.takeExtension x) == not (P.hasExtension x))
     ,("null (W.takeExtension x) == not (W.hasExtension x)", test $ \(QFilePath x) -> null (W.takeExtension x) == not (W.hasExtension x))
+    ,("P.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", test $ P.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
+    ,("W.stripExtension \"hs.o\" \"foo.x.hs.o\" == Just \"foo.x\"", test $ W.stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x")
+    ,("P.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", test $ P.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
+    ,("W.stripExtension \"hi.o\" \"foo.x.hs.o\" == Nothing", test $ W.stripExtension "hi.o" "foo.x.hs.o" == Nothing)
+    ,("P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x)", test $ \(QFilePath x) -> P.dropExtension x == fromJust (P.stripExtension (P.takeExtension x) x))
+    ,("W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x)", test $ \(QFilePath x) -> W.dropExtension x == fromJust (W.stripExtension (W.takeExtension x) x))
+    ,("P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x)", test $ \(QFilePath x) -> P.dropExtensions x == fromJust (P.stripExtension (P.takeExtensions x) x))
+    ,("W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x)", test $ \(QFilePath x) -> W.dropExtensions x == fromJust (W.stripExtension (W.takeExtensions x) x))
+    ,("P.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", test $ P.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
+    ,("W.stripExtension \".c.d\" \"a.b.c.d\" == Just \"a.b\"", test $ W.stripExtension ".c.d" "a.b.c.d" == Just "a.b")
+    ,("P.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", test $ P.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
+    ,("W.stripExtension \".c.d\" \"a.b..c.d\" == Just \"a.b.\"", test $ W.stripExtension ".c.d" "a.b..c.d" == Just "a.b.")
+    ,("P.stripExtension \"baz\" \"foo.bar\" == Nothing", test $ P.stripExtension "baz" "foo.bar" == Nothing)
+    ,("W.stripExtension \"baz\" \"foo.bar\" == Nothing", test $ W.stripExtension "baz" "foo.bar" == Nothing)
+    ,("P.stripExtension \"bar\" \"foobar\" == Nothing", test $ P.stripExtension "bar" "foobar" == Nothing)
+    ,("W.stripExtension \"bar\" \"foobar\" == Nothing", test $ W.stripExtension "bar" "foobar" == Nothing)
+    ,("P.stripExtension \"\" x == Just x", test $ \(QFilePath x) -> P.stripExtension "" x == Just x)
+    ,("W.stripExtension \"\" x == Just x", test $ \(QFilePath x) -> W.stripExtension "" x == Just x)
     ,("P.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", test $ P.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
     ,("W.splitExtensions \"/directory/path.ext\" == (\"/directory/path\", \".ext\")", test $ W.splitExtensions "/directory/path.ext" == ("/directory/path", ".ext"))
     ,("P.splitExtensions \"file.tar.gz\" == (\"file\", \".tar.gz\")", test $ P.splitExtensions "file.tar.gz" == ("file", ".tar.gz"))


From git at git.haskell.org  Mon Dec 28 20:40:24 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:24 +0000 (UTC)
Subject: [commit: packages/filepath] master: GHC 7.8 and earlier compatibility
 (afd45d0)
Message-ID: <20151228204024.EC2653A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/afd45d015d431dc68e89b406cebc3fe32f337fb7

>---------------------------------------------------------------

commit afd45d015d431dc68e89b406cebc3fe32f337fb7
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:12:13 2015 +0000

    GHC 7.8 and earlier compatibility


>---------------------------------------------------------------

afd45d015d431dc68e89b406cebc3fe32f337fb7
 System/FilePath/Internal.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 4572ae7..00cdfcd 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -1027,4 +1027,4 @@ breakEnd p = spanEnd (not . p)
 -- Nothing if the list did not end with the suffix given, or Just the list
 -- before the suffix, if it does.
 stripSuffix :: Eq a => [a] -> [a] -> Maybe [a]
-stripSuffix xs ys = reverse <$> stripPrefix (reverse xs) (reverse ys)
+stripSuffix xs ys = fmap reverse $ stripPrefix (reverse xs) (reverse ys)


From git at git.haskell.org  Mon Dec 28 20:40:26 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:26 +0000 (UTC)
Subject: [commit: packages/filepath] master: Allow QuickCheck 2.9 (6bc1265)
Message-ID: <20151228204026.F258B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/6bc1265f9fec02e0e84c4fb481010e19255d91e1

>---------------------------------------------------------------

commit 6bc1265f9fec02e0e84c4fb481010e19255d91e1
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:15:34 2015 +0000

    Allow QuickCheck 2.9


>---------------------------------------------------------------

6bc1265f9fec02e0e84c4fb481010e19255d91e1
 filepath.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/filepath.cabal b/filepath.cabal
index 49404bc..3a25e1f 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -60,7 +60,7 @@ test-suite filepath-tests
     build-depends:
         filepath,
         base,
-        QuickCheck >= 2.7 && < 2.8
+        QuickCheck >= 2.7 && < 2.9
 
 source-repository head
     type:     git


From git at git.haskell.org  Mon Dec 28 20:40:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:29 +0000 (UTC)
Subject: [commit: packages/filepath] master: Put the source repo bit higher up
 in the Cabal file, since its useful information (078f1a0)
Message-ID: <20151228204029.05CFE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/078f1a05fffeca901ad44a5e4fc1edf9ce8ffa4a

>---------------------------------------------------------------

commit 078f1a05fffeca901ad44a5e4fc1edf9ce8ffa4a
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:17:43 2015 +0000

    Put the source repo bit higher up in the Cabal file, since its useful information


>---------------------------------------------------------------

078f1a05fffeca901ad44a5e4fc1edf9ce8ffa4a
 filepath.cabal | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/filepath.cabal b/filepath.cabal
index 3a25e1f..5d4e771 100644
--- a/filepath.cabal
+++ b/filepath.cabal
@@ -30,6 +30,10 @@ extra-doc-files:
     README.md
     changelog.md
 
+source-repository head
+    type:     git
+    location: https://github.com/haskell/filepath.git
+
 library
     default-language: Haskell98
     other-extensions:
@@ -61,7 +65,3 @@ test-suite filepath-tests
         filepath,
         base,
         QuickCheck >= 2.7 && < 2.9
-
-source-repository head
-    type:     git
-    location: https://github.com/haskell/filepath.git


From git at git.haskell.org  Mon Dec 28 20:40:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:31 +0000 (UTC)
Subject: [commit: packages/filepath] master: Fix documentation markup in </>
 (802046a)
Message-ID: <20151228204031.0C0ED3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/802046adbf26716698621c472e65267605a28e88

>---------------------------------------------------------------

commit 802046adbf26716698621c472e65267605a28e88
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:34:08 2015 +0000

    Fix documentation markup in </>


>---------------------------------------------------------------

802046adbf26716698621c472e65267605a28e88
 System/FilePath/Internal.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 00cdfcd..3b7fa48 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -683,7 +683,7 @@ combineAlways a b | null a = b
 --   On Windows, if a filepath starts with a single slash, it is relative to the
 --   root of the current drive. In [1], this is (confusingly) referred to as an
 --   absolute path.
---   The current behavior of @</>@ is to never combine these forms.
+--   The current behavior of '</>' is to never combine these forms.
 --
 -- > Windows: "home" </> "/bob" == "/bob"
 -- > Windows: "home" </> "\\bob" == "\\bob"
@@ -692,7 +692,7 @@ combineAlways a b | null a = b
 --   On Windows, from [1]: "If a file name begins with only a disk designator
 --   but not the backslash after the colon, it is interpreted as a relative path
 --   to the current directory on the drive with the specified letter."
---   The current behavior of @</>@ is to never combine these forms.
+--   The current behavior of '</>' is to never combine these forms.
 --
 -- > Windows: "D:\\foo" </> "C:bar" == "C:bar"
 -- > Windows: "C:\\foo" </> "C:bar" == "C:bar"


From git at git.haskell.org  Mon Dec 28 20:40:33 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:33 +0000 (UTC)
Subject: [commit: packages/filepath] master: Improve the docs for
 stripExtension (a38cc73)
Message-ID: <20151228204033.1357B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/a38cc733674497875ad76240c24a17ec1a0d568b

>---------------------------------------------------------------

commit a38cc733674497875ad76240c24a17ec1a0d568b
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Dec 22 14:34:19 2015 +0000

    Improve the docs for stripExtension


>---------------------------------------------------------------

a38cc733674497875ad76240c24a17ec1a0d568b
 System/FilePath/Internal.hs | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/System/FilePath/Internal.hs b/System/FilePath/Internal.hs
index 3b7fa48..df4b39c 100644
--- a/System/FilePath/Internal.hs
+++ b/System/FilePath/Internal.hs
@@ -312,14 +312,12 @@ hasExtension :: FilePath -> Bool
 hasExtension = any isExtSeparator . takeFileName
 
 
--- | Drop the given extension from a FilePath, and the \".\" preceding it.
+-- | Drop the given extension from a FilePath, and the @\".\"@ preceding it.
+--   Returns 'Nothing' if the FilePath does not have the given extension, or
+--   'Just' and the part before the extension if it does.
 --
--- It returns Nothing if the FilePath does not have the extension given, or
--- Just the part before the extension, if it does.
---
--- It is safer to use this function than System.FilePath.dropExtensions,
--- because FilePath might be something like 'file.name.ext1.ext2', where we
--- want to only drop the 'ext1.ext2' part, but keep the full 'file.name' part.
+--   This function can be more predictable than 'dropExtensions', especially if the filename
+--   might itself contain @.@ characters.
 --
 -- > stripExtension "hs.o" "foo.x.hs.o" == Just "foo.x"
 -- > stripExtension "hi.o" "foo.x.hs.o" == Nothing


From git at git.haskell.org  Mon Dec 28 20:40:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:35 +0000 (UTC)
Subject: [commit: packages/filepath] master: Mention which version of GHC this
 is bundled with (1b2c048)
Message-ID: <20151228204035.19D233A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/1b2c048bea2fdb00e7244b7b7d50a4bb2527fc34

>---------------------------------------------------------------

commit 1b2c048bea2fdb00e7244b7b7d50a4bb2527fc34
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Wed Dec 23 23:18:02 2015 +0000

    Mention which version of GHC this is bundled with


>---------------------------------------------------------------

1b2c048bea2fdb00e7244b7b7d50a4bb2527fc34
 changelog.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/changelog.md b/changelog.md
index 7d3f943..13591b4 100644
--- a/changelog.md
+++ b/changelog.md
@@ -4,6 +4,8 @@ _Note: below all `FilePath` values are unquoted, so `\\` really means two backsl
 
 ## 1.4.1.0  *Unreleased*
 
+ * Bundled with GHC 8.0.1
+
  * Add `replaceExtensions` and `stripExtension` functions.
 
  * Make `isValid` detect more invalid Windows paths, e.g. `nul .txt` and `foo\nbar`.


From git at git.haskell.org  Mon Dec 28 20:40:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:37 +0000 (UTC)
Subject: [commit: packages/filepath] master: Add in the release date (f510e50)
Message-ID: <20151228204037.1FE6D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/f510e50feefe9995334769dd5e26c79edbe6fdc1

>---------------------------------------------------------------

commit f510e50feefe9995334769dd5e26c79edbe6fdc1
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Dec 28 19:03:44 2015 +0000

    Add in the release date


>---------------------------------------------------------------

f510e50feefe9995334769dd5e26c79edbe6fdc1
 changelog.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 13591b4..074905f 100644
--- a/changelog.md
+++ b/changelog.md
@@ -2,7 +2,7 @@
 
 _Note: below all `FilePath` values are unquoted, so `\\` really means two backslashes._
 
-## 1.4.1.0  *Unreleased*
+## 1.4.1.0  *Dec 2015*
 
  * Bundled with GHC 8.0.1
 


From git at git.haskell.org  Mon Dec 28 20:40:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:40:39 +0000 (UTC)
Subject: [commit: packages/filepath] master: Add dependency to flush appveyor
 cache (again) (5c69dd0)
Message-ID: <20151228204039.25A433A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/filepath

On branch  : master
Link       : http://git.haskell.org/packages/filepath.git/commitdiff/5c69dd09aa8728fe07c292a1347fe26c81c1ecff

>---------------------------------------------------------------

commit 5c69dd09aa8728fe07c292a1347fe26c81c1ecff
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Mon Dec 28 19:12:58 2015 +0000

    Add dependency to flush appveyor cache (again)


>---------------------------------------------------------------

5c69dd09aa8728fe07c292a1347fe26c81c1ecff
 appveyor.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/appveyor.yml b/appveyor.yml
index 79b35ca..fe96cbd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -1,5 +1,5 @@
 cache:
-- "c:\\sr" # stack root, short paths == less problems
+- "c:\\sr -> appveyor.yml" # stack root, short paths == less problems
 
 build: off
 


From git at git.haskell.org  Mon Dec 28 20:43:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 20:43:56 +0000 (UTC)
Subject: [commit: ghc] master: Update filepath submodule to v1.4.1.0 rls tag
 (3aa4a45)
Message-ID: <20151228204356.6B3223A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3aa4a45e7af91b5062948e94aa1f8b35c783fcec/ghc

>---------------------------------------------------------------

commit 3aa4a45e7af91b5062948e94aa1f8b35c783fcec
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 21:41:28 2015 +0100

    Update filepath submodule to v1.4.1.0 rls tag
    
    This submodule update contains only changelog changes,
    hence [skip ci].
    
    /cc @ndmitchell


>---------------------------------------------------------------

3aa4a45e7af91b5062948e94aa1f8b35c783fcec
 libraries/filepath | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/filepath b/libraries/filepath
index a38cc73..f510e50 160000
--- a/libraries/filepath
+++ b/libraries/filepath
@@ -1 +1 @@
-Subproject commit a38cc733674497875ad76240c24a17ec1a0d568b
+Subproject commit f510e50feefe9995334769dd5e26c79edbe6fdc1


From git at git.haskell.org  Mon Dec 28 22:07:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 22:07:08 +0000 (UTC)
Subject: [commit: ghc] master: Update time submodule to latest snapshot
 (295085c)
Message-ID: <20151228220708.20C253A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/295085c3ad16a45f62e71936fe4aea34c708d2a5/ghc

>---------------------------------------------------------------

commit 295085c3ad16a45f62e71936fe4aea34c708d2a5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 22:51:43 2015 +0100

    Update time submodule to latest snapshot


>---------------------------------------------------------------

295085c3ad16a45f62e71936fe4aea34c708d2a5
 libraries/time | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/time b/libraries/time
index 409d7a0..a73564c 160000
--- a/libraries/time
+++ b/libraries/time
@@ -1 +1 @@
-Subproject commit 409d7a01659c2ac331017a6ece423485bc7aaf01
+Subproject commit a73564c366b15f7057b614188662d7b7a8eaab19


From git at git.haskell.org  Mon Dec 28 22:07:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Mon, 28 Dec 2015 22:07:10 +0000 (UTC)
Subject: [commit: ghc] master: Make git-committer inferred version-date
 TZ-invariant (bab5109)
Message-ID: <20151228220710.B70F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bab51097701aaf2d890196a351fd3614a66c79dd/ghc

>---------------------------------------------------------------

commit bab51097701aaf2d890196a351fd3614a66c79dd
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 22:55:24 2015 +0100

    Make git-committer inferred version-date TZ-invariant
    
    The existing code suffers from the issue of converting the
    committer date to localtime, thereby resulting in varying
    inferred dates for the same commit-hash depending on the currently
    set local timezone.
    
    In order to have a universally unique mapping between commit-hashes and
    their snapshot-version-date it's better to convert to the date expressed
    in a fixed timezone like e.g. UTC.
    
    Sadly, `git` doesn't seem to provide a way to directly format dates the
    way we need it, so we shell out to `perl` for this.
    
    Reviewers: austin, thomie, erikd, bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1711


>---------------------------------------------------------------

bab51097701aaf2d890196a351fd3614a66c79dd
 aclocal.m4 | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/aclocal.m4 b/aclocal.m4
index e823f34..8e97726 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1458,10 +1458,11 @@ if test "$RELEASE" = "NO"; then
         AC_MSG_RESULT(given $PACKAGE_VERSION)
     elif test -d .git; then
         changequote(, )dnl
-        ver_date=`git log -n 1 --date=short --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
+        ver_posixtime=`git log -1 --pretty=format:%ct`
+        ver_date=`perl -MPOSIX -e "print strftime('%Y%m%d', gmtime($ver_posixtime));"`
         if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
         changequote([, ])dnl
-                AC_MSG_ERROR([failed to detect version date: check that git is in your path])
+                AC_MSG_ERROR([failed to detect version date: check that git and perl are in your path])
         fi
         PACKAGE_VERSION=${PACKAGE_VERSION}.$ver_date
         AC_MSG_RESULT(inferred $PACKAGE_VERSION)


From git at git.haskell.org  Tue Dec 29 05:28:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 05:28:16 +0000 (UTC)
Subject: [commit: ghc] wip/rae: Fix #11305. (b78b5a6)
Message-ID: <20151229052816.D0C3C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/rae
Link       : http://ghc.haskell.org/trac/ghc/changeset/b78b5a6d1c60382736f5ecbeb3be5a57bb2bcd0e/ghc

>---------------------------------------------------------------

commit b78b5a6d1c60382736f5ecbeb3be5a57bb2bcd0e
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 29 00:27:59 2015 -0500

    Fix #11305.
    
    In the fallthrough case when doing a subsumption case, we
    need to deeply instantiate to remove any buried foralls in
    the "actual" type.


>---------------------------------------------------------------

b78b5a6d1c60382736f5ecbeb3be5a57bb2bcd0e
 compiler/typecheck/TcUnify.hs                      | 56 +++++++++++----------
 testsuite/tests/typecheck/should_compile/T11305.hs | 57 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 3 files changed, 89 insertions(+), 25 deletions(-)

diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index b7bc77d..e843811 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -630,7 +630,7 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                  do { traceTc "tcSubTypeDS_NC_O following filled act meta-tyvar:"
                         (ppr tv_a <+> text "-->" <+> ppr ty_a')
                     ; tc_sub_type_ds eq_orig inst_orig ctxt ty_a' ty_e }
-               Unfilled _   -> mkWpCastN <$> unify }
+               Unfilled _   -> unify }
 
 
     go ty_a (TyVarTy tv_e)
@@ -645,33 +645,14 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                Unfilled details
                  |  canUnifyWithPolyType dflags details
                     && isTouchableMetaTyVar tclvl tv_e  -- don't want skolems here
-                 -> mkWpCastN <$> unify
+                 -> unify
 
      -- We've avoided instantiating ty_actual just in case ty_expected is
      -- polymorphic. But we've now assiduously determined that it is *not*
      -- polymorphic. So instantiate away. This is needed for e.g. test
      -- typecheck/should_compile/T4284.
                  |  otherwise
-                 -> do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
-
-                           -- if we haven't recurred through an arrow, then
-                           -- the eq_orig will list ty_actual. In this case,
-                           -- we want to update the origin to reflect the
-                           -- instantiation. If we *have* recurred through
-                           -- an arrow, it's better not to update.
-                       ; let eq_orig' = case eq_orig of
-                               TypeEqOrigin { uo_actual   = orig_ty_actual
-                                            , uo_expected = orig_ty_expected
-                                            , uo_thing    = thing }
-                                 |  orig_ty_actual `tcEqType` ty_actual
-                                 -> TypeEqOrigin
-                                      { uo_actual = rho_a
-                                      , uo_expected = orig_ty_expected
-                                      , uo_thing    = thing }
-                               _ -> eq_orig
-
-                       ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
-                       ; return (mkWpCastN cow <.> wrap) } }
+                 -> inst_and_unify }
 
     go (ForAllTy (Anon act_arg) act_res) (ForAllTy (Anon exp_arg) exp_res)
       | not (isPredTy act_arg)
@@ -693,11 +674,36 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
            ; return (body_wrap <.> in_wrap) }
 
       | otherwise   -- Revert to unification
-      = do { cow <- unify
-           ; return (mkWpCastN cow) }
+      = inst_and_unify
+         -- It's still possible that ty_actual has nested foralls. Instantiate
+         -- these, as there's no way unification will succeed with them in.
+         -- See typecheck/should_compiler/T11350 for an example of when this
+         -- is important.
+
+    inst_and_unify = do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
+
+                           -- if we haven't recurred through an arrow, then
+                           -- the eq_orig will list ty_actual. In this case,
+                           -- we want to update the origin to reflect the
+                           -- instantiation. If we *have* recurred through
+                           -- an arrow, it's better not to update.
+                        ; let eq_orig' = case eq_orig of
+                                TypeEqOrigin { uo_actual   = orig_ty_actual
+                                             , uo_expected = orig_ty_expected
+                                             , uo_thing    = thing }
+                                  |  orig_ty_actual `tcEqType` ty_actual
+                                  -> TypeEqOrigin
+                                       { uo_actual = rho_a
+                                       , uo_expected = orig_ty_expected
+                                       , uo_thing    = thing }
+                                _ -> eq_orig
+
+                        ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
+                        ; return (mkWpCastN cow <.> wrap) }
+
 
      -- use versions without synonyms expanded
-    unify = uType eq_orig TypeLevel ty_actual ty_expected
+    unify = mkWpCastN <$> uType eq_orig TypeLevel ty_actual ty_expected
 
 -----------------
 -- needs both un-type-checked (for origins) and type-checked (for wrapping)
diff --git a/testsuite/tests/typecheck/should_compile/T11305.hs b/testsuite/tests/typecheck/should_compile/T11305.hs
new file mode 100644
index 0000000..14cb955
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T11305.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Data.Profunctor.Strong where
+
+import Control.Arrow
+import Control.Category
+import Data.Tuple
+import Prelude hiding (id,(.))
+
+infixr 0 :->
+type p :-> q = forall a b. p a b -> q a b
+
+class Profunctor p where
+  dimap :: (a -> b) -> (c -> d) -> p b c -> p a d
+
+class ProfunctorFunctor t where
+  promap    :: Profunctor p => (p :-> q) -> t p :-> t q
+
+class ProfunctorFunctor t => ProfunctorMonad t where
+  proreturn :: Profunctor p => p       :-> t p
+  projoin   :: Profunctor p => t (t p) :-> t p
+
+class ProfunctorFunctor t => ProfunctorComonad t where
+  proextract   :: Profunctor p => t p :-> p
+  produplicate :: Profunctor p => t p :-> t (t p)
+
+class Profunctor p => Strong p where
+  first' :: p a b  -> p (a, c) (b, c)
+  first' = dimap swap swap . second'
+
+  second' :: p a b -> p (c, a) (c, b)
+  second' = dimap swap swap . first'
+
+----------------------------------------------------------------------------
+
+newtype Tambara p a b = Tambara { runTambara :: forall c. p (a, c) (b, c) }
+
+instance Profunctor p => Profunctor (Tambara p) where
+  dimap f g (Tambara p) = Tambara $ dimap (first f) (first g) p
+
+instance ProfunctorFunctor Tambara where
+  promap f (Tambara p) = Tambara (f p)
+
+instance ProfunctorComonad Tambara where
+  proextract (Tambara p) = dimap (\a -> (a,())) fst p
+
+  produplicate (Tambara p) = Tambara (Tambara $ dimap hither yon p)
+    where
+      hither :: ((a, b), c) -> (a, (b, c))
+      hither ~(~(x,y),z) = (x,(y,z))
+
+      yon    :: (a, (b, c)) -> ((a, b), c)
+      yon    ~(x,~(y,z)) = ((x,y),z)
+
+instance Profunctor p => Strong (Tambara p) where
+  first' = runTambara . produplicate
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 20ef3a7..3fa1f8c 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -486,3 +486,4 @@ test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
 test('T11254', expect_broken(11254), compile, [''])
+test('T11305', normal, compile, [''])


From git at git.haskell.org  Tue Dec 29 05:28:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 05:28:29 +0000 (UTC)
Subject: [commit: ghc] wip/rae's head updated: Fix #11305. (b78b5a6)
Message-ID: <20151229052829.3A5B83A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/rae' now includes:

     18bf6d5 Bump version to 7.11
     41e1cf1 Revert "Bump version to 7.11"
     3879bdf Fix typo in GLASGOW_HASKELL_PATCHLEVEL2 macro
     8a02c5e Bump GHC version from 7.9 to 7.11
     22bb78b Expand notes in TcFlatten
     c72f61c Groom comments related to StaticPointers.
     1da2c0f fix spInfoSrcLoc field name
     e435a09 docs: create 7.12.1 relnotes
     6eb86a5 Fix panic on :kind _ in GHCi (Trac #9879)
     089222c Rename NamedWildcards flag to NamedWildCards
     30fdf86 dwarf: sync getIdFromTrivialExpr with exprIsTrivial (test break028 and others)
     9fc3aeb always use 'mkdir -p' and fix missing dir (fixes #9876)
     625dd7b Add a small comment
     a6f0f5a Eliminate so-called "silent superclass parameters"
     3e96d89 Add a couple of missing cases to isTcReflCo and isTcReflCo_maybe
     c407b5a Comments only
     679a661 A bit of refactoring to TcErrors
     c3394e0 Attempt to improve cleaning
     edd233a Test earlier for self-import (Trac #9032)
     7a2c9dd Fixup edd233acc19d269385 (T9032 test)
     878910e Make ghc -e not exit on valid import commands (#9905)
     cc510b4 Make ghc -e fail on invalid declarations
     3e3aa92 Fix linker interaction between Template Haskell and HPC (#9762)
     add6a30 2nd attempt to fix T9032 test-case
     9ae78b0 Copy GHC's config.guess/sub over libffi's versions
     1dcef98 Run T9762 only if dynamic libraries are available
     c0ab767 We do emit a warning for stdcall now.
     0899caa Use directory-style database for bootstrapping database
     bd01af9 Update hsc2hs submodule for de-tabbing
     c55fefc Avoid redundant-import warning (w/o CPP)
     6b9e958 Update hoopl and hpc submodules
     d6e7f5d Add export lists to some modules.
     1fefb59 Update parallel submodule to 3.2.0.6 release
     6c86635 Update validate-settings.mk
     0cc0cc8 Support pattern synonyms in GHCi (fixes #9900)
     58ac9c8 LlvmCodeGen cross-compiling fixes (#9895)
     40561cd Fix `heapSizeSuggesionAuto` typo (#9934)
     b32c227 Fix system linker on Mac OS X
     4e1e776 Skip T2276_ghci on Darwin, since stdcall is not supported.
     65e3e0b Test case for #9938
     9521a58 Refine test case for #9938
     8d62f92 Update nofib submodule, unbreak cryptarithm2
     a3d6eb7 Improve documentation of -XFlexibleInstances
     44b65fd Comments only (mainly about HsWithBndrs)
     a9dc427 Comments only, mainly on superclasses
     fd97d2a Eliminate the final two calls to xCtEvidence
     d8d0031 When solving one Given from another, use the depth to control which way round
     633814f Mark T9938 as not broken
     af4d998 Don't do a half-hearted recompilation check in compileOne
     2223e19 Fix #9243 so recompilation avoidance works with -fno-code
     d84742b Update Cabal submodule to latest 1.22 snapshot
     696f2cf submodule update: remove html dependency from nofib.
     d2b6e76 Make the location in TcLclEnv and CtLoc into a RealSrcSpan
     f17992a Updaete perf numbers for 32-bit machines
     00e1fc1 Modify a couple of error messages slightly
     8e2ed2c Replace fixVarSet with transCloVarSet
     28299d6 Always generalise a partial type signature
     d4f460f Use a less fragile method for defaulting
     da9b2ec Print singleton consraints without parens
     32973bf Major patch to add -fwarn-redundant-constraints
     39337a6 Remove redundant constraints in the compiler itself, found by -fwarn-redundant-constraints
     c409b6f Remove redundant constraints from libraries, discovered by -fwarn-redundant-constraints
     c790fe8 Test Trac #9939
     d57f507 Update haddock submodule, and fix haddock input file from genprimopcode
     b0f8cb8 Another fix to genprimopcode, when generating Prim.hs
     8efaff1 Make comments less beautiful in order to pacify Haddock
     228902a Fix undefined GHC.Real export with integer-simple
     5bc99df Fix stderr for T9939
     471891c Mark T9938 as expect_broken again
     da64ab5 Compress TypeMap TrieMap leaves with singleton constructor.
     197f4e5 Generalize TrieMap compression to GenMap.
     b14dae3 Fix out of date comment.
     2d15dc7 Improve documentation of -fwarn-redundant-constraints
     43e5a22 Spelling error in comment
     9564bb8 Improve HsBang
     8adc015 Bump haddock.base according to whats observed on ghcspeed
     6d32c93 Recenter T6048 performance numbers
     ccef014 Add 'DeBruijn' constructor, which generalizes "key modulo alpha-renaming."
     0bef02e Apply GenMap to CoreMap and CoercionMap.
     327ce1d Return a [HsImplBang] from dataConImplBangs even with NoDataConRep
     dfe62eb Make TcRnMonad.reportWarning call makeIntoWarning
     4425ab9 A little tidying up in ErrUtils
     68a5a78 Update syntax of pattern synonym type signature in documentation (fixes #9967)
     6f818e0 Pattern synonyms do work in GHCi now (see #9900)
     ee4ced4 Comments only
     3d44911 A little tidying up in the flattener
     678df4c Fix up test for T7861
     5830fc4 Pattern synonym names need to be in scope before renaming bindings (#9889)
     dd3e1dd Fix Trac #9973 (buglet in -fwarn-redundant-constraints)
     c4e1ccb Miscellaneous improvements to TrieMap, from D608 code review.
     90dee6e Inline all of the .*[TCE] methods, and then rename .*[TCE]X to vacated name.
     944329a Newtype CoreMap and TypeMap so their keys are user-friendly.
     4ec7fcc Update pretty submodule to 1.1.2.0 release
     c506f25 More comments on HsBang
     fe0d289 inplace: Don't add empty component to LD_LIBRARY_PATH when it is empty
     a5bc257 Move libffi configuration after basic toolchain setup
     8464fa2 Update Cabal submodule to latest 1.22.0.1 snapshot
     0234399 Event Manager: Make one-shot a per-registration property
     0fa4240 aclocal.m4: fix == bashism in FIND_LLVM_PROG
     07ace5c add -th-file which generates a th.hs file
     099b767 Package environments
     7637810 Trac #9878: Have StaticPointers support dynamic loading.
     c9532f8 Fix panics of PartialTypeSignatures combined with extensions
     36df098 Dwarf generation fixed pt 2
     2a103c7 Improve documentation for -N and -qa (#9890)
     24bbc3e Allow the linker to run concurrently with the GC
     adc542d Compile the RTS with -g by default
     cf8e669 Optimise scavenge_large_srt_bitmap
     0afa37a Correct typos in comments to mkDataCon
     6b0cf0e Tighten up constraint solve order for RULES
     e4cb837 Tiny refactoring (shorter, simpler code)
     7884132 Refactor handling of SPECIALISE pragmas (Trac #5821)
     c823b73 Test Trac #5821
     c71fb84 Add Eq, Ord, Show, and Read instances for Const
     fb7c311 Repsect the package name when checking for self-import
     854e7b8 Fix a terrible bug in the canonicaliser which led to an infinite loop
     6392df0 Don't hardcode the name "ghc" in versionedAppDir
     fffbf06 Trac #9878: Make the static form illegal in interpreted mode.
     11881ec API Annotations tweaks.
     2edb4a7 Trac #9384: fix increasing capabilites number for eventlog.
     3ea40e3 Fix the 'builder' code for pattern synonyms with type signatures
     9a14582 Add missing argument in Match, a merge bug (apologies)
     ff4733f Update bytestring submodule
     1289048 Fix bad '... \\' escape in ghcversion.h generation
     8e774ba Improve documentation of pattern synonyms, to reflect conclusion of Trac #9953
     4cfd235 Test Trac #9867
     e1a4581 Revert "Fix undefined GHC.Real export with integer-simple"
     f006ed7 Revert "Add export lists to some modules."
     d839493 Make AutoDeriveTypeable work for associated datatypes (fix #9999)
     55199a9 Split stripTicks into expression editing and tick collection
     8ce3871 Update directory submodule to latest 1.2.2 snapshot
     960e3c9 Add missing test from previous commit (55199a97)
     851ed72 API Annotations documentation update, parsing issue, add example test
     cb65bdb Doc fix (follow up to #9957)
     d3c08ca Tidy up fix to Trac #9999
     1f15951 Respect package visibility when deciding wired in packages.
     c77eecd Upgrade Cabal submodule to latest HEAD, change to package key calculation.
     c024af1 Expose source locations via Implicit Parameters of type GHC.Location.Location
     d82f592 CMM: add a mechanism to import C .data labels
     9894f6a comments only
     6108d95 Make the linker_unload test less fragile
     cf0e100 Cosmetic: Fix all uses of the word 'worker' when referring to pattern synonym builders
     387f1d1 32-bit performance wibbles
     3992a6e Test Trac #9975
     bec932e Some simplification and refactoring of FunDeps
     f3e6271 cmm lex: drop unused 'align' token
     bef8b79 compiler/parser/cutils: drop unused 'ghc_memcmp_off' helper
     ca15376 Update Backpack document with examples [skip ci]
     79b0d0e Restore invariant in `Data (Ratio a)` instance
     22c4d60 Revert "Restore invariant in `Data (Ratio a)` instance"
     027acf6 Merge branch 'master' of ssh://git.haskell.org/ghc
     8a29493 Update a few performance numbers
     ccbe2b8 Revert "32-bit performance wibbles"
     e675664 32-bit performance wibbles (second attempt)
     3df429e Restore invariant in `Data (Ratio a)` instance
     f2867dc Update binary submodule to 0.7.3.0 release
     34d68d8 Update Haddock submodule
     febee92 Revert "Update Haddock submodule"
     f44bbc8 Revert zipWith strictification (re #9949)
     b906370 RTS : Fix StgRun for aarch64-linux (#9935).
     0af1b73 Add cost semantics for STG profiling.
     cecf036 Fix #10031 by inverting a critical test in kick_out.
     cf3e340 update submodule
     276da79 Improve error message on typed holes, and user manual (Tradc #10040)
     07ee96f Use strict atomicModifyIORef' (added in GHC 7.6).
     92c9354 Fix #10017
     daed18c Fix a profiling bug
     78216e2 fix _FILE_OFFSET_BITS redefined warning on Solaris/i386 platform
     c88e112 Bring Match m_fun_id_infix through the renamer.
     d4f25cb GRHS with empty wherebinds gets wrong SrcSpan
     ae39c5c Add packageName to GHC.Generics.Datatype
     7cf87fc Eta-expand argument to foldr in mapM_ for []
     73f976c Make -ddump-splices output to stdout (fixes #8796)
     2f13cd8 Comments only
     da78af3 Comments only
     111e587 Put parens around (ty :: kind) when pretty-printing TH syntax
     dda6528 Fix the nullary-type-class case for associated types
     0f75a3f Test Trac #10041
     43636e1 Fix Trac #10004: head [] exception when using recursive mdo
     9bc13c0 Remove the *o pattern in testsuite/.gitignore
     a741e69 Provide default implementation of `Monad(return)`
     83efb98 Replace .lhs with .hs in compiler comments
     e22282e Remove deprecated libraries/base/include/Typeable.h
     de9a836 Clarify the documentation for 'evaluate'
     a1db53c Add a workaround to allow older cabal-install to use ghc-7.10
     d5a80db Add Uniquable instances for InstalledPackageId/SourcePackageId/PackageName
     5d5abdc llvmGen: move to LLVM 3.6 exclusively
     78833ca Don't overwrite input file by default
     f46360e Refactor the handling of quasi-quotes
     1e651b9 Comments only
     12698ff More comments and white space
     1e58ed8 Add a couple of tcTraces around reify
     1d982ba Do not complain about missing fields in Trac #10047
     3568bf3 Do not share T9878.hs between test T9878 and T9878b
     6ff3db9 nameIsLocalOrFrom should include interactive modules
     befe2d7 Fix #10079 by recurring after flattening exposes a TyConApp.
     d5cd94d Fix egregious typo in checkTauTvUpdate.
     849e25c Propagate ReturnTvs in matchExpectedFunTys
     b45309f Comments and white space; plus structurally avoiding the previously "egregious bug"
     6be91dd Tiny refactoring; no change in behaviour
     b96db75 Refactor decideQuantification
     7fdded4 Improve documentation of 'trace'
     36f2ad5 Comments only
     5ab7518 Improve typechecking of RULEs, to account for type wildcard holes
     6fa285d Move comments about evaluating the message to the top of the module
     49d99eb Fix typo in error message
     555eef1 Remove RAWCPP_FLAGS (Task #9094)
     310b636 Add missing va_end to va_start
     a82364c Don't truncate traceEvents to 512 bytes (#8309)
     e7fab33 Improve outdated ghc-pkg cache warning (#9606)
     08102b3 Delete vestigial external core code (#9402)
     1b82619 Add configurable verbosity level to hpc
     91d9530 Revert "Eta-expand argument to foldr in mapM_ for []"
     9caf71a Do not clobber CPPFLAGS nor LDFLAGS, fixes #10093
     6d17125 runghc: be explicit about ghc version (#9054)
     32d1a8a Cleanup ghc-pkg
     35d464b Typo in function name
     e9d72ce Fix #10045
     ef391f8 Comments only
     3f30912 fix T7600 run on bigendian platform
     10fab31 Don't report instance constraints with fundeps as redundant
     9c78d09 Add a bizarre corner-case to cgExpr (Trac #9964)
     f3e5c30 Comments only
     5f675e5 Comments only
     5094719 Comments only
     547c40a [ci skip] comment typo
     d4b6453 Unbreak travis by installing llvm-3.6
     1f60d63 {Data,Generic(1),MonadZip} instances for Identity
     b2be772 fix bus errors on SPARC caused by unalignment access to alloc_limit (fixes #10043)
     0fa2072 Error out on `Main` without `main` in GHCi (#7765)
     bbb57a6 Make top-level "configure" accept and propagate --with-curses-{includes,libraries} to libraries
     fd581a7 Fix for ticket #10078: ensure that tcPluginStop is called even in case of type errors
     30dc59e Always ignore user-package-db when running tests
     a0ef626 Declare some Makefile targets to be PHONY
     a293925 rts/linker: ignore unknown PE sections
     47175e0 Show '#' on unboxed literals
     9a1c8d9 docs: add INSTALL.md to root dir (#9926)
     c3f9eb4 docs: Flatten MAKEHELP/SUBMAKEHELP
     266fa70 base: fix broken link (#10088)
     9004f0d Fix build bogons due to missing separator
     4f467b2 base: Fix (**) implementation for Data.Complex
     a5a4c25 Provide a faster implementation for the Read Integer instance
     d1d02e8 testsuite: update .gitignore
     bb3b71a System.IO.Error: Fix a documentation link to Control.Exception.Exception
     26a85bd Comment typo
     aead019 driver: split -fwarn-unused-binds into 3 flags (fixes #17)
     5be8ed4 Emulate GMP 5+ operations for GMP 4.x compat
     00c971e Update submodule to Cabal 1.22.1.0 release
     7a3d7c0 Fix comments, and a little reformatting
     ea3b4cf Axe ModFinderCache, folding it into a generalized FinderCache.
     b7f7889 AllocationLimitExceeded should be a child of SomeAsyncException
     1def53f Update process submodule to 1.2.3.0 snapshot
     c5977c2 Extend the docs for Data.List.transpose
     7727371 Comments only
     9b3239f Improve comments on coreView/tcView, and combine coreExpandTyCon/tcExpandTyCon
     104c0ad Test Trac #10112
     52dfa61 Comments only
     cabe174 Two kind-polymorphism fixes (Trac #10122)
     d2e6a3b Improve documentation of infinite inlining bug
     5692643 Show record construction/update without parens
     6cdccb4 fix typos in coreSyn
     1dfab7a Fix detection of llvm-x.x
     ca478ac Fix typecheck tests (--slow)
     31d4f2e `make test` in root directory now runs fulltest
     efbd3eb Removed unused constrained which causes build to fail with -Werror
     3197018 Typos in non-code
     c3eee14 Improve if-then-else tree for cases on literal values
     5bdfb9b Small emitCmmSwitch/emitCmmLitSwitch refactoring
     1da3bbd Give full-precision time for BEGIN_SAMPLE/END_SAMPLE.
     f6609b0 Cite the TrieMap idea [skip-ci]
     5200bde Replaced SEH handles with VEH handlers which should work uniformly across x86 and x64
     89458eb Pretty-print # on unboxed literals in core
     4e6bcc2 Add various instances to newtypes in Data.Monoid
     a0cea7b Don't use deriveUnique *twice* in flattenTys.
     6e77d45 Clarify some comments in Packages.hs [skip-ci]
     e673b84 Fix -Werror build failure in RtsMain
     ee56dc5 Tidy up and improve comments about one-shot info
     d058bc9 Some minor refactoring in TcHsType
     f66e0e6 A raft of small changes associated with -XConstrainedClassMethods
     ef2c7a7 Comments only
     3aa2519 Check for equality before deferring
     9dc0d63 Three other test updates following the fix to Trac #7854
     e73c0de travis: Get libstdc++ from a more sensible location
     8a5d320 Remove unused/undocumented flag `-fhpc-no-auto`
     56e0ac9 Add public rnf/hash operations to TypeRep/TyCon
     44b6bbd libraries: update deepseq submodule
     b833bc2 User manual section to document the principles of kind inference
     7b486a6 testsuite: accept updated output
     48f32a8 Typos in docs [ci skip]
     41df51d Update shift/reduce commentary in Parser.y
     91c11fe testsuite: format commands using config dict
     1965202 Drop redundant LANGUAGE pragmas
     eb3661f Re-export `<$>` from Prelude (#10113)
     479523f Re-export `<$` from Prelude (#10113)
     b359c88 Custom `Typeable` solver, that keeps track of kinds.
     34ba68c Add missed test (uuugh)
     504d8a4 Don't assume tools are in same directory as ghc in some cases
     76b1e11 Improve core linter so it catches unsafeCoerce problems (T9122)
     0fcc454 Dynamically link all loaded packages in new object
     e642de6 build: fix 'make help'
     68d4f47 Store renamings as (ModuleName, ModuleName) pairs.
     47b5b5c base: drop redundant Typeable derivings
     7a2d65a Define proper `MINIMAL` pragma for `class Ix`
     e76f866 Add `GHC.OldList` legacy module
     8b7534b Update process submodule
     2aef320 hsc2hs: update submodule
     c439af5 Refactor Digraph to use Data.Graph when possible
     d01844f Remove obsolete comment in cmmOffset
     f9344f3 Fix `ghc --make -fhpc` with imported lhs modules
     fe3cf4d Revert "Refactor Digraph to use Data.Graph when possible"
     6188d0a Refactor Digraph to use Data.Graph when possible
     74625d6 RTS/IOManager: fix trac issue #9722.
     c4ac3c9 Merge branch 'master' of git://git.haskell.org/ghc
     c1db477 Changes to Safe Haskell documentation from feedback (#10140).
     19440ae ghc-prim : Hide 64 bit primops when the word size is 32 bits (fixes #9886).
     fdb7283 Update submodule to Cabal 1.22.1.1 release
     0281c98 Update array submodule (min ver bump to 0.5.1.0)
     d2a5ea1 Sync up terminfo/haskeline submodule with ghc-7.10
     b03479d Update directory submodule to latest 1.2.2 snapshot
     8a91079 Documentation for PackageArg/ModRenaming/PackageFlag
     8cbd7f5 Refactor testsuite with normalise_version()
     838d804 Update Cabal submodule to latest 1.22 snapshot
     5f356f3 Update filepath submodule to filepath-1.4 snapshot
     842028b Rename ty{Con,peRep}Hash to ty{Con,peRep}Fingerprint
     5258566 Cleanup test framework string formatting
     41e8400 Update submodule hpc (includes fix for #9619)
     ec67f81 testsuite: use same flags for ghci way and scripts
     71fcc4c Use the gold linker for linux/ARM and android/ARM targets.
     cc07a0b Move the function strip_quotes to testutil.py
     1b7f597 Link temporary shared objects with `--no-as-needed`
     11314b9 We need to import 'cast' on Windows
     cbc7103 Update Haddock submodule
     14b78eb Update Cabal submodule to latest 1.22.1.2 snapshot
     e935a7f libraries/win32: update submodule
     817d2c3 Test Trac #10156
     beee618 Fix testsuite driver for a profiling compiler
     5166ee9 Dont call unsafeGlobalDynFlags if it is not set
     83afcd1 Fix build on amd64/solaris.
     9987c66 Fix Windows testsuite driver
     9c9e973 Refactor the extra-deps stuff for hs-boot
     cf6c307 Comments, white space, and small refactoring
     dbd9299 Move declaration of Rulebase from Rules to CoreSyn
     3f3782d Add more MonadZip instances
     ac14af3 Add release note entry for D716
     86eff3d Expose listPackageConfigMap
     801f4b9 hpc: use System.FilePath.(</>) instead of (++)
     6f40060 Typos in comments
     fad7bb0 Comments only
     3508b68 Remove mention of `-unreg` in error message
     6b3a7f4 Update filepath/hpc/process submodules
     c4aa959 Update Cabal submodule to 1.22 branch tip
     9d81980 Remove comments and flag for GranSim
     c718bd8 Refactor Linker.hs: use System.Directory.findFile
     d832b6b Refactor: follow hlint suggestions in Linker.hs
     3a0019e Improve `Typeable` solver.
     48ba1e5 win32/base: Remove redundant import
     2ff68c3 libraries: update win32 submodule
     a07ff3b Merge branch 'master' of git://git.haskell.org/ghc
     75ef8b3 Remove unused parameter to `EvTypeableTyCon`
     e02ef0e testsuite: add a regression test for #10011
     c2833d6 Update deepseq submodule to 1.4.1.1 tag
     76f385b Modify test th/T10019 to wobble less
     9dfdd16 Bump ghc-prim to 0.4.0.0
     6da18b8 Try to reconstruct a changelog for TH 2.10
     c746f01 Update bytestring submodule to 0.10.6.0 release tag
     d9e0e16 Update Cabal submodule to Cabal-v1.22.2.0 rls tag
     1cc46b1 Correct documentation in `Parser`.
     854fd12 testsuite: add test for #10177
     899cb3e Update haskeline submodule to 0.7.2.1 release tag
     5449b25 Clarify meaning of the RTS `taskCount` variable
     29f7c10 New lint check: exprIsHNF = True and alts = [] is bogus
     5119e09 Test case for #10176
     b4efac5 Trim Call Arity
     e25ad04 docs: make gen_contents_index --verbose more verbose
     12a03c4 fix bus error (misaligned data access) on SPARC in __decodeDouble_Int64
     a20cc3d rts: check arguments to flags that don't have any
     5ef5a18 Update integer-gmp2's changelog for release
     cab5b3a Fix integer-gmp source tarball distribution
     992040e Minor fix to Note [Trimming arity]
     f72074e Fix quasiquotation test (#4150)
     7035ff8 Minor bump `base` version to 4.8.1.0
     1a72886 Update base changelog regarding 4.8.1 changes
     0f03a84 Make testsuite driver Python 2.6 compatible again
     c1edbdf Do proper depth checking in the flattener to avoid looping.
     5673bfc exprIsBottom should look through type lambdas
     a0678f1 New Lint check: no alternatives implies bottoming expression
     567db32 New lint check: Check idArity invariants (#10181)
     8f08069 Add Note [No alternatives lint check]
     aef4de4 isEmptyTy: Improve comment
     42448e3 Do version specific detection of LLVM tools (#10170).
     fd17651 Fix bug in hs-libraries field munging.
     7062ebe exprIsBottom: Make use of isEmptyTy (#10186)
     9cdd2e6 Empty alternative lint check: Explain why there are two checks
     484d2b1 Delete DynFlag for NDP way
     6cf0c79 Some stress tests for the empty case linter
     8eaa70a Improve environment handling in TcBinds
     33cfa5f More comments (related to Trac #10180)
     9db005a Add Monad instance for `((,) a)` (#10190)
     5aa57d0 Fix Git-commit-id detection for RELEASE=YES
     90dd11b Remove some unimplemented GranSim primops
     af45feb Update list of primops that don't get wrappers (#10191)
     abde5da Rename driver phases C(obj)cpp to C(obj)cplusplus
     e2f1ffc Rename C(obj)cplusplus to C(obj)cxx
     a4656eb Doc typofix.
     e24f638 Renames some files to help with validation cleanup (#10212)
     de1160b Refactor the story around switches (#10137)
     c37ee4a Remove an unused include that doesn't exist on OS X (#10211)
     b1d6a60 Delete unused field `PipeEnv.pe_isHaskellishFile`
     5971ad5 Syntax check package-qualified imports (#9225)
     1f69f37 Add `integer-gmp` specific hint to build.mk.sample
     995e8c1 Drop old integer-gmp-0.5 from GHC source tree
     a3d0a7a Testsuite: suppress errors when running GS on bad.ps
     9e073ce Explicitly check for -C on registerised build (#7563)
     6981862 Don't throw exception when start_phase==stop_phase (#10219)
     da17f99 Don't treat .hcr and .raw_s as haskellish suffixes
     8757e2d Testsuite: redirect stderr to /dev/null when running GS on bad.ps
     694c4d5 uBackpack: simplified Backpack description.
     d4cf705 Don't `make accept` output of expect_broken tests
     7cec6c7 Change which files --make thinks are 'Haskellish' (#10220)
     3749c05 Reformat build flavours in build.mk.sample (#10223)
     43351ff Filter out `-Rghc-timing` for V=0 builds (#10223)
     f15dbc2 Indentation only.
     0721e55 Fake (->) fixity declaration (#10145)
     9b66a7f Do not set -fasm explicitly in build.mk.sample (#10223)
     4c1e1c8 Disable same warnings for normal builds as for validate (#10223)
     afcfb62 Change 'Tab character' warnings so there is one per file (#9723)
     47f821a libffi: backport noexecstack fix for x86/win32.S
     48977c8 Fix validate linenumber off-by-one
     13a0d5a clarify --no-as-needed is only needed on ELF
     78c79e3 docs: remove unused -ddump flags from users guide
     59f7a7b Restore unwind information generation
     012ea0b parser: allow type-level cons in prefix position
     3541f73 Data.Complex: Derive Generic
     2255c76 Remove an incorrect statement about -fwarn-tabs
     fd1099c Don't `make accept` output of `expect_broken_for` tests
     ab0743f Comments only, mostly typos
     a0c1c96 testsuite: fix failing amd64/Windows perf tests
     54b7dc5 rts/linker: make an error msg a debug msg
     b0ba054 testsuite: skip T10017 on Windows
     89eef44 Whitespace only
     a1404e8 Update hsc2hs submodule
     a838d1f CmmSwitch: Do not trip over a case with no (valid) branches
     8f07092 Test case for #10246
     fef4948 User's guide: .a files can be 2-2.5x larger with -split-objs
     c81e070 Stop profiling output from running together (#8811)
     22eecaf fix '&stg_interp_constr_entry' FFI type to be FunPtr
     7209290 fix typo
     a7ab161 Replace hooks by callbacks in RtsConfig (#8785)
     890461e Add +RTS -O<size> to control the minimum old gen size
     93f3a64 Add -n to the RTS help output
     f745b6e Typechecker: refactoring only
     0622970 testdriver: delete unused ways
     b972de0 Suggest how to fix .ghci when it is group writeable (#8248)
     9f0f99f Fix a long-standing bug in the demand analyser
     547c597 Reduce module qualifiers in pretty-printing
     c897613 Error msg wibbles from reduced module prefixes
     74d2c33 GHC.Prim.Constraint is not built-in syntax
     cfb6042 Do not quantify over the function itself in a RULE
     6ca7b84 Put quotes round a Name in an error message
     8b7ceec More aggressive Given/Wanted overlap check
     553c518 Look inside synonyms for foralls when unifying
     4f8e348 Replace endian test by 64-bit word access in T7600
     ab76b09 rts/Linker.c: distinct between DATA and CODE labels when importing
     cf1d975 Don't repeat package key with -dppr-debug when package info is missing.
     f1a4e42 The production for `pquals` is incorrect; the specifics are in D803.
     cf19640 The production for squals is incorrect; see D806 for specifics.
     eacda92 Test Trac #10148
     e6e0415 More error message wibbles
     a058ad6 Final error message wibble
     a7524ea Support for multiple signature files in scope.
     9e7802f Commit missing T10148 files and ignore the built executable.
     1d5c887 Axe one-shot sig-of
     3c6448c Ignore temporary ./configure files.
     53cc9af Test Trac #8030
     6b96eeb Fixes a compiler error with -DDEBUG (#10265)
     f536d89 Import rand using capi
     2d68aa6 Comments about AnyK
     d9b0be3 Comments in rejigConRes
     702fc77 Comments only
     fa46c59 Make the evidence in a CtGiven into an EvId
     9d16808 Typos in error messages and in comments
     485dba8 configure : LLVM and LD detections improvements (#10234).
     edc059a Fix autoconf's check for create_timer()
     a5745d2 Derive Generic instance for System.Exit.ExitCode
     c327393 Derive Generic instance for Data.Version.Version
     6109b31 use projectVersion from DynFlags rather than cProjectVersion for versionedAppDir
     8aefc9b parser: opt_kind_sig has incorrect SrcSpan
     9eab6fe parser: API Annotations : guardquals1 does not annotate commas properly
     919b511 parser : the API annotation on opt_sig is being discarded
     d261d4c Zap usage info in CSE (Trac #10218)
     25f2d68 Comments only
     a2ce3af Comments and white space only
     7febc2b Add "error:" prefix to error-messages
     79bfe27 Remove LlvmCodeGen panic variants.
     8dc2944 API Annotations : ExprWithTySig processing discards annotated spans
     5fded20 ApiAnnotations : lexer discards comment close in nested comment
     6dd2765 Implement -f[no-]print-unicode-syntax flag for unicode syntax output (#8959)
     7b042d5 Do not allow Typeable on constraints (Trac #9858)
     49d9b00 Fix fundep coverage-condition check for poly-kinds
     a9ca67f Improve Call Arity performance
     9654a7c Call Arity: Trade precision for performance in large mutually recursive groups
     1fb4dd3 Add exception for `KnownNat` and `KnownSymbol` in super classes.
     d8d541d Fixes (hopefully!) T9858
     e68e8ca Fix test output.
     ea579d9 Fix test output
     3b90d8c Rename tests so that they have a unique name.
     51af102 Better hints when RTS options not available (Trac #9579)
     2483644 Documentation for rnImports/rnImportDecl.
     2b3766b Comments only.
     ad6d6a7 Stub out pkgState with non-error, helps with debugging.
     619a324 Make T9579 parallel-safe and add build outputs to .gitignore
     88b8406 Test case for indirect dependencies in ghci linker (#10322)
     4bc925a Update Cabal submodule to 1.22.3.0 release
     d5773a4 Teach DmdAnal that coercions are value arguments!
     3bec1ac Teach DmdAnal about free coercion variables
     d12c7cb Spelling in comment
     f2d1b7f Support unboxing for GADT product types
     5c7e4db Wibble to DmdAnal
     b9f20bd GADTs now are CPR-able
     1e8c9b8 Enable SMP and GHCi support for Aarch64
     0bbc2ac Use the gold linker for aarch64/linux (#9673)
     3b932cc Add a blank line
     9b9fc4c Fix the boot dfun impedence-matching binding
     c0b5adb Do not decompose => (Trac #9858)
     1bb1ff2 Mark T8743 as passing
     1bd1cef Don't use self {-# SOURCE #-} import in test-cases.
     a2f9fef Fix #10182 by disallowing/avoiding self {-# SOURCE #-} imports
     646866f Fix superclass generation in an instance
     9d3bd3d Comments only
     c715166 Improve error reporting for impredicative types
     746f086 Better documetation of higher rank types
     932f086 Test Trac #9858 comment:101
     43d7137 Rename new T9858c to T9858d to avoid test name clash
     a55bfab Rename new T9858d to T9858e to avoid test name clash
     524ddbd Make sure GHC.List.last is memory-efficient
     6ab5da9 Rename role annotations w.r.t only local decls.
     a8d39a7 Fix #10285 by refusing to use NthCo on a newtype.
     414e20b Fix the formal operational semantics (#10121)
     d4cf559 Test #10321 in ghci/scripts/T10321
     dc587fe Test case for #10141
     72a9272 Change default roles in hs-boot files. (#9204)
     bbabb71 Updates to Backpack documentation based on recent visit to MSRC.
     c4e8097 Bump base version to 4.8.2.0
     75adc35 Add missing since-annotations for c024af131b9e2538
     9a0c179 base: Export GHC.Event(.Internal).Lifetime
     5f127fc Flesh out some more Backpack examples in the merging section.
     d0898ca Backpack docs: explain alternate merging scheme.
     541aa7f Full type checking Backpack details.
     21a37ca Backpack docs: merge backpack-shaping into algorithm, sigs no longer provide
     b61562f Seed SpecConstr from local calls
     168c883 A little outright bug in canEqTyVar2
     d9bb0ee Don't print evidence in TcFlatten
     a1275a7 Improve improvement in the constraint solver
     d4a926b Test Trac #10226
     54cefbd Typeset Backpack syntax in a figure
     b83160d Tidy up treatment of FlexibleContexts
     a3f7517 Typo fixes (mostly in comments)
     fe5ccbb Typeset Backpack semantic entities in figure, figure-ify all asides.
     bbfa0ca Comments only
     f6ab0f2 Refactor TyCon to eliminate TupleTyCon
     0d715db Update haddock submodule to track TyCon change
     b626cb0 Make Derived NomEq rewrite only Derived NomEq
     de5d022 Kill off the default types in ghc-prim
     2f6a0ac Move IP, Symbol, Nat to ghc-prim
     4efa421 Permit empty closed type families
     63a10bb arm: Force non-executable stack (#10369)
     f7dfcef Fix safeHaskell test for llvm backend
     bf4f3e6 Give a hint when a TH splice has a bad package key, partially fixes #10279
     cdba973 Documentation for Language.Haskell.TH.Quote.
     1a4374c arm: Force non-executable stack (part 2)
     341a766 Doc: checkCrossStageLifting, RnSplice/TcExpr is untyped/typed brackets (#10384)
     f7daf5a Normalise type families in the type of an expression
     458a97b Fix typo: identifer -> identifier
     03c4893 Retain ic_monad and ic_int_print from external packages after load
     477f514 rts: add "-no-rtsopts-suggestions" option
     fa0474d base: Fix confusing docs typo
     fb54b2c API Annotations : add Locations in hsSyn were layout occurs
     caeae1a Correct parsing of lifted empty list constructor
     15aafc7 ApiAnnotations : quoted type variables missing leading quote
     81030ed ApiAnnotations : Nested forall loses forall annotation
     f34c072 Revert "ApiAnnotations : Nested forall loses forall annotation"
     97d320f Revert "API Annotations : add Locations in hsSyn were layout occurs"
     d1295da Comments only
     931d014 A bit of refactoring RnSplice
     c3e6b3a Regression test for Trac #10390
     5bde9f7 ApiAnnotations : RdrHsSyn.isFunLhs discards parentheses
     cc9b788 Backpack docs: meditate on AvailTC with four examples.
     225df19 ApiAnnotations : AnnComma missing in TupleSection
     7136126 ApiAnnotations: misplaced AnnComma for squals production
     2601a43 Backpack docs: AvailInfo plan, and why selectors are hard.
     28257ca Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382.
     21c72e7 Split off quotes/ from th/ for tests that can be done on stage1 compiler.
     eb0ed40 RnSplice's staging test should be applied for quotes in stage1.
     9a43b2c Always do polymorphic typed quote check, c.f. #10384
     3c70ae0 Quick fix: drop base bound on template-haskell.
     5c459ee Revert stage 1 template-haskell. This is a combination of 5 commits.
     811b72a Api Annotations: RdrHsSyn.mkAtDefault causes annotations to be disconnected.
     e4032b1 ApiAnnotations : mkGadtDecl discards annotations for HsFunTy
     27aa733 IdInfo comment update
     2666ba3 haddock: update submodule to fix #10206
     cf7573b More accurate allocation stats for :set +s
     9736c04 compiler: make sure we reject -O + HscInterpreted
     24707d7 ApiAnnotations : BooleanFormula construction discards original
     f35d621 Fix build breakage from 9736c042
     fe38195 ApiAnnotations : pquals production adds AnnVbar in the wrong place
     ecc3d6b ApiAnnotations : PatBind gives wrong SrcSpan for the pattern.
     f16ddce Support stage 1 Template Haskell (non-quasi) quotes, fixes #10382.
     b0784cc Backpack docs: more carefully describe unification versus unioning.
     b4f6c16 Ignore out and toc files.
     53409a7 Backpack docs: proper discourse on ModIface and ModDetails.
     eecef17 Fix safe haskell bug: instances in safe-inferred
     4fffbc3 New handling of overlapping inst in Safe Haskell
     ef7ed16 Make template-haskell build with GHC 7.6, fixes bootstrap build.
     c119a80 Use fmap instead of <$> (Fixes #10407)
     ca7c855 We need an empty boolFormula.stderr
     f5188f3 Fix weird behavior of -ignore-dot-ghci and -ghci-scipt
     6ee4b6f Turn off warnings when compiling boolFormula
     1b47692 Backpack docs: Consistently italicize metavariables.
     4432863 Update some tests for recent Safe Haskell change.
     a171cc1 Update Safe Haskell documentation.
     4b8b4ce Fix fragile T9579 tests
     8764a7e Revert D727
     8da785d Delete commented-out line
     130e93a Refactor tuple constraints
     5910a1b Change in capitalisation of error msg
     a154944 Two wibbles to fix the build
     a8493e0 Fix imports in HscMain (stage2)
     6e1174d Separate transCloVarSet from fixVarSet
     51cbad1 Update haddock submodule
     ca173aa Add a case to checkValidTyCon
     eb6ca85 Make the "matchable-given" check happen first
     c0aae6f Test Trac #10248
     a9ccd37 Test Trac #10403
     04a484e Test Trac #10359
     3cf8ecd Revert multiple commits
     3ef7fce Do not check dir perms when .ghci doesn't exist
     5972037 Backpack docs: Rewrite type checking section to have a more concrete plan.
     ab45de1 Failing test for #10420 using plugins.
     c256357 Speed up elimCommonBlocks by grouping blocks also by outgoing labels
     8e4dc8f Greatly speed up nativeCodeGen/seqBlocks
     73f836f CmmCommonBlockElim: Improve hash function
     3f42de5 Test Trac #10359
     f1f265d Test Trac #10403
     fa0bdd3 Test Trac #10248
     76024fd Delete commented-out line
     ffc2150 Refactor tuple constraints
     228ddb9 Make the "matchable-given" check happen first
     eaaa38b includes/stg/SMP.h: implement simple load_/store_load_barrier on armv6 and older
     85bf9e4 Add regression test for #10110.
     5cbac88 user guide: correct documentation for -Wall (fixes #10386)
     578d2ba Remove unneeded compatibility with LLVM < 3.6
     b03f074 ghci: Allow :back and :forward to take counts
     b0b11ad In ghci linker, link against all previous temp sos (#10322)
     b199536 compiler: make sure we reject -O + HscInterpreted
     470a949 Revert "In ghci linker, link against all previous temp sos (#10322)"
     753b156 Add a TODO FIXME w.r.t. D894
     fc8c5e7 Test Trac #8799, #8555
     edb8dc5 Revert "compiler: make sure we reject -O + HscInterpreted" (again)
     25d1a71 Fix error messages from open(Binary)TempFileWithDefaultPermissions
     c934914 Backpack docs: Clarifications from today's Skype call.
     9f968e9 Fix binary instance for IfaceLitTy
     c553e98 ApiAnnotations : AST version of nested forall loses forall annotation
     0df14b5 ApiAnnotations : parens around a context with wildcard loses annotations
     c488da8 ApiAnnotatons : AnnDcolon in wrong place for PatBind
     369dd0c White space layout only
     eae703a Reduce magic for seqId
     c89bd68 Fix quadratic behaviour in tidyOccName
     45d9a15 Fix a huge space leak in the mighty Simplifier
     7d519da testsuite: commit missing T4945 stdout
     4d6c0ee compiler: kill a stray pprTrace in OccName
     6694ccf testsuite: handle missing stats files gracefully (#10305)
     c00f051 Update .mailmap
     c04571d rts: Fix typo in comment
     326989e Add missing name for FFI import (fixes #9950)
     70f1ca4 Fix ghci-way tests of -XStaticPointers.
     71d1f01 Omit the static form error for variables not in scope.
     388448b Build system: don't install haddock .t files (#10410)
     c591147 ApiAnnotations tweaks
     ef90466 Testdriver: don't use os.popen in config/ghc
     ce166a3 Testdriver: do not interfer with MinGW path magic (#10449)
     640fe14 Remove unnecessary loadInterface for TH quoted name.
     e28462d base: fix #10298 & #7695
     b0d8ba3 Add liftData function.
     a138fa1 Testsuite: accept new output for T2507 and T8959a
     5ead7d1 Build system: make more targets PHONY
     4c7d177 Build system: remove toplevel target `fast`
     a065a3a Build system: use `mkdir -p` instead of `-mkdir`
     51aacde Build system: allow missing config.mk for target clean_%
     4de8028 Build system: check $CLEANING instead of $MAKECMDGOALS
     47e00ec Build system: don't set CLEANING=NO
     b0885e4 Build system: whitespace and comments only
     cd0e2f5 Build system: prevent "--version: Command not found"
     0bfd05e Build system: prevent "./Setup: Command not found"
     a49070e Build system: time's config files have moved
     48ed2f1 Build system: always allow me to clean haddock
     577d315 Build system: always use `make -r`
     0d20d76 Build system: make clean in utils/ghc-pkg should not delete inplace/lib/bin
     0a159e3 Build system: don't use supposedly local variable inside macro
     018fec0 Build system: also clean the inplace wrapper
     508a3a3 Build system: don't build runghc if GhcWithInterpreter=NO (#10261)
     7db2dec linker_unload working on Windows, fixes #8292.
     5a65da4 Don't run T9330fail on Windows, no clobber occurs. #9930
     94fff17 Travis: use validate --quiet to prevent hitting log file limits
     4756438 Catch canonicalizePath exceptions, fix #10101
     a52f144 In ghci linker, link against all previous temp sos (#10322)
     f5b43ce compiler/specialise: shut match_co up a bit
     f6ca695 rts: Fix aarch64 implementation of xchg
     e00910b ApiAnnotations : rationalise tests
     7dd0ea7 Update binary submodule to 0.7.5.0 release
     e6191d1 ApiAnnotations : strings in warnings do not return SourceText
     e8a7254 Add constraint creation functions to TcPluginM API
     1c38325 Fix dropped event registrations
     928f536 Use seq rather than (==) to force the size
     5eee6a1 Move seqExpr, seqIdInfo etc to CoreUtils
     20d8621 Add some missing seqs to Coercion.seqCo
     d245787 Use named fields in SimplCont.Select constructor
     403cfc9 Comments only
     931268a Replace tabs with spaces.
     98b0b2e Add information about allowed foreign prim args, see #10460.
     e5be846 Typofix: missing period. (#10460)
     a27fb46 Add (failing) test case for #7672.
     f82e866 Newline after type of allocate().
     dfdc50d Don't call DEAD_WEAK finalizer again on shutdown (#7170)
     34dcf8a Re-center perf numbers for T5631
     2f0011a White space only
     11d8f84 Treat pattern-synonym binders more consistently
     9b73cb1 Refactor the GlobalRdrEnv, fixing #7672
     90fde52 Mark sigof02 tests as expect_broken
     1189196 Re-do superclass solving (again); fixes #10423
     b095c97 Improve constraint tuples (Trac #10451)
     dbcdfe2 Set 32-bit perf figure
     d6c01fa Remove redundant import
     b1b2b44 Test Trac #10423
     8a38348 Test Trac #10451
     8e5f8cf Test Trac #10466
     b2b69b2 Test Trac #10438
     091944e compiler: make sure we reject -O + HscInterpreted
     e796026 build: make haddock a bit less chatty
     3758050 Improve FFI error reporting
     5688053 Detabify a programlisting in the User's Guide (#10425)
     942a074 testsuite: mark test T9938 (#9938) as passing again
     7a82b77 newTempName: Do not include pid in basename
     2c4c627 Typofixes
     6adfb88 Suggest -H to improve GC productivity, fixes #10474.
     7b6800c Remove outdated uBackpack docs.
     7ea156a Refactor RdrName.Provenance, to fix #7672
     cd9c5c6 Allow Any return in foreign prim, fixes #10460.
     08558a3 Move liftData and use it as a default definition for Lift.
     942cfa4 typo: 'Ture' / 'True'
     21d7c85 Travis: Send notifications to author and commiter
     c69b69d ghc-pkg support query by package-key, fixes #9507
     d8f66f1 Re-center perf numbers for haddock.compiler
     75c6e06 Build: make configure and ghc-pkg a bit less chatty
     14652b5 ghc-cabal: don't warn about missing cabal fields
     092082e Build: ./boot && ./configure && make sdist (#8723)
     cac68d0 Build: remove unnecessary CLEANING/=YES check
     5dd0286 Build: remove more unnecessary CLEANING/=YES checks
     d0063e8 Make validate more quiet
     e340f6e Testsuite: add/fix cleanup for certain tests
     07feab1 Testsuite: ignore `stdcall attribute ignored` (#1288)
     0686d76 Testsuite: don't show compile/link info for some tests
     7beb477 Travis: allow user forks
     761fb7c Fix #10488 by unwrapping type synonyms.
     53c1374 Minor code cleanup
     61b96a8 Fix #10489
     dcaaa98 docs: Fix #10416
     ae83a81 Testsuite: only show output diff when test is expected to pass
     328c212 Fix the sdist build
     89223ce Fix the build when SplitObjs=YES
     19ec6a8 Fix for CAF retention when dynamically loading & unloading code
     7944a68 Revert "docs: Fix #10416"
     058af6c Refactor wild card renaming
     a48167e build: Clean testsuite before sdist
     3b55659 Always force the exception in enqueued commands
     bb99671 Revert "The test runner now also works under the msys-native Python."
     43ebe24 Testsuite: delete expect_fail setups for hugs
     3445947 Testsuite: delete expect_fail setups for ghc < 7.1
     4a0b7a1 Build: run autoreconf jobs in parallel
     5828457 make sdist: distclean testsuite for real (#10406)
     ca39b96 docs: Fix #10416
     ddbb97d Another major improvement of "improvement"
     c0dc79f IndTypesPerfMerge no longer seems to requre -M20M
     a66ef35 Fix DWARF generation for MinGW (#10468)
     c1dc421 Update submodule process to master
     da84fd5 Testsuite Windows: fix T8172 (#8172)
     a765f72 Testsuite: mark tests as expect_broken on win64
     506522c Testsuite: mark T4945 as expect_broken (#4945)
     6cefeb3 Testsuite: mention the existence of ticket #10510
     5e66a69 Testsuite: change some expect_fail tests to expect_broken
     a4318c6 Travis: use apt-get -q
     0db0ac4 Removes all occurrences of __MINGW32__ (#10485)
     23582b0 Add failing test for #9562.
     28e04de Remove redundant tcg_visible_orphan_mods, it is recorded in imp_orphs.
     bac927b Revert "Support for multiple signature files in scope."
     c60704f Revert "Change loadSrcInterface to return a list of ModIface"
     ce53138 Delete _MSC_VER when not necessary, fix #10511
     016bbfd docs: Fix unicode alternatives table (fixes #10509).
     0ef7174 Squash typos in comments
     c14bd01 Testsuite: fix the little known CHECK_FILES_WRITTEN=1
     d20031d Add parseExpr and compileParsedExpr and use them in GHC API and GHCi
     892c3e9 Do not copy stack after stack overflow, refix #8435
     dd5cac7 Fix typo in `traceShowM` haddock comment (#10392)
     0a086c8 Docs: it's `gv --orientation=seascape` nowadays (#10497)
     b07dccc Docs: `-XTypeOperators` (#10175)
     e02a4f2 Add versioning section to Backpack docs.
     5ddd904 Testsuite: diff non-whitespace normalised output (#10152)
     6e542a6 Testsuite: add function compile_timeout_multiplier (#10345)
     a508455 UNREG: fix pprHexVal to emit zeros (#10518)
     1cf7fc0 add type annotations to SrcLoc functions
     dd3080f Increase constraint tuple limit to 62 (Trac #10451)
     a607011 Test Trac #10348
     77e5ec8 Demonstrate that inferring Typeable for type literals works
     efa136f Remove derived CFunEqCans after solving givens
     a3f6239 GHCi: fix scoping for record selectors
     a6cbf41 Spelling in comments
     855f56b Improved peak_megabytes_allocated
     2613271 Testsuite: fix framework failure
     89c7168 Fix #10534
     df63736 ghc.mk: Update instances of -auto-all
     1ff7f09 Lexer: Suggest adding 'let' on unexpected '=' token
     0d6c97b Lexer: Suggest adding 'let' on unexpected '=' token
     a90712b users_guide: Various spelling fixes
     d46fdf2 users_guide: Various spelling fixes
     681973c Encode alignment in MO_Memcpy and friends
     a0d158f Encode alignment in MO_Memcpy and friends
     c772f57 Fix #10494
     0de0b14 Fix #10495.
     ace8d4f Fix #10493.
     6644039 Test case for #10428.
     ff82387 Decompose wanted repr. eqs. when no matchable givens.
     93f97be (mostly) Comments only
     f108003 Testsuite wibble around decomposing newtypes.
     7eceffb Refactor handling of decomposition.
     9b105c6 Reimplement Unify.typesCantMatch in terms of apartness.
     298c424 Treat funTyCon like any other TyCon in can_eq_nc.
     a6b8b9c Fix typo in comment
     daf1eee Clarify some comments around injectivity.
     65d4b89 Add `Monoid` instance for `IO`
     f063656 Fix ghc-pkg reports cache out date (#10205)
     0760b84 Update foreign export docs, fixes #10467
     b98ca17 Make enum01/enum02/enum03 tests clang-compatible
     023a0ba Care with impossible-cons in combineIdenticalAlts
     5879d5a Report arity errors correctly despite kinds
     f4370c6 Comments only
     4a7a6c3 Rename getCtLoc, setCtLoc
     02bac02 Remove some horrible munging of origins for Coercible
     760b079 A bit more tracing
     0899911 Comments plus tiny refactoring
     ee64369 Refactor filterAlts into two parts
     5d98b68 Trac #4945 is working again
     72b21c3 Parser: commas_tup_tail duplicate SrcSpan on "Missing" value
     ba7c8e5 Test Trac #10503
     c45f8ce Elaborate test for Trac #10403
     40698fe Spelling in comments
     e283cec testsuite: mark T4945 as expect_broken
     440d1bc docs: Unbreak the PS/PDF builds for the User's Guide (#10509)
     7d5a845 should_run/allocLimit4: disable ghci way
     e491803 Amend tcrun024, tcrun025 after Trac #7854 fix
     7c2293a Amend tcrun037 after Trac #7854 fix
     2c6a041 Fix a couple of tests for GHCi/-O* (Trac #10052)
     5cc08eb Recognise 'hardhloat' as a valid vendor in a host tuple
     f2ffdc6 Updated output for test ghci024
     85d5397 Make GHC install libraries to e.g. xhtml-3000.2.1-0ACfOp3hebWD9jGWE4v4Gh.
     0cb1f5c Filter orphan rules based on imports, fixes #10294 and #10420.
     29bc13a Fix all.T for T8131/T8131b.
     15ef5fc Remove duplicate test.
     13ba87f Build system: unset HADDOCK when haddock is not found
     4854fce Change `Typeable` instance for type-lis to use the Known* classes.
     38f3745 Add parsePattern parser entry point
     b5a2e87 Documentation: add section on .haskeline file (#2531)
     e60dbf3 Check KnownSymbol => Typeable deduction
     f70fb68 Use -package-id to specify libraries on command line.
     6c5a66a Fix #10551 by using LIB_NAMES.
     01f7e44 Rename $1_$2_$3_LIB_NAME to LIB_FILE.
     55843f1 Further elaborate Trac #10403 test
     c084796 powerpc: add basic support for PLT relocations (#10402)
     73a6265 Make $1 in $1_$2_$3_FOO actually be directory.
     95d5031 Build system: delete unused variables in config.mk.in
     ece2c43 Drop prefix from package keys.
     aa26731 Clean outdated ext-core references in comments.
     4d1316a driver: pass '-fPIC' option to all CC invocations
     9a34864 Improve kind-checking for 'deriving' clauses
     c7b6fb5 Test Trac #10562
     a2f828a Be aware of overlapping global STG registers in CmmSink (#10521)
     a7eee0d Comments only
     3edc186 White space only
     9195927 Improve pretty-printing for CoPat
     ff8a671 Use a Representaional coercion for data families
     0b7e538 Allow recursive unwrapping of data families
     cc0dba1 Minor fix to free-vars in RnTypes
     9014a7e Fix addDataConStrictness
     b69dc73 Don't float out alpha[sig] ~ Int
     97e313c Add module header to test
     2f16a3b Get rid of irrlevant result type signature
     95fc6d5 Get rid of irrelevant impredicative polymoprhism
     fb7b692 Treat out-of-scope variables as holes
     b98ff25 Error message wibbles from out-of-scope changes
     0aaea5b Tiny refactor plus comments
     be0ce87 Fix for crash in setnumcapabilities001
     111ba4b Fix deadlock (#10545)
     7c8ffd3 GHCi docs: layout rule is respected inside :{ :}
     cbd9278 Comments only
     caf9d42 Small doc fixes
     0696fc6 Improve CPR behavior for strict constructors
     7c07cf1 closeOverKinds *before* oclose in coverage check
     614ba3c Kill off sizePred
     8e34783 Make fvType ignore kinds
     a64a26f Better tracing and tiny refactoring
     ceb3c84 Improve error message for Typeable k (T k)
     0e1e798 Test Trac #10524
     8d221bb Test #10582
     89834d6 Add -fcross-module-specialise flag
     302d937 Add -fcross-module-specialise flag
     bb0e462 Mask to avoid uncaught ^C exceptions
     9b5df2a Update performance numbers due to #10482
     c6bb2fc Correct BangPat SrcSpan calculation
     c495c67 Build system: remove unused variable CHECK_PACKAGES
     897a46c Testsuite: accept T2592.stderr (minor changes)
     6b9fc65 Testsuite: put extra_run_opts last on command line
     daa5097 Build system: prevent "warning: overriding commands for target..."
     bbf6078 disable check for .init_array section on OpenBSD
     9aa0e4b ghc-pkg: use read/writeUTF8File from Cabal
     bdd0b71 bin-package-db: copy paste writeFileAtomic from Cabal
     bdf7f13 Build system: rename bindist to bindist-list...
     d3c1dda Implement PowerPC 64-bit native code backend for Linux
     b5e1944 Use `+RTS -G1` for more stable residency measurements (#9675)
     1d6ead7 Enable using qualified field of constructor in GHCi
     f856383 Fix Trac #10519
     f07b7a8 Remove unnecessary OrdList from decl parser.
     6400c76 users_guide: Describe order-dependence of -f and -O flags
     e4bf4bf Remove redundant parser entry point
     8b55788 Add "since" column for LANGUAGE extensions in user guide
     39d83f2 Generalize traceM, traceShowM (fixes #10023)
     6b01d3c parser: Allow Lm (MODIFIER LETTER) category in identifiers
     889c81c Fix some validation errors.
     69beef5 Replace usages of `-w` by `-fno-warn`s
     b1d1c65 Support MO_{Add,Sub}IntC and MO_Add2 in the LLVM backend
     124f399 Testsuite: add -ignore-dot-ghci to some tests
     ced27de Remove dead code / overlapping pattern (#9723)
     a4b0342 Lexer: remove -fno-warn-unused-do-bind
     aa778c8 Comments only [skip ci]
     c875b08 Use -fno-warn-unused-imports instead of hiding `ord`
     8e12a21 Lexer.x and Parser.y: delete dead code
     5d48e67 Easy way to defer type errors (implements #8353)
     3fabb71 Fix typo [skip ci] (#10605)
     75de613 rts: fix incorrect checking start for -x arguments (#9839)
     edb2c54 Remove Hugs specific test setups (omit_compiler_type)
     7a3d85e Remove all *.stderr/stdout-hugs files
     4681f55 Specialise: Avoid unnecessary recomputation of free variable information
     2765fcf Remove warnings for -fwarn-incomplete-patterns
     a07898e Spelling in comments
     9180df1 Fix offset calculation in __stg_gc_fun
     aaa0cd2 Don't eagerly blackhole single-entry thunks (#10414)
     d27e7fd Add more discussion of black-holing logic for #10414
     d59cf4e Fix "CPP directive" in comment
     db530f1 Add Note [Warnings in code generated by Alex]
     37de4ad Build system: don't set GhcLibWays explicitly in build.mk.sample (#10536)
     62fcf05 Fix word repetitions in comments
     ebfc2fb Update comments around blackholes
     f753cf1 Allow deferred type error warnings to be suppressed
     31580e2 Fix todo in compiler/nativeGen: Rename Size to Format
     9a3e165 Deferred type errors now throw TypeError (#10284)
     5857e0a fix EBADF unqueueing in select backend (Trac #10590)
     6d69c3a Generalize `Control.Monad.forever`
     d03bcfa always use -fPIC on OpenBSD/AMD64 platform
     00c8d4d Fix #10596 by looking up 'Int' not 'Maybe Int' in the map.
     1967a52 Export more types from GHC.RTS.Flags (#9970)
     8800a73 Backpack: Flesh out more Cabal details
     d71b65f holePackageKey and isHoleModule utility functions.
     3d5f8e7 Unbreak Windows build: delete unusud throwIOIO
     6f9efcb Delete duplicate "Note [Unpack equality predicates]"
     f3bfa3b Broaden Outputable instance for Termination
     85b14a7 Comments only
     4f9d600 Fix Trac #10618 (out of scope operator)
     b29633f Bitmap: Fix thunk explosion
     889824d Document RULES and class methods
     c58dc1a White space only
     b5aabfb Infer types with flexible contexts
     7dcf86f users_guide: Fix errant "a" in RULES/class methods docs
     a6359f2 Add testcase for #10602
     6f1c076 Make mkQualPackage more robust when package key is bad.
     0a3c43f Comments only
     9e86bf1 Better type wildcard errors
     888026d Update .mailmap [skip ci]
     2d06a9f Improve error message for fundeps
     9b1ebba Delete the WayPar way
     d69dfba Fix self-contained handling of ASCII encoding
     ee28a79 T1969: Update max_bytes_used
     a846088 T876 (32-bit): Update bytes allocated
     de6597e perf/compiler: Switch to -G1 and update performance metrics
     b935497 T9872d: Update 32-bit allocations
     d073c77 Do not optimise RULE lhs in substRule
     e922847 Add Linting for Rules
     7da7b0e Make sure rule LHSs are simplified
     875723b Reformat a leading # in a comment
     d7335f7 Test Trac #10463
     02a6b29 Test Trac #10634
     946c8b1 Another comment with a leading # (sigh)
     2e52057 Build system: comments only [skip ci]
     ec197d3 Build system: add `make show!` command (#7810)
     f70f1b6 Build system: delete two unused files
     47ebe26 Build system: delete REGULAR_INSTALL_DYNLIBS and INSTALL_DYNLIBS
     392ff06 Build system: do not build stm and parallel by default
     5764ade Testsuite: delete unused with_namebase
     322ae32 Testsuite: delete remaining only_compiler_types(['ghc']) setups
     783b79b traivs: Use the new container based travis setup
     4dc3877 Testsuite: rename *.stderr-ghc to *.stderr
     ab5257b Testsuite: delete *.stderr-ghc-7.0 *.stdout-ghc-7.0
     4ee658a0 Mark test case for #10294 expect_broken on #10301
     0a40278 Flush stdout in test case for #10596
     8e6a503 Mark test case for #10294 conditionally expect_broken on #10301
     b1063b1 Testsuite: mark T10294 conditionally expect_broken on #10301
     348f5ca Build system: delete fingerprint.py [skip ci]
     a592e9f Remove all references to sync-all
     75fd5dc Don't get a new nursery if we exceeded large_alloc_lim
     9f978b6 Fix #10642.
     74a00bc initGroup: only initialize the first and last blocks of a group
     504c2ae Docs: `sortOn = sortBy (comparing f)` [skip ci]
     02897c5 Failing test case: idArity invariant check, #10181
     e29c2ac CoreUtils: Move seq* functions to CoreSeq
     ae0e340 CoreUtils: Move size utilities to CoreStats
     fa33f45 PprCore: Add size annotations for top-level bindings
     29f8225 CoreLint: Use size-annotated ppr variant
     82f1c78 Fix tests
     ae96c75 Implement -fprint-expanded-synonyms
     415351a Put Opt_Static into defaultFlags if not pc_DYNAMIC_BY_DEFAULT (#7478)
     2c5c297 DeriveFoldable for data types with existential constraints (#10447)
     2c9de9c Handle Char#, Addr# in TH quasiquoter (fixes #10620)
     a5e9da8 Fix off-by-one error in GHCi line reporting (Trac #10578)
     3448f98 Reduce non-determinism in ABI hashes with RULES and instance decls
     bc604bd Update assert to fix retc001 and retc002 (#9243)
     0d4b074 Travis: actually do debug builds
     ac0feec Testsuite: small test cleanups
     f607393 Testsuite: accept new stderr for T9497{a,b,c}-run (#10224)
     a0371c0 Build system: fail when encountering an unknown package tag
     dc6e556 Testsuite: mark T2497 expect_broken_for(#10657, ['optasm', 'optllvm'])
     dcaa486 Testsuite: mark T7919 expect_broken_for(#7919, ['optasm','dyn','optllvm'])
     11f8612 Testsuite: mark 3 tests expect_broken_for(#10181, ['optasm', 'optllvm'])
     16a8739 Testsuite: mark qq007 and qq008 expect_broken(#10181)
     cbb4d78 Testsuite: mark qq007 and qq008 expect_broken(#10047)
     43dafc9 Testsuite: mark gadt/termination expect_broken_for(#10658, ['optasm','optllvm'])
     34bb460 Testsuite: mark array001 and conc034 expect_broken_for(#10659, ['optasm',...])
     9834fea Add regression test for unused implicit parameter warning (#10632)
     4c96e7c Testsuite: add ImpredicativeTypes to T7861 (#7861)
     7f37274 Testsuite: add -XUndecidableInstances to T3500a
     029367e Testsuite: add regression test for missing class constraint
     82ffc80 LlvmCodeGen: add support for MO_U_Mul2 CallishMachOp
     49373ff Support wild cards in TH splices
     c526e09 primops: Add haddocks to BCO primops
     4cd008b Do not treat prim and javascript imports as C imports in TH and QQ
     96de809 Fix primops documentation syntax
     d71d9a9 Testsuite: fix concprog002 (AMP)
     2f18b197 Testsuite: mark concprog002 expect_broken_for(#10661, ['threaded2_hT'])
     d0cf8f1 Testsuite: simplify T8089 (#8089)
     b4ef8b8 Update submodule hpc with fix for #10529
     0c6c015 Revert "Revert "Change loadSrcInterface to return a list of ModIface""
     214596d Revert "Revert "Support for multiple signature files in scope.""
     9ade087 primops: Fix spelling mistake
     e0a3c44 Delete __GLASGOW_HASKELL__ ifdefs for stage0 < 7.8
     8f48fdc Use varToCoreExpr in mkWWcpr_help
     3fbf496 Comments only (superclasses and improvement)
     3509191 Refactor newSCWorkFromFlavoured
     7c0fff4 Improve strictness analysis for exceptions
     cd48797 Comments and white space only
     3c44a46 Refactor self-boot info
     efa7b3a Add NOINLINE for hs-boot functions
     aa78cd6 Documents -dsuppress-unfoldings
     0df2348 Comments and layout only
     a0e8bb7 Implement -dsuppress-unfoldings
     b5c1400 Comments and white space only
     f1d0480 Avoid out-of-scope top-level Ids
     7a6ed66 Comments only
     55754ea Fix test T2497 to avoid infinite loop in RULES
     feaa095 Do occurrence analysis on result of BuiltInRule
     00f3187 Make seq-of-cast rule generate a case
     35eb736 T4945 is working again
     f519cb5 testsuite: Show killed command line on timeout
     97a50d5 configure: Bump minimum bootstrap GHC version to 7.8
     dbe6dac When iconv is unavailable, use an ASCII encoding to encode ASCII
     18c6ee2 Travis: use ghc-7.8.4 as stage0 to fix the build
     d941a89 Validate: by default do show commands
     a7e0326 Validate: document --quiet [skip ci]
     1224bb5 Add utility function isHoleName.
     50b9a7a Revert "Trac #4945 is working again"
     1b76997 Testsuite: recenter haddock.base allocation numbers
     b949c96 Eliminate zero_static_objects_list()
     0d1a8d0 Two step allocator for 64-bit systems
     e3df1b1 Validate: explain THREADS instead of CPUS in --help
     cf57f8f Travis: do pass `--quiet` to validate
     0b12aca Switch from recording IsBootInterface to recording full HscSource.
     adea827 Add ExceptionMonad instance for IOEnv.
     144096e Give more informative panic for checkFamInstConsistency.
     4a9b40d Export alwaysQualifyPackages and neverQualifyPackages.
     939f1b2 Some utility functions for testing IfaceType equality.
     dd365b1 Use lookupIfaceTop for loading IfaceDecls.
     5c3fc92 Fix Trac #10670
     9851275 Comments only
     d784bde Lexer: support consecutive references to Haddock chunks (#10398)
     d2b4df1 Generate .dyn_o files for .hsig files with -dynamic-too
     76e2341 Accept next-docstrings on GADT constructors.
     e78841b Update encoding001 to test the full range of non-surrogate code points
     b5c9426 Parenthesise TypeOperator in import hints
     1852c3d DataCon: Fix redundant import
     4c8e69e rts/sm: Add missing argument names in function definitions
     7ec07e4 Slight refactoring to the fix for #4012
     608e76c Document type functions in the Paterson conditions
     e809ef5 ghci: fixity declarations for infix data constructors (#10018)
     5ff4dad Add a few comments from SPJ on fixity declarations
     f9687ca Library names, with Cabal submodule update
     45c319f Fix line number in T10018 testcase
     30d8349 Comments only
     e161634 Comments about stricteness of catch#
     d53d808 Refactoring around FunDeps
     6e618d7 Improve instanceCantMatch
     09d0505 RetainerProfile: Add missing UNTAG_STATIC_LIST_PTR
     b04bed0 renamer: fix module-level deprecation message
     070f76a -include-pkg-deps takes only one hyphen.
     7e70c06 Use isTrue# around primitive comparisons in integer-gmp
     c55f61c Add missing parentheses in eqBigNatWord#
     474d4cc Comment tweaks only
     f842ad6 Implementation of StrictData language extension
     2178273 Add UInfixT to TH types (fixes #10522)
     81fffc4 Remove runSTRep from PrelNames
     bc4b64c Do not inline or apply rules on LHS of rules
     2d88a53 Improve warnings for rules that might not fire
     09925c3 Revert "RetainerProfile: Add missing UNTAG_STATIC_LIST_PTR"
     a1e8620 Revert "Eliminate zero_static_objects_list()"
     e343c0a Test case for #10698
     a1dd7dd Fallout from more assiduous RULE warnings
     f83aab9 Eliminate zero_static_objects_list()
     2dbb01a Add a missing check for -fcpr-off
     fac11f8 Comments only
     4e8d74d Deal with phantom type variables in rules
     92d2567 Define DsUtils.mkCastDs and use it
     fa915af Spit out a little more info with -dppr-debug
     e4114c8 Fix an outright error in competesWith
     499b926 Fix Trac #10694: CPR analysis
     918dcf8 The parallel package has warnings
     2e33b9c Modify spec002 to be less trivial
     72d23c3 Better treatment of signatures in cls/inst
     24afe6d Fix missing files
     5a8a8a6 Don't allowInterrupt inside uninterruptibleMask
     9f7cdfe Make configure error out on missing ghc-tarballs on Windows
     e7c331a Make headers C++ compatible (fixes #10700)
     26315ed Fix misspelled function name in a comment
     4f80ec0 Improve error message for newtypes and deriving clauses
     e9ad42d Typos in comments and strings
     d7c2b01 Fix comment that confused Haddock
     b5097fe Testsuite: rename rename/should_fail/T5001 to T5001b (#5001)
     e273c67 Testsuite: mark tests recently fixed as passing + accept new stderr
     756fa0a Testsuite: skip T10489 unless compiler_debugged (#10489)
     6880277 Testsuite: add arrows/should_compile/T5333 (#5333)
     58b5f04 Testsuite: add typecheck/should_fail/T9260 (#9260)
     58986c4 Testsuite: add typecheck/should_fail/T8034 (#8034)
     aee19d0 Testsuite: T10245 is passing for WAY=ghci (#10245)
     36bbfbd Backpack docs on renamer and depsolver, also s/package/unit/.
     a442800 Build system: remove function keyword from configure.ac (#10705)
     a66e1ba User's guide: delete ancient "Core syntax" example
     7cf87df Fix #7919 (again)
     353db30 Remove checked-in PDFs.
     8f81af9 Typos in comments
     ad089f5 Give raise# a return type of open kind (#10481)
     75504f3 Typos in comments
     15dd700 Replace (SourceText,FastString) with StringLiteral data type
     d9b618f Typo in comment
     37227d3 Make BranchFlag a new kind
     92f5385 Support MO_U_QuotRem2 in LLVM backend
     948e03e Update parallel submodule, and re-enable warnings
     b38ee89 Fix incorrect stack pointer usage in StgRun() on x86_64
     4d8859c Typos in comments
     d7ced09 Minor improvement to user guide
     30b32f4 Test Trac #10134
     697079f 4 reduce/reduce parser conflicts resolved
     d9d2102 Support wild cards in data/type family instances
     7ec6ffc Typos in comments [skip ci]
     64b6733 CmmParse: Don't force alignment in memcpy-ish operations
     30c981e Removed deprecated syntax for GADT constuctors.
     f063bd5 Fix #10713.
     b5f1c85 Test #9233 in perf/compiler/T9233
     d7b053a Pretty: reformat using style from libraries/pretty (#10735)
     9d24b06 Pretty: rename variables to the ones used by libraries/pretty (#10735)
     25bc406 Pretty: improve error messages (#10735)
     53484d3 Pretty: remove superfluous parenthesis (#10735)
     2d1eae2 Pretty: kill code that has been dead since 1997 (#10735)
     6f6d082 Pretty: Args of NilAbove/TextBeside/Nest/Union are always RDocs (#10735)
     926e428 Pretty: use BangPatterns instead of manual unboxing Ints (#10735)
     f951ffc Pretty: mimic pretty API more closely (#10735)
     85179b5 Pretty: use replicate for spaces and multi_ch (#10735)
     dd7e188 Add framework flags when linking a dynamic library
     4c55f14 users_guide: Add note about #367 to Bugs section
     6029748 Drop custom mapM impl for []
     ecb1752 Make -fcpr-off a dynamic flag
     b12dba7 Make Exception datatypes into newtypes
     22bbc1c Make sure that `all`, `any`, `and`, and `or` fuse (#9848)
     fd6b24f Additions to users' guide and release notes
     575abf4 Add Fixity info for infix types
     e2b5738 Allow proper errors/warnings in core2core passes
     617f696 Do not complain about SPECIALISE for INLINE
     a426154 Warn about missed specialisations for imports
     49615d9 Comments only
     ab98860 Minor refactor to use filterInScope
     9536481 Tidy up and refactor wildcard handling
     28096b2 Fix quantification for inference with sigs
     75f5f23 Coments only
     cc07c40 Comments only
     294553e T8968-1 and -3 should pass
     64dba51 Test Trac #10742
     eca9a1a Ensure DynFlags are consistent
     97843d0 base: Add instances
     600b153 llvmGen: Rework LLVM mangler
     aa23054 Add test for #10600 (exhaustiveness check with --make and -fno-code)
     bc43d23 Rejigger OSMem.my_mmap to allow building on Mac
     a1c934c base: Add missing Traversable instance for ZipList
     6cab3af Big batch of Backpack documentation edits.
     79e0a10 Test Trac #10753
     a192d6b Comments only
     f1b4864 Sync base/changelog.md with GHC 7.10.2 release
     590aa0f Make oneShot open-kinded
     92f35cd cmmCreateSwitchPlan: Handle singletons up-front
     2c4a7d3 Update transformers submodule to 0.4.3.0 release
     f04c7be Fix unused-matches warnings in CmmLex.x
     a40ec75 Update testsuite/.gitignore [skip ci]
     b4ed130 Replace HsBang type with HsSrcBang and HsImplBang
     2da06d7 User manual update, as prodded by #10760.
     2b4710b Add missing </para> to User's guide to fix the build
     8cce7e4 Bump template-haskell to new major version 2.11
     67576dd Pretty: bugfix fillNB (#10735)
     bcfae08 Pretty: fix potential bad formatting of error message (#10735)
     5d57087 Pretty: fix a broken invariant (#10735)
     85bf76a Pretty: show rational as is (#10735)
     f903949 Pretty: improving the space/time performance of vcat, hsep, hcat (#10735)
     b0dee61 template-haskell: Add changelog entry to infix type operators
     7b211b4 Upgrade GCC to 5.2.0 for Windows x86 and x86_64
     e415369 Update mingw tarball location
     8c5b087 SysTools: Fix whitespace in error message
     d2dd5af DynFlags: Prohibit hpc and byte-code interpreter
     ec68618 Name: Show NameSort in warning
     1857191 Testsuite: mark T8089 expect_broken(#7325) on Windows
     8906037 Testsuite: mark encoding005 expect_broken(#10623) on Windows
     ca85442 Testsuite: recenter 2 performance tests on Windows
     744ff88 Testsuite: speedup running a single test
     e367e27 Travis: prevent 10' no output, by setting VERBOSE=2
     74897de Make rts/ThreadLabels.c threadsafe for debug runtime.
     22aca53 Transliterate unknown characters at output
     ab9403d Dump files always use UTF8 encoding #10762
     b17ec56 Fix rdynamic flag and test on Windows
     ebca3f8 rts/Printer.c: speed up '-Da' printer for 'LIBBFD' build
     18a1567 Add selectors for common fields (DataCon/PatSyn) to ConLike
     d97e60f Comments reformating/corrections
     b6be81b Build system: delete half-baked Cygwin support
     98f8c9e Delete sync-all
     a146b28 GhcMake: Fix spelling in comment
     0d0e651 Bag: Add Foldable instance
     9e8562a Implement getSizeofMutableByteArrayOp primop
     3452473 Delete FastBool
     2f29ebb Refactor: delete most of the module FastTypes
     47493e6 Build system: simplify install.mk.in
     a1c008b Build system: delete unused distrib/Makefile
     a5061a9 Check options before warning about source imports.
     37a0b50 Delete ExtsCompat46 (#8330)
     b78494e fix 64bit two-stage allocator on Solaris/AMD64 platform (#10790)
     fba724c configure.ac: Allow disabling of large-address-space
     1c643ba Fix algorithm.tex build and update with some new info.
     0f3335f Comments and white space
     816d48a Implement lookupGlobal in TcEnv, and use it
     711e0bf tcRnDeclsi can use tcRnSrcDecls
     ac0d052 TcDeriv: Kill dead code
     de476e9 PrelNames: Clean up list a bit
     89d25b9 BinIface: Clean up whitespace
     7924469 Clean up handling of knownKeyNames
     a8601a8 Revert "Clean up handling of knownKeyNames"
     28ad98e PrelNames: introduce dcQual in place of conName
     211b349 Move newImplicitBinder to from IfaceEnv to BuildTyCl
     70ea94c IfaceEnv: Clean up updNameCache a bit
     f6035bc MkIface: Introduce PatSynId, ReflectionId, DefMethId
     7bd8f8f TysWiredIn: Shuffle code around
     15c63d2 base: Remove a redundant 'return'
     38c98e4 RTS: Reduce MBLOCK_SPACE_SIZE on AArch64
     15cb83d Add testcase for #7411
     a6826c5 Make Generic (Proxy t) instance poly-kinded (fixes #10775)
     1b56c40 Respect GHC_CHARENC environment variable #10762
     81ae26d Dwarf: Fix DW_AT_use_UTF8 attribute
     cbf58a2 Dwarf: Produce {low,high}_pc attributes for compilation units
     8476ce2 Dwarf: Produce .dwarf_aranges section
     0c823af Fix identifier parsing in hp2ps
     cd2dc9e ghc-pkg --enable-multi-instance should not complain about case sensitivity.
     c7f0626 integer-gmp: optimise bitBigNat
     c1d7b4b StgCmmHeap: Re-add check for large static allocations
     60120d2 Fix 7.10 validate
     12098c2 Fix typo in pattern synonym documentation.
     10a0775 Anchor type family instances deterministically
     ad26c54 Testsuite: refactoring only
     6740d70 Use IP based CallStack in error and undefined
     010e187 Fix trac #10413
     ff9432f Add test for updating a record with existentially quantified fields.
     296bc70 Use a response file for linker command line arguments #10777
     ba5554e Allow annotations though addTopDecls (#10486)
     c8f623e Expand declaration QQs first (#10047)
     28ac9d3 Improve the error messages for class instance errors
     3cc8f07 stm: Fix test case
     5d7a873 Testsuite: don't warn about missing specialisations
     e0b3ff0 Testsuite: update expected output
     3b23379 Testsuite: mark 4 tests expect_broken_for(#10712, opt_ways)
     32a9ead Fix some tests that were broken by D861
     c43c8e2 Testsuite: by default run all tests for a single way
     bd16e0b Testsuite: delete dead code
     3744578 Injective type families
     5dc88b7 Add test for T10836 (expected broken)
     34b106f Accept underscores in the module parser. (Thanks spinda for the fix.)
     b639c97 Testsuite: fix tcfail220 - Maybe is wired-in now
     e1293bb Testsuite: only print msg when timeout kills process unexpectedly
     79cdb25 Testsuite: ignore line number differences in call stacks (#10834)
     85915e9 Make Data.List.foldr1 inline
     19c6049 Fix T6018th test failure
     64761ce Build system: implement `make install-strip` (#1851)
     5c372fe ghc-pkg: don't print ignored errors when verbosity=0
     c60c462 user-guide: Add missing <para> tags around <listitem> body
     96b986b EventLog: Factor out ensureRoomFor*Event
     062feee tracing: Kill EVENT_STARTUP
     2c24fd7 Build system: put each BuildFlavour in a separate file (#10223)
     b40e559 Build system: simplify *-llvm BuildFlavours (#10223)
     1abbacd Build system: cleanup utils/ghc-pkg/ghc.mk
     dc671a1 SPECIALIZE strictMinimum for Int and Integer
     c6b82e9 Further simplify the story around minimum/maximum
     554be5e Build system: detect when user cloned from GitHub
     864a9c4 Build system: remove hack for Mac OSX in configure.ac (#10476)
     a158607 Build system: delete the InstallExtraPackages variable
     330fbbd Build system: make *-cross BuildFlavours consistent (#10223)
     8be43dd Build system: cleanup BUILD_DIRS + add lots of Notes
     e4a73f4 Move GeneralCategory et al to GHC.Unicode
     1b8eca1 Build system: check for inconsistent settings (#10157)
     dbb4e41 HeapStackCheck: Small refactoring
     4356dac Forbid annotations when Safe Haskell safe mode is enabled.
     23a301a Testsuite: comment out `setnumcapabilities001` (#10860)
     cdca31e Don't check in autogenerated hs files for recomp013.
     3a71d78 Comments on oneShot
     a870738 Improve rejigConRes (again)
     487c90e Add a test for Trac #10806
     a7f6909 A CFunEqCan can be Derived
     377395e Improve documentation for transform list-comps
     50d1c72 Fix broken links in documentation
     413fa95 Improve documentation of comprehensions
     f30a492 Testsuite cleanup
     8c0eca3 Add assertions
     18759cc Remove redundant language extensions
     195af2d Dead code removal, export cleanup
     4275028 Code movement
     7ad4b3c s/StgArrWords/StgArrBytes/
     89324b8 Testsuite: normalise slashes in callstack output
     37081ac Testsuite: mark enum01-enum03 expect_broken(#9399) on Windows
     3ec205a CodeGen: fix typo in error message
     08af42f hpc: use `takeDirectory` instead of `dropWhileEnd (/= '/')`
     c8d438f Testsuite: mark T6037 expect_fail on Windows (#6037)
     12b0bb6 Account for stack allocation in the thread's allocation counter
     14c4090 Pretty: fix unicode arrow operators.
     325efac Fix `hp2ps -i-`
     e66daec DynFlags: remove unused sPgm_sysman (#8689)
     8d89d80 Testsuite: add test for #10781
     43eb1dc Show minimal complete definitions in ghci (#10847)
     8ecf6d8 ApplicativeDo transformation
     77662e1 Add namePackage function to template-haskell
     48746ff Docs: make sure all libs are included in index.html (#10879)
     a8406f8 Pass TEST_HC_OPTS in bug1465 and T5792.
     2d4db40 Fix #10815 by kind-checking type patterns against known kinds.
     8ee2b95 Polish some error messages.
     b89c491 Always run explicitly requested ways (extra_ways) for fast runs.
     c738b12 Replace [PostTc id Type] with PostTc id [Type]
     e156361 Put stable pointer names in the name cache.
     1637e4d Driver: --make -o without Main should be an error (#10895)
     1a13551 Test #10347
     d19a77a Update user guide, fixing #10772
     d7f2ab0 Test #10770
     79b8e89 Print associated types a bit better.
     1292c17 Allow TH quoting of assoc type defaults.
     27f9186 Clarify parsing infelicity.
     93fafe0 Re-polish error messages around injective TFs.
     6a20920 Small improvement in pretty-printing constructors.
     cbcad85 Fix typo in test for #10347.
     2f9809e Slightly better `Coercible` errors.
     e27b267 Perform a validity check on assoc type defaults.
     8e8b9ed Run simplifier only when the env is clean.
     cd2840a Refactor BranchLists.
     c234acb `_ <- mapM` --> `mapM_`
     3f13c20 Revert "Revert "Revert "Support for multiple signature files in scope."""
     09d214d Revert "Revert "Revert "Change loadSrcInterface to return a list of ModIface"""
     06d46b1 Unify hsig and hs-boot; add preliminary "hs-boot" merging.
     d516d2e Fix build failure, I think.
     07f6418 Remove graphFromVerticesAndAdjacency
     5a8b055 TcDeriv: Use a NameEnv instead of association list
     83e23c1 Remove (now bogus) assert.
     0b852fc base: use Show for ErrorCall in uncaughtExceptionHandler
     d4d34a7 Make derived names deterministic
     089b72f DeriveLift extension (#1830)
     4cdab73 HscMain: Place CPP macro invocation on one line
     79f5732 testsuite: attempt fixing fallout from 089b72f52
     c6bdf4f Remove references to () from types of mkWeak# and friends
     65bf7ba DsBinds: Avoid using String when desugaring CallStack construction
     939a7d6 Annotate CmmBranch with an optional likely target
     cf90a1e Add constant-folding rule for Data.Bits.bit
     73921df Update Cabal to recognize DeriveLift
     453cdbf base: export allocation counter/limit API from System.Mem
     5c11523 reify associated types when reifying typeclasses
     39a262e Revert "reify associated types when reifying typeclasses"
     2440e3c Fix a bug with mallocForeignPtr and finalizers (#10904)
     b08a533d Fix DeriveGeneric for types with same OccName (#10487)
     4f9ee91 Testsuite: update expected output for T8832 on 32-bit systems (#8832)
     5883b56 Testsuite: properly fix T8832.stdout-ws-32 (#8832)
     1395185 Testsuite: add test for #10767
     fb40926 Weak: Don't require wrapping/unwrapping of finalizers
     a98815a Dwarf: Rename binding to avoid shadowing ppr
     a0b1f41 Dwarf: Ensure block length is encoded correctly
     f7fd864 Skip a possible BOM in utf8 encoding
     3fbf8f4 Debug: Remove extraneous LANGUAGE CPP
     988b2ba rts: Clean up whitespace in Trace.h
     b4d43b4 reify associated types when reifying typeclasses(#10891)
     78053f4 Allow enumDeltaIntegerFB to be inlined
     2eddcd9 Lexer: delete dead code for binary character literals
     23baa65 .gitignore update for some test files.
     e3ab25a Typos in comments
     03b3804 Add Data.Semigroup and Data.List.NonEmpty (re #10365)
     f2a174a Update nofib submodule
     a52db23 Update nofib submodule again
     eb975d2 Fix treatment of -0.0
     57e3742 Document peculiarities of `traceM`.
     b29f20e nativeGen PPC: fix > 16 bit offsets in stack handling
     bd41eb2 LLVM: Implement atomic operations in terms of LLVM primitives
     9539408 LLVM: Factor out accumulation of LLVM statements and variables
     7442434 Move CallStack back to base
     e3d2bab Fix signature of atomic builtins
     9ed700b Don't use old linkable for hs-boot files.
     4fd6207 Move user's guide to ReStructuredText
     93e21b9 docs: Fix ghc_config.py.in
     b6f76b9 Prevent GHC from silently dying when preprocessor is not found
     c4d7df0 Fix broken validation Build 6564 and accepting a few other test results
     a3c78ab Build system: add mk/validate.mk.sample
     a96f1ac Testsuite: update expected output for T8602
     6cde981 Make GHC generics capable of handling unboxed types
     0eb8fcd Enable `Enumeration is empty` warnings for `Integer`
     2f74be9 Fill in associated type defaults with DeriveAnyClass
     d2fb532 testsuite: Bump up haddock.base expected allocations
     620fc6f Make Windows linker more robust to unknown sections
     aecf4a5 Build system: don't create mk/are-validating.mk
     c0bdfee Testsuite: only add -fno-warn-missed-specialisations for ghc>=7.11
     7fcfee1 A few typos in comments
     5ca1d31 Testsuite: make driver python 2.6 compatible again
     427f8a1 Deduplicate one-shot/make compile paths.
     8c1866a Comments only
     0e169a8 Fix kind-var abstraction in SimplUtils.abstractFloats
     ca816c6 Remove dead code: ruleLhsOrphNames
     7da3d30 Comments only
     3833e71 Comments about TcLevel assignment
     59883ae Documentation for FrontendResult
     36811bf AsmCodeGen: Ensure LLVM .line directives are sorted
     ea4df12 Ensure shiftL/shiftR arguments aren't negative
     7b443bb Improve error messages for ambiguous type variables
     69a6e42 Allow non-operator infix pattern synonyms
     e2b579e Parser: revert some error messages to what they were before 7.10
     f64f7c3 Tests for #10945 and #10946
     931d0a7 Move orphan instance/rule warnings to typechecker/desugarer.
     e99e6db Extra files to ignore from the new Restructured documentation.
     0ead0ca Disable man building for most quick build styles.
     c7ab799 Ignore __pycache__.
     e5baf62 Simplify type of ms_srcimps and ms_textual_imps.
     5dc3db7 Switch to LLVM version 3.7
     80602af Revert "Switch to LLVM version 3.7"
     e331392 Fix error msg: ghci can't be used with -prof or -static (#10936)
     5d84110 Add short library names support to Windows linker
     182c44d Keep `shift{L,R}` on `Integer` from segfaulting
     840df33 Rename SpecInfo to RuleInfo (upon SPJ's advice).
     fa5eabe sphinx: Don't share doctrees between targets
     614ce4b Testsuite: T3333 still fails on non-linux statically linked ghci (#3333)
     bbad4f6 Delete ShPackageKey for now.
     f002340 compiler/nativeGen/PPC/Ppr.hs: Whitespace
     4bd58c1 PPC: Fix right shift by 32 bits #10870
     e737a51 base: MRP-refactoring of AMP instances
     6b7bad9 Test Trac #10931
     f8fbf38 Reinstate monomorphism-restriction warnings
     dcc3428 Don't inline/apply other rules when simplifying a rule RHS.
     330ba6a testsuite: attempt fixing T10935 output
     94ef79a Slightly wibble TcSimplify documentation
     d2f9972 Make dataToQa aware of Data instances which use functions to implement toConstr
     1818b48 Fix incorrect import warnings when methods with identical names are imported
     e5bfd70 docs: overhaul Derive{Functor,Foldable,Traversable} notes
     dec5cd4 base: Add forkOSWithUnmask
     e8c8173 Allow arr ? (first ? (***)) as minimal definition of Arrow instance
     29310b6 Switch to LLVM version 3.7
     7756161 travis: use LLVM 3.7
     933adc0 Fix GHCi on Arm (#10375).
     729bf08 User should use -package-id flag if value in question is IPID.
     5b0191f Update Cabal to HEAD, IPID renamed to Component ID.
     b92a51f Rename package key to unit ID, and installed package ID to component ID.
     6338a1c Rename PACKAGE_KEY and LIB_NAME in build system.
     20e30d5 Minor stylistic update.
     04e8366 ELF/x86_64: map object file sections separately into the low 2GB
     78c9dea Fix windows build after D975
     4d6844a rts/Linker.c : Fix armhf build (#10977)
     808bbdf Remove dead function patSynTyDetails
     b1884b0 Implement DuplicateRecordFields
     75492e7 Add typed holes support in Template Haskell.
     6a8ca65 Allow left ? (+++) as minimal definition of ArrowChoice instance
     e7c076d base: changelog entries for Arrow/ArrowChoice
     324e0ac base: MINIMAL pragmas for Arrow/ArrowChoice
     3340fe0 Build system: fix `make -j1` (#10973)
     603a369 Silence the linker on Windows so tests pass
     fff0254 Move Control.Monad.IO.Class to base from transformers
     a6a3dab Libdw: Add libdw-based stack unwinding
     40cbf9a Signals: Print backtrace on SIGUSR2
     e8ed213 Make Monad/Applicative instances MRP-friendly
     6638bfd CmmParse: Clarify description of calling convention
     d990b5f Signals: Always install SIGUSR2 handler
     75c7cda ghc-pkg: Express return-method in terms of pure
     c6781a5 template-haskell: MRP-refactor Applicative/Monad instances
     1e34f62 MRP-refactor `GHCi` Applicative/Monad instance
     d6d421c template-haskell: set explicit return=pure
     40235c3 fix RTS linker compilation failure on Solaris
     7bbb61b Driver: `ghci -e` should behave like `ghc -e` (#9360)
     2b25a58 base: Have the argument of mask restore the state.
     96dc041 Systools.hs: Improve detection of GCC and Clang
     ae4acbd Testsuite Windows: don't use forward slashes in topdir path
     1750ebc Reject top-level typed TH splices. Fixes #10945
     bb7e93c Extended default rules now specialize Foldable, Traversable to [] (#10971)
     68a084f Testsuite: add test for #10997
     2bc6efc Fix caching of pagesize
     7855afb Fix breakage in the GHCi debugger
     e3e5a96 Remove old trace statement
     d77c404 Stop the pipeline when it doesn't need to be run.
     c633f71 Add another test for #10549
     1e8d1f1 Suggest enabling PatternSynonyms (#10943)
     9ec5996 rts/Schedule.c: remove unused variable
     0499aa7 Add missing stderr file
     9cb192c Make stronglyConnCompFromEdgedVertices deterministic
     0ae6a43 Suggest chmod 755 instead of 644
     fa7d582 Quote GHC path in configure so we can deal with multiple spaces.
     8f5ad1a Quote GHC_PKG in Makefile.
     fdb08e2 Add testcase for #10426
     0afba67 arclint: ReST doesn't need ArcanistMergeConflictLinter
     fd63ea5 base: Note platform dependence of registerFd
     7dae074 Verify minimum required version of sphinx-build
     67284a0 gitignore: Ignore sphinx doctrees directories
     2866dfb Fix broken .arclint
     4e40340 Support more sphinx-build versions in configure script
     ec14392 typo in comments: s/selectg/select/
     798d2e2 configure.ac: Fix autotool warnings
     7aea0cf use Proxy instead of undefined -- we already dropped support for 7.6
     ca12c24 Update example GHCi startup
     abc214b rts/Linker.c:  Split RTS symbols out into separate file
     3ed4b80 rts/Linker.c: Convert #if/#else to if/else
     898f34c rts/RtsSymbols.c: Fix Windows build
     43751b2 Provide a utility to check API Annotations
     c2fab84 Add testcase for #10370
     86e5eb9 Remove redundant typedef
     0b79aa1 base: Add Haddocks to GHC.RTS.Flags
     73c273a Fix a typo in the User's Guide ReST intro
     23e344b Remove cygwin32_HOST_OS #ifdefs
     499ce29 Add flag to reverse errors in GHC/GHCi
     a9c93bd Implement MIN_VERSION and VERSION macros natively in GHC.
     c10c01c Build system: comments only [skip ci]
     f86fb5e Add regression tests for #10045, #10999
     6831815 Comments only
     0ce858e Zonk properly when checkig pattern synonyms
     adc3d17 manpage: Mark as orphan document
     d1d8704 Use correct documentation flag for freverse-errors
     158d2a9 Make it possible to have different UniqSupply strategies
     079dd12 Fix "Use correct documentation flag for freverse-errors"
     dc13467 DynFlags: Fix more merge errors
     ffcdd84 Sort field labels before fingerprint hashing
     166c597 DynFlags: Yet one more fix
     31704ad Make worker-wrapper optional
     9efa56d Fix the DYNAMIC_GHC_PROGRAMS=NO build on Mac/Windows
     19354fb Make T10970a non-dependent on GCC version.
     7c2ab6f Testsuite: accept output for T10999 (#10999)
     d1ab6fc PrelNames: Fix duplicate unique
     9fc2d77 Build system: don't add ALL_HC_OPTS when linking
     04b0a73 Pattern synonyms: swap provided/required
     de27bed Update haskeline/terminfo submodules
     c1e1584 Update `deepseq` submodule
     776d55c rts/Linker.c: Drop support for legacy OS X dyn loading
     ce2416b Fix rts/T9579 tests on OS X
     08f5c4e Backpack documentation updates for component IDs [no-ci]
     032be43 Testsuite: report and error out on unfound tests
     a051788 Revert "Build system: don't add ALL_HC_OPTS when linking"
     2a74a64 Record pattern synonyms
     fa58731 Revert "Build system: don't create mk/are-validating.mk"
     e31113f Move mkDefaultMethodIds, mkRecSelBinds from TcTyClsDecls to TcTyDecls
     d25fa86 TcTyDecls: Remove redundant import of Applicative
     40e6214 DynFlags: Add (another) missing hunk from D1360
     bef2f03 Generate Typeable info at definition sites
     bbaf76f Revert "Generate Typeable info at definition sites"
     e272ab9 x86 codegen: don't generate location comments
     8ddf417 Linker: Fix type in m32_free_internal
     9b3a058 Swap prov/req in variable naming in Parser.y
     9376249 Fix unused-import stuff in a better way
     3e94842 Record usage information using GlobalRdrElt
     da58d15 Kill redundant import
     268aa9a integerConstantFolding: when(compiler_debugged(), expect_broken(#11006))
     0a16374 Disambiguate record selectors by type signature
     1f1c7c6 Build system: rename runghc.hs to Main.hs
     b05ab1a Build system: cleanup a few .cabal files
     314395e Build system: cabalise deriveConstants + genprimopcode
     2624298 Fix segfault due to reading non-existent memory
     42e8528 CmmParse: Expose popcnt operations
     3e2c227 Linker: Clean up USE_MMAP usage
     1c80db5 Insert an empty line between two STG definitions in dump output.
     56f9ef4 Unify: Add Outputable instance for UnifyResultM
     aa289d2 Move win32 tarball download logic to script
     f78b477 driver: use PROGBITS type for .debug-ghc-link-info section
     59e728b Testsuite: suggest quoting $(TEST_HC)
     91c6b1f Generate Typeable info at definition sites
     39b71e8 Reimplement shadowing on a per database basis.
     f5974c8 rts: Make MBLOCK_SPACE_SIZE dynamic
     fce758c Add failing test for #11039
     a5cb27f Make type-class dictionary let binds deterministic
     e03e22c testsuite: performGC requires SMP support for 'qg' option
     d9d201c testsuite: 'threaded2' tests require '-N' RTS option support
     e0071c3 unreg: handle CmmStack in C codegen (unbreaks '-g')
     8995865 Update primitive/vector submodules
     62f0fbc Update parallel submodule
     8160f42 Add subWordC# on x86ish
     7a48e6c Make ghc-cabal's `System.Directory` import more robust
     6bef55c Fix documentation build on windows
     e2a78ee Signals: Ensure libdw session is freed
     8f02baa Remove Data.List.NonEmpty.{words,unwords,lines,unlines}
     bc7cc25 disable large address space on OpenBSD
     da1a8da llvmGen: Fix build with Clang
     8fd5cff llvmGen: Really fix build with Clang
     3021cc0 Add rts/Linker support for more than 64k sections
     31bcf9b Apply WERROR only to stage2 HC options
     c3b0215 Provide a utility to check API Annotations docs
     4ad2a8f rts/posix: Reduce heap allocation amount on mmap failure
     c8e866a Enforce linkage with pthread library on OpenBSD
     184dfce Linker: More uint64_t to uintptr_t fixes
     9f0ecb4 ghc-prim: Fix hs_ctz64 for powerpc
     62e1b35 Update array/stm/hpc/haddock submodules
     d2a7fb9 Update directory submodule
     12abc77 Update filepath submodule
     de8443c Update process submodule
     3238ef7 Update unix submodule
     32f92a3 Update hoopl submodule
     f8ba4b5 Bump `base` version to 4.9.0.0 (closes #11026)
     4b8b934 ghc-prim: add API delta as changelog (re #11043)
     84bf1eb Bump ghc-prim version to 0.5.0.0 (closes #11043)
     f16827f ApiAnnotations: BooleanFormula is not properly Located
     5a48180 keepCAFsForGHCi was broken
     677d768 DynFlags: -freverse-errors should be defFlag
     3431ad6 Update Cabal submodule
     6fb0ba6 Dwarf: Preserve stack pointer register
     76611d7 Dwarf.Types: Fix comment style
     159a1a2 cmm: Expose machine's stack and return address register
     d9f8862 StgStartup: Setup unwinding for stg_stop_thread
     bb446b2 Libdw: Remove special treatment for stg_stop_thread
     b8df858 Dwarf.Constants: Introduce Haddock sections
     52c6e3d Libdw: Fix symbol naming
     e9bfb3f Minor simplification in unariser pass:
     65f3c4c Change sphinx for documentation building on windows to the python3 version
     f46f32b EventLog: Loop fwrite if necessary during flush
     9fe5497 rts: Produce stack trace on fatal error
     1e2259b Update process submodule to process-1.4 release
     c00c5e5 get rid of Elf32/Elf64_Section as this is a non-portable Linux-ism.
     130ca3e Update filepath submodule for proper version
     5065cf4 base: Update `@since 4.8.2` annotations (re #11026)
     0bc8c6a base: GHC.RTS.Flags symbols really were introduced in 4.8.2
     83fd2ba base: Add changelog entry for 4.8.2.0
     8c80dcc base: Add new Control.Monad.Fail module (re #10751)
     b62605e Add `MonadPlus IO` and `Alternative IO` instances
     334fe45 rts/Hash: Constify HashTable* in lookupHashTable
     987d542 Build system: renable -Wall on validate (base)
     0e21678 Cabal-level sanity check to enforce Cabal flag-invariant
     22fcf9c Tweak settings for LLVM tests
     e547954 Use full name of LLVM program in error message
     10647d4 Linker: #ifdef cleanup
     a58eeb7 Call Arity: In "e x", the result of "x" is not shared
     ce1f160 Make GHCi & TH work when the compiler is built with -prof
     6e6438e Allow the GHCi Linker to resolve related dependencies when loading DLLs
     be88585 fix #10734 by adding braces to pretty-printing of let inside do
     2208011 Remove PatSynBuilderId
     d9c1450 Build system: use stage0 to build dll-split
     8262c95 Parser: allow empty multi-line deprecation warnings
     bd69f6f minor: use unless instead of (when . not)
     932d503 Replace freeVarsOf scrut with scrut_fvs to avoid repetition
     80d7ce8 Add pprSTrace for debugging with call stacks
     0e40c01 Quote file paths in linker scripts
     2b7d9c2 Add OpenBSD specific RTS symbols
     f405632 Fix sporadic failing ghci/Linker/Dyn tests
     3cfe60a Abstract TFs can have injectivity information
     96621b1 Associate pattern synonyms with types in module exports
     5eb56ed Fix link in documentation
     fbc2537 OPTIONS_GHC compiler flags may contain spaces (#4931)
     ea8c116 Remove unused field in ConDecl
     f0f9365 Remove fun_infix from Funbind, as it is now in Match
     109d7ce Systools: read ELF section without calling readelf
     fa61edd Improve documentation of Data.List.lines:
     0f49508 Put kind variables before type variables when specializing
     badf5d5 Detect invalid foreign imports in bytecode compiler
     fb0d512 nativeGen.PPC: Fix shift arith. right > 31 bits
     afbd30b mkGadtDecl no longer in P monad
     63cad5d Rename bundled pattern synonym tests to reflect new terminology
     a038b72 Remove redundant test.
     9bea234 fix RTS Linker on platforms without SHN_XINDEX support
     4a32bf9 Implement function-sections for Haskell code, #8405
     e090f1b Change demand information for foreign calls
     8755719 rules/haddock: Set __HADDOCK_VERSION__
     351de16 New magic function for applying realWorld#
     ac2e1e5 T10678: Fix bytes allocated statistic
     5d6133b Ignore comments in getOptions
     2290c8b APIAnnotations:add Locations in hsSyn for layout
     e66f79d Give helpful advice when a fully qualified name is not in scope
     b8d263d Turn ImportedModsVal into a data type
     5a86292 Remove imv_empty from ImportedModsVal
     8868ff3 Update note for Parent to explain PatternSynonym.
     8988be8 Make 'error' include the CCS call stack when profiled
     3353f62 Rip out __HADDOCK__ references
     5488422 Fix bootstrapping with GHC 7.10.1
     46a03fb Implement the Strict language extension
     fe95463 ApiAnnotations: Add SourceText for unicode tokens
     ee91482 ApiAnnotations : ITopenExpQuote needs SourceText
     83b214d RtsFlags: Clean up stale CPP
     b8a849b users-guide: Limit column width
     69822f0 RtsFlags: Refactor some of the deeper switches
     7485d0c ghc.mk: Make install_docs rule sh-compatible
     82cf672 haddock.mk: Use \{1,\} instead of \+
     3773e91 Use TcM instead of it's expanded form, in TcSplice
     741cf18 Weaken monadic list operations to Applicative
     e2d9821 Data.List.isSubsequenceOf documentation clarification
     2d1a563 Implement support for user-defined type errors.
     3d88e89 s/FrontendMerge/FrontendInterface/g
     9193629 Move usage calculation to desugaring, simplifying ModGuts.
     ac1a379 Revert "Unify hsig and hs-boot; add preliminary "hs-boot" merging."
     df8169c Bump process submodule
     4e74ef9 T9181: Fix testsuite output
     615ba5f Remove orphan Functor instance of Data.Graph.SCC
     7c9cbfd template-haskell: drop `TemplateHaskell` requirement
     b3d6c0f Update Cabal submodule for new known extension
     8ad9e74 Make `timer_create(CLOCK_REALTIME)` autoconf test more reliable
     acce37f Fix archive loading on Windows by the runtime loader
     7b962ba Implement OverloadedLabels
     233d131 MonadFail proposal, phase 1
     98a4fa5 DynFlags: Don't list TemplateHaskell as supported if it's not
     11e336e More import related hints
     f405e1e Disable failed specialisation warnings by default & update documentation.
     f9e17fd Add -fwarn-missing-monadfail-instance to mkUserGuidePart
     6b3d5b5 rts: Kill PAPI support
     c945c90 base: Documentation for TypeError
     112ce87 docs: Ignore Sphinx doctrees produced by manpage build
     3ee0c14 Improve MonadFail errors by mentioning the pattern
     2f7e895 users-guide: Give links more contrast
     a0f977e relnotes: Update base version
     8eefdf0 users-guide: Use tango pygments style
     02eb44d users-guide: Fix typo in conf.py
     2d0e1db Comments only
     8e8d26a Comments on TcRnTypes.canDischarge
     07eb258 Refactor HsExpr.RecordCon, RecordUpd
     c61759d Fix inconsistent pretty-printing of type families
     cc79dd1 users-guide: Move <h1> outside of <a> tag
     971f2c9 Correct &gt; to > in user's guide
     a41830f Mention "-XMonadFailDesugaring" in the docs
     a586622 Release Notes: Mention out-of-scope error message improvements
     2442038 Fix interaction of DuplicateRecordFields and GHC.Generics
     3e2a4ee Fix broken build-system when libffi uses install-sh
     65d7ff0 Make `derivedConstants` more crosscompile-friendly
     7dfde0e derivedConstants: Add support for AIX
     c5d8162 Make GHC aware of OSAIX and AixLD
     75036aa Set AIX specific CFLAGS flags
     fce0465 Unbreak Text.Read.Lex.lex on Unicode symbols
     d732ce0 Bump process submodule
     b72ca3e Pattern Synonym Documentation
     a689c8e ghci: don't let ctags/etags overwrite source files
     1994304 user's guide: Fix some accidental triple-` quote
     998c371 users-guide: Fix version number
     7e6dcf4 base: Delete errant GHC/Stack.hsc
     f40fe62 Follow-up fixup to c5d8162d230c373
     7f77e4e Fix Windows builds after D1242
     d585073 RtsFlags: Fix const warning
     192dd06 Suppress conflicting types for builtins warnings
     6664ab8 Add DVarSet - a deterministic set of Vars
     2325bd4 Create a deterministic version of tyVarsOfType
     b98ff3c Function definition in GHCi
     a703fbc Remove accidentally added T10359 blob
     4976ab2 Follow-up fix to 3e2a4eefbed7002437c3f (re #11109)
     638fde5 Add comment to Parser.y re extra API Annotation
     64737f2 New expected test output for 32 bit platforms
     3df9563 ApiAnnotations: Make all RdrName occurences Located
     6393dd8 Make abstractVars deterministic in SetLevel
     02c689c build.mk.sample: Document meaning of WERROR
     5d6cfbc Rip out Papi configure check
     7c9a04d Add a note explaining why every RdrName is Located
     dbad0d5 Libdw: Fix build on 32-bit platforms
     70ee638 Libdw: Fix initial register collection on i386
     36b2139 rts: Expose more libdw symbols
     a3a8ce6 rts: Add simple resource pool
     6fbf22d rts: Add LibdwPool, a pool for libdw sessions
     bb249aa base: Add Haskell interface to ExecutionStack
     7aaeaf8 Support multiple debug output levels
     40be909 Dwarf: Ensure tick parentage is preserved
     9471562 Output source notes in extended DWARF DIEs
     5955510 Improve constraint-used-as-type error msg
     70efb62 Add tests/monadfail/Makefile
     e587217 Add the rest of the notes for Located RdrName
     1c45f41 rts: Always export Libdw* symbols
     12dbc89 Add `PrelNames.thenAName` for `Applicative(*>)`
     f09f247 Implement new `-fwarn-noncanonical-monad-instances`
     c05fddd Rearrange error msgs and add section markers (Trac #11014).
     6d14793 Add -Wcompat warning flag group
     e506f02 Rewrite checkUniques and incorporate into validate
     8c5fe53 DynFlags: Update comments to reflect new users guide
     8dc6da8 Comments only
     5e04c38 Simplify the MonadFail code
     76f3142 DynFlags: Drop stale comment
     9032d05 update link to MonadFail proposal
     924f851 Refactor default methods (Trac #11105)
     e9a4c09 Comments only
     e913676 Add a simplifier trace for eta-expansion
     9aa9458 Note STM's vulnerability to non-allocating loops
     c7a058f User's Guide: Add links to MFP wiki page
     5699ac9 User documentation for DuplicateRecordFields
     d2a2d5e Note #11108 in the bugs section of users guide
     c4308b4 rts/Pool: Add poolTryTake
     1712a9e LibdwPool: Use poolTryTake
     ba14f04 Libdw: Handle failure to grab session for location lookup
     d25f853 Update transformers submodule
     49aae12 Check arity on default decl for assoc types
     583867b Update haskeline & terminfo submodules
     85fcd03 Implement new -XTemplateHaskellQuotes pragma
     72e3620 ghci: Add support for prompt functions
     55c737f ghc-pkg: print version when verbose
     399a5b4 Remove deprecated quasiquoter syntax.
     71c0cc1 GHCi should not defer typed holes
     54a9456 Update containers submodule
     616aceb Update deepseq submodule
     5897213 Remove redundant `#if`s
     f101a82 ghci: Refactor handling of :show
     bcd55a9 Some improvements on CoreToDos passed to plugins
     290def7 Implement warnings for Semigroups as parent of Monoid
     afb7213 MkId: Typos in comments
     14d0f7f Build system: Add stage specific SRC_HC_(WARNING_)OPTS
     6dce643 Fix grammar and typo in TcTyDecls
     36c1247 Remove duplicated line
     44c3e37 Fix warning about unused pattern variable
     b432e2f Make the determinism tests more robust
     1e041b7 Refactor treatment of wildcards
     218fdf9 Make the order of fixities in the iface file deterministic
     741f837 Implement more deterministic operations and document them
     52b02e6 Comments only (isIrrefutablePat)
     b564731 Comments (TcSMonad)
     d00cdf2 Revert "ghci: Add support for prompt functions"
     1caff20 StgSyn: Remove unused SRT constructor
     c75948b Move Stg-specific code from DynFlags to SimplStg
     d4d54b4 Remove *.xml from gitignore
     a12e47b Avoid panic due to partial ieName
     8cba907 Create empty dump files when there was nothing to dump
     0d1a2d2 ErrUtils: Spruce up Haddocks
     e7929ba Update bytestring submodule
     d25f3c0 users_guide/glasgow_exts.rst: fix link markup
     8a50610 Major Overhaul of Pattern Match Checking (Fixes #595)
     43a31fe testsuite: haddock.compiler: Bump expected allocations
     a034031 extending_ghc.rst: fix broken link (Trac #10950)
     c5597bb Revert "Create empty dump files when there was nothing to dump"
     7b29b0b Fix haddock syntax
     0dd61fe Kill redundant patterns
     934b3a0 Update test output
     40fc353 Bump hoopl submodule
     ae4398d Improve performance for PM check on literals (Fixes #11160 and #11161)
     99d01e1 Remove unused import in deSugar/TmOracle.hs
     7af29da Use Autoconf's AC_USE_SYSTEM_EXTENSIONS
     cd9f3bf RTS: Rename InCall.stat struct field to .rstat
     6ef351d On AIX we need -D_BSD defined in <Stg.h>
     d40f5b7 PmExpr: Fix CPP unacceptable too clang's CPP
     36a208f Use builtin ISO 8859-1 decoder in mkTextEncoding
     befc4e4 Check: More Clang/CPP wibbles
     e9220da Bump allocations for T783
     dc33e4c T5642 is broken
     96e67c0 T5642: Skip it entirely
     5b2b7e3 Make callToPats deterministic in SpecConstr
     1c9fd3f Case-of-empty-alts is trivial (Trac #11155)
     28035c0 Add derived constraints for wildcard signatures
     1cb3c8c Wibbles only
     822141b Make -dppr-debug show contents of (TypeError ...)
     1160dc5 Fix egregious error in eta-reduction of data families
     31b482b Minor refactoring of user type errors
     67565a7 Tidy user type errors in checkValidType
     43a5970 Comments only
     16aae60 T5642: Fix skip usage
     caa6851 testsuite: Rename pmcheck/T7669 to pmcheck/T7669a
     d4bf863 Update peak_megabytes_allocated for T9675
     020375d Add linter to check for binaries accidentally added to repository
     901cab1 lint: Add linter to catch uses of ASSERT macro that Clang dislikes
     c865c42 StgCmmMonad: Implement Outputable instance for Sequel for debugging
     e2c518e libdw: enable support only on i386 and amd64
     81cf200 pmcheck: Comments about term equality representation
     406444b pmcheck: Comments about undecidability of literal equality
     8f28797 Fix broken linters when using python3
     c714f8f Use git.h.o copy of arcanist-external-json-linter
     a14296c Temporarily disable external-json linters
     51d08d8 Enable non-canonical Monad instance warnings for stage1/2
     314bc99 ghc.mk: cleanup: use tab consistently
     d6512c7 ghc.mk: don't run mkUserGuidePart more than once
     13ab2c6 ghc.mk: fix docs re-rebuilding
     5f1e42f Allow to compile OSMem.c when MEM_NORESERVE is not available
     df67940 Make ghc.mk compatible with pedantic /bin/sh impls
     986ceb1 Implement new `-fwarn-noncanonical-monoid-instances`
     8b42214 Tweak use of AC_USE_SYSTEM_EXTENSIONS
     be92c28 Update hoopl submodule
     f5127c8 linters/check-cpp: Don't produce debug log
     3ea4fb7 Documentation: escape characters in template-haskell Haddocks
     42a5469 Ignore generated linter.log
     3d55e41 ghc-pkg: Restore old behavior in colored version; fixes 6119
     8cef8af Re-export data family when exporting a data instance without an export list
     91e985c Minor stylistic fixes in glasgow_exts.rst
     2110037 Add isImport, isDecl, and isStmt functions to GHC API
     d4bcd05 rts: Remove space before argument list in ASSERTs
     700c42b Use TypeLits in the meta-data encoding of GHC.Generics
     51a5e68 Refactor ConDecl
     1bd40c8 Move checking for missing signatures to RnNames.reportUnusedNames
     151c4b0 ghc-pkg: don't sort packages unnecessarily
     04e1c27 rts: One more Clang-unfriendly CPP usage
     0933331 Re-use `transformers`'s `MaybeT` rather than our own
     b292720 Remove redundant CPP conditionals
     834f9a4 Get rid of tcView altogether
     2f6e87a Introduce HasGhciState class and refactor use-sites
     9f4ca5a Associate ErrorCall pattern with ErrorCall type
     fd3b845 Make HasDynFlags more transformers friendly
     7a40a6c Update libffi-tarballs submodule to libffi 3.1 (re #10238)
     bb753c5 Rename s/7.12.1/8.0.1/ two minor occurences
     2cfa5db Fix double MaybeT instance
     2106d86 Fix typo sneaked in with fd3b845c01aa26b6e5
     69c3964 docs/glasgow_exts: Use warning admonition
     e792711 users_guide: Show sub-sub-sections in ToC
     aa6ae8a Comments only
     6c794c3 Comments about polymorphic recursion
     d7729c7 An assortment of typos
     7997d6c Refactor GHCi Command type; allow "hidden" commands
     31bddc4 Add missing whitespace in toArgs' error msg
     af77089 Fix DeriveAnyClass (Trac #9968)
     e9ea020 Comments only
     8317893 Improve documentation for DeriveAnyClass
     688069c More typos in comments/docs
     602889a Test Trac #11192
     f4f00c0 Test Trac #11187
     41ef8f7 Make sure PatSyns only get added once to tcg_patsyns
     f7c17c8 T7478: Don't expect broken on Darwin
     5447c20 Mark retc001 as broken on Darwin
     262954c T4801: Update expected allocations on Darwin
     c205aeb Removed colon append operation (fixes #10785)
     b138248 Improved data family export documentation
     ceaf0f4 testsuite: Only run recomp015 on ELF-based platforms
     6e56ac5 Fix infix record field fixity (#11167 and #11173).
     6746549 Add kind equalities to GHC.
     5183109 Revert README.md changes from 6746549772c5
     a6e0394 haddock: Fix submodule commit to point to ghc-head
     b5d5d83 Revert .gitmodules changes from 6746549772c5
     a459451 rm rae.txt
     68f198f Test case for #7961.
     779dfea Test #9017 in polykinds/T9017
     a3c2a26 Frontend plugins.
     1883afb Implement -fwarn-missing-pat-syn-sigs
     3ec8288 Rework the Implicit CallStack solver to handle local lets.
     4935b48 Make -XStrict imply -XStrictData
     3640ae9 Dwarf: Use .short instead of .hword on Darwin
     aaed24a Build system: fix 'make install-strip' in bindist
     9934819 Refactor type families in Template Haskell
     59cc6ed Fix release notes markup
     669c5ed Remove redundant imports
     f48015b configure: add support for 'sh4' (Trac #11209)
     0bf0cf9 Update Cabal submodule
     fcc6b1d Use idiomatic way to tell Autoconf the c compiler
     baed2f5 Don't pass CC= explicitly to `./configure` scripts
     65920c9 Some more typos in comments
     04ab55d Use Cxt for deriving clauses in TH (#10819)
     023f11f Suggest import Data.Kinds when * is out of scope
     419b6c0 Make binds in do-blocks strict when -XStrict (#11193)
     59d3948 Add testcase for #11216
     402bbe6 Add IsString Outputable.SDoc instance
     05fe546 Test #9632 in dependent/should_compile/T9632
     ddde542 DynFlags Remove -fwarn-context-quantification flag
     9017f16 Mention "handle is semi-closed" in error messages
     05a5ebe Fix runghc when $1_$2_SHELL_WRAPPER = NO
     6d9c18c DynFlags: remove Opt_Static
     33742db DynFlags: delete function that doesn't do anything
     f4dd486 Document -XOverloadedLabels
     8e6f9bf TysWiredIn: Fix a comment - Note [TYPE] is in TysPrim
     4c9d1ea Update expected test output for 32 bit platforms
     f4d90f9 Reset process submodule to v1.4.1.0 release tag
     d1ca5d2 Fix formatting complaint from Sphinx
     98cdaee Improve documentation for -XStrict
     b8ca645 Comments on equality types and classes
     6eabb6d Allow recursive (undecidable) superclasses
     947e44f Comment layout only
     e2c9173 Narrow scope of special-case for unqualified printing of names in core libraries
     758e6b3 base: NonEmpty: Fix documentation example
     a701694 Add testcase for #11224
     28638df primops: Mark actions evaluated by `catch*` as lazy
     c1e2553 Expose enabled language extensions to TH
     50c795c Update pretty submodule to v1.1.3.2 release
     3a48e6e Update binary submodule to binary-0.8 snapshot
     2206fa8 Add `-W(no-)xxx` aliases for `-f(no-)warn-xxx` flags
     437ebdd Start using `-W` instead of `-f(no-)warn` in some places
     d36e9e1 GHC.Stack: Fix Haddock markup
     4c7da9c Update haddock submodule
     ab79ed7 Improve detection of `fdatasync(2)` (re #11137)
     11b9ada Synchronize Haddock submodule with master branch
     efaa51d Look through type synonyms in GADT kind signatures
     046b47a Note [The equality types story] in TysPrim
     b35cc1f Update Cabal submodule to latest snapshot
     1687f99 Update transformers submodule to latest v0.5.0.0
     6c9258d Add test for #10897
     7221ad7 GHC doesn't have a way to ask for user-package-db, so Cabal reimplemented it.
     4905b83 Remote GHCi, -fexternal-interpreter
     a6d664c accept output
     dd3837a Fix tests when run in parallel
     acd447e Bump haddock expected performance numbers
     b20a65d testsuite: Add missing LiteralsTest2.hs
     786d528 TcTypeable: Don't use bogus fingerprints when suppress-uniques is enabled
     62e60bb Fix haddock hyperlinker
     27f47cd Fix libffi dependency, and remove redundant LibFFI.hsc
     0cc4aad Build system: Cabalize genapply
     86ad116 Add Shake configuration to configure.ac
     109d847 Build system: Make cGhcRtsWithLibdw flag a proper Bool
     e58a936 rules/haddock: Add EXTRA_HADDOCK_OPTS flag
     4f870f8 Conditionally show plural "s" in warnings
     cab1316 Fix #11232.
     4b161c9 Reify DuplicateRecordFields by label, rather than by selector
     d3dac4e Add -fprint-typechecker-elaboration flag (fixes #10662)
     575f0ad users_guide: Remove extraneous vertical whitespace
     e7f22bf Improve pretty-printing in pprIfaceIdBndr
     e32c2e1 Remove unused T10524.stderr
     89d70f9 Update Cabal submodule
     aee58e1 T9961 allocations crept further upwards
     e2e24f2 Disable recomp015 on ARM
     ece8aff Remove warning-suppression flags for Cabal
     a2f04a2 Testsuite: #10712 is fixed
     9d9c534 Lexer: update outdated comments [skip ci]
     1b6323b IO Handles: update comments [skip ci]
     ae86eb9 Fix tcTyClTyVars to handle SigTvs
     1722fa1 Fix #11230.
     c1bd3d4 Build system: also put scripts in libexecdir/bin
     272e1cc Testsuite: allow spaces in TEST_HC passed in by the user
     116ba5e Build system: allow bindist without docs
     f1fa383 Suppress warnings when compiling primitive and random
     bc436f9 Testsuite: mark frontend01 conditionally expect_broken on #10301
     e0e03d5 Move Data.Functor.(Classes,Compose,Product,Sum) into base
     c5c72aa Update containers submodule to v0.5.7.0 release
     3dd06d5 Random typo fixes
     06cb695 ghci: fix UNREG build (missing fromJust import)
     98ccb72 Testsuite: widen lazy-bs-alloc 3->5%
     8d45ccd Testsuite Windows: fix sigof01m, sigof012m and sigof02dm
     dc8b647 Testsuite Windows: fix ghcpkg03 and ghcpkg05
     34393d9 Documentation for -fexternal-interpreter
     77b7f24 Use `-Wno-tabs` more targetted
     ba80fc6 Fix PowerPC build
     55e9ab8 Update directory submodule to v1.2.5.0 release
     83e4140 Comments only
     ed3bfca Update Win32 submodule to fix 77b7f24543f fallout
     8946ee6 GHCi.Run: Remove redundant language pragma
     53a567c configure.ac: Rename shake/ to build/
     f857d27 configure.ac: Rename build/ to shake-build/
     9d921d6 Test Trac #11248, #11249
     ff752a1 tcCheckSatisfiability: less aggressive superclass expansion
     987426c SrcLoc: Eliminate constructors of RealSrcSpan
     d6b91ea Add test for T11122
     4198b81 ghc.cabal: Backpack directory no longer exists
     0e9a331 LLVM backend: Show expected LLVM version in warnings/errors
     e02a4c2 Fix build for AArch64/Arm64
     9356393 Update terminfo submodule to v0.4.0.2 release
     97281b4 Update terminfo submodule to v0.7.2.2 release
     ccc5a1a Build system: fix 'make sdist'
     d1416c3 Update .mailmap [skip ci]
     5431273 Bump hsc2hs submodule
     b2670fc fix typo
     2cc5b60 Documentation, tests for hsc2hs's new #alignment macro
     b028384 Add -Nmax<n> RTS feature (#10728)
     59de6e8 Add sparc64 a known architecture (Ticket #11211)
     7b8a822 Make ghc-boot Hackage-ready
     64b6a76 Fix typo in 7b8a8222e8f0
     d8c8902 First pass at cleaning up ghci.cabal
     34eaf2b Fix two occurences of `x86_HOST_ARCH`
     bcc213d Update time submodule to v1.6 release
     dd56eb1 Merge new commands from ghci-ng (re #10874)
     59cc32c Update containers submodule to v0.5.7.1 release tag
     3b66960 Remove unused/redundant fields from ghc-cabal.
     f7bd37e aclocal.m4: Fix llc/opt detection code
     1a86413 Update binary submodule to final 0.8.0.0 release
     8d95412 Disallow empty where bindings in pattern synonym declarations.
     44640af Allow as-patterns in pattern synonym declarations.
     29ca4a1 DynFlags: call defaultWays when creating defaultFlags
     62155a6 TcTyClsDecls: use zipWith3M_ instead of generating triplets
     850710a TcTyClsDecls: Add a type annotation
     d8ed20c Add Location to RdrName in FieldOcc
     b225b23 Modify IsString String instance (fixes #10814)
     eb7796f Warn about unused type variables in type families
     edcf17b Move Const to own module in Data.Functor.Const and enable PolyKinds
     6457903 Implement phase 1 of expanded Floating
     9f23dd9 testsuite: Add ClassOperator testcase
     25db56c Minor clean-up to ghc-bin.cabal.in
     e29ee49 Fix AnnDotDot in module export
     99b956e Fix-up GHC 7.12 artifacts
     ee6fba8 Encode strictness in GHC generics metadata
     c8c44fd Maintain cost-centre stacks in the interpreter
     4bb9f88 TcTyClsDecls: Remove invalid comments about list monads
     fd1b5ae testsuite/ClassOperator: This actually should_fail
     a61e717 testsuite: Add testcase for #8316
     eeecb86 Add proper GADTs support to Template Haskell
     55250a6 Rename GHCi's UI modules into GHCi.UI(.*)
     ff3f918 Fix #11256 by not immediately erroring if we can't find a module.
     2dff6c1 Added missing instances for Identity and Const (#11210)
     1fcdcae testsuite/ClassOperator: Mark as compile_fail instead of should_fail
     fb3302c base: Add sections to changelog
     083b700 users_guide: Synchronize relnotes with base changelog
     c12fc2e Update hoopl submodule to final 3.10.2.1 release
     aa7fb9a Fix GHCi segfault in Windows 32bit
     ff92395 Make HsAppsType contents Located
     44de66b Update Cabal submodule to latest snapshot
     ea3f733 Comments only, about coercion holes
     b407bd7 Retain AnnTilde in splitTildeApps
     f975b0b Rework Template Haskell's handling of strictness
     6eabd93 Update stm submodule to v2.4.4.1 release
     29928f2 Fix grouping for pattern synonyms
     f40e122 Fix typechecking for pattern synonym signatures
     51d8330 Remove duplicate T11224 test definition
     7966eea Localize API Annotation in LInjectivtyAnn
     01b0461 Remove another duplicate test
     575a98e Refactor named wildcards (again)
     721d56d APIAnnotations:AnnComma in wrong place in qcnames1
     d3ce417 Tweak comments around UnivCos.
     21b25df CoercionN is not in scope in TyCoRep
     998739d Refactor package flags into several distinct types.
     1faf1fc Implement -hide-all-plugin-packages and -plugin-package(-id), fixing #11244
     3e99980 Update filepath submodule to latest snapshot
     5f08681 - fix tests on OpenBSD which requires _DYNAMIC symbol
     48e0634 Revert "Allow as-patterns in pattern synonym declarations."
     b55ad1b Wibble to error message in Trac #10426
     1963250 Comments and white space
     c069be8 Add a pattern-syn form of PromotionErr
     99eb002 Comments only
     6eb9dc9 Tidy up and comment wildcards in family instances
     ed213ea Test Trac #11274
     7ed0da6 Modify Nmax to maxN Trac #10728
     dab8e34 Delete incorrect *-ws-32 expected test output
     84f6739 - fix gc_thread related compilation failure on Solaris/i386 platform
     f13de71 Fix super-class cycle check
     b37f216 Comments only
     7824870 Fix ASSERT in buildPatSyn, and T10897 test
     380b25e Allow CallStacks to be frozen
     cb989e2 API Annotaions:add name in PatBind Match
     d1e9f82 Update tests for Trac #11039
     f141f41 Test #10432
     7cddcde Docs: -interactive-print should reside in registered package
     3221599 Make testsuite work again with Py3
     353e97a config.mk.in: Disable stripping by default on ARM
     3017cbc ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
     6ec236b Improve SimplUtils.interestingArg
     d990354 Improve the runRW magic in CorePrep
     fcc7498 Improve tracing a bit in CoreSubst
     1af0d36 Refactoring only
     e338376 Fix normalisation of TyCon representations
     48db13d Don't drop last char of file if -osuf contains dot
     2db18b8 Visible type application
     2032635 Testsuite: fix qq005 and qq006 (#11279)
     bc8cac1 Testsuite: mark T7681 expect_broken (#11287)
     5e4e9e0 Fix #11255.
     bd7ab66 Test #11254 in typecheck/should_compile/T11254
     1411eaf Note [TyBinder] in TyCoRep
     52da6bd Have mkCastTy look more closely for reflexivity.
     da69358 Fix #11287.
     b218241 Test #10589 in typecheck/should_compile/T10589
     05e3541 Test #10619 in typecheck/should_fail/T10619
     b78b5a6 Fix #11305.

From git at git.haskell.org  Tue Dec 29 12:48:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 12:48:05 +0000 (UTC)
Subject: [commit: ghc] master: drop obsolete/redundant OPTIONS pragma [skip
 ci] (7fef7fe)
Message-ID: <20151229124805.772563A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/7fef7fe926695aa099444e1d95357a0b108c7b5d/ghc

>---------------------------------------------------------------

commit 7fef7fe926695aa099444e1d95357a0b108c7b5d
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 29 13:48:47 2015 +0100

    drop obsolete/redundant OPTIONS pragma [skip ci]


>---------------------------------------------------------------

7fef7fe926695aa099444e1d95357a0b108c7b5d
 utils/genprimopcode/Main.hs | 1 -
 1 file changed, 1 deletion(-)

diff --git a/utils/genprimopcode/Main.hs b/utils/genprimopcode/Main.hs
index dc75570..781317a 100644
--- a/utils/genprimopcode/Main.hs
+++ b/utils/genprimopcode/Main.hs
@@ -1,4 +1,3 @@
-{-# OPTIONS -cpp #-}
 ------------------------------------------------------------------
 -- A primop-table mangling program                              --
 ------------------------------------------------------------------


From git at git.haskell.org  Tue Dec 29 12:59:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 12:59:10 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Introduce negative patterns for literals
 (addresses #11303) (80e2811)
Message-ID: <20151229125910.564963A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/80e28111389c4755b3d9683a9e2adb833799219d/ghc

>---------------------------------------------------------------

commit 80e28111389c4755b3d9683a9e2adb833799219d
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 29 13:58:21 2015 +0100

    Introduce negative patterns for literals (addresses #11303)


>---------------------------------------------------------------

80e28111389c4755b3d9683a9e2adb833799219d
 compiler/deSugar/Check.hs | 88 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 17 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index af37de5..3f5cfc0 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -88,16 +88,18 @@ data PatTy = PAT | VA -- Used only as a kind, to index PmPat
 -- the number of p1..pn that are not Guards
 
 data PmPat :: PatTy -> * where
-  PmCon :: { pm_con_con     :: DataCon
-           , pm_con_arg_tys :: [Type]
-           , pm_con_tvs     :: [TyVar]
-           , pm_con_dicts   :: [EvVar]
-           , pm_con_args    :: [PmPat t] } -> PmPat t
-           -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
-  PmVar :: { pm_var_id   :: Id    } -> PmPat t
-  PmLit :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
-  PmGrd :: { pm_grd_pv   :: PatVec
-           , pm_grd_expr :: PmExpr } -> PmPat 'PAT
+  PmCon  :: { pm_con_con     :: DataCon
+            , pm_con_arg_tys :: [Type]
+            , pm_con_tvs     :: [TyVar]
+            , pm_con_dicts   :: [EvVar]
+            , pm_con_args    :: [PmPat t] } -> PmPat t
+            -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
+  PmVar  :: { pm_var_id   :: Id    } -> PmPat t
+  PmLit  :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
+  PmNLit :: { pm_lit_id :: Id
+            , pm_lit_not :: [PmLit] } -> PmPat 'VA
+  PmGrd  :: { pm_grd_pv   :: PatVec
+            , pm_grd_expr :: PmExpr } -> PmPat 'PAT
 
 -- data T a where
 --     MkT :: forall p q. (Eq p, Ord q) => p -> q -> T [p]
@@ -656,9 +658,10 @@ process_guards  us  oversimplify gs
 pmPatType :: PmPat p -> Type
 pmPatType (PmCon { pm_con_con = con, pm_con_arg_tys = tys })
   = mkTyConApp (dataConTyCon con) tys
-pmPatType (PmVar { pm_var_id  = x }) = idType x
-pmPatType (PmLit { pm_lit_lit = l }) = pmLitType l
-pmPatType (PmGrd { pm_grd_pv  = pv })
+pmPatType (PmVar  { pm_var_id  = x }) = idType x
+pmPatType (PmLit  { pm_lit_lit = l }) = pmLitType l
+pmPatType (PmNLit { pm_lit_id  = x }) = idType x
+pmPatType (PmGrd  { pm_grd_pv  = pv })
   = ASSERT(patVecArity pv == 1) (pmPatType p)
   where Just p = find ((==1) . patternArity) pv
 
@@ -801,10 +804,11 @@ mkPmId2FormsSM ty = do
 -- * Converting between Value Abstractions, Patterns and PmExpr
 
 valAbsToPmExpr :: ValAbs -> PmExpr
-valAbsToPmExpr (PmCon { pm_con_con = c, pm_con_args = ps })
+valAbsToPmExpr (PmCon  { pm_con_con = c, pm_con_args = ps })
   = PmExprCon c (map valAbsToPmExpr ps)
-valAbsToPmExpr (PmVar { pm_var_id  = x }) = PmExprVar x
-valAbsToPmExpr (PmLit { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmVar  { pm_var_id  = x }) = PmExprVar x
+valAbsToPmExpr (PmLit  { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmNLit { pm_lit_id  = x }) = PmExprVar x
 
 -- Convert a pattern vector to a value list abstraction by dropping the guards
 -- recursively (See Note [Translating As Patterns])
@@ -1058,6 +1062,14 @@ cMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 (pm_con_con p)
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- CConNLit
+cMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = cMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- CConCon
 cMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1088,6 +1100,15 @@ cMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
     lit_abs = PmLit l
     cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- CLitNLit
+cMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+  | all (not . eqPmLit l) lits
+  = cMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 cMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.cMatcher: Guard"
 
@@ -1115,6 +1136,10 @@ uMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     y  = mkPmId us1 (pmPatType p)
     cs = [TmConstraint (PmExprVar y) (PmExprLit l)]
 
+-- UConNLit
+uMatcher us gvsa (p@(PmCon {})) ps (PmNLit { pm_lit_id = x }) vsa
+  = uMatcher us gvsa p ps (PmVar x) vsa
+
 -- UConCon
 uMatcher us gvsa ( p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                  (va@(PmCon { pm_con_con = c2, pm_con_args = args2 })) vsa
@@ -1146,7 +1171,19 @@ uMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmVar x) vsa
 -- ULitVar
 uMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
   = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
-            (non_match_cs `mkConstraint` (PmVar x `mkCons` vsa))
+            (non_match_cs `mkConstraint` (PmNLit x [l] `mkCons` vsa))
+  where
+    match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
+   -- See Note [Representation of Term Equalities]
+    non_match_cs = [ TmConstraint falsePmExpr
+                                  (PmExprEq (PmExprVar x) (PmExprLit l)) ]
+
+-- ULitNLit
+uMatcher us gvsa (p@(PmLit l)) ps (va@(PmNLit x lits)) vsa
+  | all (not . eqPmLit l) lits
+  = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
+            (non_match_cs `mkConstraint` (PmNLit x (l:lits) `mkCons` vsa))
+  | otherwise = va `mkCons` vsa
   where
     match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
    -- See Note [Representation of Term Equalities]
@@ -1178,6 +1215,14 @@ dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 con
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- DConNLit
+dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = dMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- DConCon
 dMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1209,6 +1254,15 @@ dMatcher us gvsa (PmLit l) ps (PmVar x) vsa
   where
     cs = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- DLitNLit
+dMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+  | all (not . eqPmLit l) lits
+  = dMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 dMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.dMatcher: Guard"
 


From git at git.haskell.org  Tue Dec 29 12:59:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 12:59:12 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm's head updated: Introduce negative patterns
 for literals (addresses #11303) (80e2811)
Message-ID: <20151229125912.994CC3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/gadtpm' now includes:

     5e4e9e0 Fix #11255.
     bd7ab66 Test #11254 in typecheck/should_compile/T11254
     1411eaf Note [TyBinder] in TyCoRep
     52da6bd Have mkCastTy look more closely for reflexivity.
     da69358 Fix #11287.
     b218241 Test #10589 in typecheck/should_compile/T10589
     05e3541 Test #10619 in typecheck/should_fail/T10619
     0fda908 Bump Haddock submodule again
     8bf2d8f Linker: Fix cut-and-paste error in debug output
     422107e T10518: Ensure literal has 64-bit type
     e39d10f testsuite/T8274: Remove 32-bit test output
     fb5d26d testsuite/codegen: Add missing dummy Makefiles
     0b0652f testsuite/T9430: Fix word-size dependence
     b62215d Linker: Reenable Thumb support
     e8672e5 libraries/ghci: Implement mkJumpToAddr for ppc64
     909bbdb Linker(ELF): Fix addProddableBlocks usage
     da5e693 testsuite/joao-circular: Clean up test results
     a3b34b6 Clean up a botched merge.
     d1ebbb0 testsuite/CmmSwitchTest: Mark as broken on 32-bit platforms
     11778f7 Add testcase for getSizeofMutableByteArray#
     07b3be7 integer-gmp: Fix #11296
     bec5350 Adding flags: -ffull-guard-reasoning and too-many-guards
     c8d0af3 RTS: Detect powerpc64le as ELF 64-bit system
     1b00016 The -package flag should select match from right-most package db.
     0054bcd rts/Linker(ARM): Ensure all code sections are flushed from cache
     01299ca Synchronise ghci-package version with ghc-package
     4a10ecb Patch-level increment integer-gmp to 1.0.0.1
     e01aa22 Patch-level increment integer-simple version 0.1.1.1
     c7830bd Update hpc submodule to 0.6.0.3 version
     3aa4a45 Update filepath submodule to v1.4.1.0 rls tag
     295085c Update time submodule to latest snapshot
     bab5109 Make git-committer inferred version-date TZ-invariant
     80e2811 Introduce negative patterns for literals (addresses #11303)

From git at git.haskell.org  Tue Dec 29 13:12:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 13:12:41 +0000 (UTC)
Subject: [commit: ghc] master: Fix panic when using pattern synonyms with
 DisambiguateRecordFields (4f69203)
Message-ID: <20151229131241.4554D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/4f69203dd7892d3640e871c5914b7ee2be5f5dff/ghc

>---------------------------------------------------------------

commit 4f69203dd7892d3640e871c5914b7ee2be5f5dff
Author: Adam Gundry <adam at well-typed.com>
Date:   Tue Dec 29 13:42:32 2015 +0100

    Fix panic when using pattern synonyms with DisambiguateRecordFields
    
    This fixes a `find_tycon` panic when constructing a record pattern
    synonym when `DisambiguateRecordFields` (turned on by `RecordWildCards`)
    is enabled.  The handling of record wild cards in such constructions
    isn't completely satisfactory, but doing better will require the
    `Parent` type to be more informative, as I'll explain on #11228.
    
    Test Plan: New test patsyn/should_compile/T11283.hs
    
    Reviewers: mpickering, austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1695
    
    GHC Trac Issues: #11283


>---------------------------------------------------------------

4f69203dd7892d3640e871c5914b7ee2be5f5dff
 compiler/rename/RnPat.hs                           | 26 +++++++++++++---------
 testsuite/tests/patsyn/should_compile/T11283.hs    |  7 ++++++
 .../tests/patsyn/should_compile/T11283.stderr      |  5 +++++
 testsuite/tests/patsyn/should_compile/all.T        |  1 +
 4 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/compiler/rename/RnPat.hs b/compiler/rename/RnPat.hs
index 38c832c..8ee2141 100644
--- a/compiler/rename/RnPat.hs
+++ b/compiler/rename/RnPat.hs
@@ -599,10 +599,10 @@ rnHsRecFields ctxt mk_arg (HsRecFields { rec_flds = flds, rec_dotdot = dotdot })
                    = rdr `elemLocalRdrEnv` lcl_env
                    || notNull [ gre | gre <- lookupGRE_RdrName rdr rdr_env
                                     , case gre_par gre of
-                                        ParentIs p               -> p /= parent_tc
-                                        FldParent { par_is = p } -> p /= parent_tc
-                                        PatternSynonym           -> True
-                                        NoParent                 -> True ]
+                                        ParentIs p     -> Just p /= parent_tc
+                                        FldParent p _  -> Just p /= parent_tc
+                                        PatternSynonym -> False
+                                        NoParent       -> True ]
                    where
                      rdr = mkVarUnqual lbl
 
@@ -629,19 +629,23 @@ rnHsRecFields ctxt mk_arg (HsRecFields { rec_flds = flds, rec_dotdot = dotdot })
     -- When disambiguation is on, return name of parent tycon.
     check_disambiguation disambig_ok mb_con
       | disambig_ok, Just con <- mb_con
-      = do { env <- getGlobalRdrEnv; return (Just (find_tycon env con)) }
+      = do { env <- getGlobalRdrEnv; return (find_tycon env con) }
       | otherwise = return Nothing
 
-    find_tycon :: GlobalRdrEnv -> Name {- DataCon -} -> Name {- TyCon -}
+    find_tycon :: GlobalRdrEnv -> Name {- DataCon -} -> Maybe Name {- TyCon -}
     -- Return the parent *type constructor* of the data constructor
-    -- That is, the parent of the data constructor.
+    -- (that is, the parent of the data constructor),
+    -- or 'Nothing' if it is a pattern synonym.
     -- That's the parent to use for looking up record fields.
     find_tycon env con
       | Just (AConLike (RealDataCon dc)) <- wiredInNameTyThing_maybe con
-      = tyConName (dataConTyCon dc)   -- Special case for [], which is built-in syntax
-                                      -- and not in the GlobalRdrEnv (Trac #8448)
-      | [GRE { gre_par = ParentIs p }] <- lookupGRE_Name env con
-      = p
+      = Just (tyConName (dataConTyCon dc))
+        -- Special case for [], which is built-in syntax
+        -- and not in the GlobalRdrEnv (Trac #8448)
+      | [gre] <- lookupGRE_Name env con
+      = case gre_par gre of
+          ParentIs p -> Just p
+          _          -> Nothing
 
       | otherwise
       = pprPanic "find_tycon" (ppr con $$ ppr (lookupGRE_Name env con))
diff --git a/testsuite/tests/patsyn/should_compile/T11283.hs b/testsuite/tests/patsyn/should_compile/T11283.hs
new file mode 100644
index 0000000..ed7471d
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/T11283.hs
@@ -0,0 +1,7 @@
+{-# LANGUAGE PatternSynonyms, RecordWildCards #-}
+module T11283 where
+data P = MkP Bool
+pattern S{x} = MkP x
+d = S{x = True}
+e = S{..}
+f S{x=x} = x
diff --git a/testsuite/tests/patsyn/should_compile/T11283.stderr b/testsuite/tests/patsyn/should_compile/T11283.stderr
new file mode 100644
index 0000000..86d8575
--- /dev/null
+++ b/testsuite/tests/patsyn/should_compile/T11283.stderr
@@ -0,0 +1,5 @@
+
+T11283.hs:6:5: warning:
+    ? Fields of ?S? not initialised: x
+    ? In the expression: S {..}
+      In an equation for ?e?: e = S {..}
diff --git a/testsuite/tests/patsyn/should_compile/all.T b/testsuite/tests/patsyn/should_compile/all.T
index e1c8243..880d6b2 100644
--- a/testsuite/tests/patsyn/should_compile/all.T
+++ b/testsuite/tests/patsyn/should_compile/all.T
@@ -46,3 +46,4 @@ test('T10897', normal, multi_compile, ['T10897', [
                                       ], '-v0'])
 test('T11224b', normal, compile, [''])
 test('MoreEx', normal, compile, [''])
+test('T11283', normal, compile, [''])


From git at git.haskell.org  Tue Dec 29 13:12:43 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 13:12:43 +0000 (UTC)
Subject: [commit: ghc] master: ghc/Main: Update list of --print modes (af92ef3)
Message-ID: <20151229131243.E2E163A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/af92ef3eb9e70e59dfdc81cdb88f527c2eb82399/ghc

>---------------------------------------------------------------

commit af92ef3eb9e70e59dfdc81cdb88f527c2eb82399
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Mon Dec 28 15:14:18 2015 +0100

    ghc/Main: Update list of --print modes
    
    Test Plan: Validate
    
    Reviewers: austin, hvr
    
    Reviewed By: hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1712
    
    GHC Trac Issues: #9614


>---------------------------------------------------------------

af92ef3eb9e70e59dfdc81cdb88f527c2eb82399
 ghc/Main.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ghc/Main.hs b/ghc/Main.hs
index a47678b..31a9b91 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -598,8 +598,8 @@ mode_flags =
           "LibDir",
           "Global Package DB",
           "C compiler flags",
-          "Gcc Linker flags",
-          "Ld Linker flags"],
+          "C compiler link flags",
+          "ld flags"],
     let k' = "-print-" ++ map (replaceSpace . toLower) k
         replaceSpace ' ' = '-'
         replaceSpace c   = c


From git at git.haskell.org  Tue Dec 29 13:12:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 13:12:46 +0000 (UTC)
Subject: [commit: ghc] master: Fix GEq1 when optimizations are enabled
 (8e735fd)
Message-ID: <20151229131246.A45293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8e735fd0f88454b74fbb866a59b608925a2b3e48/ghc

>---------------------------------------------------------------

commit 8e735fd0f88454b74fbb866a59b608925a2b3e48
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Tue Dec 29 13:43:52 2015 +0100

    Fix GEq1 when optimizations are enabled
    
    When optimizations are enabled, primitive string literals can be
    inlined, which can create two copies of a string constant with different
    addresses. We want to avoid this behavior at all costs in the `GEq1`
    test, since the output depends on the result of `eqAddr#`. We prevent
    such inlining through use of the `{-# NOINLINE #-}` pragma.
    
    Fixes #11292.
    
    Test Plan: Validate with T11292
    
    Reviewers: thomie, austin, bgamari
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1714
    
    GHC Trac Issues: #11292


>---------------------------------------------------------------

8e735fd0f88454b74fbb866a59b608925a2b3e48
 testsuite/tests/generics/GEq/GEq1.hs | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/testsuite/tests/generics/GEq/GEq1.hs b/testsuite/tests/generics/GEq/GEq1.hs
index d6ca0b0..54867db 100644
--- a/testsuite/tests/generics/GEq/GEq1.hs
+++ b/testsuite/tests/generics/GEq/GEq1.hs
@@ -46,9 +46,11 @@ f2 = F 0.0 4 'h'
 
 u0 :: U Int
 u0 = U 1 "1"# '1'# 1.0## 1.0# 1# 1##
+{-# NOINLINE u0 #-}
 
 uf0 :: UF Int Int Int
 uf0 = UF 2 2 "1"# '2'# 2.0## 2.0# 2# 2##
+{-# NOINLINE uf0 #-}
 
 -- Generic instances
 instance                   GEq C


From git at git.haskell.org  Tue Dec 29 13:12:49 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 13:12:49 +0000 (UTC)
Subject: [commit: ghc] master: Export some useful GHC API functions. (5bb7fec)
Message-ID: <20151229131249.6C03F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5bb7fecb09f828ea41e5b5a295ea159fa405dcc5/ghc

>---------------------------------------------------------------

commit 5bb7fecb09f828ea41e5b5a295ea159fa405dcc5
Author: Edward Z. Yang <ezyang at cs.stanford.edu>
Date:   Tue Dec 29 13:43:02 2015 +0100

    Export some useful GHC API functions.
    
    Working on some code using the GHC API, I found these
    functions were useful and wished they were exported.  This
    commit exports them.
    
    Signed-off-by: Edward Z. Yang <ezyang at cs.stanford.edu>
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: hvr, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1710


>---------------------------------------------------------------

5bb7fecb09f828ea41e5b5a295ea159fa405dcc5
 compiler/main/DriverPhases.hs   | 20 ++++++++++++++++++++
 compiler/main/DriverPipeline.hs | 20 +++++++++++++++++++-
 compiler/main/Finder.hs         |  2 ++
 compiler/main/GhcMake.hs        |  8 ++++++++
 ghc/Main.hs                     |  8 +-------
 5 files changed, 50 insertions(+), 8 deletions(-)

diff --git a/compiler/main/DriverPhases.hs b/compiler/main/DriverPhases.hs
index ff6f8b8..84eee1b 100644
--- a/compiler/main/DriverPhases.hs
+++ b/compiler/main/DriverPhases.hs
@@ -25,6 +25,8 @@ module DriverPhases (
    isHaskellSigSuffix,
    isSourceSuffix,
 
+   isHaskellishTarget,
+
    isHaskellishFilename,
    isHaskellSrcFilename,
    isHaskellSigFilename,
@@ -42,6 +44,7 @@ import Outputable
 import Platform
 import System.FilePath
 import Binary
+import Util
 
 -----------------------------------------------------------------------------
 -- Phases
@@ -333,6 +336,23 @@ isDynLibSuffix platform s = s `elem` dynlib_suffixes platform
 isSourceSuffix :: String -> Bool
 isSourceSuffix suff  = isHaskellishSuffix suff || isCishSuffix suff
 
+-- | When we are given files (modified by -x arguments) we need
+-- to determine if they are Haskellish or not to figure out
+-- how we should try to compile it.  The rules are:
+--
+--      1. If no -x flag was specified, we check to see if
+--         the file looks like a module name, has no extension,
+--         or has a Haskell source extension.
+--
+--      2. If an -x flag was specified, we just make sure the
+--         specified suffix is a Haskell one.
+isHaskellishTarget :: (String, Maybe Phase) -> Bool
+isHaskellishTarget (f,Nothing) =
+  looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f
+isHaskellishTarget (_,Just phase) =
+  phase `notElem` [ As True, As False, Cc, Cobjc, Cobjcxx, CmmCpp, Cmm
+                  , StopLn]
+
 isHaskellishFilename, isHaskellSrcFilename, isCishFilename,
     isHaskellUserSrcFilename, isSourceFilename, isHaskellSigFilename
  :: FilePath -> Bool
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index ee07d54..4936ace 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -25,7 +25,7 @@ module DriverPipeline (
 
         -- Exports for hooks to override runPhase and link
    PhasePlus(..), CompPipeline(..), PipeEnv(..), PipeState(..),
-   phaseOutputFilename, getPipeState, getPipeEnv,
+   phaseOutputFilename, getOutputFilename, getPipeState, getPipeEnv,
    hscPostBackendPhase, getLocation, setModLocation, setDynFlags,
    runPhase, exeFileName,
    mkExtraObjToLinkIntoBinary, mkNoteObjsToLinkIntoBinary,
@@ -708,6 +708,9 @@ runHookedPhase pp input dflags =
 -- output.  All the logic about which filenames we generate output
 -- into is embodied in the following function.
 
+-- | Computes the next output filename after we run @next_phase at .
+-- Like 'getOutputFilename', but it operates in the 'CompPipeline' monad
+-- (which specifies all of the ambient information.)
 phaseOutputFilename :: Phase{-next phase-} -> CompPipeline FilePath
 phaseOutputFilename next_phase = do
   PipeEnv{stop_phase, src_basename, output_spec} <- getPipeEnv
@@ -716,6 +719,21 @@ phaseOutputFilename next_phase = do
   liftIO $ getOutputFilename stop_phase output_spec
                              src_basename dflags next_phase maybe_loc
 
+-- | Computes the next output filename for something in the compilation
+-- pipeline.  This is controlled by several variables:
+--
+--      1. 'Phase': the last phase to be run (e.g. 'stopPhase').  This
+--         is used to tell if we're in the last phase or not, because
+--         in that case flags like @-o@ may be important.
+--      2. 'PipelineOutput': is this intended to be a 'Temporary' or
+--         'Persistent' build output?  Temporary files just go in
+--         a fresh temporary name.
+--      3. 'String': what was the basename of the original input file?
+--      4. 'DynFlags': the obvious thing
+--      5. 'Phase': the phase we want to determine the output filename of.
+--      6. @Maybe ModLocation@: the 'ModLocation' of the module we're
+--         compiling; this can be used to override the default output
+--         of an object file.  (TODO: do we actually need this?)
 getOutputFilename
   :: Phase -> PipelineOutput -> String
   -> DynFlags -> Phase{-next phase-} -> Maybe ModLocation -> IO FilePath
diff --git a/compiler/main/Finder.hs b/compiler/main/Finder.hs
index dddc09a..2ac0737 100644
--- a/compiler/main/Finder.hs
+++ b/compiler/main/Finder.hs
@@ -17,6 +17,8 @@ module Finder (
     mkHomeModLocation,
     mkHomeModLocation2,
     mkHiOnlyModLocation,
+    mkHiPath,
+    mkObjPath,
     addHomeModuleToFinder,
     uncacheModule,
     mkStubPaths,
diff --git a/compiler/main/GhcMake.hs b/compiler/main/GhcMake.hs
index 843def1..9c6abb8 100644
--- a/compiler/main/GhcMake.hs
+++ b/compiler/main/GhcMake.hs
@@ -18,6 +18,8 @@ module GhcMake(
 
         topSortModuleGraph,
 
+        ms_home_srcimps, ms_home_imps,
+
         noModError, cyclicModuleErr
     ) where
 
@@ -1709,9 +1711,15 @@ home_imps imps = [ lmodname |  (mb_pkg, lmodname) <- imps,
 ms_home_allimps :: ModSummary -> [ModuleName]
 ms_home_allimps ms = map unLoc (ms_home_srcimps ms ++ ms_home_imps ms)
 
+-- | Like 'ms_home_imps', but for SOURCE imports.
 ms_home_srcimps :: ModSummary -> [Located ModuleName]
 ms_home_srcimps = home_imps . ms_srcimps
 
+-- | All of the (possibly) home module imports from a
+-- 'ModSummary'; that is to say, each of these module names
+-- could be a home import if an appropriately named file
+-- existed.  (This is in contrast to package qualified
+-- imports, which are guaranteed not to be home imports.)
 ms_home_imps :: ModSummary -> [Located ModuleName]
 ms_home_imps = home_imps . ms_imps
 
diff --git a/ghc/Main.hs b/ghc/Main.hs
index 31a9b91..73552d3 100644
--- a/ghc/Main.hs
+++ b/ghc/Main.hs
@@ -694,13 +694,7 @@ addFlag s flag = liftEwM $ do
 
 doMake :: [(String,Maybe Phase)] -> Ghc ()
 doMake srcs  = do
-    let (hs_srcs, non_hs_srcs) = partition haskellish srcs
-
-        haskellish (f,Nothing) =
-          looksLikeModuleName f || isHaskellSrcFilename f || '.' `notElem` f
-        haskellish (_,Just phase) =
-          phase `notElem` [ As True, As False, Cc, Cobjc, Cobjcxx, CmmCpp, Cmm
-                          , StopLn]
+    let (hs_srcs, non_hs_srcs) = partition isHaskellishTarget srcs
 
     hsc_env <- GHC.getSession
 


From git at git.haskell.org  Tue Dec 29 14:04:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 14:04:57 +0000 (UTC)
Subject: [commit: ghc] master: Update a few references to GHC 7.12 (9cb79c5)
Message-ID: <20151229140457.358813A301@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/9cb79c538dcf9e06a0a64050c28a177ea061e664/ghc

>---------------------------------------------------------------

commit 9cb79c538dcf9e06a0a64050c28a177ea061e664
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 29 14:21:18 2015 +0100

    Update a few references to GHC 7.12


>---------------------------------------------------------------

9cb79c538dcf9e06a0a64050c28a177ea061e664
 compiler/hsSyn/HsTypes.hs                             | 2 +-
 libraries/base/Data/Version.hs                        | 2 +-
 libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/compiler/hsSyn/HsTypes.hs b/compiler/hsSyn/HsTypes.hs
index d414880..e8b38c7 100644
--- a/compiler/hsSyn/HsTypes.hs
+++ b/compiler/hsSyn/HsTypes.hs
@@ -607,7 +607,7 @@ Qualified currently behaves exactly as Implicit,
 but it is deprecated to use it for implicit quantification.
 In this case, GHC 7.10 gives a warning; see
 Note [Context quantification] in RnTypes, and Trac #4426.
-In GHC 7.12, Qualified will no longer bind variables
+In GHC 8.0, Qualified will no longer bind variables
 and this will become an error.
 
 The kind variables bound in the hsq_implicit field come both
diff --git a/libraries/base/Data/Version.hs b/libraries/base/Data/Version.hs
index 414b2aa..6738ca8 100644
--- a/libraries/base/Data/Version.hs
+++ b/libraries/base/Data/Version.hs
@@ -96,7 +96,7 @@ data Version =
         }
   deriving (Read,Show,Generic)
 {-# DEPRECATED versionTags "See GHC ticket #2496" #-}
--- TODO. Remove all references to versionTags in GHC 7.12 release.
+-- TODO. Remove all references to versionTags in GHC 8.0 release.
 
 instance Eq Version where
   v1 == v2  =  versionBranch v1 == versionBranch v2
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index a251502..3d77a4a 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -471,7 +471,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
   do eqns1 <- sequence eqns
      return (ClosedTypeFamilyD (TypeFamilyHead tc tvs result injectivity) eqns1)
 
--- These were deprecated in GHC 7.12 with a plan to remove them in 7.14. If you
+-- These were deprecated in GHC 8.0 with a plan to remove them in 8.2. If you
 -- remove this check please also:
 --   1. remove deprecated functions
 --   2. remove CPP language extension from top of this module


From git at git.haskell.org  Tue Dec 29 14:04:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 14:04:54 +0000 (UTC)
Subject: [commit: ghc] master: users_guide: Move 7.12.1-notes to 8.0.1-notes
 (2e49c8c)
Message-ID: <20151229140454.7B5EB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2e49c8cb7cb04a02461fe0b2c47e1c738acc833f/ghc

>---------------------------------------------------------------

commit 2e49c8cb7cb04a02461fe0b2c47e1c738acc833f
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 29 14:16:46 2015 +0100

    users_guide: Move 7.12.1-notes to 8.0.1-notes


>---------------------------------------------------------------

2e49c8cb7cb04a02461fe0b2c47e1c738acc833f
 docs/users_guide/{7.12.1-notes.rst => 8.0.1-notes.rst} | 6 +++---
 docs/users_guide/glasgow_exts.rst                      | 2 +-
 docs/users_guide/index.rst                             | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/users_guide/7.12.1-notes.rst b/docs/users_guide/8.0.1-notes.rst
similarity index 99%
rename from docs/users_guide/7.12.1-notes.rst
rename to docs/users_guide/8.0.1-notes.rst
index 6553fba..0aa221d 100644
--- a/docs/users_guide/7.12.1-notes.rst
+++ b/docs/users_guide/8.0.1-notes.rst
@@ -1,7 +1,7 @@
-.. _release-7-12-1:
+.. _release-8-0-1:
 
-Release notes for version 7.12.1
-================================
+Release notes for version 8.0.1
+===============================
 
 The significant changes to the various parts of the compiler are listed
 in the following sections. There have also been numerous bug fixes and
diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 8a5b9b6..961a378 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -7017,7 +7017,7 @@ which implicitly defines an instance of the form
 Injective type families
 -----------------------
 
-Starting with GHC 7.12 type families can be annotated with injectivity
+Starting with GHC 8.0 type families can be annotated with injectivity
 information. This information is then used by GHC during type checking
 to resolve type ambiguities in situations where a type variable appears
 only under type family applications.
diff --git a/docs/users_guide/index.rst b/docs/users_guide/index.rst
index 3f1f381..bb6b09a 100644
--- a/docs/users_guide/index.rst
+++ b/docs/users_guide/index.rst
@@ -12,7 +12,7 @@ Contents:
 
    license
    intro
-   7.12.1-notes
+   8.0.1-notes
    ghci
    runghc
    usage


From git at git.haskell.org  Tue Dec 29 14:04:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 14:04:59 +0000 (UTC)
Subject: [commit: ghc] master: Modify getFullArgs to include program name
 (b093e63)
Message-ID: <20151229140459.C98043A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b093e631fbef456a000107921d69b6b7b5845149/ghc

>---------------------------------------------------------------

commit b093e631fbef456a000107921d69b6b7b5845149
Author: Rik Steenkamp <rik at ewps.nl>
Date:   Tue Dec 29 14:38:40 2015 +0100

    Modify getFullArgs to include program name
    
    Fixes an inconsistency of `getFullArgs` across operating systems. On
    non-Windows systems the returning list did not include the program name
    as the first element, while on Windows systems it did.
    
    As `System.Environment` depends on this behaviour of `getFullArgs` under
    Windows, this is now the behaviour across all operating systems.
    Computation `getFullArgs` is now like the "raw" version of `getArgs`,
    similar to `argv` in other languages.
    
    This patch also fixes T10728 under Windows.
    
    Reviewers: austin, hvr, erikd, #ghc_windows_task_force, Phyx, bgamari
    
    Reviewed By: #ghc_windows_task_force, Phyx, bgamari
    
    Subscribers: Phyx, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1713


>---------------------------------------------------------------

b093e631fbef456a000107921d69b6b7b5845149
 libraries/base/GHC/Environment.hs | 18 +++++++++++-------
 testsuite/tests/rts/T10728.hs     |  2 +-
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/libraries/base/GHC/Environment.hs b/libraries/base/GHC/Environment.hs
index 103848a..97005eb 100644
--- a/libraries/base/GHC/Environment.hs
+++ b/libraries/base/GHC/Environment.hs
@@ -20,9 +20,18 @@ import GHC.Windows
 # else
 #  error Unknown mingw32 arch
 # endif
+#else
+import GHC.IO.Encoding
+import qualified GHC.Foreign as GHC
+#endif
 
--- Ignore the arguments to hs_init on Windows for the sake of Unicode compat
+-- | Computation 'getFullArgs' is the "raw" version of 'getArgs', similar
+-- to @argv@ in other languages. It returns a list of the program's
+-- command line arguments, starting with the program name, and
+-- including those normally eaten by the RTS (+RTS ... -RTS).
 getFullArgs :: IO [String]
+#ifdef mingw32_HOST_OS
+-- Ignore the arguments to hs_init on Windows for the sake of Unicode compat
 getFullArgs = do
     p_arg_string <- c_GetCommandLine
     alloca $ \p_argc -> do
@@ -43,11 +52,6 @@ foreign import WINDOWS_CCONV unsafe "windows.h CommandLineToArgvW"
 foreign import WINDOWS_CCONV unsafe "Windows.h LocalFree"
     c_LocalFree :: Ptr a -> IO (Ptr a)
 #else
-import GHC.IO.Encoding
-import GHC.Num
-import qualified GHC.Foreign as GHC
-
-getFullArgs :: IO [String]
 getFullArgs =
   alloca $ \ p_argc ->
   alloca $ \ p_argv -> do
@@ -55,7 +59,7 @@ getFullArgs =
    p    <- fromIntegral `liftM` peek p_argc
    argv <- peek p_argv
    enc <- getFileSystemEncoding
-   peekArray (p - 1) (advancePtr argv 1) >>= mapM (GHC.peekCString enc)
+   peekArray p argv >>= mapM (GHC.peekCString enc)
 
 foreign import ccall unsafe "getFullProgArgv"
     getFullProgArgv :: Ptr CInt -> Ptr (Ptr CString) -> IO ()
diff --git a/testsuite/tests/rts/T10728.hs b/testsuite/tests/rts/T10728.hs
index 056124d..ff005fa 100644
--- a/testsuite/tests/rts/T10728.hs
+++ b/testsuite/tests/rts/T10728.hs
@@ -35,6 +35,6 @@ getN = getFullArgs >>= return . go
   where
     go :: [String] -> Int
     go as = case reads (
-      dropWhile (not . isDigit) . (!! 1) $ as ) :: [(Int, String)] of
+      dropWhile (not . isDigit) . (!! 2) $ as ) :: [(Int, String)] of
         [x] -> fst x
         _ -> 0


From git at git.haskell.org  Tue Dec 29 15:44:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 15:44:39 +0000 (UTC)
Subject: [commit: ghc] master: Accept submodule libraries/primitive commit
 1af89788d (df6cb57)
Message-ID: <20151229154439.1F0E53A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/df6cb57b32d94b7f6f7c9a86207adfeee9712ed6/ghc

>---------------------------------------------------------------

commit df6cb57b32d94b7f6f7c9a86207adfeee9712ed6
Author: Gabor Greif <ggreif at gmail.com>
Date:   Tue Dec 29 16:40:26 2015 +0100

    Accept submodule libraries/primitive commit 1af89788d


>---------------------------------------------------------------

df6cb57b32d94b7f6f7c9a86207adfeee9712ed6
 libraries/primitive | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/primitive b/libraries/primitive
index 83d3d23..1af8978 160000
--- a/libraries/primitive
+++ b/libraries/primitive
@@ -1 +1 @@
-Subproject commit 83d3d23d2fa1583ecd1b59464cc889924e1b5fff
+Subproject commit 1af89788d5c9ab7a0a93ff6764e1770e6c80d957


From git at git.haskell.org  Tue Dec 29 17:10:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 17:10:02 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Introduce negative patterns for literals
 (addresses #11303) (c2c4790)
Message-ID: <20151229171002.100C23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/c2c4790cccf6b6dbe8119365932c719399993c3f/ghc

>---------------------------------------------------------------

commit c2c4790cccf6b6dbe8119365932c719399993c3f
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 29 13:58:21 2015 +0100

    Introduce negative patterns for literals (addresses #11303)
    
    Summary:
    Introduce negative patterns for literals. In addition to storing term constraints
    for literals (checked at the end by the term oracle), also check eagerly, using
    negative patterns. This means generation of smaller sets (covered, uncovered, and
    divergent), instead of generating big sets and pruning afterwards.
    
    Test Plan: validate
    
    Reviewers: bgamari, austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1716
    
    GHC Trac Issues: #11303


>---------------------------------------------------------------

c2c4790cccf6b6dbe8119365932c719399993c3f
 compiler/deSugar/Check.hs | 88 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 71 insertions(+), 17 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index af37de5..3f5cfc0 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -88,16 +88,18 @@ data PatTy = PAT | VA -- Used only as a kind, to index PmPat
 -- the number of p1..pn that are not Guards
 
 data PmPat :: PatTy -> * where
-  PmCon :: { pm_con_con     :: DataCon
-           , pm_con_arg_tys :: [Type]
-           , pm_con_tvs     :: [TyVar]
-           , pm_con_dicts   :: [EvVar]
-           , pm_con_args    :: [PmPat t] } -> PmPat t
-           -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
-  PmVar :: { pm_var_id   :: Id    } -> PmPat t
-  PmLit :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
-  PmGrd :: { pm_grd_pv   :: PatVec
-           , pm_grd_expr :: PmExpr } -> PmPat 'PAT
+  PmCon  :: { pm_con_con     :: DataCon
+            , pm_con_arg_tys :: [Type]
+            , pm_con_tvs     :: [TyVar]
+            , pm_con_dicts   :: [EvVar]
+            , pm_con_args    :: [PmPat t] } -> PmPat t
+            -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
+  PmVar  :: { pm_var_id   :: Id    } -> PmPat t
+  PmLit  :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
+  PmNLit :: { pm_lit_id :: Id
+            , pm_lit_not :: [PmLit] } -> PmPat 'VA
+  PmGrd  :: { pm_grd_pv   :: PatVec
+            , pm_grd_expr :: PmExpr } -> PmPat 'PAT
 
 -- data T a where
 --     MkT :: forall p q. (Eq p, Ord q) => p -> q -> T [p]
@@ -656,9 +658,10 @@ process_guards  us  oversimplify gs
 pmPatType :: PmPat p -> Type
 pmPatType (PmCon { pm_con_con = con, pm_con_arg_tys = tys })
   = mkTyConApp (dataConTyCon con) tys
-pmPatType (PmVar { pm_var_id  = x }) = idType x
-pmPatType (PmLit { pm_lit_lit = l }) = pmLitType l
-pmPatType (PmGrd { pm_grd_pv  = pv })
+pmPatType (PmVar  { pm_var_id  = x }) = idType x
+pmPatType (PmLit  { pm_lit_lit = l }) = pmLitType l
+pmPatType (PmNLit { pm_lit_id  = x }) = idType x
+pmPatType (PmGrd  { pm_grd_pv  = pv })
   = ASSERT(patVecArity pv == 1) (pmPatType p)
   where Just p = find ((==1) . patternArity) pv
 
@@ -801,10 +804,11 @@ mkPmId2FormsSM ty = do
 -- * Converting between Value Abstractions, Patterns and PmExpr
 
 valAbsToPmExpr :: ValAbs -> PmExpr
-valAbsToPmExpr (PmCon { pm_con_con = c, pm_con_args = ps })
+valAbsToPmExpr (PmCon  { pm_con_con = c, pm_con_args = ps })
   = PmExprCon c (map valAbsToPmExpr ps)
-valAbsToPmExpr (PmVar { pm_var_id  = x }) = PmExprVar x
-valAbsToPmExpr (PmLit { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmVar  { pm_var_id  = x }) = PmExprVar x
+valAbsToPmExpr (PmLit  { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmNLit { pm_lit_id  = x }) = PmExprVar x
 
 -- Convert a pattern vector to a value list abstraction by dropping the guards
 -- recursively (See Note [Translating As Patterns])
@@ -1058,6 +1062,14 @@ cMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 (pm_con_con p)
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- CConNLit
+cMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = cMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- CConCon
 cMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1088,6 +1100,15 @@ cMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
     lit_abs = PmLit l
     cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- CLitNLit
+cMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+  | all (not . eqPmLit l) lits
+  = cMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 cMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.cMatcher: Guard"
 
@@ -1115,6 +1136,10 @@ uMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     y  = mkPmId us1 (pmPatType p)
     cs = [TmConstraint (PmExprVar y) (PmExprLit l)]
 
+-- UConNLit
+uMatcher us gvsa (p@(PmCon {})) ps (PmNLit { pm_lit_id = x }) vsa
+  = uMatcher us gvsa p ps (PmVar x) vsa
+
 -- UConCon
 uMatcher us gvsa ( p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                  (va@(PmCon { pm_con_con = c2, pm_con_args = args2 })) vsa
@@ -1146,7 +1171,19 @@ uMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmVar x) vsa
 -- ULitVar
 uMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
   = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
-            (non_match_cs `mkConstraint` (PmVar x `mkCons` vsa))
+            (non_match_cs `mkConstraint` (PmNLit x [l] `mkCons` vsa))
+  where
+    match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
+   -- See Note [Representation of Term Equalities]
+    non_match_cs = [ TmConstraint falsePmExpr
+                                  (PmExprEq (PmExprVar x) (PmExprLit l)) ]
+
+-- ULitNLit
+uMatcher us gvsa (p@(PmLit l)) ps (va@(PmNLit x lits)) vsa
+  | all (not . eqPmLit l) lits
+  = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
+            (non_match_cs `mkConstraint` (PmNLit x (l:lits) `mkCons` vsa))
+  | otherwise = va `mkCons` vsa
   where
     match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
    -- See Note [Representation of Term Equalities]
@@ -1178,6 +1215,14 @@ dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 con
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- DConNLit
+dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = dMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- DConCon
 dMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1209,6 +1254,15 @@ dMatcher us gvsa (PmLit l) ps (PmVar x) vsa
   where
     cs = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- DLitNLit
+dMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+  | all (not . eqPmLit l) lits
+  = dMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 dMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.dMatcher: Guard"
 


From git at git.haskell.org  Tue Dec 29 17:10:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 17:10:04 +0000 (UTC)
Subject: [commit: ghc] wip/gadtpm: Make use of field `pm_lit_not` (to avoid
 not-used warning) (f8cd796)
Message-ID: <20151229171004.A1AF33A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/gadtpm
Link       : http://ghc.haskell.org/trac/ghc/changeset/f8cd796f43f87e1c0c438d73768f8e51fbcde5fd/ghc

>---------------------------------------------------------------

commit f8cd796f43f87e1c0c438d73768f8e51fbcde5fd
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 29 15:05:42 2015 +0100

    Make use of field `pm_lit_not` (to avoid not-used warning)


>---------------------------------------------------------------

f8cd796f43f87e1c0c438d73768f8e51fbcde5fd
 compiler/deSugar/Check.hs | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 3f5cfc0..78a8eaa 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -1101,7 +1101,8 @@ cMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
     cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
 -- CLitNLit
-cMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+cMatcher us gvsa (p@(PmLit l)) ps
+                 (PmNLit { pm_lit_id = x, pm_lit_not = lits }) vsa
   | all (not . eqPmLit l) lits
   = cMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
   | otherwise = Empty
@@ -1179,7 +1180,8 @@ uMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
                                   (PmExprEq (PmExprVar x) (PmExprLit l)) ]
 
 -- ULitNLit
-uMatcher us gvsa (p@(PmLit l)) ps (va@(PmNLit x lits)) vsa
+uMatcher us gvsa (p@(PmLit l)) ps
+                 (va@(PmNLit { pm_lit_id = x, pm_lit_not = lits })) vsa
   | all (not . eqPmLit l) lits
   = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
             (non_match_cs `mkConstraint` (PmNLit x (l:lits) `mkCons` vsa))
@@ -1255,7 +1257,8 @@ dMatcher us gvsa (PmLit l) ps (PmVar x) vsa
     cs = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
 -- DLitNLit
-dMatcher us gvsa (p@(PmLit l)) ps (PmNLit x lits) vsa
+dMatcher us gvsa (p@(PmLit l)) ps
+                 (PmNLit { pm_lit_id = x, pm_lit_not = lits }) vsa
   | all (not . eqPmLit l) lits
   = dMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
   | otherwise = Empty


From git at git.haskell.org  Tue Dec 29 17:43:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 17:43:01 +0000 (UTC)
Subject: [commit: ghc] master: Introduce negative patterns for literals
 (addresses #11303) (fcc7649)
Message-ID: <20151229174301.A6ED43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/fcc76493c8b35001fc1b22738cc64ff9506e278a/ghc

>---------------------------------------------------------------

commit fcc76493c8b35001fc1b22738cc64ff9506e278a
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Tue Dec 29 18:16:38 2015 +0100

    Introduce negative patterns for literals (addresses #11303)
    
    Introduce negative patterns for literals. In addition to storing term
    constraints for literals (checked at the end by the term oracle), also
    check eagerly, using negative patterns. This means generation of smaller
    sets (covered, uncovered, and divergent), instead of generating big sets
    and pruning afterwards.
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1716
    
    GHC Trac Issues: #11303


>---------------------------------------------------------------

fcc76493c8b35001fc1b22738cc64ff9506e278a
 compiler/deSugar/Check.hs | 91 ++++++++++++++++++++++++++++++++++++++---------
 1 file changed, 74 insertions(+), 17 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index af37de5..78a8eaa 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -88,16 +88,18 @@ data PatTy = PAT | VA -- Used only as a kind, to index PmPat
 -- the number of p1..pn that are not Guards
 
 data PmPat :: PatTy -> * where
-  PmCon :: { pm_con_con     :: DataCon
-           , pm_con_arg_tys :: [Type]
-           , pm_con_tvs     :: [TyVar]
-           , pm_con_dicts   :: [EvVar]
-           , pm_con_args    :: [PmPat t] } -> PmPat t
-           -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
-  PmVar :: { pm_var_id   :: Id    } -> PmPat t
-  PmLit :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
-  PmGrd :: { pm_grd_pv   :: PatVec
-           , pm_grd_expr :: PmExpr } -> PmPat 'PAT
+  PmCon  :: { pm_con_con     :: DataCon
+            , pm_con_arg_tys :: [Type]
+            , pm_con_tvs     :: [TyVar]
+            , pm_con_dicts   :: [EvVar]
+            , pm_con_args    :: [PmPat t] } -> PmPat t
+            -- For PmCon arguments' meaning see @ConPatOut@ in hsSyn/HsPat.hs
+  PmVar  :: { pm_var_id   :: Id    } -> PmPat t
+  PmLit  :: { pm_lit_lit  :: PmLit } -> PmPat t -- See Note [Literals in PmPat]
+  PmNLit :: { pm_lit_id :: Id
+            , pm_lit_not :: [PmLit] } -> PmPat 'VA
+  PmGrd  :: { pm_grd_pv   :: PatVec
+            , pm_grd_expr :: PmExpr } -> PmPat 'PAT
 
 -- data T a where
 --     MkT :: forall p q. (Eq p, Ord q) => p -> q -> T [p]
@@ -656,9 +658,10 @@ process_guards  us  oversimplify gs
 pmPatType :: PmPat p -> Type
 pmPatType (PmCon { pm_con_con = con, pm_con_arg_tys = tys })
   = mkTyConApp (dataConTyCon con) tys
-pmPatType (PmVar { pm_var_id  = x }) = idType x
-pmPatType (PmLit { pm_lit_lit = l }) = pmLitType l
-pmPatType (PmGrd { pm_grd_pv  = pv })
+pmPatType (PmVar  { pm_var_id  = x }) = idType x
+pmPatType (PmLit  { pm_lit_lit = l }) = pmLitType l
+pmPatType (PmNLit { pm_lit_id  = x }) = idType x
+pmPatType (PmGrd  { pm_grd_pv  = pv })
   = ASSERT(patVecArity pv == 1) (pmPatType p)
   where Just p = find ((==1) . patternArity) pv
 
@@ -801,10 +804,11 @@ mkPmId2FormsSM ty = do
 -- * Converting between Value Abstractions, Patterns and PmExpr
 
 valAbsToPmExpr :: ValAbs -> PmExpr
-valAbsToPmExpr (PmCon { pm_con_con = c, pm_con_args = ps })
+valAbsToPmExpr (PmCon  { pm_con_con = c, pm_con_args = ps })
   = PmExprCon c (map valAbsToPmExpr ps)
-valAbsToPmExpr (PmVar { pm_var_id  = x }) = PmExprVar x
-valAbsToPmExpr (PmLit { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmVar  { pm_var_id  = x }) = PmExprVar x
+valAbsToPmExpr (PmLit  { pm_lit_lit = l }) = PmExprLit l
+valAbsToPmExpr (PmNLit { pm_lit_id  = x }) = PmExprVar x
 
 -- Convert a pattern vector to a value list abstraction by dropping the guards
 -- recursively (See Note [Translating As Patterns])
@@ -1058,6 +1062,14 @@ cMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 (pm_con_con p)
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- CConNLit
+cMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = cMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- CConCon
 cMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1088,6 +1100,16 @@ cMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
     lit_abs = PmLit l
     cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- CLitNLit
+cMatcher us gvsa (p@(PmLit l)) ps
+                 (PmNLit { pm_lit_id = x, pm_lit_not = lits }) vsa
+  | all (not . eqPmLit l) lits
+  = cMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 cMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.cMatcher: Guard"
 
@@ -1115,6 +1137,10 @@ uMatcher us gvsa (p@(PmCon {})) ps (PmLit l) vsa
     y  = mkPmId us1 (pmPatType p)
     cs = [TmConstraint (PmExprVar y) (PmExprLit l)]
 
+-- UConNLit
+uMatcher us gvsa (p@(PmCon {})) ps (PmNLit { pm_lit_id = x }) vsa
+  = uMatcher us gvsa p ps (PmVar x) vsa
+
 -- UConCon
 uMatcher us gvsa ( p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                  (va@(PmCon { pm_con_con = c2, pm_con_args = args2 })) vsa
@@ -1146,7 +1172,20 @@ uMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmVar x) vsa
 -- ULitVar
 uMatcher us gvsa (p@(PmLit l)) ps (PmVar x) vsa
   = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
-            (non_match_cs `mkConstraint` (PmVar x `mkCons` vsa))
+            (non_match_cs `mkConstraint` (PmNLit x [l] `mkCons` vsa))
+  where
+    match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
+   -- See Note [Representation of Term Equalities]
+    non_match_cs = [ TmConstraint falsePmExpr
+                                  (PmExprEq (PmExprVar x) (PmExprLit l)) ]
+
+-- ULitNLit
+uMatcher us gvsa (p@(PmLit l)) ps
+                 (va@(PmNLit { pm_lit_id = x, pm_lit_not = lits })) vsa
+  | all (not . eqPmLit l) lits
+  = mkUnion (uMatcher us gvsa p ps (PmLit l) (mkConstraint match_cs vsa))
+            (non_match_cs `mkConstraint` (PmNLit x (l:lits) `mkCons` vsa))
+  | otherwise = va `mkCons` vsa
   where
     match_cs     = [ TmConstraint (PmExprVar x) (PmExprLit l)]
    -- See Note [Representation of Term Equalities]
@@ -1178,6 +1217,14 @@ dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps (PmLit l) vsa
     (con_abs, all_cs) = mkOneConFull y us2 con
     cs = TmConstraint (PmExprVar y) (PmExprLit l) : all_cs
 
+-- DConNLit
+dMatcher us gvsa (p@(PmCon { pm_con_con = con })) ps
+                 (PmNLit { pm_lit_id = x }) vsa
+  = dMatcher us2 gvsa p ps con_abs (mkConstraint all_cs vsa)
+  where
+    (us1, us2)        = splitUniqSupply us
+    (con_abs, all_cs) = mkOneConFull x us1 con
+
 -- DConCon
 dMatcher us gvsa (p@(PmCon { pm_con_con = c1, pm_con_args = args1 })) ps
                     (PmCon { pm_con_con = c2, pm_con_args = args2 }) vsa
@@ -1209,6 +1256,16 @@ dMatcher us gvsa (PmLit l) ps (PmVar x) vsa
   where
     cs = [TmConstraint (PmExprVar x) (PmExprLit l)]
 
+-- DLitNLit
+dMatcher us gvsa (p@(PmLit l)) ps
+                 (PmNLit { pm_lit_id = x, pm_lit_not = lits }) vsa
+  | all (not . eqPmLit l) lits
+  = dMatcher us gvsa p ps lit_abs (mkConstraint cs vsa)
+  | otherwise = Empty
+  where
+    lit_abs = PmLit l
+    cs      = [TmConstraint (PmExprVar x) (PmExprLit l)]
+
 -- Impossible: handled by pmTraverse
 dMatcher _ _ (PmGrd {}) _ _ _ = panic "Check.dMatcher: Guard"
 


From git at git.haskell.org  Tue Dec 29 17:43:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 17:43:04 +0000 (UTC)
Subject: [commit: ghc] master: testlib: Make TyCon normalization Python
 2.6-compatible (a1e01b6)
Message-ID: <20151229174304.495243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/a1e01b61d4e083ac4ed59c593c89970143986f1a/ghc

>---------------------------------------------------------------

commit a1e01b61d4e083ac4ed59c593c89970143986f1a
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 29 18:16:59 2015 +0100

    testlib: Make TyCon normalization Python 2.6-compatible
    
    D1629 introduced this normalization which was not Python 2.6 compatible
    due to the use of the `flags` argument of `re.sub`. Fix this.
    
    Test Plan: Validate
    
    Reviewers: austin, thomie
    
    Differential Revision: https://phabricator.haskell.org/D1718


>---------------------------------------------------------------

a1e01b61d4e083ac4ed59c593c89970143986f1a
 testsuite/driver/testlib.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index cf5a226..6b2220f 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1697,12 +1697,11 @@ def normalise_callstacks(str):
     # Ignore line number differences in call stacks (#10834).
     return re.sub(', called at (.+):[\\d]+:[\\d]+ in [\\w\-\.]+:', repl, str)
 
+tyCon_re = re.compile(r'TyCon\s*\d+L?\#\#\s*\d+L?\#\#\s*', flags=re.MULTILINE)
+
 def normalise_type_reps(str):
     """ Normalise out fingerprints from Typeable TyCon representations """
-    return re.sub(r'TyCon\s*\d+L?\#\#\s*\d+L?\#\#\s*',
-                  'TyCon FINGERPRINT FINGERPRINT ',
-                  str,
-                  flags=re.MULTILINE)
+    return re.sub(tyCon_re, 'TyCon FINGERPRINT FINGERPRINT ', str)
 
 def normalise_errmsg( str ):
     # remove " error:" and lower-case " Warning:" to make patch for


From git at git.haskell.org  Tue Dec 29 19:42:02 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 19:42:02 +0000 (UTC)
Subject: [commit: ghc] master: Add regression test for #11303 (adcbc98)
Message-ID: <20151229194202.0BAA43A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/adcbc98f50cd6bb01dfcf4c98ad5fe414f7cc40c/ghc

>---------------------------------------------------------------

commit adcbc98f50cd6bb01dfcf4c98ad5fe414f7cc40c
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 29 20:42:19 2015 +0100

    Add regression test for #11303
    
    
    Test Plan: Validate
    
    Reviewers: austin
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1719
    
    GHC Trac Issues: #11303


>---------------------------------------------------------------

adcbc98f50cd6bb01dfcf4c98ad5fe414f7cc40c
 testsuite/tests/pmcheck/should_compile/T11303.hs | 28 ++++++++++++++++++++++++
 testsuite/tests/pmcheck/should_compile/all.T     |  3 +--
 2 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/testsuite/tests/pmcheck/should_compile/T11303.hs b/testsuite/tests/pmcheck/should_compile/T11303.hs
new file mode 100644
index 0000000..3989b99
--- /dev/null
+++ b/testsuite/tests/pmcheck/should_compile/T11303.hs
@@ -0,0 +1,28 @@
+import System.Environment
+
+-- This covers #11303, wherein the pattern checker would explode
+-- when it encountered patterns sharing a prefix.
+
+main :: IO ()
+main = do
+  args <- getArgs
+  print $ case head args of
+                      "--primop-primop-info"  -> "turtle"
+                      "--primop-tag" -> "asdf"
+                      "--primop-list"  -> "casdhf"
+                      "--primop-vector-uniques"  -> "this"
+                      "--primop-vector-tys"  -> "is"
+                      "--primop-vector-tys-exports"  -> "silly"
+                      "--primop-vector-tycons"  -> "hmmm"
+                      "--primop-vector-turtles"  -> "hmmm"
+                      "--primop-vector-plugs"  -> "hmmm"
+                      "--primop-vector-caps"  -> "hmmm"
+                      "--primop-vector-wires"  -> "hmmm"
+                      "--primop-vector-tornado"  -> "hmmm"
+                      "--primop-vector-tomato"  -> "hmmm"
+                      "--primop-vector-maps"  -> "hmmm"
+                      "--primop-vector-paper"  -> "hmmm"
+                      "--make-haskell-wrappers" -> "123512"
+                      "--make-haskell-source"  -> "as;dg"
+                      "--make-latex-doc" -> "adghiw"
+                      _ -> error "Should not happen, known_args out of sync?"
diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index 8ff797a..3bd4118 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -22,6 +22,7 @@ test('T7669a', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patter
 test('T8970', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T11303', normal, compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 
 # Other tests
 test('pmc001', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
@@ -31,5 +32,3 @@ test('pmc004', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patter
 test('pmc005', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('pmc006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('pmc007', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
-
-


From git at git.haskell.org  Tue Dec 29 21:19:29 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 21:19:29 +0000 (UTC)
Subject: [commit: ghc] master: Update Cabal submodule to latest snapshot
 (e4cc19d)
Message-ID: <20151229211929.657DA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e4cc19de4bdbccea589d41717e31d63b088a8990/ghc

>---------------------------------------------------------------

commit e4cc19de4bdbccea589d41717e31d63b088a8990
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 29 22:19:54 2015 +0100

    Update Cabal submodule to latest snapshot


>---------------------------------------------------------------

e4cc19de4bdbccea589d41717e31d63b088a8990
 libraries/Cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/Cabal b/libraries/Cabal
index 679812d..072e472 160000
--- a/libraries/Cabal
+++ b/libraries/Cabal
@@ -1 +1 @@
-Subproject commit 679812d2b679af952a7c9ab45a9a3a3476874a07
+Subproject commit 072e4728079e6caf521339e3934e1279aa09e83d


From git at git.haskell.org  Tue Dec 29 21:59:05 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 21:59:05 +0000 (UTC)
Subject: [commit: ghc] master: Remove `cabal07`-test broken by e4cc19de4bdbcc
 (c6cab9d)
Message-ID: <20151229215905.505853A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c6cab9d998b819b177962c1341208cf8b89ad398/ghc

>---------------------------------------------------------------

commit c6cab9d998b819b177962c1341208cf8b89ad398
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Tue Dec 29 22:57:29 2015 +0100

    Remove `cabal07`-test broken by e4cc19de4bdbcc
    
    This test is no longer legitimate as the feature it tests was removed
    from Cabal via
    
    https://git.haskell.org/packages/Cabal.git/commitdiff/5d20551e44e565bad6335fa213fc4ad592db7225


>---------------------------------------------------------------

c6cab9d998b819b177962c1341208cf8b89ad398
 testsuite/tests/cabal/cabal07/Makefile       | 21 ---------------------
 testsuite/tests/cabal/cabal07/Setup.hs       |  2 --
 testsuite/tests/cabal/cabal07/all.T          |  9 ---------
 testsuite/tests/cabal/cabal07/cabal07.stderr |  6 ------
 testsuite/tests/cabal/cabal07/p/LICENSE      |  0
 testsuite/tests/cabal/cabal07/p/P.hs         |  5 -----
 testsuite/tests/cabal/cabal07/p/Q.hs         |  3 ---
 testsuite/tests/cabal/cabal07/p/p.cabal      | 12 ------------
 8 files changed, 58 deletions(-)

diff --git a/testsuite/tests/cabal/cabal07/Makefile b/testsuite/tests/cabal/cabal07/Makefile
deleted file mode 100644
index 1dfed8a..0000000
--- a/testsuite/tests/cabal/cabal07/Makefile
+++ /dev/null
@@ -1,21 +0,0 @@
-TOP=../../..
-include $(TOP)/mk/boilerplate.mk
-include $(TOP)/mk/test.mk
-
-SETUP=../Setup -v0
-
-# This test is for a Cabal package with thinning and renaming
-
-cabal07: clean
-	$(MAKE) clean
-	'$(TEST_HC)' -v0 --make Setup
-	cd p && $(SETUP) clean
-	cd p && $(SETUP) configure $(CABAL_MINIMAL_BUILD) --with-ghc='$(TEST_HC)' --ghc-options='$(TEST_HC_OPTS)' --prefix='$(PWD)/inst-p' --constraint="containers>=0"
-	cd p && ! $(SETUP) build
-ifneq "$(CLEANUP)" ""
-	$(MAKE) clean
-endif
-
-clean :
-	'$(GHC_PKG)' unregister --force p >/dev/null 2>&1 || true
-	$(RM) -r tmp.d inst-* *.o *.hi */*.o */*.hi */Setup$(exeext) */dist Setup$(exeext)
diff --git a/testsuite/tests/cabal/cabal07/Setup.hs b/testsuite/tests/cabal/cabal07/Setup.hs
deleted file mode 100644
index 9a994af..0000000
--- a/testsuite/tests/cabal/cabal07/Setup.hs
+++ /dev/null
@@ -1,2 +0,0 @@
-import Distribution.Simple
-main = defaultMain
diff --git a/testsuite/tests/cabal/cabal07/all.T b/testsuite/tests/cabal/cabal07/all.T
deleted file mode 100644
index 2052c89..0000000
--- a/testsuite/tests/cabal/cabal07/all.T
+++ /dev/null
@@ -1,9 +0,0 @@
-if default_testopts.cleanup != '':
-   cleanup = 'CLEANUP=1'
-else:
-   cleanup = ''
-
-test('cabal07',
-     normalise_version('containers'),
-     run_command,
-     ['$MAKE -s --no-print-directory cabal07 ' + cleanup])
diff --git a/testsuite/tests/cabal/cabal07/cabal07.stderr b/testsuite/tests/cabal/cabal07/cabal07.stderr
deleted file mode 100644
index b3cfe5b..0000000
--- a/testsuite/tests/cabal/cabal07/cabal07.stderr
+++ /dev/null
@@ -1,6 +0,0 @@
-
-Q.hs:3:1: error:
-    Failed to load interface for ?Data.Set?
-    It is a member of the hidden package ?containers-0.5.7.0?.
-    Perhaps you need to add ?containers? to the build-depends in your .cabal file.
-    Use -v to see a list of the files searched for.
diff --git a/testsuite/tests/cabal/cabal07/p/LICENSE b/testsuite/tests/cabal/cabal07/p/LICENSE
deleted file mode 100644
index e69de29..0000000
diff --git a/testsuite/tests/cabal/cabal07/p/P.hs b/testsuite/tests/cabal/cabal07/p/P.hs
deleted file mode 100644
index c9458dd..0000000
--- a/testsuite/tests/cabal/cabal07/p/P.hs
+++ /dev/null
@@ -1,5 +0,0 @@
-module P where
-import qualified Set
-import qualified Seq
-import qualified Seq2
-import qualified Control.DeepSeq
diff --git a/testsuite/tests/cabal/cabal07/p/Q.hs b/testsuite/tests/cabal/cabal07/p/Q.hs
deleted file mode 100644
index 4887939..0000000
--- a/testsuite/tests/cabal/cabal07/p/Q.hs
+++ /dev/null
@@ -1,3 +0,0 @@
-module Q where
-import P
-import Data.Set
diff --git a/testsuite/tests/cabal/cabal07/p/p.cabal b/testsuite/tests/cabal/cabal07/p/p.cabal
deleted file mode 100644
index 2699e93..0000000
--- a/testsuite/tests/cabal/cabal07/p/p.cabal
+++ /dev/null
@@ -1,12 +0,0 @@
-name:                p
-version:             1.0
-license-file:        LICENSE
-author:              Edward Z. Yang
-maintainer:          ezyang at cs.stanford.edu
-build-type:          Simple
-cabal-version:       >=1.20
-
-library
-  exposed-modules:     P, Q
-  build-depends:       base, containers >= 0.1 (Data.Set as Set), deepseq (> 0.2 && > 0.1) with (Control.DeepSeq as Seq, Control.DeepSeq as Seq2)
-  default-language:    Haskell2010


From git at git.haskell.org  Tue Dec 29 23:08:57 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 23:08:57 +0000 (UTC)
Subject: [commit: ghc] master: testsuite: normalise away `ld`-warning on AIX
 (34af60c)
Message-ID: <20151229230857.4EDBE3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/34af60c718734625d7f5abbebb3d520ecba36afa/ghc

>---------------------------------------------------------------

commit 34af60c718734625d7f5abbebb3d520ecba36afa
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 28 23:18:33 2015 +0100

    testsuite: normalise away `ld`-warning on AIX
    
    On AIX, `ld` doesn't support `-x` and ignores it. However, a warning is
    emitted to stderr which ends up triggering false positives in some of
    GHC's testsuite tests. So we simply filter out that noise as part of
    normalising stderr.


>---------------------------------------------------------------

34af60c718734625d7f5abbebb3d520ecba36afa
 testsuite/driver/testlib.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/testsuite/driver/testlib.py b/testsuite/driver/testlib.py
index 6b2220f..2ac9018 100644
--- a/testsuite/driver/testlib.py
+++ b/testsuite/driver/testlib.py
@@ -1704,6 +1704,10 @@ def normalise_type_reps(str):
     return re.sub(tyCon_re, 'TyCon FINGERPRINT FINGERPRINT ', str)
 
 def normalise_errmsg( str ):
+    """Normalise error-messages emitted via stderr"""
+    # IBM AIX's `ld` is a bit chatty
+    if opsys('aix'):
+        str = str.replace('ld: 0706-027 The -x flag is ignored.\n', '')
     # remove " error:" and lower-case " Warning:" to make patch for
     # trac issue #10021 smaller
     str = modify_lines(str, lambda l: re.sub(' error:', '', l))


From git at git.haskell.org  Tue Dec 29 23:42:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 23:42:12 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0: Bump GHC version to 8.0.0 (f5ef528)
Message-ID: <20151229234212.D8F173A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/f5ef52887301366e4643b1b55a647a72b5c4cd14/ghc

>---------------------------------------------------------------

commit f5ef52887301366e4643b1b55a647a72b5c4cd14
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0
    
    Test Plan: testing whether we need to fixup something for the version bump
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1679


>---------------------------------------------------------------

f5ef52887301366e4643b1b55a647a72b5c4cd14
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f5d624d..637d3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Tue Dec 29 23:42:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Tue, 29 Dec 2015 23:42:15 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0's head updated: Bump GHC version to 8.0.0
 (f5ef528)
Message-ID: <20151229234215.A538D3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/ghc-8.0' now includes:

     c12fc2e Update hoopl submodule to final 3.10.2.1 release
     aa7fb9a Fix GHCi segfault in Windows 32bit
     ff92395 Make HsAppsType contents Located
     44de66b Update Cabal submodule to latest snapshot
     ea3f733 Comments only, about coercion holes
     b407bd7 Retain AnnTilde in splitTildeApps
     f975b0b Rework Template Haskell's handling of strictness
     6eabd93 Update stm submodule to v2.4.4.1 release
     29928f2 Fix grouping for pattern synonyms
     f40e122 Fix typechecking for pattern synonym signatures
     51d8330 Remove duplicate T11224 test definition
     7966eea Localize API Annotation in LInjectivtyAnn
     01b0461 Remove another duplicate test
     575a98e Refactor named wildcards (again)
     721d56d APIAnnotations:AnnComma in wrong place in qcnames1
     d3ce417 Tweak comments around UnivCos.
     21b25df CoercionN is not in scope in TyCoRep
     998739d Refactor package flags into several distinct types.
     1faf1fc Implement -hide-all-plugin-packages and -plugin-package(-id), fixing #11244
     3e99980 Update filepath submodule to latest snapshot
     5f08681 - fix tests on OpenBSD which requires _DYNAMIC symbol
     48e0634 Revert "Allow as-patterns in pattern synonym declarations."
     b55ad1b Wibble to error message in Trac #10426
     1963250 Comments and white space
     c069be8 Add a pattern-syn form of PromotionErr
     99eb002 Comments only
     6eb9dc9 Tidy up and comment wildcards in family instances
     ed213ea Test Trac #11274
     7ed0da6 Modify Nmax to maxN Trac #10728
     dab8e34 Delete incorrect *-ws-32 expected test output
     84f6739 - fix gc_thread related compilation failure on Solaris/i386 platform
     f13de71 Fix super-class cycle check
     b37f216 Comments only
     7824870 Fix ASSERT in buildPatSyn, and T10897 test
     380b25e Allow CallStacks to be frozen
     cb989e2 API Annotaions:add name in PatBind Match
     d1e9f82 Update tests for Trac #11039
     f141f41 Test #10432
     7cddcde Docs: -interactive-print should reside in registered package
     3221599 Make testsuite work again with Py3
     353e97a config.mk.in: Disable stripping by default on ARM
     3017cbc ghc-cabal: Bring back TRANSITIVE_DEP_NAMES
     6ec236b Improve SimplUtils.interestingArg
     d990354 Improve the runRW magic in CorePrep
     fcc7498 Improve tracing a bit in CoreSubst
     1af0d36 Refactoring only
     e338376 Fix normalisation of TyCon representations
     48db13d Don't drop last char of file if -osuf contains dot
     2db18b8 Visible type application
     2032635 Testsuite: fix qq005 and qq006 (#11279)
     bc8cac1 Testsuite: mark T7681 expect_broken (#11287)
     5e4e9e0 Fix #11255.
     bd7ab66 Test #11254 in typecheck/should_compile/T11254
     1411eaf Note [TyBinder] in TyCoRep
     52da6bd Have mkCastTy look more closely for reflexivity.
     da69358 Fix #11287.
     b218241 Test #10589 in typecheck/should_compile/T10589
     05e3541 Test #10619 in typecheck/should_fail/T10619
     0fda908 Bump Haddock submodule again
     8bf2d8f Linker: Fix cut-and-paste error in debug output
     422107e T10518: Ensure literal has 64-bit type
     e39d10f testsuite/T8274: Remove 32-bit test output
     fb5d26d testsuite/codegen: Add missing dummy Makefiles
     0b0652f testsuite/T9430: Fix word-size dependence
     b62215d Linker: Reenable Thumb support
     e8672e5 libraries/ghci: Implement mkJumpToAddr for ppc64
     909bbdb Linker(ELF): Fix addProddableBlocks usage
     da5e693 testsuite/joao-circular: Clean up test results
     a3b34b6 Clean up a botched merge.
     d1ebbb0 testsuite/CmmSwitchTest: Mark as broken on 32-bit platforms
     11778f7 Add testcase for getSizeofMutableByteArray#
     07b3be7 integer-gmp: Fix #11296
     bec5350 Adding flags: -ffull-guard-reasoning and too-many-guards
     c8d0af3 RTS: Detect powerpc64le as ELF 64-bit system
     1b00016 The -package flag should select match from right-most package db.
     0054bcd rts/Linker(ARM): Ensure all code sections are flushed from cache
     01299ca Synchronise ghci-package version with ghc-package
     4a10ecb Patch-level increment integer-gmp to 1.0.0.1
     e01aa22 Patch-level increment integer-simple version 0.1.1.1
     c7830bd Update hpc submodule to 0.6.0.3 version
     3aa4a45 Update filepath submodule to v1.4.1.0 rls tag
     295085c Update time submodule to latest snapshot
     bab5109 Make git-committer inferred version-date TZ-invariant
     7fef7fe drop obsolete/redundant OPTIONS pragma [skip ci]
     af92ef3 ghc/Main: Update list of --print modes
     4f69203 Fix panic when using pattern synonyms with DisambiguateRecordFields
     5bb7fec Export some useful GHC API functions.
     8e735fd Fix GEq1 when optimizations are enabled
     2e49c8c users_guide: Move 7.12.1-notes to 8.0.1-notes
     9cb79c5 Update a few references to GHC 7.12
     b093e63 Modify getFullArgs to include program name
     df6cb57 Accept submodule libraries/primitive commit 1af89788d
     fcc7649 Introduce negative patterns for literals (addresses #11303)
     a1e01b6 testlib: Make TyCon normalization Python 2.6-compatible
     adcbc98 Add regression test for #11303
     e4cc19d Update Cabal submodule to latest snapshot
     c6cab9d Remove `cabal07`-test broken by e4cc19de4bdbcc
     34af60c testsuite: normalise away `ld`-warning on AIX
     f5ef528 Bump GHC version to 8.0.0

From git at git.haskell.org  Wed Dec 30 03:12:12 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 03:12:12 +0000 (UTC)
Subject: [commit: ghc] wip/rae: Fix #11305. (718ab6d)
Message-ID: <20151230031212.2CC033A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/rae
Link       : http://ghc.haskell.org/trac/ghc/changeset/718ab6d8644e21dbc36f42c9bada788a8ca2b6af/ghc

>---------------------------------------------------------------

commit 718ab6d8644e21dbc36f42c9bada788a8ca2b6af
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 29 00:27:59 2015 -0500

    Fix #11305.
    
    Summary:
    In the fallthrough case when doing a subsumption case, we
    need to deeply instantiate to remove any buried foralls in
    the "actual" type.
    
    Once this validates, please feel free to commit it; I may not
    have the chance to do this on Tuesday. Back in full action on
    Wed.
    
    Test Plan: ./validate, typecheck/should_compiler/T11305
    
    Reviewers: austin, bgamari, hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1715
    
    GHC Trac Issues: #11305


>---------------------------------------------------------------

718ab6d8644e21dbc36f42c9bada788a8ca2b6af
 compiler/typecheck/TcUnify.hs                      | 57 ++++++++++++----------
 testsuite/tests/typecheck/should_compile/T11305.hs | 57 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 3 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index b7bc77d..908b692 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -630,7 +630,7 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                  do { traceTc "tcSubTypeDS_NC_O following filled act meta-tyvar:"
                         (ppr tv_a <+> text "-->" <+> ppr ty_a')
                     ; tc_sub_type_ds eq_orig inst_orig ctxt ty_a' ty_e }
-               Unfilled _   -> mkWpCastN <$> unify }
+               Unfilled _   -> unify }
 
 
     go ty_a (TyVarTy tv_e)
@@ -645,33 +645,14 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                Unfilled details
                  |  canUnifyWithPolyType dflags details
                     && isTouchableMetaTyVar tclvl tv_e  -- don't want skolems here
-                 -> mkWpCastN <$> unify
+                 -> unify
 
      -- We've avoided instantiating ty_actual just in case ty_expected is
      -- polymorphic. But we've now assiduously determined that it is *not*
      -- polymorphic. So instantiate away. This is needed for e.g. test
      -- typecheck/should_compile/T4284.
                  |  otherwise
-                 -> do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
-
-                           -- if we haven't recurred through an arrow, then
-                           -- the eq_orig will list ty_actual. In this case,
-                           -- we want to update the origin to reflect the
-                           -- instantiation. If we *have* recurred through
-                           -- an arrow, it's better not to update.
-                       ; let eq_orig' = case eq_orig of
-                               TypeEqOrigin { uo_actual   = orig_ty_actual
-                                            , uo_expected = orig_ty_expected
-                                            , uo_thing    = thing }
-                                 |  orig_ty_actual `tcEqType` ty_actual
-                                 -> TypeEqOrigin
-                                      { uo_actual = rho_a
-                                      , uo_expected = orig_ty_expected
-                                      , uo_thing    = thing }
-                               _ -> eq_orig
-
-                       ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
-                       ; return (mkWpCastN cow <.> wrap) } }
+                 -> inst_and_unify }
 
     go (ForAllTy (Anon act_arg) act_res) (ForAllTy (Anon exp_arg) exp_res)
       | not (isPredTy act_arg)
@@ -693,11 +674,37 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
            ; return (body_wrap <.> in_wrap) }
 
       | otherwise   -- Revert to unification
-      = do { cow <- unify
-           ; return (mkWpCastN cow) }
+      = inst_and_unify
+         -- It's still possible that ty_actual has nested foralls. Instantiate
+         -- these, as there's no way unification will succeed with them in.
+         -- See typecheck/should_compiler/T11350 for an example of when this
+         -- is important.
+
+    inst_and_unify = do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
+
+                           -- if we haven't recurred through an arrow, then
+                           -- the eq_orig will list ty_actual. In this case,
+                           -- we want to update the origin to reflect the
+                           -- instantiation. If we *have* recurred through
+                           -- an arrow, it's better not to update.
+                        ; let eq_orig' = case eq_orig of
+                                TypeEqOrigin { uo_actual   = orig_ty_actual
+                                             , uo_expected = orig_ty_expected
+                                             , uo_thing    = thing }
+                                  |  orig_ty_actual `tcEqType` ty_actual
+                                  ,  not (isIdHsWrapper wrap)
+                                  -> TypeEqOrigin
+                                       { uo_actual = rho_a
+                                       , uo_expected = orig_ty_expected
+                                       , uo_thing    = thing }
+                                _ -> eq_orig
+
+                        ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
+                        ; return (mkWpCastN cow <.> wrap) }
+
 
      -- use versions without synonyms expanded
-    unify = uType eq_orig TypeLevel ty_actual ty_expected
+    unify = mkWpCastN <$> uType eq_orig TypeLevel ty_actual ty_expected
 
 -----------------
 -- needs both un-type-checked (for origins) and type-checked (for wrapping)
diff --git a/testsuite/tests/typecheck/should_compile/T11305.hs b/testsuite/tests/typecheck/should_compile/T11305.hs
new file mode 100644
index 0000000..14cb955
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T11305.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Data.Profunctor.Strong where
+
+import Control.Arrow
+import Control.Category
+import Data.Tuple
+import Prelude hiding (id,(.))
+
+infixr 0 :->
+type p :-> q = forall a b. p a b -> q a b
+
+class Profunctor p where
+  dimap :: (a -> b) -> (c -> d) -> p b c -> p a d
+
+class ProfunctorFunctor t where
+  promap    :: Profunctor p => (p :-> q) -> t p :-> t q
+
+class ProfunctorFunctor t => ProfunctorMonad t where
+  proreturn :: Profunctor p => p       :-> t p
+  projoin   :: Profunctor p => t (t p) :-> t p
+
+class ProfunctorFunctor t => ProfunctorComonad t where
+  proextract   :: Profunctor p => t p :-> p
+  produplicate :: Profunctor p => t p :-> t (t p)
+
+class Profunctor p => Strong p where
+  first' :: p a b  -> p (a, c) (b, c)
+  first' = dimap swap swap . second'
+
+  second' :: p a b -> p (c, a) (c, b)
+  second' = dimap swap swap . first'
+
+----------------------------------------------------------------------------
+
+newtype Tambara p a b = Tambara { runTambara :: forall c. p (a, c) (b, c) }
+
+instance Profunctor p => Profunctor (Tambara p) where
+  dimap f g (Tambara p) = Tambara $ dimap (first f) (first g) p
+
+instance ProfunctorFunctor Tambara where
+  promap f (Tambara p) = Tambara (f p)
+
+instance ProfunctorComonad Tambara where
+  proextract (Tambara p) = dimap (\a -> (a,())) fst p
+
+  produplicate (Tambara p) = Tambara (Tambara $ dimap hither yon p)
+    where
+      hither :: ((a, b), c) -> (a, (b, c))
+      hither ~(~(x,y),z) = (x,(y,z))
+
+      yon    :: (a, (b, c)) -> ((a, b), c)
+      yon    ~(x,~(y,z)) = ((x,y),z)
+
+instance Profunctor p => Strong (Tambara p) where
+  first' = runTambara . produplicate
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 20ef3a7..3fa1f8c 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -486,3 +486,4 @@ test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
 test('T11254', expect_broken(11254), compile, [''])
+test('T11305', normal, compile, [''])


From git at git.haskell.org  Wed Dec 30 04:10:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 04:10:31 +0000 (UTC)
Subject: [commit: ghc] master: Fix #11305. (c06b46d)
Message-ID: <20151230041031.841D93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/c06b46d0313cafe05f8250a660b4481d7c1d298f/ghc

>---------------------------------------------------------------

commit c06b46d0313cafe05f8250a660b4481d7c1d298f
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Tue Dec 29 00:27:59 2015 -0500

    Fix #11305.
    
    Summary:
    In the fallthrough case when doing a subsumption case, we
    need to deeply instantiate to remove any buried foralls in
    the "actual" type.
    
    Once this validates, please feel free to commit it; I may not
    have the chance to do this on Tuesday. Back in full action on
    Wed.
    
    Test Plan: ./validate, typecheck/should_compiler/T11305
    
    Reviewers: austin, bgamari, hvr
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1715
    
    GHC Trac Issues: #11305


>---------------------------------------------------------------

c06b46d0313cafe05f8250a660b4481d7c1d298f
 compiler/typecheck/TcUnify.hs                      | 57 ++++++++++++----------
 testsuite/tests/typecheck/should_compile/T11305.hs | 57 ++++++++++++++++++++++
 testsuite/tests/typecheck/should_compile/all.T     |  1 +
 3 files changed, 90 insertions(+), 25 deletions(-)

diff --git a/compiler/typecheck/TcUnify.hs b/compiler/typecheck/TcUnify.hs
index b7bc77d..908b692 100644
--- a/compiler/typecheck/TcUnify.hs
+++ b/compiler/typecheck/TcUnify.hs
@@ -630,7 +630,7 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                  do { traceTc "tcSubTypeDS_NC_O following filled act meta-tyvar:"
                         (ppr tv_a <+> text "-->" <+> ppr ty_a')
                     ; tc_sub_type_ds eq_orig inst_orig ctxt ty_a' ty_e }
-               Unfilled _   -> mkWpCastN <$> unify }
+               Unfilled _   -> unify }
 
 
     go ty_a (TyVarTy tv_e)
@@ -645,33 +645,14 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
                Unfilled details
                  |  canUnifyWithPolyType dflags details
                     && isTouchableMetaTyVar tclvl tv_e  -- don't want skolems here
-                 -> mkWpCastN <$> unify
+                 -> unify
 
      -- We've avoided instantiating ty_actual just in case ty_expected is
      -- polymorphic. But we've now assiduously determined that it is *not*
      -- polymorphic. So instantiate away. This is needed for e.g. test
      -- typecheck/should_compile/T4284.
                  |  otherwise
-                 -> do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
-
-                           -- if we haven't recurred through an arrow, then
-                           -- the eq_orig will list ty_actual. In this case,
-                           -- we want to update the origin to reflect the
-                           -- instantiation. If we *have* recurred through
-                           -- an arrow, it's better not to update.
-                       ; let eq_orig' = case eq_orig of
-                               TypeEqOrigin { uo_actual   = orig_ty_actual
-                                            , uo_expected = orig_ty_expected
-                                            , uo_thing    = thing }
-                                 |  orig_ty_actual `tcEqType` ty_actual
-                                 -> TypeEqOrigin
-                                      { uo_actual = rho_a
-                                      , uo_expected = orig_ty_expected
-                                      , uo_thing    = thing }
-                               _ -> eq_orig
-
-                       ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
-                       ; return (mkWpCastN cow <.> wrap) } }
+                 -> inst_and_unify }
 
     go (ForAllTy (Anon act_arg) act_res) (ForAllTy (Anon exp_arg) exp_res)
       | not (isPredTy act_arg)
@@ -693,11 +674,37 @@ tc_sub_type_ds eq_orig inst_orig ctxt ty_actual ty_expected
            ; return (body_wrap <.> in_wrap) }
 
       | otherwise   -- Revert to unification
-      = do { cow <- unify
-           ; return (mkWpCastN cow) }
+      = inst_and_unify
+         -- It's still possible that ty_actual has nested foralls. Instantiate
+         -- these, as there's no way unification will succeed with them in.
+         -- See typecheck/should_compiler/T11350 for an example of when this
+         -- is important.
+
+    inst_and_unify = do { (wrap, rho_a) <- deeplyInstantiate inst_orig ty_actual
+
+                           -- if we haven't recurred through an arrow, then
+                           -- the eq_orig will list ty_actual. In this case,
+                           -- we want to update the origin to reflect the
+                           -- instantiation. If we *have* recurred through
+                           -- an arrow, it's better not to update.
+                        ; let eq_orig' = case eq_orig of
+                                TypeEqOrigin { uo_actual   = orig_ty_actual
+                                             , uo_expected = orig_ty_expected
+                                             , uo_thing    = thing }
+                                  |  orig_ty_actual `tcEqType` ty_actual
+                                  ,  not (isIdHsWrapper wrap)
+                                  -> TypeEqOrigin
+                                       { uo_actual = rho_a
+                                       , uo_expected = orig_ty_expected
+                                       , uo_thing    = thing }
+                                _ -> eq_orig
+
+                        ; cow <- uType eq_orig' TypeLevel rho_a ty_expected
+                        ; return (mkWpCastN cow <.> wrap) }
+
 
      -- use versions without synonyms expanded
-    unify = uType eq_orig TypeLevel ty_actual ty_expected
+    unify = mkWpCastN <$> uType eq_orig TypeLevel ty_actual ty_expected
 
 -----------------
 -- needs both un-type-checked (for origins) and type-checked (for wrapping)
diff --git a/testsuite/tests/typecheck/should_compile/T11305.hs b/testsuite/tests/typecheck/should_compile/T11305.hs
new file mode 100644
index 0000000..14cb955
--- /dev/null
+++ b/testsuite/tests/typecheck/should_compile/T11305.hs
@@ -0,0 +1,57 @@
+{-# LANGUAGE RankNTypes #-}
+{-# LANGUAGE TypeOperators #-}
+
+module Data.Profunctor.Strong where
+
+import Control.Arrow
+import Control.Category
+import Data.Tuple
+import Prelude hiding (id,(.))
+
+infixr 0 :->
+type p :-> q = forall a b. p a b -> q a b
+
+class Profunctor p where
+  dimap :: (a -> b) -> (c -> d) -> p b c -> p a d
+
+class ProfunctorFunctor t where
+  promap    :: Profunctor p => (p :-> q) -> t p :-> t q
+
+class ProfunctorFunctor t => ProfunctorMonad t where
+  proreturn :: Profunctor p => p       :-> t p
+  projoin   :: Profunctor p => t (t p) :-> t p
+
+class ProfunctorFunctor t => ProfunctorComonad t where
+  proextract   :: Profunctor p => t p :-> p
+  produplicate :: Profunctor p => t p :-> t (t p)
+
+class Profunctor p => Strong p where
+  first' :: p a b  -> p (a, c) (b, c)
+  first' = dimap swap swap . second'
+
+  second' :: p a b -> p (c, a) (c, b)
+  second' = dimap swap swap . first'
+
+----------------------------------------------------------------------------
+
+newtype Tambara p a b = Tambara { runTambara :: forall c. p (a, c) (b, c) }
+
+instance Profunctor p => Profunctor (Tambara p) where
+  dimap f g (Tambara p) = Tambara $ dimap (first f) (first g) p
+
+instance ProfunctorFunctor Tambara where
+  promap f (Tambara p) = Tambara (f p)
+
+instance ProfunctorComonad Tambara where
+  proextract (Tambara p) = dimap (\a -> (a,())) fst p
+
+  produplicate (Tambara p) = Tambara (Tambara $ dimap hither yon p)
+    where
+      hither :: ((a, b), c) -> (a, (b, c))
+      hither ~(~(x,y),z) = (x,(y,z))
+
+      yon    :: (a, (b, c)) -> ((a, b), c)
+      yon    ~(x,~(y,z)) = ((x,y),z)
+
+instance Profunctor p => Strong (Tambara p) where
+  first' = runTambara . produplicate
diff --git a/testsuite/tests/typecheck/should_compile/all.T b/testsuite/tests/typecheck/should_compile/all.T
index 20ef3a7..3fa1f8c 100644
--- a/testsuite/tests/typecheck/should_compile/all.T
+++ b/testsuite/tests/typecheck/should_compile/all.T
@@ -486,3 +486,4 @@ test('T10971a', normal, compile, [''])
 test('T11237', normal, compile, [''])
 test('T10592', normal, compile, [''])
 test('T11254', expect_broken(11254), compile, [''])
+test('T11305', normal, compile, [''])


From git at git.haskell.org  Wed Dec 30 07:37:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 07:37:39 +0000 (UTC)
Subject: [commit: ghc] master: Make iserv-bin compatible with GHC version bump
 to 8.0 (8fcf1e7)
Message-ID: <20151230073739.16B143A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8fcf1e729fda213591251d974df4b3c9875d9a0a/ghc

>---------------------------------------------------------------

commit 8fcf1e729fda213591251d974df4b3c9875d9a0a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 30 08:37:02 2015 +0100

    Make iserv-bin compatible with GHC version bump to 8.0


>---------------------------------------------------------------

8fcf1e729fda213591251d974df4b3c9875d9a0a
 iserv/iserv-bin.cabal | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index d4f0eed..c7bd823 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -23,4 +23,4 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       == 7.11.*
+                   ghci       >= 7.11 && < 8.1


From git at git.haskell.org  Wed Dec 30 07:38:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 07:38:13 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0: Bump GHC version to 8.0.0 (ff89237)
Message-ID: <20151230073813.E97B23A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : wip/ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/ff8923747989eca936822d7d47b794db50095bdf/ghc

>---------------------------------------------------------------

commit ff8923747989eca936822d7d47b794db50095bdf
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0
    
    Test Plan: testing whether we need to fixup something for the version bump
    
    Reviewers: austin, bgamari
    
    Subscribers: thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1679


>---------------------------------------------------------------

ff8923747989eca936822d7d47b794db50095bdf
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f5d624d..637d3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Wed Dec 30 07:38:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 07:38:16 +0000 (UTC)
Subject: [commit: ghc] wip/ghc-8.0's head updated: Bump GHC version to 8.0.0
 (ff89237)
Message-ID: <20151230073816.581C63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'wip/ghc-8.0' now includes:

     c06b46d Fix #11305.
     8fcf1e7 Make iserv-bin compatible with GHC version bump to 8.0
     ff89237 Bump GHC version to 8.0.0

From git at git.haskell.org  Wed Dec 30 10:59:20 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 10:59:20 +0000 (UTC)
Subject: [commit: ghc] master: T11303: Set maximum heap size (07779c2)
Message-ID: <20151230105920.A710C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/07779c23d2a0e4b98d6ee29c0bc7e09345a24d4a/ghc

>---------------------------------------------------------------

commit 07779c23d2a0e4b98d6ee29c0bc7e09345a24d4a
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 30 11:16:59 2015 +0100

    T11303: Set maximum heap size
    
    As suggested by @thomie.


>---------------------------------------------------------------

07779c23d2a0e4b98d6ee29c0bc7e09345a24d4a
 testsuite/tests/pmcheck/should_compile/all.T | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index 3bd4118..9278fde 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -22,7 +22,7 @@ test('T7669a', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patter
 test('T8970', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951b',only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('T9951', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
-test('T11303', normal, compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T11303', normal, compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns +RTS -M1G -RTS'])
 
 # Other tests
 test('pmc001', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])


From git at git.haskell.org  Wed Dec 30 10:59:23 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 10:59:23 +0000 (UTC)
Subject: [commit: ghc] master: users_guide/ghci: Fix heading (630303a)
Message-ID: <20151230105923.4B08A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/630303af5b948f89b4aeb026c8d78a42146fa9b0/ghc

>---------------------------------------------------------------

commit 630303af5b948f89b4aeb026c8d78a42146fa9b0
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 30 11:21:43 2015 +0100

    users_guide/ghci: Fix heading


>---------------------------------------------------------------

630303af5b948f89b4aeb026c8d78a42146fa9b0
 docs/users_guide/ghci.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users_guide/ghci.rst b/docs/users_guide/ghci.rst
index 7fedf21..3402b45 100644
--- a/docs/users_guide/ghci.rst
+++ b/docs/users_guide/ghci.rst
@@ -399,7 +399,7 @@ For example, remembering that ``putStrLn :: String -> IO ()``:
 
 .. _ghci-stmts:
 
-Using ``do-``\ notation at the prompt
+Using ``do`` notation at the prompt
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 .. index::


From git at git.haskell.org  Wed Dec 30 11:29:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 11:29:39 +0000 (UTC)
Subject: [commit: ghc] master: Testsuite: mark T7653 with high_memory_usage
 (3bbc01a)
Message-ID: <20151230112939.22B693A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3bbc01a425f8a0b395751a7394c40d1507e77bbc/ghc

>---------------------------------------------------------------

commit 3bbc01a425f8a0b395751a7394c40d1507e77bbc
Author: Thomas Miedema <thomasmiedema at gmail.com>
Date:   Sat Dec 26 14:32:55 2015 +0100

    Testsuite: mark T7653 with high_memory_usage


>---------------------------------------------------------------

3bbc01a425f8a0b395751a7394c40d1507e77bbc
 libraries/base/tests/all.T | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libraries/base/tests/all.T b/libraries/base/tests/all.T
index da14cb2..0cb48bb 100644
--- a/libraries/base/tests/all.T
+++ b/libraries/base/tests/all.T
@@ -141,7 +141,8 @@ test('T7773', when(opsys('mingw32'), skip), compile_and_run, [''])
 test('CatPairs', normal, compile, [''])
 test('CatEntail', normal, compile, [''])
 
-test('T7653', normal, compile_and_run, [''])
+# When running with WAY=ghci, T7653 uses a lot of memory.
+test('T7653', high_memory_usage, compile_and_run, [''])
 test('T7787', normal, compile_and_run, [''])
 
 test('topHandler01', when(opsys('mingw32'), skip), compile_and_run, [''])


From git at git.haskell.org  Wed Dec 30 11:40:31 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 11:40:31 +0000 (UTC)
Subject: [commit: ghc] branch 'ghc-8.0' created
Message-ID: <20151230114031.CEE2B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New branch : ghc-8.0
Referencing: 8fdbdaee10999291b103dffddddcf2aab85c6943

From git at git.haskell.org  Wed Dec 30 11:40:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 11:40:34 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: configure.ac: Bump version to 8.0 (8fdbdae)
Message-ID: <20151230114034.779973A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/8fdbdaee10999291b103dffddddcf2aab85c6943/ghc

>---------------------------------------------------------------

commit 8fdbdaee10999291b103dffddddcf2aab85c6943
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 29 14:36:59 2015 +0100

    configure.ac: Bump version to 8.0


>---------------------------------------------------------------

8fdbdaee10999291b103dffddddcf2aab85c6943
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f5d624d..d37edee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Wed Dec 30 12:27:39 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 12:27:39 +0000 (UTC)
Subject: [commit: ghc] master: Fix some typos (b0fa286)
Message-ID: <20151230122739.651AB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/b0fa286475e5251e6b92e83da3716f9ca9ed37b6/ghc

>---------------------------------------------------------------

commit b0fa286475e5251e6b92e83da3716f9ca9ed37b6
Author: Gabor Greif <ggreif at gmail.com>
Date:   Wed Dec 30 13:27:57 2015 +0100

    Fix some typos


>---------------------------------------------------------------

b0fa286475e5251e6b92e83da3716f9ca9ed37b6
 compiler/parser/Parser.y         | 4 ++--
 compiler/parser/RdrHsSyn.hs      | 2 +-
 compiler/typecheck/TcRnDriver.hs | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/compiler/parser/Parser.y b/compiler/parser/Parser.y
index 11dc84f..9ddeb56 100644
--- a/compiler/parser/Parser.y
+++ b/compiler/parser/Parser.y
@@ -2863,9 +2863,9 @@ constructors with 'type' keyword.
 
 This ambiguity causes reduce/reduce conflicts in parser, which are always
 resolved in favour of variable constructors. To get rid of conflicts we demand
-that ambigous type constructors (those, which are formed by the same
+that ambiguous type constructors (those, which are formed by the same
 productions as variable constructors) are always prefixed with 'type' keyword.
-Unambigous type constructors may occur both with or without 'type' keyword.
+Unambiguous type constructors may occur both with or without 'type' keyword.
 -}
 
 qtyconop :: { Located RdrName } -- Qualified or unqualified
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index d8c8b3a..f423c6e 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -1287,7 +1287,7 @@ mkImport (L lc cconv) (L ls safety) (L loc (StringLiteral esrc entity), v, ty)
                                                      , fd_co = noForeignImportCoercionYet
                                                      , fd_fi = importSpec }))
 
--- the string "foo" is ambigous: either a header or a C identifier.  The
+-- the string "foo" is ambiguous: either a header or a C identifier.  The
 -- C identifier case comes first in the alternatives below, so we pick
 -- that one.
 parseCImport :: Located CCallConv -> Located Safety -> FastString -> String
diff --git a/compiler/typecheck/TcRnDriver.hs b/compiler/typecheck/TcRnDriver.hs
index 823bd38..078b7df 100644
--- a/compiler/typecheck/TcRnDriver.hs
+++ b/compiler/typecheck/TcRnDriver.hs
@@ -1953,7 +1953,7 @@ isGHCiMonad hsc_env ty
                 _ <- tcLookupInstance ghciClass [userTy]
                 return name
 
-            Just _  -> failWithTc $ text "Ambigous type!"
+            Just _  -> failWithTc $ text "Ambiguous type!"
             Nothing -> failWithTc $ text ("Can't find type:" ++ ty)
 
 -- tcRnExpr just finds the type of an expression


From git at git.haskell.org  Wed Dec 30 14:23:07 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 14:23:07 +0000 (UTC)
Subject: [commit: ghc] master: rts/PrimOps.cmm: fix UNREG profiled build
 (e9ab6d5)
Message-ID: <20151230142307.5BDA93A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e9ab6d5939014e11b4f9368984f991de4d4cf041/ghc

>---------------------------------------------------------------

commit e9ab6d5939014e11b4f9368984f991de4d4cf041
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Wed Dec 30 12:35:53 2015 +0000

    rts/PrimOps.cmm: fix UNREG profiled build
    
    Brought 'CCS_MAIN' into scope, otherwise UNREG
    prof build is unhappy:
    
        rts_dist_HC rts/dist/build/PrimOps.p_o
      /tmp/ghc25593_0/ghc_3.hc: In function 'clB_entry':
    
      /tmp/ghc25593_0/ghc_3.hc:2983:24: error:
         error: 'CCS_MAIN' undeclared (first use in this function)
         *((P_)(_cly+8)) = (W_)&CCS_MAIN;
                                ^
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

e9ab6d5939014e11b4f9368984f991de4d4cf041
 rts/PrimOps.cmm | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index 2989f29..7add835 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -35,6 +35,9 @@ import CLOSURE ghczmprim_GHCziTypes_False_closure;
 #if defined(USE_MINIINTERPRETER) || !defined(mingw32_HOST_OS)
 import CLOSURE sm_mutex;
 #endif
+#ifdef PROFILING
+import CLOSURE CCS_MAIN;
+#endif
 
 /*-----------------------------------------------------------------------------
   Array Primitives


From git at git.haskell.org  Wed Dec 30 14:23:10 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 14:23:10 +0000 (UTC)
Subject: [commit: ghc] master: rts/Linker.c: mark ia64 as 64-bit ELF,
 drop unused branches (d3a79bc)
Message-ID: <20151230142310.056283A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d3a79bcc035d7dab4f16a807984225e4bd4fccd8/ghc

>---------------------------------------------------------------

commit d3a79bcc035d7dab4f16a807984225e4bd4fccd8
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Wed Dec 30 12:40:56 2015 +0000

    rts/Linker.c: mark ia64 as 64-bit ELF, drop unused branches
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

d3a79bcc035d7dab4f16a807984225e4bd4fccd8
 rts/Linker.c | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/rts/Linker.c b/rts/Linker.c
index c0ab664..cb90c97 100644
--- a/rts/Linker.c
+++ b/rts/Linker.c
@@ -4169,6 +4169,8 @@ ocRunInit_PEi386 ( ObjectCode *oc )
 #  define ELF_TARGET_AMD64 /* Used inside <elf.h> on Solaris 11 */
 #elif defined(powerpc64_HOST_ARCH) || defined(powerpc64le_HOST_ARCH)
 #  define ELF_64BIT
+#elif defined(ia64_HOST_ARCH)
+#  define ELF_64BIT
 #endif
 
 #if !defined(openbsd_HOST_OS)
@@ -5296,7 +5298,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
 #if defined(SHN_XINDEX)
    Elf_Word* shndx_table = get_shndx_table((Elf_Ehdr*)ehdrC);
 #endif
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
    /* This #ifdef only serves to avoid unused-var warnings. */
    Elf_Addr targ = (Elf_Addr) oc->sections[target_shndx].start;
 #endif
@@ -5314,13 +5316,13 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
    }
 
    for (j = 0; j < nent; j++) {
-#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(DEBUG) || defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
       /* This #ifdef only serves to avoid unused-var warnings. */
       Elf_Addr  offset = rtab[j].r_offset;
       Elf_Addr  P      = targ + offset;
       Elf_Addr  A      = rtab[j].r_addend;
 #endif
-#if defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
       Elf_Addr  value;
 #endif
       Elf_Addr  info   = rtab[j].r_info;
@@ -5386,7 +5388,7 @@ do_Elf_Rela_relocations ( ObjectCode* oc, char* ehdrC,
                                         (void*)P, (void*)S, (void*)A ));
       /* checkProddableBlock ( oc, (void*)P ); */
 
-#if defined(sparc_HOST_ARCH) || defined(ia64_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
+#if defined(sparc_HOST_ARCH) || defined(powerpc_HOST_ARCH) || defined(x86_64_HOST_ARCH)
       value = S + A;
 #endif
 


From git at git.haskell.org  Wed Dec 30 14:33:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 14:33:35 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Bump GHC version to 8.0.0 (24cf43f)
Message-ID: <20151230143335.4AF8A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/24cf43fe46c0f5c09101e8b6bb4a8ffda51ec1c5/ghc

>---------------------------------------------------------------

commit 24cf43fe46c0f5c09101e8b6bb4a8ffda51ec1c5
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0
    
    NB: We need to use `8.0` rather than `8.0.0`
    
    Differential Revision: https://phabricator.haskell.org/D1679


>---------------------------------------------------------------

24cf43fe46c0f5c09101e8b6bb4a8ffda51ec1c5
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d37edee..637d3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Wed Dec 30 16:24:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:24:08 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Declare that ghc:ghc-8.0 is tracking
 haddock:master (7e38b72)
Message-ID: <20151230162408.E98353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/7e38b7203f494a903369eecbd55cb6c416f3f0dd/ghc

>---------------------------------------------------------------

commit 7e38b7203f494a903369eecbd55cb6c416f3f0dd
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 30 17:24:19 2015 +0100

    Declare that ghc:ghc-8.0 is tracking haddock:master


>---------------------------------------------------------------

7e38b7203f494a903369eecbd55cb6c416f3f0dd
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 73ce0d1..29ca854 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -102,7 +102,7 @@
 	path = utils/haddock
 	url = ../haddock.git
 	ignore = none
-	branch = ghc-head
+	branch = master
 [submodule "nofib"]
 	path = nofib
 	url = ../nofib.git


From git at git.haskell.org  Wed Dec 30 16:24:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:24:55 +0000 (UTC)
Subject: [commit: ghc] master: glasgow_exts.rst: fix code block (0380a95)
Message-ID: <20151230162455.ECD873A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0380a95b42a5e79edbe835ea76142ae0472c7b2d/ghc

>---------------------------------------------------------------

commit 0380a95b42a5e79edbe835ea76142ae0472c7b2d
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Wed Dec 30 16:21:25 2015 +0000

    glasgow_exts.rst: fix code block
    
    Detected by sphinx as:
        ERROR: Unexpected indentation.
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

0380a95b42a5e79edbe835ea76142ae0472c7b2d
 docs/users_guide/glasgow_exts.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/users_guide/glasgow_exts.rst b/docs/users_guide/glasgow_exts.rst
index 961a378..51f84d6 100644
--- a/docs/users_guide/glasgow_exts.rst
+++ b/docs/users_guide/glasgow_exts.rst
@@ -8401,6 +8401,7 @@ the printed stack is not particularly enlightening, so we might choose
 to surpress it by freezing the ``CallStack`` that we pass to ``myerror``.
 
 ::
+
    head :: (?callStack :: CallStack) => [a] -> a
    head []     = let ?callStack = freezeCallStack ?callStack in myerror "empty"
    head (x:xs) = x


From git at git.haskell.org  Wed Dec 30 16:29:22 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:29:22 +0000 (UTC)
Subject: [commit: ghc] master: Bump GHC HEAD's Version from 7.11 to 8.1
 (947c8a5)
Message-ID: <20151230162922.40BC73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/947c8a530e2f977f56601289e1b11cde42f95322/ghc

>---------------------------------------------------------------

commit 947c8a530e2f977f56601289e1b11cde42f95322
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 30 17:28:13 2015 +0100

    Bump GHC HEAD's Version from 7.11 to 8.1
    
    This updates the haddock submodule


>---------------------------------------------------------------

947c8a530e2f977f56601289e1b11cde42f95322
 configure.ac                                          | 2 +-
 iserv/iserv-bin.cabal                                 | 2 +-
 libraries/template-haskell/Language/Haskell/TH/Lib.hs | 2 +-
 libraries/template-haskell/template-haskell.cabal     | 2 +-
 utils/haddock                                         | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index f5d624d..0ff4769 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.1], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}
diff --git a/iserv/iserv-bin.cabal b/iserv/iserv-bin.cabal
index c7bd823..a770b4f 100644
--- a/iserv/iserv-bin.cabal
+++ b/iserv/iserv-bin.cabal
@@ -23,4 +23,4 @@ Executable iserv
                    bytestring >= 0.10 && < 0.11,
                    containers >= 0.5 && < 0.6,
                    deepseq    >= 1.4 && < 1.5,
-                   ghci       >= 7.11 && < 8.1
+                   ghci       == 8.1
diff --git a/libraries/template-haskell/Language/Haskell/TH/Lib.hs b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
index 3d77a4a..0dcf81a 100644
--- a/libraries/template-haskell/Language/Haskell/TH/Lib.hs
+++ b/libraries/template-haskell/Language/Haskell/TH/Lib.hs
@@ -478,7 +478,7 @@ closedTypeFamilyD tc tvs result injectivity eqns =
 --   3. remove the FamFlavour data type from Syntax module
 --   4. make sure that all references to FamFlavour are gone from DsMeta,
 --      Convert, TcSplice (follows from 3)
-#if __GLASGOW_HASKELL__ > 800
+#if __GLASGOW_HASKELL__ >= 802
 #error Remove deprecated familyNoKindD, familyKindD, closedTypeFamilyNoKindD and closedTypeFamilyKindD
 #endif
 
diff --git a/libraries/template-haskell/template-haskell.cabal b/libraries/template-haskell/template-haskell.cabal
index ff9fe05..aae8afe 100644
--- a/libraries/template-haskell/template-haskell.cabal
+++ b/libraries/template-haskell/template-haskell.cabal
@@ -48,7 +48,7 @@ Library
 
     build-depends:
         base       >= 4.6 && < 4.10,
-        ghc-boot   >= 7.11 && < 8.1,
+        ghc-boot   == 8.1,
         pretty     == 1.1.*
 
     -- We need to set the unit ID to template-haskell (without a
diff --git a/utils/haddock b/utils/haddock
index 80f2f98..6ddd758 160000
--- a/utils/haddock
+++ b/utils/haddock
@@ -1 +1 @@
-Subproject commit 80f2f9805b61e8cea291bae8ce22db626dc11f21
+Subproject commit 6ddd758be0e7b50bd19d33400b3c3013d60786cb


From git at git.haskell.org  Wed Dec 30 16:33:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:33:06 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Declare that ghc:ghc-8.0 is tracking
 haddock:master (9418ee7)
Message-ID: <20151230163306.26ECB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/9418ee79e8957d10c98350a7adddca4c8c7aa859/ghc

>---------------------------------------------------------------

commit 9418ee79e8957d10c98350a7adddca4c8c7aa859
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Wed Dec 30 17:24:19 2015 +0100

    Declare that ghc:ghc-8.0 is tracking haddock:master


>---------------------------------------------------------------

9418ee79e8957d10c98350a7adddca4c8c7aa859
 .gitmodules | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 73ce0d1..29ca854 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -102,7 +102,7 @@
 	path = utils/haddock
 	url = ../haddock.git
 	ignore = none
-	branch = ghc-head
+	branch = master
 [submodule "nofib"]
 	path = nofib
 	url = ../nofib.git


From git at git.haskell.org  Wed Dec 30 16:33:08 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:33:08 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Bump GHC version to 8.0.0 (69a25d6)
Message-ID: <20151230163308.BBE353A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/69a25d68f9f8364593d59ad3450384d806ae35da/ghc

>---------------------------------------------------------------

commit 69a25d68f9f8364593d59ad3450384d806ae35da
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Dec 21 18:10:12 2015 +0100

    Bump GHC version to 8.0.0
    
    NB: We need to use `8.0` rather than `8.0.0`
    
    Differential Revision: https://phabricator.haskell.org/D1679


>---------------------------------------------------------------

69a25d68f9f8364593d59ad3450384d806ae35da
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index d37edee..637d3cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Wed Dec 30 16:33:11 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:33:11 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: configure.ac: Bump version to 8.0 (0675f79)
Message-ID: <20151230163311.66A703A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/0675f795577c6c0833a08bfd0009bbe26af36569/ghc

>---------------------------------------------------------------

commit 0675f795577c6c0833a08bfd0009bbe26af36569
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Tue Dec 29 14:36:59 2015 +0100

    configure.ac: Bump version to 8.0


>---------------------------------------------------------------

0675f795577c6c0833a08bfd0009bbe26af36569
 configure.ac | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index f5d624d..d37edee 100644
--- a/configure.ac
+++ b/configure.ac
@@ -13,7 +13,7 @@ dnl
 # see what flags are available. (Better yet, read the documentation!)
 #
 
-AC_INIT([The Glorious Glasgow Haskell Compilation System], [7.11], [glasgow-haskell-bugs at haskell.org], [ghc])
+AC_INIT([The Glorious Glasgow Haskell Compilation System], [8.0], [glasgow-haskell-bugs at haskell.org], [ghc])
 
 # Set this to YES for a released version, otherwise NO
 : ${RELEASE=NO}


From git at git.haskell.org  Wed Dec 30 16:33:13 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:33:13 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0's head updated: Declare that ghc:ghc-8.0 is
 tracking haddock:master (9418ee7)
Message-ID: <20151230163313.B15103A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Branch 'ghc-8.0' now includes:

     3bbc01a Testsuite: mark T7653 with high_memory_usage
     b0fa286 Fix some typos
     e9ab6d5 rts/PrimOps.cmm: fix UNREG profiled build
     d3a79bc rts/Linker.c: mark ia64 as 64-bit ELF, drop unused branches
     0380a95 glasgow_exts.rst: fix code block
     0675f79 configure.ac: Bump version to 8.0
     69a25d6 Bump GHC version to 8.0.0
     9418ee7 Declare that ghc:ghc-8.0 is tracking haddock:master

From git at git.haskell.org  Wed Dec 30 16:37:15 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 16:37:15 +0000 (UTC)
Subject: [commit: ghc] branch 'wip/ghc-8.0' deleted
Message-ID: <20151230163715.DAFA63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

Deleted branch: wip/ghc-8.0

From git at git.haskell.org  Wed Dec 30 18:34:27 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 18:34:27 +0000 (UTC)
Subject: [commit: ghc] master: Address #11245: Ensure the non-matched list is
 always non-empty (bb7f2e3)
Message-ID: <20151230183427.CB78B3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/bb7f2e33197e667eb694bd1243f125c722a0a868/ghc

>---------------------------------------------------------------

commit bb7f2e33197e667eb694bd1243f125c722a0a868
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 30 16:09:29 2015 +0100

    Address #11245: Ensure the non-matched list is always non-empty
    
    When there is an uncovered vector of length 0 (which in turn means that
    it represents a guard failure) print "(incomplete guards)" instead of an
    empty list of non-covered vectors.
    
    Test Plan: validate
    
    Reviewers: austin, bgamari
    
    Reviewed By: bgamari
    
    Subscribers: thomie
    
    Differential Revision: https://phabricator.haskell.org/D1717
    
    GHC Trac Issues: #11245


>---------------------------------------------------------------

bb7f2e33197e667eb694bd1243f125c722a0a868
 compiler/deSugar/Check.hs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 78a8eaa..fd0c6e0 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -1420,9 +1420,11 @@ dsPmWarn dflags ctx@(DsMatchContext kind loc) mPmResult
       vcat (map (ppr_eqn f kind) (take maximum_output qs)) $$ dots qs
 
     pprEqnsU qs = pp_context ctx (ptext (sLit "are non-exhaustive")) $ \_ ->
-      let us = map ppr_uncovered qs
-      in  hang (ptext (sLit "Patterns not matched:")) 4
-               (vcat (take maximum_output us) $$ dots us)
+      case qs of -- See #11245
+           [([],_)] -> ptext (sLit "Guards do not cover entire pattern space")
+           _missing -> let us = map ppr_uncovered qs
+                       in  hang (ptext (sLit "Patterns not matched:")) 4
+                                (vcat (take maximum_output us) $$ dots us)
 
 dots :: [a] -> SDoc
 dots qs | qs `lengthExceeds` maximum_output = ptext (sLit "...")


From git at git.haskell.org  Wed Dec 30 20:51:30 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 20:51:30 +0000 (UTC)
Subject: [commit: ghc] tag 'ghc-8.1-start' created
Message-ID: <20151230205130.4458F3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

New tag    : ghc-8.1-start
Referencing: 9402724216e67c54c28cc6bc0c3d5073dc319898

From git at git.haskell.org  Wed Dec 30 21:19:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Wed, 30 Dec 2015 21:19:40 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Address #11245: Ensure the non-matched list is
 always non-empty (95fdf59)
Message-ID: <20151230211940.CE2DD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/95fdf59c73e3f0d85f3e5d8540d27583cc310669/ghc

>---------------------------------------------------------------

commit 95fdf59c73e3f0d85f3e5d8540d27583cc310669
Author: George Karachalias <george.karachalias at gmail.com>
Date:   Wed Dec 30 16:09:29 2015 +0100

    Address #11245: Ensure the non-matched list is always non-empty
    
    When there is an uncovered vector of length 0 (which in turn means that
    it represents a guard failure) print "(incomplete guards)" instead of an
    empty list of non-covered vectors.
    
    Reviewed By: bgamari
    
    Differential Revision: https://phabricator.haskell.org/D1717
    
    GHC Trac Issues: #11245
    
    (cherry picked from commit bb7f2e33197e667eb694bd1243f125c722a0a868)


>---------------------------------------------------------------

95fdf59c73e3f0d85f3e5d8540d27583cc310669
 compiler/deSugar/Check.hs | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/compiler/deSugar/Check.hs b/compiler/deSugar/Check.hs
index 78a8eaa..fd0c6e0 100644
--- a/compiler/deSugar/Check.hs
+++ b/compiler/deSugar/Check.hs
@@ -1420,9 +1420,11 @@ dsPmWarn dflags ctx@(DsMatchContext kind loc) mPmResult
       vcat (map (ppr_eqn f kind) (take maximum_output qs)) $$ dots qs
 
     pprEqnsU qs = pp_context ctx (ptext (sLit "are non-exhaustive")) $ \_ ->
-      let us = map ppr_uncovered qs
-      in  hang (ptext (sLit "Patterns not matched:")) 4
-               (vcat (take maximum_output us) $$ dots us)
+      case qs of -- See #11245
+           [([],_)] -> ptext (sLit "Guards do not cover entire pattern space")
+           _missing -> let us = map ppr_uncovered qs
+                       in  hang (ptext (sLit "Patterns not matched:")) 4
+                                (vcat (take maximum_output us) $$ dots us)
 
 dots :: [a] -> SDoc
 dots qs | qs `lengthExceeds` maximum_output = ptext (sLit "...")


From git at git.haskell.org  Thu Dec 31 09:51:59 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 09:51:59 +0000 (UTC)
Subject: [commit: ghc] master: Various API Annotations fixes (25e4556)
Message-ID: <20151231095159.A40C63A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/25e4556d97429e95ddb5972f6e7e6599ef902e9c/ghc

>---------------------------------------------------------------

commit 25e4556d97429e95ddb5972f6e7e6599ef902e9c
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Wed Dec 30 18:51:53 2015 +0200

    Various API Annotations fixes
    
    - Export unicodeAnn from GHC
    - unicodeAnn for Annlarrowtail was wrong
    - Use actual source for a CImport SourceText


>---------------------------------------------------------------

25e4556d97429e95ddb5972f6e7e6599ef902e9c
 compiler/main/GHC.hs                              | 1 +
 compiler/parser/ApiAnnotation.hs                  | 2 +-
 compiler/parser/RdrHsSyn.hs                       | 2 +-
 testsuite/tests/ghc-api/annotations/T11018.stdout | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/compiler/main/GHC.hs b/compiler/main/GHC.hs
index 0ac1331..666ff49 100644
--- a/compiler/main/GHC.hs
+++ b/compiler/main/GHC.hs
@@ -272,6 +272,7 @@ module GHC (
         ApiAnns,AnnKeywordId(..),AnnotationComment(..),
         getAnnotation, getAndRemoveAnnotation,
         getAnnotationComments, getAndRemoveAnnotationComments,
+        unicodeAnn,
 
         -- * Miscellaneous
         --sessionHscEnv,
diff --git a/compiler/parser/ApiAnnotation.hs b/compiler/parser/ApiAnnotation.hs
index b5214c1..73490e4 100644
--- a/compiler/parser/ApiAnnotation.hs
+++ b/compiler/parser/ApiAnnotation.hs
@@ -324,7 +324,7 @@ unicodeAnn AnnDcolon     = AnnDcolonU
 unicodeAnn AnnLarrow     = AnnLarrowU
 unicodeAnn AnnRarrow     = AnnRarrowU
 unicodeAnn AnnDarrow     = AnnDarrowU
-unicodeAnn Annlarrowtail = AnnLarrowtailU
+unicodeAnn Annlarrowtail = AnnlarrowtailU
 unicodeAnn Annrarrowtail = AnnrarrowtailU
 unicodeAnn AnnLarrowtail = AnnLarrowtailU
 unicodeAnn AnnRarrowtail = AnnRarrowtailU
diff --git a/compiler/parser/RdrHsSyn.hs b/compiler/parser/RdrHsSyn.hs
index f423c6e..0f38086 100644
--- a/compiler/parser/RdrHsSyn.hs
+++ b/compiler/parser/RdrHsSyn.hs
@@ -1268,7 +1268,7 @@ mkImport (L lc cconv) (L ls safety) (L loc (StringLiteral esrc entity), v, ty)
   | cconv == PrimCallConv                      = do
   let funcTarget = CFunction (StaticTarget esrc entity Nothing True)
       importSpec = CImport (L lc PrimCallConv) (L ls safety) Nothing funcTarget
-                           (L loc (unpackFS entity))
+                           (L loc esrc)
   return (ForD (ForeignImport { fd_name = v, fd_sig_ty = ty
                               , fd_co = noForeignImportCoercionYet
                               , fd_fi = importSpec }))
diff --git a/testsuite/tests/ghc-api/annotations/T11018.stdout b/testsuite/tests/ghc-api/annotations/T11018.stdout
index ac32549..011867e 100644
--- a/testsuite/tests/ghc-api/annotations/T11018.stdout
+++ b/testsuite/tests/ghc-api/annotations/T11018.stdout
@@ -142,7 +142,7 @@
 ((Test11018.hs:43:11-17,AnnOpenP), [Test11018.hs:43:11]),
 ((Test11018.hs:43:12,AnnComma), [Test11018.hs:43:13]),
 ((Test11018.hs:43:14,AnnComma), [Test11018.hs:43:15]),
-((Test11018.hs:43:22-34,AnnLarrowtailU), [Test11018.hs:43:30]),
+((Test11018.hs:43:22-34,AnnlarrowtailU), [Test11018.hs:43:30]),
 ((Test11018.hs:43:32-34,AnnVal), [Test11018.hs:43:33]),
 ((Test11018.hs:45:1-36,AnnDcolon), [Test11018.hs:45:5-6]),
 ((Test11018.hs:45:1-36,AnnSemi), [Test11018.hs:46:1]),


From git at git.haskell.org  Thu Dec 31 11:14:37 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 11:14:37 +0000 (UTC)
Subject: [commit: ghc] master: fix ghci build on ArchUnknown targets (75851bf)
Message-ID: <20151231111437.234F73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/75851bf930067ae7c57bee3c6feea456534eafed/ghc

>---------------------------------------------------------------

commit 75851bf930067ae7c57bee3c6feea456534eafed
Author: Sergei Trofimovich <siarheit at google.com>
Date:   Thu Dec 31 10:32:40 2015 +0000

    fix ghci build on ArchUnknown targets
    
    Observed failure on ia64 as:
    
        "inplace/bin/hsc2hs" \
             ... \
             --cflag=-Dia64_HOST_ARCH=1 --cflag=-Dlinux_HOST_OS=1 \
             ... \
             libraries/ghci/./GHCi/InfoTable.hsc \
             -o libraries/ghci/dist-install/build/GHCi/InfoTable.hs
    
        InfoTable.hsc:84:2: error: #error Unknown architecture
    
    Signed-off-by: Sergei Trofimovich <siarheit at google.com>


>---------------------------------------------------------------

75851bf930067ae7c57bee3c6feea456534eafed
 libraries/ghci/GHCi/InfoTable.hsc | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/libraries/ghci/GHCi/InfoTable.hsc b/libraries/ghci/GHCi/InfoTable.hsc
index 14e1698..0244990 100644
--- a/libraries/ghci/GHCi/InfoTable.hsc
+++ b/libraries/ghci/GHCi/InfoTable.hsc
@@ -56,8 +56,16 @@ type ItblCodes = Either [Word8] [Word32]
 funPtrToInt :: FunPtr a -> Int
 funPtrToInt (FunPtr a) = I## (addr2Int## a)
 
-data Arch = ArchSPARC | ArchPPC | ArchX86 | ArchX86_64 | ArchAlpha | ArchARM
-          | ArchARM64 | ArchPPC64 | ArchPPC64LE
+data Arch = ArchSPARC
+          | ArchPPC
+          | ArchX86
+          | ArchX86_64
+          | ArchAlpha
+          | ArchARM
+          | ArchARM64
+          | ArchPPC64
+          | ArchPPC64LE
+          | ArchUnknown
  deriving Show
 
 platform :: Arch
@@ -81,7 +89,11 @@ platform =
 #elif defined(powerpc64le_HOST_ARCH)
        ArchPPC64LE
 #else
-#error Unknown architecture
+#    if defined(TABLES_NEXT_TO_CODE)
+#        error Unimplemented architecture
+#    else
+       ArchUnknown
+#    endif
 #endif
 
 mkJumpToAddr :: EntryFunPtr -> ItblCodes
@@ -245,6 +257,11 @@ mkJumpToAddr a = case platform of
                    0x618C0000 .|. lo16 w32,
                    0x7D8903A6, 0x4E800420 ]
 
+    -- This code must not be called. You either need to
+    -- add your architecture as a distinct case or
+    -- use non-TABLES_NEXT_TO_CODE mode
+    ArchUnknown -> error "mkJumpToAddr: ArchUnknown is unsupported"
+
 byte0 :: (Integral w) => w -> Word8
 byte0 w = fromIntegral w
 


From git at git.haskell.org  Thu Dec 31 14:45:35 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 14:45:35 +0000 (UTC)
Subject: [commit: ghc] master: Improve exprIsBottom (0579fe9)
Message-ID: <20151231144535.E192C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0579fe99b933384172d19beb6a00dc8a1238101a/ghc

>---------------------------------------------------------------

commit 0579fe99b933384172d19beb6a00dc8a1238101a
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 31 09:07:33 2015 +0000

    Improve exprIsBottom
    
    This fixes Trac #11290, by being sligthtly cleverer about finding
    what expressions are bottom.  Actually this might have minor
    other side benefits.


>---------------------------------------------------------------

0579fe99b933384172d19beb6a00dc8a1238101a
 compiler/coreSyn/CoreUtils.hs                 |  2 ++
 compiler/simplCore/SetLevels.hs               | 13 ++++++++++++-
 testsuite/tests/deriving/should_compile/all.T |  3 ++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/compiler/coreSyn/CoreUtils.hs b/compiler/coreSyn/CoreUtils.hs
index f31eac6..d89612a 100644
--- a/compiler/coreSyn/CoreUtils.hs
+++ b/compiler/coreSyn/CoreUtils.hs
@@ -810,6 +810,8 @@ exprIsBottom e
     go n (Cast e _)              = go n e
     go n (Let _ e)               = go n e
     go n (Lam v e) | isTyVar v   = go n e
+    go _ (Case _ _ _ alts)       = null alts
+       -- See Note [Empty case alternatives] in CoreSyn
     go _ _                       = False
 
 {- Note [Bottoming expressions]
diff --git a/compiler/simplCore/SetLevels.hs b/compiler/simplCore/SetLevels.hs
index b742a29..b84d67b 100644
--- a/compiler/simplCore/SetLevels.hs
+++ b/compiler/simplCore/SetLevels.hs
@@ -542,7 +542,7 @@ See Maessen's paper 1999 "Bottom extraction: factoring error handling out
 of functional programs" (unpublished I think).
 
 When we do this, we set the strictness and arity of the new bottoming
-Id, *immediately*, for two reasons:
+Id, *immediately*, for three reasons:
 
   * To prevent the abstracted thing being immediately inlined back in again
     via preInlineUnconditionally.  The latter has a test for bottoming Ids
@@ -551,6 +551,17 @@ Id, *immediately*, for two reasons:
   * So that it's properly exposed as such in the interface file, even if
     this is all happening after strictness analysis.
 
+  * In case we do CSE with the same expression that *is* marked bottom
+        lvl          = error "urk"
+          x{str=bot) = error "urk"
+    Here we don't want to replace 'x' with 'lvl', else we may get Lint
+    errors, e.g. via a case with empty alternatives:  (case x of {})
+    Lint complains unless the scrutinee of such a case is clearly bottom.
+
+    This was reported in Trac #11290.   But since the whole bottoming-float
+    thing is based on the cheap-and-cheerful exprIsBottom, I'm not sure
+    that it'll nail all such cases.
+
 Note [Bottoming floats: eta expansion] c.f Note [Bottoming floats]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 Tiresomely, though, the simplifier has an invariant that the manifest
diff --git a/testsuite/tests/deriving/should_compile/all.T b/testsuite/tests/deriving/should_compile/all.T
index 36d49f5..ff26d37 100644
--- a/testsuite/tests/deriving/should_compile/all.T
+++ b/testsuite/tests/deriving/should_compile/all.T
@@ -31,7 +31,8 @@ test('T4966', normal, compile, [''])
 test('drv-functor1', normal, compile, [''])
 test('drv-functor2', normal, compile, [''])
 test('drv-foldable-traversable1', normal, compile, [''])
-test('T6031', extra_clean(['T6031a.o', 'T6031a.hi']), multimod_compile, ['T6031', '-v0'])
+test('T6031', extra_clean(['T6031a.o', 'T6031a.hi']), multimod_compile, ['T6031', '-v0 -O'])
+# Adding -O on T6031 to expose Trac #11245 regardless of way
 test('T1133',
      extra_clean(['T1133.o-boot', 'T1133.hi-boot', 'T1133a.o', 'T1133a.hi']),
      run_command,


From git at git.haskell.org  Thu Dec 31 14:45:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 14:45:38 +0000 (UTC)
Subject: [commit: ghc] master: Comments only (5ba3caa)
Message-ID: <20151231144538.8EE223A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/5ba3caa2a722d4de5b7886550956e0294e170523/ghc

>---------------------------------------------------------------

commit 5ba3caa2a722d4de5b7886550956e0294e170523
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 31 09:21:58 2015 +0000

    Comments only


>---------------------------------------------------------------

5ba3caa2a722d4de5b7886550956e0294e170523
 compiler/coreSyn/CoreSyn.hs | 69 +++++++++++++++++++++++++--------------------
 1 file changed, 39 insertions(+), 30 deletions(-)

diff --git a/compiler/coreSyn/CoreSyn.hs b/compiler/coreSyn/CoreSyn.hs
index 12f3573..cd3bcb1 100644
--- a/compiler/coreSyn/CoreSyn.hs
+++ b/compiler/coreSyn/CoreSyn.hs
@@ -391,31 +391,32 @@ See #type_let#
 
 Note [Empty case alternatives]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-The alternatives of a case expression should be exhaustive.
-
-A case expression can have empty alternatives if (and only if) the
-scrutinee is bound to raise an exception or diverge. When do we know
-this?  See Note [Bottoming expressions] in CoreUtils.
-
-The possiblity of empty alternatives is one reason we need a type on
-the case expression: if the alternatives are empty we can't get the
-type from the alternatives!
-
-In the case of empty types (see Note [Bottoming expressions]), say
-  data T
-we do NOT want to replace
-   case (x::T) of Bool {}   -->   error Bool "Inaccessible case"
-because x might raise an exception, and *that*'s what we want to see!
-(Trac #6067 is an example.) To preserve semantics we'd have to say
-   x `seq` error Bool "Inaccessible case"
- but the 'seq' is just a case, so we are back to square 1.  Or I suppose
-we could say
-   x |> UnsafeCoerce T Bool
-but that loses all trace of the fact that this originated with an empty
-set of alternatives.
-
-We can use the empty-alternative construct to coerce error values from
-one type to another.  For example
+The alternatives of a case expression should be exhaustive.  But
+this exhaustive list can be empty!
+
+* A case expression can have empty alternatives if (and only if) the
+  scrutinee is bound to raise an exception or diverge. When do we know
+  this?  See Note [Bottoming expressions] in CoreUtils.
+
+* The possiblity of empty alternatives is one reason we need a type on
+  the case expression: if the alternatives are empty we can't get the
+  type from the alternatives!
+
+* In the case of empty types (see Note [Bottoming expressions]), say
+    data T
+  we do NOT want to replace
+    case (x::T) of Bool {}   -->   error Bool "Inaccessible case"
+  because x might raise an exception, and *that*'s what we want to see!
+  (Trac #6067 is an example.) To preserve semantics we'd have to say
+     x `seq` error Bool "Inaccessible case"
+  but the 'seq' is just a case, so we are back to square 1.  Or I suppose
+  we could say
+     x |> UnsafeCoerce T Bool
+  but that loses all trace of the fact that this originated with an empty
+  set of alternatives.
+
+* We can use the empty-alternative construct to coerce error values from
+  one type to another.  For example
 
     f :: Int -> Int
     f n = error "urk"
@@ -423,14 +424,22 @@ one type to another.  For example
     g :: Int -> (# Char, Bool #)
     g x = case f x of { 0 -> ..., n -> ... }
 
-Then if we inline f in g's RHS we get
+  Then if we inline f in g's RHS we get
     case (error Int "urk") of (# Char, Bool #) { ... }
-and we can discard the alternatives since the scrutinee is bottom to give
+  and we can discard the alternatives since the scrutinee is bottom to give
     case (error Int "urk") of (# Char, Bool #) {}
 
-This is nicer than using an unsafe coerce between Int ~ (# Char,Bool #),
-if for no other reason that we don't need to instantiate the (~) at an
-unboxed type.
+  This is nicer than using an unsafe coerce between Int ~ (# Char,Bool #),
+  if for no other reason that we don't need to instantiate the (~) at an
+  unboxed type.
+
+* We treat a case expression with empty alternatives as trivial iff
+  its scrutinee is (see CoreUtils.exprIsTrivial).  This is actually
+  important; see Note [Empty case is trivial] in CoreUtils
+
+* An empty case is replaced by its scrutinee during the CoreToStg
+  conversion; remember STG is un-typed, so there is no need for
+  the empty case to do the type conversion.
 
 
 ************************************************************************


From git at git.haskell.org  Thu Dec 31 14:45:41 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 14:45:41 +0000 (UTC)
Subject: [commit: ghc] master: Test Trac #11245 (70eefbc)
Message-ID: <20151231144541.A8C0C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/70eefbc21649b11cd0ea1b779df316fc93d84a59/ghc

>---------------------------------------------------------------

commit 70eefbc21649b11cd0ea1b779df316fc93d84a59
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Dec 31 14:32:27 2015 +0000

    Test Trac #11245


>---------------------------------------------------------------

70eefbc21649b11cd0ea1b779df316fc93d84a59
 testsuite/tests/pmcheck/should_compile/T11245.hs     | 13 +++++++++++++
 testsuite/tests/pmcheck/should_compile/T11245.stderr |  4 ++++
 testsuite/tests/pmcheck/should_compile/all.T         |  1 +
 3 files changed, 18 insertions(+)

diff --git a/testsuite/tests/pmcheck/should_compile/T11245.hs b/testsuite/tests/pmcheck/should_compile/T11245.hs
new file mode 100644
index 0000000..1f5c0fc
--- /dev/null
+++ b/testsuite/tests/pmcheck/should_compile/T11245.hs
@@ -0,0 +1,13 @@
+module T11245 where
+
+
+foo x = do
+  let a | Just i <- x
+        , odd i
+        = True
+
+        | Nothing <- x
+        = False
+
+  print x
+  print a
diff --git a/testsuite/tests/pmcheck/should_compile/T11245.stderr b/testsuite/tests/pmcheck/should_compile/T11245.stderr
new file mode 100644
index 0000000..184029a
--- /dev/null
+++ b/testsuite/tests/pmcheck/should_compile/T11245.stderr
@@ -0,0 +1,4 @@
+
+T11245.hs:5:7: warning:
+    Pattern match(es) are non-exhaustive
+    In an equation for ?a?: Guards do not cover entire pattern space
diff --git a/testsuite/tests/pmcheck/should_compile/all.T b/testsuite/tests/pmcheck/should_compile/all.T
index 9278fde..292e9af 100644
--- a/testsuite/tests/pmcheck/should_compile/all.T
+++ b/testsuite/tests/pmcheck/should_compile/all.T
@@ -32,3 +32,4 @@ test('pmc004', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patter
 test('pmc005', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('pmc006', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
 test('pmc007', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])
+test('T11245', only_compiler_types(['ghc']), compile, ['-fwarn-incomplete-patterns -fwarn-overlapping-patterns'])


From git at git.haskell.org  Thu Dec 31 16:42:54 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 16:42:54 +0000 (UTC)
Subject: [commit: ghc] master: Drop redundant `-D__GLASGOW_HASKELL__=...` flag
 (351dea4)
Message-ID: <20151231164254.E80203A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/351dea4a7c07f4e845eac6c2e895f6f41524b40c/ghc

>---------------------------------------------------------------

commit 351dea4a7c07f4e845eac6c2e895f6f41524b40c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 16:58:28 2015 +0100

    Drop redundant `-D__GLASGOW_HASKELL__=...` flag
    
    In 3549c952b535803270872adaf87262f2df0295a4 a `include/ghcversions.h` include
    file was introduced which defines `__GLASGOW_HASKELL__` as well.
    
    So there's no need to define it twice.


>---------------------------------------------------------------

351dea4a7c07f4e845eac6c2e895f6f41524b40c
 compiler/main/DriverPipeline.hs | 9 ++-------
 includes/ghc.mk                 | 4 +---
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 4936ace..d3038bc 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -1191,9 +1191,7 @@ runPhase (RealPhase cc_phase) input_fn dflags
                        ++ verbFlags
                        ++ [ "-S" ]
                        ++ cc_opt
-                       ++ [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt
-                          , "-include", ghcVersionH
-                          ]
+                       ++ [ "-include", ghcVersionH ]
                        ++ framework_paths
                        ++ split_opt
                        ++ include_paths
@@ -2032,10 +2030,7 @@ doCpp dflags raw input_fn output_fn = do
 #endif
     -- Default CPP defines in Haskell source
     ghcVersionH <- getGhcVersionPathName dflags
-    let hsSourceCppOpts =
-          [ "-D__GLASGOW_HASKELL__="++cProjectVersionInt
-          , "-include", ghcVersionH
-          ]
+    let hsSourceCppOpts = [ "-include", ghcVersionH ]
 
     -- MIN_VERSION macros
     let uids = explicitPackages (pkgState dflags)
diff --git a/includes/ghc.mk b/includes/ghc.mk
index e87a487..aacca08 100644
--- a/includes/ghc.mk
+++ b/includes/ghc.mk
@@ -60,9 +60,7 @@ $(includes_H_VERSION) : mk/project.mk | $$(dir $$@)/.
 	@echo "#ifndef __GHCVERSION_H__"  > $@
 	@echo "#define __GHCVERSION_H__" >> $@
 	@echo >> $@
-	@echo "#ifndef __GLASGOW_HASKELL__" >> $@
-	@echo "# define __GLASGOW_HASKELL__ $(ProjectVersionInt)" >> $@
-	@echo "#endif" >> $@
+	@echo "#define __GLASGOW_HASKELL__ $(ProjectVersionInt)" >> $@
 	@echo >> $@
 	@if [ -n "$(ProjectPatchLevel1)" ]; then \
 	  echo "#define __GLASGOW_HASKELL_PATCHLEVEL1__ $(ProjectPatchLevel1)" >> $@; \


From git at git.haskell.org  Thu Dec 31 21:41:55 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:41:55 +0000 (UTC)
Subject: [commit: ghc] master: Use 0/1 instead of YES/NO as
 `__GLASGOW_HASKELL_TH__` macro value (eae40e1)
Message-ID: <20151231214155.C28EF3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/eae40e16a0933fe3b6cb0ee4dc9cdbe3d21e44ce/ghc

>---------------------------------------------------------------

commit eae40e16a0933fe3b6cb0ee4dc9cdbe3d21e44ce
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 21:02:50 2015 +0100

    Use 0/1 instead of YES/NO as `__GLASGOW_HASKELL_TH__` macro value
    
    Using `YES`/`NO` causes all sorts of problems as CPP doesn't work on
    symbolic tokens but rather on scalar values.
    
    A use like
    
       #if __GLASGOW_HASKELL_TH__==YES
       {-# LANGUAGE TemplateHaskell #-}
       #endif
    
    doesn't do what one may naively expect, and neither does
    
       #if __GLASGOW_HASKELL_TH__
       {-# LANGUAGE TemplateHaskell #-}
       #endif
    
    *unless* `YES` happens to evaluate to a non-zero scalar.
    
    `__GLASGOW_HASKELL_TH__ was originally introduced via D396 / #9734.
    
    Fixes #11322
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1723


>---------------------------------------------------------------

eae40e16a0933fe3b6cb0ee4dc9cdbe3d21e44ce
 compiler/main/DriverPipeline.hs  | 4 ++--
 docs/users_guide/8.0.1-notes.rst | 5 +++++
 docs/users_guide/phases.rst      | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index d3038bc..a6a5e1de 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -2024,9 +2024,9 @@ doCpp dflags raw input_fn output_fn = do
     backend_defs <- getBackendDefs dflags
 
 #ifdef GHCI
-    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=YES" ]
+    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=1" ]
 #else
-    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=NO" ]
+    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=0" ]
 #endif
     -- Default CPP defines in Haskell source
     ghcVersionH <- getGhcVersionPathName dflags
diff --git a/docs/users_guide/8.0.1-notes.rst b/docs/users_guide/8.0.1-notes.rst
index 0aa221d..013b7b8 100644
--- a/docs/users_guide/8.0.1-notes.rst
+++ b/docs/users_guide/8.0.1-notes.rst
@@ -288,6 +288,11 @@ Template Haskell
    without interpreter support). Also, ``-XTemplateHaskellQuotes`` is
    considered safe under Safe Haskell.
 
+-  The ``__GLASGOW_HASKELL_TH__`` CPP constant denoting support for
+   ``-XTemplateHaskell`` introduced in GHC 7.10.1 has been changed to
+   use the values ``1``/``0`` instead of the previous ``YES``/``NO``
+   values.
+
 -  Partial type signatures can now be used in splices, see
    :ref:`pts-where`.
 
diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
index 1c48cfc..cc4244e 100644
--- a/docs/users_guide/phases.rst
+++ b/docs/users_guide/phases.rst
@@ -328,8 +328,8 @@ defined by your local GHC installation, the following trick is useful:
     .. index::
        single: __GLASGOW_HASKELL_TH__
 
-    This is set to ``YES`` when the compiler supports Template Haskell,
-    and to ``NO`` when not. The latter is the case for a stage-1
+    This is set to ``1`` when the compiler supports Template Haskell,
+    and to ``0`` when not. The latter is the case for a stage-1
     compiler during bootstrapping, or on architectures where the
     interpreter is not available.
 


From git at git.haskell.org  Thu Dec 31 21:41:58 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:41:58 +0000 (UTC)
Subject: [commit: ghc] master: Drop redundant/explicit `=1` in `-DFOO=1` flags
 (0d20737)
Message-ID: <20151231214158.6D0CD3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/0d20737860c29169d89c1d5ea728f3848cc28564/ghc

>---------------------------------------------------------------

commit 0d20737860c29169d89c1d5ea728f3848cc28564
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 22:01:26 2015 +0100

    Drop redundant/explicit `=1` in `-DFOO=1` flags
    
    Quoting the POSIX standard for the `-D` C compiler flag:
    
      -D  name[=value]
    
          Define name as if by a C-language #define directive.
          If no `=value` is given, a value of 1 shall be used.
          [...]
    
    Removing this explicit `=1` definition from `-D` flags which are used to
    define boolean macro constants makes the CLI invocation a bit more
    idiomatic and reduces visual noise in debugging output
    (flags containing `=`s are additionally put in single-quotes by GHC)


>---------------------------------------------------------------

0d20737860c29169d89c1d5ea728f3848cc28564
 compiler/main/DriverPipeline.hs | 28 ++++++++++++++--------------
 mk/config.mk.in                 |  6 +++---
 testsuite/tests/rts/Makefile    |  4 ++--
 3 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index a6a5e1de..17a7214 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -2001,30 +2001,30 @@ doCpp dflags raw input_fn output_fn = do
                       | otherwise = SysTools.runCc dflags (SysTools.Option "-E" : args)
 
     let target_defs =
-          [ "-D" ++ HOST_OS     ++ "_BUILD_OS=1",
-            "-D" ++ HOST_ARCH   ++ "_BUILD_ARCH=1",
-            "-D" ++ TARGET_OS   ++ "_HOST_OS=1",
-            "-D" ++ TARGET_ARCH ++ "_HOST_ARCH=1" ]
+          [ "-D" ++ HOST_OS     ++ "_BUILD_OS",
+            "-D" ++ HOST_ARCH   ++ "_BUILD_ARCH",
+            "-D" ++ TARGET_OS   ++ "_HOST_OS",
+            "-D" ++ TARGET_ARCH ++ "_HOST_ARCH" ]
         -- remember, in code we *compile*, the HOST is the same our TARGET,
         -- and BUILD is the same as our HOST.
 
     let sse_defs =
-          [ "-D__SSE__=1"    | isSseEnabled    dflags ] ++
-          [ "-D__SSE2__=1"   | isSse2Enabled   dflags ] ++
-          [ "-D__SSE4_2__=1" | isSse4_2Enabled dflags ]
+          [ "-D__SSE__"      | isSseEnabled      dflags ] ++
+          [ "-D__SSE2__"     | isSse2Enabled     dflags ] ++
+          [ "-D__SSE4_2__"   | isSse4_2Enabled   dflags ]
 
     let avx_defs =
-          [ "-D__AVX__=1"  | isAvxEnabled  dflags ] ++
-          [ "-D__AVX2__=1" | isAvx2Enabled dflags ] ++
-          [ "-D__AVX512CD__=1" | isAvx512cdEnabled dflags ] ++
-          [ "-D__AVX512ER__=1" | isAvx512erEnabled dflags ] ++
-          [ "-D__AVX512F__=1"  | isAvx512fEnabled  dflags ] ++
-          [ "-D__AVX512PF__=1" | isAvx512pfEnabled dflags ]
+          [ "-D__AVX__"      | isAvxEnabled      dflags ] ++
+          [ "-D__AVX2__"     | isAvx2Enabled     dflags ] ++
+          [ "-D__AVX512CD__" | isAvx512cdEnabled dflags ] ++
+          [ "-D__AVX512ER__" | isAvx512erEnabled dflags ] ++
+          [ "-D__AVX512F__"  | isAvx512fEnabled  dflags ] ++
+          [ "-D__AVX512PF__" | isAvx512pfEnabled dflags ]
 
     backend_defs <- getBackendDefs dflags
 
 #ifdef GHCI
-    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=1" ]
+    let th_defs = [ "-D__GLASGOW_HASKELL_TH__" ]
 #else
     let th_defs = [ "-D__GLASGOW_HASKELL_TH__=0" ]
 #endif
diff --git a/mk/config.mk.in b/mk/config.mk.in
index fd0bb51..e107bea 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -647,9 +647,9 @@ ifeq "$(CrossCompiling)" "YES"
 SRC_HSC2HS_OPTS_STAGE1 += --cross-compile
 SRC_HSC2HS_OPTS_STAGE2 += --cross-compile
 endif
-SRC_HSC2HS_OPTS_STAGE0 += --cflag=-D$(HostArch_CPP)_HOST_ARCH=1 --cflag=-D$(HostOS_CPP)_HOST_OS=1
-SRC_HSC2HS_OPTS_STAGE1 += --cflag=-D$(TargetArch_CPP)_HOST_ARCH=1 --cflag=-D$(TargetOS_CPP)_HOST_OS=1
-SRC_HSC2HS_OPTS_STAGE2 += --cflag=-D$(TargetArch_CPP)_HOST_ARCH=1 --cflag=-D$(TargetOS_CPP)_HOST_OS=1
+SRC_HSC2HS_OPTS_STAGE0 += --cflag=-D$(HostArch_CPP)_HOST_ARCH --cflag=-D$(HostOS_CPP)_HOST_OS
+SRC_HSC2HS_OPTS_STAGE1 += --cflag=-D$(TargetArch_CPP)_HOST_ARCH --cflag=-D$(TargetOS_CPP)_HOST_OS
+SRC_HSC2HS_OPTS_STAGE2 += --cflag=-D$(TargetArch_CPP)_HOST_ARCH --cflag=-D$(TargetOS_CPP)_HOST_OS
 
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 WINDRES = $(INPLACE_MINGW)/bin/windres
diff --git a/testsuite/tests/rts/Makefile b/testsuite/tests/rts/Makefile
index 52de19c..70bcfd4 100644
--- a/testsuite/tests/rts/Makefile
+++ b/testsuite/tests/rts/Makefile
@@ -53,14 +53,14 @@ T5423:
 
 define run_T5435_v
 $(RM) T5435_load_v_$(1) T5435_v_$(1)$(exeext)
-'$(TEST_HC)' $(TEST_HC_OPTS) -optc-D$(HostOS)_HOST_OS=1 -v0 -c T5435_$(1).c -o T5435_load_v_$(1).o
+'$(TEST_HC)' $(TEST_HC_OPTS) -optc-D$(HostOS)_HOST_OS -v0 -c T5435_$(1).c -o T5435_load_v_$(1).o
 '$(TEST_HC)' $(TEST_HC_OPTS) -v0 T5435.hs -osuf main_v_$(1)_o -o T5435_v_$(1)$(exeext)
 ./T5435_v_$(1) v ./T5435_load_v_$(1).o
 endef
 
 define run_T5435_dyn
 $(RM) T5435_load_dyn_$(1) T5435_dyn_$(1)$(exeext)
-'$(TEST_HC)' $(filter-out -rtsopts, $(TEST_HC_OPTS)) -optc-D$(HostOS)_HOST_OS=1 -v0 -fPIC -shared -c T5435_$(1).c -osuf dyn_$(1)_o -o T5435_load_dyn_$(1)$(dllext)
+'$(TEST_HC)' $(filter-out -rtsopts, $(TEST_HC_OPTS)) -optc-D$(HostOS)_HOST_OS -v0 -fPIC -shared -c T5435_$(1).c -osuf dyn_$(1)_o -o T5435_load_dyn_$(1)$(dllext)
 '$(TEST_HC)' $(TEST_HC_OPTS) -v0 T5435.hs -osuf main_dyn_$(1)_o -o T5435_dyn_$(1)$(exeext)
 ./T5435_dyn_$(1) dyn ./T5435_load_dyn_$(1)$(dllext)
 endef


From git at git.haskell.org  Thu Dec 31 21:42:01 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:42:01 +0000 (UTC)
Subject: [commit: ghc] master: Drop pre-AMP compatibility CPP conditionals
 (2f923ce)
Message-ID: <20151231214201.4B0A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05/ghc

>---------------------------------------------------------------

commit 2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 13:47:43 2015 +0100

    Drop pre-AMP compatibility CPP conditionals
    
    Since GHC 8.1/8.2 only needs to be bootstrap-able by GHC 7.10 and
    GHC 8.0 (and GHC 8.2), we can now finally drop all that pre-AMP
    compatibility CPP-mess for good!
    
    Reviewers: austin, goldfire, bgamari
    
    Subscribers: goldfire, thomie, erikd
    
    Differential Revision: https://phabricator.haskell.org/D1724


>---------------------------------------------------------------

2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05
 compiler/basicTypes/ConLike.hs                           |  3 ---
 compiler/basicTypes/FieldLabel.hs                        |  6 ------
 compiler/basicTypes/SrcLoc.hs                            |  5 -----
 compiler/cmm/CmmLayoutStack.hs                           |  2 --
 compiler/cmm/CmmLint.hs                                  |  5 +----
 compiler/cmm/PprC.hs                                     |  4 ----
 compiler/codeGen/StgCmmBind.hs                           |  2 --
 compiler/codeGen/StgCmmExpr.hs                           |  2 --
 compiler/codeGen/StgCmmExtCode.hs                        |  5 -----
 compiler/codeGen/StgCmmForeign.hs                        |  4 ----
 compiler/codeGen/StgCmmHeap.hs                           |  2 --
 compiler/codeGen/StgCmmLayout.hs                         |  2 --
 compiler/codeGen/StgCmmPrim.hs                           |  2 --
 compiler/coreSyn/CorePrep.hs                             |  4 ----
 compiler/coreSyn/MkCore.hs                               |  3 ---
 compiler/deSugar/MatchLit.hs                             |  3 ---
 compiler/deSugar/PmExpr.hs                               |  3 ---
 compiler/ghci/ByteCodeAsm.hs                             |  3 ---
 compiler/ghci/ByteCodeGen.hs                             |  4 ----
 compiler/ghci/RtClosureInspect.hs                        |  7 -------
 compiler/hsSyn/Convert.hs                                |  4 ----
 compiler/hsSyn/HsBinds.hs                                |  9 ---------
 compiler/hsSyn/HsDecls.hs                                |  5 -----
 compiler/hsSyn/HsUtils.hs                                |  5 -----
 compiler/iface/TcIface.hs                                |  3 ---
 compiler/llvmGen/LlvmCodeGen/Base.hs                     |  3 ---
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs                  |  4 ----
 compiler/main/CmdLineParser.hs                           |  3 ---
 compiler/main/DynFlags.hs                                |  5 -----
 compiler/main/GHC.hs                                     |  7 +------
 compiler/main/GhcMonad.hs                                |  7 +------
 compiler/main/Packages.hs                                |  3 ---
 compiler/nativeGen/AsmCodeGen.hs                         |  3 ---
 compiler/nativeGen/NCGMonad.hs                           |  3 ---
 compiler/nativeGen/RegAlloc/Linear/State.hs              |  4 ----
 compiler/parser/Lexer.x                                  |  3 ---
 compiler/parser/RdrHsSyn.hs                              |  4 ----
 compiler/prelude/PrelRules.hs                            |  4 ----
 compiler/profiling/SCCfinal.hs                           |  3 ---
 compiler/rename/RnBinds.hs                               |  5 -----
 compiler/rename/RnSource.hs                              |  3 ---
 compiler/rename/RnTypes.hs                               |  4 ----
 compiler/specialise/Specialise.hs                        |  3 ---
 compiler/stgSyn/StgLint.hs                               |  3 ---
 compiler/typecheck/FamInst.hs                            |  5 -----
 compiler/typecheck/FunDeps.hs                            |  6 ------
 compiler/typecheck/TcCanonical.hs                        |  6 ------
 compiler/typecheck/TcErrors.hs                           |  3 ---
 compiler/typecheck/TcEvidence.hs                         |  4 ----
 compiler/typecheck/TcFlatten.hs                          |  3 ---
 compiler/typecheck/TcGenDeriv.hs                         |  3 ---
 compiler/typecheck/TcHsSyn.hs                            |  3 ---
 compiler/typecheck/TcMatches.hs                          |  4 ----
 compiler/typecheck/TcPatSyn.hs                           |  3 ---
 compiler/typecheck/TcSimplify.hs                         |  4 ----
 compiler/typecheck/TcTyClsDecls.hs                       |  3 ---
 compiler/typecheck/TcType.hs                             |  3 ---
 compiler/typecheck/TcTypeNats.hs                         |  6 +-----
 compiler/types/Coercion.hs                               |  6 ------
 compiler/types/InstEnv.hs                                |  3 ---
 compiler/types/Type.hs                                   |  6 ------
 compiler/types/Unify.hs                                  |  3 ---
 compiler/utils/BooleanFormula.hs                         | 10 ++--------
 compiler/utils/FastString.hs                             |  4 ----
 compiler/utils/OrdList.hs                                |  3 ---
 compiler/utils/Pair.hs                                   |  6 ------
 compiler/utils/State.hs                                  |  6 +-----
 compiler/utils/Stream.hs                                 |  6 +-----
 compiler/utils/StringBuffer.hs                           |  4 ----
 compiler/utils/UniqFM.hs                                 |  3 ---
 compiler/utils/Util.hs                                   |  3 ---
 compiler/vectorise/Vectorise/Exp.hs                      |  3 ---
 configure.ac                                             |  4 ++--
 libraries/template-haskell/Language/Haskell/TH/PprLib.hs |  5 +----
 libraries/template-haskell/Language/Haskell/TH/Syntax.hs |  3 ---
 utils/ghc-pkg/Main.hs                                    |  3 ---
 76 files changed, 11 insertions(+), 297 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 2f923ce2ab8bad6d01645c735c81bbf1b9ff1e05

From git at git.haskell.org  Thu Dec 31 21:42:04 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:42:04 +0000 (UTC)
Subject: [commit: ghc] master: Remove some redundant definitions/constraints
 (3c8cb7f)
Message-ID: <20151231214204.10CFA3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3c8cb7f43c89e9a2b754adc5e639985f0b95b1f1/ghc

>---------------------------------------------------------------

commit 3c8cb7f43c89e9a2b754adc5e639985f0b95b1f1
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 16:42:38 2015 +0100

    Remove some redundant definitions/constraints
    
    Starting with GHC 7.10 and base-4.8, `Monad` implies `Applicative`,
    which allows to simplify some definitions to exploit the superclass
    relationship. This a first refactoring to that end.


>---------------------------------------------------------------

3c8cb7f43c89e9a2b754adc5e639985f0b95b1f1
 compiler/basicTypes/UniqSupply.hs                        | 1 -
 compiler/cmm/CmmLint.hs                                  | 1 -
 compiler/cmm/PprC.hs                                     | 1 -
 compiler/codeGen/StgCmmExtCode.hs                        | 1 -
 compiler/codeGen/StgCmmMonad.hs                          | 4 +---
 compiler/coreSyn/CoreLint.hs                             | 1 -
 compiler/deSugar/Coverage.hs                             | 1 -
 compiler/ghci/ByteCodeAsm.hs                             | 1 -
 compiler/ghci/ByteCodeGen.hs                             | 1 -
 compiler/hsSyn/Convert.hs                                | 1 -
 compiler/llvmGen/LlvmCodeGen/Base.hs                     | 1 -
 compiler/main/CmdLineParser.hs                           | 2 --
 compiler/main/GhcMonad.hs                                | 6 ++----
 compiler/main/HscTypes.hs                                | 1 -
 compiler/main/PipelineMonad.hs                           | 1 -
 compiler/main/TidyPgm.hs                                 | 1 -
 compiler/nativeGen/AsmCodeGen.hs                         | 1 -
 compiler/nativeGen/NCGMonad.hs                           | 1 -
 compiler/nativeGen/RegAlloc/Linear/State.hs              | 1 -
 compiler/parser/Lexer.x                                  | 1 -
 compiler/prelude/PrelRules.hs                            | 1 -
 compiler/profiling/SCCfinal.hs                           | 1 -
 compiler/rename/RnPat.hs                                 | 1 -
 compiler/simplCore/CoreMonad.hs                          | 7 +++----
 compiler/simplCore/SimplMonad.hs                         | 1 -
 compiler/specialise/Specialise.hs                        | 1 -
 compiler/stgSyn/CoreToStg.hs                             | 1 -
 compiler/stgSyn/StgLint.hs                               | 1 -
 compiler/typecheck/TcFlatten.hs                          | 1 -
 compiler/typecheck/TcRnTypes.hs                          | 1 -
 compiler/typecheck/TcSMonad.hs                           | 1 -
 compiler/typecheck/TcTyDecls.hs                          | 1 -
 compiler/typecheck/TcType.hs                             | 1 -
 compiler/types/FamInstEnv.hs                             | 1 -
 compiler/types/Type.hs                                   | 4 ++--
 compiler/types/Unify.hs                                  | 2 --
 compiler/utils/Exception.hs                              | 3 +--
 compiler/utils/IOEnv.hs                                  | 1 -
 compiler/utils/Maybes.hs                                 | 2 --
 compiler/utils/State.hs                                  | 1 -
 compiler/utils/Stream.hs                                 | 1 -
 compiler/vectorise/Vectorise/Monad/Base.hs               | 1 -
 libraries/ghci/GHCi/TH.hs                                | 1 -
 libraries/template-haskell/Language/Haskell/TH/PprLib.hs | 1 -
 libraries/template-haskell/Language/Haskell/TH/Syntax.hs | 3 +--
 utils/ghc-pkg/Main.hs                                    | 1 -
 46 files changed, 10 insertions(+), 60 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 3c8cb7f43c89e9a2b754adc5e639985f0b95b1f1

From git at git.haskell.org  Thu Dec 31 21:42:06 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:42:06 +0000 (UTC)
Subject: [commit: ghc] master: Simplify -fcmm-sink handling for Parser.hs
 (37945c1)
Message-ID: <20151231214206.AE61A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/37945c1db2f893657c1e3b9b26704cbf3ef27a5a/ghc

>---------------------------------------------------------------

commit 37945c1db2f893657c1e3b9b26704cbf3ef27a5a
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 21:33:46 2015 +0100

    Simplify -fcmm-sink handling for Parser.hs
    
    As we're requiring GHC >= 7.10 now, the conditional handling introduced
    in 9e133b9dccec0553c6ec302d6ca0d3bc5eea06c4 for addressing #8182 can be
    made unconditional, and thus simplify the build-system a little bit.


>---------------------------------------------------------------

37945c1db2f893657c1e3b9b26704cbf3ef27a5a
 compiler/ghc.mk | 9 ++-------
 configure.ac    | 6 ------
 mk/config.mk.in | 2 --
 3 files changed, 2 insertions(+), 15 deletions(-)

diff --git a/compiler/ghc.mk b/compiler/ghc.mk
index 49c6971..f9ca71c 100644
--- a/compiler/ghc.mk
+++ b/compiler/ghc.mk
@@ -370,17 +370,12 @@ endif
 # at it, because that takes too long and doesn't buy much, but we do want
 # to inline certain key external functions, so we instruct GHC not to
 # throw away inlinings as it would normally do in -O0 mode.
-compiler/stage1/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas
-# If we're bootstrapping the compiler during stage2, or we're being
-# built by a GHC whose version is > 7.8, we need -fcmm-sink to be
+# Since GHC version 7.8, we need -fcmm-sink to be
 # passed to the compiler. This is required on x86 to avoid the
 # register allocator running out of stack slots when compiling this
 # module with -fPIC -dynamic.
 # See #8182 for all the details
-ifeq "$(CMM_SINK_BOOTSTRAP_IS_NEEDED)" "YES"
-compiler/stage1/build/Parser_HC_OPTS += -fcmm-sink
-endif
-# We also pass -fcmm-sink to every stage != 1
+compiler/stage1/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 compiler/stage2/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 compiler/stage3/build/Parser_HC_OPTS += -O0 -fno-ignore-interface-pragmas -fcmm-sink
 
diff --git a/configure.ac b/configure.ac
index ae8a3e9..042b417 100644
--- a/configure.ac
+++ b/configure.ac
@@ -153,12 +153,6 @@ fi
 GHC_PACKAGE_DB_FLAG=package-db
 AC_SUBST(GHC_PACKAGE_DB_FLAG)
 
-# GHC 7.7+ needs -fcmm-sink when compiling Parser.hs. See #8182
-FP_COMPARE_VERSIONS([$GhcVersion],[-gt],[7.7],
-                    CMM_SINK_BOOTSTRAP_IS_NEEDED=YES,
-                    CMM_SINK_BOOTSTRAP_IS_NEEDED=NO)
-AC_SUBST(CMM_SINK_BOOTSTRAP_IS_NEEDED)
-
 # GHC is passed to Cabal, so we need a native path
 if test "${WithGhc}" != ""
 then
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 4331b36..2091671 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -498,8 +498,6 @@ endif
 
 GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
 
-CMM_SINK_BOOTSTRAP_IS_NEEDED = @CMM_SINK_BOOTSTRAP_IS_NEEDED@
-
 #-----------------------------------------------------------------------------
 # C compiler
 #


From git at git.haskell.org  Thu Dec 31 21:42:09 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:42:09 +0000 (UTC)
Subject: [commit: ghc] master: Remove ghc-7.8 `-package-name`-compat handling
 (12ee511)
Message-ID: <20151231214209.5A2533A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/12ee51137a8c848f64b44fd8f3f4cd899bb214bc/ghc

>---------------------------------------------------------------

commit 12ee51137a8c848f64b44fd8f3f4cd899bb214bc
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 21:25:26 2015 +0100

    Remove ghc-7.8 `-package-name`-compat handling
    
    This code was introduced in 66218d15b7c27a4a38992003bd761f60bae84b1f to
    use `-package-name` for GHC 7.8, whereas GHC 7.10 needs the new
    `-this-package-key` flag.


>---------------------------------------------------------------

12ee51137a8c848f64b44fd8f3f4cd899bb214bc
 configure.ac              |  5 -----
 mk/config.mk.in           |  2 --
 rules/distdir-way-opts.mk | 14 +-------------
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/configure.ac b/configure.ac
index 669dce3..ae8a3e9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -159,11 +159,6 @@ FP_COMPARE_VERSIONS([$GhcVersion],[-gt],[7.7],
                     CMM_SINK_BOOTSTRAP_IS_NEEDED=NO)
 AC_SUBST(CMM_SINK_BOOTSTRAP_IS_NEEDED)
 
-FP_COMPARE_VERSIONS([$GhcVersion],[-lt],[7.9],
-                    SUPPORTS_COMPONENT_ID=NO,
-                    SUPPORTS_COMPONENT_ID=YES)
-AC_SUBST(SUPPORTS_COMPONENT_ID)
-
 # GHC is passed to Cabal, so we need a native path
 if test "${WithGhc}" != ""
 then
diff --git a/mk/config.mk.in b/mk/config.mk.in
index e107bea..4331b36 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -500,8 +500,6 @@ GHC_PACKAGE_DB_FLAG = @GHC_PACKAGE_DB_FLAG@
 
 CMM_SINK_BOOTSTRAP_IS_NEEDED = @CMM_SINK_BOOTSTRAP_IS_NEEDED@
 
-SUPPORTS_COMPONENT_ID = @SUPPORTS_COMPONENT_ID@
-
 #-----------------------------------------------------------------------------
 # C compiler
 #
diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk
index 92dbf34..f6b9a45 100644
--- a/rules/distdir-way-opts.mk
+++ b/rules/distdir-way-opts.mk
@@ -96,21 +96,9 @@ define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage
 # $1_$2_$3_MOST_HC_OPTS is also passed to C compilations when we use
 # GHC as the C compiler.
 
-ifeq "$(SUPPORTS_COMPONENT_ID)" "NO"
-ifeq "$4" "0"
-$4_USE_COMPONENT_ID=NO
-endif
-endif
-
 $1_$2_$4_DEP_OPTS = \
  $$(foreach pkg,$$($1_$2_DEP_IPIDS),-package-id $$(pkg))
 
-ifeq "$($4_USE_COMPONENT_ID)" "NO"
-$4_THIS_COMPONENT_ID = -package-name
-else
-$4_THIS_COMPONENT_ID = -this-package-key
-endif
-
 $1_$2_$3_MOST_HC_OPTS = \
  $$(WAY_$3_HC_OPTS) \
  $$(CONF_HC_OPTS) \
@@ -119,7 +107,7 @@ $1_$2_$3_MOST_HC_OPTS = \
  $$($1_HC_OPTS) \
  $$($1_$2_HC_PKGCONF) \
  $$(if $$($1_$2_PROG),, \
-        $$(if $$($1_PACKAGE),$$($4_THIS_COMPONENT_ID) $$($1_$2_COMPONENT_ID))) \
+        $$(if $$($1_PACKAGE),-this-package-key $$($1_$2_COMPONENT_ID))) \
  $$(if $$($1_PACKAGE),-hide-all-packages) \
  -i $$(if $$($1_$2_HS_SRC_DIRS),$$(foreach dir,$$($1_$2_HS_SRC_DIRS),-i$1/$$(dir)),-i$1) \
  -i$1/$2/build -i$1/$2/build/autogen \


From git at git.haskell.org  Thu Dec 31 21:56:56 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 21:56:56 +0000 (UTC)
Subject: [commit: ghc] ghc-8.0: Use 0/1 instead of YES/NO as
 `__GLASGOW_HASKELL_TH__` macro value (39237c1)
Message-ID: <20151231215656.054803A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : ghc-8.0
Link       : http://ghc.haskell.org/trac/ghc/changeset/39237c178f179a7e8d57e6e51e4dcd6881b97ca4/ghc

>---------------------------------------------------------------

commit 39237c178f179a7e8d57e6e51e4dcd6881b97ca4
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 21:02:50 2015 +0100

    Use 0/1 instead of YES/NO as `__GLASGOW_HASKELL_TH__` macro value
    
    Using `YES`/`NO` causes all sorts of problems as CPP doesn't work on
    symbolic tokens but rather on scalar values.
    
    A use like
    
       #if __GLASGOW_HASKELL_TH__==YES
       {-# LANGUAGE TemplateHaskell #-}
       #endif
    
    doesn't do what one may naively expect, and neither does
    
       #if __GLASGOW_HASKELL_TH__
       {-# LANGUAGE TemplateHaskell #-}
       #endif
    
    *unless* `YES` happens to evaluate to a non-zero scalar.
    
    `__GLASGOW_HASKELL_TH__ was originally introduced via D396 / #9734.
    
    Fixes #11322
    
    Reviewed By: austin
    
    Differential Revision: https://phabricator.haskell.org/D1723
    
    (cherry picked from commit eae40e16a0933fe3b6cb0ee4dc9cdbe3d21e44ce)


>---------------------------------------------------------------

39237c178f179a7e8d57e6e51e4dcd6881b97ca4
 compiler/main/DriverPipeline.hs  | 4 ++--
 docs/users_guide/8.0.1-notes.rst | 5 +++++
 docs/users_guide/phases.rst      | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs
index 4936ace..23cc6de 100644
--- a/compiler/main/DriverPipeline.hs
+++ b/compiler/main/DriverPipeline.hs
@@ -2026,9 +2026,9 @@ doCpp dflags raw input_fn output_fn = do
     backend_defs <- getBackendDefs dflags
 
 #ifdef GHCI
-    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=YES" ]
+    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=1" ]
 #else
-    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=NO" ]
+    let th_defs = [ "-D__GLASGOW_HASKELL_TH__=0" ]
 #endif
     -- Default CPP defines in Haskell source
     ghcVersionH <- getGhcVersionPathName dflags
diff --git a/docs/users_guide/8.0.1-notes.rst b/docs/users_guide/8.0.1-notes.rst
index 0aa221d..013b7b8 100644
--- a/docs/users_guide/8.0.1-notes.rst
+++ b/docs/users_guide/8.0.1-notes.rst
@@ -288,6 +288,11 @@ Template Haskell
    without interpreter support). Also, ``-XTemplateHaskellQuotes`` is
    considered safe under Safe Haskell.
 
+-  The ``__GLASGOW_HASKELL_TH__`` CPP constant denoting support for
+   ``-XTemplateHaskell`` introduced in GHC 7.10.1 has been changed to
+   use the values ``1``/``0`` instead of the previous ``YES``/``NO``
+   values.
+
 -  Partial type signatures can now be used in splices, see
    :ref:`pts-where`.
 
diff --git a/docs/users_guide/phases.rst b/docs/users_guide/phases.rst
index 1c48cfc..cc4244e 100644
--- a/docs/users_guide/phases.rst
+++ b/docs/users_guide/phases.rst
@@ -328,8 +328,8 @@ defined by your local GHC installation, the following trick is useful:
     .. index::
        single: __GLASGOW_HASKELL_TH__
 
-    This is set to ``YES`` when the compiler supports Template Haskell,
-    and to ``NO`` when not. The latter is the case for a stage-1
+    This is set to ``1`` when the compiler supports Template Haskell,
+    and to ``0`` when not. The latter is the case for a stage-1
     compiler during bootstrapping, or on architectures where the
     interpreter is not available.
 


From git at git.haskell.org  Thu Dec 31 22:40:36 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:36 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Change Windows-style line
 endings to Unix-style (b2b86de)
Message-ID: <20151231224036.48E243A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/b2b86de908e2478f2c24cf67a31ca84f1e342352

>---------------------------------------------------------------

commit b2b86de908e2478f2c24cf67a31ca84f1e342352
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 17:35:15 2015 -0600

    Change Windows-style line endings to Unix-style


>---------------------------------------------------------------

b2b86de908e2478f2c24cf67a31ca84f1e342352
 System/Console/Haskeline/Backend/Win32.hsc | 0
 1 file changed, 0 insertions(+), 0 deletions(-)



From git at git.haskell.org  Thu Dec 31 22:40:38 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:38 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Suppress hsc2hs-related warning
 on GHC HEAD (576e7cb)
Message-ID: <20151231224038.4E06C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/576e7cbc4cde1195fb97c8540caad38de8d7e681

>---------------------------------------------------------------

commit 576e7cbc4cde1195fb97c8540caad38de8d7e681
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 17:35:52 2015 -0600

    Suppress hsc2hs-related warning on GHC HEAD


>---------------------------------------------------------------

576e7cbc4cde1195fb97c8540caad38de8d7e681
 System/Console/Haskeline/Backend/Win32.hsc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/System/Console/Haskeline/Backend/Win32.hsc b/System/Console/Haskeline/Backend/Win32.hsc
index b88dc3c..d9c0934 100644
--- a/System/Console/Haskeline/Backend/Win32.hsc
+++ b/System/Console/Haskeline/Backend/Win32.hsc
@@ -167,7 +167,9 @@ getKeyEvent p = do
 data Coord = Coord {coordX, coordY :: Int}
                 deriving Show
 
+#if __GLASGOW_HASKELL__ < 711
 #let alignment t = "%lu", (unsigned long)offsetof(struct {char x__; t (y__); }, y__)
+#endif
 instance Storable Coord where
     sizeOf _ = (#size COORD)
     alignment _ = (#alignment COORD)


From git at git.haskell.org  Thu Dec 31 22:40:40 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:40 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Avoid a SafeHaskell bug in GHC
 7.2.1 (4b007b0)
Message-ID: <20151231224040.54CFB3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/4b007b03d0a5eae3db2d6db608ef5b01d8113668

>---------------------------------------------------------------

commit 4b007b03d0a5eae3db2d6db608ef5b01d8113668
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 17:49:27 2015 -0600

    Avoid a SafeHaskell bug in GHC 7.2.1


>---------------------------------------------------------------

4b007b03d0a5eae3db2d6db608ef5b01d8113668
 .travis.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.travis.yml b/.travis.yml
index c625dc1..5f8f175 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,6 +28,7 @@ before_install:
 install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
+ - ghc-pkg trust base # To avoid a SafeHaskell bug on GHC 7.2.1
  - travis_retry cabal update
  - cabal install --only-dependencies
  - cabal install "Cabal == $CABALVER.*"  # Use the same Cabal version for Setup.hs and cabal-install


From git at git.haskell.org  Thu Dec 31 22:40:42 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:42 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Only call ghc-pkg trust base on
 GHC 7.2.1 (00c7d41)
Message-ID: <20151231224042.5B2A13A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/00c7d41532b625da9848d75c14c2fee58266d36c

>---------------------------------------------------------------

commit 00c7d41532b625da9848d75c14c2fee58266d36c
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 18:05:37 2015 -0600

    Only call ghc-pkg trust base on GHC 7.2.1


>---------------------------------------------------------------

00c7d41532b625da9848d75c14c2fee58266d36c
 .travis.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 5f8f175..b2a294e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,7 +28,9 @@ before_install:
 install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - ghc-pkg trust base # To avoid a SafeHaskell bug on GHC 7.2.1
+ - if [ "$GHCVER" = "7.2.1" ]; then
+     sudo ghc-pkg trust base; # To avoid a SafeHaskell bug on GHC 7.2.1
+   fi
  - travis_retry cabal update
  - cabal install --only-dependencies
  - cabal install "Cabal == $CABALVER.*"  # Use the same Cabal version for Setup.hs and cabal-install


From git at git.haskell.org  Thu Dec 31 22:40:44 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:44 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Make .travis.yml parse correctly
 (02d82c6)
Message-ID: <20151231224044.61FC73A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/02d82c6a95af45e41182af87d676b12c6a558a63

>---------------------------------------------------------------

commit 02d82c6a95af45e41182af87d676b12c6a558a63
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 18:07:27 2015 -0600

    Make .travis.yml parse correctly


>---------------------------------------------------------------

02d82c6a95af45e41182af87d676b12c6a558a63
 .travis.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b2a294e..af146a4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -28,8 +28,9 @@ before_install:
 install:
  - cabal --version
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- - if [ "$GHCVER" = "7.2.1" ]; then
-     sudo ghc-pkg trust base; # To avoid a SafeHaskell bug on GHC 7.2.1
+ - |
+   if [ "$GHCVER" = "7.2.1" ]; then
+     sudo ghc-pkg trust base # To avoid a SafeHaskell bug on GHC 7.2.1
    fi
  - travis_retry cabal update
  - cabal install --only-dependencies


From git at git.haskell.org  Thu Dec 31 22:40:46 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:46 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Maybe you need to give the full
 path with sudo... (bc443ea)
Message-ID: <20151231224046.6796C3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/bc443ea45a186f5e55811f259b4b3048a8f9edea

>---------------------------------------------------------------

commit bc443ea45a186f5e55811f259b4b3048a8f9edea
Author: RyanGlScott <ryan.gl.scott at gmail.com>
Date:   Wed Dec 23 18:12:07 2015 -0600

    Maybe you need to give the full path with sudo...


>---------------------------------------------------------------

bc443ea45a186f5e55811f259b4b3048a8f9edea
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index af146a4..d8643c6 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -30,7 +30,7 @@ install:
  - echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
  - |
    if [ "$GHCVER" = "7.2.1" ]; then
-     sudo ghc-pkg trust base # To avoid a SafeHaskell bug on GHC 7.2.1
+     sudo /opt/ghc/$GHCVER/bin/ghc-pkg trust base # To avoid a SafeHaskell bug on GHC 7.2.1
    fi
  - travis_retry cabal update
  - cabal install --only-dependencies


From git at git.haskell.org  Thu Dec 31 22:40:48 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:40:48 +0000 (UTC)
Subject: [commit: packages/haskeline] master: Merge pull request #35 from
 RyanGlScott/master (5e53651)
Message-ID: <20151231224048.6F5293A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/haskeline

On branch  : master
Link       : http://git.haskell.org/packages/haskeline.git/commitdiff/5e53651b2683f31bf5efc842c33f07afc05ec287

>---------------------------------------------------------------

commit 5e53651b2683f31bf5efc842c33f07afc05ec287
Merge: 2c69d65 bc443ea
Author: Judah Jacobson <judah.jacobson at gmail.com>
Date:   Wed Dec 23 17:01:57 2015 -0800

    Merge pull request #35 from RyanGlScott/master
    
    Suppress hsc2hs-related warning on GHC HEAD



>---------------------------------------------------------------

5e53651b2683f31bf5efc842c33f07afc05ec287
 .travis.yml                                | 4 ++++
 System/Console/Haskeline/Backend/Win32.hsc | 2 ++
 2 files changed, 6 insertions(+)


From git at git.haskell.org  Thu Dec 31 22:44:34 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:44:34 +0000 (UTC)
Subject: [commit: ghc] master: Update haskeline submodule to latest snapshot
 (6a010b9)
Message-ID: <20151231224434.CE77A3A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6a010b9c3e3dbba8e4f7e0cf0af76c92fb0dd7f3/ghc

>---------------------------------------------------------------

commit 6a010b9c3e3dbba8e4f7e0cf0af76c92fb0dd7f3
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 23:42:59 2015 +0100

    Update haskeline submodule to latest snapshot
    
    This pulls in a fix to suppress a `hsc2hs`-related
    warning in the windows backend.


>---------------------------------------------------------------

6a010b9c3e3dbba8e4f7e0cf0af76c92fb0dd7f3
 libraries/haskeline | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/haskeline b/libraries/haskeline
index 2c69d65..5e53651 160000
--- a/libraries/haskeline
+++ b/libraries/haskeline
@@ -1 +1 @@
-Subproject commit 2c69d656e2ed163b20cdf4905ff398345d62f006
+Subproject commit 5e53651b2683f31bf5efc842c33f07afc05ec287


From git at git.haskell.org  Thu Dec 31 22:49:16 2015
From: git at git.haskell.org (git at git.haskell.org)
Date: Thu, 31 Dec 2015 22:49:16 +0000 (UTC)
Subject: [commit: ghc] master: travis: use GHC 7.10.3 (8afeaad)
Message-ID: <20151231224916.32F723A300@ghc.haskell.org>

Repository : ssh://git at git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/8afeaad919dc67643b4eff14efafb48b59039b2b/ghc

>---------------------------------------------------------------

commit 8afeaad919dc67643b4eff14efafb48b59039b2b
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Thu Dec 31 23:49:49 2015 +0100

    travis: use GHC 7.10.3


>---------------------------------------------------------------

8afeaad919dc67643b4eff14efafb48b59039b2b
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 7bb719e..1006503 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -16,13 +16,13 @@ addons:
     - ubuntu-toolchain-r-test
     packages:
     - cabal-install-1.18
-    - ghc-7.8.4
+    - ghc-7.10.3
     - alex-3.1.3
     - happy-1.19.4
     - llvm-3.7
 
 before_install:
- - export PATH=/opt/ghc/7.8.4/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/lib/llvm-3.7/bin:$PATH
+ - export PATH=/opt/ghc/7.10.3/bin:/opt/cabal/1.18/bin:/opt/alex/3.1.3/bin:/opt/happy/1.19.4/bin:/usr/lib/llvm-3.7/bin:$PATH
 
 # Be explicit about which protocol to use, such that we don't have to repeat the rewrite command for each.
  - git config remote.origin.url git://github.com/${TRAVIS_REPO_SLUG}.git