[commit: bytestring] ghc-7.6: Re-export all of the D.B.Builder.ASCII via top level D.B.Builder (c27a4c5)

[Paolo Capriotti]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/bytestring

On branch  : ghc-7.6

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

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

commit c27a4c5ee41c61641edd7271ed30694fb8d635e8
Author: Duncan Coutts <duncan at community.haskell.org>
Date:   Wed Sep 5 01:49:50 2012 +0000

    Re-export all of the D.B.Builder.ASCII via top level D.B.Builder
    Decided it's better to have a few biger builder modules than to confuse
    users with loads of Builder.* modules.

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

 Data/ByteString/Builder.hs       |    1 +
 Data/ByteString/Builder/ASCII.hs |    8 +++++---
 Data/ByteString/Builder/Prim.hs  |    6 ++----
 bytestring.cabal                 |    2 +-
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Data/ByteString/Builder.hs b/Data/ByteString/Builder.hs
index 4c6af7e..f8dec8f 100644
--- a/Data/ByteString/Builder.hs
+++ b/Data/ByteString/Builder.hs
@@ -255,6 +255,7 @@ module Data.ByteString.Builder
     , charUtf8
     , stringUtf8
 
+    , module Data.ByteString.Builder.ASCII
 
     ) where
 
diff --git a/Data/ByteString/Builder/ASCII.hs b/Data/ByteString/Builder/ASCII.hs
index 17d01f3..2fac578 100644
--- a/Data/ByteString/Builder/ASCII.hs
+++ b/Data/ByteString/Builder/ASCII.hs
@@ -1,4 +1,5 @@
 {-# LANGUAGE ScopedTypeVariables, CPP, ForeignFunctionInterface #-}
+{-# OPTIONS_HADDOCK hide #-}
 -- | Copyright : (c) 2010 - 2011 Simon Meier
 -- License     : BSD3-style (see LICENSE)
 --
@@ -9,7 +10,8 @@
 --
 module Data.ByteString.Builder.ASCII
     (
-      -- * Decimal numbers
+      -- ** ASCII text
+      -- *** Decimal numbers
       -- | Decimal encoding of numbers using ASCII encoded characters.
       int8Dec
     , int16Dec
@@ -27,7 +29,7 @@ module Data.ByteString.Builder.ASCII
     , floatDec
     , doubleDec
 
-      -- * Hexadecimal numbers
+      -- *** Hexadecimal numbers
 
       -- | Encoding positive integers as hexadecimal numbers using lower-case
       -- ASCII characters. The shortest
@@ -46,7 +48,7 @@ module Data.ByteString.Builder.ASCII
     , word64Hex
     , wordHex
 
-      -- * Fixed-width hexadecimal numbers
+      -- *** Fixed-width hexadecimal numbers
       --
     , int8HexFixed
     , int16HexFixed
diff --git a/Data/ByteString/Builder/Prim.hs b/Data/ByteString/Builder/Prim.hs
index e64d561..4c85bb0 100644
--- a/Data/ByteString/Builder/Prim.hs
+++ b/Data/ByteString/Builder/Prim.hs
@@ -69,8 +69,7 @@ Its \"hot code\" is the rendering of a table's cells,
   'Builder' API.
 
 @
-import "Data.ByteString.Builder"       as B
-import "Data.ByteString.Builder.ASCII" as B
+import "Data.ByteString.Builder" as B
 
 renderCell :: Cell -> Builder
 renderCell (StringC cs) = renderString cs
@@ -84,8 +83,7 @@ renderString cs = B.charUtf8 \'\"\' \<\> foldMap escape cs \<\> B.charUtf8 \'\"\
     escape c    = B.charUtf8 c
 @
 
-Efficient encoding of 'Int's as decimal numbers is performed by @intDec@
-  from "Data.ByteString.Builder.ASCII".
+Efficient encoding of 'Int's as decimal numbers is performed by @intDec at .
 Optimization potential exists for the escaping of 'String's.
 The above implementation has two optimization opportunities.
 First,
diff --git a/bytestring.cabal b/bytestring.cabal
index d87bc57..cdf777f 100644
--- a/bytestring.cabal
+++ b/bytestring.cabal
@@ -73,9 +73,9 @@ library
 
                      Data.ByteString.Builder
                      Data.ByteString.Builder.Extra
-                     Data.ByteString.Builder.ASCII
 
   other-modules:
+                     Data.ByteString.Builder.ASCII
                      -- these three modules should be exposed in a future
                      -- release once we're confident the API is stable.
                      Data.ByteString.Builder.Internal