diff --git a/examples/bindgen/BUILD.bazel b/examples/bindgen/BUILD.bazel
index ee3a57a8f3..8e36e20e55 100644
--- 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
index c7bb14e2d1..463841f0ba 100644
--- 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
index 9b877d4525..c88ccb74d2 100644
--- 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
index fe313cf2d0..82161bb69e 100644
--- 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
index a44ccb3385..b491126253 100644
--- 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
index e3cff9f4d4..48e078e0e3 100644
--- 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
index 50b1dd3d95..87ff5c3865 100644
--- 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
index ed54cdae4c..fdc92ed42b 100644
--- 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
index c11fc749f7..e8fb6f6023 100644
--- 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
index cbca98e34c..64a6c13431 100644
--- 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
index 9f138f740d..8de82781ff 100644
--- 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
index b0d0d2dd1a..77b36e4d1c 100644
--- 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
index c955f71515..9853a2e4b2 100644
--- 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
index 786e1549a3..db30a9d09c 100644
--- 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
index 3f64952fb6..b35435e4a9 100644
--- 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
index 56ed52532d..616ecb599b 100644
--- 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
index 189ecad994..142aa89947 100644
--- 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
index 5fe984a92a..403de65ca2 100644
--- 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
index accf79a302..2401d2ce2a 100644
--- 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
index d1a8b8b4ca..ad826c1fda 100644
--- 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
index 8f0528888d..4b8aed7b6b 100644
--- 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
index dc015aacec..0121432461 100644
--- 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
index 68fc131f01..f0e7f0bd6a 100644
--- 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
index eb5e0053d9..5faa88d2b3 100644
--- 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
index 017bf50516..09adb27ed6 100644
--- 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
index 23a010f5e1..2bc830db32 100644
--- 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 = [
diff --git a/examples/sys/complex/raze/remote/BUILD.cfg-if-1.0.0.bazel b/examples/sys/complex/raze/remote/BUILD.cfg-if-1.0.0.bazel
index f967d70a15..c2cdc137c2 100644
--- a/examples/sys/complex/raze/remote/BUILD.cfg-if-1.0.0.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.cfg-if-1.0.0.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 = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.foreign-types-0.3.2.bazel b/examples/sys/complex/raze/remote/BUILD.foreign-types-0.3.2.bazel
index a9067d2e4b..598b30a7d7 100644
--- a/examples/sys/complex/raze/remote/BUILD.foreign-types-0.3.2.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.foreign-types-0.3.2.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/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel b/examples/sys/complex/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel
index 570e1e166e..b084e4ee25 100644
--- a/examples/sys/complex/raze/remote/BUILD.foreign-types-shared-0.1.1.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.foreign-types-shared-0.1.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",
 )
 
@@ -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/raze/remote/BUILD.form_urlencoded-1.0.1.bazel b/examples/sys/complex/raze/remote/BUILD.form_urlencoded-1.0.1.bazel
index 1677b053cc..4e1962bfc5 100644
--- a/examples/sys/complex/raze/remote/BUILD.form_urlencoded-1.0.1.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.form_urlencoded-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",
 )
 
@@ -36,7 +37,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.git2-0.13.12.bazel b/examples/sys/complex/raze/remote/BUILD.git2-0.13.12.bazel
index 109f6012cd..2c84c59bb7 100644
--- a/examples/sys/complex/raze/remote/BUILD.git2-0.13.12.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.git2-0.13.12.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",
 )
 
@@ -72,7 +73,6 @@ rust_library(
         "ssh_key_from_memory",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
@@ -93,19 +93,19 @@ rust_library(
     ] + selects.with_or({
         # cfg(all(unix, not(target_os = "macos")))
         (
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__openssl_probe__0_1_4//:openssl_probe",
             "@complex_sys__openssl_sys__0_9_60//:openssl_sys",
diff --git a/examples/sys/complex/raze/remote/BUILD.idna-0.2.3.bazel b/examples/sys/complex/raze/remote/BUILD.idna-0.2.3.bazel
index 6714b4d78e..b558dba9b1 100644
--- a/examples/sys/complex/raze/remote/BUILD.idna-0.2.3.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.idna-0.2.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",
 )
 
@@ -38,7 +39,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.jobserver-0.1.23.bazel b/examples/sys/complex/raze/remote/BUILD.jobserver-0.1.23.bazel
index 9ecea557e2..bc6f007e28 100644
--- a/examples/sys/complex/raze/remote/BUILD.jobserver-0.1.23.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.jobserver-0.1.23.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",
 )
 
@@ -38,7 +39,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
@@ -54,22 +54,22 @@ rust_library(
     ] + selects.with_or({
         # cfg(unix)
         (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-darwin",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
-            "@rules_rust//rust/platform:i686-apple-darwin",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
-            "@rules_rust//rust/platform:x86_64-apple-darwin",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__libc__0_2_98//:libc",
         ],
diff --git a/examples/sys/complex/raze/remote/BUILD.lazy_static-1.4.0.bazel b/examples/sys/complex/raze/remote/BUILD.lazy_static-1.4.0.bazel
index 9b1665abef..440c1c93b9 100644
--- a/examples/sys/complex/raze/remote/BUILD.lazy_static-1.4.0.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.lazy_static-1.4.0.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/raze/remote/BUILD.libc-0.2.98.bazel b/examples/sys/complex/raze/remote/BUILD.libc-0.2.98.bazel
index 11d72bad39..b3a45267df 100644
--- a/examples/sys/complex/raze/remote/BUILD.libc-0.2.98.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.libc-0.2.98.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",
 )
 
@@ -69,7 +70,6 @@ rust_library(
         "std",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.libgit2-sys-0.12.21+1.1.0.bazel b/examples/sys/complex/raze/remote/BUILD.libgit2-sys-0.12.21+1.1.0.bazel
index 968b8546c4..63c87f1ba3 100644
--- a/examples/sys/complex/raze/remote/BUILD.libgit2-sys-0.12.21+1.1.0.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.libgit2-sys-0.12.21+1.1.0.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",
 )
 
@@ -69,22 +70,22 @@ cargo_build_script(
     ] + selects.with_or({
         # cfg(unix)
         (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-darwin",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
-            "@rules_rust//rust/platform:i686-apple-darwin",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
-            "@rules_rust//rust/platform:x86_64-apple-darwin",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__openssl_sys__0_9_60//:openssl_sys",
         ],
@@ -105,7 +106,6 @@ rust_library(
         "ssh_key_from_memory",
     ],
     crate_root = "lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
@@ -125,22 +125,22 @@ rust_library(
     ] + selects.with_or({
         # cfg(unix)
         (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-darwin",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
-            "@rules_rust//rust/platform:i686-apple-darwin",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
-            "@rules_rust//rust/platform:x86_64-apple-darwin",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__openssl_sys__0_9_60//:openssl_sys",
         ],
diff --git a/examples/sys/complex/raze/remote/BUILD.libssh2-sys-0.2.21.bazel b/examples/sys/complex/raze/remote/BUILD.libssh2-sys-0.2.21.bazel
index 6cd0915458..dab53f1090 100644
--- a/examples/sys/complex/raze/remote/BUILD.libssh2-sys-0.2.21.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.libssh2-sys-0.2.21.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",
 )
 
@@ -74,22 +75,22 @@ cargo_build_script(
     }) + selects.with_or({
         # cfg(unix)
         (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-darwin",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
-            "@rules_rust//rust/platform:i686-apple-darwin",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
-            "@rules_rust//rust/platform:x86_64-apple-darwin",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__openssl_sys__0_9_60//:openssl_sys",
         ],
@@ -105,7 +106,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
@@ -132,22 +132,22 @@ rust_library(
     }) + selects.with_or({
         # cfg(unix)
         (
+            "@rules_rust//rust/platform:i686-apple-darwin",
+            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
+            "@rules_rust//rust/platform:x86_64-apple-darwin",
+            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
             "@rules_rust//rust/platform:aarch64-apple-darwin",
             "@rules_rust//rust/platform:aarch64-apple-ios",
             "@rules_rust//rust/platform:aarch64-linux-android",
             "@rules_rust//rust/platform:aarch64-unknown-linux-gnu",
             "@rules_rust//rust/platform:arm-unknown-linux-gnueabi",
-            "@rules_rust//rust/platform:i686-apple-darwin",
             "@rules_rust//rust/platform:i686-linux-android",
             "@rules_rust//rust/platform:i686-unknown-freebsd",
-            "@rules_rust//rust/platform:i686-unknown-linux-gnu",
             "@rules_rust//rust/platform:powerpc-unknown-linux-gnu",
             "@rules_rust//rust/platform:s390x-unknown-linux-gnu",
-            "@rules_rust//rust/platform:x86_64-apple-darwin",
             "@rules_rust//rust/platform:x86_64-apple-ios",
             "@rules_rust//rust/platform:x86_64-linux-android",
             "@rules_rust//rust/platform:x86_64-unknown-freebsd",
-            "@rules_rust//rust/platform:x86_64-unknown-linux-gnu",
         ): [
             "@complex_sys__openssl_sys__0_9_60//:openssl_sys",
         ],
diff --git a/examples/sys/complex/raze/remote/BUILD.libz-sys-1.1.3.bazel b/examples/sys/complex/raze/remote/BUILD.libz-sys-1.1.3.bazel
index dfab8b86fc..88c2b1361e 100644
--- a/examples/sys/complex/raze/remote/BUILD.libz-sys-1.1.3.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.libz-sys-1.1.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",
 )
 
@@ -81,7 +82,6 @@ rust_library(
         "libc",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.log-0.4.14.bazel b/examples/sys/complex/raze/remote/BUILD.log-0.4.14.bazel
index 19ef279ceb..dbea3b31c6 100644
--- a/examples/sys/complex/raze/remote/BUILD.log-0.4.14.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.log-0.4.14.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(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.matches-0.1.8.bazel b/examples/sys/complex/raze/remote/BUILD.matches-0.1.8.bazel
index e8b7052ff5..2b9a32d696 100644
--- a/examples/sys/complex/raze/remote/BUILD.matches-0.1.8.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.matches-0.1.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",
 )
 
@@ -36,7 +37,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.openssl-0.10.32.bazel b/examples/sys/complex/raze/remote/BUILD.openssl-0.10.32.bazel
index abc2a0e002..5dda642270 100644
--- a/examples/sys/complex/raze/remote/BUILD.openssl-0.10.32.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.openssl-0.10.32.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 = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.openssl-probe-0.1.4.bazel b/examples/sys/complex/raze/remote/BUILD.openssl-probe-0.1.4.bazel
index cacc6757cd..e8c551b7ab 100644
--- a/examples/sys/complex/raze/remote/BUILD.openssl-probe-0.1.4.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.openssl-probe-0.1.4.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/raze/remote/BUILD.openssl-sys-0.9.60.bazel b/examples/sys/complex/raze/remote/BUILD.openssl-sys-0.9.60.bazel
index 047f7b3811..c033c83ed9 100644
--- a/examples/sys/complex/raze/remote/BUILD.openssl-sys-0.9.60.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.openssl-sys-0.9.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",
 )
 
@@ -85,7 +86,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [] + ["@openssl//:openssl"],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.percent-encoding-2.1.0.bazel b/examples/sys/complex/raze/remote/BUILD.percent-encoding-2.1.0.bazel
index 7f663df28b..c6db1caae6 100644
--- a/examples/sys/complex/raze/remote/BUILD.percent-encoding-2.1.0.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.percent-encoding-2.1.0.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 = "lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2015",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.pkg-config-0.3.19.bazel b/examples/sys/complex/raze/remote/BUILD.pkg-config-0.3.19.bazel
index b2e00fff16..579c9ba2c2 100644
--- a/examples/sys/complex/raze/remote/BUILD.pkg-config-0.3.19.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.pkg-config-0.3.19.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/raze/remote/BUILD.tinyvec-1.3.1.bazel b/examples/sys/complex/raze/remote/BUILD.tinyvec-1.3.1.bazel
index 1d09090fd3..ec3dc78a59 100644
--- a/examples/sys/complex/raze/remote/BUILD.tinyvec-1.3.1.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.tinyvec-1.3.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",
 )
 
@@ -41,7 +42,6 @@ rust_library(
         "tinyvec_macros",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.tinyvec_macros-0.1.0.bazel b/examples/sys/complex/raze/remote/BUILD.tinyvec_macros-0.1.0.bazel
index f79972ca3b..898618b914 100644
--- a/examples/sys/complex/raze/remote/BUILD.tinyvec_macros-0.1.0.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.tinyvec_macros-0.1.0.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 = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.unicode-bidi-0.3.5.bazel b/examples/sys/complex/raze/remote/BUILD.unicode-bidi-0.3.5.bazel
index 8262c7194b..eb6eaa4090 100644
--- a/examples/sys/complex/raze/remote/BUILD.unicode-bidi-0.3.5.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.unicode-bidi-0.3.5.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",
 )
 
@@ -37,7 +38,6 @@ rust_library(
         "default",
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.unicode-normalization-0.1.19.bazel b/examples/sys/complex/raze/remote/BUILD.unicode-normalization-0.1.19.bazel
index 148cf0e1c5..eacf38da76 100644
--- a/examples/sys/complex/raze/remote/BUILD.unicode-normalization-0.1.19.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.unicode-normalization-0.1.19.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 = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.url-2.2.2.bazel b/examples/sys/complex/raze/remote/BUILD.url-2.2.2.bazel
index 0c6997cc21..37b82d9a5b 100644
--- a/examples/sys/complex/raze/remote/BUILD.url-2.2.2.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.url-2.2.2.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",
 )
 
@@ -38,7 +39,6 @@ rust_library(
     crate_features = [
     ],
     crate_root = "src/lib.rs",
-    crate_type = "lib",
     data = [],
     edition = "2018",
     rustc_flags = [
diff --git a/examples/sys/complex/raze/remote/BUILD.vcpkg-0.2.15.bazel b/examples/sys/complex/raze/remote/BUILD.vcpkg-0.2.15.bazel
index 409c839723..6a4c4047ca 100644
--- a/examples/sys/complex/raze/remote/BUILD.vcpkg-0.2.15.bazel
+++ b/examples/sys/complex/raze/remote/BUILD.vcpkg-0.2.15.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/version_stamping/BUILD.bazel b/examples/version_stamping/BUILD.bazel
index 7d671c8918..474c80f545 100644
--- a/examples/version_stamping/BUILD.bazel
+++ b/examples/version_stamping/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_binary",
-)
+load("@rules_rust//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])