From 6f54cc56e765732ae2b5ada8dfd98a27d6f60eeb Mon Sep 17 00:00:00 2001 From: jiangjianfeng Date: Thu, 25 Dec 2025 10:54:12 +0000 Subject: [PATCH] Move int-to-c-enum from kernel/libs to ostd/libs --- Cargo.toml | 6 +++--- Makefile | 4 ++-- {kernel => ostd}/libs/int-to-c-enum/.gitignore | 0 {kernel => ostd}/libs/int-to-c-enum/Cargo.toml | 8 ++++---- {kernel => ostd}/libs/int-to-c-enum/README.md | 0 {kernel => ostd}/libs/int-to-c-enum/derive/Cargo.toml | 6 +++--- {kernel => ostd}/libs/int-to-c-enum/derive/src/lib.rs | 0 {kernel => ostd}/libs/int-to-c-enum/src/lib.rs | 0 {kernel => ostd}/libs/int-to-c-enum/tests/regression.rs | 0 9 files changed, 12 insertions(+), 12 deletions(-) rename {kernel => ostd}/libs/int-to-c-enum/.gitignore (100%) rename {kernel => ostd}/libs/int-to-c-enum/Cargo.toml (100%) rename {kernel => ostd}/libs/int-to-c-enum/README.md (100%) rename {kernel => ostd}/libs/int-to-c-enum/derive/Cargo.toml (100%) rename {kernel => ostd}/libs/int-to-c-enum/derive/src/lib.rs (100%) rename {kernel => ostd}/libs/int-to-c-enum/src/lib.rs (100%) rename {kernel => ostd}/libs/int-to-c-enum/tests/regression.rs (100%) diff --git a/Cargo.toml b/Cargo.toml index ba40b27e0..e6e275665 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -15,6 +15,8 @@ members = [ "ostd/libs/align_ext", "ostd/libs/ostd-macros", "ostd/libs/id-alloc", + "ostd/libs/int-to-c-enum", + "ostd/libs/int-to-c-enum/derive", "ostd/libs/linux-bzimage/builder", "ostd/libs/linux-bzimage/boot-params", "ostd/libs/linux-bzimage/setup", @@ -35,8 +37,6 @@ members = [ "kernel/comps/virtio", "kernel/comps/pci", "kernel/libs/cpio-decoder", - "kernel/libs/int-to-c-enum", - "kernel/libs/int-to-c-enum/derive", "kernel/libs/aster-rights", "kernel/libs/aster-rights-proc", "kernel/libs/aster-util", @@ -84,6 +84,7 @@ ostd = { version = "0.17.0", path = "ostd" } # Crates under ostd/libs align_ext = { path = "ostd/libs/align_ext", version = "0.1.0" } id-alloc = { path = "ostd/libs/id-alloc", version = "0.1.0" } +int-to-c-enum = { path = "ostd/libs/int-to-c-enum", version = "0.1.0" } linux-boot-params = { version = "0.17.0", path = "ostd/libs/linux-bzimage/boot-params" } ostd-macros = { version = "0.17.0", path = "ostd/libs/ostd-macros" } ostd-test = { version = "0.17.0", path = "ostd/libs/ostd-test" } @@ -112,7 +113,6 @@ aster-util = { path = "kernel/libs/aster-util" } atomic-integer-wrapper = { path = "kernel/libs/atomic-integer-wrapper" } cpio-decoder = { path = "kernel/libs/cpio-decoder" } device-id = { path = "kernel/libs/device-id" } -int-to-c-enum = { path = "kernel/libs/int-to-c-enum", version = "0.1.0" } jhash = { path = "kernel/libs/jhash" } keyable-arc = { path = "kernel/libs/keyable-arc" } logo-ascii-art = { path = "kernel/libs/logo-ascii-art" } diff --git a/Makefile b/Makefile index 4c079df1e..5aa0f92e6 100644 --- a/Makefile +++ b/Makefile @@ -207,6 +207,8 @@ export NON_OSDK_CRATES := \ ostd/libs/align_ext \ ostd/libs/id-alloc \ + ostd/libs/int-to-c-enum \ + ostd/libs/int-to-c-enum/derive \ ostd/libs/linux-bzimage/builder \ ostd/libs/linux-bzimage/boot-params \ ostd/libs/ostd-macros \ @@ -215,8 +217,6 @@ NON_OSDK_CRATES := \ kernel/libs/aster-rights-proc \ kernel/libs/atomic-integer-wrapper \ kernel/libs/cpio-decoder \ - kernel/libs/int-to-c-enum \ - kernel/libs/int-to-c-enum/derive \ kernel/libs/jhash \ kernel/libs/keyable-arc \ kernel/libs/logo-ascii-art \ diff --git a/kernel/libs/int-to-c-enum/.gitignore b/ostd/libs/int-to-c-enum/.gitignore similarity index 100% rename from kernel/libs/int-to-c-enum/.gitignore rename to ostd/libs/int-to-c-enum/.gitignore diff --git a/kernel/libs/int-to-c-enum/Cargo.toml b/ostd/libs/int-to-c-enum/Cargo.toml similarity index 100% rename from kernel/libs/int-to-c-enum/Cargo.toml rename to ostd/libs/int-to-c-enum/Cargo.toml index da08ea8a6..80c05eb6b 100644 --- a/kernel/libs/int-to-c-enum/Cargo.toml +++ b/ostd/libs/int-to-c-enum/Cargo.toml @@ -1,11 +1,11 @@ [package] name = "int-to-c-enum" version = "0.1.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" +readme = "README.md" +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/kernel/libs/int-to-c-enum/README.md b/ostd/libs/int-to-c-enum/README.md similarity index 100% rename from kernel/libs/int-to-c-enum/README.md rename to ostd/libs/int-to-c-enum/README.md diff --git a/kernel/libs/int-to-c-enum/derive/Cargo.toml b/ostd/libs/int-to-c-enum/derive/Cargo.toml similarity index 100% rename from kernel/libs/int-to-c-enum/derive/Cargo.toml rename to ostd/libs/int-to-c-enum/derive/Cargo.toml index 119c4a541..d41b41866 100644 --- a/kernel/libs/int-to-c-enum/derive/Cargo.toml +++ b/ostd/libs/int-to-c-enum/derive/Cargo.toml @@ -1,10 +1,10 @@ [package] name = "int-to-c-enum-derive" version = "0.1.0" -edition.workspace = true -license.workspace = true -repository.workspace = true description = "int-to-c-enum's proc macros" +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/kernel/libs/int-to-c-enum/derive/src/lib.rs b/ostd/libs/int-to-c-enum/derive/src/lib.rs similarity index 100% rename from kernel/libs/int-to-c-enum/derive/src/lib.rs rename to ostd/libs/int-to-c-enum/derive/src/lib.rs diff --git a/kernel/libs/int-to-c-enum/src/lib.rs b/ostd/libs/int-to-c-enum/src/lib.rs similarity index 100% rename from kernel/libs/int-to-c-enum/src/lib.rs rename to ostd/libs/int-to-c-enum/src/lib.rs diff --git a/kernel/libs/int-to-c-enum/tests/regression.rs b/ostd/libs/int-to-c-enum/tests/regression.rs similarity index 100% rename from kernel/libs/int-to-c-enum/tests/regression.rs rename to ostd/libs/int-to-c-enum/tests/regression.rs