[src] Run rustfmt

pull/36/head
Florian Dehau 7 years ago
parent 8907ab90a1
commit af16518650

@ -28,7 +28,6 @@ struct App {
dir_y: bool,
}
impl App {
fn new() -> App {
App {

@ -31,7 +31,6 @@ struct Server<'a> {
status: &'a str,
}
struct App<'a> {
size: Rect,
items: Vec<&'a str>,
@ -70,30 +69,9 @@ fn main() {
let mut app = App {
size: Rect::default(),
items: vec![
"Item1",
"Item2",
"Item3",
"Item4",
"Item5",
"Item6",
"Item7",
"Item8",
"Item9",
"Item10",
"Item11",
"Item12",
"Item13",
"Item14",
"Item15",
"Item16",
"Item17",
"Item18",
"Item19",
"Item20",
"Item21",
"Item22",
"Item23",
"Item24",
"Item1", "Item2", "Item3", "Item4", "Item5", "Item6", "Item7", "Item8", "Item9",
"Item10", "Item11", "Item12", "Item13", "Item14", "Item15", "Item16", "Item17",
"Item18", "Item19", "Item20", "Item21", "Item22", "Item23", "Item24",
],
events: vec![
("Event1", "INFO"),

@ -31,30 +31,9 @@ impl<'a> App<'a> {
App {
size: Rect::default(),
items: vec![
"Item1",
"Item2",
"Item3",
"Item4",
"Item5",
"Item6",
"Item7",
"Item8",
"Item9",
"Item10",
"Item11",
"Item12",
"Item13",
"Item14",
"Item15",
"Item16",
"Item17",
"Item18",
"Item19",
"Item20",
"Item21",
"Item22",
"Item23",
"Item24",
"Item1", "Item2", "Item3", "Item4", "Item5", "Item6", "Item7", "Item8", "Item9",
"Item10", "Item11", "Item12", "Item13", "Item14", "Item15", "Item16", "Item17",
"Item18", "Item19", "Item20", "Item21", "Item22", "Item23", "Item24",
],
selected: 0,
events: vec![

@ -122,12 +122,7 @@ fn draw(t: &mut Terminal<MouseBackend>, app: &App) {
Group::default()
.direction(Direction::Vertical)
.margin(2)
.sizes(&[
Size::Fixed(3),
Size::Fixed(3),
Size::Fixed(7),
Size::Min(0),
])
.sizes(&[Size::Fixed(3), Size::Fixed(3), Size::Fixed(7), Size::Min(0)])
.render(t, &app.size, |t, chunks| {
Sparkline::default()
.block(

@ -40,7 +40,6 @@ fn main() {
let backend = MouseBackend::new().unwrap();
let mut terminal = Terminal::new(backend).unwrap();
// App
let mut app = App::new();
@ -94,14 +93,13 @@ fn draw(t: &mut Terminal<MouseBackend>, app: &App) {
let normal_style = Style::default().fg(Color::White);
Table::new(
["Header1", "Header2", "Header3"].into_iter(),
app.items
.iter()
.enumerate()
.map(|(i, item)| if i == app.selected {
app.items.iter().enumerate().map(|(i, item)| {
if i == app.selected {
Row::StyledData(item.into_iter(), &selected_style)
} else {
Row::StyledData(item.into_iter(), &normal_style)
}),
}
}),
).block(Block::default().borders(border::ALL).title("Table"))
.widths(&[10, 10, 10])
.render(t, &chunks[0]);

@ -18,9 +18,8 @@ where
}
pub type RawBackend = TermionBackend<termion::raw::RawTerminal<io::Stdout>>;
pub type MouseBackend = TermionBackend<
termion::input::MouseTerminal<termion::raw::RawTerminal<io::Stdout>>,
>;
pub type MouseBackend =
TermionBackend<termion::input::MouseTerminal<termion::raw::RawTerminal<io::Stdout>>>;
impl RawBackend {
pub fn new() -> Result<RawBackend, io::Error> {

@ -62,8 +62,7 @@ where
let chunks = split(area, &group.direction, group.margin, &group.sizes);
debug!(
"New layout computed:\n* Group = {:?}\n* Chunks = {:?}",
group,
chunks
group, chunks
);
LayoutEntry {
chunks: chunks,
@ -83,13 +82,15 @@ where
.iter()
.zip(self.buffers[1 - self.current].content.iter())
.enumerate()
.filter_map(|(i, (c, p))| if c != p {
let i = i as u16;
let x = i % width;
let y = i / width;
Some((x, y, c))
} else {
None
.filter_map(|(i, (c, p))| {
if c != p {
let i = i as u16;
let x = i % width;
let y = i / width;
Some((x, y, c))
} else {
None
}
});
self.backend.draw(content)
}

@ -258,7 +258,6 @@ where
self
}
/// Compute the internal layout of the chart given the area. If the area is too small some
/// elements may be automatically hidden
fn layout(&self, area: &Rect) -> ChartLayout {

@ -116,8 +116,6 @@ where
}
}
/// A widget to display several items among which one can be selected (optional)
///
/// # Examples
@ -227,10 +225,12 @@ impl<'b> Widget for SelectableList<'b> {
let items = self.items
.iter()
.enumerate()
.map(|(i, item)| if i == selected {
Item::StyledData(format!("{} {}", highlight_symbol, item), highlight_style)
} else {
Item::StyledData(format!("{} {}", blank_symbol, item), &self.style)
.map(|(i, item)| {
if i == selected {
Item::StyledData(format!("{} {}", highlight_symbol, item), highlight_style)
} else {
Item::StyledData(format!("{} {}", blank_symbol, item), &self.style)
}
})
.skip(offset as usize);
List::new(items)

@ -142,7 +142,6 @@ where
self
}
pub fn column_spacing(&mut self, spacing: u16) -> &mut Table<'a, 'i, T, H, I, D, R> {
self.column_spacing = spacing;
self

@ -103,14 +103,13 @@ where
self.background(&tabs_area, buf, self.style.bg);
let mut x = tabs_area.left();
for (title, style) in self.titles
.iter()
.enumerate()
.map(|(i, t)| if i == self.selected {
for (title, style) in self.titles.iter().enumerate().map(|(i, t)| {
if i == self.selected {
(t, &self.highlight_style)
} else {
(t, &self.style)
}) {
}
}) {
x += 1;
if x > tabs_area.right() {
break;

Loading…
Cancel
Save