From 87421ce74d9022d6ba637feb788415e5f6323812 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Fri, 13 Apr 2018 04:35:50 +0300 Subject: [PATCH] Cargo fmt --- hammond-data/benches/bench.rs | 4 +-- hammond-data/src/feed.rs | 2 +- hammond-data/src/lib.rs | 36 ++++++++++++++------------ hammond-data/src/models/episode.rs | 2 +- hammond-data/src/models/new_episode.rs | 2 +- hammond-data/src/models/new_podcast.rs | 2 +- hammond-data/src/models/source.rs | 10 ++++--- hammond-data/src/pipeline.rs | 6 ++--- hammond-downloader/src/downloader.rs | 4 +-- hammond-gtk/src/app.rs | 6 ++--- hammond-gtk/src/appnotif.rs | 6 +---- hammond-gtk/src/headerbar.rs | 2 +- hammond-gtk/src/main.rs | 21 ++++++++------- hammond-gtk/src/manager.rs | 6 ++--- hammond-gtk/src/stacks/content.rs | 2 +- hammond-gtk/src/stacks/episode.rs | 2 +- hammond-gtk/src/stacks/show.rs | 6 ++--- hammond-gtk/src/utils.rs | 10 +++---- hammond-gtk/src/views/episodes.rs | 4 +-- hammond-gtk/src/views/mod.rs | 4 +-- hammond-gtk/src/views/shows.rs | 4 +-- hammond-gtk/src/widgets/episode.rs | 6 ++--- hammond-gtk/src/widgets/mod.rs | 4 +-- hammond-gtk/src/widgets/show.rs | 4 +-- rustfmt.toml | 2 -- 25 files changed, 80 insertions(+), 77 deletions(-) diff --git a/hammond-data/benches/bench.rs b/hammond-data/benches/bench.rs index dce3907..8eb4ae2 100644 --- a/hammond-data/benches/bench.rs +++ b/hammond-data/benches/bench.rs @@ -16,10 +16,10 @@ extern crate rss; // use futures::future::*; use tokio_core::reactor::Core; -use hammond_data::FeedBuilder; -use hammond_data::Source; use hammond_data::database::truncate_db; use hammond_data::pipeline; +use hammond_data::FeedBuilder; +use hammond_data::Source; // use hammond_data::errors::*; use std::io::BufReader; diff --git a/hammond-data/src/feed.rs b/hammond-data/src/feed.rs index 4d135ed..d896b8e 100644 --- a/hammond-data/src/feed.rs +++ b/hammond-data/src/feed.rs @@ -117,10 +117,10 @@ mod tests { use rss::Channel; use tokio_core::reactor::Core; - use Source; use database::truncate_db; use dbqueries; use utils::get_feed; + use Source; use std::fs; use std::io::BufReader; diff --git a/hammond-data/src/lib.rs b/hammond-data/src/lib.rs index cae80a3..e00b757 100644 --- a/hammond-data/src/lib.rs +++ b/hammond-data/src/lib.rs @@ -1,18 +1,22 @@ #![recursion_limit = "1024"] #![cfg_attr(all(test, feature = "clippy"), allow(option_unwrap_used, result_unwrap_used))] #![cfg_attr(feature = "cargo-clippy", allow(blacklisted_name))] -#![cfg_attr(feature = "clippy", - warn(option_unwrap_used, result_unwrap_used, print_stdout, - wrong_pub_self_convention, mut_mut, non_ascii_literal, similar_names, - unicode_not_nfc, enum_glob_use, if_not_else, items_after_statements, - used_underscore_binding))] +#![cfg_attr( + feature = "clippy", + warn( + option_unwrap_used, result_unwrap_used, print_stdout, wrong_pub_self_convention, mut_mut, + non_ascii_literal, similar_names, unicode_not_nfc, enum_glob_use, if_not_else, + items_after_statements, used_underscore_binding + ) +)] #![allow(unknown_lints)] -#![deny(bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership, - non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, - path_statements, patterns_in_fns_without_body, plugin_as_library, private_in_public, - private_no_mangle_fns, private_no_mangle_statics, safe_extern_statics, - unconditional_recursion, unions_with_drop_fields, unused_allocation, unused_comparisons, - unused_parens, while_true)] +#![deny( + bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership, + non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, path_statements, + patterns_in_fns_without_body, plugin_as_library, private_in_public, private_no_mangle_fns, + private_no_mangle_statics, safe_extern_statics, unconditional_recursion, + unions_with_drop_fields, unused_allocation, unused_comparisons, unused_parens, while_true +)] #![deny(missing_debug_implementations, missing_docs, trivial_casts, trivial_numeric_casts)] #![deny(unused_extern_crates, unused)] @@ -54,21 +58,21 @@ extern crate tokio_core; extern crate url; extern crate xdg; +pub mod database; #[allow(missing_docs)] pub mod dbqueries; #[allow(missing_docs)] pub mod errors; -pub mod utils; -pub mod database; -pub mod pipeline; -pub(crate) mod models; mod feed; +pub(crate) mod models; mod parser; +pub mod pipeline; mod schema; +pub mod utils; pub use feed::{Feed, FeedBuilder}; -pub use models::{Episode, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source}; pub use models::Save; +pub use models::{Episode, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source}; /// [XDG Base Direcotory](https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html) Paths. #[allow(missing_debug_implementations)] diff --git a/hammond-data/src/models/episode.rs b/hammond-data/src/models/episode.rs index 0f22702..a60a047 100644 --- a/hammond-data/src/models/episode.rs +++ b/hammond-data/src/models/episode.rs @@ -1,7 +1,7 @@ use chrono::prelude::*; use diesel; -use diesel::SaveChangesDsl; use diesel::prelude::*; +use diesel::SaveChangesDsl; use database::connection; use errors::DataError; diff --git a/hammond-data/src/models/new_episode.rs b/hammond-data/src/models/new_episode.rs index d456ef1..ea9d81f 100644 --- a/hammond-data/src/models/new_episode.rs +++ b/hammond-data/src/models/new_episode.rs @@ -287,8 +287,8 @@ impl NewEpisodeMinimal { mod tests { use database::truncate_db; use dbqueries; - use models::*; use models::new_episode::{NewEpisodeMinimal, NewEpisodeMinimalBuilder}; + use models::*; use rss::Channel; diff --git a/hammond-data/src/models/new_podcast.rs b/hammond-data/src/models/new_podcast.rs index e370fef..dd019e6 100644 --- a/hammond-data/src/models/new_podcast.rs +++ b/hammond-data/src/models/new_podcast.rs @@ -4,8 +4,8 @@ use diesel::prelude::*; use rss; use errors::DataError; -use models::{Index, Insert, Update}; use models::Podcast; +use models::{Index, Insert, Update}; use schema::podcast; use database::connection; diff --git a/hammond-data/src/models/source.rs b/hammond-data/src/models/source.rs index 0d09e91..c4409c6 100644 --- a/hammond-data/src/models/source.rs +++ b/hammond-data/src/models/source.rs @@ -3,10 +3,10 @@ use diesel::SaveChangesDsl; use rss::Channel; use url::Url; -use hyper::{Client, Method, Request, Response, StatusCode, Uri}; use hyper::client::HttpConnector; use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified, Location, UserAgent}; +use hyper::{Client, Method, Request, Response, StatusCode, Uri}; use hyper_tls::HttpsConnector; // use futures::future::ok; @@ -213,9 +213,11 @@ impl Source { if !ignore_etags { if let Some(foo) = self.http_etag() { - req.headers_mut().set(IfNoneMatch::Items(vec![ - EntityTag::new(true, foo.to_owned()), - ])); + req.headers_mut() + .set(IfNoneMatch::Items(vec![EntityTag::new( + true, + foo.to_owned(), + )])); } if let Some(foo) = self.last_modified() { diff --git a/hammond-data/src/pipeline.rs b/hammond-data/src/pipeline.rs index c1015ca..e2845b1 100644 --- a/hammond-data/src/pipeline.rs +++ b/hammond-data/src/pipeline.rs @@ -4,18 +4,18 @@ use futures::future::*; // use futures::prelude::*; -use hyper::Client; use hyper::client::HttpConnector; +use hyper::Client; use hyper_tls::HttpsConnector; use tokio_core::reactor::Core; use num_cpus; use rss; -use Source; use dbqueries; use errors::DataError; use models::{IndexState, NewEpisode, NewEpisodeMinimal}; +use Source; // use std::sync::{Arc, Mutex}; @@ -141,8 +141,8 @@ where #[cfg(test)] mod tests { use super::*; - use Source; use database::truncate_db; + use Source; // (path, url) tuples. const URLS: &[(&str, &str)] = { diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index 4dd3892..e62bdab 100644 --- a/hammond-downloader/src/downloader.rs +++ b/hammond-downloader/src/downloader.rs @@ -11,8 +11,8 @@ use std::io::{BufWriter, Read, Write}; use std::path::Path; use std::sync::{Arc, Mutex}; -use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save}; use hammond_data::xdg_dirs::HAMMOND_CACHE; +use hammond_data::{EpisodeWidgetQuery, PodcastCoverQuery, Save}; // use failure::Error; use errors::DownloadError; @@ -234,9 +234,9 @@ pub fn cache_image(pd: &PodcastCoverQuery) -> Result { #[cfg(test)] mod tests { use super::*; - use hammond_data::Source; use hammond_data::dbqueries; use hammond_data::pipeline; + use hammond_data::Source; use std::fs; diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index 8148c01..47cffe0 100644 --- a/hammond-gtk/src/app.rs +++ b/hammond-gtk/src/app.rs @@ -3,14 +3,14 @@ use gio::{ApplicationExt, ApplicationExtManual, ApplicationFlags, Settings, SettingsExt}; use glib; use gtk; -use gtk::SettingsExt as GtkSettingsExt; use gtk::prelude::*; +use gtk::SettingsExt as GtkSettingsExt; use failure::Error; use rayon; -use hammond_data::{Podcast, Source}; use hammond_data::utils::delete_show; +use hammond_data::{Podcast, Source}; use appnotif::*; use headerbar::Header; @@ -19,8 +19,8 @@ use stacks::Content; use utils; use widgets::mark_all_watched; -use std::sync::Arc; use std::sync::mpsc::{channel, Receiver, Sender}; +use std::sync::Arc; use std::time::Duration; #[derive(Clone, Debug)] diff --git a/hammond-gtk/src/appnotif.rs b/hammond-gtk/src/appnotif.rs index e4b9ec2..b7043d9 100644 --- a/hammond-gtk/src/appnotif.rs +++ b/hammond-gtk/src/appnotif.rs @@ -32,11 +32,7 @@ impl Default for InAppNotification { } impl InAppNotification { - pub fn new( - text: String, - mut callback: F, - undo_callback: U, - ) -> Self + pub fn new(text: String, mut callback: F, undo_callback: U) -> Self where F: FnMut() -> glib::Continue + 'static, U: Fn() + 'static, diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index ba9f55f..db01198 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/hammond-gtk/src/headerbar.rs @@ -5,8 +5,8 @@ use failure::Error; use failure::ResultExt; use url::Url; -use hammond_data::Source; use hammond_data::dbqueries; +use hammond_data::Source; use std::sync::mpsc::Sender; diff --git a/hammond-gtk/src/main.rs b/hammond-gtk/src/main.rs index f9c3c6c..aa343e9 100644 --- a/hammond-gtk/src/main.rs +++ b/hammond-gtk/src/main.rs @@ -1,6 +1,9 @@ -#![cfg_attr(feature = "cargo-clippy", - allow(clone_on_ref_ptr, needless_pass_by_value, useless_format, blacklisted_name, - match_same_arms))] +#![cfg_attr( + feature = "cargo-clippy", + allow( + clone_on_ref_ptr, needless_pass_by_value, useless_format, blacklisted_name, match_same_arms + ) +)] #![allow(unknown_lints)] #![deny(unused_extern_crates, unused)] @@ -64,18 +67,18 @@ macro_rules! clone { // They do not need to be public // But it helps when looking at the generated docs. +pub mod stacks; pub mod views; pub mod widgets; -pub mod stacks; -pub mod headerbar; pub mod app; +pub mod headerbar; -pub mod settings; -pub mod utils; -pub mod manager; -pub mod static_resource; pub mod appnotif; +pub mod manager; +pub mod settings; +pub mod static_resource; +pub mod utils; use app::App; diff --git a/hammond-gtk/src/manager.rs b/hammond-gtk/src/manager.rs index 70dd9a9..5ee8c98 100644 --- a/hammond-gtk/src/manager.rs +++ b/hammond-gtk/src/manager.rs @@ -8,8 +8,8 @@ use hammond_downloader::downloader::{get_episode, DownloadProgress}; use app::Action; use std::collections::HashMap; -use std::sync::{Arc, Mutex, RwLock}; use std::sync::mpsc::Sender; +use std::sync::{Arc, Mutex, RwLock}; // use std::sync::atomic::AtomicUsize; // use std::path::PathBuf; @@ -122,17 +122,17 @@ pub fn add(id: i32, directory: String, sender: Sender) -> Result<(), Err mod tests { use super::*; - use hammond_data::{Episode, Source}; use hammond_data::dbqueries; use hammond_data::pipeline; use hammond_data::utils::get_download_folder; + use hammond_data::{Episode, Source}; use hammond_downloader::downloader::get_episode; - use std::{thread, time}; use std::fs; use std::path::Path; use std::sync::mpsc::channel; + use std::{thread, time}; #[test] // This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit diff --git a/hammond-gtk/src/stacks/content.rs b/hammond-gtk/src/stacks/content.rs index 825a98d..ede4230 100644 --- a/hammond-gtk/src/stacks/content.rs +++ b/hammond-gtk/src/stacks/content.rs @@ -7,8 +7,8 @@ use app::Action; use stacks::EpisodeStack; use stacks::ShowStack; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::Arc; #[derive(Debug, Clone)] pub struct Content { diff --git a/hammond-gtk/src/stacks/episode.rs b/hammond-gtk/src/stacks/episode.rs index 03a0af0..b1bd89a 100644 --- a/hammond-gtk/src/stacks/episode.rs +++ b/hammond-gtk/src/stacks/episode.rs @@ -1,6 +1,6 @@ use gtk; -use gtk::Cast; use gtk::prelude::*; +use gtk::Cast; use failure::Error; diff --git a/hammond-gtk/src/stacks/show.rs b/hammond-gtk/src/stacks/show.rs index ddcf583..d438402 100644 --- a/hammond-gtk/src/stacks/show.rs +++ b/hammond-gtk/src/stacks/show.rs @@ -1,19 +1,19 @@ use gtk; -use gtk::Cast; use gtk::prelude::*; +use gtk::Cast; use failure::Error; -use hammond_data::Podcast; use hammond_data::dbqueries; +use hammond_data::Podcast; use views::{EmptyView, ShowsPopulated}; use app::Action; use widgets::ShowWidget; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::Arc; #[derive(Debug, Clone)] pub struct ShowStack { diff --git a/hammond-gtk/src/utils.rs b/hammond-gtk/src/utils.rs index 998e49e..906d0fb 100644 --- a/hammond-gtk/src/utils.rs +++ b/hammond-gtk/src/utils.rs @@ -4,8 +4,8 @@ use gdk_pixbuf::Pixbuf; use gio::{Settings, SettingsExt}; use glib; use gtk; -use gtk::{IsA, Widget}; use gtk::prelude::*; +use gtk::{IsA, Widget}; use failure::Error; use rayon; @@ -15,21 +15,21 @@ use send_cell::SendCell; use serde_json::Value; // use hammond_data::feed; -use hammond_data::{PodcastCoverQuery, Source}; use hammond_data::dbqueries; use hammond_data::pipeline; use hammond_data::utils::checkup; +use hammond_data::{PodcastCoverQuery, Source}; use hammond_downloader::downloader; use std::collections::{HashMap, HashSet}; -use std::sync::{Mutex, RwLock}; -use std::sync::Arc; use std::sync::mpsc::*; +use std::sync::Arc; +use std::sync::{Mutex, RwLock}; use app::Action; -use chrono::Duration; use chrono::prelude::*; +use chrono::Duration; /// Lazy evaluates and loads widgets to the parent `container` widget. /// diff --git a/hammond-gtk/src/views/episodes.rs b/hammond-gtk/src/views/episodes.rs index e8f51c5..8dac2f2 100644 --- a/hammond-gtk/src/views/episodes.rs +++ b/hammond-gtk/src/views/episodes.rs @@ -3,15 +3,15 @@ use failure::Error; use gtk; use gtk::prelude::*; -use hammond_data::EpisodeWidgetQuery; use hammond_data::dbqueries; +use hammond_data::EpisodeWidgetQuery; use app::Action; use utils::{get_ignored_shows, set_image_from_path}; use widgets::EpisodeWidget; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::Arc; #[derive(Debug, Clone)] enum ListSplit { diff --git a/hammond-gtk/src/views/mod.rs b/hammond-gtk/src/views/mod.rs index de97d2a..d14ed86 100644 --- a/hammond-gtk/src/views/mod.rs +++ b/hammond-gtk/src/views/mod.rs @@ -1,6 +1,6 @@ -mod shows; -mod episodes; mod empty; +mod episodes; +mod shows; pub use self::empty::EmptyView; pub use self::episodes::EpisodesView; diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs index 67ba529..54c1a70 100644 --- a/hammond-gtk/src/views/shows.rs +++ b/hammond-gtk/src/views/shows.rs @@ -2,14 +2,14 @@ use failure::Error; use gtk; use gtk::prelude::*; -use hammond_data::{Podcast, PodcastCoverQuery}; use hammond_data::dbqueries; +use hammond_data::{Podcast, PodcastCoverQuery}; use app::Action; use utils::{get_ignored_shows, set_image_from_path}; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::Arc; #[derive(Debug, Clone)] pub struct ShowsPopulated { diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 1d9beb7..507ca6e 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/hammond-gtk/src/widgets/episode.rs @@ -8,9 +8,9 @@ use open; use rayon; use take_mut; -use hammond_data::{EpisodeWidgetQuery, Podcast}; use hammond_data::dbqueries; use hammond_data::utils::get_download_folder; +use hammond_data::{EpisodeWidgetQuery, Podcast}; use app::Action; use manager; @@ -21,8 +21,8 @@ use std::cell::RefCell; use std::ops::DerefMut; use std::path::Path; use std::rc::Rc; -use std::sync::{Arc, Mutex}; use std::sync::mpsc::Sender; +use std::sync::{Arc, Mutex}; #[derive(Debug)] pub struct EpisodeWidget { @@ -370,8 +370,8 @@ fn total_size_helper( // } pub fn episodes_listbox(pd: Arc, sender: Sender) -> Result { - use crossbeam_channel::TryRecvError::*; use crossbeam_channel::bounded; + use crossbeam_channel::TryRecvError::*; let count = dbqueries::get_pd_episodes_count(&pd)?; diff --git a/hammond-gtk/src/widgets/mod.rs b/hammond-gtk/src/widgets/mod.rs index 46f759c..72acb20 100644 --- a/hammond-gtk/src/widgets/mod.rs +++ b/hammond-gtk/src/widgets/mod.rs @@ -1,7 +1,7 @@ -mod show; mod episode; mod episode_states; +mod show; pub use self::episode::EpisodeWidget; -pub use self::show::ShowWidget; pub use self::show::mark_all_watched; +pub use self::show::ShowWidget; diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs index 135ff17..7f2249b 100644 --- a/hammond-gtk/src/widgets/show.rs +++ b/hammond-gtk/src/widgets/show.rs @@ -5,15 +5,15 @@ use gtk::prelude::*; use html2pango::markup_from_raw; use open; -use hammond_data::Podcast; use hammond_data::dbqueries; +use hammond_data::Podcast; use app::Action; use utils::set_image_from_path; use widgets::episode::episodes_listbox; -use std::sync::Arc; use std::sync::mpsc::Sender; +use std::sync::Arc; #[derive(Debug, Clone)] pub struct ShowWidget { diff --git a/rustfmt.toml b/rustfmt.toml index b755324..2eeaaa8 100644 --- a/rustfmt.toml +++ b/rustfmt.toml @@ -11,5 +11,3 @@ condense_wildcard_suffixes = false format_strings = true normalize_comments = true reorder_imports = true -reorder_imported_names = true -reorder_imports_in_group = true