From 6c15c634874b77330ec0eb2836d66ad95762f9d3 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Tue, 2 May 2023 08:48:58 -0500 Subject: [PATCH] format all bzl files consistently with buildifier --- BUCK | 2 +- component-catalog/BUCK | 4 +- prelude-nri/elm.bzl | 47 +++++++++++--------- prelude-nri/elm/toolchain.bzl | 7 ++- prelude-nri/node.bzl | 34 +++++++------- prelude-nri/node/toolchain.bzl | 10 ++--- prelude/cxx/omnibus.bzl | 2 +- prelude/genrule.bzl | 4 +- prelude/rules.bzl | 2 +- prelude/transitions/constraint_overrides.bzl | 2 +- 10 files changed, 62 insertions(+), 52 deletions(-) diff --git a/BUCK b/BUCK index c4ef7316..85a09c17 100644 --- a/BUCK +++ b/BUCK @@ -11,7 +11,7 @@ elm_docs( filegroup( name = "src", srcs = glob(["src/**/*.elm"]), - visibility = ["//component-catalog:app"] + visibility = ["//component-catalog:app"], ) node_modules( diff --git a/component-catalog/BUCK b/component-catalog/BUCK index 53768b71..9d964638 100644 --- a/component-catalog/BUCK +++ b/component-catalog/BUCK @@ -8,7 +8,7 @@ elm_app( source_directories = { "../src": "//:src", "src": "src", - } + }, ) filegroup( @@ -20,5 +20,5 @@ filegroup( "elm.js": ":app", "application.json": "elm.json", "package.json": "//:elm.json", - } + }, ) diff --git a/prelude-nri/elm.bzl b/prelude-nri/elm.bzl index dde549c4..4c17e509 100644 --- a/prelude-nri/elm.bzl +++ b/prelude-nri/elm.bzl @@ -11,12 +11,16 @@ def _elm_docs_impl(ctx: "context") -> [DefaultInfo.type]: ctx.attrs._python_toolchain[PythonToolchainInfo].interpreter, elm_toolchain.isolated_compile[DefaultInfo].default_outputs, ctx.attrs.elm_json, - "--build-dir", build.as_output(), - "--elm-compiler", elm_toolchain.elm, + "--build-dir", + build.as_output(), + "--elm-compiler", + elm_toolchain.elm, "--verbose", "docs", - "--out", docs.as_output(), - "--src", ctx.attrs.src, + "--out", + docs.as_output(), + "--src", + ctx.attrs.src, ) ctx.actions.run( @@ -30,18 +34,18 @@ def _elm_docs_impl(ctx: "context") -> [DefaultInfo.type]: elm_docs = rule( impl = _elm_docs_impl, attrs = { - "out": attrs.string(default="docs.json"), + "out": attrs.string(default = "docs.json"), "elm_json": attrs.source(), "src": attrs.source(allow_directory = True), "_elm_toolchain": attrs.toolchain_dep( - default="toolchains//:elm", - providers=[ElmToolchainInfo] + default = "toolchains//:elm", + providers = [ElmToolchainInfo], ), "_python_toolchain": attrs.toolchain_dep( - default="toolchains//:python", - providers=[PythonToolchainInfo] + default = "toolchains//:python", + providers = [PythonToolchainInfo], ), - } + }, ) def _elm_app_impl(ctx: "context") -> [DefaultInfo.type]: @@ -54,16 +58,19 @@ def _elm_app_impl(ctx: "context") -> [DefaultInfo.type]: ctx.attrs._python_toolchain[PythonToolchainInfo].interpreter, elm_toolchain.isolated_compile[DefaultInfo].default_outputs, ctx.attrs.elm_json, - "--build-dir", build.as_output(), - "--elm-compiler", elm_toolchain.elm, + "--build-dir", + build.as_output(), + "--elm-compiler", + elm_toolchain.elm, "--verbose", "make", ctx.attrs.main, - "--output", out.as_output(), + "--output", + out.as_output(), ) for (name, value) in ctx.attrs.source_directories.items(): - cmd.add(cmd_args(value, format="--source-directory=" + name + "={}")) + cmd.add(cmd_args(value, format = "--source-directory=" + name + "={}")) if ctx.attrs.debug and ctx.attrs.optimize: fail("Only one of `optimize` and `debug` may be true!") @@ -90,17 +97,17 @@ elm_app = rule( "main": attrs.source(), "source_directories": attrs.dict( attrs.string(), - attrs.source(allow_directory=True), + attrs.source(allow_directory = True), ), "debug": attrs.bool(default = False), "optimize": attrs.bool(default = False), "_elm_toolchain": attrs.toolchain_dep( - default="toolchains//:elm", - providers=[ElmToolchainInfo] + default = "toolchains//:elm", + providers = [ElmToolchainInfo], ), "_python_toolchain": attrs.toolchain_dep( - default="toolchains//:python", - providers=[PythonToolchainInfo] + default = "toolchains//:python", + providers = [PythonToolchainInfo], ), - } + }, ) diff --git a/prelude-nri/elm/toolchain.bzl b/prelude-nri/elm/toolchain.bzl index ec2f469d..1ee783b5 100644 --- a/prelude-nri/elm/toolchain.bzl +++ b/prelude-nri/elm/toolchain.bzl @@ -1,4 +1,4 @@ -ElmToolchainInfo = provider(fields=[ +ElmToolchainInfo = provider(fields = [ "elm", "isolated_compile", ]) @@ -16,11 +16,10 @@ def _system_elm_toolchain_impl(ctx) -> [[DefaultInfo.type, ElmToolchainInfo.type ), ] - system_elm_toolchain = rule( impl = _system_elm_toolchain_impl, attrs = { - "_isolated_compile": attrs.dep(default="prelude-nri//elm:isolated_compile.py"), + "_isolated_compile": attrs.dep(default = "prelude-nri//elm:isolated_compile.py"), }, is_toolchain_rule = True, ) @@ -45,7 +44,7 @@ elm_toolchain = rule( providers = [RunInfo], default = "prelude-nri//elm:elm_compiler_binary", ), - "_isolated_compile": attrs.dep(default="prelude-nri//elm:isolated_compile.py"), + "_isolated_compile": attrs.dep(default = "prelude-nri//elm:isolated_compile.py"), }, is_toolchain_rule = True, ) diff --git a/prelude-nri/node.bzl b/prelude-nri/node.bzl index c88c5b28..7280af19 100644 --- a/prelude-nri/node.bzl +++ b/prelude-nri/node.bzl @@ -11,9 +11,12 @@ def _node_modules_impl(ctx: "context") -> [DefaultInfo.type]: ctx.attrs._python_toolchain[PythonToolchainInfo].interpreter, node_toolchain.build_node_modules[DefaultInfo].default_outputs, out.as_output(), - "--package", ctx.attrs.package, - "--package-lock", ctx.attrs.package_lock, - "--bin-dir", node_toolchain.bin_dir[DefaultInfo].default_outputs, + "--package", + ctx.attrs.package, + "--package-lock", + ctx.attrs.package_lock, + "--bin-dir", + node_toolchain.bin_dir[DefaultInfo].default_outputs, ], category = "npm", ) @@ -26,14 +29,14 @@ node_modules = rule( "package": attrs.source(), "package_lock": attrs.source(), "_node_toolchain": attrs.toolchain_dep( - default="toolchains//:node", - providers=[NodeToolchainInfo] + default = "toolchains//:node", + providers = [NodeToolchainInfo], ), "_python_toolchain": attrs.toolchain_dep( - default="toolchains//:python", - providers=[PythonToolchainInfo] + default = "toolchains//:python", + providers = [PythonToolchainInfo], ), - } + }, ) def _npm_bin_impl(ctx: "context") -> [[DefaultInfo.type, RunInfo.type]]: @@ -50,7 +53,8 @@ def _npm_bin_impl(ctx: "context") -> [[DefaultInfo.type, RunInfo.type]]: ctx.attrs.node_modules, bin_name, out.as_output(), - "--bin-dir", node_toolchain.bin_dir[DefaultInfo].default_outputs, + "--bin-dir", + node_toolchain.bin_dir[DefaultInfo].default_outputs, ], category = "build_npm_bin", ) @@ -63,15 +67,15 @@ def _npm_bin_impl(ctx: "context") -> [[DefaultInfo.type, RunInfo.type]]: npm_bin = rule( impl = _npm_bin_impl, attrs = { - "bin_name": attrs.option(attrs.string(), default=None), + "bin_name": attrs.option(attrs.string(), default = None), "node_modules": attrs.source(), "_node_toolchain": attrs.toolchain_dep( - default="toolchains//:node", - providers=[NodeToolchainInfo] + default = "toolchains//:node", + providers = [NodeToolchainInfo], ), "_python_toolchain": attrs.toolchain_dep( - default="toolchains//:python", - providers=[PythonToolchainInfo] + default = "toolchains//:python", + providers = [PythonToolchainInfo], ), - } + }, ) diff --git a/prelude-nri/node/toolchain.bzl b/prelude-nri/node/toolchain.bzl index 21ec518c..eb88e8cd 100644 --- a/prelude-nri/node/toolchain.bzl +++ b/prelude-nri/node/toolchain.bzl @@ -1,4 +1,4 @@ -NodeToolchainInfo = provider(fields=[ +NodeToolchainInfo = provider(fields = [ "bin_dir", "node", "build_node_modules", @@ -24,17 +24,17 @@ node_toolchain = rule( impl = _node_toolchain_impl, attrs = { "bin_dir": attrs.dep( - default="prelude-nri//node:bin" + default = "prelude-nri//node:bin", ), "node": attrs.dep( providers = [RunInfo], - default="prelude-nri//node:node" + default = "prelude-nri//node:node", ), "_build_node_modules": attrs.dep( - default="prelude-nri//node:build_node_modules.py", + default = "prelude-nri//node:build_node_modules.py", ), "_build_npm_bin": attrs.dep( - default="prelude-nri//node:build_npm_bin.py", + default = "prelude-nri//node:build_npm_bin.py", ), }, is_toolchain_rule = True, diff --git a/prelude/cxx/omnibus.bzl b/prelude/cxx/omnibus.bzl index 561f99e5..854c1e53 100644 --- a/prelude/cxx/omnibus.bzl +++ b/prelude/cxx/omnibus.bzl @@ -959,6 +959,6 @@ def omnibus_environment_attr(): }) # In open source, we don't want to use omnibus - default = None # @oss-enable + default = None # @oss-enable return attrs.option(attrs.dep(), default = default) diff --git a/prelude/genrule.bzl b/prelude/genrule.bzl index 07dc6be6..ab7cfb49 100644 --- a/prelude/genrule.bzl +++ b/prelude/genrule.bzl @@ -55,8 +55,8 @@ def _requires_no_srcs_environment(ctx: "context") -> bool.type: return _NO_SRCS_ENVIRONMENT_LABEL in ctx.attrs.labels # We don't want to use cache mode in open source because the config keys that drive it aren't wired up -# @oss-disable: _USE_CACHE_MODE = True -_USE_CACHE_MODE = False # @oss-enable +# @oss-disable: _USE_CACHE_MODE = True +_USE_CACHE_MODE = False # @oss-enable # Extra attributes required by every genrule based on genrule_impl def genrule_attributes() -> {str.type: "attribute"}: diff --git a/prelude/rules.bzl b/prelude/rules.bzl index 1cb0c0eb..cb4dfd69 100644 --- a/prelude/rules.bzl +++ b/prelude/rules.bzl @@ -37,7 +37,7 @@ def _mk_rule(rule_spec: "") -> "rule": # Fat platforms is an idea specific to our toolchains, so doesn't apply to # open source. Ideally this restriction would be done at the toolchain level. - fat_platform_compatible = True # @oss-enable + fat_platform_compatible = True # @oss-enable if not fat_platform_compatible: # copy so we don't try change the passed in object diff --git a/prelude/transitions/constraint_overrides.bzl b/prelude/transitions/constraint_overrides.bzl index f0536f83..6e95a32d 100644 --- a/prelude/transitions/constraint_overrides.bzl +++ b/prelude/transitions/constraint_overrides.bzl @@ -18,7 +18,7 @@ _CONSTRAINTS = [ "ovr_config//third-party/python/constraints:cinder.3.8", ] -_CONSTRAINTS = [] # @oss-enable +_CONSTRAINTS = [] # @oss-enable # Apparently, `==` doesn't do value comparison for `ConstraintValueInfo`, so # impl a hacky eq impl to workaround.