rustfmt: enable reorder imports.

hammond-data/benches/bench.rs

@@ -12,8 +12,8 @@ extern crate test;
 use test::Bencher;
 
 use hammond_data::Source;
-use hammond_data::feed::*;
 use hammond_data::database::truncate_db;
+use hammond_data::feed::*;
 
 use std::io::BufReader;
 

hammond-data/src/database.rs

@@ -1,11 +1,11 @@
 //! Database Setup. This is only public to help with some unit tests.
 
-use r2d2_diesel::ConnectionManager;
 use diesel::prelude::*;
 use r2d2;
+use r2d2_diesel::ConnectionManager;
 
-use std::path::PathBuf;
 use std::io;
+use std::path::PathBuf;
 
 use errors::*;
 

hammond-data/src/dbqueries.rs

@@ -1,12 +1,12 @@
 //! Random CRUD helper functions.
 
-use diesel::prelude::*;
-use diesel;
-use models::{Episode, EpisodeCleanerQuery, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source};
 use chrono::prelude::*;
-use errors::*;
+use diesel;
+use diesel::prelude::*;
 
 use database::connection;
+use errors::*;
+use models::{Episode, EpisodeCleanerQuery, EpisodeWidgetQuery, Podcast, PodcastCoverQuery, Source};
 
 pub fn get_sources() -> Result<Vec<Source>> {
     use schema::source::dsl::*;
@@ -279,9 +279,9 @@ pub fn delete_podcast_episodes(con: &SqliteConnection, parent_id: i32) -> QueryR
 }
 
 pub fn podcast_exists(source_id_: i32) -> Result<bool> {
-    use schema::podcast::dsl::*;
-    use diesel::select;
     use diesel::dsl::exists;
+    use diesel::select;
+    use schema::podcast::dsl::*;
 
     let db = connection();
     let con = db.get()?;

hammond-data/src/errors.rs

@@ -1,10 +1,10 @@
 use diesel;
 use diesel_migrations::RunMigrationsError;
-use rss;
-use reqwest;
-use r2d2;
 use hyper;
 use native_tls;
+use r2d2;
+use reqwest;
+use rss;
 
 use std::io;
 

hammond-data/src/feed.rs

@@ -1,17 +1,16 @@
 //! Index Feeds.
 
-use rayon::prelude::*;
 use diesel::prelude::*;
-use futures::prelude::*;
 use futures::future::*;
+use futures::prelude::*;
 use rayon::iter::IntoParallelIterator;
-
+use rayon::prelude::*;
 use rss;
 
-use dbqueries;
-use models::{NewEpisode, NewPodcast, Podcast, Source};
 use database::connection;
+use dbqueries;
 use errors::*;
+use models::{NewEpisode, NewPodcast, Podcast, Source};
 
 // #[cfg(test)]
 // use models::queryables::Episode;
@@ -149,9 +148,9 @@ pub fn index_all() -> Result<()> {
 
 #[cfg(test)]
 mod tests {
+    use database::truncate_db;
     use std::fs;
     use std::io::BufReader;
-    use database::truncate_db;
 
     use super::*;
 

hammond-data/src/models/episode.rs

@@ -1,13 +1,12 @@
 use chrono::prelude::*;
-use diesel::prelude::*;
 use diesel;
-
 use diesel::SaveChangesDsl;
+use diesel::prelude::*;
 
-use schema::episode;
-use errors::*;
 use database::connection;
+use errors::*;
 use models::Podcast;
+use schema::episode;
 
 #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
 #[table_name = "episode"]

hammond-data/src/models/mod.rs

@@ -13,9 +13,9 @@ pub(crate) use self::new_podcast::NewPodcast;
 pub(crate) use self::new_source::NewSource;
 
 pub use self::episode::{Episode, EpisodeWidgetQuery};
+pub(crate) use self::episode::EpisodeCleanerQuery;
 pub use self::podcast::{Podcast, PodcastCoverQuery};
 pub use self::source::Source;
-pub(crate) use self::episode::EpisodeCleanerQuery;
 
 #[allow(dead_code)]
 enum IndexState<T> {

hammond-data/src/models/new_episode.rs

@@ -1,18 +1,17 @@
-use diesel::prelude::*;
 use diesel;
+use diesel::prelude::*;
 use schema::episode;
 
-use rss;
 use ammonia;
 use rfc822_sanitizer::parse_from_rfc2822_with_fallback as parse_rfc822;
+use rss;
 
 use dbqueries;
 use errors::*;
 use models::{Insert, Update};
 use models::Episode;
-
-use utils::{replace_extra_spaces, url_cleaner};
 use parser;
+use utils::{replace_extra_spaces, url_cleaner};
 
 #[derive(Insertable, AsChangeset)]
 #[table_name = "episode"]

hammond-data/src/models/new_podcast.rs

@@ -1,15 +1,15 @@
-use diesel::prelude::*;
 use diesel;
+use diesel::prelude::*;
 
-use rss;
 use ammonia;
+use rss;
 
-use schema::podcast;
-use models::Podcast;
 use models::{Insert, Update};
+use models::Podcast;
+use schema::podcast;
 
-use dbqueries;
 use database::connection;
+use dbqueries;
 use utils::{replace_extra_spaces, url_cleaner};
 
 use errors::*;

hammond-data/src/models/new_source.rs

@@ -1,14 +1,13 @@
 #![allow(unused_mut)]
 
-use diesel::prelude::*;
 use diesel;
+use diesel::prelude::*;
 
-use schema::source;
-use models::Source;
-use models::{Insert, Update};
-
-use dbqueries;
 use database::connection;
+use dbqueries;
+use models::{Insert, Update};
+use models::Source;
+use schema::source;
 
 use errors::*;
 

hammond-data/src/models/podcast.rs

@@ -1,11 +1,9 @@
 use diesel::SaveChangesDsl;
 
-// use futures::future::{ok, result};
-
-use schema::podcast;
-use errors::*;
 use database::connection;
+use errors::*;
 use models::Source;
+use schema::podcast;
 
 #[derive(Queryable, Identifiable, AsChangeset, Associations, PartialEq)]
 #[belongs_to(Source, foreign_key = "source_id")]

hammond-data/src/models/source.rs

@@ -1,22 +1,21 @@
-use reqwest;
 use diesel::SaveChangesDsl;
+use reqwest;
 use rss::Channel;
 
 use hyper;
-use hyper::client::HttpConnector;
 use hyper::{Client, Method, Request, Response, StatusCode, Uri};
+use hyper::client::HttpConnector;
 use hyper::header::{ETag, EntityTag, HttpDate, IfModifiedSince, IfNoneMatch, LastModified};
 use hyper_tls::HttpsConnector;
 
 use futures::prelude::*;
 // use futures::future::{ok, result};
 
-use schema::source;
-use feed::Feed;
-use errors::*;
-
-use models::NewSource;
 use database::connection;
+use errors::*;
+use feed::Feed;
+use models::NewSource;
+use schema::source;
 
 use std::io::Read;
 use std::str::FromStr;

hammond-data/src/parser.rs

@@ -32,13 +32,15 @@ pub(crate) fn parse_itunes_duration(item: &Item) -> Option<i32> {
 
 #[cfg(test)]
 mod tests {
-    use std::fs::File;
-    use std::io::BufReader;
-    use rss::{Channel, ItemBuilder};
-    use rss::extension::itunes::ITunesItemExtensionBuilder;
     use models::new_episode::{NewEpisode, NewEpisodeBuilder};
     use models::new_podcast::{NewPodcast, NewPodcastBuilder};
 
+    use rss::{Channel, ItemBuilder};
+    use rss::extension::itunes::ITunesItemExtensionBuilder;
+
+    use std::fs::File;
+    use std::io::BufReader;
+
     use super::*;
 
     #[test]

hammond-data/src/pipeline.rs

@@ -1,14 +1,15 @@
 // FIXME:
 //! Docs.
 
-use tokio_core::reactor::Core;
+use futures::future::*;
+use futures::prelude::*;
+
 use hyper::Client;
 use hyper_tls::HttpsConnector;
-use futures::prelude::*;
+use tokio_core::reactor::Core;
-use futures::future::*;
 
-use errors::*;
 use Source;
+use errors::*;
 // use Feed;
 
 use std;

hammond-data/src/utils.rs

@@ -1,18 +1,18 @@
 //! Helper utilities for accomplishing various tasks.
 
-use rayon::prelude::*;
 use chrono::prelude::*;
+use rayon::prelude::*;
 
-use url::{Position, Url};
 use itertools::Itertools;
+use url::{Position, Url};
 
-use errors::*;
 use dbqueries;
+use errors::*;
 use models::{EpisodeCleanerQuery, Podcast};
 use xdg_dirs::DL_DIR;
 
-use std::path::Path;
 use std::fs;
+use std::path::Path;
 
 /// Scan downloaded `episode` entries that might have broken `local_uri`s and set them to `None`.
 fn download_checker() -> Result<()> {
@@ -151,10 +151,10 @@ pub fn delete_show(pd: &Podcast) -> Result<()> {
 mod tests {
     extern crate tempdir;
 
+    use self::tempdir::TempDir;
     use super::*;
     use database::{connection, truncate_db};
     use models::new_episode::NewEpisodeBuilder;
-    use self::tempdir::TempDir;
     use std::fs::File;
     use std::io::Write;
 

hammond-downloader/src/downloader.rs

@@ -1,13 +1,13 @@
-use reqwest;
-use hyper::header::*;
-use tempdir::TempDir;
-use mime_guess;
 use glob::glob;
+use hyper::header::*;
+use mime_guess;
+use reqwest;
+use tempdir::TempDir;
 
+use std::fs;
 use std::fs::{rename, DirBuilder, File};
 use std::io::{BufWriter, Read, Write};
 use std::path::Path;
-use std::fs;
 use std::sync::{Arc, Mutex};
 
 use errors::*;

hammond-downloader/src/errors.rs

@@ -1,5 +1,5 @@
-use reqwest;
 use hammond_data;
+use reqwest;
 use std::io;
 
 error_chain! {

hammond-gtk/src/app.rs

@@ -1,19 +1,19 @@
-use gtk;
-use glib;
 use gio;
-use gtk::prelude::*;
 use gio::{ApplicationExt, ApplicationExtManual};
+use glib;
+use gtk;
+use gtk::prelude::*;
 
-use hammond_data::utils::checkup;
 use hammond_data::{Podcast, Source};
+use hammond_data::utils::checkup;
 
-use headerbar::Header;
 use content::Content;
+use headerbar::Header;
 use utils;
 
 use std::sync::Arc;
-use std::time::Duration;
 use std::sync::mpsc::{channel, Receiver, Sender};
+use std::time::Duration;
 
 #[derive(Clone, Debug)]
 pub enum Action {

hammond-gtk/src/content.rs

@@ -5,12 +5,12 @@ use gtk::prelude::*;
 use hammond_data::Podcast;
 use hammond_data::dbqueries;
 
-use views::shows::ShowsPopulated;
 use views::empty::EmptyView;
 use views::episodes::EpisodesView;
+use views::shows::ShowsPopulated;
 
-use widgets::show::ShowWidget;
 use app::Action;
+use widgets::show::ShowWidget;
 
 use std::sync::Arc;
 use std::sync::mpsc::Sender;

hammond-gtk/src/headerbar.rs

@@ -3,8 +3,8 @@ use gtk::prelude::*;
 
 use hammond_data::Source;
 
-use std::sync::mpsc::Sender;
 use std::sync::Arc;
+use std::sync::mpsc::Sender;
 
 use app::Action;
 use content::Content;

hammond-gtk/src/manager.rs

@@ -1,7 +1,6 @@
 // use hammond_data::Episode;
 use hammond_data::dbqueries;
-use hammond_downloader::downloader::get_episode;
+use hammond_downloader::downloader::{get_episode, DownloadProgress};
-use hammond_downloader::downloader::DownloadProgress;
 
 use app::Action;
 
@@ -118,13 +117,13 @@ pub fn add(id: i32, directory: &str, sender: Sender<Action>) {
 mod tests {
     use super::*;
 
-    use hammond_data::database;
-    use hammond_data::utils::get_download_folder;
     use hammond_data::{Episode, Source};
+    use hammond_data::database;
     use hammond_data::dbqueries;
+    use hammond_data::utils::get_download_folder;
 
-    use std::path::Path;
     use std::{thread, time};
+    use std::path::Path;
     use std::sync::mpsc::channel;
 
     #[test]

hammond-gtk/src/utils.rs

@@ -1,19 +1,19 @@
-use send_cell::SendCell;
 use gdk_pixbuf::Pixbuf;
+use send_cell::SendCell;
 
 // use hammond_data::feed;
-use hammond_data::pipeline;
-use hammond_data::dbqueries;
 use hammond_data::{PodcastCoverQuery, Source};
+use hammond_data::dbqueries;
+use hammond_data::pipeline;
 use hammond_downloader::downloader;
 
-use std::thread;
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex, RwLock};
 use std::collections::HashMap;
+use std::sync::{Arc, Mutex, RwLock};
+use std::sync::mpsc::Sender;
+use std::thread;
 
-use headerbar::Header;
 use app::Action;
+use headerbar::Header;
 
 /// Update the rss feed(s) originating from `source`.
 /// If `source` is None, Fetches all the `Source` entries in the database and updates them.
@@ -80,9 +80,9 @@ pub fn get_pixbuf_from_path(pd: &PodcastCoverQuery, size: u32) -> Option<Pixbuf>
 
 #[cfg(test)]
 mod tests {
+    use super::*;
     use hammond_data::Source;
     use hammond_data::dbqueries;
-    use super::*;
 
     #[test]
     // This test inserts an rss feed to your `XDG_DATA/hammond/hammond.db` so we make it explicit

hammond-gtk/src/views/episodes.rs

@@ -1,16 +1,16 @@
+use chrono::prelude::*;
 use gtk;
 use gtk::prelude::*;
-use chrono::prelude::*;
 
-use hammond_data::dbqueries;
 use hammond_data::EpisodeWidgetQuery;
+use hammond_data::dbqueries;
 
-use widgets::episode::EpisodeWidget;
-use utils::get_pixbuf_from_path;
 use app::Action;
+use utils::get_pixbuf_from_path;
+use widgets::episode::EpisodeWidget;
 
-use std::sync::mpsc::Sender;
 use std::sync::Arc;
+use std::sync::mpsc::Sender;
 
 #[derive(Debug, Clone)]
 enum ListSplit {

hammond-gtk/src/views/shows.rs

@@ -1,11 +1,11 @@
 use gtk;
 use gtk::prelude::*;
 
-use hammond_data::dbqueries;
 use hammond_data::Podcast;
+use hammond_data::dbqueries;
 
-use utils::get_pixbuf_from_path;
 use app::Action;
+use utils::get_pixbuf_from_path;
 
 use std::sync::mpsc::Sender;
 

hammond-gtk/src/widgets/episode.rs

@@ -1,23 +1,23 @@
 use glib;
 use gtk;
 
-use gtk::prelude::*;
 use chrono::prelude::*;
+use gtk::prelude::*;
 
-use open;
 use humansize::{file_size_opts as size_opts, FileSize};
+use open;
 
-use hammond_data::dbqueries;
 use hammond_data::{EpisodeWidgetQuery, Podcast};
-use hammond_data::utils::get_download_folder;
+use hammond_data::dbqueries;
 use hammond_data::errors::*;
+use hammond_data::utils::get_download_folder;
 
 use app::Action;
 use manager;
 
-use std::sync::mpsc::Sender;
-use std::sync::{Arc, Mutex};
 use std::path::Path;
+use std::sync::{Arc, Mutex};
+use std::sync::mpsc::Sender;
 
 lazy_static! {
     static ref SIZE_OPTS: Arc<size_opts::FileSizeOpts> =  {

hammond-gtk/src/widgets/show.rs

@@ -1,15 +1,15 @@
-use gtk::prelude::*;
-use gtk;
-use open;
 use dissolve;
+use gtk;
+use gtk::prelude::*;
+use open;
 
-use hammond_data::dbqueries;
 use hammond_data::Podcast;
+use hammond_data::dbqueries;
 use hammond_data::utils::{delete_show, replace_extra_spaces};
 
-use widgets::episode::episodes_listbox;
-use utils::get_pixbuf_from_path;
 use app::Action;
+use utils::get_pixbuf_from_path;
+use widgets::episode::episodes_listbox;
 
 use std::sync::mpsc::Sender;
 use std::thread;

rustfmt.toml

@@ -6,8 +6,10 @@ wrap_comments = true
 tab_spaces = 4
 hard_tabs = false
 newline_style = "Unix"
-reorder_imports = false
 write_mode = "Overwrite"
 condense_wildcard_suffixes = false
 format_strings = true
-normalize_comments = true
+normalize_comments = true
+reorder_imports = true
+reorder_imported_names = true
+reorder_imports_in_group = true