From 95063ea919b0422bb2f929f1947685d87e8ffbdc Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 19 Sep 2025 00:55:14 +0000 Subject: [PATCH 1/2] Fix buildifier issues --- mojo/private/mojo_binary_test.bzl | 2 ++ mojo/private/utils.bzl | 2 +- mojo/toolchain.bzl | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/mojo/private/mojo_binary_test.bzl b/mojo/private/mojo_binary_test.bzl index e3b6a0c..9f86ed6 100644 --- a/mojo/private/mojo_binary_test.bzl +++ b/mojo/private/mojo_binary_test.bzl @@ -4,6 +4,8 @@ load("@bazel_skylib//lib:paths.bzl", "paths") load("@bazel_skylib//rules:common_settings.bzl", "BuildSettingInfo") load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain", "use_cpp_toolchain") load("@build_bazel_rules_android//:link_hack.bzl", "link_hack") # See link_hack.bzl for details +load("@rules_cc//cc/common:cc_common.bzl", "cc_common") +load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("@rules_python//python:py_info.bzl", "PyInfo") load("//mojo:providers.bzl", "MojoInfo") load(":transitions.bzl", "python_version_transition") diff --git a/mojo/private/utils.bzl b/mojo/private/utils.bzl index 4bbfcaf..1c5de78 100644 --- a/mojo/private/utils.bzl +++ b/mojo/private/utils.bzl @@ -1,6 +1,6 @@ """Helpers internal to rules_mojo.""" -load("//mojo:providers.bzl", "MojoInfo", "MojoToolchainInfo") +load("//mojo:providers.bzl", "MojoInfo") MOJO_EXTENSIONS = ("mojo", "🔥") diff --git a/mojo/toolchain.bzl b/mojo/toolchain.bzl index 0884b69..2214cb7 100644 --- a/mojo/toolchain.bzl +++ b/mojo/toolchain.bzl @@ -1,5 +1,6 @@ """The Mojo compiler toolchain.""" +load("@rules_cc//cc/common:cc_info.bzl", "CcInfo") load("//mojo:providers.bzl", "MojoInfo", "MojoToolchainInfo") def _mojo_toolchain_impl(ctx): From 3a81eeee3dc4abaa4f5a1bd1e88a5e6914f7e668 Mon Sep 17 00:00:00 2001 From: Keith Smiley Date: Fri, 19 Sep 2025 00:56:15 +0000 Subject: [PATCH 2/2] another --- mojo/private/utils.bzl | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/mojo/private/utils.bzl b/mojo/private/utils.bzl index 1c5de78..84d1ae5 100644 --- a/mojo/private/utils.bzl +++ b/mojo/private/utils.bzl @@ -5,6 +5,14 @@ load("//mojo:providers.bzl", "MojoInfo") MOJO_EXTENSIONS = ("mojo", "🔥") def collect_mojoinfo(deps): + """Get a combined MojoInfo from all the passed dependencies. + + Args: + deps: A list of dependencies to collect MojoInfo from. + + Returns: + A single MojoInfo object with the combined data. + """ import_paths = [] mojopkgs = [] for dep in deps: