Skip to content

Commit

Permalink
Revert "do a minimal change to get this type error fixed"
Browse files Browse the repository at this point in the history
This reverts commit 6d212a0.
  • Loading branch information
kadoban committed Dec 10, 2015
1 parent b1d832d commit a5ec10a
Showing 1 changed file with 2 additions and 4 deletions.
6 changes: 2 additions & 4 deletions src/Stack/PackageIndex.hs
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@ import qualified Data.Map.Strict as Map
import Data.Monoid
import Data.Text (Text)
import qualified Data.Text as T
import qualified Data.Text.Encoding as T

import Data.Traversable (forM)

Expand Down Expand Up @@ -145,14 +144,13 @@ populateCache menv index = do
where
(y, z) = S.break (== Word8._slash) x

-- TODO: handling of unicode in this seems iffy, need to look into it more
parseNameVersion t1 = do
(p', t3) <- breakSlash
$ S.map (\c -> if c == Word8._backslash then Word8._slash else c)
$ S8.pack t1
p <- parsePackageName $ T.decodeUtf8 p'
p <- parsePackageName p'
(v', t5) <- breakSlash t3
v <- parseVersion $ T.decodeUtf8 v'
v <- parseVersion v'
let (t6, suffix) = S.break (== Word8._period) t5
if t6 == p'
then return (PackageIdentifier p v, suffix)
Expand Down

0 comments on commit a5ec10a

Please sign in to comment.