Some clippy fixes. (#624)

waywardmonkeys · web-flow · commit 18df9aafe7da · 2023-08-03T14:20:26.000Z
diff --git a/cocoa-foundation/src/foundation.rs b/cocoa-foundation/src/foundation.rs
@@ -48,7 +48,7 @@ mod macos {
     impl NSPoint {
         #[inline]
         pub fn new(x: CGFloat, y: CGFloat) -> NSPoint {
-            NSPoint { x: x, y: y }
+            NSPoint { x, y }
         }
     }
 
@@ -73,10 +73,7 @@ mod macos {
     impl NSSize {
         #[inline]
         pub fn new(width: CGFloat, height: CGFloat) -> NSSize {
-            NSSize {
-                width: width,
-                height: height,
-            }
+            NSSize { width, height }
         }
     }
 
@@ -101,10 +98,7 @@ mod macos {
     impl NSRect {
         #[inline]
         pub fn new(origin: NSPoint, size: NSSize) -> NSRect {
-            NSRect {
-                origin: origin,
-                size: size,
-            }
+            NSRect { origin, size }
         }
 
         #[inline]
@@ -169,10 +163,7 @@ pub struct NSRange {
 impl NSRange {
     #[inline]
     pub fn new(location: NSUInteger, length: NSUInteger) -> NSRange {
-        NSRange {
-            location: location,
-            length: length,
-        }
+        NSRange { location, length }
     }
 }
 
@@ -216,9 +207,9 @@ impl NSOperatingSystemVersion {
         patchVersion: NSUInteger,
     ) -> NSOperatingSystemVersion {
         NSOperatingSystemVersion {
-            majorVersion: majorVersion,
-            minorVersion: minorVersion,
-            patchVersion: patchVersion,
+            majorVersion,
+            minorVersion,
+            patchVersion,
         }
     }
 }
@@ -663,10 +654,10 @@ impl NSString for id {
     }
 
     unsafe fn init_str(self, string: &str) -> id {
-        return msg_send![self,
-                         initWithBytes:string.as_ptr()
-                             length:string.len()
-                             encoding:UTF8_ENCODING as id];
+        msg_send![self,
+                  initWithBytes:string.as_ptr()
+                      length:string.len()
+                      encoding:UTF8_ENCODING as id]
     }
 
     unsafe fn len(self) -> usize {
@@ -734,7 +725,7 @@ impl Iterator for NSFastIterator {
         }
 
         if self.idx < self.len {
-            let object = unsafe { *self.state.items_ptr.offset(self.idx as isize) };
+            let object = unsafe { *self.state.items_ptr.add(self.idx) };
             self.mut_val = Some(new_mut);
             self.idx += 1;
             Some(object)
diff --git a/cocoa-foundation/tests/foundation.rs b/cocoa-foundation/tests/foundation.rs
@@ -116,8 +116,8 @@ mod foundation {
 
         #[test]
         fn test_get() {
-            const KEY: &'static str = "The key";
-            const VALUE: &'static str = "Some value";
+            const KEY: &str = "The key";
+            const VALUE: &str = "Some value";
             unsafe {
                 let key = NSString::alloc(nil).init_str(KEY);
                 let value = NSString::alloc(nil).init_str(VALUE);
diff --git a/cocoa/examples/color.rs b/cocoa/examples/color.rs
@@ -133,5 +133,5 @@ unsafe fn create_app() -> id {
     let current_app = NSRunningApplication::currentApplication(nil);
     current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps);
 
-    return app;
+    app
 }
diff --git a/cocoa/examples/tab_view.rs b/cocoa/examples/tab_view.rs
@@ -83,5 +83,5 @@ unsafe fn create_app(title: id, content: id) -> id {
     let current_app = NSRunningApplication::currentApplication(nil);
     current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps);
 
-    return app;
+    app
 }
diff --git a/cocoa/src/appkit.rs b/cocoa/src/appkit.rs
@@ -583,7 +583,7 @@ impl NSApplication for id {
 
     unsafe fn presentationOptions_(self) -> NSApplicationPresentationOptions {
         let options = msg_send![self, presentationOptions];
-        return NSApplicationPresentationOptions::from_bits(options).unwrap();
+        NSApplicationPresentationOptions::from_bits(options).unwrap()
     }
 
     unsafe fn setMainMenu_(self, menu: id) {
diff --git a/core-foundation-sys/src/base.rs b/core-foundation-sys/src/base.rs
@@ -49,9 +49,9 @@ pub type CFComparatorFunction = extern "C" fn(
     context: *mut c_void,
 ) -> CFComparisonResult;
 
-impl Into<Ordering> for CFComparisonResult {
-    fn into(self) -> Ordering {
-        match self {
+impl From<CFComparisonResult> for Ordering {
+    fn from(val: CFComparisonResult) -> Self {
+        match val {
             CFComparisonResult::LessThan => Ordering::Less,
             CFComparisonResult::EqualTo => Ordering::Equal,
             CFComparisonResult::GreaterThan => Ordering::Greater,
@@ -69,10 +69,7 @@ pub struct CFRange {
 // for back-compat
 impl CFRange {
     pub fn init(location: CFIndex, length: CFIndex) -> CFRange {
-        CFRange {
-            location: location,
-            length: length,
-        }
+        CFRange { location, length }
     }
 }
 
diff --git a/core-foundation/src/array.rs b/core-foundation/src/array.rs
@@ -115,7 +115,7 @@ impl<T> CFArray<T> {
     /// Core Foundation objects (not always true), they need to be wrapped with
     /// `TCFType::wrap_under_get_rule()`.
     #[inline]
-    pub fn iter<'a>(&'a self) -> CFArrayIterator<'a, T> {
+    pub fn iter(&self) -> CFArrayIterator<'_, T> {
         CFArrayIterator {
             array: self,
             index: 0,
@@ -128,16 +128,22 @@ impl<T> CFArray<T> {
         unsafe { CFArrayGetCount(self.0) }
     }
 
+    /// Returns `true` if the array contains no elements.
     #[inline]
-    pub unsafe fn get_unchecked<'a>(&'a self, index: CFIndex) -> ItemRef<'a, T>
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
+
+    #[inline]
+    pub unsafe fn get_unchecked(&self, index: CFIndex) -> ItemRef<'_, T>
     where
         T: FromVoid,
     {
         T::from_void(CFArrayGetValueAtIndex(self.0, index))
     }
 
     #[inline]
-    pub fn get<'a>(&'a self, index: CFIndex) -> Option<ItemRef<'a, T>>
+    pub fn get(&self, index: CFIndex) -> Option<ItemRef<'_, T>>
     where
         T: FromVoid,
     {
diff --git a/core-foundation/src/data.rs b/core-foundation/src/data.rs
@@ -80,7 +80,7 @@ impl CFData {
     /// Returns a pointer to the underlying bytes in this data. Note that this byte buffer is
     /// read-only.
     #[inline]
-    pub fn bytes<'a>(&'a self) -> &'a [u8] {
+    pub fn bytes(&self) -> &[u8] {
         unsafe { slice::from_raw_parts(CFDataGetBytePtr(self.0), self.len() as usize) }
     }
 
@@ -89,6 +89,12 @@ impl CFData {
     pub fn len(&self) -> CFIndex {
         unsafe { CFDataGetLength(self.0) }
     }
+
+    /// Returns `true` if this byte buffer is empty.
+    #[inline]
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 }
 
 impl Deref for CFData {
diff --git a/core-foundation/src/date.rs b/core-foundation/src/date.rs
@@ -79,7 +79,7 @@ mod test {
 
         let same_sign = a.is_sign_positive() == b.is_sign_positive();
         let equal = ((a - b).abs() / f64::min(a.abs() + b.abs(), f64::MAX)) < f64::EPSILON;
-        (same_sign && equal)
+        same_sign && equal
     }
 
     #[test]
diff --git a/core-foundation/src/dictionary.rs b/core-foundation/src/dictionary.rs
@@ -47,7 +47,7 @@ impl<K, V> CFDictionary<K, V> {
     {
         let (keys, values): (Vec<CFTypeRef>, Vec<CFTypeRef>) = pairs
             .iter()
-            .map(|&(ref key, ref value)| (key.as_CFTypeRef(), value.as_CFTypeRef()))
+            .map(|(key, value)| (key.as_CFTypeRef(), value.as_CFTypeRef()))
             .unzip();
 
         unsafe {
@@ -103,7 +103,7 @@ impl<K, V> CFDictionary<K, V> {
     }
 
     #[inline]
-    pub fn find<'a, T: ToVoid<K>>(&'a self, key: T) -> Option<ItemRef<'a, V>>
+    pub fn find<T: ToVoid<K>>(&self, key: T) -> Option<ItemRef<'_, V>>
     where
         V: FromVoid,
         K: ToVoid<K>,
@@ -123,7 +123,7 @@ impl<K, V> CFDictionary<K, V> {
     /// Panics if the key is not present in the dictionary. Use `find` to get an `Option` instead
     /// of panicking.
     #[inline]
-    pub fn get<'a, T: ToVoid<K>>(&'a self, key: T) -> ItemRef<'a, V>
+    pub fn get<T: ToVoid<K>>(&self, key: T) -> ItemRef<'_, V>
     where
         V: FromVoid,
         K: ToVoid<K>,
@@ -195,7 +195,7 @@ impl<K, V> CFMutableDictionary<K, V> {
         V: ToVoid<V>,
     {
         let mut result = Self::with_capacity(pairs.len() as _);
-        for &(ref key, ref value) in pairs {
+        for (key, value) in pairs {
             result.add(key, value);
         }
         result
@@ -265,7 +265,7 @@ impl<K, V> CFMutableDictionary<K, V> {
         K: ToVoid<K>,
     {
         let ptr = key.to_void();
-        self.find(&key)
+        self.find(key)
             .unwrap_or_else(|| panic!("No entry found for key {:p}", ptr))
     }
 
diff --git a/core-foundation/src/set.rs b/core-foundation/src/set.rs
@@ -49,8 +49,13 @@ impl CFSet {
 }
 
 impl<T> CFSet<T> {
-    /// Get the number of elements in the CFSet
+    /// Get the number of elements in the `CFSet`.
     pub fn len(&self) -> usize {
         unsafe { CFSetGetCount(self.0) as usize }
     }
+
+    /// Returns `true` if the set contains no elements.
+    pub fn is_empty(&self) -> bool {
+        self.len() == 0
+    }
 }
diff --git a/core-foundation/src/url.rs b/core-foundation/src/url.rs
@@ -34,7 +34,7 @@ impl fmt::Debug for CFURL {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         unsafe {
             let string: CFString = TCFType::wrap_under_get_rule(CFURLGetString(self.0));
-            write!(f, "{}", string.to_string())
+            write!(f, "{}", string)
         }
     }
 }
diff --git a/core-foundation/src/uuid.rs b/core-foundation/src/uuid.rs
@@ -44,9 +44,9 @@ impl Default for CFUUID {
 }
 
 #[cfg(feature = "with-uuid")]
-impl Into<Uuid> for CFUUID {
-    fn into(self) -> Uuid {
-        let b = unsafe { CFUUIDGetUUIDBytes(self.0) };
+impl From<CFUUID> for Uuid {
+    fn from(val: CFUUID) -> Self {
+        let b = unsafe { CFUUIDGetUUIDBytes(val.0) };
         let bytes = [
             b.byte0, b.byte1, b.byte2, b.byte3, b.byte4, b.byte5, b.byte6, b.byte7, b.byte8,
             b.byte9, b.byte10, b.byte11, b.byte12, b.byte13, b.byte14, b.byte15,
diff --git a/core-graphics-types/src/geometry.rs b/core-graphics-types/src/geometry.rs
@@ -42,10 +42,7 @@ pub struct CGSize {
 impl CGSize {
     #[inline]
     pub fn new(width: CGFloat, height: CGFloat) -> CGSize {
-        CGSize {
-            width: width,
-            height: height,
-        }
+        CGSize { width, height }
     }
 
     #[inline]
@@ -64,7 +61,7 @@ pub struct CGPoint {
 impl CGPoint {
     #[inline]
     pub fn new(x: CGFloat, y: CGFloat) -> CGPoint {
-        CGPoint { x: x, y: y }
+        CGPoint { x, y }
     }
 
     #[inline]
diff --git a/core-graphics/src/context.rs b/core-graphics/src/context.rs
@@ -165,7 +165,7 @@ impl CGContext {
         unsafe {
             slice::from_raw_parts_mut(
                 CGBitmapContextGetData(self.as_ptr()) as *mut u8,
-                (self.height() * self.bytes_per_row()) as usize,
+                self.height() * self.bytes_per_row(),
             )
         }
     }
diff --git a/core-graphics/src/display.rs b/core-graphics/src/display.rs
@@ -127,7 +127,7 @@ foreign_type! {
 impl CGDisplay {
     #[inline]
     pub fn new(id: CGDirectDisplayID) -> CGDisplay {
-        CGDisplay { id: id }
+        CGDisplay { id }
     }
 
     /// Returns the the main display.
@@ -462,8 +462,7 @@ impl CGDisplay {
     pub fn active_displays() -> Result<Vec<CGDirectDisplayID>, CGError> {
         let count = CGDisplay::active_display_count()?;
         let mut buf: Vec<CGDirectDisplayID> = vec![0; count as usize];
-        let result =
-            unsafe { CGGetActiveDisplayList(count as u32, buf.as_mut_ptr(), ptr::null_mut()) };
+        let result = unsafe { CGGetActiveDisplayList(count, buf.as_mut_ptr(), ptr::null_mut()) };
         if result == 0 {
             Ok(buf)
         } else {
@@ -477,7 +476,7 @@ impl CGDisplay {
         let mut count: u32 = 0;
         let result = unsafe { CGGetActiveDisplayList(0, ptr::null_mut(), &mut count) };
         if result == 0 {
-            Ok(count as u32)
+            Ok(count)
         } else {
             Err(result)
         }
@@ -603,7 +602,7 @@ impl CGDisplayMode {
     /// Returns the I/O Kit flags of the specified display mode.
     #[inline]
     pub fn io_flags(&self) -> u32 {
-        unsafe { CGDisplayModeGetIOFlags(self.as_ptr()) as u32 }
+        unsafe { CGDisplayModeGetIOFlags(self.as_ptr()) }
     }
 
     /// Returns the pixel encoding of the specified display mode.
diff --git a/core-graphics/src/path.rs b/core-graphics/src/path.rs
@@ -83,7 +83,7 @@ pub struct CGPathElementRef<'a> {
 impl<'a> CGPathElementRef<'a> {
     fn new<'b>(element: *const CGPathElement) -> CGPathElementRef<'b> {
         CGPathElementRef {
-            element: element,
+            element,
             phantom: PhantomData,
         }
     }
diff --git a/core-graphics/src/private.rs b/core-graphics/src/private.rs
@@ -31,7 +31,7 @@ impl CGSRegion {
         unsafe {
             let mut region = ptr::null_mut();
             assert!(ffi::CGSNewRegionWithRect(rect, &mut region) == 0);
-            CGSRegion { region: region }
+            CGSRegion { region }
         }
     }
 
@@ -43,7 +43,7 @@ impl CGSRegion {
                 ffi::CGSNewRegionWithRectList(rects.as_ptr(), rects.len() as c_uint, &mut region)
                     == 0
             );
-            CGSRegion { region: region }
+            CGSRegion { region }
         }
     }
 }
@@ -59,9 +59,9 @@ impl CGSSurface {
     #[inline]
     pub fn from_ids(context_id: c_uint, window_number: c_int, surface_id: c_uint) -> CGSSurface {
         CGSSurface {
-            context_id: context_id,
-            window_number: window_number,
-            surface_id: surface_id,
+            context_id,
+            window_number,
+            surface_id,
         }
     }
 
diff --git a/core-text/src/font.rs b/core-text/src/font.rs
diff --git a/io-surface/src/lib.rs b/io-surface/src/lib.rs

Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ mod macos {`
`48`	`48`	`impl NSPoint {`
`49`	`49`	`#[inline]`
`50`	`50`	`pub fn new(x: CGFloat, y: CGFloat) -> NSPoint {`
`51`		`- NSPoint { x: x, y: y }`
	`51`	`+ NSPoint { x, y }`
`52`	`52`	`}`
`53`	`53`	`}`
`54`	`54`
`@@ -73,10 +73,7 @@ mod macos {`
`73`	`73`	`impl NSSize {`
`74`	`74`	`#[inline]`
`75`	`75`	`pub fn new(width: CGFloat, height: CGFloat) -> NSSize {`
`76`		`- NSSize {`
`77`		`- width: width,`
`78`		`- height: height,`
`79`		`- }`
	`76`	`+ NSSize { width, height }`
`80`	`77`	`}`
`81`	`78`	`}`
`82`	`79`
`@@ -101,10 +98,7 @@ mod macos {`
`101`	`98`	`impl NSRect {`
`102`	`99`	`#[inline]`
`103`	`100`	`pub fn new(origin: NSPoint, size: NSSize) -> NSRect {`
`104`		`- NSRect {`
`105`		`- origin: origin,`
`106`		`- size: size,`
`107`		`- }`
	`101`	`+ NSRect { origin, size }`
`108`	`102`	`}`
`109`	`103`
`110`	`104`	`#[inline]`
`@@ -169,10 +163,7 @@ pub struct NSRange {`
`169`	`163`	`impl NSRange {`
`170`	`164`	`#[inline]`
`171`	`165`	`pub fn new(location: NSUInteger, length: NSUInteger) -> NSRange {`
`172`		`- NSRange {`
`173`		`- location: location,`
`174`		`- length: length,`
`175`		`- }`
	`166`	`+ NSRange { location, length }`
`176`	`167`	`}`
`177`	`168`	`}`
`178`	`169`
`@@ -216,9 +207,9 @@ impl NSOperatingSystemVersion {`
`216`	`207`	`patchVersion: NSUInteger,`
`217`	`208`	`) -> NSOperatingSystemVersion {`
`218`	`209`	`NSOperatingSystemVersion {`
`219`		`- majorVersion: majorVersion,`
`220`		`- minorVersion: minorVersion,`
`221`		`- patchVersion: patchVersion,`
	`210`	`+ majorVersion,`
	`211`	`+ minorVersion,`
	`212`	`+ patchVersion,`
`222`	`213`	`}`
`223`	`214`	`}`
`224`	`215`	`}`
`@@ -663,10 +654,10 @@ impl NSString for id {`
`663`	`654`	`}`
`664`	`655`
`665`	`656`	`unsafe fn init_str(self, string: &str) -> id {`
`666`		`- return msg_send![self,`
`667`		`- initWithBytes:string.as_ptr()`
`668`		`- length:string.len()`
`669`		`- encoding:UTF8_ENCODING as id];`
	`657`	`+ msg_send![self,`
	`658`	`+ initWithBytes:string.as_ptr()`
	`659`	`+ length:string.len()`
	`660`	`+ encoding:UTF8_ENCODING as id]`
`670`	`661`	`}`
`671`	`662`
`672`	`663`	`unsafe fn len(self) -> usize {`
`@@ -734,7 +725,7 @@ impl Iterator for NSFastIterator {`
`734`	`725`	`}`
`735`	`726`
`736`	`727`	`if self.idx < self.len {`
`737`		`- let object = unsafe { *self.state.items_ptr.offset(self.idx as isize) };`
	`728`	`+ let object = unsafe { *self.state.items_ptr.add(self.idx) };`
`738`	`729`	`self.mut_val = Some(new_mut);`
`739`	`730`	`self.idx += 1;`
`740`	`731`	`Some(object)`
Original file line number	Diff line number	Diff line change
`@@ -133,5 +133,5 @@ unsafe fn create_app() -> id {`
`133`	`133`	`let current_app = NSRunningApplication::currentApplication(nil);`
`134`	`134`	`current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps);`
`135`	`135`
`136`		`- return app;`
	`136`	`+ app`
`137`	`137`	`}`
Original file line number	Diff line number	Diff line change
`@@ -83,5 +83,5 @@ unsafe fn create_app(title: id, content: id) -> id {`
`83`	`83`	`let current_app = NSRunningApplication::currentApplication(nil);`
`84`	`84`	`current_app.activateWithOptions_(NSApplicationActivateIgnoringOtherApps);`
`85`	`85`
`86`		`- return app;`
	`86`	`+ app`
`87`	`87`	`}`
Original file line number	Diff line number	Diff line change
`@@ -583,7 +583,7 @@ impl NSApplication for id {`
`583`	`583`
`584`	`584`	`unsafe fn presentationOptions_(self) -> NSApplicationPresentationOptions {`
`585`	`585`	`let options = msg_send![self, presentationOptions];`
`586`		`- return NSApplicationPresentationOptions::from_bits(options).unwrap();`
	`586`	`+ NSApplicationPresentationOptions::from_bits(options).unwrap()`
`587`	`587`	`}`
`588`	`588`
`589`	`589`	`unsafe fn setMainMenu_(self, menu: id) {`
Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ impl CFData {`
`80`	`80`	`/// Returns a pointer to the underlying bytes in this data. Note that this byte buffer is`
`81`	`81`	`/// read-only.`
`82`	`82`	`#[inline]`
`83`		`- pub fn bytes<'a>(&'a self) -> &'a [u8] {`
	`83`	`+ pub fn bytes(&self) -> &[u8] {`
`84`	`84`	`unsafe { slice::from_raw_parts(CFDataGetBytePtr(self.0), self.len() as usize) }`
`85`	`85`	`}`
`86`	`86`
`@@ -89,6 +89,12 @@ impl CFData {`
`89`	`89`	`pub fn len(&self) -> CFIndex {`
`90`	`90`	`unsafe { CFDataGetLength(self.0) }`
`91`	`91`	`}`
	`92`	`+`
	`93`	+ /// Returns `true` if this byte buffer is empty.
	`94`	`+ #[inline]`
	`95`	`+ pub fn is_empty(&self) -> bool {`
	`96`	`+ self.len() == 0`
	`97`	`+ }`
`92`	`98`	`}`
`93`	`99`
`94`	`100`	`impl Deref for CFData {`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ mod test {`
`79`	`79`
`80`	`80`	`let same_sign = a.is_sign_positive() == b.is_sign_positive();`
`81`	`81`	`let equal = ((a - b).abs() / f64::min(a.abs() + b.abs(), f64::MAX)) < f64::EPSILON;`
`82`		`- (same_sign && equal)`
	`82`	`+ same_sign && equal`
`83`	`83`	`}`
`84`	`84`
`85`	`85`	`#[test]`