Merge #738

738: Fixing a bunch of new and future clippy lints r=toasteater a=toasteater



Co-authored-by: toasteater <48371905+toasteater@users.noreply.github.com>

Author: bors[bot]

bindings_generator/src/dependency.rs

@@ -45,16 +45,14 @@ fn visit(api: &Api, class: &GodotClass, visited: &mut HashSet<String>) {
 fn base_classes(api: &Api, class: &GodotClass) -> HashSet<String> {
     let mut bases = HashSet::new();
 
-    if class.base_class.is_empty() {
-        bases
-    } else {
+    if !class.base_class.is_empty() {
         if let Some(class) = api.find_class(&class.base_class) {
             bases.insert(class.name.clone());
-
             bases.extend(base_classes(api, class));
         }
-        bases
     }
+
+    bases
 }
 
 fn referenced_classes(api: &Api, class: &GodotClass) -> HashSet<String> {

gdnative-core/src/core_types/color.rs

@@ -110,7 +110,7 @@ impl Color {
     }
 
     #[inline]
-    pub fn to_html(&self, with_alpha: bool) -> GodotString {
+    pub fn to_html(self, with_alpha: bool) -> GodotString {
         GodotString::from_sys(unsafe { (get_api().godot_color_to_html)(self.sys(), with_alpha) })
     }
 
@@ -122,7 +122,7 @@ impl Color {
     /// # Example
     /// `0x00FF7FFF` would be the equivalent to `Color::from_rgba(1.0, 0.5, 1.0, 0.0)`
     #[inline]
-    pub fn to_abgr32(&self) -> u32 {
+    pub fn to_abgr32(self) -> u32 {
         ((self.a * 255.0) as u32) << 24
             | ((self.b * 255.0) as u32) << 16
             | ((self.g * 255.0) as u32) << 8
@@ -137,7 +137,7 @@ impl Color {
     /// # Example
     /// `0x0000FFFF7FFFFFFF` would be the equivalent to `Color::from_rgba(0.0, 1.0, 0.5, 1.0)`
     #[inline]
-    pub fn to_abgr64(&self) -> u64 {
+    pub fn to_abgr64(self) -> u64 {
         ((self.a * 65535.0) as u64) << 48
             | ((self.b * 65535.0) as u64) << 32
             | ((self.g * 65535.0) as u64) << 16
@@ -151,7 +151,7 @@ impl Color {
     /// On little endian machines this is stored in the order BGRA byte order
     /// `0x0000FFFF7FFFFFFF` would be the equivalent to `Color::from_rgba(1.0, 0.5, 1.0, 0.0)`
     #[inline]
-    pub fn to_argb32(&self) -> u32 {
+    pub fn to_argb32(self) -> u32 {
         ((self.a * 255.0) as u32) << 24
             | ((self.r * 255.0) as u32) << 16
             | ((self.g * 255.0) as u32) << 8
@@ -166,7 +166,7 @@ impl Color {
     /// # Example
     /// `0x0000FFFF7FFFFFFF` would be the equivalent to `Color::from_rgba(1.0, 0.5, 1.0, 0.0)`
     #[inline]
-    pub fn to_argb64(&self) -> u64 {
+    pub fn to_argb64(self) -> u64 {
         ((self.a * 65535.0) as u64) << 48
             | ((self.r * 65535.0) as u64) << 32
             | ((self.g * 65535.0) as u64) << 16
@@ -181,7 +181,7 @@ impl Color {
     /// # Example
     /// `0x00FF7FFF` would be the equivalent to `Color::from_rgba(0.0, 1.0, 0.5, 1.0)`
     #[inline]
-    pub fn to_rgba32(&self) -> u32 {
+    pub fn to_rgba32(self) -> u32 {
         ((self.r * 255.0) as u32) << 24
             | ((self.g * 255.0) as u32) << 16
             | ((self.b * 255.0) as u32) << 8
@@ -196,7 +196,7 @@ impl Color {
     /// # Example
     /// `0x0000FFFF7FFFFFFF` would be the equivalent to `Color::from_rgba(0.0, 1.0, 0.5, 1.0)`
     #[inline]
-    pub fn to_rgba64(&self) -> u64 {
+    pub fn to_rgba64(self) -> u64 {
         ((self.r * 65535.0) as u64) << 48
             | ((self.g * 65535.0) as u64) << 32
             | ((self.b * 65535.0) as u64) << 16

gdnative-core/src/core_types/geom/basis.rs

@@ -286,7 +286,7 @@ impl Basis {
     ///
     /// If `self` is not normalized.
     #[inline]
-    pub fn to_quat(&self) -> Quat {
+    pub fn to_quat(self) -> Quat {
         // Assumes that the matrix can be decomposed into a proper rotation and scaling matrix as M = R.S,
         // and returns the Euler angles corresponding to the rotation part, complementing get_scale().
         // See the comment in get_scale() for further information.
@@ -348,7 +348,7 @@ impl Basis {
 
     /// Returns the scale of the matrix.
     #[inline]
-    pub fn to_scale(&self) -> Vector3 {
+    pub fn to_scale(self) -> Vector3 {
         let det = self.determinant();
         let det_sign = if det < 0.0 { -1.0 } else { 1.0 };
         Vector3::new(
@@ -383,7 +383,7 @@ impl Basis {
     ///
     /// See [`Basis::to_quat`](#method.to_quat) if you need a quaternion instead.
     #[inline]
-    pub fn to_euler(&self) -> Vector3 {
+    pub fn to_euler(self) -> Vector3 {
         let mut euler = Vector3::ZERO;
 
         let m12 = self.elements[1].z;

gdnative-core/src/core_types/string.rs

@@ -636,10 +636,9 @@ godot_test!(test_string {
     let cmp1: GodotString = "foo".into();
     let cmp2: GodotString = "foo".into();
     let cmp3: GodotString = "bar".into();
-    assert_eq!(cmp1 < cmp2, false, "equal should not be less than");
-    assert_eq!(cmp1 > cmp2, false, "equal should not be greater than");
-    assert_eq!(cmp1 < cmp3, false, "foo should be less than bar");
-    assert_eq!(cmp3 > cmp1, false, "bar should be greater than foo");
+    assert_eq!(cmp1.cmp(&cmp2), Ordering::Equal, "equal should not be less than");
+    assert_eq!(cmp1.cmp(&cmp3), Ordering::Greater, "foo should greater than bar");
+    assert_eq!(cmp3.cmp(&cmp1), Ordering::Less, "bar should be less than foo");
 
     let index_string: GodotString = "bar".into();
     assert_eq!(index_string[0], 'b');

gdnative-core/src/init.rs

@@ -60,9 +60,9 @@ impl InitializeInfo {
             crate::core_types::GodotString::clone_from_sys(*active_library_path);
 
         Self {
-            options,
             in_editor,
             active_library_path,
+            options,
         }
     }
 

gdnative-derive/src/native_script.rs

@@ -51,17 +51,10 @@ pub(crate) fn derive_native_class(derive_input: &DeriveInput) -> Result<TokenStr
             .map(|function_path| quote!(#function_path(builder);))
             .unwrap_or(quote!({}));
         let properties = data.properties.into_iter().map(|(ident, config)| {
-            let with_default = if let Some(default_value) = &config.default {
-                Some(quote!(.with_default(#default_value)))
-            } else {
-                None
-            };
-
-            let with_hint = if let Some(hint_fn) = &config.hint {
-                Some(quote!(.with_hint(#hint_fn())))
-            } else {
-                None
-            };
+            let with_default = config
+                .default
+                .map(|default_value| quote!(.with_default(#default_value)));
+            let with_hint = config.hint.map(|hint_fn| quote!(.with_hint(#hint_fn())));
 
             let with_usage = if config.no_editor {
                 Some(quote!(.with_usage(::gdnative::nativescript::init::property::Usage::NOEDITOR)))