Skip to content

Commit

Permalink
refactor: bind edition, version to workspace (#722)
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewgazelka authored Dec 15, 2024
1 parent eec261b commit 9103fe0
Show file tree
Hide file tree
Showing 32 changed files with 63 additions and 83 deletions.
4 changes: 2 additions & 2 deletions crates/bvh-region/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "bvh-region"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/geometry/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "geometry"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-clap-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-clap-macros"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-clap/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "hyperion-clap"
version = "0.1.0"
edition = "2024"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-command/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "hyperion-command"
version = "0.1.0"
edition = "2024"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-crafting/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-crafting"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-event-macros/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-event-macros"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-gui/Cargo.toml
Original file line number Diff line number Diff line change
@@ -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 }
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-inventory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-inventory"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-item/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "hyperion-item"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion crates/hyperion-item/src/builder.rs
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-minecraft-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-minecraft-proto"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-nerd-font/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-nerd-font"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-palette/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-palette"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-permission/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-permission"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-proto/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
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"]
20 changes: 0 additions & 20 deletions crates/hyperion-proto/rustfmt.toml

This file was deleted.

4 changes: 2 additions & 2 deletions crates/hyperion-proxy/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,11 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
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
4 changes: 2 additions & 2 deletions crates/hyperion-rank-tree/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "hyperion-rank-tree"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-rank-tree/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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},
};

Expand Down
4 changes: 2 additions & 2 deletions crates/hyperion-scheduled/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-scheduled"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-stats/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-stats"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-text/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-text"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion-utils/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion-utils"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/hyperion/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
edition = "2024"
edition.workspace = true
name = "hyperion"
publish = false
readme = "README.md"
version = "0.1.0"
version.workspace = true
4 changes: 2 additions & 2 deletions crates/simd-utils/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "simd-utils"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
2 changes: 1 addition & 1 deletion crates/simd-utils/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions crates/spatial/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "spatial"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
10 changes: 5 additions & 5 deletions crates/spatial/src/lib.rs
Original file line number Diff line number Diff line change
@@ -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)]
Expand All @@ -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) }
Expand Down
4 changes: 2 additions & 2 deletions crates/system-order/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
[package]
name = "system-order"
version = "0.1.0"
edition = "2021"
version.workspace = true
edition.workspace = true
authors = ["Andrew Gazelka <[email protected]>"]
readme = "README.md"
publish = false
Expand Down
4 changes: 2 additions & 2 deletions crates/system-order/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
4 changes: 2 additions & 2 deletions events/tag/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ workspace = true

[package]
authors = ["Andrew Gazelka <[email protected]>"]
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

0 comments on commit 9103fe0

Please sign in to comment.