Fix clippy lints

GuillaumeGomez · GuillaumeGomez · commit f4effec6703e · 2022-11-09T15:57:21.000+01:00
diff --git a/examples/cairo_threads/main.rs b/examples/cairo_threads/main.rs
@@ -87,7 +87,7 @@ fn build_ui(application: &gtk::Application) {
                 // Draw an arc with a weirdly calculated radius
                 image.with_surface(|surface| {
                     let cr = Context::new(surface).expect("Can't create a Cairo context");
-                    draw_slow(&cr, delay, x, y, 1.2_f64.powi(((n as i32) << thread_num) % 32));
+                    draw_slow(&cr, delay, x, y, 1.2_f64.powi((n << thread_num) % 32));
                     surface.flush();
                 });
 
diff --git a/examples/communication_thread/main.rs b/examples/communication_thread/main.rs
@@ -49,8 +49,8 @@ fn start_communication_thread(mut sender: mpsc::Sender<String>) {
         loop {
             // Instead of a counter, your application code will
             // block here on TCP or serial communications.
-            let data = format!("Counter = {}!", counter);
-            println!("Thread received data: {}", data);
+            let data = format!("Counter = {counter}!");
+            println!("Thread received data: {data}");
             match sender.try_send(data) {
                 Ok(_) => {}
                 Err(err) => {
diff --git a/examples/dialog_async/main.rs b/examples/dialog_async/main.rs
@@ -50,7 +50,7 @@ async fn dialog<W: IsA<gtk::Window>>(window: W) {
         .modal(true)
         .buttons(gtk::ButtonsType::Close)
         .text("You answered")
-        .secondary_text(&format!("Your answer: {:?}", answer))
+        .secondary_text(&format!("Your answer: {answer:?}"))
         .build();
 
     info_dialog.run_future().await;
diff --git a/examples/gtk_builder_signal/main.rs b/examples/gtk_builder_signal/main.rs
@@ -30,7 +30,7 @@ fn build_ui(application: &gtk::Application) {
                 }),
             )
         } else {
-            panic!("Unknown handler name {}", handler_name)
+            panic!("Unknown handler name {handler_name}")
         }
     });
 
diff --git a/examples/gtk_test/main.rs b/examples/gtk_test/main.rs
@@ -34,15 +34,15 @@ fn build_ui(application: &gtk::Application) {
     let scale: Scale = builder.object("scale").expect("Couldn't get scale");
     scale.connect_format_value(|scale, value| {
         let digits = scale.digits() as usize;
-        format!("<{:.*}>", digits, value)
+        format!("<{value:.digits$}>")
     });
 
     let spin_button: SpinButton = builder
         .object("spin_button")
         .expect("Couldn't get spin_button");
     spin_button.connect_input(|spin_button| {
         let text = spin_button.text();
-        println!("spin_button_input: \"{}\"", text);
+        println!("spin_button_input: \"{text}\"");
         match text.parse::<f64>() {
             Ok(value) if value >= 90. => {
                 println!("circular right");
@@ -72,7 +72,7 @@ fn build_ui(application: &gtk::Application) {
                                                 ("Custom", ResponseType::Other(0))]);
 
         dialog.connect_response(glib::clone!(@weak entry => move |dialog, response| {
-            entry.set_text(&format!("Clicked {}", response));
+            entry.set_text(&format!("Clicked {response}"));
             dialog.close();
         }));
         dialog.show_all();
@@ -119,7 +119,7 @@ fn build_ui(application: &gtk::Application) {
         dialog.connect_response(|dialog, response| {
             if response == ResponseType::Ok {
                 let files = dialog.filenames();
-                println!("Files: {:?}", files);
+                println!("Files: {files:?}");
             }
             dialog.close();
         });
@@ -159,7 +159,7 @@ fn build_ui(application: &gtk::Application) {
             let keyval = key.keyval();
             let keystate = key.state();
 
-            println!("key pressed: {} / {:?}", keyval, keystate);
+            println!("key pressed: {keyval} / {keystate:?}");
             println!("text: {}", entry.text());
 
             if keystate.intersects(gdk::ModifierType::CONTROL_MASK) {
diff --git a/examples/icon_view/main.rs b/examples/icon_view/main.rs
@@ -84,7 +84,7 @@ fn create_list_store_model() -> gtk::ListStore {
                     );
                 }
                 Err(err) => {
-                    println!("Error: {}", err);
+                    println!("Error: {err}");
                     process::exit(1);
                 }
             }
diff --git a/examples/list_box_model/main.rs b/examples/list_box_model/main.rs
@@ -178,7 +178,7 @@ fn build_ui(application: &gtk::Application) {
     window.add(&vbox);
 
     for i in 0..10 {
-        model.append(&RowData::new(&format!("Name {}", i), i * 10));
+        model.append(&RowData::new(&format!("Name {i}"), i * 10));
     }
 
     window.show_all();
diff --git a/examples/multi_threading_context/main.rs b/examples/multi_threading_context/main.rs
@@ -35,7 +35,7 @@ fn build_ui(application: &gtk::Application) {
             // do long work
             thread::sleep(Duration::from_millis(50));
             // send result to channel
-            tx.send(format!("#{} Text from another thread.", i))
+            tx.send(format!("#{i} Text from another thread."))
                 .expect("Couldn't send data to channel");
             // receiver will be run on the main thread
         }
diff --git a/examples/multi_window/main.rs b/examples/multi_window/main.rs
@@ -104,10 +104,10 @@ fn create_sub_window(
         }),
     );
 
-    let button = gtk::Button::with_label(&format!("Notify main window with id {}!", id));
+    let button = gtk::Button::with_label(&format!("Notify main window with id {id}!"));
     button.connect_clicked(glib::clone!(@weak main_window_entry => move |_| {
         // When the button is clicked, let's write it on the main window's entry!
-        main_window_entry.buffer().set_text(&format!("sub window {} clicked", id));
+        main_window_entry.buffer().set_text(&format!("sub window {id} clicked"));
     }));
     window.add(&button);
 
diff --git a/examples/notebook/main.rs b/examples/notebook/main.rs
@@ -25,7 +25,7 @@ fn build_ui(application: &gtk::Application) {
     let mut notebook = Notebook::new();
 
     for i in 1..4 {
-        let title = format!("sheet {}", i);
+        let title = format!("sheet {i}");
         let label = gtk::Label::new(Some(&*title));
         notebook.create_tab(&title, label.upcast());
     }
diff --git a/examples/text_viewer/main.rs b/examples/text_viewer/main.rs
@@ -32,7 +32,7 @@ pub fn build_ui(application: &gtk::Application) {
         file_chooser.connect_response(glib::clone!(@weak text_view => move |file_chooser, response| {
             if response == gtk::ResponseType::Ok {
                 let filename = file_chooser.filename().expect("Couldn't get filename");
-                let file = File::open(&filename).expect("Couldn't open file");
+                let file = File::open(filename).expect("Couldn't open file");
 
                 let mut reader = BufReader::new(file);
                 let mut contents = String::new();
diff --git a/examples/tree_view/main.rs b/examples/tree_view/main.rs
@@ -33,7 +33,7 @@ fn build_ui(application: &gtk::Application) {
         // insert_with_values takes a slice of tuples: column index and ToValue
         // trait objects. ToValue is implemented for strings, numeric types,
         // bool and Object descendants
-        let iter = left_store.insert_with_values(None, None, &[(0, &format!("Hello {}", i))]);
+        let iter = left_store.insert_with_values(None, None, &[(0, &format!("Hello {i}"))]);
 
         for _ in 0..i {
             left_store.insert_with_values(Some(&iter), None, &[(0, &"I'm a child node")]);
diff --git a/gdk/src/display.rs b/gdk/src/display.rs
@@ -64,7 +64,7 @@ impl<O: IsA<Display>> DisplayExtManual for O {
             "GdkQuartzDisplay" => Backend::MacOS,
             "GdkWin32Display" => Backend::Win32,
             "GdkBroadwayDisplay" => Backend::Broadway,
-            e => panic!("Unsupported display backend {}", e),
+            e => panic!("Unsupported display backend {e}"),
         }
     }
 }
diff --git a/gdk/src/event.rs b/gdk/src/event.rs
@@ -256,7 +256,7 @@ impl Event {
                 self.to_glib_none().0,
                 state.as_mut_ptr(),
             )) {
-                Some(from_glib(state.assume_init() as u32))
+                Some(from_glib(state.assume_init() as _))
             } else {
                 None
             }
diff --git a/gdk/sys/build.rs b/gdk/sys/build.rs
@@ -11,7 +11,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure
 #[cfg(not(feature = "dox"))]
 fn main() {
     if let Err(s) = system_deps::Config::new().probe() {
-        let _ = writeln!(io::stderr(), "{}", s);
+        let _ = writeln!(io::stderr(), "{s}");
         process::exit(1);
     }
 
@@ -34,9 +34,9 @@ fn check_features() {
     // For reference, the backend set at time of writing consists of:
     // x11 win32 quartz broadway wayland
     if let Ok(targets) = pkg_config::get_variable(PKG_CONFIG_PACKAGE, "targets") {
-        println!("cargo:backends={}", targets);
+        println!("cargo:backends={targets}");
         for target in targets.split_whitespace() {
-            println!("cargo:rustc-cfg=gdk_backend=\"{}\"", target);
+            println!("cargo:rustc-cfg=gdk_backend=\"{target}\"");
         }
     }
 }
diff --git a/gdk/tests/check_gir.rs b/gdk/tests/check_gir.rs
@@ -3,6 +3,6 @@
 #[test]
 fn check_gir_file() {
     let res = gir_format_check::check_gir_file("Gir.toml");
-    println!("{}", res);
+    println!("{res}");
     assert_eq!(res.nb_errors, 0);
 }
diff --git a/gtk/build.rs b/gtk/build.rs
@@ -11,7 +11,7 @@ fn check_features() {
     // x11 win32 quartz broadway wayland
     if let Ok(targets) = pkg_config::get_variable("gtk+-3.0", "targets") {
         for target in targets.split_whitespace() {
-            println!("cargo:rustc-cfg=gdk_backend=\"{}\"", target);
+            println!("cargo:rustc-cfg=gdk_backend=\"{target}\"");
         }
     }
 }
diff --git a/gtk/src/builder.rs b/gtk/src/builder.rs
@@ -105,7 +105,7 @@ impl<O: IsA<Builder>> BuilderExtManual for O {
     }
 
     fn add_from_string(&self, buffer: &str) -> Result<(), glib::Error> {
-        let length = buffer.len() as usize;
+        let length = buffer.len();
         unsafe {
             let mut error = ptr::null_mut();
             let exit_code = ffi::gtk_builder_add_from_string(
@@ -150,7 +150,7 @@ impl<O: IsA<Builder>> BuilderExtManual for O {
         buffer: &str,
         object_ids: &[&str],
     ) -> Result<(), glib::Error> {
-        let length = buffer.len() as usize;
+        let length = buffer.len();
         unsafe {
             let mut error = ptr::null_mut();
             let exit_code = ffi::gtk_builder_add_objects_from_string(
@@ -222,7 +222,7 @@ impl<O: IsA<Builder>> BuilderExtManual for O {
         template_type: glib::types::Type,
         buffer: &str,
     ) -> Result<(), glib::Error> {
-        let length = buffer.len() as usize;
+        let length = buffer.len();
         unsafe {
             let mut error = ptr::null_mut();
             let exit_code = ffi::gtk_builder_extend_with_template(
diff --git a/gtk/src/container.rs b/gtk/src/container.rs
@@ -34,13 +34,13 @@ impl<O: IsA<Container>> ContainerExtManual for O {
                     property_name.to_glib_none().0,
                 ));
             let pspec = pspec.unwrap_or_else(|| {
-                panic!("The Container property '{}' doesn't exists", property_name)
+                panic!("The Container property '{property_name}' doesn't exists")
             });
 
             if !pspec.flags().contains(glib::ParamFlags::READABLE)
                 || !pspec.flags().contains(glib::ParamFlags::READWRITE)
             {
-                panic!("The Container property '{}' is not readable", property_name);
+                panic!("The Container property '{property_name}' is not readable");
             }
 
             let mut value = glib::Value::from_type(pspec.value_type());
@@ -79,16 +79,13 @@ impl<O: IsA<Container>> ContainerExtManual for O {
                     property_name.to_glib_none().0,
                 ));
             let pspec = pspec.unwrap_or_else(|| {
-                panic!("The Container property '{}' doesn't exists", property_name)
+                panic!("The Container property '{property_name}' doesn't exists")
             });
 
             if !pspec.flags().contains(glib::ParamFlags::WRITABLE)
                 || !pspec.flags().contains(glib::ParamFlags::READWRITE)
             {
-                panic!(
-                    "The Container property '{}' is not writeable",
-                    property_name
-                );
+                panic!("The Container property '{property_name}' is not writeable");
             }
 
             assert!(
diff --git a/gtk/src/enums.rs b/gtk/src/enums.rs
@@ -14,7 +14,7 @@ impl IconSize {
 impl From<IconSize> for i32 {
     fn from(val: IconSize) -> i32 {
         skip_assert_initialized!();
-        val.into_glib() as i32
+        val.into_glib() as _
     }
 }
 
@@ -28,7 +28,7 @@ impl From<i32> for IconSize {
 impl From<ResponseType> for i32 {
     fn from(val: ResponseType) -> i32 {
         skip_assert_initialized!();
-        val.into_glib() as i32
+        val.into_glib() as _
     }
 }
 
diff --git a/gtk/tests/check_gir.rs b/gtk/tests/check_gir.rs
@@ -3,6 +3,6 @@
 #[test]
 fn check_gir_file() {
     let res = gir_format_check::check_gir_file("Gir.toml");
-    println!("{}", res);
+    println!("{res}");
     assert_eq!(res.nb_errors, 0);
 }
diff --git a/gtk3-macros/src/attribute_parser.rs b/gtk3-macros/src/attribute_parser.rs
@@ -144,7 +144,7 @@ fn parse_field_attr_meta(
     let ident_str = ident.to_string();
     let unknown_err = Err(Error::new(
         ident.span(),
-        &format!("unknown attribute argument: `{}`", ident_str),
+        format!("unknown attribute argument: `{ident_str}`"),
     ));
     let value = match ty {
         FieldAttributeType::TemplateChild => match ident_str.as_str() {

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ fn build_ui(application: &gtk::Application) {`
`30`	`30`	`}),`
`31`	`31`	`)`
`32`	`32`	`} else {`
`33`		`- panic!("Unknown handler name {}", handler_name)`
	`33`	`+ panic!("Unknown handler name {handler_name}")`
`34`	`34`	`}`
`35`	`35`	`});`
`36`	`36`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ fn create_list_store_model() -> gtk::ListStore {`
`84`	`84`	`);`
`85`	`85`	`}`
`86`	`86`	`Err(err) => {`
`87`		`- println!("Error: {}", err);`
	`87`	`+ println!("Error: {err}");`
`88`	`88`	`process::exit(1);`
`89`	`89`	`}`
`90`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,7 @@ fn build_ui(application: &gtk::Application) {`
`178`	`178`	`window.add(&vbox);`
`179`	`179`
`180`	`180`	`for i in 0..10 {`
`181`		`- model.append(&RowData::new(&format!("Name {}", i), i * 10));`
	`181`	`+ model.append(&RowData::new(&format!("Name {i}"), i * 10));`
`182`	`182`	`}`
`183`	`183`
`184`	`184`	`window.show_all();`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ fn build_ui(application: &gtk::Application) {`
`35`	`35`	`// do long work`
`36`	`36`	`thread::sleep(Duration::from_millis(50));`
`37`	`37`	`// send result to channel`
`38`		`- tx.send(format!("#{} Text from another thread.", i))`
	`38`	`+ tx.send(format!("#{i} Text from another thread."))`
`39`	`39`	`.expect("Couldn't send data to channel");`
`40`	`40`	`// receiver will be run on the main thread`
`41`	`41`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ fn build_ui(application: &gtk::Application) {`
`25`	`25`	`let mut notebook = Notebook::new();`
`26`	`26`
`27`	`27`	`for i in 1..4 {`
`28`		`- let title = format!("sheet {}", i);`
	`28`	`+ let title = format!("sheet {i}");`
`29`	`29`	`let label = gtk::Label::new(Some(&*title));`
`30`	`30`	`notebook.create_tab(&title, label.upcast());`
`31`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ impl<O: IsA<Display>> DisplayExtManual for O {`
`64`	`64`	`"GdkQuartzDisplay" => Backend::MacOS,`
`65`	`65`	`"GdkWin32Display" => Backend::Win32,`
`66`	`66`	`"GdkBroadwayDisplay" => Backend::Broadway,`
`67`		`- e => panic!("Unsupported display backend {}", e),`
	`67`	`+ e => panic!("Unsupported display backend {e}"),`
`68`	`68`	`}`
`69`	`69`	`}`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,7 @@ impl Event {`
`256`	`256`	`self.to_glib_none().0,`
`257`	`257`	`state.as_mut_ptr(),`
`258`	`258`	`)) {`
`259`		`- Some(from_glib(state.assume_init() as u32))`
	`259`	`+ Some(from_glib(state.assume_init() as _))`
`260`	`260`	`} else {`
`261`	`261`	`None`
`262`	`262`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fn main() {} // prevent linking libraries to avoid documentation failure`
`11`	`11`	`#[cfg(not(feature = "dox"))]`
`12`	`12`	`fn main() {`
`13`	`13`	`if let Err(s) = system_deps::Config::new().probe() {`
`14`		`- let _ = writeln!(io::stderr(), "{}", s);`
	`14`	`+ let _ = writeln!(io::stderr(), "{s}");`
`15`	`15`	`process::exit(1);`
`16`	`16`	`}`
`17`	`17`
`@@ -34,9 +34,9 @@ fn check_features() {`
`34`	`34`	`// For reference, the backend set at time of writing consists of:`
`35`	`35`	`// x11 win32 quartz broadway wayland`
`36`	`36`	`if let Ok(targets) = pkg_config::get_variable(PKG_CONFIG_PACKAGE, "targets") {`
`37`		`- println!("cargo:backends={}", targets);`
	`37`	`+ println!("cargo:backends={targets}");`
`38`	`38`	`for target in targets.split_whitespace() {`
`39`		`- println!("cargo:rustc-cfg=gdk_backend=\"{}\"", target);`
	`39`	`+ println!("cargo:rustc-cfg=gdk_backend=\"{target}\"");`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3,6 +3,6 @@`
`3`	`3`	`#[test]`
`4`	`4`	`fn check_gir_file() {`
`5`	`5`	`let res = gir_format_check::check_gir_file("Gir.toml");`
`6`		`- println!("{}", res);`
	`6`	`+ println!("{res}");`
`7`	`7`	`assert_eq!(res.nb_errors, 0);`
`8`	`8`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,7 @@ fn check_features() {`
`11`	`11`	`// x11 win32 quartz broadway wayland`
`12`	`12`	`if let Ok(targets) = pkg_config::get_variable("gtk+-3.0", "targets") {`
`13`	`13`	`for target in targets.split_whitespace() {`
`14`		`- println!("cargo:rustc-cfg=gdk_backend=\"{}\"", target);`
	`14`	`+ println!("cargo:rustc-cfg=gdk_backend=\"{target}\"");`
`15`	`15`	`}`
`16`	`16`	`}`
`17`	`17`	`}`