examples: fix clippy warnings

Author: bilelmoussaoui

examples/src/bin/basic_subclass.rs

@@ -199,6 +199,7 @@ glib_wrapper! {
 }
 
 impl SimpleApplication {
+    #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
         glib::Object::new(
             Self::static_type(),

examples/src/bin/clipboard_simple.rs

@@ -72,10 +72,10 @@ fn build_ui(application: &gtk::Application) {
     // Save out UI in thread-local storage so we can use it in callbacks later
     GLOBAL.with(move |global| {
         *global.borrow_mut() = Some(Ui {
-            button_a1: button_a1,
-            button_a2: button_a2,
-            button_b1: button_b1,
-            button_b2: button_b2,
+            button_a1,
+            button_a2,
+            button_b1,
+            button_b2,
         })
     });
 
@@ -112,12 +112,11 @@ fn build_ui(application: &gtk::Application) {
     paste_button.connect_clicked(|_| {
         let clipboard = gtk::Clipboard::get(&gdk::SELECTION_CLIPBOARD);
         clipboard.request_text(|_, t| {
-            if t.is_some() {
-                let t = t.unwrap();
+            if let Some(t) = t {
                 if t.len() >= 4 {
                     GLOBAL.with(|global| {
                         if let Some(ref ui) = *global.borrow() {
-                            ui.button_a1.set_active(t.chars().nth(0).unwrap() == '1');
+                            ui.button_a1.set_active(t.starts_with('1'));
                             ui.button_a2.set_active(t.chars().nth(1).unwrap() == '1');
                             ui.button_b1.set_active(t.chars().nth(2).unwrap() == '1');
                             ui.button_b2.set_active(t.chars().nth(3).unwrap() == '1');

examples/src/bin/gio_futures.rs

@@ -19,7 +19,7 @@ fn read_and_print_file(
 ) -> impl Future<Output = Result<(), String>> + std::marker::Unpin {
     file.read_async_future(glib::PRIORITY_DEFAULT)
         .map_err(|err| format!("Failed to open file: {}", err))
-        .and_then(|strm| read_and_print_chunks(strm))
+        .and_then(read_and_print_chunks)
 }
 
 // Read the input stream in chunks of 64 bytes, always into the same buffer

examples/src/bin/iconview_example.rs

@@ -70,7 +70,7 @@ fn create_list_store_model() -> gtk::ListStore {
         }
     }
 
-    return icon_view_model;
+    icon_view_model
 }
 
 fn build_ui(application: &gtk::Application) {

examples/src/bin/list_store.rs

@@ -3,6 +3,7 @@ extern crate glib;
 extern crate gtk;
 
 use gio::prelude::*;
+use glib::clone;
 use gtk::prelude::*;
 
 use std::env::args;
@@ -55,8 +56,13 @@ fn build_ui(application: &gtk::Application) {
 
     window.show_all();
 
-    let model = model.clone();
-    glib::timeout_add_local(Duration::from_millis(80), move || spinner_timeout(&model));
+    glib::timeout_add_local(
+        Duration::from_millis(80),
+        clone!(@weak model => @default-return glib::Continue(false), move || {
+            spinner_timeout(&model);
+            glib::Continue(false)
+        }),
+    );
 }
 
 struct Data {

examples/src/bin/progress_tracker.rs

@@ -75,9 +75,7 @@ impl Application {
                     let _ = tx.send(None);
                 });
 
-                let active = active.clone();
-                let widgets = widgets.clone();
-                rx.attach(None, move |value| match value {
+                rx.attach(None, clone!(@weak active, @weak widgets => @default-return glib::Continue(false), move |value| match value {
                     Some(value) => {
                         widgets
                             .main_view
@@ -105,7 +103,7 @@ impl Application {
                         active.set(false);
                         glib::Continue(false)
                     }
-                });
+                }));
             }),
         );
     }
@@ -160,6 +158,7 @@ pub struct Header {
 }
 
 impl Header {
+    #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
         let container = gtk::HeaderBar::new();
         container.set_title(Some("Progress Tracker"));
@@ -174,6 +173,7 @@ pub struct CompleteView {
 }
 
 impl CompleteView {
+    #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
         let label = gtk::Label::new(None);
         label.set_markup("Task complete");
@@ -198,6 +198,7 @@ pub struct MainView {
 }
 
 impl MainView {
+    #[allow(clippy::new_without_default)]
     pub fn new() -> Self {
         let progress = gtk::ProgressBar::new();
         progress.set_text(Some("Progress Bar"));

examples/src/bin/treeview.rs

@@ -68,7 +68,7 @@ fn build_ui(application: &gtk::Application) {
     col.pack_start(&renderer2, true);
     col.add_attribute(&renderer2, "text", 1);
     let image = Pixbuf::from_file("./resources/eye.png")
-        .or_else(|err| {
+        .map_err(|err| {
             let mut msg = err.to_string();
             if err.kind() == Some(glib::FileError::Noent) {
                 msg.push_str(
@@ -86,8 +86,6 @@ fn build_ui(application: &gtk::Application) {
                     Continue(false)
                 }),
             );
-
-            Err(())
         })
         .ok();