Migrate rules_rust examples to defs.bzl and smaller rules (#986)

bazelbuild · Oct 23, 2021 · d974e0e · d974e0e
1 parent 3fff8df
commit d974e0e
Show file tree

Hide file tree

Showing 52 changed files with 112 additions and 161 deletions.
diff --git a/examples/bindgen/BUILD.bazel b/examples/bindgen/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@rules_cc//cc:defs.bzl", "cc_library")
 load("@rules_rust//bindgen:bindgen.bzl", "rust_bindgen_library")
-load("@rules_rust//rust:rust.bzl", "rust_binary", "rust_test")
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_test")
 
 cc_library(
     name = "simple",

diff --git a/examples/cargo/BUILD.bazel b/examples/cargo/BUILD.bazel
@@ -2,11 +2,7 @@ load(
     "@rules_rust//cargo:cargo_build_script.bzl",
     "cargo_build_script",
 )
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_library",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_library", "rust_test")
 
 cargo_build_script(
     name = "build_script",

diff --git a/examples/cargo_manifest_dir/usage/BUILD.bazel b/examples/cargo_manifest_dir/usage/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_rust//rust:rust.bzl", "rust_test")
+load("@rules_rust//rust:defs.bzl", "rust_test")
 
 rust_test(
     name = "cargo_manifest_dir_usage",

diff --git a/examples/env_locations/BUILD.bazel b/examples/env_locations/BUILD.bazel
@@ -1,8 +1,5 @@
 load("@rules_rust//cargo:cargo_build_script.bzl", "cargo_build_script")
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_test")
 
 # generate a file
 genrule(

diff --git a/examples/ffi/c_calling_rust/BUILD.bazel b/examples/ffi/c_calling_rust/BUILD.bazel
@@ -1,10 +1,9 @@
 load("@rules_cc//cc:defs.bzl", "cc_test")
-load("@rules_rust//rust:rust.bzl", "rust_library", "rust_test")
+load("@rules_rust//rust:defs.bzl", "rust_static_library", "rust_test")
 
-rust_library(
+rust_static_library(
     name = "rusty",
     srcs = ["lib.rs"],
-    crate_type = "staticlib",
 )
 
 rust_test(

diff --git a/examples/ffi/rust_calling_c/BUILD.bazel b/examples/ffi/rust_calling_c/BUILD.bazel
@@ -1,4 +1,4 @@
-load("@rules_rust//rust:rust.bzl", "rust_doc", "rust_library", "rust_test")
+load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_library", "rust_test")
 
 package(default_visibility = ["//ffi/rust_calling_c:__subpackages__"])
 

diff --git a/examples/fibonacci/BUILD.bazel b/examples/fibonacci/BUILD.bazel
@@ -1,10 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_doc",
-    "rust_doc_test",
-    "rust_library",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_doc", "rust_doc_test", "rust_library", "rust_test")
 
 rust_library(
     name = "fibonacci",

diff --git a/examples/flag_locations/BUILD.bazel b/examples/flag_locations/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_test")
 
 # generate a file containing cfg flags
 genrule(

diff --git a/examples/hello_lib/BUILD.bazel b/examples/hello_lib/BUILD.bazel
@@ -1,11 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_analyzer",
-    "rust_doc",
-    "rust_doc_test",
-    "rust_library",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_analyzer", "rust_doc", "rust_doc_test", "rust_library", "rust_shared_library", "rust_static_library", "rust_test")
 
 package(default_visibility = ["//visibility:public"])
 
@@ -19,50 +12,37 @@ rust_library(
     rustc_flags = ["--cap-lints=allow"],
 )
 
-rust_library(
-    name = "hello_dylib",
-    srcs = [
-        "src/greeter.rs",
-        "src/lib.rs",
-    ],
-    crate_type = "dylib",
-)
-
-rust_library(
+rust_shared_library(
     name = "hello_cdylib",
     srcs = [
         "src/greeter.rs",
         "src/lib.rs",
     ],
-    crate_type = "cdylib",
 )
 
-rust_library(
+rust_static_library(
     name = "hello_staticlib",
     srcs = [
         "src/greeter.rs",
         "src/lib.rs",
     ],
-    crate_type = "staticlib",
 )
 
 # Regression test for #368: static lib with dependencies fail.
-rust_library(
+rust_static_library(
     name = "hello_test_staticlib",
     srcs = [
         "tests/greeting.rs",
     ],
-    crate_type = "staticlib",
     deps = [":hello_lib"],
 )
 
 # Regression test for #368: cdylib lib with dependencies fail.
-rust_library(
+rust_shared_library(
     name = "hello_test_cdylib",
     srcs = [
         "tests/greeting.rs",
     ],
-    crate_type = "cdylib",
     deps = [":hello_lib"],
 )
 

diff --git a/examples/hello_runfiles/BUILD.bazel b/examples/hello_runfiles/BUILD.bazel
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_rust//rust:rust.bzl", "rust_binary")
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/hello_world/BUILD.bazel b/examples/hello_world/BUILD.bazel
@@ -1,8 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_binary",
-    "rust_doc",
-)
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_doc")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/per_platform_printer/BUILD.bazel b/examples/per_platform_printer/BUILD.bazel
@@ -1,9 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_binary",
-    "rust_library",
-    "rust_test",
-)
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library", "rust_test")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/proto/basic/BUILD.bazel b/examples/proto/basic/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_rust//proto:proto.bzl", "rust_proto_library")
-load("@rules_rust//rust:rust.bzl", "rust_binary", "rust_library")
+load("@rules_rust//rust:defs.bzl", "rust_binary", "rust_library")
 
 package(default_visibility = ["//proto:__subpackages__"])
 

diff --git a/examples/proto/helloworld/BUILD.bazel b/examples/proto/helloworld/BUILD.bazel
@@ -1,6 +1,6 @@
 load("@rules_proto//proto:defs.bzl", "proto_library")
 load("@rules_rust//proto:proto.bzl", "rust_grpc_library")
-load("@rules_rust//rust:rust.bzl", "rust_test")
+load("@rules_rust//rust:defs.bzl", "rust_test")
 
 proto_library(
     name = "helloworld",

diff --git a/examples/proto/helloworld/greeter_client/BUILD.bazel b/examples/proto/helloworld/greeter_client/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_rust//proto:toolchain.bzl", "GRPC_COMPILE_DEPS")
-load("@rules_rust//rust:rust.bzl", "rust_binary")
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 rust_binary(
     name = "greeter_client",

diff --git a/examples/proto/helloworld/greeter_server/BUILD.bazel b/examples/proto/helloworld/greeter_server/BUILD.bazel
@@ -1,5 +1,5 @@
 load("@rules_rust//proto:toolchain.bzl", "GRPC_COMPILE_DEPS")
-load("@rules_rust//rust:rust.bzl", "rust_binary")
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 rust_binary(
     name = "greeter_server",

diff --git a/examples/sys/basic/BUILD.bazel b/examples/sys/basic/BUILD.bazel
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_rust//rust:rust.bzl", "rust_binary")
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/sys/basic/raze/remote/BUILD.bzip2-0.3.3.bazel b/examples/sys/basic/raze/remote/BUILD.bzip2-0.3.3.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -36,7 +37,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/basic/raze/remote/BUILD.bzip2-sys-0.1.9+1.0.8.bazel b/examples/sys/basic/raze/remote/BUILD.bzip2-sys-0.1.9+1.0.8.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -68,7 +69,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/basic/raze/remote/BUILD.cc-1.0.60.bazel b/examples/sys/basic/raze/remote/BUILD.cc-1.0.60.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -60,7 +61,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [

diff --git a/examples/sys/basic/raze/remote/BUILD.libc-0.2.77.bazel b/examples/sys/basic/raze/remote/BUILD.libc-0.2.77.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -40,7 +41,6 @@ rust_library(
         "std",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/basic/raze/remote/BUILD.pkg-config-0.3.18.bazel b/examples/sys/basic/raze/remote/BUILD.pkg-config-0.3.18.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -36,7 +37,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/complex/BUILD.bazel b/examples/sys/complex/BUILD.bazel
@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-load("@rules_rust//rust:rust.bzl", "rust_binary")
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])
 

diff --git a/examples/sys/complex/raze/remote/BUILD.autocfg-1.0.1.bazel b/examples/sys/complex/raze/remote/BUILD.autocfg-1.0.1.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -44,7 +45,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/complex/raze/remote/BUILD.bitflags-1.2.1.bazel b/examples/sys/complex/raze/remote/BUILD.bitflags-1.2.1.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -67,7 +68,6 @@ rust_library(
         "default",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [

diff --git a/examples/sys/complex/raze/remote/BUILD.cc-1.0.69.bazel b/examples/sys/complex/raze/remote/BUILD.cc-1.0.69.bazel
@@ -10,9 +10,10 @@ load("@bazel_skylib//lib:selects.bzl", "selects")
 
 # buildifier: disable=load
 load(
-    "@rules_rust//rust:rust.bzl",
+    "@rules_rust//rust:defs.bzl",
     "rust_binary",
     "rust_library",
+    "rust_proc_macro",
     "rust_test",
 )
 
@@ -65,7 +66,6 @@ rust_library(
         "parallel",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [