Rename bevy_reflect_derive folder to derive (#13269)

# Objective - Some of the "large" crates have sub-crates, usually for things such as macros. - For an example, see [`bevy_ecs_macros` at `bevy_ecs/macros`](https://github.com/bevyengine/bevy/tree/4f9f987099224ca41aab91a582b80fca8eb969f8/crates/bevy_ecs/macros). - The one crate that does not follow this convention is [`bevy_reflect_derive`](https://github.com/bevyengine/bevy/tree/4f9f987099224ca41aab91a582b80fca8eb969f8/crates/bevy_reflect/bevy_reflect_derive), which is in the `bevy_reflect/bevy_reflect_derive` folder and not `bevy_reflect/derive` or `bevy_reflect/macros`. ## Solution - Rename folder `bevy_reflect_derive` to `derive`. - I chose to use `derive` instead of `macros` because the crate name itself ends in `_derive`. (One of only two crates to actually use this convention, funnily enough.) ## Testing - Build and test `bevy_reflect` and `bevy_reflect_derive`. - Apply the following patch to `publish.sh` to run it in `--dry-run` mode, to test that the path has been successfully updated: - If you have any security concerns about applying random diffs, feel free to skip this step. Worst case scenario it fails and Cart has to manually publish a few crates. ```bash # Apply patch to make `publish.sh` *not* actually publish anything. git apply path/to/foo.patch # Make `publish.sh` executable. chmod +x tools/publish.sh # Execute `publish.sh`. ./tools/publish.sh ``` ```patch diff --git a/tools/publish.sh b/tools/publish.sh index b020bad28..fbcc09281 100644 --- a/tools/publish.sh +++ b/tools/publish.sh @@ -49,7 +49,7 @@ crates=( if [ -n "$(git status --porcelain)" ]; then echo "You have local changes!" - exit 1 + # exit 1 fi pushd crates @@ -61,15 +61,15 @@ do cp ../LICENSE-APACHE "$crate" pushd "$crate" git add LICENSE-MIT LICENSE-APACHE - cargo publish --no-verify --allow-dirty + cargo publish --no-verify --allow-dirty --dry-run popd - sleep 20 + # sleep 20 done popd echo "Publishing root crate" -cargo publish --allow-dirty +cargo publish --allow-dirty --dry-run echo "Cleaning local state" git reset HEAD --hard ``` --- ## Changelog - Moved `bevy_reflect_derive` from `crates/bevy_reflect/bevy_reflect_derive` to `crates/bevy_reflect/derive`.
bevyengine · May 7, 2024 · 22305ac · 22305ac
1 parent 4737106
commit 22305ac
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 2 deletions.
diff --git a/crates/bevy_reflect/Cargo.toml b/crates/bevy_reflect/Cargo.toml
@@ -25,7 +25,7 @@ documentation = ["bevy_reflect_derive/documentation"]
 bevy_math = { path = "../bevy_math", version = "0.14.0-dev", features = [
   "serialize",
 ], optional = true }
-bevy_reflect_derive = { path = "bevy_reflect_derive", version = "0.14.0-dev" }
+bevy_reflect_derive = { path = "derive", version = "0.14.0-dev" }
 bevy_utils = { path = "../bevy_utils", version = "0.14.0-dev" }
 bevy_ptr = { path = "../bevy_ptr", version = "0.14.0-dev" }
 

diff --git a/...vy_reflect/bevy_reflect_derive/Cargo.toml → crates/bevy_reflect/derive/Cargo.toml b/...vy_reflect/bevy_reflect_derive/Cargo.toml → crates/bevy_reflect/derive/Cargo.toml
diff --git a/...eflect_derive/src/container_attributes.rs → ...eflect/derive/src/container_attributes.rs b/...eflect_derive/src/container_attributes.rs → ...eflect/derive/src/container_attributes.rs
diff --git a/...ct/bevy_reflect_derive/src/derive_data.rs → ...es/bevy_reflect/derive/src/derive_data.rs b/...ct/bevy_reflect_derive/src/derive_data.rs → ...es/bevy_reflect/derive/src/derive_data.rs
diff --git a/.../bevy_reflect_derive/src/documentation.rs → .../bevy_reflect/derive/src/documentation.rs b/.../bevy_reflect_derive/src/documentation.rs → .../bevy_reflect/derive/src/documentation.rs
diff --git a/...t/bevy_reflect_derive/src/enum_utility.rs → ...s/bevy_reflect/derive/src/enum_utility.rs b/...t/bevy_reflect_derive/src/enum_utility.rs → ...s/bevy_reflect/derive/src/enum_utility.rs
diff --git a/...vy_reflect_derive/src/field_attributes.rs → ...vy_reflect/derive/src/field_attributes.rs b/...vy_reflect_derive/src/field_attributes.rs → ...vy_reflect/derive/src/field_attributes.rs
diff --git a/...t/bevy_reflect_derive/src/from_reflect.rs → ...s/bevy_reflect/derive/src/from_reflect.rs b/...t/bevy_reflect_derive/src/from_reflect.rs → ...s/bevy_reflect/derive/src/from_reflect.rs
diff --git a/...ct/bevy_reflect_derive/src/impls/enums.rs → ...es/bevy_reflect/derive/src/impls/enums.rs b/...ct/bevy_reflect_derive/src/impls/enums.rs → ...es/bevy_reflect/derive/src/impls/enums.rs
diff --git a/...lect/bevy_reflect_derive/src/impls/mod.rs → crates/bevy_reflect/derive/src/impls/mod.rs b/...lect/bevy_reflect_derive/src/impls/mod.rs → crates/bevy_reflect/derive/src/impls/mod.rs
diff --git a/.../bevy_reflect_derive/src/impls/structs.rs → .../bevy_reflect/derive/src/impls/structs.rs b/.../bevy_reflect_derive/src/impls/structs.rs → .../bevy_reflect/derive/src/impls/structs.rs
diff --git a/...reflect_derive/src/impls/tuple_structs.rs → ...reflect/derive/src/impls/tuple_structs.rs b/...reflect_derive/src/impls/tuple_structs.rs → ...reflect/derive/src/impls/tuple_structs.rs
diff --git a/...ct/bevy_reflect_derive/src/impls/typed.rs → ...es/bevy_reflect/derive/src/impls/typed.rs b/...ct/bevy_reflect_derive/src/impls/typed.rs → ...es/bevy_reflect/derive/src/impls/typed.rs
diff --git a/...t/bevy_reflect_derive/src/impls/values.rs → ...s/bevy_reflect/derive/src/impls/values.rs b/...t/bevy_reflect_derive/src/impls/values.rs → ...s/bevy_reflect/derive/src/impls/values.rs
diff --git a/...vy_reflect/bevy_reflect_derive/src/lib.rs → crates/bevy_reflect/derive/src/lib.rs b/...vy_reflect/bevy_reflect_derive/src/lib.rs → crates/bevy_reflect/derive/src/lib.rs
diff --git a/.../bevy_reflect_derive/src/reflect_value.rs → .../bevy_reflect/derive/src/reflect_value.rs b/.../bevy_reflect_derive/src/reflect_value.rs → .../bevy_reflect/derive/src/reflect_value.rs
diff --git a/...t/bevy_reflect_derive/src/registration.rs → ...s/bevy_reflect/derive/src/registration.rs b/...t/bevy_reflect_derive/src/registration.rs → ...s/bevy_reflect/derive/src/registration.rs
diff --git a/.../bevy_reflect_derive/src/serialization.rs → .../bevy_reflect/derive/src/serialization.rs b/.../bevy_reflect_derive/src/serialization.rs → .../bevy_reflect/derive/src/serialization.rs
diff --git a/...vy_reflect_derive/src/trait_reflection.rs → ...vy_reflect/derive/src/trait_reflection.rs b/...vy_reflect_derive/src/trait_reflection.rs → ...vy_reflect/derive/src/trait_reflection.rs
diff --git a/...lect/bevy_reflect_derive/src/type_path.rs → crates/bevy_reflect/derive/src/type_path.rs b/...lect/bevy_reflect_derive/src/type_path.rs → crates/bevy_reflect/derive/src/type_path.rs
diff --git a/...eflect/bevy_reflect_derive/src/utility.rs → crates/bevy_reflect/derive/src/utility.rs b/...eflect/bevy_reflect_derive/src/utility.rs → crates/bevy_reflect/derive/src/utility.rs
diff --git a/tools/publish.sh b/tools/publish.sh
@@ -7,7 +7,7 @@ crates=(
     bevy_derive
     bevy_math
     bevy_tasks
-    bevy_reflect/bevy_reflect_derive
+    bevy_reflect/derive
     bevy_reflect
     bevy_ecs/macros
     bevy_ecs