From 25019d18109cd620a2cf6ab0e7d417d14935e8a5 Mon Sep 17 00:00:00 2001 From: Ben Gamari Date: Mon, 11 Nov 2019 12:34:42 -0500 Subject: Drop Uniquable constraint for AnnTarget This relied on deriveUnique, which was far too subtle to be safely applied. Thankfully the instance doesn't appear to be used so let's just drop it. --- testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs | 2 +- testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'testsuite/tests/plugins') diff --git a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs index 55e32e5b69..ae4135d203 100644 --- a/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs +++ b/testsuite/tests/plugins/annotation-plugin/SayAnnNames.hs @@ -29,5 +29,5 @@ pass g = do annotationsOn :: Data a => ModGuts -> CoreBndr -> CoreM [a] annotationsOn guts bndr = do - anns <- getAnnotations deserializeWithData guts + (_, anns) <- getAnnotations deserializeWithData guts return $ lookupWithDefaultUFM anns [] (varUnique bndr) diff --git a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs index 938d23586c..aabc1e5b6c 100644 --- a/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs +++ b/testsuite/tests/plugins/simple-plugin/Simple/Plugin.hs @@ -46,7 +46,7 @@ findNameBndr target b mainPass :: ModGuts -> CoreM ModGuts mainPass guts = do putMsgS "Simple Plugin Pass Run" - anns <- getAnnotations deserializeWithData guts + (_, anns) <- getAnnotations deserializeWithData guts bindsOnlyPass (mapM (changeBind anns Nothing)) guts changeBind :: UniqFM [ReplaceWith] -> Maybe String -> CoreBind -> CoreM CoreBind -- cgit v1.2.1