diff --git a/Cargo.lock b/Cargo.lock index 7d6c166d6..960968bfc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -66,15 +66,6 @@ dependencies = [ "zerocopy", ] -[[package]] -name = "aho-corasick" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ddd31a130427c27518df266943a5308ed92d4b226cc639f5a8f1002816174301" -dependencies = [ - "memchr", -] - [[package]] name = "align_ext" version = "0.1.0" @@ -85,56 +76,6 @@ version = "0.2.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923" -[[package]] -name = "anstream" -version = "0.6.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a" -dependencies = [ - "anstyle", - "anstyle-parse", - "anstyle-query", - "anstyle-wincon", - "colorchoice", - "is_terminal_polyfill", - "utf8parse", -] - -[[package]] -name = "anstyle" -version = "1.0.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78" - -[[package]] -name = "anstyle-parse" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" -dependencies = [ - "utf8parse", -] - -[[package]] -name = "anstyle-query" -version = "1.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e231f6134f61b71076a3eab506c379d4f36122f2af15a9ff04415ea4c3339e2" -dependencies = [ - "windows-sys 0.60.2", -] - -[[package]] -name = "anstyle-wincon" -version = "3.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e0633414522a32ffaac8ac6cc8f748e090c5717661fddeea04219e2344f5f2a" -dependencies = [ - "anstyle", - "once_cell_polyfill", - "windows-sys 0.60.2", -] - [[package]] name = "aster-bigtcp" version = "0.1.0" @@ -554,58 +495,12 @@ dependencies = [ "generic-array", ] -[[package]] -name = "clap" -version = "4.5.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c26d721170e0295f191a69bd9a1f93efcdb0aff38684b61ab5750468972e5f5" -dependencies = [ - "clap_builder", - "clap_derive", -] - -[[package]] -name = "clap_builder" -version = "4.5.51" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75835f0c7bf681bfd05abe44e965760fea999a5286c6eb2d59883634fd02011a" -dependencies = [ - "anstream", - "anstyle", - "clap_lex", - "strsim 0.11.1", -] - -[[package]] -name = "clap_derive" -version = "4.5.49" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a0b5487afeab2deb2ff4e03a807ad1a03ac532ff5a2cee5d86884440c7f7671" -dependencies = [ - "heck", - "proc-macro2", - "quote", - "syn 2.0.101", -] - -[[package]] -name = "clap_lex" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" - [[package]] name = "cobs" version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67ba02a97a2bd10f4b59b25c7973101c79642302776489e030cd13cdab09ed15" -[[package]] -name = "colorchoice" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75" - [[package]] name = "component" version = "0.1.0" @@ -717,7 +612,7 @@ dependencies = [ "ident_case", "proc-macro2", "quote", - "strsim 0.10.0", + "strsim", "syn 1.0.109", ] @@ -1003,12 +898,6 @@ dependencies = [ "stable_deref_trait", ] -[[package]] -name = "heck" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" - [[package]] name = "iced-x86" version = "1.21.0" @@ -1086,12 +975,6 @@ dependencies = [ "ghost", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.10.5" @@ -1300,12 +1183,6 @@ dependencies = [ "walkdir", ] -[[package]] -name = "minimal-lexical" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" - [[package]] name = "multiboot2" version = "0.24.0" @@ -1336,27 +1213,6 @@ version = "6.6.666" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf5a574dadd7941adeaa71823ecba5e28331b8313fb2e1c6a5c7e5981ea53ad6" -[[package]] -name = "nix" -version = "0.27.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053" -dependencies = [ - "bitflags 2.9.1", - "cfg-if", - "libc", -] - -[[package]] -name = "nom" -version = "7.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d273983c5a657a70a3e8f2a01329822f3b8c8172b73826411a55751e404a0a4a" -dependencies = [ - "memchr", - "minimal-lexical", -] - [[package]] name = "nougat" version = "0.2.4" @@ -1399,12 +1255,6 @@ version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "opaque-debug" version = "0.3.1" @@ -1703,35 +1553,6 @@ dependencies = [ "bitflags 1.3.2", ] -[[package]] -name = "regex" -version = "1.12.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" -dependencies = [ - "aho-corasick", - "memchr", - "regex-automata", - "regex-syntax", -] - -[[package]] -name = "regex-automata" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.8.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" - [[package]] name = "riscv" version = "0.15.0" @@ -1813,16 +1634,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" -[[package]] -name = "sctrace" -version = "0.17.0" -dependencies = [ - "clap", - "nix", - "nom", - "regex", -] - [[package]] name = "semver" version = "1.0.26" @@ -1905,12 +1716,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" -[[package]] -name = "strsim" -version = "0.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" - [[package]] name = "subtle" version = "2.4.1" @@ -2147,12 +1952,6 @@ dependencies = [ "gimli 0.32.3", ] -[[package]] -name = "utf8parse" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" - [[package]] name = "version_check" version = "0.9.5" @@ -2205,31 +2004,16 @@ version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb" dependencies = [ - "windows-sys 0.59.0", + "windows-sys", ] -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - [[package]] name = "windows-sys" version = "0.59.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" dependencies = [ - "windows-targets 0.52.6", -] - -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", + "windows-targets", ] [[package]] @@ -2238,31 +2022,14 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.6", - "windows_aarch64_msvc 0.52.6", - "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", - "windows_i686_msvc 0.52.6", - "windows_x86_64_gnu 0.52.6", - "windows_x86_64_gnullvm 0.52.6", - "windows_x86_64_msvc 0.52.6", -] - -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", + "windows_aarch64_gnullvm", + "windows_aarch64_msvc", + "windows_i686_gnu", + "windows_i686_gnullvm", + "windows_i686_msvc", + "windows_x86_64_gnu", + "windows_x86_64_gnullvm", + "windows_x86_64_msvc", ] [[package]] @@ -2271,96 +2038,48 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" version = "0.5.40" diff --git a/Cargo.toml b/Cargo.toml index 239f900e9..faf680bb8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,3 +1,10 @@ +# The Cargo workspace configurations shared by all in-kernel crates. +# +# As a kernel project, most crates in Asterinas are written and built for the kernel space. +# But there are also a few userspace crates +# whose crate-level `Cargo.toml` files are not affected by this workspace-level `Cargo.toml`. +# The complete list can be found in the `workspace.exclude` field. + [workspace] resolver = "2" members = [ @@ -42,7 +49,6 @@ members = [ "kernel/libs/typeflags-util", "kernel/libs/atomic-integer-wrapper", "kernel/libs/xarray", - "tools/sctrace", ] exclude = [ "kernel/libs/comp-sys/cargo-component", @@ -60,6 +66,18 @@ unexpected_cfgs = { level = "allow", check-cfg = ['cfg(ktest)'] } [workspace.lints.clippy] allow_attributes = "warn" +# Keys under `workspace.package` and the `package` section of each crate +# follow the ordering suggested at: +# https://github.com/crate-ci/cargo-cargofmt/issues/29#issuecomment-3647516745 +# +# FIXME: The current key order is not yet finalized. +# Once `cargo-cargofmt` becomes stable, we will use it to enforce a consistent key order. +[workspace.package] +version = "0.17.0" +repository = "https://github.com/asterinas/asterinas" +license = "MPL-2.0" +edition = "2024" + # Cargo only looks at the profile settings # in the Cargo.toml manifest at the root of the workspace diff --git a/Makefile b/Makefile index 105c3808e..4c079df1e 100644 --- a/Makefile +++ b/Makefile @@ -221,8 +221,7 @@ NON_OSDK_CRATES := \ kernel/libs/keyable-arc \ kernel/libs/logo-ascii-art \ kernel/libs/typeflags \ - kernel/libs/typeflags-util \ - tools/sctrace + kernel/libs/typeflags-util # In contrast, OSDK crates depend on OSTD (or being `ostd` itself) # and need to be built or tested with OSDK. diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 691e931f6..421001a97 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-nix" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/block/Cargo.toml b/kernel/comps/block/Cargo.toml index 5f0ece96c..796fe08c7 100644 --- a/kernel/comps/block/Cargo.toml +++ b/kernel/comps/block/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-block" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/cmdline/Cargo.toml b/kernel/comps/cmdline/Cargo.toml index b208bd7a9..a844a43b8 100644 --- a/kernel/comps/cmdline/Cargo.toml +++ b/kernel/comps/cmdline/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-cmdline" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/console/Cargo.toml b/kernel/comps/console/Cargo.toml index 746ec49e4..adfba638b 100644 --- a/kernel/comps/console/Cargo.toml +++ b/kernel/comps/console/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-console" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/framebuffer/Cargo.toml b/kernel/comps/framebuffer/Cargo.toml index 1950b4dd2..7f44a49a9 100644 --- a/kernel/comps/framebuffer/Cargo.toml +++ b/kernel/comps/framebuffer/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-framebuffer" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/i8042/Cargo.toml b/kernel/comps/i8042/Cargo.toml index ca03446f3..bc0a44257 100644 --- a/kernel/comps/i8042/Cargo.toml +++ b/kernel/comps/i8042/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-i8042" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/input/Cargo.toml b/kernel/comps/input/Cargo.toml index 9cf9b9e58..21f1d50b5 100644 --- a/kernel/comps/input/Cargo.toml +++ b/kernel/comps/input/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-input" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/logger/Cargo.toml b/kernel/comps/logger/Cargo.toml index ef0b5cae0..5979ff0fa 100644 --- a/kernel/comps/logger/Cargo.toml +++ b/kernel/comps/logger/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-logger" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/mlsdisk/Cargo.toml b/kernel/comps/mlsdisk/Cargo.toml index 212c4e898..cf20b2abf 100644 --- a/kernel/comps/mlsdisk/Cargo.toml +++ b/kernel/comps/mlsdisk/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-mlsdisk" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/network/Cargo.toml b/kernel/comps/network/Cargo.toml index fff6441c9..5c0fb3cba 100644 --- a/kernel/comps/network/Cargo.toml +++ b/kernel/comps/network/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-network" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/pci/Cargo.toml b/kernel/comps/pci/Cargo.toml index 0536093b4..b13ef4429 100644 --- a/kernel/comps/pci/Cargo.toml +++ b/kernel/comps/pci/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-pci" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/softirq/Cargo.toml b/kernel/comps/softirq/Cargo.toml index 980e20649..86d29f48c 100644 --- a/kernel/comps/softirq/Cargo.toml +++ b/kernel/comps/softirq/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-softirq" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/systree/Cargo.toml b/kernel/comps/systree/Cargo.toml index 7cc3cffc6..8b87e446c 100644 --- a/kernel/comps/systree/Cargo.toml +++ b/kernel/comps/systree/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-systree" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/time/Cargo.toml b/kernel/comps/time/Cargo.toml index 2201ce534..236764a86 100644 --- a/kernel/comps/time/Cargo.toml +++ b/kernel/comps/time/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-time" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/comps/virtio/Cargo.toml b/kernel/comps/virtio/Cargo.toml index 84e3a5dfe..3f92c8ec2 100644 --- a/kernel/comps/virtio/Cargo.toml +++ b/kernel/comps/virtio/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-virtio" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/aster-bigtcp/Cargo.toml b/kernel/libs/aster-bigtcp/Cargo.toml index 9e25dcef1..3bfded6bd 100644 --- a/kernel/libs/aster-bigtcp/Cargo.toml +++ b/kernel/libs/aster-bigtcp/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-bigtcp" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/aster-rights-proc/Cargo.toml b/kernel/libs/aster-rights-proc/Cargo.toml index e3aea1771..0affdb23f 100644 --- a/kernel/libs/aster-rights-proc/Cargo.toml +++ b/kernel/libs/aster-rights-proc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-rights-proc" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/aster-rights/Cargo.toml b/kernel/libs/aster-rights/Cargo.toml index 0955ac88d..dca11cd72 100644 --- a/kernel/libs/aster-rights/Cargo.toml +++ b/kernel/libs/aster-rights/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-rights" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/aster-util/Cargo.toml b/kernel/libs/aster-util/Cargo.toml index 8b6b4ce3b..9e73a5aac 100644 --- a/kernel/libs/aster-util/Cargo.toml +++ b/kernel/libs/aster-util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "aster-util" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/atomic-integer-wrapper/Cargo.toml b/kernel/libs/atomic-integer-wrapper/Cargo.toml index 1e7d4ed60..8d7e1d570 100644 --- a/kernel/libs/atomic-integer-wrapper/Cargo.toml +++ b/kernel/libs/atomic-integer-wrapper/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "atomic-integer-wrapper" version = "0.1.0" -edition = "2024" +edition.workspace = true [lib] proc-macro = true diff --git a/kernel/libs/cpio-decoder/Cargo.toml b/kernel/libs/cpio-decoder/Cargo.toml index 2aaf8f5be..faabc6766 100644 --- a/kernel/libs/cpio-decoder/Cargo.toml +++ b/kernel/libs/cpio-decoder/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "cpio-decoder" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/device-id/Cargo.toml b/kernel/libs/device-id/Cargo.toml index 0294491ef..d2b15a922 100644 --- a/kernel/libs/device-id/Cargo.toml +++ b/kernel/libs/device-id/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "device-id" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/int-to-c-enum/Cargo.toml b/kernel/libs/int-to-c-enum/Cargo.toml index 836b83b59..da08ea8a6 100644 --- a/kernel/libs/int-to-c-enum/Cargo.toml +++ b/kernel/libs/int-to-c-enum/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "int-to-c-enum" version = "0.1.0" -edition = "2024" -license = "MPL-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true readme = "README.md" description = "TryFromInt - A convenient derive macro for converting an integer to an enum" -repository = "https://github.com/asterinas/asterinas" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/int-to-c-enum/derive/Cargo.toml b/kernel/libs/int-to-c-enum/derive/Cargo.toml index a388a00c5..49052e8e0 100644 --- a/kernel/libs/int-to-c-enum/derive/Cargo.toml +++ b/kernel/libs/int-to-c-enum/derive/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "int-to-c-enum-derive" version = "0.1.0" -edition = "2024" -license = "MPL-2.0" +edition.workspace = true +license.workspace = true +repository.workspace = true description = "int-to-c-enum's proc macros" -repository = "https://github.com/asterinas/asterinas" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/jhash/Cargo.toml b/kernel/libs/jhash/Cargo.toml index da1acc6ef..5f043178e 100644 --- a/kernel/libs/jhash/Cargo.toml +++ b/kernel/libs/jhash/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "jhash" version = "0.1.0" -edition = "2024" +edition.workspace = true [dependencies] diff --git a/kernel/libs/keyable-arc/Cargo.toml b/kernel/libs/keyable-arc/Cargo.toml index b7f63496c..56a545fb0 100644 --- a/kernel/libs/keyable-arc/Cargo.toml +++ b/kernel/libs/keyable-arc/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "keyable-arc" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/logo-ascii-art/Cargo.toml b/kernel/libs/logo-ascii-art/Cargo.toml index 8f772fde3..e3d673cf7 100644 --- a/kernel/libs/logo-ascii-art/Cargo.toml +++ b/kernel/libs/logo-ascii-art/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "logo-ascii-art" version = "0.1.0" -edition = "2024" +edition.workspace = true [dependencies] # This crate is only needed by `main.rs`, not `lib.rs` diff --git a/kernel/libs/typeflags-util/Cargo.toml b/kernel/libs/typeflags-util/Cargo.toml index 3e60a1075..afa65c5c4 100644 --- a/kernel/libs/typeflags-util/Cargo.toml +++ b/kernel/libs/typeflags-util/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "typeflags-util" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/typeflags/Cargo.toml b/kernel/libs/typeflags/Cargo.toml index 573aa8ac1..c87075a76 100644 --- a/kernel/libs/typeflags/Cargo.toml +++ b/kernel/libs/typeflags/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "typeflags" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/kernel/libs/xarray/Cargo.toml b/kernel/libs/xarray/Cargo.toml index dd27477c6..3fea4f7b5 100644 --- a/kernel/libs/xarray/Cargo.toml +++ b/kernel/libs/xarray/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "xarray" version = "0.1.0" -edition = "2024" +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/osdk/deps/frame-allocator/Cargo.toml b/osdk/deps/frame-allocator/Cargo.toml index 778ab06b8..0036a950f 100644 --- a/osdk/deps/frame-allocator/Cargo.toml +++ b/osdk/deps/frame-allocator/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "osdk-frame-allocator" -version = "0.17.0" -edition = "2024" description = "The default buddy system frame allocator shipped with OSDK." -license = "MPL-2.0" -repository ="https://github.com/asterinas/asterinas" readme = "README.md" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true [dependencies] log = "0.4" diff --git a/osdk/deps/heap-allocator/Cargo.toml b/osdk/deps/heap-allocator/Cargo.toml index 427129c60..ab6e33781 100644 --- a/osdk/deps/heap-allocator/Cargo.toml +++ b/osdk/deps/heap-allocator/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "osdk-heap-allocator" -version = "0.17.0" -edition = "2024" description = "The default slab-based heap allocator shipped with OSDK." -license = "MPL-2.0" -repository ="https://github.com/asterinas/asterinas" readme = "README.md" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true [dependencies] log = "0.4" diff --git a/osdk/deps/test-kernel/Cargo.toml b/osdk/deps/test-kernel/Cargo.toml index 16ca07438..32714a436 100644 --- a/osdk/deps/test-kernel/Cargo.toml +++ b/osdk/deps/test-kernel/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "osdk-test-kernel" -version = "0.17.0" -edition = "2024" description = "The OSTD-based kernel for running unit tests with OSDK." -license = "MPL-2.0" -repository ="https://github.com/asterinas/asterinas" readme = "README.md" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/Cargo.toml b/ostd/Cargo.toml index 124da197c..c59830060 100644 --- a/ostd/Cargo.toml +++ b/ostd/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "ostd" -version = "0.17.0" -edition = "2024" description = "Rust OS framework that facilitates the development of and innovation in OS kernels" -license = "MPL-2.0" -readme = "README.md" -repository = "https://github.com/asterinas/asterinas" documentation = "https://asterinas.github.io/api-docs" +readme = "README.md" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/align_ext/Cargo.toml b/ostd/libs/align_ext/Cargo.toml index 503a70420..01e22d2fe 100644 --- a/ostd/libs/align_ext/Cargo.toml +++ b/ostd/libs/align_ext/Cargo.toml @@ -1,9 +1,10 @@ [package] name = "align_ext" version = "0.1.0" -edition = "2024" description = " An extension trait for Rust integer types to make integers aligned to a power of two" -license = "MPL-2.0" +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/id-alloc/Cargo.toml b/ostd/libs/id-alloc/Cargo.toml index 1e007c97f..245cdf0cc 100644 --- a/ostd/libs/id-alloc/Cargo.toml +++ b/ostd/libs/id-alloc/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "id-alloc" version = "0.1.0" -edition = "2024" -license = "MPL-2.0" description = "An id allocator implemented by the bitmap" -repository = "https://github.com/asterinas/asterinas" +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/linux-bzimage/boot-params/Cargo.toml b/ostd/libs/linux-bzimage/boot-params/Cargo.toml index 62dba8eeb..b3010367f 100644 --- a/ostd/libs/linux-bzimage/boot-params/Cargo.toml +++ b/ostd/libs/linux-bzimage/boot-params/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "linux-boot-params" -version = "0.17.0" -edition = "2024" description = "The Boot Parameters for Linux Boot Protocol" -license = "MPL-2.0" -repository = "https://github.com/asterinas/asterinas" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/linux-bzimage/builder/Cargo.toml b/ostd/libs/linux-bzimage/builder/Cargo.toml index 226c28d23..cd1d5b277 100644 --- a/ostd/libs/linux-bzimage/builder/Cargo.toml +++ b/ostd/libs/linux-bzimage/builder/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "linux-bzimage-builder" -version = "0.17.0" -edition = "2024" description = "Linux boot compatibility for modern OSes" -license = "MPL-2.0" -repository = "https://github.com/asterinas/asterinas" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/linux-bzimage/setup/Cargo.toml b/ostd/libs/linux-bzimage/setup/Cargo.toml index e0c24abe5..86779a80a 100644 --- a/ostd/libs/linux-bzimage/setup/Cargo.toml +++ b/ostd/libs/linux-bzimage/setup/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "linux-bzimage-setup" -version = "0.17.0" -edition = "2024" description = "The linux bzImage setup binary" -license = "MPL-2.0" -repository = "https://github.com/asterinas/asterinas" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true [[bin]] name = "linux-bzimage-setup" diff --git a/ostd/libs/ostd-macros/Cargo.toml b/ostd/libs/ostd-macros/Cargo.toml index 44b475741..59eccdee0 100644 --- a/ostd/libs/ostd-macros/Cargo.toml +++ b/ostd/libs/ostd-macros/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "ostd-macros" -version = "0.17.0" -edition = "2024" description = "OSTD's proc macros" -license = "MPL-2.0" -repository ="https://github.com/asterinas/asterinas" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/ostd/libs/ostd-test/Cargo.toml b/ostd/libs/ostd-test/Cargo.toml index 05c975f56..6b14cd2bb 100644 --- a/ostd/libs/ostd-test/Cargo.toml +++ b/ostd/libs/ostd-test/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "ostd-test" -version = "0.17.0" -edition = "2024" description = "The kernel mode unit testing framework of OSTD" -license = "MPL-2.0" -repository ="https://github.com/asterinas/asterinas" +version.workspace = true +repository.workspace = true +license.workspace = true +edition.workspace = true # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/tools/sctrace/Cargo.toml b/tools/sctrace/Cargo.toml index 75987988d..5aa48ff82 100644 --- a/tools/sctrace/Cargo.toml +++ b/tools/sctrace/Cargo.toml @@ -16,6 +16,3 @@ clap = { version = "4.5.47", features = ["derive"] } regex = "1.11.2" nom = "7" nix = { version = "0.27", features = ["process"] } - -[lints] -workspace = true