From a70a5bccffbf6baec6d07e64900b623fc68d1f20 Mon Sep 17 00:00:00 2001
From: Conrad Ludgate <conrad@neon.tech>
Date: Fri, 25 Jul 2025 11:44:28 +0100
Subject: [PATCH] move subzero_core to proxy libs (#12742)

We have a dedicated libs folder for proxy related libraries. Let's move
the subzero_core stub there.
---
 Cargo.toml                                    | 2 +-
 {proxy => libs/proxy}/subzero_core/.gitignore | 0
 {proxy => libs/proxy}/subzero_core/Cargo.toml | 0
 {proxy => libs/proxy}/subzero_core/src/lib.rs | 0
 proxy/Cargo.toml                              | 2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)
 rename {proxy => libs/proxy}/subzero_core/.gitignore (100%)
 rename {proxy => libs/proxy}/subzero_core/Cargo.toml (100%)
 rename {proxy => libs/proxy}/subzero_core/src/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index 18236a81f5..f011ff3da7 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -46,10 +46,10 @@ members = [
     "libs/proxy/json",
     "libs/proxy/postgres-protocol2",
     "libs/proxy/postgres-types2",
+    "libs/proxy/subzero_core",
     "libs/proxy/tokio-postgres2",
     "endpoint_storage",
     "pgxn/neon/communicator",
-    "proxy/subzero_core",
 ]
 
 [workspace.package]
diff --git a/proxy/subzero_core/.gitignore b/libs/proxy/subzero_core/.gitignore
similarity index 100%
rename from proxy/subzero_core/.gitignore
rename to libs/proxy/subzero_core/.gitignore
diff --git a/proxy/subzero_core/Cargo.toml b/libs/proxy/subzero_core/Cargo.toml
similarity index 100%
rename from proxy/subzero_core/Cargo.toml
rename to libs/proxy/subzero_core/Cargo.toml
diff --git a/proxy/subzero_core/src/lib.rs b/libs/proxy/subzero_core/src/lib.rs
similarity index 100%
rename from proxy/subzero_core/src/lib.rs
rename to libs/proxy/subzero_core/src/lib.rs
diff --git a/proxy/Cargo.toml b/proxy/Cargo.toml
index 3c3f93c8e3..b9e1445870 100644
--- a/proxy/Cargo.toml
+++ b/proxy/Cargo.toml
@@ -110,7 +110,7 @@ zerocopy.workspace = true
 # uncomment this to use the real subzero-core crate
 # subzero-core = { git = "https://github.com/neondatabase/subzero", rev = "396264617e78e8be428682f87469bb25429af88a", features = ["postgresql"], optional = true }
 # this is a stub for the subzero-core crate
-subzero-core = { path = "./subzero_core", features = ["postgresql"], optional = true}
+subzero-core = { path = "../libs/proxy/subzero_core", features = ["postgresql"], optional = true}
 ouroboros = { version = "0.18", optional = true }
 
 # jwt stuff