Skip to content

Commit 740a15c

Browse files
committed
Minor doc improvements
1 parent 5d9b31f commit 740a15c

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/Stack/Types/BuildPlan.hs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ data MiniPackageInfo = MiniPackageInfo
445445
, mpiToolDeps :: !(Set Text)
446446
-- ^ Due to ambiguity in Cabal, it is unclear whether this refers to the
447447
-- executable name, the package name, or something else. We have to guess
448-
-- based on what's available, which is why we store this is an unwrapped
448+
-- based on what's available, which is why we store this in an unwrapped
449449
-- 'Text'.
450450
, mpiExes :: !(Set ExeName)
451451
-- ^ Executables provided by this package
@@ -454,12 +454,15 @@ data MiniPackageInfo = MiniPackageInfo
454454
, mpiGitSHA1 :: !(Maybe GitSHA1)
455455
-- ^ An optional SHA1 representation in hex format of the blob containing
456456
-- the cabal file contents. Useful for grabbing the correct cabal file
457-
-- revision directly from a Git repo
457+
-- revision directly from a Git repo or the 01-index.tar file
458458
}
459459
deriving (Generic, Show, Eq, Data, Typeable)
460460
instance Store MiniPackageInfo
461461
instance NFData MiniPackageInfo
462462

463+
-- | A SHA1 hash, but in Git format. This means that the contents are
464+
-- prefixed with @blob@ and the size of the payload before hashing, as
465+
-- Git itself does.
463466
newtype GitSHA1 = GitSHA1 ByteString
464467
deriving (Generic, Show, Eq, NFData, Store, Data, Typeable, Ord, Hashable)
465468

src/Stack/Types/Resolver.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ data ResolverThat's (l :: IsLoaded) where
6565
-- dependency solver.
6666
ResolverCompiler :: !CompilerVersion -> ResolverThat's l
6767
-- A custom resolver based on the given name and URL. When a URL is
68-
-- provided, it file is to be completely immutable. Filepaths are
68+
-- provided, its contents must be completely immutable. Filepaths are
6969
-- always loaded. This constructor is used before the build-plan has
7070
-- been loaded, as we do not yet know the custom snapshot's hash.
7171
ResolverCustom :: !Text -> !Text -> ResolverThat's 'NotLoaded

0 commit comments

Comments
 (0)