on master help sign in
Merge remote-tracking branch 'upstream/master'
commit16ffeb422046e58d7b620cde856fca57840cc343 authorJeremy Fitzhardinge <jeremy@goop.org> dateWed 23 Feb 2011, 15:19 (16 years ago) parent1aa35aa2694fcc
1 file changed+2−1
Data/Aeson/Types.hs+2−1
Data/Aeson/Types.hs+2−1
@@ -47,9 +47,9 @@ import qualified Data.IntSet as IntSet
4747import Data.Map (Map)
4848import Data.Monoid (Dual(..), First(..), Last(..))
4949import Data.Ratio (Ratio)
50+import Data.String (IsString(..))
5051import Data.Text (Text, pack, unpack)
5152import Data.Text.Encoding (decodeUtf8, encodeUtf8)
52−import Data.String (IsString(..))
5353import Data.Time.Clock (UTCTime)
5454import Data.Time.Format (FormatTime, formatTime, parseTime)
5555import Data.Attoparsec.Char8 (Number(..))
@@ -157,6 +157,7 @@ instance NFData Value where
157157
158158instance IsString Value where
159159 fromString = String . pack
160+ {-# INLINE fromString #-}
160161
161162-- | The empty array.
162163emptyArray :: Value