Merge pull request #9044 from andreabedini/remove-sandbox-index

Remove SandboxIndex

cabal-install/src/Distribution/Client/IndexUtils.hs

@@ -142,7 +142,6 @@ import Distribution.Utils.Structured (Structured (..), nominalStructure, structu
 import System.Directory (doesDirectoryExist, doesFileExist)
 import System.FilePath
   ( normalise
-  , replaceExtension
   , splitDirectories
   , takeDirectory
   , takeExtension
@@ -637,20 +636,18 @@ extractPkg verbosity entry blockNo = case Tar.entryContent entry of
         Just $ do
           let path = byteStringToFilePath content
           dirExists <- doesDirectoryExist path
-          result <-
-            if not dirExists
-              then return Nothing
-              else do
-                cabalFile <- tryFindAddSourcePackageDesc verbosity path "Error reading package index."
-                descr <- PackageDesc.Parse.readGenericPackageDescription normal cabalFile
-                return . Just $
-                  BuildTreeRef
-                    (refTypeFromTypeCode typeCode)
-                    (packageId descr)
-                    descr
-                    path
-                    blockNo
-          return result
+          if not dirExists
+            then return Nothing
+            else do
+              cabalFile <- tryFindAddSourcePackageDesc verbosity path "Error reading package index."
+              descr <- PackageDesc.Parse.readGenericPackageDescription normal cabalFile
+              return . Just $
+                BuildTreeRef
+                  (refTypeFromTypeCode typeCode)
+                  (packageId descr)
+                  descr
+                  path
+                  blockNo
   _ -> Nothing
   where
     fileName = Tar.entryPath entry
@@ -758,29 +755,22 @@ lazyUnfold step = goLazy . Just
 data Index
   = -- | The main index for the specified repository
     RepoIndex RepoContext Repo
-  | -- | A sandbox-local repository
-    -- Argument is the location of the index file
-    SandboxIndex FilePath
 
 indexFile :: Index -> FilePath
 indexFile (RepoIndex _ctxt repo) = indexBaseName repo <.> "tar"
-indexFile (SandboxIndex index) = index
 
 cacheFile :: Index -> FilePath
 cacheFile (RepoIndex _ctxt repo) = indexBaseName repo <.> "cache"
-cacheFile (SandboxIndex index) = index `replaceExtension` "cache"
 
 timestampFile :: Index -> FilePath
 timestampFile (RepoIndex _ctxt repo) = indexBaseName repo <.> "timestamp"
-timestampFile (SandboxIndex index) = index `replaceExtension` "timestamp"
 
 -- | Return 'True' if 'Index' uses 01-index format (aka secure repo)
 is01Index :: Index -> Bool
 is01Index (RepoIndex _ repo) = case repo of
   RepoSecure{} -> True
   RepoRemote{} -> False
   RepoLocalNoIndex{} -> True
-is01Index (SandboxIndex _) = False
 
 updatePackageIndexCacheFile :: Verbosity -> Index -> IO ()
 updatePackageIndexCacheFile verbosity index = do
@@ -940,7 +930,7 @@ withIndexEntries verbosity (RepoIndex _repoCtxt (RepoLocalNoIndex (LocalRepo nam
       | filename == Tar.entryPath entry
       , Tar.NormalFile contents _ <- Tar.entryContent entry =
           let bs = BS.toStrict contents
-           in fmap (\gpd -> CacheGPD gpd bs) $ parseGenericPackageDescriptionMaybe bs
+           in ((`CacheGPD` bs) <$> parseGenericPackageDescriptionMaybe bs)
       where
         filename = prettyShow pkgId FilePath.Posix.</> prettyShow (packageName pkgId) ++ ".cabal"
     readCabalEntry _ _ x = x
@@ -1043,7 +1033,7 @@ packageListFromCache verbosity mkPkg hnd Cache{..} = accum mempty [] mempty cach
       -- We have to read the .cabal file eagerly here because we can't cache the
       -- package id for build tree references - the user might edit the .cabal
       -- file after the reference was added to the index.
-      path <- liftM byteStringToFilePath . getEntryContent $ blockno
+      path <- fmap byteStringToFilePath . getEntryContent $ blockno
       pkg <- do
         let err = "Error reading package index from cache."
         file <- tryFindAddSourcePackageDesc verbosity path err
@@ -1150,8 +1140,7 @@ readIndexCache' :: Index -> IO (Either String Cache)
 readIndexCache' index
   | is01Index index = structuredDecodeFileOrFail (cacheFile index)
   | otherwise =
-      liftM (Right . read00IndexCache) $
-        BSS.readFile (cacheFile index)
+      Right . read00IndexCache <$> BSS.readFile (cacheFile index)
 
 readNoIndexCache' :: Index -> IO (Either String NoIndexCache)
 readNoIndexCache' index = structuredDecodeFileOrFail (cacheFile index)
@@ -1307,8 +1296,7 @@ instance Binary NoIndexCacheEntry where
           Just gpd -> return (CacheGPD gpd bs)
           Nothing -> fail "Failed to parse GPD"
       1 -> do
-        dep <- get
-        pure $ NoIndexCachePreference dep
+        NoIndexCachePreference <$> get
       _ -> fail "Failed to parse NoIndexCacheEntry"
 
 instance Structured NoIndexCacheEntry where