From f17ca91e823d8d6a9ec60c3bf9110da5ceaf0b7f Mon Sep 17 00:00:00 2001 From: GuillaumeDIDIER Date: Tue, 29 Sep 2020 10:51:24 +0200 Subject: [PATCH] Various dependency updates - should now compile again --- Cargo.lock | 39 ++++++++++++++++++++------------------- Cargo.toml | 8 ++++---- aes-t-tables/Cargo.toml | 2 +- cache_utils/Cargo.toml | 10 +++++----- polling_serial/Cargo.toml | 2 +- vga_buffer/Cargo.toml | 2 +- 6 files changed, 32 insertions(+), 31 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 0c26130..d588279 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -14,9 +14,9 @@ dependencies = [ [[package]] name = "ahash" -version = "0.3.8" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" +checksum = "0adac150c2dd5a9c864d054e07bda5e6bc010cd10036ea5f17e82a2f5867f735" [[package]] name = "arrayref" @@ -26,9 +26,12 @@ checksum = "a4c527152e37cf757a3f78aae5a06fbeefdb07ccc535c980a3208ee3060dd544" [[package]] name = "atomic" -version = "0.4.6" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "64f46ca51dca4837f1520754d1c8c36636356b81553d928dc9c177025369a06e" +checksum = "c3410529e8288c463bedb5930f82833bc0c90e5d2fe639a56582a4d09220b281" +dependencies = [ + "autocfg", +] [[package]] name = "autocfg" @@ -109,7 +112,7 @@ dependencies = [ "linked_list_allocator", "polling_serial", "vga_buffer", - "volatile", + "volatile 0.4.1", "x86_64", ] @@ -147,12 +150,11 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.8.2" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" +checksum = "d7afe4a420e3fe79967a00898cc1f4db7c8a49a9333a29f8a4bd76a253d5cd04" dependencies = [ "ahash", - "autocfg", ] [[package]] @@ -208,15 +210,14 @@ dependencies = [ [[package]] name = "nix" -version = "0.17.0" +version = "0.18.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50e4785f2c3b7589a0d0c1dd60285e1188adac4006e8abd6dd578e1567027363" +checksum = "83450fe6a6142ddd95fb064b746083fc4ef1705fe81f64a64e1d4b39f54a1055" dependencies = [ "bitflags", "cc", "cfg-if", "libc", - "void", ] [[package]] @@ -347,20 +348,20 @@ version = "0.1.0" dependencies = [ "lazy_static", "spin", - "volatile", + "volatile 0.3.0", ] [[package]] -name = "void" -version = "1.0.2" +name = "volatile" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" +checksum = "f8e76fae08f03f96e166d2dfda232190638c10e0383841252416f9cfe2ae60e6" [[package]] name = "volatile" -version = "0.2.7" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945" +checksum = "e000a949a4c792c46417a637bdf18ed39cfc70184318f609979e0fa03ab334c8" [[package]] name = "wasi" @@ -370,9 +371,9 @@ checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" [[package]] name = "x86_64" -version = "0.11.8" +version = "0.12.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fa1f02f6b33489502afe477f7d428cfa1eee22d4a10966e95dfeed96c523d46" +checksum = "d5b4b42dbabe13b69023e1a1407d395f1a1a33df76e9a9efdbe303acc907e292" dependencies = [ "bit_field 0.9.0", "bitflags", diff --git a/Cargo.toml b/Cargo.toml index 9816c75..d619237 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -26,11 +26,11 @@ test-success-exit-code = 33 # (0x10 << 1) | 1 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -x86_64 = "0.11.0" +x86_64 = "0.12.2" vga_buffer = { path = "vga_buffer" } polling_serial = { path = "polling_serial" } -volatile = "0.2.6" -linked_list_allocator = "0.8.4" +volatile = "0.4.1" +linked_list_allocator = "0.8.6" cache_utils = { path = "cache_utils", features = ["no_std"], default-features = false } arrayref = "0.3.6" @@ -39,7 +39,7 @@ version = "1.4.0" features = ["spin_no_std"] [dependencies.bootloader] -version = "0.9.4" +version = "0.9.10" features = ["sse", "map_physical_memory"] #[patch.crates-io] diff --git a/aes-t-tables/Cargo.toml b/aes-t-tables/Cargo.toml index 8c9d668..295214c 100644 --- a/aes-t-tables/Cargo.toml +++ b/aes-t-tables/Cargo.toml @@ -12,4 +12,4 @@ openssl = "0.10.30" cache_utils = { path = "../cache_utils" } memmap2 = "0.1.0" rand = "0.7.3" -nix = "0.17.0" +nix = "0.18.0" diff --git a/cache_utils/Cargo.toml b/cache_utils/Cargo.toml index 3213704..9a204c1 100644 --- a/cache_utils/Cargo.toml +++ b/cache_utils/Cargo.toml @@ -10,14 +10,14 @@ edition = "2018" polling_serial = { path = "../polling_serial", optional = true } vga_buffer = { path = "../vga_buffer", optional = true } cpuid = { path = "../cpuid", default-features = false } -x86_64 = "0.11.0" +x86_64 = "0.12.2" static_assertions = "1.1.0" itertools = { version = "0.9.0", default-features = false } -atomic = {version = "0.4", features = ["nightly"]} +atomic = { version = "0.5.0" } -nix = { version = "0.17.0", optional = true } -libc = { version = "0.2.69", optional = true } -hashbrown = { version = "0.8.0", optional = true } +nix = { version = "0.18.0", optional = true } +libc = { version = "0.2.77", optional = true } +hashbrown = { version = "0.9.1", optional = true } [features] use_std = ["nix", "itertools/use_std", "libc", "cpuid/use_std"] diff --git a/polling_serial/Cargo.toml b/polling_serial/Cargo.toml index 71dd003..f74132e 100644 --- a/polling_serial/Cargo.toml +++ b/polling_serial/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -x86_64 = "0.11.0" +x86_64 = "0.12.2" spin = "0.5.2" [dependencies.lazy_static] diff --git a/vga_buffer/Cargo.toml b/vga_buffer/Cargo.toml index e11ef1d..fed47de 100644 --- a/vga_buffer/Cargo.toml +++ b/vga_buffer/Cargo.toml @@ -7,7 +7,7 @@ edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -volatile = "0.2.6" +volatile = "0.3.0" spin = "0.5.2" [dependencies.lazy_static]