Auto-fix warnings

Author: avdv

haskell/experimental/private/module.bzl

@@ -319,11 +319,11 @@ def _build_haskell_module(
 
     outputs = [module_outputs.hi, module_outputs.abi]
     if module_outputs.o:
-        outputs += [module_outputs.o]
+        outputs.append(module_outputs.o)
     if with_shared:
-        outputs += [module_outputs.dyn_hi]
+        outputs.append(module_outputs.dyn_hi)
         if module_outputs.dyn_o:
-            outputs += [module_outputs.dyn_o]
+            outputs.append(module_outputs.dyn_o)
 
     input_files = [src] + extra_srcs + [optp_args_file]
     if enable_th and extra_ldflags_file:

haskell/private/actions/compile.bzl

@@ -194,7 +194,7 @@ def _compilation_defaults(
     optp_args.add_all(cc.cpp_flags)
     optp_args.set_param_file_format("multiline")
     hs.actions.write(optp_args_file, optp_args)
-    compile_flags += ["-optP@" + optp_args_file.path]
+    compile_flags.append("-optP@" + optp_args_file.path)
 
     compile_flags += cc.include_args
 

haskell/private/actions/runghc.bzl

@@ -53,7 +53,7 @@ def build_haskell_runghc(
 
     if lib_info != None:
         for idir in sets.to_list(hs_info.import_dirs):
-            args += ["-i{0}".format(idir)]
+            args.append("-i{0}".format(idir))
 
     link_libraries(
         get_ghci_library_files(hs, cc.cc_libraries_info, cc.cc_libraries),

haskell/private/cc_wrapper.bzl

@@ -125,7 +125,7 @@ def cc_wrapper(name, **kwargs):
     # See https://github.com/bazelbuild/bazel/issues/8981
     # In principle the python cc_wrapper would be sufficient for all platforms,
     # however, execution is too slow on Windows to be practical.
-    native.sh_binary(
+    sh_binary(
         name = name + "-bash",
         srcs = [name + ".sh"],
         deps = [

haskell/repl.bzl

@@ -258,11 +258,11 @@ def _create_HaskellReplCollectInfo(target, dep_labels, dep_package_ids, dep_pack
         java_deps_list = []
 
         if hasattr(ctx.rule.attr, "deps"):
-            java_deps_list += [java_interop_info(ctx.rule.attr.deps).inputs]
+            java_deps_list.append(java_interop_info(ctx.rule.attr.deps).inputs)
 
         # TODO[GL]: add tests for the java deps in narrowed_deps
         if hasattr(ctx.rule.attr, "narrowed_deps"):
-            java_deps_list += [java_interop_info(ctx.rule.attr.narrowed_deps).inputs]
+            java_deps_list.append(java_interop_info(ctx.rule.attr.narrowed_deps).inputs)
 
         java_deps = depset(transitive = java_deps_list)
 
@@ -1227,8 +1227,7 @@ information.
         multi = multi,
         **kwargs
     )
-
-    native.sh_binary(
+    sh_binary(
         name = hie_bios_runnable_target_name,
         srcs = [
             hie_bios_script_name,

haskell/toolchain.bzl

@@ -77,7 +77,7 @@ def _run_ghc(
         tools = [hs.worker]
     else:
         args.add(hs.tools.ghc)
-        extra_inputs += [hs.tools.ghc]
+        extra_inputs.append(hs.tools.ghc)
 
     # XXX: We should also tether Bazel's CC toolchain to GHC's, so that we can properly mix Bazel-compiled
     # C libraries with Haskell targets.
@@ -117,7 +117,7 @@ def _run_ghc(
         unused_inputs_list = hs.actions.declare_file("unused_%s_%s" % (hs.name, extra_name))
 
         extra_inputs += [show_iface_file, interface_with_abis_list]
-        outputs += [unused_inputs_list]
+        outputs.append(unused_inputs_list)
         env.update({"MUST_EXTRACT_ABI": "true"})
 
         new_args = [show_iface_file.path, abi_file.path, interface_with_abis_list.path, unused_inputs_list.path]

rules_haskell_tests/WORKSPACE

@@ -138,7 +138,7 @@ load(
 haskell_register_ghc_bindists(
     cabalopts = test_cabalopts,
     dist = {
-      "linux_amd64": "deb10",
+        "linux_amd64": "deb10",
     },
     ghcopts = test_ghcopts,
     version = GHC_VERSION,

rules_haskell_tests/tests/multi_repl/BUILD.bazel

@@ -22,8 +22,8 @@ haskell_repl(
 
 haskell_repl(
     name = "d_unit_repl",
-    deps = ["//tests/multi_repl/bc:d"],
     multi = True,
+    deps = ["//tests/multi_repl/bc:d"],
 )
 
 filegroup(

rules_haskell_tests/tests/multi_repl/a/BUILD.bazel

@@ -7,15 +7,15 @@ package(default_visibility = ["//visibility:public"])
 
 haskell_library(
     name = "a",
+    package_name = "a",
     srcs = [
         "src/A/A.hs",
     ],
     src_strip_prefix = "src",
+    version = "0.0.0",
     deps = [
         "//tests/hackage:base",
     ],
-    package_name = "a",
-    version = "0.0.0",
 )
 
 filegroup(

rules_haskell_tests/tests/multi_repl/bc/BUILD.bazel

@@ -7,44 +7,44 @@ package(default_visibility = ["//visibility:public"])
 
 haskell_library(
     name = "b",
+    package_name = "b",
     srcs = [
         "src-b/BC/B.hs",
     ],
     src_strip_prefix = "src-b",
+    version = "0.0.0",
     deps = [
         "//tests/hackage:base",
         "//tests/multi_repl/a",
     ],
-    package_name = "b",
-    version = "0.0.0",
 )
 
 haskell_library(
     name = "c",
+    package_name = "c",
     srcs = [
         "src-c/BC/C.hs",
     ],
     src_strip_prefix = "src-c",
+    version = "0.0.0",
     deps = [
         ":b",
         "//tests/hackage:base",
     ],
-    package_name = "c",
-    version = "0.0.0",
 )
 
 haskell_library(
     name = "d",
+    package_name = "d",
     srcs = [
         "src-d/BC/D.hs",
     ],
     src_strip_prefix = "src-d",
+    version = "0.0.0",
     deps = [
         ":c",
         "//tests/hackage:base",
     ],
-    package_name = "d",
-    version = "0.0.0",
 )
 
 filegroup(