refactor: bind edition, version to workspace (#722)

andrewgazelka · web-flow · commit 9103fe030a7b · 2024-12-15T10:29:01.000-08:00
diff --git a/crates/bvh-region/Cargo.toml b/crates/bvh-region/Cargo.toml
@@ -39,8 +39,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "bvh-region"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/geometry/Cargo.toml b/crates/geometry/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "geometry"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/hyperion-clap-macros/Cargo.toml b/crates/hyperion-clap-macros/Cargo.toml
@@ -10,8 +10,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-clap-macros"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-clap/Cargo.toml b/crates/hyperion-clap/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperion-clap"
-version = "0.1.0"
-edition = "2024"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/hyperion-command/Cargo.toml b/crates/hyperion-command/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperion-command"
-version = "0.1.0"
-edition = "2024"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/hyperion-crafting/Cargo.toml b/crates/hyperion-crafting/Cargo.toml
@@ -10,8 +10,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-crafting"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-event-macros/Cargo.toml b/crates/hyperion-event-macros/Cargo.toml
@@ -12,8 +12,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-event-macros"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-gui/Cargo.toml b/crates/hyperion-gui/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperion-gui"
-version = "0.1.0"
-edition = "2024"
+version.workspace = true
+edition.workspace = true
 
 [dependencies]
 flecs_ecs = { workspace = true }
diff --git a/crates/hyperion-inventory/Cargo.toml b/crates/hyperion-inventory/Cargo.toml
@@ -10,8 +10,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-inventory"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-item/Cargo.toml b/crates/hyperion-item/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperion-item"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/hyperion-item/src/builder.rs b/crates/hyperion-item/src/builder.rs
@@ -1,5 +1,5 @@
 use flecs_ecs::core::Entity;
-use valence_protocol::{nbt, nbt::Value, ItemKind, ItemStack};
+use valence_protocol::{ItemKind, ItemStack, nbt, nbt::Value};
 
 mod book;
 pub use book::BookBuilder;
diff --git a/crates/hyperion-minecraft-proto/Cargo.toml b/crates/hyperion-minecraft-proto/Cargo.toml
@@ -5,8 +5,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-minecraft-proto"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-nerd-font/Cargo.toml b/crates/hyperion-nerd-font/Cargo.toml
@@ -5,8 +5,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-nerd-font"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-palette/Cargo.toml b/crates/hyperion-palette/Cargo.toml
@@ -8,8 +8,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-palette"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-permission/Cargo.toml b/crates/hyperion-permission/Cargo.toml
@@ -15,8 +15,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-permission"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-proto/Cargo.toml b/crates/hyperion-proto/Cargo.toml
@@ -9,11 +9,11 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-proto"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
 
 [package.metadata.cargo-machete]
 ignored = ["prost"]
diff --git a/crates/hyperion-proto/rustfmt.toml b/crates/hyperion-proto/rustfmt.toml
diff --git a/crates/hyperion-proxy/Cargo.toml b/crates/hyperion-proxy/Cargo.toml
@@ -23,11 +23,11 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-proxy"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 tikv-jemallocator.workspace = true
diff --git a/crates/hyperion-rank-tree/Cargo.toml b/crates/hyperion-rank-tree/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "hyperion-rank-tree"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/hyperion-rank-tree/src/lib.rs b/crates/hyperion-rank-tree/src/lib.rs
@@ -1,11 +1,11 @@
 use clap::ValueEnum;
 use flecs_ecs::{
-    core::{flecs, Entity, IdOperations, World},
+    core::{Entity, IdOperations, World, flecs},
     macros::Component,
     prelude::Module,
 };
 use hyperion::{
-    simulation::{handlers::PacketSwitchQuery, Player},
+    simulation::{Player, handlers::PacketSwitchQuery},
     storage::{EventFn, InteractEvent},
 };
 
diff --git a/crates/hyperion-scheduled/Cargo.toml b/crates/hyperion-scheduled/Cargo.toml
@@ -5,8 +5,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-scheduled"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-stats/Cargo.toml b/crates/hyperion-stats/Cargo.toml
@@ -14,8 +14,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-stats"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-text/Cargo.toml b/crates/hyperion-text/Cargo.toml
@@ -10,8 +10,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-text"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion-utils/Cargo.toml b/crates/hyperion-utils/Cargo.toml
@@ -17,8 +17,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion-utils"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/hyperion/Cargo.toml b/crates/hyperion/Cargo.toml
@@ -81,8 +81,8 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "hyperion"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
diff --git a/crates/simd-utils/Cargo.toml b/crates/simd-utils/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "simd-utils"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/simd-utils/src/lib.rs b/crates/simd-utils/src/lib.rs
@@ -6,7 +6,7 @@
 use core::simd;
 use std::{
     iter::zip,
-    simd::{cmp::SimdPartialEq, LaneCount, Mask, MaskElement, Simd, SupportedLaneCount},
+    simd::{LaneCount, Mask, MaskElement, Simd, SupportedLaneCount, cmp::SimdPartialEq},
 };
 
 use crate::one_bit_positions::OneBitPositionsExt;
diff --git a/crates/spatial/Cargo.toml b/crates/spatial/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spatial"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/spatial/src/lib.rs b/crates/spatial/src/lib.rs
@@ -1,17 +1,17 @@
 use bvh_region::TrivialHeuristic;
 use flecs_ecs::{
     core::{
-        flecs, Builder, Entity, EntityView, EntityViewGet, IdOperations, QueryAPI,
-        QueryBuilderImpl, SystemAPI, TermBuilderImpl, World, WorldGet,
+        Builder, Entity, EntityView, EntityViewGet, IdOperations, QueryAPI, QueryBuilderImpl,
+        SystemAPI, TermBuilderImpl, World, WorldGet, flecs,
     },
-    macros::{system, Component},
+    macros::{Component, system},
     prelude::Module,
 };
 use geometry::aabb::Aabb;
 use hyperion::{
     egress::player_join::RayonWorldStages,
     glam::Vec3,
-    simulation::{aabb, EntitySize, Position},
+    simulation::{EntitySize, Position, aabb},
 };
 
 #[derive(Component)]
@@ -23,7 +23,7 @@ pub struct SpatialIndex {
     query: bvh_region::Bvh<Entity>,
 }
 
-fn get_aabb_func<'a>(world: &'a World) -> impl Fn(&Entity) -> Aabb + Send + Sync + use<'a> {
+fn get_aabb_func<'a>(world: &'a World) -> impl Fn(&Entity) -> Aabb + Send + Sync {
     let stages: &'a RayonWorldStages = world.get::<&RayonWorldStages>(|stages| {
         // we can properly extend lifetimes here
         unsafe { core::mem::transmute(stages) }
diff --git a/crates/system-order/Cargo.toml b/crates/system-order/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "system-order"
-version = "0.1.0"
-edition = "2021"
+version.workspace = true
+edition.workspace = true
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
 readme = "README.md"
 publish = false
diff --git a/crates/system-order/src/lib.rs b/crates/system-order/src/lib.rs
@@ -3,8 +3,8 @@ use std::collections::{BTreeSet, HashMap, HashSet};
 use derive_more::Constructor;
 use flecs_ecs::{
     core::{
-        flecs, flecs::DependsOn, Builder, Entity, EntityView, EntityViewGet, IdOperations,
-        QueryAPI, QueryBuilderImpl,
+        Builder, Entity, EntityView, EntityViewGet, IdOperations, QueryAPI, QueryBuilderImpl,
+        flecs, flecs::DependsOn,
     },
     macros::Component,
     prelude::{Module, World},
diff --git a/events/tag/Cargo.toml b/events/tag/Cargo.toml
@@ -37,11 +37,11 @@ workspace = true
 
 [package]
 authors = ["Andrew Gazelka <andrew.gazelka@gmail.com>"]
-edition = "2024"
+edition.workspace = true
 name = "tag"
 publish = false
 readme = "README.md"
-version = "0.1.0"
+version.workspace = true
 
 [target.'cfg(not(target_os = "windows"))'.dependencies]
 tikv-jemallocator.workspace = true
