Some cleanup

persistent-test/src/TypeLitFieldDefsTest.hs

@@ -66,4 +66,3 @@ specsWith runDb =
       lbl <- getJust labelledKey
       liftIO $ typeLitFieldDefsEntityLabelled lbl @?= oneLabelled
       liftIO $ typeLitFieldDefsEntityLabelled lbl @?= twentyLabelled
-

persistent/Database/Persist/Quasi/Internal.hs

@@ -129,13 +129,13 @@ parseFieldType t0 =
     parseNumericLit :: Char -> Text -> Maybe (ParseState FieldType)
     parseNumericLit c t = do
         guard (isDigit c && T.all isDigit t)
-        let (a, b) = T.break (\x -> isSpace x || x `elem` ("()[]"::String)) t
+        let (a, b) = breakAtNextSpace t
         lit <- FTLit . IntTypeLit <$> readMaybe (T.cons c a)
         pure $ PSSuccess lit b
 
     parseTypeCon c t = do
         guard (isUpper c || c == '\'')
-        let (a, b) = T.break (\x -> isSpace x || x `elem` ("()[]"::String)) t
+        let (a, b) = breakAtNextSpace t
         pure $ PSSuccess (parseFieldTypePiece c a) b
 
     goMany :: ([FieldType] -> a) -> Text -> ParseState a
@@ -145,6 +145,10 @@ parseFieldType t0 =
             PSFail err -> PSFail err
             PSDone -> PSSuccess (front []) t
 
+breakAtNextSpace :: Text -> (Text, Text)
+breakAtNextSpace =
+  T.break isSpace
+
 parseFieldTypePiece :: Char -> Text -> FieldType
 parseFieldTypePiece fstChar rest =
     case fstChar of

persistent/Database/Persist/Types.hs

@@ -48,8 +48,6 @@ import Database.Persist.PersistValue
 -- this module is a bit of a kitchen sink of types and concepts. the guts of
 -- persistent, just strewn across the table. in 2.13 let's get this cleaned up
 -- and a bit more tidy.
---
--- not sure if the re-export of FieldTypeLit here is correct going forward, given the above
 import Database.Persist.Types.Base
        ( Attr
        , CascadeAction(..)