diff --git a/Cargo.toml b/Cargo.toml index edc6acf12ee..90a46f0bdb3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,8 +11,8 @@ members = [ "internal-dns", "internal-dns-client", "nexus", - "nexus/src/authz/authz-macros", - "nexus/src/db/db-macros", + "nexus/authz-macros", + "nexus/db-macros", "nexus/test-utils", "nexus/test-utils-macros", "nexus-client", @@ -43,8 +43,8 @@ default-members = [ "internal-dns", "internal-dns-client", "nexus", - "nexus/src/authz/authz-macros", - "nexus/src/db/db-macros", + "nexus/authz-macros", + "nexus/db-macros", "package", "rpaths", "sled-agent", diff --git a/nexus/Cargo.toml b/nexus/Cargo.toml index 247592e8a1c..580884b75e2 100644 --- a/nexus/Cargo.toml +++ b/nexus/Cargo.toml @@ -11,7 +11,6 @@ path = "../rpaths" anyhow = "1.0" async-bb8-diesel = { git = "https://github.com/oxidecomputer/async-bb8-diesel", rev = "ab1f49e0b3f95557aa96bf593282199fafeef4bd" } async-trait = "0.1.56" -authz-macros = { path = "src/authz/authz-macros" } base64 = "0.13.0" bb8 = "0.8.0" clap = { version = "3.2", features = ["derive"] } @@ -25,7 +24,6 @@ headers = "0.3.7" hex = "0.4.3" http = "0.2.7" hyper = "0.14" -db-macros = { path = "src/db/db-macros" } internal-dns-client = { path = "../internal-dns-client" } ipnetwork = "0.18" lazy_static = "1.4.0" @@ -60,6 +58,9 @@ toml = "0.5.9" tough = { version = "0.12", features = [ "http" ] } usdt = "0.3.1" +authz-macros = { path = "authz-macros" } +db-macros = { path = "db-macros" } + [dependencies.api_identity] path = "../api_identity" diff --git a/nexus/src/authz/authz-macros/Cargo.toml b/nexus/authz-macros/Cargo.toml similarity index 100% rename from nexus/src/authz/authz-macros/Cargo.toml rename to nexus/authz-macros/Cargo.toml diff --git a/nexus/src/authz/authz-macros/src/lib.rs b/nexus/authz-macros/src/lib.rs similarity index 100% rename from nexus/src/authz/authz-macros/src/lib.rs rename to nexus/authz-macros/src/lib.rs diff --git a/nexus/src/db/db-macros/Cargo.toml b/nexus/db-macros/Cargo.toml similarity index 100% rename from nexus/src/db/db-macros/Cargo.toml rename to nexus/db-macros/Cargo.toml diff --git a/nexus/src/db/db-macros/src/lib.rs b/nexus/db-macros/src/lib.rs similarity index 100% rename from nexus/src/db/db-macros/src/lib.rs rename to nexus/db-macros/src/lib.rs diff --git a/nexus/src/db/db-macros/src/lookup.rs b/nexus/db-macros/src/lookup.rs similarity index 100% rename from nexus/src/db/db-macros/src/lookup.rs rename to nexus/db-macros/src/lookup.rs