From 84c2b63e96953bc78aa0cdb131e7ba59651d1634 Mon Sep 17 00:00:00 2001 From: Olivier FAURE Date: Thu, 25 Jun 2026 19:05:01 +0200 Subject: [PATCH] Rename folders to match crate names --- .release-please-manifest.json | 2 +- Cargo.toml | 8 ++++---- {common => accesskit}/CHANGELOG.md | 0 {common => accesskit}/Cargo.toml | 0 {common => accesskit}/README.md | 0 {common => accesskit}/src/geometry.rs | 0 {common => accesskit}/src/lib.rs | 0 {consumer => accesskit_consumer}/CHANGELOG.md | 0 {consumer => accesskit_consumer}/Cargo.toml | 3 +-- {consumer => accesskit_consumer}/README.md | 0 {consumer => accesskit_consumer}/src/filters.rs | 0 {consumer => accesskit_consumer}/src/iterators.rs | 0 {consumer => accesskit_consumer}/src/lib.rs | 0 {consumer => accesskit_consumer}/src/node.rs | 0 {consumer => accesskit_consumer}/src/text.rs | 0 {consumer => accesskit_consumer}/src/tree.rs | 0 platforms/android/Cargo.toml | 4 ++-- platforms/atspi-common/Cargo.toml | 4 ++-- platforms/ios/Cargo.toml | 4 ++-- platforms/macos/Cargo.toml | 4 ++-- platforms/unix/Cargo.toml | 2 +- platforms/windows/Cargo.toml | 4 ++-- platforms/winit/Cargo.toml | 2 +- release-please-config.json | 4 ++-- 24 files changed, 20 insertions(+), 21 deletions(-) rename {common => accesskit}/CHANGELOG.md (100%) rename {common => accesskit}/Cargo.toml (100%) rename {common => accesskit}/README.md (100%) rename {common => accesskit}/src/geometry.rs (100%) rename {common => accesskit}/src/lib.rs (100%) rename {consumer => accesskit_consumer}/CHANGELOG.md (100%) rename {consumer => accesskit_consumer}/Cargo.toml (86%) rename {consumer => accesskit_consumer}/README.md (100%) rename {consumer => accesskit_consumer}/src/filters.rs (100%) rename {consumer => accesskit_consumer}/src/iterators.rs (100%) rename {consumer => accesskit_consumer}/src/lib.rs (100%) rename {consumer => accesskit_consumer}/src/node.rs (100%) rename {consumer => accesskit_consumer}/src/text.rs (100%) rename {consumer => accesskit_consumer}/src/tree.rs (100%) diff --git a/.release-please-manifest.json b/.release-please-manifest.json index cb14233ad..bb2b8e70d 100644 --- a/.release-please-manifest.json +++ b/.release-please-manifest.json @@ -1 +1 @@ -{"common":"0.24.1","consumer":"0.37.0","platforms/macos":"0.26.2","platforms/windows":"0.33.1","platforms/winit":"0.33.1","platforms/unix":"0.22.0","platforms/atspi-common":"0.19.0","platforms/android":"0.7.4","platforms/ios":"0.1.1"} \ No newline at end of file +{"accesskit":"0.24.1","consumer":"0.37.0","platforms/macos":"0.26.2","platforms/windows":"0.33.1","platforms/winit":"0.33.1","platforms/unix":"0.22.0","platforms/atspi-common":"0.19.0","platforms/android":"0.7.4","platforms/ios":"0.1.1"} \ No newline at end of file diff --git a/Cargo.toml b/Cargo.toml index a9f16b58c..3f7d4df70 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,8 +1,8 @@ [workspace] resolver = "2" members = [ - "common", - "consumer", + "accesskit", + "accesskit_consumer", "platforms/android", "platforms/atspi-common", "platforms/ios", @@ -12,8 +12,8 @@ members = [ "platforms/winit", ] default-members = [ - "common", - "consumer", + "accesskit", + "accesskit_consumer", "platforms/winit", ] diff --git a/common/CHANGELOG.md b/accesskit/CHANGELOG.md similarity index 100% rename from common/CHANGELOG.md rename to accesskit/CHANGELOG.md diff --git a/common/Cargo.toml b/accesskit/Cargo.toml similarity index 100% rename from common/Cargo.toml rename to accesskit/Cargo.toml diff --git a/common/README.md b/accesskit/README.md similarity index 100% rename from common/README.md rename to accesskit/README.md diff --git a/common/src/geometry.rs b/accesskit/src/geometry.rs similarity index 100% rename from common/src/geometry.rs rename to accesskit/src/geometry.rs diff --git a/common/src/lib.rs b/accesskit/src/lib.rs similarity index 100% rename from common/src/lib.rs rename to accesskit/src/lib.rs diff --git a/consumer/CHANGELOG.md b/accesskit_consumer/CHANGELOG.md similarity index 100% rename from consumer/CHANGELOG.md rename to accesskit_consumer/CHANGELOG.md diff --git a/consumer/Cargo.toml b/accesskit_consumer/Cargo.toml similarity index 86% rename from consumer/Cargo.toml rename to accesskit_consumer/Cargo.toml index 8e82a10a6..782773cd9 100644 --- a/consumer/Cargo.toml +++ b/accesskit_consumer/Cargo.toml @@ -12,6 +12,5 @@ edition.workspace = true rust-version.workspace = true [dependencies] -accesskit = { version = "0.24.1", path = "../common" } +accesskit = { version = "0.24.1", path = "../accesskit" } hashbrown.workspace = true - diff --git a/consumer/README.md b/accesskit_consumer/README.md similarity index 100% rename from consumer/README.md rename to accesskit_consumer/README.md diff --git a/consumer/src/filters.rs b/accesskit_consumer/src/filters.rs similarity index 100% rename from consumer/src/filters.rs rename to accesskit_consumer/src/filters.rs diff --git a/consumer/src/iterators.rs b/accesskit_consumer/src/iterators.rs similarity index 100% rename from consumer/src/iterators.rs rename to accesskit_consumer/src/iterators.rs diff --git a/consumer/src/lib.rs b/accesskit_consumer/src/lib.rs similarity index 100% rename from consumer/src/lib.rs rename to accesskit_consumer/src/lib.rs diff --git a/consumer/src/node.rs b/accesskit_consumer/src/node.rs similarity index 100% rename from consumer/src/node.rs rename to accesskit_consumer/src/node.rs diff --git a/consumer/src/text.rs b/accesskit_consumer/src/text.rs similarity index 100% rename from consumer/src/text.rs rename to accesskit_consumer/src/text.rs diff --git a/consumer/src/tree.rs b/accesskit_consumer/src/tree.rs similarity index 100% rename from consumer/src/tree.rs rename to accesskit_consumer/src/tree.rs diff --git a/platforms/android/Cargo.toml b/platforms/android/Cargo.toml index 2302cb7fd..444076fa0 100644 --- a/platforms/android/Cargo.toml +++ b/platforms/android/Cargo.toml @@ -15,7 +15,7 @@ rust-version.workspace = true embedded-dex = [] [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } -accesskit_consumer = { version = "0.37.0", path = "../../consumer" } +accesskit = { version = "0.24.1", path = "../../accesskit" } +accesskit_consumer = { version = "0.37.0", path = "../../accesskit_consumer" } jni = "0.21.1" log = "0.4.17" diff --git a/platforms/atspi-common/Cargo.toml b/platforms/atspi-common/Cargo.toml index aaee53b83..9b08eb26b 100644 --- a/platforms/atspi-common/Cargo.toml +++ b/platforms/atspi-common/Cargo.toml @@ -15,8 +15,8 @@ rust-version.workspace = true simplified-api = [] [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } -accesskit_consumer = { version = "0.37.0", path = "../../consumer" } +accesskit = { version = "0.24.1", path = "../../accesskit" } +accesskit_consumer = { version = "0.37.0", path = "../../accesskit_consumer" } atspi-common = { version = "0.13", default-features = false } phf = { version = "0.13.1", features = ["macros"] } serde = "1.0" diff --git a/platforms/ios/Cargo.toml b/platforms/ios/Cargo.toml index 7d326cbf4..ada7b5665 100644 --- a/platforms/ios/Cargo.toml +++ b/platforms/ios/Cargo.toml @@ -15,8 +15,8 @@ rust-version.workspace = true default-target = "aarch64-apple-ios" [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } -accesskit_consumer = { version = "0.37.0", path = "../../consumer" } +accesskit = { version = "0.24.1", path = "../../accesskit" } +accesskit_consumer = { version = "0.37.0", path = "../../accesskit_consumer" } hashbrown.workspace = true objc2 = "0.5.1" objc2-foundation = { version = "0.2.0", features = [ diff --git a/platforms/macos/Cargo.toml b/platforms/macos/Cargo.toml index 7b6a5b06d..46c120223 100644 --- a/platforms/macos/Cargo.toml +++ b/platforms/macos/Cargo.toml @@ -15,8 +15,8 @@ rust-version.workspace = true default-target = "x86_64-apple-darwin" [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } -accesskit_consumer = { version = "0.37.0", path = "../../consumer" } +accesskit = { version = "0.24.1", path = "../../accesskit" } +accesskit_consumer = { version = "0.37.0", path = "../../accesskit_consumer" } hashbrown.workspace = true objc2 = "0.5.1" objc2-foundation = { version = "0.2.0", features = [ diff --git a/platforms/unix/Cargo.toml b/platforms/unix/Cargo.toml index e01ca2210..2ecb65060 100644 --- a/platforms/unix/Cargo.toml +++ b/platforms/unix/Cargo.toml @@ -17,7 +17,7 @@ async-io = ["dep:async-channel", "dep:async-executor", "dep:async-task", "dep:fu tokio = ["dep:tokio", "dep:tokio-stream"] [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } +accesskit = { version = "0.24.1", path = "../../accesskit" } accesskit_atspi_common = { version = "0.19.0", path = "../atspi-common" } atspi = { version = "0.29", default-features = false, features = ["proxies"] } futures-lite = "2.3" diff --git a/platforms/windows/Cargo.toml b/platforms/windows/Cargo.toml index e7440d85d..43dbf66ce 100644 --- a/platforms/windows/Cargo.toml +++ b/platforms/windows/Cargo.toml @@ -16,8 +16,8 @@ default-target = "x86_64-pc-windows-msvc" targets = [] [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } -accesskit_consumer = { version = "0.37.0", path = "../../consumer" } +accesskit = { version = "0.24.1", path = "../../accesskit" } +accesskit_consumer = { version = "0.37.0", path = "../../accesskit_consumer" } hashbrown.workspace = true static_assertions = "1.1.0" windows-core = "0.62.0" diff --git a/platforms/winit/Cargo.toml b/platforms/winit/Cargo.toml index c826914aa..81f48441b 100644 --- a/platforms/winit/Cargo.toml +++ b/platforms/winit/Cargo.toml @@ -19,7 +19,7 @@ async-io = ["accesskit_unix/async-io"] tokio = ["accesskit_unix/tokio"] [dependencies] -accesskit = { version = "0.24.1", path = "../../common" } +accesskit = { version = "0.24.1", path = "../../accesskit" } winit = { version = "0.30.5", default-features = false } rwh_05 = { package = "raw-window-handle", version = "0.5", features = ["std"], optional = true } rwh_06 = { package = "raw-window-handle", version = "0.6.2", features = ["std"], optional = true } diff --git a/release-please-config.json b/release-please-config.json index e0cf47199..7aba1fd06 100644 --- a/release-please-config.json +++ b/release-please-config.json @@ -4,8 +4,8 @@ "plugins": ["cargo-workspace"], "release-type": "rust", "packages": { - "common": {}, - "consumer": {}, + "accesskit": {}, + "accesskit_consumer": {}, "platforms/android": {}, "platforms/atspi-common": {}, "platforms/ios": {},