Favor explicit refference cloning, as suggested by clippy.

This commit is contained in:
Jordan Petridis
2017-10-21 05:35:54 +03:00
parent 048d4800da
commit 5fb783c0c0
8 changed files with 52 additions and 38 deletions
+8 -5
View File
@@ -1,3 +1,6 @@
#![cfg_attr(feature = "cargo-clippy", allow(clone_on_ref_ptr))]
use open;
use diesel::prelude::SqliteConnection;
use hammond_data::dbqueries;
@@ -17,7 +20,7 @@ use gtk::prelude::*;
// use utils;
fn epidose_widget(
connection: Arc<Mutex<SqliteConnection>>,
connection: &Arc<Mutex<SqliteConnection>>,
episode: &mut Episode,
pd_title: &str,
) -> gtk::Box {
@@ -47,7 +50,7 @@ fn epidose_widget(
expander.connect_activate(move |_| {
let plain_text = strip_html_tags(&d).join(" ");
desc_label.set_text(&plain_text.trim())
desc_label.set_text(plain_text.trim())
});
}
@@ -63,7 +66,7 @@ fn epidose_widget(
});
}
let pd_title_cloned = pd_title.clone().to_owned();
let pd_title_cloned = pd_title.to_owned();
let db = connection.clone();
let ep_clone = episode.clone();
dl_button.connect_clicked(move |_| {
@@ -87,7 +90,7 @@ fn epidose_widget(
ep
}
pub fn episodes_listbox(connection: Arc<Mutex<SqliteConnection>>, pd_title: &str) -> gtk::ListBox {
pub fn episodes_listbox(connection: &Arc<Mutex<SqliteConnection>>, pd_title: &str) -> gtk::ListBox {
// TODO: handle unwraps.
let m = connection.lock().unwrap();
let pd = dbqueries::load_podcast(&m, pd_title).unwrap();
@@ -96,7 +99,7 @@ pub fn episodes_listbox(connection: Arc<Mutex<SqliteConnection>>, pd_title: &str
let list = gtk::ListBox::new();
episodes.iter_mut().for_each(|ep| {
let w = epidose_widget(connection.clone(), ep, pd_title);
let w = epidose_widget(&connection.clone(), ep, pd_title);
list.add(&w)
});
+4 -4
View File
@@ -10,7 +10,7 @@ use std::sync::{Arc, Mutex};
use widgets::episode::episodes_listbox;
pub fn podcast_widget(
connection: Arc<Mutex<SqliteConnection>>,
connection: &Arc<Mutex<SqliteConnection>>,
title: Option<&str>,
description: Option<&str>,
image: Option<Pixbuf>,
@@ -27,7 +27,7 @@ pub fn podcast_widget(
if let Some(t) = title {
title_label.set_text(t);
let listbox = episodes_listbox(connection.clone(), t);
let listbox = episodes_listbox(&connection.clone(), t);
view.add(&listbox);
}
@@ -56,9 +56,9 @@ pub fn create_flowbox_child(title: &str, cover: Option<Pixbuf>) -> gtk::FlowBoxC
// GDK.TOUCH_MASK
// https://developer.gnome.org/gdk3/stable/gdk3-Events.html#GDK-TOUCH-MASK:CAPS
// http://gtk-rs.org/docs/gdk/constant.TOUCH_MASK.html
events.add_events(4194304);
events.add_events(4_194_304);
pd_title.set_text(&title);
pd_title.set_text(title);
if let Some(img) = cover {
pd_cover.set_from_pixbuf(&img);