Skip to content

Commit

Permalink
Avoid -Wname-shadowing by importing qualified
Browse files Browse the repository at this point in the history
  • Loading branch information
philderbeast committed Dec 11, 2024
1 parent d23893c commit 4bae177
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions cabal-install/src/Distribution/Client/Errors.hs
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ import qualified Data.ByteString.Base16 as Base16
import qualified Data.ByteString.Char8 as BS8
import Data.List (groupBy)
import Distribution.Client.IndexUtils.Timestamp
import Distribution.Client.Types.Repo
import Distribution.Client.Types.RepoName (RepoName (..))
import qualified Distribution.Client.Types.Repo as Repo
import qualified Distribution.Client.Types.RepoName as RepoName
import Distribution.Compat.Prelude
import Distribution.Deprecated.ParseUtils (PWarning, showPWarning)
import Distribution.Package
Expand Down Expand Up @@ -180,8 +180,8 @@ data CabalInstallException
| FreezeException String
| PkgSpecifierException [String]
| CorruptedIndexCache String
| UnusableIndexState RemoteRepo Timestamp Timestamp
| MissingPackageList RemoteRepo
| UnusableIndexState Repo.RemoteRepo Timestamp Timestamp
| MissingPackageList Repo.RemoteRepo
| CmdPathAcceptsNoTargets
| CmdPathCommandDoesn'tSupportDryRun
deriving (Show, Typeable)
Expand Down Expand Up @@ -839,7 +839,7 @@ exceptionMessageCabalInstall e = case e of
CorruptedIndexCache str -> str
UnusableIndexState repoRemote maxFound requested ->
"Latest known index-state for '"
++ unRepoName (remoteRepoName repoRemote)
++ RepoName.unRepoName (Repo.remoteRepoName repoRemote)
++ "' ("
++ prettyShow maxFound
++ ") is older than the requested index-state ("
Expand All @@ -849,7 +849,7 @@ exceptionMessageCabalInstall e = case e of
++ "."
MissingPackageList repoRemote ->
"The package list for '"
++ unRepoName (remoteRepoName repoRemote)
++ RepoName.unRepoName (Repo.remoteRepoName repoRemote)
++ "' does not exist. Run 'cabal update' to download it."
CmdPathAcceptsNoTargets ->
"The 'path' command accepts no target arguments."
Expand Down

0 comments on commit 4bae177

Please sign in to comment.