Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Migrate rules_rust main repository to defs.bzl and smaller rules #987

Merged
merged 2 commits into from
Oct 23, 2021
Merged

Migrate rules_rust main repository to defs.bzl and smaller rules #987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aa8acf9
Migrate main repository
hlopko Oct 22, 2021
177ca1a
Merge branch 'main' into flip_591_2
hlopko Oct 22, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion proto/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
load("//rust:rust.bzl", "rust_binary")
load("//rust:defs.bzl", "rust_binary")
load(":toolchain.bzl", "rust_proto_toolchain")

package(default_visibility = ["//visibility:public"])
Expand Down
5 changes: 1 addition & 4 deletions test/build_env/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,7 @@ load(
"//cargo:cargo_build_script.bzl",
"cargo_build_script",
)
load(
"//rust:rust.bzl",
"rust_test",
)
load("//rust:defs.bzl", "rust_test")

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion test/cargo_build_script/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
"""Tests for the cargo_build_script rule"""

load("//cargo:cargo_build_script.bzl", "cargo_build_script")
load("//rust:rust.bzl", "rust_test")
load("//rust:defs.bzl", "rust_test")

# Test that tools are built in the exec configuration.
cargo_build_script(
Expand Down
7 changes: 1 addition & 6 deletions test/chained_direct_deps/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,4 @@
load(
"//rust:rust.bzl",
"rust_doc_test",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_doc_test", "rust_library", "rust_test")

rust_library(
name = "mod1",
Expand Down
8 changes: 1 addition & 7 deletions test/clippy/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,4 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
"rust_clippy",
"rust_library",
"rust_test",
)
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_clippy", "rust_library", "rust_test")

package(default_visibility = ["//test:__subpackages__"])

Expand Down
6 changes: 1 addition & 5 deletions test/conflicting_deps/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_library", "rust_test")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 1 addition & 4 deletions test/conflicting_deps/first_crate/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
)
load("//rust:defs.bzl", "rust_library")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 1 addition & 4 deletions test/conflicting_deps/second_crate/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
)
load("//rust:defs.bzl", "rust_library")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 1 addition & 4 deletions test/inline_test_with_deps/dep/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
)
load("//rust:defs.bzl", "rust_library")

package(default_visibility = ["//visibility:public"])

Expand Down
6 changes: 1 addition & 5 deletions test/inline_test_with_deps/test/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_library", "rust_test")

package(default_visibility = ["//visibility:public"])

Expand Down
6 changes: 1 addition & 5 deletions test/inline_test_with_deps/test_with_srcs/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_library", "rust_test")

package(default_visibility = ["//visibility:public"])

Expand Down
7 changes: 1 addition & 6 deletions test/out_dir_in_tests/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,5 @@
load("//cargo:cargo_build_script.bzl", "cargo_build_script")
load("//rust:defs.bzl", "rust_test_suite")
load(
"//rust:rust.bzl",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_library", "rust_test", "rust_test_suite")

cargo_build_script(
name = "build_script",
Expand Down
6 changes: 1 addition & 5 deletions test/renamed_deps/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_library",
"rust_test",
)
load("//rust:defs.bzl", "rust_library", "rust_test")

rust_library(
name = "mod1",
Expand Down
2 changes: 1 addition & 1 deletion test/rust/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
load("//rust:defs.bzl", "rust_binary", "rust_library")

package(default_visibility = ["//visibility:public"])

Expand Down
5 changes: 1 addition & 4 deletions test/rustc_env_files/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,4 @@
load(
"@rules_rust//rust:rust.bzl",
"rust_binary",
)
load("//rust:defs.bzl", "rust_binary")

package(default_visibility = ["//visibility:public"])

Expand Down
6 changes: 1 addition & 5 deletions test/test_env/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_binary",
"rust_test",
)
load("//rust:defs.bzl", "rust_binary", "rust_test")

rust_binary(
name = "hello-world",
Expand Down
6 changes: 1 addition & 5 deletions test/test_env_launcher/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_binary",
"rust_test",
)
load("//rust:defs.bzl", "rust_binary", "rust_test")

rust_binary(
name = "hello-world",
Expand Down
3 changes: 1 addition & 2 deletions test/transitive_lib/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
load("//cargo:cargo_build_script.bzl", "cargo_build_script")
load("//rust:rust.bzl", "rust_binary", "rust_library")
load("//rust:defs.bzl", "rust_binary", "rust_library")

# sets link alias
cargo_build_script(
Expand All @@ -13,7 +13,6 @@ cargo_build_script(
rust_library(
name = "dll_user",
srcs = ["dll_user.rs"],
crate_type = "lib",
edition = "2018",
deps = [
":buildscript",
Expand Down
6 changes: 1 addition & 5 deletions test/versioned_dylib/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,4 @@
load(
"//rust:rust.bzl",
"rust_binary",
"rust_test",
)
load("//rust:defs.bzl", "rust_binary", "rust_test")

package(default_visibility = ["//visibility:public"])

Expand Down
2 changes: 1 addition & 1 deletion util/dir_zipper/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//rust:rust.bzl", "rust_binary")
load("//rust:defs.bzl", "rust_binary")

rust_binary(
name = "dir_zipper",
Expand Down
2 changes: 1 addition & 1 deletion util/label/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//rust:rust.bzl", "rust_library", "rust_test")
load("//rust:defs.bzl", "rust_library", "rust_test")

rust_library(
name = "label",
Expand Down
2 changes: 1 addition & 1 deletion util/launcher/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load("//rust:rust.bzl", "rust_binary")
load("//rust:defs.bzl", "rust_binary")

package(default_visibility = ["//visibility:public"])

Expand Down