From df7493fd33cf2cd9f90726edd052eb136e768214 Mon Sep 17 00:00:00 2001 From: Florian Dehau Date: Sat, 9 Jun 2018 11:02:37 +0200 Subject: [PATCH] style: Run rustfmt --- examples/barchart.rs | 2 +- examples/block.rs | 2 +- examples/canvas.rs | 2 +- examples/chart.rs | 2 +- examples/custom_widget.rs | 2 +- examples/demo.rs | 2 +- examples/gauge.rs | 2 +- examples/layout.rs | 2 +- examples/list.rs | 2 +- examples/paragraph.rs | 2 +- examples/rustbox.rs | 2 +- examples/sparkline.rs | 2 +- examples/table.rs | 2 +- examples/tabs.rs | 2 +- examples/user_input.rs | 2 +- src/layout.rs | 2 +- src/widgets/canvas/map.rs | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/barchart.rs b/examples/barchart.rs index e9c5f6d9..c9cd857c 100644 --- a/examples/barchart.rs +++ b/examples/barchart.rs @@ -9,11 +9,11 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{BarChart, Block, Borders, Widget}; +use tui::Terminal; struct App<'a> { size: Rect, diff --git a/examples/block.rs b/examples/block.rs index a03f5ff3..69b14f75 100644 --- a/examples/block.rs +++ b/examples/block.rs @@ -5,11 +5,11 @@ use std::io; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Widget}; +use tui::Terminal; fn main() { let mut terminal = Terminal::new(MouseBackend::new().unwrap()).unwrap(); diff --git a/examples/canvas.rs b/examples/canvas.rs index ebc83882..724224e7 100644 --- a/examples/canvas.rs +++ b/examples/canvas.rs @@ -9,12 +9,12 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::Color; use tui::widgets::canvas::{Canvas, Line, Map, MapResolution}; use tui::widgets::{Block, Borders, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/examples/chart.rs b/examples/chart.rs index 6970135c..3964e440 100644 --- a/examples/chart.rs +++ b/examples/chart.rs @@ -12,11 +12,11 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::Rect; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/examples/custom_widget.rs b/examples/custom_widget.rs index ceefcdf8..786337d9 100644 --- a/examples/custom_widget.rs +++ b/examples/custom_widget.rs @@ -1,11 +1,11 @@ extern crate tui; -use tui::Terminal; use tui::backend::MouseBackend; use tui::buffer::Buffer; use tui::layout::Rect; use tui::style::Style; use tui::widgets::Widget; +use tui::Terminal; struct Label<'a> { text: &'a str, diff --git a/examples/demo.rs b/examples/demo.rs index a2ccda5c..8f70459b 100644 --- a/examples/demo.rs +++ b/examples/demo.rs @@ -14,13 +14,13 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::canvas::{Canvas, Line, Map, MapResolution}; use tui::widgets::{Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, Item, List, Marker, Paragraph, Row, SelectableList, Sparkline, Table, Tabs, Widget}; +use tui::Terminal; use util::*; diff --git a/examples/gauge.rs b/examples/gauge.rs index 842081f1..68ae609a 100644 --- a/examples/gauge.rs +++ b/examples/gauge.rs @@ -9,11 +9,11 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Gauge, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/examples/layout.rs b/examples/layout.rs index b94f4492..291de0c2 100644 --- a/examples/layout.rs +++ b/examples/layout.rs @@ -10,10 +10,10 @@ use std::thread; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::widgets::{Block, Borders, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/examples/list.rs b/examples/list.rs index 13e56fc2..8d75431a 100644 --- a/examples/list.rs +++ b/examples/list.rs @@ -9,11 +9,11 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Corner, Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Item, List, SelectableList, Widget}; +use tui::Terminal; struct App<'a> { size: Rect, diff --git a/examples/paragraph.rs b/examples/paragraph.rs index be1cef6f..b042cb1e 100644 --- a/examples/paragraph.rs +++ b/examples/paragraph.rs @@ -5,11 +5,11 @@ use std::io; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Alignment, Color, Style}; use tui::widgets::{Block, Paragraph, Widget}; +use tui::Terminal; fn main() { let mut terminal = Terminal::new(MouseBackend::new().unwrap()).unwrap(); diff --git a/examples/rustbox.rs b/examples/rustbox.rs index e5793ca4..364913af 100644 --- a/examples/rustbox.rs +++ b/examples/rustbox.rs @@ -4,11 +4,11 @@ extern crate tui; use rustbox::Key; use std::error::Error; -use tui::Terminal; use tui::backend::RustboxBackend; use tui::layout::{Direction, Group, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Paragraph, Widget}; +use tui::Terminal; fn main() { let mut terminal = Terminal::new(RustboxBackend::new().unwrap()).unwrap(); diff --git a/examples/sparkline.rs b/examples/sparkline.rs index ecd23d4d..3ad5656e 100644 --- a/examples/sparkline.rs +++ b/examples/sparkline.rs @@ -12,11 +12,11 @@ use std::time; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Style}; use tui::widgets::{Block, Borders, Sparkline, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/examples/table.rs b/examples/table.rs index c1358406..b4b98451 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -6,11 +6,11 @@ use std::io; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Row, Table, Widget}; +use tui::Terminal; struct App<'a> { size: Rect, diff --git a/examples/tabs.rs b/examples/tabs.rs index c9200f7e..4748079a 100644 --- a/examples/tabs.rs +++ b/examples/tabs.rs @@ -8,11 +8,11 @@ use std::io; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Style}; use tui::widgets::{Block, Borders, Tabs, Widget}; +use tui::Terminal; struct App<'a> { size: Rect, diff --git a/examples/user_input.rs b/examples/user_input.rs index 863ed120..271280a5 100644 --- a/examples/user_input.rs +++ b/examples/user_input.rs @@ -19,11 +19,11 @@ use std::thread; use termion::event; use termion::input::TermRead; -use tui::Terminal; use tui::backend::MouseBackend; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Style}; use tui::widgets::{Block, Borders, Item, List, Paragraph, Widget}; +use tui::Terminal; struct App { size: Rect, diff --git a/src/layout.rs b/src/layout.rs index acf09e73..c8cf6fd8 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -1,8 +1,8 @@ use std::cmp::{max, min}; use std::collections::HashMap; -use cassowary::WeightedRelation::*; use cassowary::strength::{REQUIRED, WEAK}; +use cassowary::WeightedRelation::*; use cassowary::{Constraint, Expression, Solver, Variable}; use backend::Backend; diff --git a/src/widgets/canvas/map.rs b/src/widgets/canvas/map.rs index d2bfd237..b7476a54 100644 --- a/src/widgets/canvas/map.rs +++ b/src/widgets/canvas/map.rs @@ -1,7 +1,7 @@ use style::Color; -use widgets::canvas::Shape; use widgets::canvas::points::PointsIterator; use widgets::canvas::world::{WORLD_HIGH_RESOLUTION, WORLD_LOW_RESOLUTION}; +use widgets::canvas::Shape; #[derive(Clone, Copy)] pub enum MapResolution {