From 0e3ffc09916d6f912873641526c96603049367df Mon Sep 17 00:00:00 2001 From: Fries Date: Wed, 12 Jul 2023 17:36:39 -0700 Subject: [PATCH] move crates out to a folder this should make the code cleaner if we need to add more crates as it can get messy if we keep stacking crates in the root directory --- Cargo.lock | 1 - Cargo.toml | 7 +++---- {cli => crates/cli}/Cargo.toml | 0 {cli => crates/cli}/src/arguments.rs | 0 {cli => crates/cli}/src/commands/add.rs | 0 {cli => crates/cli}/src/commands/mod.rs | 0 {cli => crates/cli}/src/commands/print.rs | 0 {cli => crates/cli}/src/commands/remove.rs | 0 {cli => crates/cli}/src/commands/utils.rs | 0 {cli => crates/cli}/src/logging.rs | 0 {cli => crates/cli}/src/main.rs | 0 {proc-macros => crates/proc-macros}/Cargo.toml | 0 {proc-macros => crates/proc-macros}/src/lib.rs | 0 {shared => crates/shared}/Cargo.toml | 0 {shared => crates/shared}/src/directories.rs | 0 {shared => crates/shared}/src/errors.rs | 0 {shared => crates/shared}/src/lib.rs | 0 {shared => crates/shared}/src/names.rs | 0 18 files changed, 3 insertions(+), 5 deletions(-) rename {cli => crates/cli}/Cargo.toml (100%) rename {cli => crates/cli}/src/arguments.rs (100%) rename {cli => crates/cli}/src/commands/add.rs (100%) rename {cli => crates/cli}/src/commands/mod.rs (100%) rename {cli => crates/cli}/src/commands/print.rs (100%) rename {cli => crates/cli}/src/commands/remove.rs (100%) rename {cli => crates/cli}/src/commands/utils.rs (100%) rename {cli => crates/cli}/src/logging.rs (100%) rename {cli => crates/cli}/src/main.rs (100%) rename {proc-macros => crates/proc-macros}/Cargo.toml (100%) rename {proc-macros => crates/proc-macros}/src/lib.rs (100%) rename {shared => crates/shared}/Cargo.toml (100%) rename {shared => crates/shared}/src/directories.rs (100%) rename {shared => crates/shared}/src/errors.rs (100%) rename {shared => crates/shared}/src/lib.rs (100%) rename {shared => crates/shared}/src/names.rs (100%) diff --git a/Cargo.lock b/Cargo.lock index f299f4e..1ccbaa5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -863,7 +863,6 @@ dependencies = [ "askama", "askama_rocket", "hex", - "log", "notify", "proc_macros", "rocket", diff --git a/Cargo.toml b/Cargo.toml index 5d9d969..a4cf50b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,5 @@ [workspace] -members = ["cli", "shared", "proc-macros"] +members = ["crates/*"] [package] name = "meowy-webring" @@ -16,7 +16,6 @@ lto = "thin" [dependencies] hex = "0.4" -log = "0.4" [dependencies.rocket] version = "=0.5.0-rc.3" @@ -47,7 +46,7 @@ version = "0.12" default-features = false [dependencies.shared] -path = "./shared" +path = "./crates/shared" [dependencies.simple_logger] version = "4" @@ -63,4 +62,4 @@ version = "=0.6.0-alpha2" default_features = false [dependencies.proc_macros] -path = "./proc-macros" +path = "./crates/proc-macros" diff --git a/cli/Cargo.toml b/crates/cli/Cargo.toml similarity index 100% rename from cli/Cargo.toml rename to crates/cli/Cargo.toml diff --git a/cli/src/arguments.rs b/crates/cli/src/arguments.rs similarity index 100% rename from cli/src/arguments.rs rename to crates/cli/src/arguments.rs diff --git a/cli/src/commands/add.rs b/crates/cli/src/commands/add.rs similarity index 100% rename from cli/src/commands/add.rs rename to crates/cli/src/commands/add.rs diff --git a/cli/src/commands/mod.rs b/crates/cli/src/commands/mod.rs similarity index 100% rename from cli/src/commands/mod.rs rename to crates/cli/src/commands/mod.rs diff --git a/cli/src/commands/print.rs b/crates/cli/src/commands/print.rs similarity index 100% rename from cli/src/commands/print.rs rename to crates/cli/src/commands/print.rs diff --git a/cli/src/commands/remove.rs b/crates/cli/src/commands/remove.rs similarity index 100% rename from cli/src/commands/remove.rs rename to crates/cli/src/commands/remove.rs diff --git a/cli/src/commands/utils.rs b/crates/cli/src/commands/utils.rs similarity index 100% rename from cli/src/commands/utils.rs rename to crates/cli/src/commands/utils.rs diff --git a/cli/src/logging.rs b/crates/cli/src/logging.rs similarity index 100% rename from cli/src/logging.rs rename to crates/cli/src/logging.rs diff --git a/cli/src/main.rs b/crates/cli/src/main.rs similarity index 100% rename from cli/src/main.rs rename to crates/cli/src/main.rs diff --git a/proc-macros/Cargo.toml b/crates/proc-macros/Cargo.toml similarity index 100% rename from proc-macros/Cargo.toml rename to crates/proc-macros/Cargo.toml diff --git a/proc-macros/src/lib.rs b/crates/proc-macros/src/lib.rs similarity index 100% rename from proc-macros/src/lib.rs rename to crates/proc-macros/src/lib.rs diff --git a/shared/Cargo.toml b/crates/shared/Cargo.toml similarity index 100% rename from shared/Cargo.toml rename to crates/shared/Cargo.toml diff --git a/shared/src/directories.rs b/crates/shared/src/directories.rs similarity index 100% rename from shared/src/directories.rs rename to crates/shared/src/directories.rs diff --git a/shared/src/errors.rs b/crates/shared/src/errors.rs similarity index 100% rename from shared/src/errors.rs rename to crates/shared/src/errors.rs diff --git a/shared/src/lib.rs b/crates/shared/src/lib.rs similarity index 100% rename from shared/src/lib.rs rename to crates/shared/src/lib.rs diff --git a/shared/src/names.rs b/crates/shared/src/names.rs similarity index 100% rename from shared/src/names.rs rename to crates/shared/src/names.rs