From 6c9286857ef8b314962b67f4a16a66e8c35531bc Mon Sep 17 00:00:00 2001 From: Benedikt Peetz Date: Mon, 14 Oct 2024 14:56:29 +0200 Subject: refactor(treewide): Combine the separate crates in one workspace --- crates/bytes/Cargo.toml | 24 +++++++++++++++++------- crates/bytes/src/lib.rs | 1 - crates/libmpv2/Cargo.toml | 7 ++----- crates/yt_dlp/Cargo.toml | 33 +++++++++++++++++++++++---------- 4 files changed, 42 insertions(+), 23 deletions(-) (limited to 'crates') diff --git a/crates/bytes/Cargo.toml b/crates/bytes/Cargo.toml index 0dc9833..4439aa8 100644 --- a/crates/bytes/Cargo.toml +++ b/crates/bytes/Cargo.toml @@ -10,14 +10,24 @@ [package] name = "bytes" -version = "1.0.0" -edition = "2021" -license = "GPL-3.0-or-later" description = "Simple byte formatting utilities" +keywords = [] +categories = [] +version.workspace = true +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +rust-version.workspace = true +publish = false [dependencies] -serde = { version = "1.0.210", optional = true } +serde.workspace = true -[features] -default = ["serde"] -serde = ["dep:serde"] +[dev-dependencies] + +[lints] +workspace = true + +[package.metadata.docs.rs] +all-features = true diff --git a/crates/bytes/src/lib.rs b/crates/bytes/src/lib.rs index 113e8d5..78d3c4e 100644 --- a/crates/bytes/src/lib.rs +++ b/crates/bytes/src/lib.rs @@ -26,7 +26,6 @@ const GB: u64 = 1000 * MB; const TB: u64 = 1000 * GB; pub mod error; -#[cfg(feature = "serde")] pub mod serde; #[derive(Clone, Copy)] diff --git a/crates/libmpv2/Cargo.toml b/crates/libmpv2/Cargo.toml index d92a012..8d45872 100644 --- a/crates/libmpv2/Cargo.toml +++ b/crates/libmpv2/Cargo.toml @@ -8,9 +8,6 @@ # You should have received a copy of the License along with this program. # If not, see . -[workspace] -members = ["libmpv2-sys"] - [package] name = "libmpv2" version = "4.0.0" @@ -23,8 +20,8 @@ keywords = ["media", "playback", "mpv", "libmpv"] [dependencies] libmpv2-sys = { path = "libmpv2-sys", version = "4.0.0" } -log = "0.4.22" -thiserror = "1.0.63" +thiserror = "1.0.64" +log = { version = "0.4.22" } [dev-dependencies] crossbeam = "0.8" diff --git a/crates/yt_dlp/Cargo.toml b/crates/yt_dlp/Cargo.toml index 6cedf5b..0f1d248 100644 --- a/crates/yt_dlp/Cargo.toml +++ b/crates/yt_dlp/Cargo.toml @@ -11,15 +11,28 @@ [package] name = "yt_dlp" description = "A wrapper around the python yt_dlp library" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +keywords = [] +categories = [] +version.workspace = true +edition.workspace = true +authors.workspace = true +license.workspace = true +repository.workspace = true +rust-version.workspace = true +publish = false [dependencies] -log = "0.4.22" -pyo3 = { version = "0.22.2", features = ["auto-initialize", "gil-refs"] } -serde = { version = "1.0.210", features = ["derive"] } -serde_json = "1.0.128" -url = { version = "2.5.2", features = ["serde"] } -bytes = { path = "../bytes" } +pyo3 = { version = "0.22.4", features = ["auto-initialize", "gil-refs"] } +bytes.workspace = true +log.workspace = true +serde.workspace = true +serde_json.workspace = true +url.workspace = true + +[dev-dependencies] + +[lints] +workspace = true + +[package.metadata.docs.rs] +all-features = true -- cgit 1.4.1