From dcbd690f21665e22ea250024a1aa85dec34e6c9e Mon Sep 17 00:00:00 2001 From: mat Date: Mon, 15 Dec 2025 11:14:40 +0930 Subject: sort derives with cargo sort-derives might add to ci later, unsure how to do it without adding significant friction for contributors though --- azalea-registry/azalea-registry-macros/src/lib.rs | 2 +- azalea-registry/src/data.rs | 4 ++-- azalea-registry/src/identifier.rs | 2 +- azalea-registry/src/lib.rs | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) (limited to 'azalea-registry') diff --git a/azalea-registry/azalea-registry-macros/src/lib.rs b/azalea-registry/azalea-registry-macros/src/lib.rs index e2e371b5..05134d29 100644 --- a/azalea-registry/azalea-registry-macros/src/lib.rs +++ b/azalea-registry/azalea-registry-macros/src/lib.rs @@ -80,7 +80,7 @@ pub fn registry(input: TokenStream) -> TokenStream { let attributes = input.attrs; generated.extend(quote! { #(#attributes)* - #[derive(Debug, Clone, Copy, PartialEq, Eq, PartialOrd, Ord, Hash, azalea_buf::AzBuf)] + #[derive(azalea_buf::AzBuf, Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] #[repr(u32)] pub enum #name { #enum_items diff --git a/azalea-registry/src/data.rs b/azalea-registry/src/data.rs index 75fd8439..b2c3691b 100644 --- a/azalea-registry/src/data.rs +++ b/azalea-registry/src/data.rs @@ -16,7 +16,7 @@ macro_rules! data_registry { } ) => { $(#[$doc])* - #[derive(Debug, Clone, Copy, AzBuf, PartialEq, Eq, Hash, PartialOrd, Ord)] + #[derive(AzBuf, Clone, Copy, Debug, Eq, Hash, Ord, PartialEq, PartialOrd)] pub struct $registry { #[var] id: u32, @@ -44,7 +44,7 @@ macro_rules! data_registry { } } - #[derive(Debug, PartialEq, Eq, Hash, Clone)] + #[derive(Clone, Debug, Eq, Hash, PartialEq)] pub enum $enum_name { $($variant),*, Other(Other) diff --git a/azalea-registry/src/identifier.rs b/azalea-registry/src/identifier.rs index b3456dab..c60f8381 100644 --- a/azalea-registry/src/identifier.rs +++ b/azalea-registry/src/identifier.rs @@ -17,7 +17,7 @@ use simdnbt::{FromNbtTag, ToNbtTag, owned::NbtTag}; /// /// This was formerly called a `ResourceLocation`. #[doc(alias = "ResourceLocation")] -#[derive(Hash, Clone, PartialEq, Eq, Default)] +#[derive(Clone, Default, Eq, Hash, PartialEq)] pub struct Identifier { // empty namespaces aren't allowed so NonZero is fine. colon_index: Option, diff --git a/azalea-registry/src/lib.rs b/azalea-registry/src/lib.rs index 12f8323a..743f0deb 100644 --- a/azalea-registry/src/lib.rs +++ b/azalea-registry/src/lib.rs @@ -66,7 +66,7 @@ where /// A registry that might not be present. /// /// This is transmitted as a single varint in the protocol. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub struct OptionalRegistry(pub Option); impl AzaleaRead for OptionalRegistry { @@ -90,7 +90,7 @@ impl AzaleaWrite for OptionalRegistry { } /// A registry that will either take an ID or a resource location. -#[derive(Debug, Clone, Copy, PartialEq, Eq, Hash)] +#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)] pub enum CustomRegistry { Direct(D), Custom(C), -- cgit v1.2.3