From f7e266c58585cd78f2635d13dbe36e0a7a633396 Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Wed, 10 Jul 2024 01:10:32 +0800 Subject: [PATCH] Update dependencies versions --- Cargo.lock | 100 ++++++++++++++--------------- api/arceos_posix_api/Cargo.toml | 2 +- crates/allocator/Cargo.toml | 2 +- crates/axfs_vfs/Cargo.toml | 2 +- crates/capability/Cargo.toml | 2 +- crates/driver_pci/Cargo.toml | 2 +- crates/driver_virtio/Cargo.toml | 2 +- crates/page_table_entry/Cargo.toml | 2 +- crates/slab_allocator/Cargo.toml | 2 +- modules/axhal/Cargo.toml | 2 +- 10 files changed, 56 insertions(+), 62 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7daff32f29..1c9543645a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -209,7 +209,7 @@ dependencies = [ "bindgen", "flatten_objects", "lazy_static", - "spin 0.9.8", + "spin", "static_assertions", ] @@ -341,7 +341,7 @@ version = "0.1.0" dependencies = [ "axfs_vfs", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -350,7 +350,7 @@ version = "0.1.0" dependencies = [ "axfs_vfs", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -358,7 +358,7 @@ name = "axfs_vfs" version = "0.1.0" dependencies = [ "axerrno", - "bitflags 2.5.0", + "bitflags 2.6.0", "log", ] @@ -372,7 +372,7 @@ dependencies = [ "axalloc", "axconfig", "axlog", - "bitflags 2.5.0", + "bitflags 2.6.0", "cfg-if", "crate_interface", "dw_apb_uart", @@ -441,7 +441,7 @@ dependencies = [ "lazy_init", "log", "smoltcp", - "spin 0.9.8", + "spin", ] [[package]] @@ -533,7 +533,7 @@ version = "0.69.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a00dc851838a2120612785d195287475a3ac45514741da670b735818822129a0" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "cexpr", "clang-sys", "itertools", @@ -546,7 +546,7 @@ dependencies = [ "regex", "rustc-hash", "shlex", - "syn 2.0.66", + "syn 2.0.70", "which", ] @@ -570,9 +570,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "bitflags" -version = "2.5.0" +version = "2.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1" +checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de" [[package]] name = "bitmap-allocator" @@ -590,9 +590,9 @@ checksum = "a1d084b0137aaa901caf9f1e8b21daa6aa24d41cd806e111335541eff9683bd6" [[package]] name = "buddy_system_allocator" -version = "0.9.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d44d578cadd17312c75e7d0ef489361f160ace58f7139aa32001fee1a51b89b5" +checksum = "a7913f22349ffcfc6ca0ca9a656ec26cfbba538ed49c31a273dff2c5d1ea83d9" [[package]] name = "bumpalo" @@ -611,7 +611,7 @@ name = "capability" version = "0.1.0" dependencies = [ "axerrno", - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -745,7 +745,7 @@ version = "0.1.1" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -841,7 +841,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -880,7 +880,7 @@ dependencies = [ "driver_common", "ixgbe-driver", "log", - "spin 0.9.8", + "spin", ] [[package]] @@ -954,7 +954,7 @@ name = "fatfs" version = "0.4.0" source = "git+https://github.com/rafalh/rust-fatfs?rev=85f06e0#85f06e08edbd3368e1b0562f2fc1b6d178bf7b8a" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", ] @@ -1029,7 +1029,7 @@ dependencies = [ "atomic-polyfill", "hash32", "rustc_version", - "spin 0.9.8", + "spin", "stable_deref_trait", ] @@ -1133,11 +1133,11 @@ version = "0.1.0" [[package]] name = "lazy_static" -version = "1.4.0" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" dependencies = [ - "spin 0.5.2", + "spin", ] [[package]] @@ -1255,7 +1255,7 @@ name = "page_table_entry" version = "0.1.0" dependencies = [ "aarch64-cpu", - "bitflags 2.5.0", + "bitflags 2.6.0", "memory_addr", "x86_64 0.15.1", ] @@ -1273,7 +1273,7 @@ dependencies = [ "cfg-if", "kernel_guard", "percpu_macros", - "spin 0.9.8", + "spin", "x86", ] @@ -1283,7 +1283,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1327,7 +1327,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6c64d9ba0963cdcea2e1b2230fbae2bab30eb25a174be395c41e764bfb65dd62" dependencies = [ "proc-macro2", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1356,9 +1356,9 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.85" +version = "1.0.86" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23" +checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77" dependencies = [ "unicode-ident", ] @@ -1421,7 +1421,7 @@ version = "11.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", ] [[package]] @@ -1567,22 +1567,22 @@ checksum = "b0293b4b29daaf487284529cc2f5675b8e57c61f70167ba415a463651fd6a918" [[package]] name = "serde" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094" +checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.203" +version = "1.0.204" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba" +checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1623,12 +1623,6 @@ dependencies = [ "managed", ] -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - [[package]] name = "spin" version = "0.9.8" @@ -1684,9 +1678,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.66" +version = "2.0.70" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5" +checksum = "2f0209b68b3613b093e0ec905354eccaedcfe83b8cb37cbdeae64026c3064c16" dependencies = [ "proc-macro2", "quote", @@ -1710,7 +1704,7 @@ checksum = "6bb623b56e39ab7dcd4b1b98bb6c8f8d907ed255b18de254088016b27a8ee19b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1741,9 +1735,9 @@ checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf" [[package]] name = "toml_edit" -version = "0.22.14" +version = "0.22.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38" +checksum = "d59a3a72298453f564e2b111fa896f8d07fabb36f51f06d7e875fc5e0b5a3ef1" dependencies = [ "indexmap", "toml_datetime", @@ -1756,7 +1750,7 @@ version = "0.1.0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] [[package]] @@ -1779,11 +1773,11 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "virtio-drivers" -version = "0.7.3" +version = "0.7.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7f49914233c1d3b612f891e986b0c1e0e8a54d7076a0f2501a5e8a53e7054f" +checksum = "aa40e09453618c7a927c08c5a990497a2954da7c2aaa6c65e0d4f0fc975f6114" dependencies = [ - "bitflags 2.5.0", + "bitflags 2.6.0", "log", "zerocopy", ] @@ -1843,7 +1837,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-shared", ] @@ -1865,7 +1859,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -2050,7 +2044,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "96cb6fd45bfeab6a5055c5bffdb08768bd0c069f1d946debe585bbb380a7c062" dependencies = [ "bit_field", - "bitflags 2.5.0", + "bitflags 2.6.0", "rustversion", "volatile 0.4.6", ] @@ -2062,7 +2056,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "4bc79523af8abf92fb1a970c3e086c5a343f6bcc1a0eb890f575cbb3b45743df" dependencies = [ "bit_field", - "bitflags 2.5.0", + "bitflags 2.6.0", "rustversion", "volatile 0.4.6", ] @@ -2085,5 +2079,5 @@ checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.66", + "syn 2.0.70", ] diff --git a/api/arceos_posix_api/Cargo.toml b/api/arceos_posix_api/Cargo.toml index ef24e854eb..2195378e69 100644 --- a/api/arceos_posix_api/Cargo.toml +++ b/api/arceos_posix_api/Cargo.toml @@ -47,7 +47,7 @@ axio = { path = "../../crates/axio" } axerrno = { path = "../../crates/axerrno" } static_assertions = "1.1.0" spin = { version = "0.9" } -lazy_static = { version = "1.4", features = ["spin_no_std"] } +lazy_static = { version = "1.5", features = ["spin_no_std"] } flatten_objects = { path = "../../crates/flatten_objects" } [build-dependencies] diff --git a/crates/allocator/Cargo.toml b/crates/allocator/Cargo.toml index bc341c792f..b474b9ae6d 100644 --- a/crates/allocator/Cargo.toml +++ b/crates/allocator/Cargo.toml @@ -22,7 +22,7 @@ buddy = ["dep:buddy_system_allocator"] allocator_api = [] [dependencies] -buddy_system_allocator = { version = "0.9", default-features = false, optional = true } +buddy_system_allocator = { version = "0.10", default-features = false, optional = true } slab_allocator = { path = "../slab_allocator", optional = true } rlsf = { version = "0.2", optional = true } bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator.git", rev = "88e871a", optional = true } diff --git a/crates/axfs_vfs/Cargo.toml b/crates/axfs_vfs/Cargo.toml index a8965925af..f653e4804a 100644 --- a/crates/axfs_vfs/Cargo.toml +++ b/crates/axfs_vfs/Cargo.toml @@ -14,5 +14,5 @@ default = [] [dependencies] log = "0.4" -bitflags = "2.5" +bitflags = "2.6" axerrno = { path = "../axerrno" } diff --git a/crates/capability/Cargo.toml b/crates/capability/Cargo.toml index 76f966ea1a..d59a1c67a3 100644 --- a/crates/capability/Cargo.toml +++ b/crates/capability/Cargo.toml @@ -10,5 +10,5 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/capability" documentation = "https://arceos-org.github.io/arceos/capability/index.html" [dependencies] -bitflags = "2.5" +bitflags = "2.6" axerrno = { path = "../axerrno" } diff --git a/crates/driver_pci/Cargo.toml b/crates/driver_pci/Cargo.toml index bce8766e70..1f80d7c084 100644 --- a/crates/driver_pci/Cargo.toml +++ b/crates/driver_pci/Cargo.toml @@ -10,4 +10,4 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/driver_pci" documentation = "https://arceos-org.github.io/arceos/driver_pci/index.html" [dependencies] -virtio-drivers = "0.7.3" +virtio-drivers = "0.7.4" diff --git a/crates/driver_virtio/Cargo.toml b/crates/driver_virtio/Cargo.toml index eb9a97b791..ddf1bf9e9b 100644 --- a/crates/driver_virtio/Cargo.toml +++ b/crates/driver_virtio/Cargo.toml @@ -19,4 +19,4 @@ driver_common = { path = "../driver_common" } driver_block = { path = "../driver_block", optional = true } driver_net = { path = "../driver_net", optional = true } driver_display = { path = "../driver_display", optional = true} -virtio-drivers = "0.7.3" +virtio-drivers = "0.7.4" diff --git a/crates/page_table_entry/Cargo.toml b/crates/page_table_entry/Cargo.toml index bb723b11eb..0af4172696 100644 --- a/crates/page_table_entry/Cargo.toml +++ b/crates/page_table_entry/Cargo.toml @@ -10,7 +10,7 @@ repository = "https://github.com/arceos-org/arceos/tree/main/crates/page_table_e documentation = "https://arceos-org.github.io/arceos/page_table_entry/index.html" [dependencies] -bitflags = "2.5" +bitflags = "2.6" memory_addr = { path = "../memory_addr" } aarch64-cpu = "9.4" # TODO: put it in [target.'cfg(target_arch = "aarch64")'.dependencies] diff --git a/crates/slab_allocator/Cargo.toml b/crates/slab_allocator/Cargo.toml index 039c230c89..c74fe7bde3 100644 --- a/crates/slab_allocator/Cargo.toml +++ b/crates/slab_allocator/Cargo.toml @@ -9,4 +9,4 @@ description = "Slab allocator for `no_std` systems. Uses multiple slabs with blo keywords = ["slab", "allocator", "no_std", "heap", "kernel"] [dependencies] -buddy_system_allocator = { version = "0.9", default-features = false } +buddy_system_allocator = { version = "0.10", default-features = false } diff --git a/modules/axhal/Cargo.toml b/modules/axhal/Cargo.toml index 8ef71d5bb8..f4069cfeeb 100644 --- a/modules/axhal/Cargo.toml +++ b/modules/axhal/Cargo.toml @@ -21,7 +21,7 @@ default = [] [dependencies] log = "0.4" cfg-if = "1.0" -bitflags = "2.5" +bitflags = "2.6" static_assertions = "1.1.0" axlog = { path = "../axlog" } axconfig = { path = "../axconfig" }