diff --git a/CHANGELOG.md b/CHANGELOG.md index d22d954..307ddb3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Changelog -## To be released +## v0.3.1 - To be released + +* Upgraded to Rust 2018 edition ## v0.3.0 - 2018-11-04 diff --git a/Cargo.toml b/Cargo.toml index 8608805..1f59746 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -10,6 +10,7 @@ repository = "https://github.com/fdehau/tui-rs" license = "MIT" exclude = ["assets/*", ".travis.yml"] autoexamples = true +edition = "2018" [badges] travis-ci = { repository = "fdehau/tui-rs" } diff --git a/examples/barchart.rs b/examples/barchart.rs index 26bd58b..37527ca 100644 --- a/examples/barchart.rs +++ b/examples/barchart.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,7 +13,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{BarChart, Block, Borders, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; struct App<'a> { data: Vec<(&'a str, u64)>, diff --git a/examples/block.rs b/examples/block.rs index 30fcc0a..fe48f98 100644 --- a/examples/block.rs +++ b/examples/block.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -16,7 +12,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; fn main() -> Result<(), failure::Error> { // Terminal initialization diff --git a/examples/canvas.rs b/examples/canvas.rs index aff0224..0a525be 100644 --- a/examples/canvas.rs +++ b/examples/canvas.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -19,7 +15,7 @@ use tui::widgets::canvas::{Canvas, Line, Map, MapResolution}; use tui::widgets::{Block, Borders, Widget}; use tui::Terminal; -use util::event::{Config, Event, Events}; +use crate::util::event::{Config, Event, Events}; struct App { x: f64, diff --git a/examples/chart.rs b/examples/chart.rs index 6f3d4de..d9de012 100644 --- a/examples/chart.rs +++ b/examples/chart.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -16,8 +12,8 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget}; use tui::Terminal; -use util::event::{Event, Events}; -use util::SinSignal; +use crate::util::event::{Event, Events}; +use crate::util::SinSignal; struct App { signal1: SinSignal, diff --git a/examples/crossterm.rs b/examples/crossterm.rs index c073c1b..a5173e2 100644 --- a/examples/crossterm.rs +++ b/examples/crossterm.rs @@ -1,7 +1,3 @@ -extern crate crossterm; -extern crate failure; -extern crate tui; - use tui::backend::CrosstermBackend; use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Paragraph, Text, Widget}; diff --git a/examples/custom_widget.rs b/examples/custom_widget.rs index f2366ec..c3a9a0e 100644 --- a/examples/custom_widget.rs +++ b/examples/custom_widget.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -18,7 +14,7 @@ use tui::style::Style; use tui::widgets::Widget; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; struct Label<'a> { text: &'a str, diff --git a/examples/demo.rs b/examples/demo.rs index f7f7803..2bda2e5 100644 --- a/examples/demo.rs +++ b/examples/demo.rs @@ -1,9 +1,3 @@ -extern crate failure; -extern crate log; -extern crate stderrlog; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -23,8 +17,8 @@ use tui::widgets::{ }; use tui::{Frame, Terminal}; -use util::event::{Event, Events}; -use util::{RandomSignal, SinSignal, TabsState}; +use crate::util::event::{Event, Events}; +use crate::util::{RandomSignal, SinSignal, TabsState}; struct Server<'a> { name: &'a str, diff --git a/examples/gauge.rs b/examples/gauge.rs index 7fc5d20..76f0b56 100644 --- a/examples/gauge.rs +++ b/examples/gauge.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,7 +13,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Gauge, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; struct App { progress1: u16, diff --git a/examples/layout.rs b/examples/layout.rs index c8c1ea5..a72763f 100644 --- a/examples/layout.rs +++ b/examples/layout.rs @@ -1,9 +1,3 @@ -extern crate failure; -extern crate log; -extern crate stderrlog; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -18,7 +12,7 @@ use tui::layout::{Constraint, Direction, Layout}; use tui::widgets::{Block, Borders, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; fn main() -> Result<(), failure::Error> { stderrlog::new().verbosity(4).init()?; diff --git a/examples/list.rs b/examples/list.rs index b504139..331a290 100644 --- a/examples/list.rs +++ b/examples/list.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,7 +13,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, List, SelectableList, Text, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; struct App<'a> { items: Vec<&'a str>, diff --git a/examples/paragraph.rs b/examples/paragraph.rs index b4bbc7f..e60ba8b 100644 --- a/examples/paragraph.rs +++ b/examples/paragraph.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,7 +13,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Paragraph, Text, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; fn main() -> Result<(), failure::Error> { // Terminal initialization diff --git a/examples/rustbox.rs b/examples/rustbox.rs index 57a1fda..92c5686 100644 --- a/examples/rustbox.rs +++ b/examples/rustbox.rs @@ -1,6 +1,3 @@ -extern crate rustbox; -extern crate tui; - use rustbox::Key; use std::error::Error; diff --git a/examples/sparkline.rs b/examples/sparkline.rs index 31681ba..369085a 100644 --- a/examples/sparkline.rs +++ b/examples/sparkline.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,8 +13,8 @@ use tui::style::{Color, Style}; use tui::widgets::{Block, Borders, Sparkline, Widget}; use tui::Terminal; -use util::event::{Event, Events}; -use util::RandomSignal; +use crate::util::event::{Event, Events}; +use crate::util::RandomSignal; struct App { signal: RandomSignal, diff --git a/examples/table.rs b/examples/table.rs index 9fcd7f4..5d4e330 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,7 +13,7 @@ use tui::style::{Color, Modifier, Style}; use tui::widgets::{Block, Borders, Row, Table, Widget}; use tui::Terminal; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; struct App<'a> { items: Vec>, diff --git a/examples/tabs.rs b/examples/tabs.rs index 78a281a..f2abfc3 100644 --- a/examples/tabs.rs +++ b/examples/tabs.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - #[allow(dead_code)] mod util; @@ -17,8 +13,8 @@ use tui::style::{Color, Style}; use tui::widgets::{Block, Borders, Tabs, Widget}; use tui::Terminal; -use util::event::{Event, Events}; -use util::TabsState; +use crate::util::event::{Event, Events}; +use crate::util::TabsState; struct App<'a> { tabs: TabsState<'a>, diff --git a/examples/user_input.rs b/examples/user_input.rs index 3a7ed44..83f1455 100644 --- a/examples/user_input.rs +++ b/examples/user_input.rs @@ -1,4 +1,3 @@ -extern crate failure; /// A simple example demonstrating how to handle user input. This is /// a bit out of the scope of the library as it does not provide any /// input handling out of the box. However, it may helps some to get @@ -10,9 +9,6 @@ extern crate failure; /// * Pressing Backspace erases a character /// * Pressing Enter pushes the current input in the history of previous /// messages -extern crate termion; -extern crate tui; -extern crate unicode_width; #[allow(dead_code)] mod util; @@ -31,7 +27,7 @@ use tui::widgets::{Block, Borders, List, Paragraph, Text, Widget}; use tui::Terminal; use unicode_width::UnicodeWidthStr; -use util::event::{Event, Events}; +use crate::util::event::{Event, Events}; /// App holds the state of the application struct App { diff --git a/examples/util/mod.rs b/examples/util/mod.rs index 8cca40b..daa65a0 100644 --- a/examples/util/mod.rs +++ b/examples/util/mod.rs @@ -1,9 +1,7 @@ -extern crate rand; - pub mod event; -use self::rand::distributions::{Distribution, Uniform}; -use self::rand::rngs::ThreadRng; +use rand::distributions::{Distribution, Uniform}; +use rand::rngs::ThreadRng; #[derive(Clone)] pub struct RandomSignal { diff --git a/src/backend/crossterm.rs b/src/backend/crossterm.rs index 7cfa512..eba5c57 100644 --- a/src/backend/crossterm.rs +++ b/src/backend/crossterm.rs @@ -1,11 +1,9 @@ -extern crate crossterm; - use std::io; -use backend::Backend; -use buffer::Cell; -use layout::Rect; -use style::{Color, Modifier}; +use crate::backend::Backend; +use crate::buffer::Cell; +use crate::layout::Rect; +use crate::style::{Color, Modifier}; pub struct CrosstermBackend { screen: crossterm::Screen, diff --git a/src/backend/mod.rs b/src/backend/mod.rs index eabfb76..cc60c5f 100644 --- a/src/backend/mod.rs +++ b/src/backend/mod.rs @@ -1,7 +1,7 @@ use std::io; -use buffer::Cell; -use layout::Rect; +use crate::buffer::Cell; +use crate::layout::Rect; #[cfg(feature = "rustbox")] mod rustbox; diff --git a/src/backend/rustbox.rs b/src/backend/rustbox.rs index 375190b..e290fa7 100644 --- a/src/backend/rustbox.rs +++ b/src/backend/rustbox.rs @@ -1,11 +1,10 @@ -extern crate rustbox; - +use log::debug; use std::io; use super::Backend; -use buffer::Cell; -use layout::Rect; -use style::{Color, Modifier}; +use crate::buffer::Cell; +use crate::layout::Rect; +use crate::style::{Color, Modifier}; pub struct RustboxBackend { rustbox: rustbox::RustBox, @@ -13,7 +12,7 @@ pub struct RustboxBackend { impl RustboxBackend { pub fn new() -> Result { - let rustbox = try!(rustbox::RustBox::init(Default::default())); + let rustbox = r#try!(rustbox::RustBox::init(Default::default())); Ok(RustboxBackend { rustbox: rustbox }) } diff --git a/src/backend/termion.rs b/src/backend/termion.rs index 8590c77..330a5df 100644 --- a/src/backend/termion.rs +++ b/src/backend/termion.rs @@ -1,12 +1,11 @@ -extern crate termion; - +use log::debug; use std::io; use std::io::Write; use super::Backend; -use buffer::Cell; -use layout::Rect; -use style::{Color, Modifier, Style}; +use crate::buffer::Cell; +use crate::layout::Rect; +use crate::style::{Color, Modifier, Style}; pub struct TermionBackend where @@ -111,7 +110,7 @@ where /// Return the size of the terminal fn size(&self) -> io::Result { - let terminal = try!(termion::terminal_size()); + let terminal = r#try!(termion::terminal_size()); Ok(Rect::new(0, 0, terminal.0, terminal.1)) } diff --git a/src/buffer.rs b/src/buffer.rs index 5bef645..418f787 100644 --- a/src/buffer.rs +++ b/src/buffer.rs @@ -5,8 +5,8 @@ use std::usize; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; -use layout::Rect; -use style::{Color, Modifier, Style}; +use crate::layout::Rect; +use crate::style::{Color, Modifier, Style}; /// A buffer cell #[derive(Debug, Clone, PartialEq)] @@ -74,7 +74,6 @@ impl Default for Cell { /// # Examples: /// /// ``` -/// # extern crate tui; /// use tui::buffer::{Buffer, Cell}; /// use tui::layout::Rect; /// use tui::style::{Color, Style, Modifier}; diff --git a/src/layout.rs b/src/layout.rs index 160e2b6..fe1d63f 100644 --- a/src/layout.rs +++ b/src/layout.rs @@ -82,7 +82,6 @@ impl Layout { /// /// # Examples /// ``` - /// # extern crate tui; /// # use tui::layout::{Rect, Constraint, Direction, Layout}; /// /// # fn main() { diff --git a/src/lib.rs b/src/lib.rs index b7d8a25..73a1251 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -13,9 +13,6 @@ //! backend is available. //! //! ```rust,no_run -//! extern crate tui; -//! extern crate termion; -//! //! use std::io; //! use tui::Terminal; //! use tui::backend::TermionBackend; @@ -42,7 +39,6 @@ //! and then create the terminal in a similar way: //! //! ```rust,ignore -//! extern crate tui; //! //! use tui::Terminal; //! use tui::backend::RustboxBackend; @@ -68,8 +64,6 @@ //! The following example renders a block of the size of the terminal: //! //! ```rust,no_run -//! extern crate tui; -//! extern crate termion; //! //! use std::io; //! use termion::raw::IntoRawMode; @@ -99,8 +93,6 @@ //! full customization. And `Layout` is no exception: //! //! ```rust,no_run -//! extern crate tui; -//! extern crate termion; //! //! use std::io; //! use termion::raw::IntoRawMode; @@ -142,16 +134,6 @@ //! completely. So if for any reason you might need a blank space somewhere, try to //! pass an additional constraint and don't use the corresponding area. -#[macro_use] -extern crate bitflags; -extern crate cassowary; -extern crate either; -extern crate itertools; -#[macro_use] -extern crate log; -extern crate unicode_segmentation; -extern crate unicode_width; - pub mod backend; pub mod buffer; pub mod layout; diff --git a/src/terminal.rs b/src/terminal.rs index afae212..35739a4 100644 --- a/src/terminal.rs +++ b/src/terminal.rs @@ -1,9 +1,10 @@ +use log::error; use std::io; -use backend::Backend; -use buffer::Buffer; -use layout::Rect; -use widgets::Widget; +use crate::backend::Backend; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::widgets::Widget; /// Interface to the terminal backed by Termion #[derive(Debug)] diff --git a/src/widgets/barchart.rs b/src/widgets/barchart.rs index 00909a2..f223fd3 100644 --- a/src/widgets/barchart.rs +++ b/src/widgets/barchart.rs @@ -2,18 +2,17 @@ use std::cmp::{max, min}; use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::Rect; -use style::Style; -use symbols::bar; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::symbols::bar; +use crate::widgets::{Block, Widget}; /// Display multiple bars in a single widgets /// /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, BarChart}; /// # use tui::style::{Style, Color, Modifier}; /// # fn main() { diff --git a/src/widgets/block.rs b/src/widgets/block.rs index 29e062f..e02d424 100644 --- a/src/widgets/block.rs +++ b/src/widgets/block.rs @@ -1,8 +1,8 @@ -use buffer::Buffer; -use layout::Rect; -use style::Style; -use symbols::line; -use widgets::{Borders, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::symbols::line; +use crate::widgets::{Borders, Widget}; /// Base widget to be used with all upper level ones. It may be used to display a box border around /// the widget and/or add a title. @@ -10,7 +10,6 @@ use widgets::{Borders, Widget}; /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders}; /// # use tui::style::{Style, Color}; /// # fn main() { diff --git a/src/widgets/canvas/line.rs b/src/widgets/canvas/line.rs index 45dff11..4265524 100644 --- a/src/widgets/canvas/line.rs +++ b/src/widgets/canvas/line.rs @@ -1,5 +1,5 @@ use super::Shape; -use style::Color; +use crate::style::Color; /// Shape to draw a line from (x1, y1) to (x2, y2) with the given color pub struct Line { diff --git a/src/widgets/canvas/map.rs b/src/widgets/canvas/map.rs index 9021a23..c80b2ab 100644 --- a/src/widgets/canvas/map.rs +++ b/src/widgets/canvas/map.rs @@ -1,7 +1,7 @@ -use style::Color; -use widgets::canvas::points::PointsIterator; -use widgets::canvas::world::{WORLD_HIGH_RESOLUTION, WORLD_LOW_RESOLUTION}; -use widgets::canvas::Shape; +use crate::style::Color; +use crate::widgets::canvas::points::PointsIterator; +use crate::widgets::canvas::world::{WORLD_HIGH_RESOLUTION, WORLD_LOW_RESOLUTION}; +use crate::widgets::canvas::Shape; #[derive(Clone, Copy)] pub enum MapResolution { diff --git a/src/widgets/canvas/mod.rs b/src/widgets/canvas/mod.rs index a45dcb3..8d048b9 100644 --- a/src/widgets/canvas/mod.rs +++ b/src/widgets/canvas/mod.rs @@ -7,10 +7,10 @@ pub use self::line::Line; pub use self::map::{Map, MapResolution}; pub use self::points::Points; -use buffer::Buffer; -use layout::Rect; -use style::{Color, Style}; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::{Color, Style}; +use crate::widgets::{Block, Widget}; pub const DOTS: [[u16; 2]; 4] = [ [0x0001, 0x0008], @@ -132,7 +132,6 @@ impl<'a> Context<'a> { /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders}; /// # use tui::widgets::canvas::{Canvas, Shape, Line, Map, MapResolution}; /// # use tui::style::Color; diff --git a/src/widgets/canvas/points.rs b/src/widgets/canvas/points.rs index 2c3f9f1..be17008 100644 --- a/src/widgets/canvas/points.rs +++ b/src/widgets/canvas/points.rs @@ -1,7 +1,7 @@ use std::slice; use super::Shape; -use style::Color; +use crate::style::Color; /// A shape to draw a group of points with the given color pub struct Points<'a> { diff --git a/src/widgets/chart.rs b/src/widgets/chart.rs index 4010fe8..34b0611 100644 --- a/src/widgets/chart.rs +++ b/src/widgets/chart.rs @@ -2,12 +2,12 @@ use std::cmp::max; use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::Rect; -use style::Style; -use symbols; -use widgets::canvas::{Canvas, Points}; -use widgets::{Block, Borders, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::symbols; +use crate::widgets::canvas::{Canvas, Points}; +use crate::widgets::{Block, Borders, Widget}; /// An X or Y axis for the chart widget pub struct Axis<'a, L> @@ -166,7 +166,6 @@ impl Default for ChartLayout { /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, Chart, Axis, Dataset, Marker}; /// # use tui::style::{Style, Color}; /// # fn main() { diff --git a/src/widgets/gauge.rs b/src/widgets/gauge.rs index cd1e990..68defd1 100644 --- a/src/widgets/gauge.rs +++ b/src/widgets/gauge.rs @@ -1,16 +1,15 @@ use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::Rect; -use style::{Color, Style}; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::{Color, Style}; +use crate::widgets::{Block, Widget}; /// A widget to display a task progress. /// /// # Examples: /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Widget, Gauge, Block, Borders}; /// # use tui::style::{Style, Color, Modifier}; /// # fn main() { diff --git a/src/widgets/list.rs b/src/widgets/list.rs index d9c3955..077e75e 100644 --- a/src/widgets/list.rs +++ b/src/widgets/list.rs @@ -3,10 +3,10 @@ use std::iter::Iterator; use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::{Corner, Rect}; -use style::Style; -use widgets::{Block, Text, Widget}; +use crate::buffer::Buffer; +use crate::layout::{Corner, Rect}; +use crate::style::Style; +use crate::widgets::{Block, Text, Widget}; pub struct List<'b, L> where @@ -117,7 +117,6 @@ where /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, SelectableList}; /// # use tui::style::{Style, Color, Modifier}; /// # fn main() { diff --git a/src/widgets/mod.rs b/src/widgets/mod.rs index 91f1a0a..aafd747 100644 --- a/src/widgets/mod.rs +++ b/src/widgets/mod.rs @@ -1,3 +1,4 @@ +use bitflags::bitflags; use std::borrow::Cow; mod barchart; @@ -22,11 +23,11 @@ pub use self::sparkline::Sparkline; pub use self::table::{Row, Table}; pub use self::tabs::Tabs; -use backend::Backend; -use buffer::Buffer; -use layout::Rect; -use style::{Color, Style}; -use terminal::Frame; +use crate::backend::Backend; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::{Color, Style}; +use crate::terminal::Frame; /// Bitflags that can be composed to set the visible borders essentially on the block widget. bitflags! { diff --git a/src/widgets/paragraph.rs b/src/widgets/paragraph.rs index 4ae1d8c..323eede 100644 --- a/src/widgets/paragraph.rs +++ b/src/widgets/paragraph.rs @@ -2,11 +2,11 @@ use either::Either; use unicode_segmentation::UnicodeSegmentation; use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::{Alignment, Rect}; -use style::Style; -use widgets::reflow::{LineComposer, LineTruncator, Styled, WordWrapper}; -use widgets::{Block, Text, Widget}; +use crate::buffer::Buffer; +use crate::layout::{Alignment, Rect}; +use crate::style::Style; +use crate::widgets::reflow::{LineComposer, LineTruncator, Styled, WordWrapper}; +use crate::widgets::{Block, Text, Widget}; fn get_line_offset(line_width: u16, text_area_width: u16, alignment: Alignment) -> u16 { match alignment { @@ -21,7 +21,6 @@ fn get_line_offset(line_width: u16, text_area_width: u16, alignment: Alignment) /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, Paragraph, Text}; /// # use tui::style::{Style, Color}; /// # use tui::layout::{Alignment}; diff --git a/src/widgets/reflow.rs b/src/widgets/reflow.rs index d46d490..32e951a 100644 --- a/src/widgets/reflow.rs +++ b/src/widgets/reflow.rs @@ -1,4 +1,4 @@ -use style::Style; +use crate::style::Style; use unicode_width::UnicodeWidthStr; const NBSP: &str = "\u{00a0}"; diff --git a/src/widgets/sparkline.rs b/src/widgets/sparkline.rs index 1a0b932..e569462 100644 --- a/src/widgets/sparkline.rs +++ b/src/widgets/sparkline.rs @@ -1,17 +1,16 @@ use std::cmp::min; -use buffer::Buffer; -use layout::Rect; -use style::Style; -use symbols::bar; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::symbols::bar; +use crate::widgets::{Block, Widget}; /// Widget to render a sparkline over one or more lines. /// /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, Sparkline}; /// # use tui::style::{Style, Color}; /// # fn main() { diff --git a/src/widgets/table.rs b/src/widgets/table.rs index 83fc700..87809d5 100644 --- a/src/widgets/table.rs +++ b/src/widgets/table.rs @@ -1,10 +1,10 @@ use std::fmt::Display; use std::iter::Iterator; -use buffer::Buffer; -use layout::Rect; -use style::Style; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::widgets::{Block, Widget}; /// Holds data to be displayed in a Table widget pub enum Row diff --git a/src/widgets/tabs.rs b/src/widgets/tabs.rs index 548c980..ce6b657 100644 --- a/src/widgets/tabs.rs +++ b/src/widgets/tabs.rs @@ -1,17 +1,16 @@ use unicode_width::UnicodeWidthStr; -use buffer::Buffer; -use layout::Rect; -use style::Style; -use symbols::line; -use widgets::{Block, Widget}; +use crate::buffer::Buffer; +use crate::layout::Rect; +use crate::style::Style; +use crate::symbols::line; +use crate::widgets::{Block, Widget}; /// A widget to display available tabs in a multiple panels context. /// /// # Examples /// /// ``` -/// # extern crate tui; /// # use tui::widgets::{Block, Borders, Tabs}; /// # use tui::style::{Style, Color}; /// # fn main() { diff --git a/tests/block.rs b/tests/block.rs index a1f7cde..e289a0e 100644 --- a/tests/block.rs +++ b/tests/block.rs @@ -1,6 +1,3 @@ -extern crate tui; -extern crate unicode_width; - use tui::backend::TestBackend; use tui::buffer::Buffer; use tui::layout::Rect; diff --git a/tests/gauge.rs b/tests/gauge.rs index d4a9203..f7033ea 100644 --- a/tests/gauge.rs +++ b/tests/gauge.rs @@ -1,6 +1,3 @@ -extern crate tui; -extern crate unicode_width; - use tui::backend::TestBackend; use tui::buffer::Buffer; use tui::layout::{Constraint, Direction, Layout}; diff --git a/tests/paragraph.rs b/tests/paragraph.rs index 33152cd..b4ef4e1 100644 --- a/tests/paragraph.rs +++ b/tests/paragraph.rs @@ -1,7 +1,3 @@ -extern crate failure; -extern crate termion; -extern crate tui; - use tui::backend::TestBackend; use tui::buffer::Buffer; use tui::layout::Alignment; diff --git a/tests/size.rs b/tests/size.rs index 12d684e..a5055ff 100644 --- a/tests/size.rs +++ b/tests/size.rs @@ -1,5 +1,3 @@ -extern crate tui; - use tui::backend::{Backend, TestBackend}; use tui::Terminal;