fix ambiguous occurrence show (#1905)

* fix ambiguous occurrence

* bump version

* update changelog

Author: konrad-npx

yesod-core/ChangeLog.md

@@ -1,5 +1,9 @@
 # ChangeLog for yesod-core
 
+## 1.6.29.1
+
+* Fix compilation error for text >= 2.1.2 [#1905](https://github.com/yesodweb/yesod/pull/1905)
+
 ## 1.6.29.0
 
 * When showing HandlerContent, include a content snippet [#1864](https://github.com/yesodweb/yesod/pull/1864)

yesod-core/src/Yesod/Core/Types/HandlerContents.hs

@@ -5,7 +5,7 @@ module Yesod.Core.Types.HandlerContents
 
 import Control.Exception (Exception)
 import Data.Maybe
-import Data.Text
+import qualified Data.Text as T
 import qualified Data.Text.Lazy as TL
 import qualified Network.HTTP.Types as H
 import qualified Network.Wai as W
@@ -16,8 +16,8 @@ data HandlerContents =
       HCContent !H.Status !TypedContent
     | HCError !ErrorResponse
     | HCSendFile !ContentType !FilePath !(Maybe W.FilePart)
-    | HCRedirect !H.Status !Text
-    | HCCreated !Text
+    | HCRedirect !H.Status !T.Text
+    | HCCreated !T.Text
     | HCWai !W.Response
     | HCWaiApp !W.Application
 

yesod-core/yesod-core.cabal

@@ -1,5 +1,5 @@
 name:            yesod-core
-version:         1.6.29.0
+version:         1.6.29.1
 license:         MIT
 license-file:    LICENSE
 author:          Michael Snoyman <michael@snoyman.com>