diff --git a/proto/BUILD.bazel b/proto/BUILD.bazel
index 2796a9dc40..b5367482bd 100644
--- a/proto/BUILD.bazel
+++ b/proto/BUILD.bazel
@@ -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"])
diff --git a/test/build_env/BUILD.bazel b/test/build_env/BUILD.bazel
index 96fd1c1d0c..4fd7df3ed2 100644
--- a/test/build_env/BUILD.bazel
+++ b/test/build_env/BUILD.bazel
@@ -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"])
 
diff --git a/test/cargo_build_script/BUILD.bazel b/test/cargo_build_script/BUILD.bazel
index 27945372b9..84fc960be2 100644
--- a/test/cargo_build_script/BUILD.bazel
+++ b/test/cargo_build_script/BUILD.bazel
@@ -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(
diff --git a/test/chained_direct_deps/BUILD.bazel b/test/chained_direct_deps/BUILD.bazel
index eeb2e95100..8460d2284a 100644
--- a/test/chained_direct_deps/BUILD.bazel
+++ b/test/chained_direct_deps/BUILD.bazel
@@ -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",
diff --git a/test/clippy/BUILD.bazel b/test/clippy/BUILD.bazel
index db11e080ac..bcd81594a7 100644
--- a/test/clippy/BUILD.bazel
+++ b/test/clippy/BUILD.bazel
@@ -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__"])
 
diff --git a/test/conflicting_deps/BUILD.bazel b/test/conflicting_deps/BUILD.bazel
index f5f8396a83..852aec5bb8 100644
--- a/test/conflicting_deps/BUILD.bazel
+++ b/test/conflicting_deps/BUILD.bazel
@@ -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"])
 
diff --git a/test/conflicting_deps/first_crate/BUILD.bazel b/test/conflicting_deps/first_crate/BUILD.bazel
index aacf597f34..f759e19de7 100644
--- a/test/conflicting_deps/first_crate/BUILD.bazel
+++ b/test/conflicting_deps/first_crate/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "//rust:rust.bzl",
-    "rust_library",
-)
+load("//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/test/conflicting_deps/second_crate/BUILD.bazel b/test/conflicting_deps/second_crate/BUILD.bazel
index 7042f516a4..d7d510f03b 100644
--- a/test/conflicting_deps/second_crate/BUILD.bazel
+++ b/test/conflicting_deps/second_crate/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "//rust:rust.bzl",
-    "rust_library",
-)
+load("//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/test/inline_test_with_deps/dep/BUILD.bazel b/test/inline_test_with_deps/dep/BUILD.bazel
index 25c1b5b698..3435e680a8 100644
--- a/test/inline_test_with_deps/dep/BUILD.bazel
+++ b/test/inline_test_with_deps/dep/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "//rust:rust.bzl",
-    "rust_library",
-)
+load("//rust:defs.bzl", "rust_library")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/test/inline_test_with_deps/test/BUILD.bazel b/test/inline_test_with_deps/test/BUILD.bazel
index 0c9a547dc4..372199c1bd 100644
--- a/test/inline_test_with_deps/test/BUILD.bazel
+++ b/test/inline_test_with_deps/test/BUILD.bazel
@@ -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"])
 
diff --git a/test/inline_test_with_deps/test_with_srcs/BUILD.bazel b/test/inline_test_with_deps/test_with_srcs/BUILD.bazel
index 912fa59c5a..64d628e512 100644
--- a/test/inline_test_with_deps/test_with_srcs/BUILD.bazel
+++ b/test/inline_test_with_deps/test_with_srcs/BUILD.bazel
@@ -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"])
 
diff --git a/test/out_dir_in_tests/BUILD.bazel b/test/out_dir_in_tests/BUILD.bazel
index 67c4140725..1ee4ce9eb6 100644
--- a/test/out_dir_in_tests/BUILD.bazel
+++ b/test/out_dir_in_tests/BUILD.bazel
@@ -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",
diff --git a/test/renamed_deps/BUILD.bazel b/test/renamed_deps/BUILD.bazel
index 4f0e9e4dfc..92098888ff 100644
--- a/test/renamed_deps/BUILD.bazel
+++ b/test/renamed_deps/BUILD.bazel
@@ -1,8 +1,4 @@
-load(
-    "//rust:rust.bzl",
-    "rust_library",
-    "rust_test",
-)
+load("//rust:defs.bzl", "rust_library", "rust_test")
 
 rust_library(
     name = "mod1",
diff --git a/test/rust/BUILD.bazel b/test/rust/BUILD.bazel
index e5541503fa..ddb0110f6c 100644
--- a/test/rust/BUILD.bazel
+++ b/test/rust/BUILD.bazel
@@ -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"])
 
diff --git a/test/rustc_env_files/BUILD.bazel b/test/rustc_env_files/BUILD.bazel
index 9a10d336d9..431cd074a1 100644
--- a/test/rustc_env_files/BUILD.bazel
+++ b/test/rustc_env_files/BUILD.bazel
@@ -1,7 +1,4 @@
-load(
-    "@rules_rust//rust:rust.bzl",
-    "rust_binary",
-)
+load("//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])
 
diff --git a/test/test_env/BUILD.bazel b/test/test_env/BUILD.bazel
index f3f34ff5b8..623230fafc 100644
--- a/test/test_env/BUILD.bazel
+++ b/test/test_env/BUILD.bazel
@@ -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",
diff --git a/test/test_env_launcher/BUILD.bazel b/test/test_env_launcher/BUILD.bazel
index ba7ba26075..f7f20ffdef 100644
--- a/test/test_env_launcher/BUILD.bazel
+++ b/test/test_env_launcher/BUILD.bazel
@@ -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",
diff --git a/test/transitive_lib/BUILD.bazel b/test/transitive_lib/BUILD.bazel
index 186c41c312..b745248c5a 100644
--- a/test/transitive_lib/BUILD.bazel
+++ b/test/transitive_lib/BUILD.bazel
@@ -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(
@@ -13,7 +13,6 @@ cargo_build_script(
 rust_library(
     name = "dll_user",
     srcs = ["dll_user.rs"],
-    crate_type = "lib",
     edition = "2018",
     deps = [
         ":buildscript",
diff --git a/test/versioned_dylib/BUILD.bazel b/test/versioned_dylib/BUILD.bazel
index 9e774a78ec..a8804e43f6 100644
--- a/test/versioned_dylib/BUILD.bazel
+++ b/test/versioned_dylib/BUILD.bazel
@@ -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"])
 
diff --git a/util/dir_zipper/BUILD.bazel b/util/dir_zipper/BUILD.bazel
index f8d7eb2f64..43ab79e6ec 100644
--- a/util/dir_zipper/BUILD.bazel
+++ b/util/dir_zipper/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//rust:rust.bzl", "rust_binary")
+load("//rust:defs.bzl", "rust_binary")
 
 rust_binary(
     name = "dir_zipper",
diff --git a/util/label/BUILD.bazel b/util/label/BUILD.bazel
index 5518c6ec8a..405006d9b8 100644
--- a/util/label/BUILD.bazel
+++ b/util/label/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//rust:rust.bzl", "rust_library", "rust_test")
+load("//rust:defs.bzl", "rust_library", "rust_test")
 
 rust_library(
     name = "label",
diff --git a/util/launcher/BUILD.bazel b/util/launcher/BUILD.bazel
index 8b52057ea6..c12fdd7d58 100644
--- a/util/launcher/BUILD.bazel
+++ b/util/launcher/BUILD.bazel
@@ -1,4 +1,4 @@
-load("//rust:rust.bzl", "rust_binary")
+load("//rust:defs.bzl", "rust_binary")
 
 package(default_visibility = ["//visibility:public"])