diff options
| author | Alec Theriault <alec.theriault@gmail.com> | 2018-10-26 14:22:23 -0700 |
|---|---|---|
| committer | Alec Theriault <alec.theriault@gmail.com> | 2018-10-26 14:22:23 -0700 |
| commit | 2b94a90a23f03a749e3703af330d9585a5de0bae (patch) | |
| tree | a9c2debf02b417f4106e0b55cf0bfb918b3c8dbc /haddock-api/src/Haddock/Options.hs | |
| parent | cd520e9907b9a56cae5a2e51413eef1522a37bbb (diff) | |
Avoid some partiality
AFAICT this wasn't causing any crashes, but that's mostly because
we happen not to be forcing `pkgStr` when it would diverge. We come
dangerously close to doing that in `ppHtmlIndex`.
Fixes #569.
Diffstat (limited to 'haddock-api/src/Haddock/Options.hs')
| -rw-r--r-- | haddock-api/src/Haddock/Options.hs | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/haddock-api/src/Haddock/Options.hs b/haddock-api/src/Haddock/Options.hs index b5e987d8..bdc98406 100644 --- a/haddock-api/src/Haddock/Options.hs +++ b/haddock-api/src/Haddock/Options.hs @@ -371,9 +371,10 @@ modulePackageInfo :: DynFlags -> [Flag] -- ^ Haddock flags are checked as they may contain -- the package name or version provided by the user -- which we prioritise - -> Module + -> Maybe Module -> (Maybe PackageName, Maybe Data.Version.Version) -modulePackageInfo dflags flags modu = +modulePackageInfo _dflags _flags Nothing = (Nothing, Nothing) +modulePackageInfo dflags flags (Just modu) = ( optPackageName flags <|> fmap packageName pkgDb , optPackageVersion flags <|> fmap packageVersion pkgDb ) |