From 0c76582ee6cba29bc1d77f043f53014cf89425af Mon Sep 17 00:00:00 2001 From: YdrMaster Date: Mon, 13 Feb 2023 14:09:17 +0800 Subject: [PATCH] build: update deps Signed-off-by: YdrMaster --- Cargo.lock | 225 ++++++++++++++++++++++++++++--------------- ch2/Cargo.toml | 2 +- ch3/Cargo.toml | 2 +- ch4/Cargo.toml | 2 +- ch5/Cargo.toml | 4 +- ch6/Cargo.toml | 6 +- ch7/Cargo.toml | 6 +- ch8/Cargo.toml | 6 +- console/Cargo.toml | 2 +- kernel-vm/Cargo.toml | 2 +- rustsbi-qemu.bin | Bin 35256 -> 32448 bytes sync/Cargo.toml | 4 +- syscall/Cargo.toml | 2 +- xtask/Cargo.toml | 6 +- 14 files changed, 170 insertions(+), 99 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e6e5316..e71fdbc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -8,12 +8,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "bare-metal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" - [[package]] name = "bit_field" version = "0.10.1" @@ -28,9 +22,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "cc" -version = "1.0.77" +version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9f73505338f7d905b19d18738976aae232eb46b8efc15554ffc56deb5d9ebe4" +checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f" [[package]] name = "cfg-if" @@ -104,7 +98,7 @@ dependencies = [ "rcore-task-manage", "riscv", "sbi-rt", - "spin 0.9.4", + "spin 0.9.5", "syscall", "xmas-elf", ] @@ -122,7 +116,7 @@ dependencies = [ "rcore-task-manage", "riscv", "sbi-rt", - "spin 0.9.4", + "spin 0.9.5", "syscall", "virtio-drivers", "xmas-elf", @@ -143,7 +137,7 @@ dependencies = [ "sbi-rt", "signal", "signal-impl", - "spin 0.9.4", + "spin 0.9.5", "syscall", "virtio-drivers", "xmas-elf", @@ -164,7 +158,7 @@ dependencies = [ "sbi-rt", "signal", "signal-impl", - "spin 0.9.4", + "spin 0.9.5", "sync", "syscall", "virtio-drivers", @@ -173,9 +167,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.0.29" +version = "4.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d63b9e9c07271b9957ad22c173bae2a4d9a81127680962039296abcd2f8251d" +checksum = "f13b9c79b5d1dd500d20ef541215a6423c75829ef43117e1b4d17fd8af0b5d76" dependencies = [ "bitflags", "clap_derive", @@ -188,9 +182,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.0.21" +version = "4.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0177313f9f02afc995627906bbd8967e2be069f5261954222dac78290c2b9014" +checksum = "684a277d672e91966334af371f1a7b5833f9aa00b07c84e92fbce95e00208ce8" dependencies = [ "heck", "proc-macro-error", @@ -201,13 +195,19 @@ dependencies = [ [[package]] name = "clap_lex" -version = "0.3.0" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0d4198f73e42b4936b35b5bb248d81d2b595ecb170da0bac7655c54eedfa8da8" +checksum = "783fe232adfca04f90f56201b26d79682d4cd2625e0bc7290b95123afe558ade" dependencies = [ "os_str_bytes", ] +[[package]] +name = "critical-section" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6548a0ad5d2549e111e1f6a11a6c2e2d00ce6a3dafe22948d67c2b443f775e52" + [[package]] name = "customizable-buddy" version = "0.0.2" @@ -259,26 +259,39 @@ dependencies = [ "libc", ] +[[package]] +name = "hashbrown" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" + [[package]] name = "heck" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" +checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8" [[package]] name = "hermit-abi" -version = "0.2.6" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fed44880c466736ef9a5c5b5facefb5ed0785676d0c02d612db14e54f0d84286" + +[[package]] +name = "indexmap" +version = "1.9.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee512640fe35acbfb4bb779db6f0d80704c2cacfa2e39b601ef3e3f47d1ae4c7" +checksum = "1885e79c1fc4b10f0e172c475f458b7f7b93061064d98c3293e98c5ba0c8b399" dependencies = [ - "libc", + "autocfg", + "hashbrown", ] [[package]] name = "io-lifetimes" -version = "1.0.3" +version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46112a93252b123d31a119a8d1a1ac19deac4fac6e0e8b0df58f0d4e5870e63c" +checksum = "1abeb7a0dd0f8181267ff8adc397075586500b81b28a73e8a0208b00fc170fb3" dependencies = [ "libc", "windows-sys", @@ -286,9 +299,9 @@ dependencies = [ [[package]] name = "is-terminal" -version = "0.4.1" +version = "0.4.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "927609f78c2913a6f6ac3c27a4fe87f43e2a35367c0c4b0f8265e8f49a104330" +checksum = "22e18b0a45d56fe973d6db23972bf5bc46f988a4a2385deac9cc29572f09daef" dependencies = [ "hermit-abi", "io-lifetimes", @@ -309,7 +322,7 @@ dependencies = [ name = "kernel-context" version = "0.1.0" dependencies = [ - "spin 0.9.4", + "spin 0.9.5", ] [[package]] @@ -317,14 +330,14 @@ name = "kernel-vm" version = "0.1.0" dependencies = [ "page-table", - "spin 0.9.4", + "spin 0.9.5", ] [[package]] name = "libc" -version = "0.2.138" +version = "0.2.139" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db6d7e329c562c5dfab7a46a2afabc8b987ab9a4834c9d1ca04dc54c1546cef8" +checksum = "201de327520df007757c1f0adce6e827fe8562fbc28bfd9c15571c66ca1f5f79" [[package]] name = "linker" @@ -332,9 +345,9 @@ version = "0.0.1" [[package]] name = "linux-raw-sys" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f" +checksum = "f051f77a7c8e6957c0696eac88f26b0117e54f52d3fc682ab19397a8812846a4" [[package]] name = "lock_api" @@ -355,6 +368,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + [[package]] name = "nb" version = "0.1.3" @@ -370,6 +389,15 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" +[[package]] +name = "nom8" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae01545c9c7fc4486ab7debaf2aad7003ac19431791868fb2e8066df97fad2f8" +dependencies = [ + "memchr", +] + [[package]] name = "numeric-enum-macro" version = "0.2.0" @@ -378,9 +406,9 @@ checksum = "300e4bdb6b46b592948e700ea1ef24a4296491f6a0ee722b258040abd15a3714" [[package]] name = "once_cell" -version = "1.16.0" +version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860" +checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66" [[package]] name = "os-xtask-utils" @@ -433,18 +461,18 @@ dependencies = [ [[package]] name = "proc-macro2" -version = "1.0.47" +version = "1.0.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ea3d908b0e36316caf9e9e2c4625cdde190a7e6f440d794667ed17a1855e725" +checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6" dependencies = [ "unicode-ident", ] [[package]] name = "quote" -version = "1.0.21" +version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179" +checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b" dependencies = [ "proc-macro2", ] @@ -454,7 +482,7 @@ name = "rcore-console" version = "0.0.0" dependencies = [ "log", - "spin 0.9.4", + "spin 0.9.5", ] [[package]] @@ -463,20 +491,20 @@ version = "0.0.0" [[package]] name = "riscv" -version = "0.9.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fc4bc7113424814738fe79755a5764e392b3d4d1bc757e6aa6f61cede32095" +checksum = "aa3145d2fae3778b1e31ec2e827b228bdc6abd9b74bb5705ba46dcb82069bc4f" dependencies = [ - "bare-metal", "bit_field", + "critical-section", "embedded-hal", ] [[package]] name = "rustix" -version = "0.36.5" +version = "0.36.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3807b5d10909833d3e9acd1eb5fb988f79376ff10fce42937de71a449c4c588" +checksum = "f43abb88211988493c1abb44a70efa56ff0ce98f233b7b276146f1f3f7ba9644" dependencies = [ "bitflags", "errno", @@ -512,21 +540,30 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" [[package]] name = "serde" -version = "1.0.149" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "256b9932320c590e707b94576e3cc1f7c9024d0ee6612dfbcf1cb106cbe8e055" +checksum = "bb7d1f0d3021d347a83e556fc4683dea2ea09d87bccdf88ff5c12545d89d5efb" [[package]] name = "serde_derive" -version = "1.0.149" +version = "1.0.152" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4eae9b04cbffdfd550eb462ed33bc6a1b68c935127d008b27444d08380f94e4" +checksum = "af487d118eecd09402d70a5d72551860e788df87b464af30e5ea6a38c75c541e" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "serde_spanned" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0efd8caf556a6cebd3b285caf480045fcc1ac04f6bd786b09a6f11af30c4fcf4" +dependencies = [ + "serde", +] + [[package]] name = "signal" version = "0.1.0" @@ -558,9 +595,9 @@ checksum = "13287b4da9d1207a4f4929ac390916d64eacfe236a487e9a9f5b3be392be5162" [[package]] name = "spin" -version = "0.9.4" +version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" +checksum = "7dccf47db1b41fa1573ed27ccf5e08e3ca771cb994f776668c5ebda893b248fc" dependencies = [ "lock_api", ] @@ -579,9 +616,9 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.105" +version = "1.0.107" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60b9b43d45702de4c839cb9b51d9f529c5dd26a4aff255b42b1ebc03e88ee908" +checksum = "1f4064b5b16e03ae50984a5a8ed5d4f8803e6bc1fd170a3cda91a1be4b18e3f5" dependencies = [ "proc-macro2", "quote", @@ -594,7 +631,7 @@ version = "0.1.0" dependencies = [ "rcore-task-manage", "riscv", - "spin 0.9.4", + "spin 0.9.5", ] [[package]] @@ -603,32 +640,57 @@ version = "0.1.0" dependencies = [ "bitflags", "signal-defs", - "spin 0.9.4", + "spin 0.9.5", ] [[package]] name = "termcolor" -version = "1.1.3" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +checksum = "be55cf8942feac5c765c2c993422806843c9a9a45d4d5c407ad6dd2ea95eb9b6" dependencies = [ "winapi-util", ] [[package]] name = "toml" -version = "0.5.9" +version = "0.7.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7afcae9e3f0fe2c370fd4657108972cbb2fa9db1b9f84849cefd80741b01cb6" +dependencies = [ + "serde", + "serde_spanned", + "toml_datetime", + "toml_edit", +] + +[[package]] +name = "toml_datetime" +version = "0.6.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab8ed2edee10b50132aed5f331333428b011c99402b5a534154ed15746f9622" +dependencies = [ + "serde", +] + +[[package]] +name = "toml_edit" +version = "0.19.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d82e1a7758622a465f8cee077614c73484dac5b836c02ff6a40d5d1010324d7" +checksum = "5e6a7712b49e1775fb9a7b998de6635b299237f48b404dde71704f2e0e7f37e5" dependencies = [ + "indexmap", + "nom8", "serde", + "serde_spanned", + "toml_datetime", ] [[package]] name = "unicode-ident" -version = "1.0.5" +version = "1.0.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ceab39d59e4c9499d4e5a8ee0e2735b891bb7308ac83dfb4e80cad195c9f6f3" +checksum = "84a22b9f218b40614adcb3f4ff08b703773ad44fa9423e4e0d346d5db86e4ebc" [[package]] name = "user_lib" @@ -700,9 +762,18 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "windows-sys" -version = "0.42.0" +version = "0.45.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75283be5efb2831d37ea142365f009c02ec203cd29a3ebecbc093d52315b66d0" +dependencies = [ + "windows-targets", +] + +[[package]] +name = "windows-targets" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7" +checksum = "8e2522491fbfcd58cc84d47aeb2958948c4b8982e9a2d8a2a35bbaed431390e7" dependencies = [ "windows_aarch64_gnullvm", "windows_aarch64_msvc", @@ -715,45 +786,45 @@ dependencies = [ [[package]] name = "windows_aarch64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e" +checksum = "8c9864e83243fdec7fc9c5444389dcbbfd258f745e7853198f365e3c4968a608" [[package]] name = "windows_aarch64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4" +checksum = "4c8b1b673ffc16c47a9ff48570a9d85e25d265735c503681332589af6253c6c7" [[package]] name = "windows_i686_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7" +checksum = "de3887528ad530ba7bdbb1faa8275ec7a1155a45ffa57c37993960277145d640" [[package]] name = "windows_i686_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246" +checksum = "bf4d1122317eddd6ff351aa852118a2418ad4214e6613a50e0191f7004372605" [[package]] name = "windows_x86_64_gnu" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed" +checksum = "c1040f221285e17ebccbc2591ffdc2d44ee1f9186324dd3e84e99ac68d699c45" [[package]] name = "windows_x86_64_gnullvm" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028" +checksum = "628bfdf232daa22b0d64fdb62b09fcc36bb01f05a3939e20ab73aaf9470d0463" [[package]] name = "windows_x86_64_msvc" -version = "0.42.0" +version = "0.42.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5" +checksum = "447660ad36a13288b1db4d4248e857b510e8c3a225c822ba4fb748c0aafecffd" [[package]] name = "xmas-elf" diff --git a/ch2/Cargo.toml b/ch2/Cargo.toml index eef7756..9bb20de 100644 --- a/ch2/Cargo.toml +++ b/ch2/Cargo.toml @@ -6,7 +6,7 @@ authors = ["YdrMaster "] [dependencies] sbi-rt = { version = "0.0.2", features = ["legacy"] } -riscv = "0.9" +riscv = "0.10.1" linker = { path = "../linker" } rcore-console = { path = "../console" } diff --git a/ch3/Cargo.toml b/ch3/Cargo.toml index 6202748..6c0316b 100644 --- a/ch3/Cargo.toml +++ b/ch3/Cargo.toml @@ -6,7 +6,7 @@ authors = ["YdrMaster "] [dependencies] sbi-rt = { version = "0.0.2", features = ["legacy"] } -riscv = "0.9" +riscv = "0.10.1" linker = { path = "../linker" } rcore-console = { path = "../console" } diff --git a/ch4/Cargo.toml b/ch4/Cargo.toml index 358989c..68a48a1 100644 --- a/ch4/Cargo.toml +++ b/ch4/Cargo.toml @@ -7,7 +7,7 @@ authors = ["YdrMaster "] [dependencies] sbi-rt = { version = "0.0.2", features = ["legacy"] } xmas-elf = "0.8.0" -riscv = "0.9" +riscv = "0.10.1" linker = { path = "../linker" } rcore-console = { path = "../console" } diff --git a/ch5/Cargo.toml b/ch5/Cargo.toml index 1a87f30..cc1aa92 100644 --- a/ch5/Cargo.toml +++ b/ch5/Cargo.toml @@ -7,8 +7,8 @@ authors = ["zflcs <1491657576@qq.com>"] [dependencies] sbi-rt = { version = "0.0.2", features = ["legacy"] } xmas-elf = "0.8.0" -riscv = "0.9" -spin = "0.9.4" +riscv = "0.10.1" +spin = "0.9" linker = { path = "../linker" } rcore-console = { path = "../console" } diff --git a/ch6/Cargo.toml b/ch6/Cargo.toml index 6555d27..b1b5481 100644 --- a/ch6/Cargo.toml +++ b/ch6/Cargo.toml @@ -8,8 +8,8 @@ authors = ["tkf2019 "] virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" } sbi-rt = { version = "0.0.2", features = ["legacy"] } xmas-elf = "0.8.0" -riscv = "0.9" -spin = "0.9.4" +riscv = "0.10.1" +spin = "0.9" linker = { path = "../linker" } rcore-console = { path = "../console" } @@ -17,7 +17,7 @@ kernel-context = { path = "../kernel-context", features = ["foreign"] } kernel-alloc = { path = "../kernel-alloc" } kernel-vm = { path = "../kernel-vm" } syscall = { path = "../syscall", features = ["kernel"] } -rcore-task-manage = { path = "../task-manage", features = ["proc"] } +rcore-task-manage = { path = "../task-manage", features = ["proc"] } easy-fs = { path = "../easy-fs" } [build-dependencies] diff --git a/ch7/Cargo.toml b/ch7/Cargo.toml index 3b0294d..b4111bd 100644 --- a/ch7/Cargo.toml +++ b/ch7/Cargo.toml @@ -8,8 +8,8 @@ authors = ["scPointer "] virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" } sbi-rt = { version = "0.0.2", features = ["legacy"] } xmas-elf = "0.8.0" -riscv = "0.9" -spin = "0.9.4" +riscv = "0.10.1" +spin = "0.9" linker = { path = "../linker" } rcore-console = { path = "../console" } @@ -17,7 +17,7 @@ kernel-context = { path = "../kernel-context", features = ["foreign"] } kernel-alloc = { path = "../kernel-alloc" } kernel-vm = { path = "../kernel-vm" } syscall = { path = "../syscall", features = ["kernel"] } -rcore-task-manage = { path = "../task-manage", features = ["proc"] } +rcore-task-manage = { path = "../task-manage", features = ["proc"] } easy-fs = { path = "../easy-fs" } signal = { path = "../signal" } signal-impl = { path = "../signal-impl" } diff --git a/ch8/Cargo.toml b/ch8/Cargo.toml index 138a8db..43c76f5 100644 --- a/ch8/Cargo.toml +++ b/ch8/Cargo.toml @@ -8,8 +8,8 @@ authors = ["zflcs <1491657576@qq.com>"] virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "4ee80e5" } sbi-rt = { version = "0.0.2", features = ["legacy"] } xmas-elf = "0.8.0" -riscv = "0.9" -spin = "0.9.4" +riscv = "0.10.1" +spin = "0.9" linker = { path = "../linker" } rcore-console = { path = "../console" } @@ -17,7 +17,7 @@ kernel-context = { path = "../kernel-context", features = ["foreign"] } kernel-alloc = { path = "../kernel-alloc" } kernel-vm = { path = "../kernel-vm" } syscall = { path = "../syscall", features = ["kernel"] } -rcore-task-manage = { path = "../task-manage", features = ["thread"] } +rcore-task-manage = { path = "../task-manage", features = ["thread"] } easy-fs = { path = "../easy-fs" } signal = { path = "../signal" } signal-impl = { path = "../signal-impl" } diff --git a/console/Cargo.toml b/console/Cargo.toml index fcf1732..18bac64 100644 --- a/console/Cargo.toml +++ b/console/Cargo.toml @@ -13,4 +13,4 @@ categories = ["no-std"] [dependencies] log = "0.4.17" -spin = "0.9.4" +spin = "0.9" diff --git a/kernel-vm/Cargo.toml b/kernel-vm/Cargo.toml index 21a54e0..52fcc75 100644 --- a/kernel-vm/Cargo.toml +++ b/kernel-vm/Cargo.toml @@ -7,5 +7,5 @@ authors = ["YdrMaster "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -spin = "0.9.4" +spin = "0.9" page-table = "0.0.6" diff --git a/rustsbi-qemu.bin b/rustsbi-qemu.bin index 46bc478075303ce76c995989cc214f0f1417a064..cd37fa3275c1edec0e9d717678a41b90850fe8b0 100644 GIT binary patch delta 15372 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 xShxW#-TbLCqM|> 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"] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -riscv = "0.9" -spin = "0.9.4" +riscv = "0.10.1" +spin = "0.9" rcore-task-manage = { path = "../task-manage", features = ["thread"] } diff --git a/syscall/Cargo.toml b/syscall/Cargo.toml index 31bb40f..604ec5a 100644 --- a/syscall/Cargo.toml +++ b/syscall/Cargo.toml @@ -7,7 +7,7 @@ authors = ["YdrMaster "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -spin = "0.9.4" +spin = "0.9" bitflags = "1.2.1" signal-defs = { path = "../signal-defs" } diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml index 66e7ec5..7b1467e 100644 --- a/xtask/Cargo.toml +++ b/xtask/Cargo.toml @@ -7,12 +7,12 @@ authors = ["YdrMaster "] # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -clap = { version = "4.0", features = ["derive"] } +clap = { version = "4.1", features = ["derive"] } os-xtask-utils = "0.0.0" -once_cell = "1.16" +once_cell = "1.17" serde = "1.0" serde_derive = "1.0" -toml = "0.5.9" +toml = "0.7" easy-fs = { path = "../easy-fs" }