diff options
author | V3n3RiX <venerix@redcorelinux.org> | 2021-08-31 08:59:54 +0100 |
---|---|---|
committer | V3n3RiX <venerix@redcorelinux.org> | 2021-08-31 08:59:54 +0100 |
commit | 3b08f674e3f771b49370edb144dab0958c8cf721 (patch) | |
tree | 3673eb62859b2343bc70589f2f9d670c2eee5cc8 /dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch | |
parent | b1c81de4fadbd00897700a7321f03b390d952b2e (diff) |
gentoo resync : 31.08.2021
Diffstat (limited to 'dev-lang/ghc/files/ghc-8.10.5-modorigin-verbose-conflict.patch')
-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 |