fixup! Avoid per-byte loop in cstring{,Utf8} builders

Review feedback

Author: hs-viktor

Data/ByteString/Builder/Internal.hs

@@ -90,7 +90,7 @@ module Data.ByteString.Builder.Internal (
 
   , byteStringCopy
   , asciiLiteralCopy
-  , modUtf8LitCopy
+  , modUtf8LiteralCopy
   , byteStringInsert
   , byteStringThreshold
 
@@ -997,16 +997,16 @@ asciiLiteralCopy = \ !ip !len -> builder $ \k br@(BufferRange op ope) ->
 -- result is not well defined.
 --
 -- @since 0.13.0.0
-{-# INLINABLE modUtf8LitCopy #-}
-modUtf8LitCopy :: Ptr Word8 -> Int -> Builder
-modUtf8LitCopy !ip !len
+{-# INLINABLE modUtf8LiteralCopy #-}
+modUtf8LiteralCopy :: Ptr Word8 -> Int -> Builder
+modUtf8LiteralCopy !ip !len
     | len > 0   = builder (modUtf8_step ip len)
     | otherwise = builder id
 
--- | Copy a /non-empty/ UTF-8 input possibly containing denormalised 2-octet
+-- | Copy a /non-empty/ UTF-8 input possibly containing overlong 2-octet
 -- sequences.  While only the NUL byte should ever encoded that way (as @0xC0
--- 80@), this handles other denormalised @0xC0 0x??@  sequences by keeping the
--- bottom 6 bits of the second byte.  If the input is non-UTF8 garbage, the the
+-- 80@), this handles other overlong @0xC0 0x??@  sequences by keeping the
+-- bottom 6 bits of the second byte.  If the input is non-UTF8 garbage, the
 -- result may not be what the user expected.
 --
 modUtf8_step :: Ptr Word8 -> Int -> BuildStep r -> BuildStep r

Data/ByteString/Builder/Prim.hs

@@ -671,7 +671,7 @@ cstring s = asciiLiteralCopy (Ptr s) (S.byteCountLiteral s)
 --
 -- @since 0.11.0.0
 cstringUtf8 :: Addr# -> Builder
-cstringUtf8 s = modUtf8LitCopy (Ptr s) (S.byteCountLiteral s)
+cstringUtf8 s = modUtf8LiteralCopy (Ptr s) (S.byteCountLiteral s)
 {-# INLINE cstringUtf8 #-}
 
 ------------------------------------------------------------------------------

tests/builder/Data/ByteString/Builder/Prim/Tests.hs

@@ -37,7 +37,7 @@ testCString = testProperty "cstring" $
       LC.pack "hello" `L.append` L.singleton 0x20 `L.append` LC.pack "world!"
 
 testCStringUtf8 :: Int -> TestTree
-testCStringUtf8 sz = testProperty "cstringUtf8" $
+testCStringUtf8 sz = testProperty ("cstringUtf8 (chunk size " ++ shows sz ")") $
     BE.toLazyByteStringWith (BE.untrimmedStrategy sz sz) L.empty
       (BP.cstringUtf8 "hello\xc0\x80\xc0\x80\xd0\xbc\xd0\xb8\xd1\x80\xc0\x80\xC0"#) ==
       LC.pack "hello" `L.append` L.singleton 0x00