[Pkg-haskell-commits] [SCM] haskell-testpack branch, master, updated. debian/1.0.2-1-4-gb0d6b36

[John Goerzen]

The following commit has been merged in the master branch:
commit 653c2bd4097b3d0ca731b211413120db166d2f17
Author: John Goerzen <jgoerzen at complete.org>
Date:   Tue Dec 5 08:27:42 2006 +0100

    Removed deprecated subRe, splitRe

diff --git a/src/Data/String.hs b/src/Data/String.hs
index 98e2d07..65fe1f7 100644
--- a/src/Data/String.hs
+++ b/src/Data/String.hs
@@ -40,15 +40,12 @@ module Data.String
                         -- * Conversions
                         -- | Note: Some of these functions are aliases for functions
                         -- in "Data.List.Utils".
-                        join, split, splitWs, splitRe, replace, subRe, escapeRe
+                        join, split, splitWs, replace, escapeRe
                        ) where
 import Data.List.Utils(startswith, endswith, join, split, replace)
 import Data.Char
 import Text.Regex
 
-{-# DEPRECATED splitRe "Use Text.Regex.splitRegex instead" #-}
-{-# DEPRECATED subRe "Use Text.Regex.subRegex instead" #-}
-
 wschars = " \t\r\n"
 
 {- | Removes any whitespace characters that are present at the start
@@ -82,31 +79,6 @@ lstrip s = case s of
 rstrip :: String -> String
 rstrip = reverse . lstrip . reverse
 
-{- | Replaces every occurance of the given regexp with the replacement string.
-
-In the replacement string, @\"\\1\"@ refers to the first substring; 
-@\"\\2\"@ to the second, etc; and @\"\\0\"@ to the entire match.
-@\"\\\\\\\\\"@ will insert a literal backslash.
-
-This code has been integrated into the standard Haskell libraries
-as Text.Regex.subRegex and is thus deprecated in MissingH.
--}
-subRe :: Regex                          -- ^ Search pattern
-      -> String                         -- ^ Input string
-      -> String                         -- ^ Replacement text
-      -> String                         -- ^ Output string
-subRe = subRegex
-
-{- | Splits a string based on a regular expression.  The regular expression
-should identify one delimiter.
-
-This code has been integrated into the standard Haskell libraries
-as Text.Regex.splitRegex and is thus deprecated in MissingH.
--}
-
-splitRe :: Regex -> String -> [String]
-splitRe = splitRegex
-
 {- | Splits a string around whitespace.  Empty elements in the result
 list are automatically removed. -}
 splitWs :: String -> [String]

-- 
haskell-testpack