Cargo fmt

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;

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;

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",
+#![cfg_attr(
-            warn(option_unwrap_used, result_unwrap_used, print_stdout,
+    feature = "clippy",
-                 wrong_pub_self_convention, mut_mut, non_ascii_literal, similar_names,
+    warn(
-                 unicode_not_nfc, enum_glob_use, if_not_else, items_after_statements,
+        option_unwrap_used, result_unwrap_used, print_stdout, wrong_pub_self_convention, mut_mut,
-                 used_underscore_binding))]
+        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,
+#![deny(
-        non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals,
+    bad_style, const_err, dead_code, improper_ctypes, legacy_directory_ownership,
-        path_statements, patterns_in_fns_without_body, plugin_as_library, private_in_public,
+    non_shorthand_field_patterns, no_mangle_generic_items, overflowing_literals, path_statements,
-        private_no_mangle_fns, private_no_mangle_statics, safe_extern_statics,
+    patterns_in_fns_without_body, plugin_as_library, private_in_public, private_no_mangle_fns,
-        unconditional_recursion, unions_with_drop_fields, unused_allocation, unused_comparisons,
+    private_no_mangle_statics, safe_extern_statics, unconditional_recursion,
-        unused_parens, while_true)]
+    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)]

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;

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;
 

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;

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![
+                req.headers_mut()
-                    EntityTag::new(true, foo.to_owned()),
+                    .set(IfNoneMatch::Items(vec![EntityTag::new(
-                ]));
+                        true,
+                        foo.to_owned(),
+                    )]));
             }
 
             if let Some(foo) = self.last_modified() {

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)] = {

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<String, DownloadError> {
 #[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;
 

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)]

hammond-gtk/src/appnotif.rs

@@ -32,11 +32,7 @@ impl Default for InAppNotification {
 }
 
 impl InAppNotification {
-    pub fn new<F, U>(
+    pub fn new<F, U>(text: String, mut callback: F, undo_callback: U) -> Self
-        text: String,
-        mut callback: F,
-        undo_callback: U,
-    ) -> Self
     where
         F: FnMut() -> glib::Continue + 'static,
         U: Fn() + 'static,

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;
 

hammond-gtk/src/main.rs

@@ -1,6 +1,9 @@
-#![cfg_attr(feature = "cargo-clippy",
+#![cfg_attr(
-            allow(clone_on_ref_ptr, needless_pass_by_value, useless_format, blacklisted_name,
+    feature = "cargo-clippy",
-                  match_same_arms))]
+    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;
 

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<Action>) -> 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

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 {

hammond-gtk/src/stacks/episode.rs

@@ -1,6 +1,6 @@
 use gtk;
-use gtk::Cast;
 use gtk::prelude::*;
+use gtk::Cast;
 
 use failure::Error;
 

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 {

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.
 ///

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 {

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;

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 {

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<Podcast>, sender: Sender<Action>) -> Result<gtk::ListBox, Error> {
-    use crossbeam_channel::TryRecvError::*;
     use crossbeam_channel::bounded;
+    use crossbeam_channel::TryRecvError::*;
 
     let count = dbqueries::get_pd_episodes_count(&pd)?;
 

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;

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 {

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