From 3d268a474391c58d63b4960341dc191c891c47e6 Mon Sep 17 00:00:00 2001 From: cgmossa Date: Thu, 30 Nov 2023 12:18:18 +0100 Subject: [PATCH 1/2] workspace must specify latest resolver --- Cargo.toml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Cargo.toml b/Cargo.toml index e5ff1b3b1..fc3b1dd03 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,4 +1,6 @@ [workspace] +resolver = "2" + members = [ "crates/resvg", "crates/usvg", From fa6fa9aee5b9918c430d6ad7aeb36fe967965ce3 Mon Sep 17 00:00:00 2001 From: cgmossa Date: Thu, 30 Nov 2023 12:19:29 +0100 Subject: [PATCH 2/2] make `pico-args` a binary-only dependency --- crates/resvg/Cargo.toml | 4 ++-- crates/usvg/Cargo.toml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crates/resvg/Cargo.toml b/crates/resvg/Cargo.toml index 857153960..d877ce685 100644 --- a/crates/resvg/Cargo.toml +++ b/crates/resvg/Cargo.toml @@ -12,13 +12,13 @@ workspace = "../.." [[bin]] name = "resvg" -required-features = ["text", "system-fonts", "memmap-fonts"] +required-features = ["text", "system-fonts", "memmap-fonts", "pico-args"] [dependencies] gif = { version = "0.12", optional = true } jpeg-decoder = { version = "0.3", default-features = false, features = ["platform_independent"], optional = true } log = "0.4" -pico-args = { version = "0.5", features = ["eq-separator"] } +pico-args = { version = "0.5", optional = true, features = ["eq-separator"] } png = { version = "0.17", optional = true } rgb = "0.8" svgtypes = { git = "https://github.com/RazrFalcon/svgtypes" } diff --git a/crates/usvg/Cargo.toml b/crates/usvg/Cargo.toml index 09cf9f28f..f12d0f1f7 100644 --- a/crates/usvg/Cargo.toml +++ b/crates/usvg/Cargo.toml @@ -15,12 +15,12 @@ workspace = "../.." [[bin]] name = "usvg" -required-features = ["text", "system-fonts", "memmap-fonts"] +required-features = ["text", "system-fonts", "memmap-fonts", "pico-args"] [dependencies] base64 = "0.21" # for embedded images log = "0.4" -pico-args = { version = "0.5", features = ["eq-separator"] } +pico-args = { version = "0.5", optional = true, features = ["eq-separator"] } usvg-parser = { path = "../usvg-parser", version = "0.36.0" } usvg-tree = { path = "../usvg-tree", version = "0.36.0" } xmlwriter = "0.1"