From e7cb7d93210ec35649f2636f1c7aa07853f21594 Mon Sep 17 00:00:00 2001 From: steven-omaha <35634100+steven-omaha@users.noreply.github.com> Date: Tue, 14 Feb 2023 13:12:08 +0100 Subject: [PATCH] rename all crates --- Cargo.lock | 72 +++++++++---------- Cargo.toml | 11 +-- README.md | 4 +- crates/core/Cargo.toml | 20 ------ crates/macros/Cargo.toml | 13 ---- crates/main/Cargo.toml | 13 ---- crates/pacdef_core/Cargo.toml | 25 +++++++ crates/pacdef_core/README.md | 3 + crates/{core => pacdef_core}/build.rs | 0 crates/{core => pacdef_core}/src/action.rs | 2 +- crates/{core => pacdef_core}/src/args.rs | 0 .../src/backend/actual/mod.rs | 0 .../src/backend/actual/pacman.rs | 0 .../src/backend/actual/rust.rs | 0 .../src/backend/backend_trait.rs | 0 .../{core => pacdef_core}/src/backend/iter.rs | 0 .../src/backend/macros.rs | 0 .../{core => pacdef_core}/src/backend/mod.rs | 2 +- .../src/backend/todo_per_backend.rs | 0 crates/{core => pacdef_core}/src/cmd.rs | 0 crates/{core => pacdef_core}/src/config.rs | 0 crates/{core => pacdef_core}/src/core.rs | 0 crates/{core => pacdef_core}/src/env.rs | 0 .../src/grouping/group.rs | 0 .../{core => pacdef_core}/src/grouping/mod.rs | 0 .../src/grouping/package.rs | 0 .../src/grouping/section.rs | 0 crates/{core => pacdef_core}/src/lib.rs | 2 +- crates/{core => pacdef_core}/src/path.rs | 0 .../src/review/datastructures.rs | 0 .../{core => pacdef_core}/src/review/mod.rs | 0 .../src/review/strategy.rs | 0 crates/{core => pacdef_core}/src/search.rs | 0 crates/{core => pacdef_core}/src/ui.rs | 0 crates/pacdef_macros/Cargo.toml | 18 +++++ crates/pacdef_macros/README.md | 3 + .../{macros => pacdef_macros}/src/action.rs | 0 crates/{macros => pacdef_macros}/src/lib.rs | 0 .../{macros => pacdef_macros}/src/register.rs | 0 crates/pacdef_main/Cargo.toml | 18 +++++ crates/pacdef_main/README.md | 3 + crates/{main => pacdef_main}/main.rs | 3 +- 42 files changed, 119 insertions(+), 93 deletions(-) delete mode 100644 crates/core/Cargo.toml delete mode 100644 crates/macros/Cargo.toml delete mode 100644 crates/main/Cargo.toml create mode 100644 crates/pacdef_core/Cargo.toml create mode 100644 crates/pacdef_core/README.md rename crates/{core => pacdef_core}/build.rs (100%) rename crates/{core => pacdef_core}/src/action.rs (87%) rename crates/{core => pacdef_core}/src/args.rs (100%) rename crates/{core => pacdef_core}/src/backend/actual/mod.rs (100%) rename crates/{core => pacdef_core}/src/backend/actual/pacman.rs (100%) rename crates/{core => pacdef_core}/src/backend/actual/rust.rs (100%) rename crates/{core => pacdef_core}/src/backend/backend_trait.rs (100%) rename crates/{core => pacdef_core}/src/backend/iter.rs (100%) rename crates/{core => pacdef_core}/src/backend/macros.rs (100%) rename crates/{core => pacdef_core}/src/backend/mod.rs (89%) rename crates/{core => pacdef_core}/src/backend/todo_per_backend.rs (100%) rename crates/{core => pacdef_core}/src/cmd.rs (100%) rename crates/{core => pacdef_core}/src/config.rs (100%) rename crates/{core => pacdef_core}/src/core.rs (100%) rename crates/{core => pacdef_core}/src/env.rs (100%) rename crates/{core => pacdef_core}/src/grouping/group.rs (100%) rename crates/{core => pacdef_core}/src/grouping/mod.rs (100%) rename crates/{core => pacdef_core}/src/grouping/package.rs (100%) rename crates/{core => pacdef_core}/src/grouping/section.rs (100%) rename crates/{core => pacdef_core}/src/lib.rs (95%) rename crates/{core => pacdef_core}/src/path.rs (100%) rename crates/{core => pacdef_core}/src/review/datastructures.rs (100%) rename crates/{core => pacdef_core}/src/review/mod.rs (100%) rename crates/{core => pacdef_core}/src/review/strategy.rs (100%) rename crates/{core => pacdef_core}/src/search.rs (100%) rename crates/{core => pacdef_core}/src/ui.rs (100%) create mode 100644 crates/pacdef_macros/Cargo.toml create mode 100644 crates/pacdef_macros/README.md rename crates/{macros => pacdef_macros}/src/action.rs (100%) rename crates/{macros => pacdef_macros}/src/lib.rs (100%) rename crates/{macros => pacdef_macros}/src/register.rs (100%) create mode 100644 crates/pacdef_main/Cargo.toml create mode 100644 crates/pacdef_main/README.md rename crates/{main => pacdef_main}/main.rs (92%) diff --git a/Cargo.lock b/Cargo.lock index f1a2b66..f3b51a5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -76,23 +76,6 @@ dependencies = [ "os_str_bytes", ] -[[package]] -name = "core" -version = "1.0.0-beta2" -dependencies = [ - "alpm", - "anyhow", - "clap", - "macros", - "path-absolutize", - "regex", - "serde", - "serde_derive", - "serde_json", - "serde_yaml", - "termios", -] - [[package]] name = "errno" version = "0.2.8" @@ -176,23 +159,6 @@ version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" -[[package]] -name = "macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "main" -version = "1.0.0-beta2" -dependencies = [ - "anyhow", - "core", -] - [[package]] name = "memchr" version = "2.5.0" @@ -218,8 +184,8 @@ dependencies = [ "alpm", "anyhow", "clap", - "core", - "macros", + "pacdef_core", + "pacdef_macros", "path-absolutize", "regex", "serde", @@ -229,6 +195,40 @@ dependencies = [ "termios", ] +[[package]] +name = "pacdef_core" +version = "1.0.0-beta2" +dependencies = [ + "alpm", + "anyhow", + "clap", + "pacdef_macros", + "path-absolutize", + "regex", + "serde", + "serde_derive", + "serde_json", + "serde_yaml", + "termios", +] + +[[package]] +name = "pacdef_macros" +version = "0.1.0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pacdef_main" +version = "1.0.0-beta2" +dependencies = [ + "anyhow", + "pacdef_core", +] + [[package]] name = "path-absolutize" version = "3.0.14" diff --git a/Cargo.toml b/Cargo.toml index 1c83ae6..5c25366 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,9 +5,12 @@ edition = "2021" description = "declarative package manager for Arch Linux" license = "GPLv3" repository = "https://github.com/steven-omaha/pacdef" +readme = "README.md" +keywords = ["package-manager", "linux", "declarative", "cli"] +categories = ["command-line-utilities"] [workspace] -members = ["crates/main", "crates/macros", "crates/core"] +members = ["crates/pacdef_main", "crates/pacdef_macros", "crates/pacdef_core"] [dependencies] alpm = "2.2" @@ -22,12 +25,12 @@ serde_yaml = "0.9" serde_derive = "1.0" serde = "1.0" -macros = {path = "crates/macros", version = "0.1"} -core = {path = "crates/core", version = "1.0.0-beta2"} +pacdef_macros = {path = "crates/pacdef_macros", version = "0.1"} +pacdef_core = {path = "crates/pacdef_core", version = "1.0.0-beta2"} [[bin]] name = "pacdef" -path = "crates/main/main.rs" +path = "crates/pacdef_main/main.rs" [profile.release] lto = "off" diff --git a/README.md b/README.md index cd75823..f5821db 100644 --- a/README.md +++ b/README.md @@ -208,6 +208,4 @@ topgrade ## TODO -* add license -* in outermost Cargo.toml, add categories, keywords, readme - +none at this time diff --git a/crates/core/Cargo.toml b/crates/core/Cargo.toml deleted file mode 100644 index 78de922..0000000 --- a/crates/core/Cargo.toml +++ /dev/null @@ -1,20 +0,0 @@ -[package] -name = "core" -version = "1.0.0-beta2" -edition = "2021" -description = "pacdef main library" - -[dependencies] -alpm = "2.2" -anyhow = "1.0" -clap = "4.1" -path-absolutize = "3.0" -regex = "1.7" -termios = "0.3" - -serde_json = "1.0" -serde_yaml = "0.9" -serde_derive = "1.0" -serde = "1.0" - -macros = {path = "../macros", version = "0.1"} diff --git a/crates/macros/Cargo.toml b/crates/macros/Cargo.toml deleted file mode 100644 index 48d8c90..0000000 --- a/crates/macros/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "macros" -version = "0.1.0" -edition = "2021" -description = "procedural macros for pacdef" - -[dependencies] -proc-macro2 = "1.0" -quote = "1.0" -syn = "1.0" - -[lib] -proc-macro = true diff --git a/crates/main/Cargo.toml b/crates/main/Cargo.toml deleted file mode 100644 index 19b9b46..0000000 --- a/crates/main/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "main" -version = "1.0.0-beta2" -edition = "2021" -description = "main program for pacdef" - -[[bin]] -name = "pacdef" -path = "main.rs" - -[dependencies] -anyhow = "1.0" -core = { path = "../core", version = "1.0.0-beta2" } diff --git a/crates/pacdef_core/Cargo.toml b/crates/pacdef_core/Cargo.toml new file mode 100644 index 0000000..782ff79 --- /dev/null +++ b/crates/pacdef_core/Cargo.toml @@ -0,0 +1,25 @@ +[package] +name = "pacdef_core" +version = "1.0.0-beta2" +edition = "2021" +description = "pacdef core library" +license = "GPLv3" +repository = "https://github.com/steven-omaha/pacdef" +readme = "README.md" +keywords = ["package-manager", "linux", "declarative", "cli"] +categories = ["command-line-utilities"] + +[dependencies] +alpm = "2.2" +anyhow = "1.0" +clap = "4.1" +path-absolutize = "3.0" +regex = "1.7" +termios = "0.3" + +serde_json = "1.0" +serde_yaml = "0.9" +serde_derive = "1.0" +serde = "1.0" + +pacdef_macros = {path = "../pacdef_macros", version = "0.1"} diff --git a/crates/pacdef_core/README.md b/crates/pacdef_core/README.md new file mode 100644 index 0000000..33f80c7 --- /dev/null +++ b/crates/pacdef_core/README.md @@ -0,0 +1,3 @@ +# pacdef_core + +core library for pacdef diff --git a/crates/core/build.rs b/crates/pacdef_core/build.rs similarity index 100% rename from crates/core/build.rs rename to crates/pacdef_core/build.rs diff --git a/crates/core/src/action.rs b/crates/pacdef_core/src/action.rs similarity index 87% rename from crates/core/src/action.rs rename to crates/pacdef_core/src/action.rs index 4de6a8f..03ab9e5 100644 --- a/crates/core/src/action.rs +++ b/crates/pacdef_core/src/action.rs @@ -1,4 +1,4 @@ -use macros::Action; +use pacdef_macros::Action; #[derive(Debug, Action)] pub enum Actions { diff --git a/crates/core/src/args.rs b/crates/pacdef_core/src/args.rs similarity index 100% rename from crates/core/src/args.rs rename to crates/pacdef_core/src/args.rs diff --git a/crates/core/src/backend/actual/mod.rs b/crates/pacdef_core/src/backend/actual/mod.rs similarity index 100% rename from crates/core/src/backend/actual/mod.rs rename to crates/pacdef_core/src/backend/actual/mod.rs diff --git a/crates/core/src/backend/actual/pacman.rs b/crates/pacdef_core/src/backend/actual/pacman.rs similarity index 100% rename from crates/core/src/backend/actual/pacman.rs rename to crates/pacdef_core/src/backend/actual/pacman.rs diff --git a/crates/core/src/backend/actual/rust.rs b/crates/pacdef_core/src/backend/actual/rust.rs similarity index 100% rename from crates/core/src/backend/actual/rust.rs rename to crates/pacdef_core/src/backend/actual/rust.rs diff --git a/crates/core/src/backend/backend_trait.rs b/crates/pacdef_core/src/backend/backend_trait.rs similarity index 100% rename from crates/core/src/backend/backend_trait.rs rename to crates/pacdef_core/src/backend/backend_trait.rs diff --git a/crates/core/src/backend/iter.rs b/crates/pacdef_core/src/backend/iter.rs similarity index 100% rename from crates/core/src/backend/iter.rs rename to crates/pacdef_core/src/backend/iter.rs diff --git a/crates/core/src/backend/macros.rs b/crates/pacdef_core/src/backend/macros.rs similarity index 100% rename from crates/core/src/backend/macros.rs rename to crates/pacdef_core/src/backend/macros.rs diff --git a/crates/core/src/backend/mod.rs b/crates/pacdef_core/src/backend/mod.rs similarity index 89% rename from crates/core/src/backend/mod.rs rename to crates/pacdef_core/src/backend/mod.rs index 9f3d804..f9f38a6 100644 --- a/crates/core/src/backend/mod.rs +++ b/crates/pacdef_core/src/backend/mod.rs @@ -8,7 +8,7 @@ pub use backend_trait::Backend; pub use iter::BackendIter; pub use todo_per_backend::ToDoPerBackend; -use ::macros::Register; +use pacdef_macros::Register; #[derive(Debug, Register)] pub enum Backends { diff --git a/crates/core/src/backend/todo_per_backend.rs b/crates/pacdef_core/src/backend/todo_per_backend.rs similarity index 100% rename from crates/core/src/backend/todo_per_backend.rs rename to crates/pacdef_core/src/backend/todo_per_backend.rs diff --git a/crates/core/src/cmd.rs b/crates/pacdef_core/src/cmd.rs similarity index 100% rename from crates/core/src/cmd.rs rename to crates/pacdef_core/src/cmd.rs diff --git a/crates/core/src/config.rs b/crates/pacdef_core/src/config.rs similarity index 100% rename from crates/core/src/config.rs rename to crates/pacdef_core/src/config.rs diff --git a/crates/core/src/core.rs b/crates/pacdef_core/src/core.rs similarity index 100% rename from crates/core/src/core.rs rename to crates/pacdef_core/src/core.rs diff --git a/crates/core/src/env.rs b/crates/pacdef_core/src/env.rs similarity index 100% rename from crates/core/src/env.rs rename to crates/pacdef_core/src/env.rs diff --git a/crates/core/src/grouping/group.rs b/crates/pacdef_core/src/grouping/group.rs similarity index 100% rename from crates/core/src/grouping/group.rs rename to crates/pacdef_core/src/grouping/group.rs diff --git a/crates/core/src/grouping/mod.rs b/crates/pacdef_core/src/grouping/mod.rs similarity index 100% rename from crates/core/src/grouping/mod.rs rename to crates/pacdef_core/src/grouping/mod.rs diff --git a/crates/core/src/grouping/package.rs b/crates/pacdef_core/src/grouping/package.rs similarity index 100% rename from crates/core/src/grouping/package.rs rename to crates/pacdef_core/src/grouping/package.rs diff --git a/crates/core/src/grouping/section.rs b/crates/pacdef_core/src/grouping/section.rs similarity index 100% rename from crates/core/src/grouping/section.rs rename to crates/pacdef_core/src/grouping/section.rs diff --git a/crates/core/src/lib.rs b/crates/pacdef_core/src/lib.rs similarity index 95% rename from crates/core/src/lib.rs rename to crates/pacdef_core/src/lib.rs index 6b64bf6..6a48cd4 100644 --- a/crates/core/src/lib.rs +++ b/crates/pacdef_core/src/lib.rs @@ -28,4 +28,4 @@ pub use crate::grouping::Group; pub(crate) use crate::grouping::Package; pub use crate::search::NO_PACKAGES_FOUND; -extern crate macros; +extern crate pacdef_macros; diff --git a/crates/core/src/path.rs b/crates/pacdef_core/src/path.rs similarity index 100% rename from crates/core/src/path.rs rename to crates/pacdef_core/src/path.rs diff --git a/crates/core/src/review/datastructures.rs b/crates/pacdef_core/src/review/datastructures.rs similarity index 100% rename from crates/core/src/review/datastructures.rs rename to crates/pacdef_core/src/review/datastructures.rs diff --git a/crates/core/src/review/mod.rs b/crates/pacdef_core/src/review/mod.rs similarity index 100% rename from crates/core/src/review/mod.rs rename to crates/pacdef_core/src/review/mod.rs diff --git a/crates/core/src/review/strategy.rs b/crates/pacdef_core/src/review/strategy.rs similarity index 100% rename from crates/core/src/review/strategy.rs rename to crates/pacdef_core/src/review/strategy.rs diff --git a/crates/core/src/search.rs b/crates/pacdef_core/src/search.rs similarity index 100% rename from crates/core/src/search.rs rename to crates/pacdef_core/src/search.rs diff --git a/crates/core/src/ui.rs b/crates/pacdef_core/src/ui.rs similarity index 100% rename from crates/core/src/ui.rs rename to crates/pacdef_core/src/ui.rs diff --git a/crates/pacdef_macros/Cargo.toml b/crates/pacdef_macros/Cargo.toml new file mode 100644 index 0000000..04fb807 --- /dev/null +++ b/crates/pacdef_macros/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "pacdef_macros" +version = "0.1.0" +edition = "2021" +license = "GPLv3" +readme = "README.md" +repository = "https://github.com/steven-omaha/pacdef" +description = "procedural macros for pacdef" +keywords = ["macro", "proc-macro"] +categories = ["command-line-utilities"] + +[dependencies] +proc-macro2 = "1.0" +quote = "1.0" +syn = "1.0" + +[lib] +proc-macro = true diff --git a/crates/pacdef_macros/README.md b/crates/pacdef_macros/README.md new file mode 100644 index 0000000..ab21565 --- /dev/null +++ b/crates/pacdef_macros/README.md @@ -0,0 +1,3 @@ +# pacdef_macros + +procedural macros for pacdef diff --git a/crates/macros/src/action.rs b/crates/pacdef_macros/src/action.rs similarity index 100% rename from crates/macros/src/action.rs rename to crates/pacdef_macros/src/action.rs diff --git a/crates/macros/src/lib.rs b/crates/pacdef_macros/src/lib.rs similarity index 100% rename from crates/macros/src/lib.rs rename to crates/pacdef_macros/src/lib.rs diff --git a/crates/macros/src/register.rs b/crates/pacdef_macros/src/register.rs similarity index 100% rename from crates/macros/src/register.rs rename to crates/pacdef_macros/src/register.rs diff --git a/crates/pacdef_main/Cargo.toml b/crates/pacdef_main/Cargo.toml new file mode 100644 index 0000000..c9cfe35 --- /dev/null +++ b/crates/pacdef_main/Cargo.toml @@ -0,0 +1,18 @@ +[package] +name = "pacdef_main" +version = "1.0.0-beta2" +edition = "2021" +description = "main program for pacdef" +license = "GPLv3" +repository = "https://github.com/steven-omaha/pacdef" +readme = "README.md" +keywords = ["package-manager", "linux", "declarative", "cli"] +categories = ["command-line-utilities"] + +[[bin]] +name = "pacdef" +path = "main.rs" + +[dependencies] +anyhow = "1.0" +pacdef_core = { path = "../pacdef_core", version = "1.0.0-beta2" } diff --git a/crates/pacdef_main/README.md b/crates/pacdef_main/README.md new file mode 100644 index 0000000..d500a01 --- /dev/null +++ b/crates/pacdef_main/README.md @@ -0,0 +1,3 @@ +# pacdef_main + +main program for pacdef diff --git a/crates/main/main.rs b/crates/pacdef_main/main.rs similarity index 92% rename from crates/main/main.rs rename to crates/pacdef_main/main.rs index c9ca06f..94b8d1c 100644 --- a/crates/main/main.rs +++ b/crates/pacdef_main/main.rs @@ -2,7 +2,8 @@ use std::process::{ExitCode, Termination}; use anyhow::{Context, Result}; -use core::{args, Config, Group, Pacdef}; +use pacdef_core as core; +use pacdef_core::{args, Config, Group, Pacdef}; fn main() -> ExitCode { handle_final_result(main_inner())