restructure project into a virtual manifest

- remove redundant readme
- de-duplicate Cargo.toml information using workspace inheritance
- rename "pacdef_core" to "pacdef"
- move "crates/main/main.rs" to "crates/pacdef/src/main.rs"
This commit is contained in:
ripytide
2024-04-13 14:37:12 +01:00
parent bdfa9b6aeb
commit b473f8e432
48 changed files with 37 additions and 73 deletions
@@ -1,16 +1,17 @@
[package]
name = "pacdef_core"
name = "pacdef"
description = "multi-backend declarative package manager for Linux"
version = "1.6.0"
edition = "2021"
description = "pacdef core library"
license = "GPL-3.0-or-later"
repository = "https://github.com/steven-omaha/pacdef/tree/main/crates/pacdef_core"
readme = "README.md"
keywords = ["package-manager", "linux", "declarative", "cli"]
categories = ["command-line-utilities"]
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
keywords.workspace = true
categories.workspace = true
[dependencies]
anyhow = { workspace = true }
anyhow = "1.0"
clap = "4.5"
const_format = { version = "0.2", default-features = false }
path-absolutize = "3.1"
@@ -24,7 +25,7 @@ serde_derive = "1.0"
serde_json = "1.0"
serde_yaml = "0.9"
pacdef_macros = { path = "../pacdef_macros", version = "1.0" }
pacdef_macros.workspace = true
# backends
alpm = { version = "3.0", optional = true }
@@ -548,7 +548,7 @@ where
Err(e) => {
// CrossesDevices is nightly. See rust #86442.
// We cannot check that here, so we just assume that
// that would be the error if permisisons are okay.
// that would be the error if permissions are okay.
if e.kind() == std::io::ErrorKind::PermissionDenied {
bail!(e);
}
@@ -583,7 +583,7 @@ fn find_groups_by_name<'a>(names: &[String], groups: &'a HashSet<Group>) -> Resu
Ok(result)
}
/// Show the error chain for an error that has occured when a backend was queried
/// Show the error chain for an error that has occurred when a backend was queried
/// if the `RUST_BACKTRACE` env variable is set to `1` or `full`.
#[allow(clippy::option_if_let_else)]
fn show_backend_query_error(error: &anyhow::Error, backend: &dyn Backend) {
@@ -1,5 +1,5 @@
/*!
Main program for `pacdef`. All internal logic happens in [`pacdef_core`].
Main program for `pacdef`.
*/
#![warn(
@@ -21,8 +21,8 @@ use std::process::{ExitCode, Termination};
use anyhow::{bail, Context, Result};
use pacdef_core::path::{get_config_path, get_config_path_old_version, get_group_dir};
use pacdef_core::{get_args, Config, Error as PacdefError, Group, Pacdef};
use pacdef::path::{get_config_path, get_config_path_old_version, get_group_dir};
use pacdef::{get_args, Config, Error as PacdefError, Group, Pacdef};
const MAJOR_UPDATE_MESSAGE: &str = "VERSION UPGRADE
You seem to have used version 0.x of pacdef before.
@@ -53,8 +53,8 @@ pub fn review(
println!();
let mut iter = strategies.iter().peekable();
while let Some(strat) = iter.next() {
strat.show();
while let Some(strategy) = iter.next() {
strategy.show();
if iter.peek().is_some() {
println!();
@@ -66,8 +66,8 @@ pub fn review(
return Ok(());
}
for strat in strategies {
strat.execute()?;
for strategy in strategies {
strategy.execute()?;
}
Ok(())
-8
View File
@@ -1,8 +0,0 @@
# pacdef_core
core library for pacdef
## supported rust version
latest stable
+8 -7
View File
@@ -1,13 +1,14 @@
[package]
name = "pacdef_macros"
version = "1.0.1"
edition = "2021"
license = "GPL-3.0-or-later"
readme = "README.md"
repository = "https://github.com/steven-omaha/pacdef/tree/main/crates/pacdef_macros"
description = "procedural macros for pacdef"
keywords = ["macro", "proc-macro"]
categories = ["command-line-utilities"]
version = "1.0.1"
edition.workspace = true
license.workspace = true
repository.workspace = true
readme.workspace = true
keywords.workspace = true
categories.workspace = true
[dependencies]
proc-macro2 = "1.0"
-8
View File
@@ -1,8 +0,0 @@
# pacdef_macros
procedural macros for pacdef
## supported rust version
latest stable