summaryrefslogtreecommitdiff
path: root/compiler/main/HscMain.hs
diff options
context:
space:
mode:
authorIavor S. Diatchki <iavor.diatchki@gmail.com>2012-01-07 13:56:17 -0800
committerIavor S. Diatchki <iavor.diatchki@gmail.com>2012-01-07 13:56:17 -0800
commitf784eb7585901e2297d504dcf777ebc58d60aaa5 (patch)
tree7bf8bc625882724f5db96121c327ee3e80ae781a /compiler/main/HscMain.hs
parent7655c718d56666a918c06f6d4e32d98482620b9c (diff)
parenta5b365ac3ea7277817541f8bc3341eecfb083490 (diff)
downloadhaskell-f784eb7585901e2297d504dcf777ebc58d60aaa5.tar.gz
Merge remote-tracking branch 'origin/master' into type-nats
Diffstat (limited to 'compiler/main/HscMain.hs')
-rw-r--r--compiler/main/HscMain.hs2
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/main/HscMain.hs b/compiler/main/HscMain.hs
index 2882816c0b..8c9e9a8f00 100644
--- a/compiler/main/HscMain.hs
+++ b/compiler/main/HscMain.hs
@@ -296,7 +296,7 @@ hscTcRcLookupName hsc_env name =
-- "name not found", and the Maybe in the return type
-- is used to indicate that.
-hscTcRnGetInfo :: HscEnv -> Name -> IO (Maybe (TyThing, Fixity, [Instance]))
+hscTcRnGetInfo :: HscEnv -> Name -> IO (Maybe (TyThing, Fixity, [ClsInst]))
hscTcRnGetInfo hsc_env name =
runHsc hsc_env $ ioMsgMaybe' $ tcRnGetInfo hsc_env name