NameCache doesn't store a UniqSupply anymore

3 files changed, 17 insertions, 27 deletions

diff --git a/haddock-api/src/Haddock/InterfaceFile.hs b/haddock-api/src/Haddock/InterfaceFile.hs
index 7147dc9d..f47e2df0 100644
--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@ -23,11 +23,7 @@ module Haddock.InterfaceFile (
 
 import Haddock.Types
 
-import Control.Monad
-import Control.Monad.IO.Class ( MonadIO(..) )
-import Data.Array
 import Data.IORef
-import Data.List (mapAccumR)
 import qualified Data.Map as Map
 import Data.Map (Map)
 import Data.Word
@@ -37,13 +33,8 @@ import GHC.Utils.Binary
 import GHC.Data.FastMutInt
 import GHC.Data.FastString
 import GHC hiding (NoLink)
-import GHC.Driver.Monad (withSession)
-import GHC.Driver.Env
 import GHC.Types.Name.Cache
-import GHC.Iface.Env
-import GHC.Types.Name
 import GHC.Types.Unique.FM
-import GHC.Types.Unique.Supply
 import GHC.Types.Unique
 
 data InterfaceFile = InterfaceFile {
@@ -166,9 +157,8 @@ writeInterfaceFile filename iface = do
 
 
 freshNameCache :: IO NameCache
-freshNameCache = do
-  u  <- mkSplitUniqSupply 'a' -- ??
-  initNameCache u []
+freshNameCache = initNameCache 'a' -- ??
+                               []
 
 -- | Read a Haddock (@.haddock@) interface file. Return either an
 -- 'InterfaceFile' or an error message.
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
index 688b6db6..16d3b333 100644
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -194,7 +194,7 @@
 	><span class="annottext"
 	  >bar :: Int -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -226,7 +226,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >baz :: Int -&gt; (Int, Int)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -327,7 +327,7 @@ forall a. a -&gt; a
 	><span class="annottext"
 	  >bar :: [a] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#bar"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >bar</span
 	    ></a
@@ -359,7 +359,7 @@ forall (t :: * -&gt; *) a. Foldable t =&gt; t a -&gt; Int
 	><span class="annottext"
 	  >baz :: Int -&gt; ([a], [a])
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#baz"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >baz</span
 	    ></a
@@ -798,7 +798,7 @@ forall a. Foo a =&gt; a -&gt; Int
 	><span class="annottext"
 	  >norf :: [Int] -&gt; Int
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#norf"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >norf</span
 	    ></a
@@ -870,7 +870,7 @@ forall (t :: * -&gt; *) a. (Foldable t, Num a) =&gt; t a -&gt; a
 	><span class="annottext"
 	  >quux :: ([a], [a]) -&gt; [a]
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#quux"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >quux</span
 	    ></a
@@ -1118,7 +1118,7 @@ forall a. [a] -&gt; [a] -&gt; [a]
 	><span class="annottext"
 	  >plugh :: forall a b. Either a a -&gt; Either b b -&gt; Either (a -&gt; b) (b -&gt; a)
 </span
-	  ><a href="#"
+	  ><a href="Classes.html#plugh"
 	  ><span class="hs-identifier hs-var hs-var hs-var hs-var"
 	    >plugh</span
 	    ></a
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index 9adf02de..256b952f 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -623,10 +623,10 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-x :: Int
 x :: Point -&gt; Int
+x :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#x"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >x</span
 	    ></a
@@ -640,10 +640,10 @@ x :: Point -&gt; Int
       ><span class="annot"
 	><span class="annottext"
 	  >Int
-y :: Int
 y :: Point -&gt; Int
+y :: Int
 </span
-	  ><a href="#"
+	  ><a href="Records.html#y"
 	  ><span class="hs-identifier hs-var hs-var"
 	    >y</span
 	    ></a
@@ -1301,12 +1301,12 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
 	><span class="annot"
 	  ><span class="annottext"
 	    >Int
-y :: Int
-x :: Int
-y :: Point -&gt; Int
 x :: Point -&gt; Int
+y :: Point -&gt; Int
+x :: Int
+y :: Int
 </span
-	    ><a href="#"
+	    ><a href="Records.html#x"
 	    ><span class="hs-glyph hs-var hs-var hs-var hs-var"
 	      >..</span
 	      ></a