From 8de9b72c49d8ba3cc2866b80212474bea44f97c5 Mon Sep 17 00:00:00 2001 From: bestgopher <84328409@qq.com> Date: Wed, 16 Oct 2024 10:31:02 +0800 Subject: [PATCH] refactor: move api crate to api dir Signed-off-by: bestgopher <84328409@qq.com> --- Cargo.toml | 2 +- {admin => api/admin}/Cargo.toml | 2 +- {admin => api/admin}/src/error.rs | 0 {admin => api/admin}/src/handlers.rs | 0 {admin => api/admin}/src/handlers/list_pools.rs | 0 {admin => api/admin}/src/lib.rs | 0 {admin => api/admin}/src/middlewares.rs | 0 {admin => api/admin}/src/object_api.rs | 0 rustfs/Cargo.toml | 2 +- 9 files changed, 3 insertions(+), 3 deletions(-) rename {admin => api/admin}/Cargo.toml (91%) rename {admin => api/admin}/src/error.rs (100%) rename {admin => api/admin}/src/handlers.rs (100%) rename {admin => api/admin}/src/handlers/list_pools.rs (100%) rename {admin => api/admin}/src/lib.rs (100%) rename {admin => api/admin}/src/middlewares.rs (100%) rename {admin => api/admin}/src/object_api.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index f85924551..2a50af2f9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ members = [ "common/common", "common/lock", "common/protos", - "admin", + "api/admin", ] [workspace.package] diff --git a/admin/Cargo.toml b/api/admin/Cargo.toml similarity index 91% rename from admin/Cargo.toml rename to api/admin/Cargo.toml index 055839074..40a762cde 100644 --- a/admin/Cargo.toml +++ b/api/admin/Cargo.toml @@ -11,7 +11,7 @@ axum.workspace = true mime.workspace = true serde.workspace = true serde_json.workspace = true -ecstore = { path = "../ecstore" } +ecstore = { path = "../../ecstore" } time = { workspace = true, features = ["serde"] } tower.workspace = true futures-util = "0.3.31" diff --git a/admin/src/error.rs b/api/admin/src/error.rs similarity index 100% rename from admin/src/error.rs rename to api/admin/src/error.rs diff --git a/admin/src/handlers.rs b/api/admin/src/handlers.rs similarity index 100% rename from admin/src/handlers.rs rename to api/admin/src/handlers.rs diff --git a/admin/src/handlers/list_pools.rs b/api/admin/src/handlers/list_pools.rs similarity index 100% rename from admin/src/handlers/list_pools.rs rename to api/admin/src/handlers/list_pools.rs diff --git a/admin/src/lib.rs b/api/admin/src/lib.rs similarity index 100% rename from admin/src/lib.rs rename to api/admin/src/lib.rs diff --git a/admin/src/middlewares.rs b/api/admin/src/middlewares.rs similarity index 100% rename from admin/src/middlewares.rs rename to api/admin/src/middlewares.rs diff --git a/admin/src/object_api.rs b/api/admin/src/object_api.rs similarity index 100% rename from admin/src/object_api.rs rename to api/admin/src/object_api.rs diff --git a/rustfs/Cargo.toml b/rustfs/Cargo.toml index d23437931..bb10c8eea 100644 --- a/rustfs/Cargo.toml +++ b/rustfs/Cargo.toml @@ -49,7 +49,7 @@ tracing-error.workspace = true tracing-subscriber.workspace = true transform-stream.workspace = true uuid = "1.10.0" -admin = { path = "../admin" } +admin = { path = "../api/admin" } axum.workspace = true [build-dependencies]