From 23e0d541beb3486d812c0d6891605e17f1eddd59 Mon Sep 17 00:00:00 2001
From: Rain <rain@oxide.computer>
Date: Fri, 19 Jul 2024 13:47:56 -0700
Subject: [PATCH] move to subdirectories since that's the prevailing standard

Created using spr 1.3.6-beta.1
---
 Cargo.toml                                           | 12 ++++++------
 .../api}/Cargo.toml                                  |  0
 .../api}/src/lib.rs                                  |  0
 .../types}/Cargo.toml                                |  0
 .../types}/src/lib.rs                                |  0
 5 files changed, 6 insertions(+), 6 deletions(-)
 rename {cockroach-admin-api => cockroach-admin/api}/Cargo.toml (100%)
 rename {cockroach-admin-api => cockroach-admin/api}/src/lib.rs (100%)
 rename {cockroach-admin-types => cockroach-admin/types}/Cargo.toml (100%)
 rename {cockroach-admin-types => cockroach-admin/types}/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 00db359aa8..2b6281358f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,8 +16,8 @@ members = [
     "clients/sled-agent-client",
     "clients/wicketd-client",
     "cockroach-admin",
-    "cockroach-admin-api",
-    "cockroach-admin-types",
+    "cockroach-admin/api",
+    "cockroach-admin/types",
     "common",
     "dev-tools/crdb-seed",
     "dev-tools/omdb",
@@ -112,8 +112,8 @@ default-members = [
     "clients/sled-agent-client",
     "clients/wicketd-client",
     "cockroach-admin",
-    "cockroach-admin-api",
-    "cockroach-admin-types",
+    "cockroach-admin/api",
+    "cockroach-admin/types",
     "common",
     "dev-tools/crdb-seed",
     "dev-tools/omdb",
@@ -267,9 +267,9 @@ ciborium = "0.2.2"
 cfg-if = "1.0"
 chrono = { version = "0.4", features = [ "serde" ] }
 clap = { version = "4.5", features = ["cargo", "derive", "env", "wrap_help"] }
-cockroach-admin-api = { path = "cockroach-admin-api" }
+cockroach-admin-api = { path = "cockroach-admin/api" }
 cockroach-admin-client = { path = "clients/cockroach-admin-client" }
-cockroach-admin-types = { path = "cockroach-admin-types" }
+cockroach-admin-types = { path = "cockroach-admin/types" }
 colored = "2.1"
 const_format = "0.2.32"
 cookie = "0.18"
diff --git a/cockroach-admin-api/Cargo.toml b/cockroach-admin/api/Cargo.toml
similarity index 100%
rename from cockroach-admin-api/Cargo.toml
rename to cockroach-admin/api/Cargo.toml
diff --git a/cockroach-admin-api/src/lib.rs b/cockroach-admin/api/src/lib.rs
similarity index 100%
rename from cockroach-admin-api/src/lib.rs
rename to cockroach-admin/api/src/lib.rs
diff --git a/cockroach-admin-types/Cargo.toml b/cockroach-admin/types/Cargo.toml
similarity index 100%
rename from cockroach-admin-types/Cargo.toml
rename to cockroach-admin/types/Cargo.toml
diff --git a/cockroach-admin-types/src/lib.rs b/cockroach-admin/types/src/lib.rs
similarity index 100%
rename from cockroach-admin-types/src/lib.rs
rename to cockroach-admin/types/src/lib.rs