diff --git a/Cargo.lock.msrv b/Cargo.lock.msrv index a6b9f70..9857542 100644 --- a/Cargo.lock.msrv +++ b/Cargo.lock.msrv @@ -1,10 +1,10 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. [[package]] -name = "anymap" -version = "0.12.1" +name = "anymap2" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33954243bd79057c2de7338850b85983a44588021f8a5fee574a8888c6de4344" +checksum = "d301b3b94cb4b2f23d7917810addbbaff90738e0ca2be692bd027e70d7e0330c" [[package]] name = "cfg-if" @@ -131,18 +131,18 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.113" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6135c78461981c79497158ef777264c51d9d0f4f3fc3a4d22b915900e42dac6a" +checksum = "1217f97ab8e8904b57dd22eb61cde455fa7446a9c1cf43966066da047c1f3702" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.113" +version = "1.0.103" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93c5eaa17d0954cb481cdcfffe9d84fcfa7a1a9f2349271e678677be4c26ae31" +checksum = "a8c6faef9a2e64b0064f48570289b4bf8823b7581f1d6157c1b52152306651d0" dependencies = [ "proc-macro2", "quote", @@ -165,7 +165,7 @@ dependencies = [ name = "shaku" version = "0.6.1" dependencies = [ - "anymap", + "anymap2", "once_cell", "rand", "shaku_derive", @@ -196,11 +196,11 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.2.0" +version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" +checksum = "4096add70612622289f2fdcdbd5086dc81c1e2675e6ae58d6c4f62a16c6d7f2f" dependencies = [ - "winapi-util", + "wincolor", ] [[package]] @@ -214,9 +214,9 @@ dependencies = [ [[package]] name = "trybuild" -version = "1.0.53" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d664de8ea7e531ad4c0f5a834f20b8cb2b8e6dfe88d05796ee7887518ed67b9" +checksum = "b75e31d624df08744532e935f1d4bfedd319a277d5a162c5b15f6ced59307575" dependencies = [ "glob", "lazy_static", @@ -254,17 +254,17 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a16a8e2ebfc883e2b1771c6482b1fb3c6831eab289ba391619a2d93a7356220f" -[[package]] -name = "winapi-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - [[package]] name = "winapi-x86_64-pc-windows-gnu" version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ca29cb03c8ceaf20f8224a18a530938305e9872b1478ea24ff44b4f503a1d1d" + +[[package]] +name = "wincolor" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9dc3aa9dcda98b5a16150c54619c1ead22e3d3a5d458778ae914be760aa981a" +dependencies = [ + "winapi", +] diff --git a/shaku/Cargo.toml b/shaku/Cargo.toml index 781523b..64b4a8e 100644 --- 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 index 146c31c..ce1bfbb 100644 --- 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; -type ParameterMap = anymap::Map; +type ComponentMap = anymap2::Map; +type ParameterMap = anymap2::Map; diff --git a/shaku_derive/Cargo.toml b/shaku_derive/Cargo.toml index 1adbebe..b9ad518 100644 --- 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"