Simon Hengel pushed to branch wip/sol/reexported-error-message at Glasgow Haskell Compiler / GHC
Commits:
-
f1e9b87f
by Simon Hengel at 2026-06-22T13:52:42+07:00
1 changed file:
Changes:
| ... | ... | @@ -1974,7 +1974,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn |
| 1974 | 1974 | -> (hidden_pkg, x:hidden_mod, unusable, exposed)
|
| 1975 | 1975 | ModUnusable _
|
| 1976 | 1976 | -> (hidden_pkg, hidden_mod, x:unusable, exposed)
|
| 1977 | - ModOrigin { fromOrigUnit, fromHiddenReexport }
|
|
| 1977 | + ModOrigin { fromOrigUnit = origAvailableUnderSameName, fromHiddenReexport }
|
|
| 1978 | 1978 | | originEmpty origin
|
| 1979 | 1979 | -> (hidden_pkg, hidden_mod, unusable, exposed)
|
| 1980 | 1980 | | originVisible origin
|
| ... | ... | @@ -1983,14 +1983,7 @@ lookupModuleWithSuggestions' pkgs mod_map name mb_pn |
| 1983 | 1983 | -> (fromHiddenReexport ++ maybe id (:) origUnit hidden_pkg, hidden_mod, unusable, exposed)
|
| 1984 | 1984 | where
|
| 1985 | 1985 | origUnit :: Maybe UnitInfo
|
| 1986 | - origUnit
|
|
| 1987 | - | origAvailableUnderSameName = lookupUnit pkgs (moduleUnit m)
|
|
| 1988 | - | otherwise = Nothing
|
|
| 1989 | - |
|
| 1990 | - origAvailableUnderSameName :: Bool
|
|
| 1991 | - origAvailableUnderSameName = case fromOrigUnit of
|
|
| 1992 | - Nothing -> False
|
|
| 1993 | - Just _ -> True
|
|
| 1986 | + origUnit = origAvailableUnderSameName >> lookupUnit pkgs (moduleUnit m)
|
|
| 1994 | 1987 | |
| 1995 | 1988 | unit_lookup p = lookupUnit pkgs p `orElse` pprPanic "lookupModuleWithSuggestions" (ppr p <+> ppr name)
|
| 1996 | 1989 | mod_unit = unit_lookup . moduleUnit
|