testkit: testing -> testkit

charted-dev · Nov 25, 2023 · 65b00a7 · 65b00a7
1 parent 986f79e
commit 65b00a7
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 43 deletions.
diff --git a/build/manifests.bzl b/build/manifests.bzl
@@ -44,7 +44,7 @@ CARGO_MANIFESTS = [
     "//features/gc:Cargo.toml",
     "//server/proc-macro:Cargo.toml",
     "//server:Cargo.toml",
-    "//testing:Cargo.toml",
+    "//testkit:Cargo.toml",
     "//testkit/macros:Cargo.toml",
     "//tools/devtools:Cargo.toml",
     "//tools/helm-plugin:Cargo.toml",

diff --git a/thirdparty/crates/BUILD.libc-0.2.149.bazel b/thirdparty/crates/BUILD.libc-0.2.149.bazel
@@ -31,22 +31,9 @@ rust_library(
     ),
     crate_features = [
         "default",
+        "extra_traits",
         "std",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "extra_traits",
-        ],
-        "//conditions:default": [],
-    }),
+    ],
     crate_root = "src/lib.rs",
     edition = "2015",
     rustc_flags = ["--cap-lints=allow"],
@@ -68,22 +55,9 @@ cargo_build_script(
     srcs = glob(["**/*.rs"]),
     crate_features = [
         "default",
+        "extra_traits",
         "std",
-    ] + select({
-        "@rules_rust//rust/platform:aarch64-apple-darwin": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:aarch64-unknown-linux-gnu": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:x86_64-apple-darwin": [
-            "extra_traits",
-        ],
-        "@rules_rust//rust/platform:x86_64-unknown-linux-gnu": [
-            "extra_traits",
-        ],
-        "//conditions:default": [],
-    }),
+    ],
     crate_name = "build_script_build",
     crate_root = "build.rs",
     data = glob(

diff --git a/thirdparty/crates/defs.bzl b/thirdparty/crates/defs.bzl
@@ -615,7 +615,7 @@ _NORMAL_DEPENDENCIES = {
             "utoipa": "@crate_index__utoipa-4.1.0//:utoipa",
         },
     },
-    "testing": {
+    "testkit": {
         _COMMON_CONDITION: {
             "axum": "@crate_index__axum-0.6.20//:axum",
             "bytes": "@crate_index__bytes-1.5.0//:bytes",
@@ -626,6 +626,13 @@ _NORMAL_DEPENDENCIES = {
             "tokio": "@crate_index__tokio-1.34.0//:tokio",
         },
     },
+    "testkit/macros": {
+        _COMMON_CONDITION: {
+            "proc-macro2": "@crate_index__proc-macro2-1.0.69//:proc_macro2",
+            "quote": "@crate_index__quote-1.0.33//:quote",
+            "syn": "@crate_index__syn-2.0.39//:syn",
+        },
+    },
     "tools/devtools": {
         _COMMON_CONDITION: {
             "clap": "@crate_index__clap-4.4.8//:clap",
@@ -782,7 +789,11 @@ _NORMAL_ALIASES = {
         _COMMON_CONDITION: {
         },
     },
-    "testing": {
+    "testkit": {
+        _COMMON_CONDITION: {
+        },
+    },
+    "testkit/macros": {
         _COMMON_CONDITION: {
         },
     },
@@ -861,7 +872,9 @@ _NORMAL_DEV_DEPENDENCIES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -930,7 +943,9 @@ _NORMAL_DEV_ALIASES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1039,11 +1054,13 @@ _PROC_MACRO_DEPENDENCIES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
         _COMMON_CONDITION: {
             "async-trait": "@crate_index__async-trait-0.1.74//:async_trait",
         },
     },
+    "testkit/macros": {
+    },
     "tools/devtools": {
         _COMMON_CONDITION: {
             "async-trait": "@crate_index__async-trait-0.1.74//:async_trait",
@@ -1113,7 +1130,9 @@ _PROC_MACRO_ALIASES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1178,7 +1197,9 @@ _PROC_MACRO_DEV_DEPENDENCIES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1247,7 +1268,9 @@ _PROC_MACRO_DEV_ALIASES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1321,7 +1344,9 @@ _BUILD_DEPENDENCIES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1390,7 +1415,9 @@ _BUILD_ALIASES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1455,7 +1482,9 @@ _BUILD_PROC_MACRO_DEPENDENCIES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },
@@ -1520,7 +1549,9 @@ _BUILD_PROC_MACRO_ALIASES = {
     },
     "server/proc-macro": {
     },
-    "testing": {
+    "testkit": {
+    },
+    "testkit/macros": {
     },
     "tools/devtools": {
     },