Consistent #[derive] order and minor formatting

Author: Bromeon

godot-bindings/src/lib.rs

@@ -19,7 +19,7 @@ compile_error!(
 
 // This is outside of `godot_version` to allow us to use it even when we don't have the `custom-godot`
 // feature enabled.
-#[derive(Debug, Eq, PartialEq)]
+#[derive(Eq, PartialEq, Debug)]
 pub struct GodotVersion {
     /// the original string (trimmed, stripped of text around)
     pub full_string: String,

godot-codegen/src/util.rs

@@ -15,7 +15,7 @@ use quote::{format_ident, quote, ToTokens};
 
 use std::fmt;
 
-#[derive(Clone, Debug, PartialEq, Eq)]
+#[derive(Clone, Eq, PartialEq, Debug)]
 pub struct NativeStructuresField {
     pub field_type: String,
     pub field_name: String,

godot-core/src/builtin/array.rs

@@ -1022,7 +1022,7 @@ macro_rules! varray {
 /// [`set_typed`](https://docs.godotengine.org/en/latest/classes/class_array.html#class-array-method-set-typed).
 ///
 /// We ignore the `script` parameter because it has no impact on typing in Godot.
-#[derive(PartialEq, Eq)]
+#[derive(Eq, PartialEq)]
 pub(crate) struct TypeInfo {
     variant_type: VariantType,
 

godot-core/src/builtin/meta/godot_convert/convert_error.rs

@@ -108,7 +108,7 @@ impl Error for ConvertError {
     }
 }
 
-#[derive(Debug, PartialEq, Eq)]
+#[derive(Eq, PartialEq, Debug)]
 pub(crate) enum ErrorKind {
     FromGodot(FromGodotError),
     FromFfi(FromFfiError),

godot-core/src/builtin/vectors/vector_axis.rs

@@ -73,7 +73,7 @@ pub trait ToVector: Sized {
 }
 
 /// Enumerates the axes in a [`Vector2`].
-#[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
 #[repr(i32)]
 pub enum Vector2Axis {
     /// The X axis.
@@ -117,7 +117,7 @@ impl FromGodot for Vector2Axis {
 
 /// Enumerates the axes in a [`Vector3`].
 // TODO auto-generate this, alongside all the other builtin type's enums
-#[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
 #[repr(i32)]
 pub enum Vector3Axis {
     /// The X axis.
@@ -164,7 +164,7 @@ impl FromGodot for Vector3Axis {
 // ----------------------------------------------------------------------------------------------------------------------------------------------
 
 /// Enumerates the axes in a [`Vector4`].
-#[derive(Copy, Clone, Debug, Eq, Ord, PartialEq, PartialOrd)]
+#[derive(Copy, Clone, Eq, PartialEq, Ord, PartialOrd, Debug)]
 #[repr(i32)]
 pub enum Vector4Axis {
     /// The X axis.

godot-fmt/src/lib.rs

@@ -88,7 +88,7 @@ fn indent(n: usize) -> &'static str {
 /// State that is kept between processing `TokenTree`s, used to decide
 /// how to insert whitespace.
 
-#[derive(Clone, Copy, PartialEq, Eq)]
+#[derive(Copy, Clone, Eq, PartialEq)]
 enum FormatState {
     /// Starting state, meaning no whitespace is needed
     Start,

godot-macros/src/derive/derive_from_variant.rs

@@ -261,8 +261,8 @@ fn make_enum_tuple(
         } else {
             quote! {
                 let #ident = variant.pop_front()
-                                    .ok_or(ConvertError::with_cause_value("missing expected value", variant.clone()))?
-                                    .try_to::<#field_type>()?;
+                    .ok_or(ConvertError::with_cause_value("missing expected value", variant.clone()))?
+                    .try_to::<#field_type>()?;
             }
         };
         (ident.to_token_stream(), set_ident)

godot-macros/src/lib.rs

@@ -529,7 +529,7 @@ pub fn derive_from_godot(input: TokenStream) -> TokenStream {
 /// # use godot::prelude::*;
 /// #[repr(i32)]
 /// #[derive(Property)]
-/// # #[derive(PartialEq, Eq, Debug)]
+/// # #[derive(Eq, PartialEq, Debug)]
 /// enum TestEnum {
 ///     A = 0,
 ///     B = 1,

itest/rust/build.rs

@@ -77,7 +77,7 @@ macro_rules! push_newtype {
         pushs!(
             $inputs; $GDScriptTy, $name, $gdscript_val, $rust_val, false, false, None;
 
-            #[derive(Debug, Clone, PartialEq)]
+            #[derive(Clone, PartialEq, Debug)]
             pub struct $name($T);
 
             impl godot::builtin::meta::GodotConvert for $name {

itest/rust/src/builtin_tests/convert_test.rs

@@ -92,7 +92,7 @@ fn error_maintains_value() {
 }
 
 // Manual implementation of `GodotConvert` and related traits to ensure conversion works.
-#[derive(Debug, PartialEq)]
+#[derive(PartialEq, Debug)]
 struct Foo {
     a: i32,
     b: f32,