Merge pull request #862 from sdroege/clippy-warnings

Fix various new beta clippy warnings

Author: sdroege

cairo/src/rectangle_int.rs

@@ -28,7 +28,7 @@ impl RectangleInt {
         self.0.x = x;
     }
     pub fn y(&self) -> i32 {
-        self.0.x
+        self.0.y
     }
     pub fn set_y(&mut self, y: i32) {
         self.0.y = y;

examples/gio_cancellable_future/main.rs

@@ -38,10 +38,7 @@ fn main() {
     thread::spawn(move || {
         thread::sleep(TIMEOUT);
 
-        println!(
-            "Timeout ({:?}) elapsed! Cancelling pending task...",
-            TIMEOUT
-        );
+        println!("Timeout ({TIMEOUT:?}) elapsed! Cancelling pending task...",);
 
         cancellable.cancel();
     });

examples/gio_task/main.rs

@@ -106,10 +106,7 @@ fn run_in_thread(send: oneshot::Sender<()>) {
     let cancellable = gio::Cancellable::new();
 
     let closure = move |value: i64, source_object: &FileSize| {
-        println!(
-            "Safe callback (threaded version) - Returned value from task: {}",
-            value
-        );
+        println!("Safe callback (threaded version) - Returned value from task: {value}",);
         println!(
             "Safe callback (threaded version) - FileSize::size: {}",
             source_object.retrieved_size().unwrap()

gdk-pixbuf/src/pixbuf.rs

@@ -513,7 +513,7 @@ impl Pixbuf {
         Box::pin(gio::GioFuture::new(self, move |obj, cancellable, send| {
             let options = options
                 .iter()
-                .map(|&(ref k, ref v)| (k.as_str(), v.as_str()))
+                .map(|(k, v)| (k.as_str(), v.as_str()))
                 .collect::<Vec<(&str, &str)>>();
 
             obj.save_to_streamv_async(

gio/src/input_stream.rs

@@ -523,10 +523,7 @@ impl<T: IsA<InputStream>> InputStreamAsyncBufRead<T> {
             {
                 let available = j - i;
                 if amt > available {
-                    panic!(
-                        "Cannot consume {} bytes as only {} are available",
-                        amt, available
-                    )
+                    panic!("Cannot consume {amt} bytes as only {available} are available",)
                 }
                 let remaining = available - amt;
                 if remaining == 0 {

gio/src/output_stream.rs

@@ -677,11 +677,7 @@ impl<T: IsA<OutputStream>> io::Write for OutputStreamWrite<T> {
             .iter()
             .map(|v| OutputVector::new(v))
             .collect::<smallvec::SmallVec<[_; 2]>>();
-        let result = self
-            .0
-            .as_ref()
-            .writev(&vectors, crate::Cancellable::NONE)
-            .map(|size| size as usize);
+        let result = self.0.as_ref().writev(&vectors, crate::Cancellable::NONE);
         to_std_io_result(result)
     }
 

gio/src/pollable_output_stream.rs

@@ -250,7 +250,7 @@ impl<T: IsA<PollableOutputStream>> AsyncWrite for OutputStreamAsyncWrite<T> {
             .writev_nonblocking(&vectors, crate::Cancellable::NONE);
 
         match gio_result {
-            Ok((PollableReturn::Ok, size)) => Poll::Ready(Ok(size as usize)),
+            Ok((PollableReturn::Ok, size)) => Poll::Ready(Ok(size)),
             Ok((PollableReturn::WouldBlock, _)) => {
                 let mut waker = Some(cx.waker().clone());
                 let source = stream.0.as_ref().create_source(

gio/src/socket.rs

@@ -651,7 +651,7 @@ impl<O: IsA<Socket>> SocketExtManual for O {
                 &mut error,
             );
             if error.is_null() {
-                Ok((from_glib(ret), bytes_written as usize))
+                Ok((from_glib(ret), bytes_written))
             } else {
                 Err(from_glib_full(error))
             }

glib/src/object.rs

@@ -2744,10 +2744,7 @@ impl<T: ObjectType> ObjectExt for T {
 
         assert!(
             type_.is_a(signal_query_type),
-            "Signal '{}' of type '{}' but got type '{}'",
-            signal_name,
-            type_,
-            signal_query_type
+            "Signal '{signal_name}' of type '{type_}' but got type '{signal_query_type}'",
         );
 
         let handler = gobject_ffi::g_signal_connect_closure_by_id(
@@ -2793,10 +2790,7 @@ impl<T: ObjectType> ObjectExt for T {
         let signal_query_type = signal_query.type_();
         assert!(
             type_.is_a(signal_query_type),
-            "Signal '{}' of type '{}' but got type '{}'",
-            signal_name,
-            type_,
-            signal_query_type
+            "Signal '{signal_name}' of type '{type_}' but got type '{signal_query_type}'",
         );
 
         unsafe {

glib/src/param_spec.rs

@@ -742,8 +742,7 @@ macro_rules! define_builder_numeric {
 fn assert_param_name(name: &str) {
     assert!(
         is_canonical_pspec_name(name),
-        "{} is not a valid canonical parameter name",
-        name
+        "{name} is not a valid canonical parameter name",
     );
 }
 define_param_spec_numeric!(