From c3c5109c5ae83d4293b91854d5cf2eafeb0aa9b7 Mon Sep 17 00:00:00 2001 From: Florian Dehau Date: Tue, 26 Dec 2017 17:09:04 +0100 Subject: [PATCH] [src] Fix build and tests --- examples/block.rs | 2 +- examples/canvas.rs | 2 +- examples/chart.rs | 2 +- examples/demo.rs | 2 +- examples/gauge.rs | 2 +- examples/list.rs | 2 +- examples/rustbox.rs | 2 +- examples/sparkline.rs | 2 +- examples/table.rs | 2 +- examples/tabs.rs | 2 +- src/buffer.rs | 6 +++--- src/lib.rs | 4 ++-- src/widgets/block.rs | 2 +- src/widgets/canvas/mod.rs | 2 +- src/widgets/gauge.rs | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/examples/block.rs b/examples/block.rs index 62256d0..95c0215 100644 --- a/examples/block.rs +++ b/examples/block.rs @@ -7,7 +7,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Widget}; +use tui::widgets::{Block, Borders, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; diff --git a/examples/canvas.rs b/examples/canvas.rs index 709fbc0..9f219f0 100644 --- a/examples/canvas.rs +++ b/examples/canvas.rs @@ -11,7 +11,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Widget}; +use tui::widgets::{Block, Borders, Widget}; use tui::widgets::canvas::{Canvas, Line, Map, MapResolution}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::Color; diff --git a/examples/chart.rs b/examples/chart.rs index 82d9742..8c8aae5 100644 --- a/examples/chart.rs +++ b/examples/chart.rs @@ -14,7 +14,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Axis, Block, Chart, Dataset, Marker, Widget}; +use tui::widgets::{Axis, Block, Borders, Chart, Dataset, Marker, Widget}; use tui::layout::Rect; use tui::style::{Color, Modifier, Style}; diff --git a/examples/demo.rs b/examples/demo.rs index c4d10a0..062038b 100644 --- a/examples/demo.rs +++ b/examples/demo.rs @@ -16,7 +16,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Axis, BarChart, Block, Chart, Dataset, Gauge, Item, List, Marker, +use tui::widgets::{Axis, BarChart, Block, Borders, Chart, Dataset, Gauge, Item, List, Marker, Paragraph, Row, SelectableList, Sparkline, Table, Tabs, Widget}; use tui::widgets::canvas::{Canvas, Line, Map, MapResolution}; use tui::layout::{Direction, Group, Rect, Size}; diff --git a/examples/gauge.rs b/examples/gauge.rs index 663ab35..5531c87 100644 --- a/examples/gauge.rs +++ b/examples/gauge.rs @@ -11,7 +11,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Gauge, Widget}; +use tui::widgets::{Block, Borders, Gauge, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; diff --git a/examples/list.rs b/examples/list.rs index 977d98c..0accb3c 100644 --- a/examples/list.rs +++ b/examples/list.rs @@ -11,7 +11,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Item, List, SelectableList, Widget}; +use tui::widgets::{Block, Borders, Item, List, SelectableList, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; diff --git a/examples/rustbox.rs b/examples/rustbox.rs index a3f183d..060afef 100644 --- a/examples/rustbox.rs +++ b/examples/rustbox.rs @@ -6,7 +6,7 @@ use rustbox::Key; use tui::Terminal; use tui::backend::RustboxBackend; -use tui::widgets::{Borders, Block, Paragraph, Widget}; +use tui::widgets::{Block, Borders, Paragraph, Widget}; use tui::layout::{Direction, Group, Size}; use tui::style::{Color, Modifier, Style}; diff --git a/examples/sparkline.rs b/examples/sparkline.rs index e7e6013..99fb49c 100644 --- a/examples/sparkline.rs +++ b/examples/sparkline.rs @@ -14,7 +14,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Sparkline, Widget}; +use tui::widgets::{Block, Borders, Sparkline, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Style}; diff --git a/examples/table.rs b/examples/table.rs index c00bd04..f46bc5d 100644 --- a/examples/table.rs +++ b/examples/table.rs @@ -8,7 +8,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Row, Table, Widget}; +use tui::widgets::{Block, Borders, Row, Table, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Modifier, Style}; diff --git a/examples/tabs.rs b/examples/tabs.rs index 09b5ba5..6d64bf5 100644 --- a/examples/tabs.rs +++ b/examples/tabs.rs @@ -10,7 +10,7 @@ use termion::input::TermRead; use tui::Terminal; use tui::backend::MouseBackend; -use tui::widgets::{Borders, Block, Tabs, Widget}; +use tui::widgets::{Block, Borders, Tabs, Widget}; use tui::layout::{Direction, Group, Rect, Size}; use tui::style::{Color, Style}; diff --git a/src/buffer.rs b/src/buffer.rs index eb5be42..d57badb 100644 --- a/src/buffer.rs +++ b/src/buffer.rs @@ -115,11 +115,11 @@ impl Buffer { /// Returns a Buffer with all cells set to the default one pub fn empty(area: Rect) -> Buffer { let cell: Cell = Default::default(); - Buffer::filled(area, cell) + Buffer::filled(area, &cell) } /// Returns a Buffer with all cells initialized with the attributes of the given Cell - pub fn filled(area: Rect, cell: Cell) -> Buffer { + pub fn filled(area: Rect, cell: &Cell) -> Buffer { let size = area.area() as usize; let mut content = Vec::with_capacity(size); for _ in 0..size { @@ -219,7 +219,7 @@ impl Buffer { } /// Merge an other buffer into this one - pub fn merge(&mut self, other: Buffer) { + pub fn merge(&mut self, other: &Buffer) { let area = self.area.union(&other.area); let cell: Cell = Default::default(); self.content.resize(area.area() as usize, cell.clone()); diff --git a/src/lib.rs b/src/lib.rs index c24afca..081616f 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -68,7 +68,7 @@ //! //! use tui::Terminal; //! use tui::backend::RawBackend; -//! use tui::widgets::{Widget, Block, border}; +//! use tui::widgets::{Widget, Block, Borders}; //! use tui::layout::{Group, Size, Direction}; //! //! fn main() { @@ -108,7 +108,7 @@ //! //! use tui::Terminal; //! use tui::backend::RawBackend; -//! use tui::widgets::{Widget, Block, border}; +//! use tui::widgets::{Widget, Block, Borders}; //! use tui::layout::{Group, Size, Direction}; //! //! fn main() { diff --git a/src/widgets/block.rs b/src/widgets/block.rs index 2e96c6f..3279ddf 100644 --- a/src/widgets/block.rs +++ b/src/widgets/block.rs @@ -11,7 +11,7 @@ use symbols::line; /// /// ``` /// # extern crate tui; -/// # use tui::widgets::{Block, Border}; +/// # use tui::widgets::{Block, Borders}; /// # use tui::style::{Style, Color}; /// # fn main() { /// Block::default() diff --git a/src/widgets/canvas/mod.rs b/src/widgets/canvas/mod.rs index fb73297..220bea9 100644 --- a/src/widgets/canvas/mod.rs +++ b/src/widgets/canvas/mod.rs @@ -138,7 +138,7 @@ impl<'a> Context<'a> { /// /// ``` /// # extern crate tui; -/// # use tui::widgets::{Block, border}; +/// # use tui::widgets::{Block, Borders}; /// # use tui::widgets::canvas::{Canvas, Shape, Line, Map, MapResolution}; /// # use tui::style::Color; /// # fn main() { diff --git a/src/widgets/gauge.rs b/src/widgets/gauge.rs index 199633d..07291e9 100644 --- a/src/widgets/gauge.rs +++ b/src/widgets/gauge.rs @@ -11,7 +11,7 @@ use layout::Rect; /// /// ``` /// # extern crate tui; -/// # use tui::widgets::{Widget, Gauge, Block, border}; +/// # use tui::widgets::{Widget, Gauge, Block, Borders}; /// # use tui::style::{Style, Color, Modifier}; /// # fn main() { /// Gauge::default()