Merge some imports.

10 files changed, 23 insertions, 21 deletions

diff --git a/helix-term/src/application.rs b/helix-term/src/application.rs
index 16a0f6f6..cab7ad63 100644
--- a/helix-term/src/application.rs
+++ b/helix-term/src/application.rs
@@ -2,8 +2,7 @@ use clap::ArgMatches as Args;
 
 use helix_view::{document::Mode, Document, Editor, Theme, View};
 
-use crate::compositor::Compositor;
-use crate::ui;
+use crate::{compositor::Compositor, ui};
 
 use log::{error, info};
 
@@ -139,9 +138,8 @@ impl Application {
                                 .diagnostics
                                 .into_iter()
                                 .map(|diagnostic| {
-                                    use helix_core::diagnostic::Severity::*;
                                     use helix_core::{
-                                        diagnostic::{Range, Severity},
+                                        diagnostic::{Range, Severity, Severity::*},
                                         Diagnostic,
                                     };
                                     use helix_lsp::{lsp, util::lsp_pos_to_pos};
diff --git a/helix-term/src/commands.rs b/helix-term/src/commands.rs
index f7e137e0..3e60277c 100644
--- a/helix-term/src/commands.rs
+++ b/helix-term/src/commands.rs
@@ -10,8 +10,10 @@ use helix_core::{
 
 use once_cell::sync::Lazy;
 
-use crate::compositor::Compositor;
-use crate::ui::{self, Popup, Prompt, PromptEvent};
+use crate::{
+    compositor::Compositor,
+    ui::{self, Popup, Prompt, PromptEvent},
+};
 
 use std::path::PathBuf;
 
diff --git a/helix-term/src/compositor.rs b/helix-term/src/compositor.rs
index d7ca6f26..023f9b49 100644
--- a/helix-term/src/compositor.rs
+++ b/helix-term/src/compositor.rs
@@ -5,8 +5,7 @@
 use crossterm::event::Event;
 use helix_core::Position;
 use smol::Executor;
-use tui::buffer::Buffer as Surface;
-use tui::layout::Rect;
+use tui::{buffer::Buffer as Surface, layout::Rect};
 
 pub type Callback = Box<dyn FnOnce(&mut Compositor, &mut Editor)>;
 
diff --git a/helix-term/src/ui/editor.rs b/helix-term/src/ui/editor.rs
index 670de6d6..3ee9d446 100644
--- a/helix-term/src/ui/editor.rs
+++ b/helix-term/src/ui/editor.rs
@@ -1,7 +1,9 @@
-use crate::commands;
-use crate::compositor::{Component, Compositor, Context, EventResult};
-use crate::keymap::{self, Keymaps};
-use crate::ui::text_color;
+use crate::{
+    commands,
+    compositor::{Component, Compositor, Context, EventResult},
+    keymap::{self, Keymaps},
+    ui::text_color,
+};
 
 use helix_core::{
     indent::TAB_WIDTH,
diff --git a/helix-term/src/ui/markdown.rs b/helix-term/src/ui/markdown.rs
index 5e184ba3..e41f9765 100644
--- a/helix-term/src/ui/markdown.rs
+++ b/helix-term/src/ui/markdown.rs
@@ -1,7 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::buffer::Buffer as Surface;
 use tui::{
+    buffer::Buffer as Surface,
     layout::Rect,
     style::{Color, Style},
     text::Text,
diff --git a/helix-term/src/ui/menu.rs b/helix-term/src/ui/menu.rs
index 0fdf085f..e9893588 100644
--- a/helix-term/src/ui/menu.rs
+++ b/helix-term/src/ui/menu.rs
@@ -1,7 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::buffer::Buffer as Surface;
 use tui::{
+    buffer::Buffer as Surface,
     layout::Rect,
     style::{Color, Style},
     widgets::{Block, Borders},
diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
index d8da052a..853164c5 100644
--- a/helix-term/src/ui/picker.rs
+++ b/helix-term/src/ui/picker.rs
@@ -1,7 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::buffer::Buffer as Surface;
 use tui::{
+    buffer::Buffer as Surface,
     layout::Rect,
     style::{Color, Style},
     widgets::{Block, Borders},
diff --git a/helix-term/src/ui/popup.rs b/helix-term/src/ui/popup.rs
index 572c651b..98ccae61 100644
--- a/helix-term/src/ui/popup.rs
+++ b/helix-term/src/ui/popup.rs
@@ -1,7 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::buffer::Buffer as Surface;
 use tui::{
+    buffer::Buffer as Surface,
     layout::Rect,
     style::{Color, Style},
     widgets::{Block, Borders},
@@ -107,8 +107,10 @@ impl Component for Popup {
     }
 
     fn render(&self, viewport: Rect, surface: &mut Surface, cx: &mut Context) {
-        use tui::text::Text;
-        use tui::widgets::{Paragraph, Widget, Wrap};
+        use tui::{
+            text::Text,
+            widgets::{Paragraph, Widget, Wrap},
+        };
 
         cx.scroll = Some(self.scroll);
 
diff --git a/helix-term/src/ui/prompt.rs b/helix-term/src/ui/prompt.rs
index 35890b4c..db691f50 100644
--- a/helix-term/src/ui/prompt.rs
+++ b/helix-term/src/ui/prompt.rs
@@ -1,8 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
 use helix_core::Position;
-use helix_view::Editor;
-use helix_view::Theme;
+use helix_view::{Editor, Theme};
 use std::{borrow::Cow, ops::RangeFrom};
 
 pub struct Prompt {
diff --git a/helix-term/src/ui/text.rs b/helix-term/src/ui/text.rs
index 9db4d3bc..588e12c4 100644
--- a/helix-term/src/ui/text.rs
+++ b/helix-term/src/ui/text.rs
@@ -1,7 +1,7 @@
 use crate::compositor::{Component, Compositor, Context, EventResult};
 use crossterm::event::{Event, KeyCode, KeyEvent, KeyModifiers};
-use tui::buffer::Buffer as Surface;
 use tui::{
+    buffer::Buffer as Surface,
     layout::Rect,
     style::{Color, Style},
 };