Remove HaskellBinaryInfo

It has no fields by now, so conveys no useful information.
tweag · Apr 27, 2019 · 6a34786 · 6a34786
1 parent e0b4556
commit 6a34786
Show file tree

Hide file tree

Showing 9 changed files with 12 additions and 57 deletions.
diff --git a/haskell/cc.bzl b/haskell/cc.bzl
@@ -14,7 +14,6 @@ load("@bazel_skylib//lib:paths.bzl", "paths")
 load(":private/set.bzl", "set")
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
-    "HaskellBinaryInfo",
     "HaskellInfo",
 )
 
@@ -287,12 +286,6 @@ def _cc_haskell_import(ctx):
     else:
         fail("{0} has to provide `HaskellInfo`".format(ctx.attr.dep.label.name))
 
-    if HaskellBinaryInfo in ctx.attr.dep:
-        bin = ctx.attr.dep[HaskellBinaryInfo].binary
-        dyn_lib = ctx.actions.declare_file("lib{0}.so".format(bin.basename))
-        ln(ctx, bin, dyn_lib)
-        set.mutable_insert(dyn_libs, dyn_lib)
-
     return [
         DefaultInfo(
             files = set.to_depset(dyn_libs),
@@ -312,8 +305,8 @@ cc_haskell_import = rule(
     attrs = {
         "dep": attr.label(
             doc = """
-Target providing a `HaskellLibraryInfo` or `HaskellBinaryInfo`, such as
-`haskell_library` or `haskell_binary`.
+Target providing a `HaskellLiInfo` such as `haskell_library` or
+`haskell_binary`.
 """,
         ),
     },

diff --git a/haskell/doctest.bzl b/haskell/doctest.bzl
@@ -11,7 +11,6 @@ load(":providers.bzl", "get_libs_for_ghc_linker")
 load(":private/set.bzl", "set")
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
-    "HaskellBinaryInfo",
     "HaskellInfo",
     "HaskellLibraryInfo",
 )
@@ -89,7 +88,6 @@ def _haskell_doctest_single(target, ctx):
     hs_info = target[HaskellInfo]
     cc_info = target[CcInfo]
     lib_info = target[HaskellLibraryInfo] if HaskellLibraryInfo in target else None
-    bin_info = target[HaskellBinaryInfo] if HaskellBinaryInfo in target else None
 
     args = ctx.actions.args()
     args.add("--no-magic")

diff --git a/haskell/lint.bzl b/haskell/lint.bzl
@@ -2,7 +2,6 @@
 
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
-    "HaskellBinaryInfo",
     "HaskellInfo",
     "HaskellLibraryInfo",
     "HaskellLintInfo",
@@ -36,7 +35,6 @@ def _haskell_lint_aspect_impl(target, ctx):
 
     hs_info = target[HaskellInfo]
     lib_info = target[HaskellLibraryInfo] if HaskellLibraryInfo in target else None
-    bin_info = target[HaskellBinaryInfo] if HaskellBinaryInfo in target else None
 
     args = ctx.actions.args()
 

diff --git a/haskell/private/actions/repl.bzl b/haskell/private/actions/repl.bzl
@@ -28,8 +28,7 @@ def build_haskell_repl(
         output,
         package_databases,
         version,
-        lib_info = None,
-        bin_info = None):
+        lib_info = None):
     """Build REPL script.
 
     Args:
@@ -40,8 +39,6 @@ def build_haskell_repl(
                       we're creating a REPL for.
       lib_info: If we're building REPL for a library target, pass
                 HaskellLibraryInfo here, otherwise it should be None.
-      bin_info: If we're building REPL for a binary target, pass
-                HaskellBinaryInfo here, otherwise it should be None.
 
     Returns:
       None.

diff --git a/haskell/private/actions/runghc.bzl b/haskell/private/actions/runghc.bzl
@@ -26,8 +26,7 @@ def build_haskell_runghc(
         output,
         package_databases,
         version,
-        lib_info = None,
-        bin_info = None):
+        lib_info = None):
     """Build runghc script.
 
     Args:
@@ -38,8 +37,6 @@ def build_haskell_runghc(
                       we're creating a runghc for.
       lib_info: If we're building runghc for a library target, pass
                 HaskellLibraryInfo here, otherwise it should be None.
-      bin_info: If we're building runghc for a binary target, pass
-                HaskellBinaryInfo here, otherwise it should be None.
 
     Returns:
       None.

diff --git a/haskell/private/dependencies.bzl b/haskell/private/dependencies.bzl
@@ -2,7 +2,6 @@ load("@bazel_skylib//lib:dicts.bzl", "dicts")
 load("@bazel_skylib//lib:paths.bzl", "paths")
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
-    "HaskellBinaryInfo",
     "HaskellCcInfo",
     "HaskellInfo",
     "HaskellLibraryInfo",
@@ -162,7 +161,7 @@ def gather_dep_info(ctx, deps):
         if HaskellInfo in dep:
             binfo = dep[HaskellInfo]
             package_ids = acc.package_ids
-            if HaskellBinaryInfo in dep:
+            if HaskellLibraryInfo not in dep:
                 fail("Target {0} cannot depend on binary".format(ctx.attr.name))
             if HaskellLibraryInfo in dep:
                 set.mutable_insert(package_ids, dep[HaskellLibraryInfo].package_id)

diff --git a/haskell/private/haskell_impl.bzl b/haskell/private/haskell_impl.bzl
@@ -3,7 +3,6 @@
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
     "C2hsLibraryInfo",
-    "HaskellBinaryInfo",
     "HaskellInfo",
     "HaskellLibraryInfo",
     "HaskellPrebuiltPackageInfo",
@@ -170,8 +169,6 @@ def _haskell_binary_common_impl(ctx, is_test):
         cc_dependencies = dep_info.cc_dependencies,
         transitive_cc_dependencies = dep_info.transitive_cc_dependencies,
     )
-    bin_info = HaskellBinaryInfo(
-    )
     cc_info = cc_common.merge_cc_infos(
         cc_infos = [dep[CcInfo] for dep in ctx.attr.deps if CcInfo in dep],
     )
@@ -188,7 +185,6 @@ def _haskell_binary_common_impl(ctx, is_test):
         package_databases = dep_info.package_databases,
         version = ctx.attr.version,
         hs_info = hs_info,
-        bin_info = bin_info,
     )
 
     # XXX Temporary backwards compatibility hack. Remove eventually.
@@ -204,7 +200,6 @@ def _haskell_binary_common_impl(ctx, is_test):
         package_databases = dep_info.package_databases,
         version = ctx.attr.version,
         hs_info = hs_info,
-        bin_info = bin_info,
     )
 
     executable = binary
@@ -260,7 +255,6 @@ def _haskell_binary_common_impl(ctx, is_test):
 
     return [
         hs_info,
-        bin_info,
         cc_info,
         DefaultInfo(
             executable = executable,

diff --git a/haskell/providers.bzl b/haskell/providers.bzl
@@ -174,10 +174,6 @@ HaskellLibraryInfo = provider(
     },
 )
 
-HaskellBinaryInfo = provider(
-    doc = "Binary-specific information.",
-)
-
 HaskellCoverageInfo = provider(
     doc = "Information about coverage instrumentation for Haskell files.",
     fields = {

diff --git a/haskell/repl.bzl b/haskell/repl.bzl
@@ -12,7 +12,6 @@ load(
 )
 load(
     "@io_tweag_rules_haskell//haskell:providers.bzl",
-    "HaskellBinaryInfo",
     "HaskellInfo",
     "HaskellLibraryInfo",
     "empty_HaskellCcInfo",
@@ -116,28 +115,18 @@ def _create_HaskellReplCollectInfo(target, ctx):
     prebuilt_dependencies = hs_info.prebuilt_dependencies
     transitive_cc_dependencies = hs_info.transitive_cc_dependencies
 
+    load_infos[target.label] = HaskellReplLoadInfo(
+        source_files = hs_info.source_files,
+        cc_dependencies = hs_info.cc_dependencies,
+        compiler_flags = getattr(ctx.rule.attr, "compiler_flags", []),
+        repl_ghci_args = getattr(ctx.rule.attr, "repl_ghci_args", []),
+    )
     if HaskellLibraryInfo in target:
         lib_info = target[HaskellLibraryInfo]
-        load_infos[target.label] = HaskellReplLoadInfo(
-            source_files = hs_info.source_files,
-            cc_dependencies = hs_info.cc_dependencies,
-            compiler_flags = getattr(ctx.rule.attr, "compiler_flags", []),
-            repl_ghci_args = getattr(ctx.rule.attr, "repl_ghci_args", []),
-        )
         dep_infos[target.label] = HaskellReplDepInfo(
             package_ids = set.singleton(lib_info.package_id),
             package_databases = hs_info.package_databases,
         )
-    elif HaskellBinaryInfo in target:
-        bin_info = target[HaskellBinaryInfo]
-        load_infos[target.label] = HaskellReplLoadInfo(
-            source_files = hs_info.source_files,
-            cc_dependencies = hs_info.cc_dependencies,
-            compiler_flags = ctx.rule.attr.compiler_flags,
-            repl_ghci_args = ctx.rule.attr.repl_ghci_args,
-        )
-    else:
-        fail("Missing HaskellLibraryInfo or HaskellBinaryInfo.")
 
     return HaskellReplCollectInfo(
         load_infos = load_infos,
@@ -338,13 +327,7 @@ def _create_repl(hs, ctx, repl_info, output):
     )]
 
 def _haskell_repl_aspect_impl(target, ctx):
-    is_eligible = (
-        HaskellInfo in target and (
-            HaskellLibraryInfo in target or
-            HaskellBinaryInfo in target
-        )
-    )
-    if not is_eligible:
+    if not HaskellInfo in target:
         return []
 
     target_info = _create_HaskellReplCollectInfo(target, ctx)