chore: cleanup dependency features and deny

bazed-editor · Mar 14, 2023 · dec3168 · dec3168
1 parent 3f0d709
commit dec3168
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 15 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/bazed-stew-macros/Cargo.toml b/crates/bazed-stew-macros/Cargo.toml
@@ -13,10 +13,8 @@ license.workspace = true
 proc-macro = true
 
 [dependencies]
-syn = { version = "1.0.107", features = ["full"] }
+syn = { version = "1.0.107", features = ["extra-traits"] }
 quote = "1.0.23"
 proc-macro2 = "1.0.51"
 proc-macro-error = "1.0.4"
-
-# outdated version to appease cargo deny -> tauri uses 0.13.4
-darling = { version = "0.13.4" }
+darling = { version = "0.14.4" }
diff --git a/crates/bazed-stew-macros/src/lib.rs b/crates/bazed-stew-macros/src/lib.rs
@@ -52,7 +52,7 @@ pub fn plugin(attrs: TokenStream, input: TokenStream) -> TokenStream {
         pub use #internal_ident::#client_impl_name;
         mod #internal_ident {
             use super::*;
-            use bazed_stew_interface::{
+            use ::bazed_stew_interface::{
                 stew_rpc::{self, StewConnectionSender, StewConnectionReceiver, StewSession, StewSessionBase},
                 rpc_proto::{StewRpcCall, StewRpcMessage, FunctionId, PluginId, PluginMetadata},
                 re_exports

diff --git a/crates/bazed-stew/src/executable.rs b/crates/bazed-stew/src/executable.rs
@@ -44,7 +44,7 @@ impl PluginExecutable {
             .ok_or_else(|| Error::MalformedName(file_name.clone()))?;
         Ok(Self {
             name: name.to_string(),
-            version: Version::parse(&version)?,
+            version: Version::parse(version)?,
             path,
         })
     }
@@ -60,7 +60,6 @@ impl PluginExecutable {
     pub(crate) fn version_matches(&self, version_requirement: &VersionReq) -> bool {
         version_requirement.matches(&self.version)
     }
-
 }
 
 pub fn search_plugins_in(path: &Path) -> impl Iterator<Item = PluginExecutable> {

diff --git a/crates/example-plugin-impl/Cargo.toml b/crates/example-plugin-impl/Cargo.toml
@@ -11,7 +11,6 @@ repository.workspace = true
 license.workspace = true
 
 [dependencies]
-
 async-trait.workspace = true
 bazed-stew-interface.workspace = true
 tracing.workspace = true
@@ -20,6 +19,5 @@ serde_json.workspace = true
 tokio.workspace = true
 tracing-subscriber.workspace = true
 tracing-error.workspace = true
-
 example-plugin-interface.workspace = true
 color-eyre.workspace = true
diff --git a/deny.toml b/deny.toml
@@ -7,7 +7,8 @@ vulnerability = "deny"
 yanked = "deny"
 ignore = [
     "RUSTSEC-2022-0048", # xml-rs
-    "RUSTSEC-2023-0018" # tauri -> remove_dir_all
+    "RUSTSEC-2023-0018", # tauri -> remove_dir_all
+    "RUSTSEC-2023-0019" # kuchiki unmaintained
 ]
 
 [licenses]
@@ -30,9 +31,13 @@ multiple-versions = "deny"
 wildcards = "deny"
 skip = [
     { name = "cfg-expr", version = "0.9.1" }, # https://github.com/tauri-apps/webkit2gtk-rs/pull/134
+    { name = "darling", version = "0.13.4" },
+    { name = "darling_core", version = "0.13.4" },
+    { name = "darling_macro", version = "0.13.4" },
     { name = "getrandom", version = "0.1.16" }, # fixed with next kuchiki release
     { name = "heck", version = "0.3.3" }, # https://github.com/tauri-apps/webkit2gtk-rs/pull/134
     { name = "itoa", version = "0.4.8" }, # blocked by kuchiki (cssparser 0.29)
+    { name = "kuchiki", version = "0.8.1" },
     { name = "phf", version = "0.8.0" }, # fixed with next kuchiki release
     { name = "phf_generator", version = "0.8.0" }, # fixed with next kuchiki release
     { name = "phf_macros", version = "0.8.0" }, # fixed with next kuchiki release