5 files changed, 4 insertions, 6 deletions
diff --git a/compiler/GHC/HsToCore/Foreign/JavaScript.hs b/compiler/GHC/HsToCore/Foreign/JavaScript.hs
index 926f5d75d0..0db3dc75d8 100644
--- a/compiler/GHC/HsToCore/Foreign/JavaScript.hs
+++ b/compiler/GHC/HsToCore/Foreign/JavaScript.hs
@@ -396,7 +396,7 @@ showFFIType t = getOccString (getName (typeTyCon t))
 
 typeTyCon :: Type -> TyCon
 typeTyCon ty
-  -- | UnaryRep rep_ty <- repType ty
+  -- UnaryRep rep_ty <- repType ty
   | Just (tc, _) <- tcSplitTyConApp_maybe (unwrapType ty) -- rep_ty
   = tc
   | otherwise
diff --git a/libraries/Cabal b/libraries/Cabal
-Subproject 21a130a7228ab3b847c5c94092bfd5d9d9c393f
+Subproject 18d801832a3ad5f346eeaaf3f8f3df1abd5a6b9
diff --git a/libraries/base/GHCJS/Prim.hs b/libraries/base/GHCJS/Prim.hs
index 753104ad7e..d963081b74 100644
--- a/libraries/base/GHCJS/Prim.hs
+++ b/libraries/base/GHCJS/Prim.hs
@@ -255,12 +255,12 @@ unsafeUnpackJSStringUtf8## a = js_unsafeUnpackJSStringUtf8## a
 -- reduce the spine and all list elements to whnf
 seqList :: [a] -> [a]
 seqList xs = go xs `seq` xs
-  where go (x:xs) = x `seq` go xs
+  where go (y:ys) = y `seq` go ys
         go []     = ()
 
 seqListSpine :: [a] -> [a]
 seqListSpine xs = go xs `seq` xs
-  where go (x:xs) = go xs
+  where go (y:ys) = go ys
         go []     = ()
 
 foreign import javascript unsafe "h$toHsString($1)"
diff --git a/libraries/base/GHCJS/Prim/Internal.hs b/libraries/base/GHCJS/Prim/Internal.hs
index b732534453..288b677c4c 100644
--- a/libraries/base/GHCJS/Prim/Internal.hs
+++ b/libraries/base/GHCJS/Prim/Internal.hs
@@ -13,7 +13,6 @@ module GHCJS.Prim.Internal ( blockedIndefinitelyOnMVar
 import           Control.Exception
 
 import           GHCJS.Prim
-import           GHC.Exts
 
 wouldBlock :: SomeException
 wouldBlock = toException WouldBlockException
diff --git a/libraries/base/GHCJS/Prim/Internal/Build.hs b/libraries/base/GHCJS/Prim/Internal/Build.hs
index 368150c6a6..4757a11a7d 100644
--- a/libraries/base/GHCJS/Prim/Internal/Build.hs
+++ b/libraries/base/GHCJS/Prim/Internal/Build.hs
@@ -141,7 +141,6 @@ module GHCJS.Prim.Internal.Build
   ) where
 
 import GHCJS.Prim
-import GHC.Prim
 import GHC.Exts
 import Unsafe.Coerce
 import System.IO.Unsafe
@@ -154,7 +153,7 @@ type A = JSVal -- array
 
 seqTupList :: [(a,b)] -> [(a,b)]
 seqTupList xs = go xs `seq` xs
-  where go ((x1,x2):xs) = x1 `seq` x2 `seq` go xs
+  where go ((y1,y2):ys) = y1 `seq` y2 `seq` go ys
         go []           = ()
 
 foreign import javascript unsafe "$r = [];" js_emptyArrayI :: A