[commit: ghc] wip/nfs-locking: Rename Switches.hs to Predicates.hs. (47764c0)

git at git.haskell.org git at git.haskell.org
Fri Oct 27 00:05:50 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/47764c0eaedab75e54c0209ef117ddb0280d05b2/ghc

>---------------------------------------------------------------

commit 47764c0eaedab75e54c0209ef117ddb0280d05b2
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Aug 21 22:23:05 2015 +0100

    Rename Switches.hs to Predicates.hs.


>---------------------------------------------------------------

47764c0eaedab75e54c0209ef117ddb0280d05b2
 src/{Switches.hs => Predicates.hs} | 2 +-
 src/Rules/Data.hs                  | 2 +-
 src/Rules/Library.hs               | 2 +-
 src/Settings/Builders/Ar.hs        | 2 +-
 src/Settings/Builders/Gcc.hs       | 2 +-
 src/Settings/Builders/Ghc.hs       | 2 +-
 src/Settings/Builders/GhcCabal.hs  | 2 +-
 src/Settings/Builders/GhcPkg.hs    | 2 +-
 src/Settings/Builders/Haddock.hs   | 2 +-
 src/Settings/Builders/Ld.hs        | 2 +-
 src/Settings/Packages.hs           | 2 +-
 src/Settings/User.hs               | 2 +-
 src/Settings/Util.hs               | 2 +-
 src/Settings/Ways.hs               | 2 +-
 14 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/Switches.hs b/src/Predicates.hs
similarity index 98%
rename from src/Switches.hs
rename to src/Predicates.hs
index c30a33f..0dfa8db 100644
--- a/src/Switches.hs
+++ b/src/Predicates.hs
@@ -1,4 +1,4 @@
-module Switches (
+module Predicates (
     stage, package, builder, stagedBuilder, file, way,
     stage0, stage1, stage2, notStage, notStage0,
     registerPackage, splitObjects
diff --git a/src/Rules/Data.hs b/src/Rules/Data.hs
index e64938f..d481a67 100644
--- a/src/Rules/Data.hs
+++ b/src/Rules/Data.hs
@@ -5,8 +5,8 @@ import Util
 import Target (PartialTarget (..), fullTarget)
 import Package
 import Builder
-import Switches (registerPackage)
 import Expression
+import Predicates (registerPackage)
 import Oracles.PackageDeps
 import Settings.Packages
 import Settings.TargetDirectory
diff --git a/src/Rules/Library.hs b/src/Rules/Library.hs
index 4f5e787..4ff15c3 100644
--- a/src/Rules/Library.hs
+++ b/src/Rules/Library.hs
@@ -6,8 +6,8 @@ import Util
 import Target (PartialTarget (..), fullTarget)
 import Builder
 import Package
-import Switches (splitObjects)
 import Expression
+import Predicates (splitObjects)
 import Oracles.PackageData
 import Settings.Util
 import Settings.TargetDirectory
diff --git a/src/Settings/Builders/Ar.hs b/src/Settings/Builders/Ar.hs
index ec8b6ac..4bde3f8 100644
--- a/src/Settings/Builders/Ar.hs
+++ b/src/Settings/Builders/Ar.hs
@@ -1,8 +1,8 @@
 module Settings.Builders.Ar (arArgs, arPersistentArgsCount) where
 
 import Builder
-import Switches (builder)
 import Expression
+import Predicates (builder)
 import Settings.Util
 
 arArgs :: Args
diff --git a/src/Settings/Builders/Gcc.hs b/src/Settings/Builders/Gcc.hs
index 748e544..20867f7 100644
--- a/src/Settings/Builders/Gcc.hs
+++ b/src/Settings/Builders/Gcc.hs
@@ -3,8 +3,8 @@ module Settings.Builders.Gcc (gccArgs, gccMArgs) where
 import Base
 import Util
 import Builder
-import Switches (stagedBuilder)
 import Expression
+import Predicates (stagedBuilder)
 import Oracles.PackageData
 import Settings.Util
 
diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index af20c7a..e48be86 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -4,8 +4,8 @@ import Way
 import Util
 import Stage
 import Builder
-import Switches (stagedBuilder, splitObjects, stage0)
 import Expression
+import Predicates (stagedBuilder, splitObjects, stage0)
 import Oracles.Flag
 import Oracles.PackageData
 import Settings.Util
diff --git a/src/Settings/Builders/GhcCabal.hs b/src/Settings/Builders/GhcCabal.hs
index 623110b..4862e9f 100644
--- a/src/Settings/Builders/GhcCabal.hs
+++ b/src/Settings/Builders/GhcCabal.hs
@@ -9,8 +9,8 @@ import Util
 import Stage
 import Builder
 import Package
-import Switches
 import Expression
+import Predicates
 import Oracles.Flag
 import Oracles.Setting
 import Settings.User
diff --git a/src/Settings/Builders/GhcPkg.hs b/src/Settings/Builders/GhcPkg.hs
index b2bab83..64981c6 100644
--- a/src/Settings/Builders/GhcPkg.hs
+++ b/src/Settings/Builders/GhcPkg.hs
@@ -2,8 +2,8 @@ module Settings.Builders.GhcPkg (ghcPkgArgs) where
 
 import Util
 import Builder
-import Switches
 import Expression
+import Predicates
 import Settings.Util
 import Settings.Builders.GhcCabal
 
diff --git a/src/Settings/Builders/Haddock.hs b/src/Settings/Builders/Haddock.hs
index 94a1669..19c1979 100644
--- a/src/Settings/Builders/Haddock.hs
+++ b/src/Settings/Builders/Haddock.hs
@@ -4,8 +4,8 @@ import Base
 import Util
 import Builder
 import Package
-import Switches (builder, package, stage1)
 import Expression
+import Predicates (builder, package, stage1)
 import Oracles.PackageData
 import Settings.Util
 import Settings.Packages
diff --git a/src/Settings/Builders/Ld.hs b/src/Settings/Builders/Ld.hs
index e21a262..6a17ca7 100644
--- a/src/Settings/Builders/Ld.hs
+++ b/src/Settings/Builders/Ld.hs
@@ -1,8 +1,8 @@
 module Settings.Builders.Ld (ldArgs) where
 
 import Builder
-import Switches (builder)
 import Expression
+import Predicates (builder)
 import Oracles.Setting
 import Settings.Util
 
diff --git a/src/Settings/Packages.hs b/src/Settings/Packages.hs
index 5820e0c..b84bb5b 100644
--- a/src/Settings/Packages.hs
+++ b/src/Settings/Packages.hs
@@ -4,8 +4,8 @@ module Settings.Packages (
     ) where
 
 import Package
-import Switches
 import Expression
+import Predicates
 import Oracles.Setting
 import Settings.User
 import Settings.Default
diff --git a/src/Settings/User.hs b/src/Settings/User.hs
index e67afc3..cdf2840 100644
--- a/src/Settings/User.hs
+++ b/src/Settings/User.hs
@@ -7,8 +7,8 @@ module Settings.User (
 
 import Stage
 import Package
-import Switches
 import Expression
+import Predicates
 import Settings.Default
 
 -- No user-specific settings by default
diff --git a/src/Settings/Util.hs b/src/Settings/Util.hs
index 81b7b69..1ab4308 100644
--- a/src/Settings/Util.hs
+++ b/src/Settings/Util.hs
@@ -13,8 +13,8 @@ import Util
 import Stage
 import Builder
 import Package
-import Switches
 import Expression
+import Predicates
 import Oracles.Flag
 import Oracles.Setting
 import Oracles.PackageData
diff --git a/src/Settings/Ways.hs b/src/Settings/Ways.hs
index d6e541e..183068a 100644
--- a/src/Settings/Ways.hs
+++ b/src/Settings/Ways.hs
@@ -2,8 +2,8 @@ module Settings.Ways (getWays, getRtsWays) where
 
 import Way
 import Stage
-import Switches
 import Expression
+import Predicates
 import Oracles.Flag
 import Settings.User
 



More information about the ghc-commits mailing list