Hassan Al-Awwadi pushed to branch wip/haanss/depdir at Glasgow Haskell Compiler / GHC Commits: d4ae1992 by Hassan Al-Awwadi at 2025-07-07T17:52:23+02:00 Fix test for addDependentDirectory, hopefully. The rest of the changes are just reversions of accidental additions and spelling/grammer changes. - - - - - 7 changed files: - compiler/GHC/HsToCore/Usage.hs - compiler/GHC/Unit/Finder.hs - compiler/GHC/Utils/Fingerprint.hs - libraries/base/src/GHC/Fingerprint.hs - libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs - libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs - testsuite/tests/th/Makefile Changes: ===================================== compiler/GHC/HsToCore/Usage.hs ===================================== @@ -2,7 +2,7 @@ module GHC.HsToCore.Usage ( -- * Dependency/fingerprinting code (used by GHC.Iface.Make) mkUsageInfo, mkUsedNames, - UsageConfig(..) + UsageConfig(..), ) where import GHC.Prelude ===================================== compiler/GHC/Unit/Finder.hs ===================================== @@ -32,7 +32,7 @@ module GHC.Unit.Finder ( findObjectLinkableMaybe, findObjectLinkable, - -- important that GHC.HsToCore.Usage uses the same hashing method for usage dirs as is done here. + -- important that GHC.HsToCore.Usage uses the same hashing method for usage dirs as is used here. getDirHash, ) where ===================================== compiler/GHC/Utils/Fingerprint.hs ===================================== @@ -20,7 +20,7 @@ module GHC.Utils.Fingerprint ( fingerprintData, fingerprintString, fingerprintStrings, - getFileHash, + getFileHash ) where import GHC.Prelude.Basic ===================================== libraries/base/src/GHC/Fingerprint.hs ===================================== @@ -5,7 +5,7 @@ module GHC.Fingerprint ( fingerprintData, fingerprintString, fingerprintFingerprints, - getFileHash, + getFileHash ) where import GHC.Internal.Fingerprint ===================================== libraries/ghc-internal/src/GHC/Internal/Fingerprint.hs ===================================== @@ -16,7 +16,7 @@ module GHC.Internal.Fingerprint ( fingerprintData, fingerprintString, fingerprintFingerprints, - getFileHash, + getFileHash ) where import GHC.Internal.IO ===================================== libraries/ghc-internal/src/GHC/Internal/TH/Syntax.hs ===================================== @@ -830,7 +830,7 @@ getPackageRoot = Q qGetPackageRoot -- The compiler can then recognize that it should re-compile the Haskell file -- when a directory changes. -- --- Expects an absolute file path. +-- Expects an absolute directory path. -- -- Notes: -- ===================================== testsuite/tests/th/Makefile ===================================== @@ -45,12 +45,12 @@ TH_Depends: .PHONY: TH_Depends_Dir TH_Depends_Dir: - $(RM) TH_Depends_external/dummy.txt + rm -rf TH_Depends_external $(RM) TH_Depends TH_Depends.exe $(RM) TH_Depends.o TH_Depends.hi $(RM) TH_Depends_External.o TH_Depends_External.hi - - mk_DIR TH_Depends_external + + mkdir TH_Depends_external '$(TEST_HC)' $(TEST_HC_OPTS) $(ghcThWayFlags) --make -v0 TH_Depends_Dir ./TH_Depends_Dir sleep 2 View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4ae1992198aea378e5c0fefae1b66f9... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/d4ae1992198aea378e5c0fefae1b66f9... You're receiving this email because of your account on gitlab.haskell.org.