diff --git a/AGENTS.md b/AGENTS.md index 60adf3a..7204a85 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -99,8 +99,6 @@ - When creating a pull request from a worktree-specific development branch, create a dedicated pull-request branch separate from the branch that names or anchors the worktree. Do not open pull requests directly from the worktree branch. -- First-party Rust `BUILD` files should load the monorepo Rust wrappers from `//bazel:rust.bzl` - instead of loading Rust build rules from `@rules_rust` directly. - In Bazel `BUILD` files, depend on vendored Rust crates through the public aliases under `//third_party/crates`, for example `//third_party/crates:serde`. - Ariadne extraction must preserve the game-root season prefix for archived source. diff --git a/MODULE.bazel.lock b/MODULE.bazel.lock index 8464920..03e5cdc 100644 --- a/MODULE.bazel.lock +++ b/MODULE.bazel.lock @@ -93,7 +93,7 @@ "moduleExtensions": { "//bazel:rust.bzl%rust": { "general": { - "bzlTransitiveDigest": "TLLdfRWRMJF1vhBgv8dwQ3JyMdQ0kBjLdPu6lvlFalw=", + "bzlTransitiveDigest": "4kUzQyjRjzchWIBZJKkNs8LuO4F+g/DwuwtTa0RTPcU=", "usagesDigest": "jJoM2Hp1NbshT//puE4xIUfXdA0K6BRx1WTlsZIKFm4=", "recordedFileInputs": {}, "recordedDirentsInputs": {}, @@ -105,43 +105,7 @@ "attributes": {} } }, - "recordedRepoMappingEntries": [ - [ - "", - "rules_rust", - "rules_rust~" - ], - [ - "rules_cc~", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_cc~", - "rules_cc", - "rules_cc~" - ], - [ - "rules_rust~", - "bazel_skylib", - "bazel_skylib~" - ], - [ - "rules_rust~", - "bazel_tools", - "bazel_tools" - ], - [ - "rules_rust~", - "rules_cc", - "rules_cc~" - ], - [ - "rules_rust~", - "rules_rust", - "rules_rust~" - ] - ] + "recordedRepoMappingEntries": [] } }, "@@rules_jvm_external~//:extensions.bzl%maven": { diff --git a/bazel/rust.bzl b/bazel/rust.bzl index f891174..dd3afd4 100644 --- a/bazel/rust.bzl +++ b/bazel/rust.bzl @@ -1,52 +1,6 @@ -load( - "@rules_rust//rust:defs.bzl", - _rules_rust_binary = "rust_binary", - _rules_rust_library = "rust_library", - _rules_rust_test = "rust_test", -) load("//bazel:utils.bzl", "execute", "require_env") -def rust_module(name, src, deps = [], **kwargs): - native.filegroup( - name = name, - srcs = [src] + deps, - **kwargs - ) - - -def rust_library(name, src, crate_name = None, modules = [], deps = [], **kwargs): - _rules_rust_library( - name = name, - crate_name = crate_name, - crate_root = src, - srcs = [src] + modules, - deps = deps, - **kwargs - ) - - -def rust_binary(name, src, crate_name = None, deps = [], **kwargs): - _rules_rust_binary( - name = name, - crate_name = crate_name, - crate_root = src, - srcs = [src], - deps = deps, - **kwargs - ) - - -def rust_test(name, src, deps = [], **kwargs): - _rules_rust_test( - name = name, - crate_root = src, - srcs = [src], - deps = deps, - **kwargs - ) - - def _rust_repository_impl(repository_ctx): root = repository_ctx.path(require_env(repository_ctx, "RUST_TOOLCHAIN_ROOT")) rustc = root.get_child("bin/rustc") diff --git a/src/ariadne/BUILD b/src/ariadne/BUILD index ebb8aee..8c9b835 100644 --- a/src/ariadne/BUILD +++ b/src/ariadne/BUILD @@ -1,21 +1,13 @@ -load("//bazel:rust.bzl", "rust_binary", "rust_library", "rust_module", "rust_test") - -rust_module( - name = "graph", - src = "src/graph.rs", -) - -rust_module( - name = "artifact", - src = "src/artifact.rs", - deps = [":graph"], -) +load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test") rust_library( name = "ariadne_lib", crate_name = "ariadne", - src = "src/lib.rs", - modules = [":artifact"], + srcs = [ + "src/artifact.rs", + "src/graph.rs", + "src/lib.rs", + ], deps = [ "//third_party/crates:serde", "//third_party/crates:serde_json", @@ -24,7 +16,7 @@ rust_library( rust_test( name = "ariadne_lib_test", - src = "src/lib_test.rs", + srcs = ["src/lib_test.rs"], deps = [ ":ariadne_lib", "//third_party/crates:serde_json", @@ -34,7 +26,7 @@ rust_test( rust_binary( name = "ariadne", crate_name = "ariadne_cli", - src = "src/main.rs", + srcs = ["src/main.rs"], deps = [":ariadne_lib"], )