Commits

jsgf committed 9566de8 Merge

Merge remote-tracking branch 'upstream/master'

  • Participants
  • Parent commits 124bfa6, 7b97a5f

Comments (0)

Files changed (1)

Data/Aeson/Types.hs

 import Data.Map (Map)
 import Data.Monoid (Dual(..), First(..), Last(..))
 import Data.Ratio (Ratio)
+import Data.String (IsString(..))
 import Data.Text (Text, pack, unpack)
 import Data.Text.Encoding (decodeUtf8, encodeUtf8)
-import Data.String (IsString(..))
 import Data.Time.Clock (UTCTime)
 import Data.Time.Format (FormatTime, formatTime, parseTime)
 import Data.Attoparsec.Char8 (Number(..))
 
 instance IsString Value where
     fromString = String . pack
+    {-# INLINE fromString #-}
 
 -- | The empty array.
 emptyArray :: Value