Merge pull request #49 from wolpert/master

Fix for RUSTSEC-2021-0065 (Issue 48)
AzureMarker · Aug 31, 2024 · de34fe5 · de34fe5
2 parents 1caef6a + df20098
commit de34fe5
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv
diff --git a/shaku/Cargo.toml b/shaku/Cargo.toml
@@ -11,12 +11,12 @@ edition = "2018"
 
 [dependencies]
 shaku_derive = { version = "~0.6.0", path = "../shaku_derive", optional = true }
-anymap = "0.12.1"
+anymap2 = "0.13.0"
 once_cell = "1.5"
 
 [dev-dependencies]
 rand = "0.8"
-trybuild = "1.0"
+trybuild = "1.0.18"
 
 [features]
 default = ["thread_safe", "derive"]

diff --git a/shaku/src/module/mod.rs b/shaku/src/module/mod.rs
@@ -9,14 +9,14 @@ pub use self::module_builder::ModuleBuilder;
 pub use self::module_traits::{Module, ModuleInterface};
 
 #[cfg(not(feature = "thread_safe"))]
-type AnyType = dyn anymap::any::Any;
+type AnyType = dyn anymap2::any::Any;
 #[cfg(feature = "thread_safe")]
-type AnyType = dyn anymap::any::Any + Send + Sync;
+type AnyType = dyn anymap2::any::Any + Send + Sync;
 
 #[cfg(not(feature = "thread_safe"))]
-type ParamAnyType = dyn anymap::any::Any;
+type ParamAnyType = dyn anymap2::any::Any;
 #[cfg(feature = "thread_safe")]
-type ParamAnyType = dyn anymap::any::Any + Send;
+type ParamAnyType = dyn anymap2::any::Any + Send;
 
-type ComponentMap = anymap::Map<AnyType>;
-type ParameterMap = anymap::Map<ParamAnyType>;
+type ComponentMap = anymap2::Map<AnyType>;
+type ParameterMap = anymap2::Map<ParamAnyType>;
diff --git a/shaku_derive/Cargo.toml b/shaku_derive/Cargo.toml
@@ -18,4 +18,4 @@ proc-macro2 = "1.0"
 
 [dev-dependencies]
 shaku = { path = "../shaku" }
-trybuild = "1.0"
+trybuild = "1.0.18"