From 49d49ab295182c7249f8a11df013aff72f441655 Mon Sep 17 00:00:00 2001 From: Yuekai Jia Date: Mon, 20 Jan 2025 00:11:25 +0800 Subject: [PATCH] Update dependencies, bump to v0.5.1 --- .gitignore | 1 - Cargo.lock | 149 ++++++++++++++++++++++++++++++++ Cargo.toml | 4 +- page_table_entry/Cargo.toml | 5 +- page_table_entry/src/lib.rs | 3 +- page_table_multiarch/Cargo.toml | 7 +- page_table_multiarch/src/lib.rs | 3 +- 7 files changed, 161 insertions(+), 11 deletions(-) create mode 100644 Cargo.lock diff --git a/.gitignore b/.gitignore index ff78c42..23bb4fa 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,3 @@ /target /.vscode .DS_Store -Cargo.lock diff --git a/Cargo.lock b/Cargo.lock new file mode 100644 index 0000000..dfe03bf --- /dev/null +++ b/Cargo.lock @@ -0,0 +1,149 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 4 + +[[package]] +name = "aarch64-cpu" +version = "10.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a21cd0131c25c438e19cd6a774adf7e3f64f7f4d723022882facc2dee0f8bc9" +dependencies = [ + "tock-registers", +] + +[[package]] +name = "bit_field" +version = "0.10.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "dc827186963e592360843fb5ba4b973e145841266c1357f7180c43526f2e5b61" + +[[package]] +name = "bitflags" +version = "1.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.8.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" + +[[package]] +name = "critical-section" +version = "1.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "790eea4361631c5e7d22598ecd5723ff611904e3344ce8720784c93e3d83d40b" + +[[package]] +name = "embedded-hal" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "361a90feb7004eca4019fb28352a9465666b24f840f5c3cddf0ff13920590b89" + +[[package]] +name = "log" +version = "0.4.25" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" + +[[package]] +name = "memory_addr" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6f769efcf10b9dfb4c913bebb409cda77b1a3f072b249bf5465e250bcb30eb49" + +[[package]] +name = "page_table_entry" +version = "0.5.1" +dependencies = [ + "aarch64-cpu", + "bitflags 2.8.0", + "memory_addr", + "x86_64", +] + +[[package]] +name = "page_table_multiarch" +version = "0.5.1" +dependencies = [ + "log", + "memory_addr", + "page_table_entry", + "riscv", + "x86", +] + +[[package]] +name = "paste" +version = "1.0.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a" + +[[package]] +name = "raw-cpuid" +version = "10.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6c297679cb867470fa8c9f67dbba74a78d78e3e98d7cf2b08d6d71540f797332" +dependencies = [ + "bitflags 1.3.2", +] + +[[package]] +name = "riscv" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5ea8ff73d3720bdd0a97925f0bf79ad2744b6da8ff36be3840c48ac81191d7a7" +dependencies = [ + "critical-section", + "embedded-hal", + "paste", + "riscv-pac", +] + +[[package]] +name = "riscv-pac" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8188909339ccc0c68cfb5a04648313f09621e8b87dc03095454f1a11f6c5d436" + +[[package]] +name = "rustversion" +version = "1.0.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" + +[[package]] +name = "tock-registers" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b9e2fdb3a1e862c0661768b7ed25390811df1947a8acbfbefe09b47078d93c4" + +[[package]] +name = "volatile" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "442887c63f2c839b346c192d047a7c87e73d0689c9157b00b53dcc27dd5ea793" + +[[package]] +name = "x86" +version = "0.52.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2781db97787217ad2a2845c396a5efe286f87467a5810836db6d74926e94a385" +dependencies = [ + "bit_field", + "bitflags 1.3.2", + "raw-cpuid", +] + +[[package]] +name = "x86_64" +version = "0.15.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f042214de98141e9c8706e8192b73f56494087cc55ebec28ce10f26c5c364ae" +dependencies = [ + "bit_field", + "bitflags 2.8.0", + "rustversion", + "volatile", +] diff --git a/Cargo.toml b/Cargo.toml index 08a3ddd..d7d84a2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,8 @@ members = [ ] [workspace.package] -version = "0.5.0" +version = "0.5.1" +edition = "2024" authors = ["Yuekai Jia "] license = "GPL-3.0-or-later OR Apache-2.0 OR MulanPSL-2.0" homepage = "https://github.com/arceos-org/arceos" @@ -15,3 +16,4 @@ documentation = "https://arceos-org.github.io/page_table_multiarch" repository = "https://github.com/arceos-org/page_table_multiarch" keywords = ["arceos", "paging", "page-table", "virtual-memory"] categories = ["os", "hardware-support", "memory-management", "no-std"] +rust-version = "1.85" diff --git a/page_table_entry/Cargo.toml b/page_table_entry/Cargo.toml index 55bd3e9..9a2e912 100644 --- a/page_table_entry/Cargo.toml +++ b/page_table_entry/Cargo.toml @@ -1,15 +1,16 @@ [package] name = "page_table_entry" -edition = "2024" description = "Page table entry definition for various hardware architectures" documentation = "https://docs.rs/page_table_entry" version.workspace = true +edition.workspace = true authors.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true +rust-version.workspace = true [features] arm-el2 = [] @@ -19,7 +20,7 @@ bitflags = "2.6" memory_addr = "0.3" [target.'cfg(any(target_arch = "aarch64", doc))'.dependencies] -aarch64-cpu = "9.4" +aarch64-cpu = "10.0" [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies] x86_64 = "0.15.2" diff --git a/page_table_entry/src/lib.rs b/page_table_entry/src/lib.rs index 8338d6f..0a160d6 100644 --- a/page_table_entry/src/lib.rs +++ b/page_table_entry/src/lib.rs @@ -1,6 +1,5 @@ #![cfg_attr(not(test), no_std)] -#![feature(doc_auto_cfg)] -#![feature(doc_cfg)] +#![cfg_attr(docsrs, feature(doc_auto_cfg))] #![doc = include_str!("../README.md")] mod arch; diff --git a/page_table_multiarch/Cargo.toml b/page_table_multiarch/Cargo.toml index b4e8a75..f3875f2 100644 --- a/page_table_multiarch/Cargo.toml +++ b/page_table_multiarch/Cargo.toml @@ -1,26 +1,27 @@ [package] name = "page_table_multiarch" -edition = "2024" description = "Generic page table structures for various hardware architectures" documentation = "https://docs.rs/page_table_multiarch" version.workspace = true +edition.workspace = true authors.workspace = true license.workspace = true homepage.workspace = true repository.workspace = true keywords.workspace = true categories.workspace = true +rust-version.workspace = true [dependencies] log = "0.4" memory_addr = "0.3" -page_table_entry = { path = "../page_table_entry", version = "0.5.0" } +page_table_entry = { path = "../page_table_entry", version = "0.5.1" } [target.'cfg(any(target_arch = "x86_64", doc))'.dependencies] x86 = "0.52" [target.'cfg(any(target_arch = "riscv32", target_arch = "riscv64", doc))'.dependencies] -riscv = "0.11" +riscv = { version = "0.12", default-features = false } [package.metadata.docs.rs] rustc-args = [ "--cfg" , "doc"] diff --git a/page_table_multiarch/src/lib.rs b/page_table_multiarch/src/lib.rs index 4105688..c65e22a 100644 --- a/page_table_multiarch/src/lib.rs +++ b/page_table_multiarch/src/lib.rs @@ -1,6 +1,5 @@ #![cfg_attr(not(test), no_std)] -#![feature(const_trait_impl)] -#![feature(doc_auto_cfg)] +#![cfg_attr(docsrs, feature(doc_auto_cfg))] #![doc = include_str!("../README.md")] #[macro_use]