Format with new import granularity

Author: ranfdev

gemini/src/client.rs

@@ -1,8 +1,9 @@
+use std::convert::TryFrom;
+
 use async_net::TcpStream;
 use futures::io::Cursor;
 use futures::prelude::*;
 use log::debug;
-use std::convert::TryFrom;
 use url::Url;
 
 const INIT_BUFFER_SIZE: usize = 8192; // 8Kb
@@ -232,8 +233,9 @@ impl Client {
 }
 #[cfg(test)]
 mod tests {
-    use crate::gemini::*;
     use futures::executor::block_on;
+
+    use crate::gemini::*;
     #[test]
     fn client_builder() {
         let client = ClientBuilder::new().redirect(true).build();

rustfmt.toml

@@ -0,0 +1,3 @@
+unstable_features = true
+imports_granularity = "module"
+group_imports = "StdExternalCrate"

src/common/mod.rs

@@ -1,6 +1,5 @@
 use gtk::glib;
 use once_cell::sync::Lazy;
-
 use url::Url;
 
 pub static DOWNLOAD_PATH: Lazy<std::path::PathBuf> = Lazy::new(|| {

src/config.rs

@@ -1,8 +1,8 @@
-pub use crate::build_config::*;
-
 use once_cell::sync::Lazy;
 use serde::{Deserialize, Serialize};
 
+pub use crate::build_config::*;
+
 pub static DEFAULT_CONFIG: Lazy<Config> = Lazy::new(|| Config {
     colors: true,
     fonts: Fonts {

src/lossy_text_read.rs

@@ -1,6 +1,7 @@
+use std::borrow::Cow;
+
 use async_trait::async_trait;
 use futures::prelude::*;
-use std::borrow::Cow;
 
 #[async_trait(?Send)]
 pub trait LossyTextRead {

src/main.rs

@@ -1,13 +1,15 @@
-use crate::common::{
-    BOOKMARK_FILE_PATH, CONFIG_DIR_PATH, DATA_DIR_PATH, DEFAULT_BOOKMARKS, HISTORY_FILE_PATH,
-    SETTINGS_FILE_PATH,
-};
+use std::cell::RefCell;
+use std::rc::Rc;
+
 use anyhow::Context;
 use async_fs::File;
 use futures::prelude::*;
 use gtk::gio;
-use std::cell::RefCell;
-use std::rc::Rc;
+
+use crate::common::{
+    BOOKMARK_FILE_PATH, CONFIG_DIR_PATH, DATA_DIR_PATH, DEFAULT_BOOKMARKS, HISTORY_FILE_PATH,
+    SETTINGS_FILE_PATH,
+};
 
 #[rustfmt::skip]
 mod build_config;
@@ -18,7 +20,6 @@ mod macros;
 mod widgets;
 
 use common::bookmarks_url;
-
 use gtk::prelude::*;
 async fn read_config() -> anyhow::Result<config::Config> {
     toml::from_str(&async_fs::read_to_string(&*SETTINGS_FILE_PATH).await?)

src/widgets/pages/download.rs

@@ -1,8 +1,6 @@
-use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use gtk::CompositeTemplate;
-use gtk::TemplateChild;
+use gtk::{glib, CompositeTemplate, TemplateChild};
 
 mod imp {
     pub use super::*;

src/widgets/pages/hypertext.rs

@@ -1,18 +1,18 @@
-use crate::config;
+use std::cell::RefCell;
+use std::collections::HashMap;
+
 use anyhow::Context;
 use gemini::Event;
-use glib::clone;
 use glib::subclass::{Signal, SignalType};
-use glib::Properties;
-use gtk::glib;
+use glib::{clone, Properties};
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use gtk::{gdk, gio};
+use gtk::{gdk, gio, glib};
 use once_cell::sync::Lazy;
-use std::cell::RefCell;
-use std::collections::HashMap;
 use url::Url;
 
+use crate::config;
+
 #[derive(Debug, Clone)]
 pub struct Surface {
     text_view: gtk::TextView,

src/widgets/pages/input.rs

@@ -1,8 +1,6 @@
-use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use gtk::CompositeTemplate;
-use gtk::TemplateChild;
+use gtk::{glib, CompositeTemplate, TemplateChild};
 
 mod imp {
     pub use super::*;

src/widgets/tab.rs

@@ -1,3 +1,9 @@
+use std::cell::{Cell, Ref, RefCell};
+use std::fmt::Write;
+use std::marker::PhantomData;
+use std::pin::Pin;
+use std::rc::Rc;
+
 use anyhow::{bail, Context, Result};
 use async_fs::File;
 use futures::future::RemoteHandle;
@@ -6,25 +12,18 @@ use futures::prelude::*;
 use futures::task::LocalSpawnExt;
 use glib::{clone, Properties};
 use gtk::gdk::prelude::*;
-use gtk::glib;
 use gtk::prelude::*;
 use gtk::subclass::prelude::*;
-use gtk::CompositeTemplate;
-use gtk::TemplateChild;
+use gtk::{glib, CompositeTemplate, TemplateChild};
+use hypertext::HypertextEvent;
 use log::{debug, info};
 use once_cell::sync::Lazy;
-use std::cell::{Cell, Ref, RefCell};
-use std::fmt::Write;
-use std::marker::PhantomData;
-use std::pin::Pin;
-use std::rc::Rc;
 use url::Url;
 
 use super::pages::{self, hypertext};
 use crate::common;
 use crate::common::glibctx;
 use crate::lossy_text_read::*;
-use hypertext::HypertextEvent;
 
 const BYTES_BEFORE_YIELD: usize = 1024 * 10;