Removed id function from diesel models.
It's automaticly declared upon derive identifiable, And there's no need to overwrite it.
This commit is contained in:
@@ -20,6 +20,16 @@ rayon = "0.9.0"
|
||||
features = ["v3_22"]
|
||||
version = "0.2.0"
|
||||
|
||||
[dependencies.diesel]
|
||||
features = ["sqlite"]
|
||||
# version = "0.16.0"
|
||||
git = "https://github.com/diesel-rs/diesel.git"
|
||||
|
||||
[dependencies.diesel_codegen]
|
||||
features = ["sqlite"]
|
||||
# version = "0.16.0"
|
||||
git = "https://github.com/diesel-rs/diesel.git"
|
||||
|
||||
[dependencies.hammond-data]
|
||||
path = "../hammond-data"
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@ extern crate gio;
|
||||
extern crate glib;
|
||||
extern crate gtk;
|
||||
|
||||
// extern crate diesel;
|
||||
extern crate diesel;
|
||||
extern crate dissolve;
|
||||
extern crate hammond_data;
|
||||
extern crate hammond_downloader;
|
||||
|
||||
@@ -1,6 +1,7 @@
|
||||
use gtk;
|
||||
use gtk::prelude::*;
|
||||
use gdk_pixbuf::Pixbuf;
|
||||
use diesel::associations::Identifiable;
|
||||
|
||||
use hammond_data::dbqueries;
|
||||
use hammond_data::models::Podcast;
|
||||
|
||||
@@ -1,4 +1,3 @@
|
||||
|
||||
use open;
|
||||
use hammond_data::dbqueries;
|
||||
use hammond_data::models::{Episode, Podcast};
|
||||
@@ -8,6 +7,7 @@ use hammond_data::utils::*;
|
||||
use hammond_data::errors::*;
|
||||
|
||||
use dissolve::strip_html_tags;
|
||||
use diesel::associations::Identifiable;
|
||||
|
||||
use std::thread;
|
||||
use std::cell::RefCell;
|
||||
@@ -71,7 +71,7 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::
|
||||
|
||||
play_button.connect_clicked(
|
||||
clone!(db, episode, played_button, unplayed_button => move |_| {
|
||||
on_play_bttn_clicked(&db, episode.id());
|
||||
on_play_bttn_clicked(&db, *episode.id());
|
||||
let _ = set_played_now(&db, &mut episode.clone());
|
||||
played_button.hide();
|
||||
unplayed_button.show();
|
||||
@@ -80,7 +80,7 @@ fn epidose_widget(db: &Database, episode: &mut Episode, pd_title: &str) -> gtk::
|
||||
|
||||
delete_button.connect_clicked(
|
||||
clone!(episode, db, play_button, download_button => move |del| {
|
||||
on_delete_bttn_clicked(&db, episode.id());
|
||||
on_delete_bttn_clicked(&db, *episode.id());
|
||||
del.hide();
|
||||
play_button.hide();
|
||||
download_button.show();
|
||||
|
||||
Reference in New Issue
Block a user