Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents 9fa1e46 + 6a12af7 commit e48603d6fbf1f4801a5c3f423d96493fd539af69 @jsgf committed Feb 23, 2011
Showing with 2 additions and 1 deletion.
  1. +2 −1 Data/Aeson/Types.hs
View
@@ -47,9 +47,9 @@ import qualified Data.IntSet as IntSet
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(..))
@@ -157,6 +157,7 @@ instance NFData Value where
instance IsString Value where
fromString = String . pack
+ {-# INLINE fromString #-}
-- | The empty array.
emptyArray :: Value

0 comments on commit e48603d

Please sign in to comment.