From 7344a616a8e2bac2d6e63ab90abb389f92d3e05c Mon Sep 17 00:00:00 2001 From: Keagan McClelland Date: Fri, 3 Dec 2021 10:29:45 -0700 Subject: [PATCH] Condense Imports --- src/Database/Marketplace.hs | 7 +------ src/Lib/PkgRepository.hs | 6 +----- src/Util/Shared.hs | 15 ++------------- 3 files changed, 4 insertions(+), 24 deletions(-) diff --git a/src/Database/Marketplace.hs b/src/Database/Marketplace.hs index 6ca1ce1..8eaa221 100644 --- a/src/Database/Marketplace.hs +++ b/src/Database/Marketplace.hs @@ -39,12 +39,7 @@ import Database.Persist.Postgresql , selectSource , (||.) ) -import Handler.Types.Marketplace ( PackageDependencyMetadata - ( PackageDependencyMetadata - , packageDependencyMetadataDepPkgRecord - , packageDependencyMetadataDepVersions - , packageDependencyMetadataPkgDependencyRecord - ) +import Handler.Types.Marketplace ( PackageDependencyMetadata(..) ) import Lib.Types.AppIndex ( PkgId ) import Lib.Types.Category diff --git a/src/Lib/PkgRepository.hs b/src/Lib/PkgRepository.hs index 6a59812..0463542 100644 --- a/src/Lib/PkgRepository.hs +++ b/src/Lib/PkgRepository.hs @@ -43,11 +43,7 @@ import Database.Esqueleto.Experimental ) import Lib.Error ( S9Error(NotFoundE) ) import qualified Lib.External.AppMgr as AppMgr -import Lib.Types.AppIndex ( PackageManifest - ( packageManifestIcon - , packageManifestId - , packageManifestVersion - ) +import Lib.Types.AppIndex ( PackageManifest(..) , PkgId(..) , packageDependencyVersion , packageManifestDependencies diff --git a/src/Util/Shared.hs b/src/Util/Shared.hs index 5faf3ba..88f30d9 100644 --- a/src/Util/Shared.hs +++ b/src/Util/Shared.hs @@ -31,19 +31,8 @@ import Database.Esqueleto.Experimental ) import Foundation import GHC.List ( lookup ) -import Handler.Types.Marketplace ( PackageDependencyMetadata - ( PackageDependencyMetadata - , packageDependencyMetadataDepPkgRecord - , packageDependencyMetadataDepVersions - , packageDependencyMetadataPkgDependencyRecord - ) - , PackageMetadata - ( PackageMetadata - , packageMetadataPkgCategories - , packageMetadataPkgRecord - , packageMetadataPkgVersion - , packageMetadataPkgVersionRecords - ) +import Handler.Types.Marketplace ( PackageDependencyMetadata(..) + , PackageMetadata(..) ) import Lib.PkgRepository ( PkgRepo , getHash