diff options
| author |   Jack Todaro <solpeth@posteo.org> | 2021-08-24 17:17:23 +1000 |
|---|---|---|
| committer |   Mark Wright <gienah@gentoo.org> | 2021-08-27 18:22:31 +1000 |
| commit | c3e9bd6f88b4d24a55bd8959f5248732077e376b (patch) | |
| tree | 5d6b40816f9bc592564e822f51830dcfe74e980e /dev-lang/ghc/files | |
| parent | dev-db/mysql-workbench: cleanup (diff) | |
| download | gentoo-c3e9bd6f88b4d24a55bd8959f5248732077e376b.tar.gz gentoo-c3e9bd6f88b4d24a55bd8959f5248732077e376b.tar.bz2 gentoo-c3e9bd6f88b4d24a55bd8959f5248732077e376b.zip | |
dev-lang/ghc: sync 8.10.6 from ::haskell (no keywords)
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Jack Todaro <solpeth@posteo.org>
Signed-off-by: Mark Wright <gienah@gentoo.org>
Diffstat (limited to 'dev-lang/ghc/files')
| -rw-r--r-- | dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch new file mode 100644 index 000000000000..a34c0c9059fe --- /dev/null +++ b/dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch @@ -0,0 +1,20 @@ +--- a/compiler/main/Packages.hs ++++ b/compiler/main/Packages.hs +@@ -219,12 +219,14 @@ fromFlag = ModOrigin Nothing [] [] True + instance Semigroup ModuleOrigin where + ModOrigin e res rhs f <> ModOrigin e' res' rhs' f' = + ModOrigin (g e e') (res ++ res') (rhs ++ rhs') (f || f') +- where g (Just b) (Just b') ++ where g x@(Just b) y@(Just b') + | b == b' = Just b +- | otherwise = panic "ModOrigin: package both exposed/hidden" ++ | otherwise = pprPanic "ModOrigin: package both exposed/hidden" $ ++ text "x: " <> ppr x $$ text "y: " <> ppr y + g Nothing x = x + g x Nothing = x +- _x <> _y = panic "ModOrigin: hidden module redefined" ++ x <> y = pprPanic "ModOrigin: hidden module redefined" $ ++ text "x: " <> ppr x $$ text "y: " <> ppr y + + instance Monoid ModuleOrigin where + mempty = ModOrigin Nothing [] [] False |