Skip to content

Commit

Permalink
protolude: fix ambiguous occurrences
Browse files Browse the repository at this point in the history
Fixes regressions introduced by 8063c4d0

Protolude.fromStrict vs. Data.ByteString.Lazy.fromStrict
Protolude.decodeUtf8 vs. Data.Text.Lazy.Encoding.decodeUtf8
Protolude.encodeUtf8 vs. Data.Text.Lazy.Encoding.encodeUtf8
  • Loading branch information
ilovezfs committed Jul 12, 2016
1 parent f0d5256 commit 27ae3b9
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 4 deletions.
1 change: 1 addition & 0 deletions CONTRIBUTORS.md
Expand Up @@ -27,6 +27,7 @@ This file lists the contributors to the PureScript compiler project, and the ter
- [@faineance](https://github.com/faineance) My existing contributions and all future contributions until further notice are Copyright faineance, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
- [@garyb](https://github.com/garyb) (Gary Burgess) My existing contributions and all future contributions until further notice are Copyright Gary Burgess, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
- [@hdgarrood](https://github.com/hdgarrood) (Harry Garrood) My existing contributions and all future contributions until further notice are Copyright Harry Garrood, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
- [@ilovezfs](https://github.com/ilovezfs) - My existing contributions and all future contributions until further notice are Copyright ilovezfs, and are licensed to the owners and users of the PureScript compiler project under the terms of the MIT license
- [@izgzhen](https://github.com/izgzhen) (Zhen Zhang) My existing contributions and all future contributions until further notice are Copyright Zhen Zhang, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
- [@jacereda](https://github.com/jacereda) (Jorge Acereda) My existing contributions and all future contributions until further notice are Copyright Jorge Acereda, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
- [@japesinator](https://github.com/japesinator) (JP Smith) My existing contributions and all future contributions until further notice are Copyright JP Smith, and are licensed to the owners and users of the PureScript compiler project under the terms of the [MIT license](http://opensource.org/licenses/MIT).
Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Ide/Pursuit.hs
Expand Up @@ -19,7 +19,7 @@ module Language.PureScript.Ide.Pursuit
, findPackagesForModuleIdent
) where

import Protolude
import Protolude hiding (fromStrict)

import qualified Control.Exception as E
import Data.Aeson
Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Ide/Util.hs
Expand Up @@ -27,7 +27,7 @@ module Language.PureScript.Ide.Util
, module Language.PureScript.Ide.Conversions
) where

import Protolude
import Protolude hiding (decodeUtf8, encodeUtf8)
import Data.Aeson
import qualified Data.Text as T
import Data.Text.Lazy.Encoding (decodeUtf8, encodeUtf8)
Expand Down
2 changes: 1 addition & 1 deletion stack-ghc-8.0.yaml
@@ -1,4 +1,4 @@
resolver: nightly-2016-05-29
resolver: nightly-2016-07-11
packages:
- '.'
extra-deps:
Expand Down
2 changes: 1 addition & 1 deletion stack.yaml
@@ -1,4 +1,4 @@
resolver: lts-6.1
resolver: lts-6.7
packages:
- '.'
extra-deps: []
Expand Down

0 comments on commit 27ae3b9

Please sign in to comment.