[commit: base] data-proxy: Merge branch 'master' into data-proxy (aec3eaa)

[Richard Eisenberg]

Repository : http://darcs.haskell.org/ghc.git/

On branch  : data-proxy

http://hackage.haskell.org/trac/ghc/changeset/aec3eaa9041262a839279ede769d076930eee600

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

commit aec3eaa9041262a839279ede769d076930eee600
Merge: f6b521c af77ef4
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Mon Jul 22 09:40:42 2013 +0100

    Merge branch 'master' into data-proxy
    
    Conflicts:
    	Data/Typeable.hs
    	Data/Typeable/Internal.hs

 .gitignore                            |    3 +
 Control/Applicative.hs                |    2 +-
 Control/Category.hs                   |    4 +
 Control/Concurrent.hs                 |   32 +++
 Control/Concurrent/MVar.hs            |   31 +--
 Data/Either.hs                        |   12 +
 Data/Foldable.hs                      |   12 +
 Data/OldTypeable.hs                   |    7 +-
 Data/OldTypeable.hs-boot              |   10 -
 Data/OldTypeable/Internal.hs          |    7 +-
 Data/Traversable.hs                   |    7 +
 Data/Typeable.hs                      |    2 -
 Data/Typeable.hs-boot                 |   10 -
 Data/Typeable/Internal.hs             |   59 ++---
 Data/Unique.hs                        |    8 +-
 Data/Word.hs                          |   18 ++
 Foreign/C/Error.hs                    |    5 +-
 Foreign/C/Types.hs                    |    4 +-
 Foreign/ForeignPtr/Imp.hs             |    1 -
 Foreign/Marshal/Alloc.hs              |    1 -
 Foreign/Marshal/Array.hs              |    1 -
 Foreign/Storable.hs                   |    1 -
 GHC/Arr.lhs                           |    2 +-
 GHC/Base.lhs                          |    6 +-
 GHC/Conc/Sync.lhs                     |   10 +-
 GHC/Enum.lhs                          |    6 +-
 GHC/Err.lhs                           |   43 +---
 GHC/Err.lhs-boot                      |   22 --
 GHC/Event/Array.hs                    |    8 +-
 GHC/Event/EPoll.hsc                   |   27 ++-
 GHC/Event/Internal.hs                 |   18 +-
 GHC/Event/KQueue.hsc                  |   36 ++-
 GHC/Event/Manager.hs                  |   62 +++--
 GHC/Event/Poll.hsc                    |    8 +-
 GHC/Event/Thread.hs                   |    3 +-
 GHC/Event/TimerManager.hs             |   88 ++++---
 GHC/Exception.lhs                     |   19 +-
 GHC/Exception.lhs-boot                |   38 +++
 GHC/Fingerprint.hs                    |    6 +-
 GHC/Foreign.hs                        |    5 +-
 GHC/ForeignPtr.hs                     |  114 +++++----
 GHC/IO/Encoding.hs                    |   28 ++-
 GHC/IO/Encoding/CodePage.hs           |   12 +-
 GHC/IO/Encoding/CodePage/API.hs       |  426 +++++++++++++++++++++++++++++++++
 GHC/IO/Encoding/Iconv.hs              |    4 +-
 GHC/IO/Encoding/Types.hs              |   12 +-
 GHC/IO/Encoding/UTF8.hs               |    3 +-
 GHC/IO/Handle/Internals.hs            |   17 +-
 GHC/IO/Handle/Text.hs                 |    2 +-
 GHC/IOArray.hs                        |    5 +-
 GHC/IORef.hs                          |    5 +-
 GHC/Int.hs                            |   14 +-
 GHC/MVar.hs                           |   41 +++-
 GHC/Read.lhs                          |    1 -
 GHC/Real.lhs                          |   25 +-
 GHC/Stable.lhs                        |    4 +-
 GHC/TypeLits.hs                       |  118 +++++++--
 GHC/Windows.hs                        |   20 +-
 GHC/Word.hs                           |   20 +-
 Prelude.hs                            |    1 -
 System/Environment.hs                 |   96 +++++++-
 System/Posix/Internals.hs-boot        |    9 -
 System/Timeout.hs                     |    9 +-
 Unsafe/Coerce.hs                      |    1 +
 base.cabal                            |    4 +-
 cbits/SetEnv.c                        |   11 +
 cbits/md5.c                           |   26 +-
 configure.ac                          |   18 +-
 include/md5.h                         |    8 +-
 tests/CatEntail.hs                    |   27 +++
 tests/CatPairs.hs                     |   34 +++
 tests/IO/T7853.hs                     |   28 +++
 tests/IO/T7853.stdout                 |   11 +
 tests/IO/all.T                        |    2 +
 tests/IO/encoded-data/CP1251-UTF8.txt |   34 +++
 tests/IO/encoded-data/CP1251.txt      |   34 +++
 tests/IO/encoded-data/CP936-UTF8.txt  |  153 ++++++++++++
 tests/IO/encoded-data/CP936.txt       |  153 ++++++++++++
 tests/IO/encoding004.hs               |  107 +++++++++
 tests/IO/encoding004.stdout           |    3 +
 tests/IO/hSetBuffering004.hs          |    1 +
 tests/IO/hSetBuffering004.stdout      |    1 +
 tests/T7653.hs                        |    7 +
 tests/T7773.hs                        |    9 +
 tests/T7773.stdout                    |    2 +
 tests/T7787.hs                        |    8 +
 tests/T7787.stdout                    |    1 +
 tests/all.T                           |   10 +
 88 files changed, 1878 insertions(+), 445 deletions(-)

diff --cc Data/Typeable/Internal.hs
index 0596a20,e98d3c1..0ab0232
--- a/Data/Typeable/Internal.hs
+++ b/Data/Typeable/Internal.hs
@@@ -49,13 -50,11 +49,12 @@@ import GHC.Bas
  import GHC.Word
  import GHC.Show
  import Data.Maybe
- import Data.List
 +import {-# SOURCE #-} Data.Proxy
  import GHC.Num
  import GHC.Real
- import GHC.IORef
- import GHC.IOArray
- import GHC.MVar
+ -- import GHC.IORef
+ -- import GHC.IOArray
+ -- import GHC.MVar
  import GHC.ST           ( ST )
  import GHC.STRef        ( STRef )
  import GHC.Ptr          ( Ptr, FunPtr )