From 574cfae5c6b8c1ddca308137e63569bdf5156103 Mon Sep 17 00:00:00 2001 From: Jordan Petridis Date: Wed, 17 Jan 2018 08:57:02 +0200 Subject: [PATCH] rustfmt: enable reorder imports. --- hammond-data/benches/bench.rs | 2 +- hammond-data/src/database.rs | 4 ++-- hammond-data/src/dbqueries.rs | 12 ++++++------ hammond-data/src/errors.rs | 6 +++--- hammond-data/src/feed.rs | 11 +++++------ hammond-data/src/models/episode.rs | 7 +++---- hammond-data/src/models/mod.rs | 2 +- hammond-data/src/models/new_episode.rs | 7 +++---- hammond-data/src/models/new_podcast.rs | 10 +++++----- hammond-data/src/models/new_source.rs | 11 +++++------ hammond-data/src/models/podcast.rs | 6 ++---- hammond-data/src/models/source.rs | 13 ++++++------- hammond-data/src/parser.rs | 10 ++++++---- hammond-data/src/pipeline.rs | 9 +++++---- hammond-data/src/utils.rs | 10 +++++----- hammond-downloader/src/downloader.rs | 10 +++++----- hammond-downloader/src/errors.rs | 2 +- hammond-gtk/src/app.rs | 12 ++++++------ hammond-gtk/src/content.rs | 4 ++-- hammond-gtk/src/headerbar.rs | 2 +- hammond-gtk/src/manager.rs | 9 ++++----- hammond-gtk/src/utils.rs | 16 ++++++++-------- hammond-gtk/src/views/episodes.rs | 10 +++++----- hammond-gtk/src/views/shows.rs | 4 ++-- hammond-gtk/src/widgets/episode.rs | 12 ++++++------ hammond-gtk/src/widgets/show.rs | 12 ++++++------ rustfmt.toml | 6 ++++-- 27 files changed, 108 insertions(+), 111 deletions(-) diff --git a/hammond-data/benches/bench.rs b/hammond-data/benches/bench.rs index 9d3dcbc..8e665a0 100644 --- a/hammond-data/benches/bench.rs +++ b/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; diff --git a/hammond-data/src/database.rs b/hammond-data/src/database.rs index d3bb36d..0e2320c 100644 --- a/hammond-data/src/database.rs +++ b/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::*; diff --git a/hammond-data/src/dbqueries.rs b/hammond-data/src/dbqueries.rs index edc9603..0f36c10 100644 --- a/hammond-data/src/dbqueries.rs +++ b/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> { 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 { - 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()?; diff --git a/hammond-data/src/errors.rs b/hammond-data/src/errors.rs index 3beb3f2..563a093 100644 --- a/hammond-data/src/errors.rs +++ b/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; diff --git a/hammond-data/src/feed.rs b/hammond-data/src/feed.rs index 38d33a3..78c03eb 100644 --- a/hammond-data/src/feed.rs +++ b/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::*; diff --git a/hammond-data/src/models/episode.rs b/hammond-data/src/models/episode.rs index 52d863a..2ae3796 100644 --- a/hammond-data/src/models/episode.rs +++ b/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"] diff --git a/hammond-data/src/models/mod.rs b/hammond-data/src/models/mod.rs index 6e0972c..e121734 100644 --- a/hammond-data/src/models/mod.rs +++ b/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 { diff --git a/hammond-data/src/models/new_episode.rs b/hammond-data/src/models/new_episode.rs index bc12dd9..e0650a7 100644 --- a/hammond-data/src/models/new_episode.rs +++ b/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"] diff --git a/hammond-data/src/models/new_podcast.rs b/hammond-data/src/models/new_podcast.rs index b3765c9..c47e855 100644 --- a/hammond-data/src/models/new_podcast.rs +++ b/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::*; diff --git a/hammond-data/src/models/new_source.rs b/hammond-data/src/models/new_source.rs index 33f320d..dc572cf 100644 --- a/hammond-data/src/models/new_source.rs +++ b/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::*; diff --git a/hammond-data/src/models/podcast.rs b/hammond-data/src/models/podcast.rs index 63554c7..b99b83c 100644 --- a/hammond-data/src/models/podcast.rs +++ b/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")] diff --git a/hammond-data/src/models/source.rs b/hammond-data/src/models/source.rs index a65d6dc..b4245be 100644 --- a/hammond-data/src/models/source.rs +++ b/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; diff --git a/hammond-data/src/parser.rs b/hammond-data/src/parser.rs index a17c932..f8fb6cc 100644 --- a/hammond-data/src/parser.rs +++ b/hammond-data/src/parser.rs @@ -32,13 +32,15 @@ pub(crate) fn parse_itunes_duration(item: &Item) -> Option { #[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] diff --git a/hammond-data/src/pipeline.rs b/hammond-data/src/pipeline.rs index 1e0c0cb..6454d33 100644 --- a/hammond-data/src/pipeline.rs +++ b/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 futures::future::*; +use tokio_core::reactor::Core; -use errors::*; use Source; +use errors::*; // use Feed; use std; diff --git a/hammond-data/src/utils.rs b/hammond-data/src/utils.rs index ff1866e..bf875e1 100644 --- a/hammond-data/src/utils.rs +++ b/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; diff --git a/hammond-downloader/src/downloader.rs b/hammond-downloader/src/downloader.rs index 437624c..7acba68 100644 --- a/hammond-downloader/src/downloader.rs +++ b/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::*; diff --git a/hammond-downloader/src/errors.rs b/hammond-downloader/src/errors.rs index 4b019c5..a87f2ca 100644 --- a/hammond-downloader/src/errors.rs +++ b/hammond-downloader/src/errors.rs @@ -1,5 +1,5 @@ -use reqwest; use hammond_data; +use reqwest; use std::io; error_chain! { diff --git a/hammond-gtk/src/app.rs b/hammond-gtk/src/app.rs index bc9890d..4f4e341 100644 --- a/hammond-gtk/src/app.rs +++ b/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 { diff --git a/hammond-gtk/src/content.rs b/hammond-gtk/src/content.rs index 10d3d79..a83a4b1 100644 --- a/hammond-gtk/src/content.rs +++ b/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; diff --git a/hammond-gtk/src/headerbar.rs b/hammond-gtk/src/headerbar.rs index 82839a7..1c8fbda 100644 --- a/hammond-gtk/src/headerbar.rs +++ b/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; diff --git a/hammond-gtk/src/manager.rs b/hammond-gtk/src/manager.rs index fe9edd6..68b3132 100644 --- a/hammond-gtk/src/manager.rs +++ b/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::DownloadProgress; +use hammond_downloader::downloader::{get_episode, DownloadProgress}; use app::Action; @@ -118,13 +117,13 @@ pub fn add(id: i32, directory: &str, sender: Sender) { 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] diff --git a/hammond-gtk/src/utils.rs b/hammond-gtk/src/utils.rs index f73230e..0cccde1 100644 --- a/hammond-gtk/src/utils.rs +++ b/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 #[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 diff --git a/hammond-gtk/src/views/episodes.rs b/hammond-gtk/src/views/episodes.rs index dc36148..e32b4ae 100644 --- a/hammond-gtk/src/views/episodes.rs +++ b/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 { diff --git a/hammond-gtk/src/views/shows.rs b/hammond-gtk/src/views/shows.rs index 72a5b1e..a0a0851 100644 --- a/hammond-gtk/src/views/shows.rs +++ b/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; diff --git a/hammond-gtk/src/widgets/episode.rs b/hammond-gtk/src/widgets/episode.rs index 2ecc4d6..d4da92e 100644 --- a/hammond-gtk/src/widgets/episode.rs +++ b/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 = { diff --git a/hammond-gtk/src/widgets/show.rs b/hammond-gtk/src/widgets/show.rs index c67db1d..0573903 100644 --- a/hammond-gtk/src/widgets/show.rs +++ b/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; diff --git a/rustfmt.toml b/rustfmt.toml index c420ec1..b755324 100644 --- a/rustfmt.toml +++ b/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 \ No newline at end of file +normalize_comments = true +reorder_imports = true +reorder_imported_names = true +reorder_imports_in_group = true