Run cargo format

This commit is contained in:
Dheepak Krishnamurthy 2020-07-27 02:51:38 -06:00
parent 293f7f59b6
commit 412c63965b
3 changed files with 82 additions and 84 deletions

View file

@ -14,7 +14,7 @@ use unicode_width::UnicodeWidthStr;
use chrono::{DateTime, Duration, Local, NaiveDateTime, TimeZone};
use tui::{
backend::{Backend},
backend::Backend,
layout::{Constraint, Direction, Layout, Rect},
style::{Color, Modifier, Style},
terminal::Frame,
@ -23,7 +23,7 @@ use tui::{
Terminal,
};
use crate::util::{Key};
use crate::util::Key;
pub fn cmp(t1: &Task, t2: &Task) -> Ordering {
let urgency1 = match &t1.uda()["urgency"] {
@ -277,7 +277,7 @@ impl App {
}
pub fn next(&mut self) {
if self.tasks.len() == 0 {
return
return;
}
let i = match self.state.selected() {
Some(i) => {
@ -293,7 +293,7 @@ impl App {
}
pub fn previous(&mut self) {
if self.tasks.len() == 0 {
return
return;
}
let i = match self.state.selected() {
Some(i) => {
@ -406,7 +406,6 @@ impl App {
},
}
}
}
#[cfg(test)]

View file

@ -7,21 +7,20 @@ mod util;
#[allow(dead_code)]
mod app;
use crate::util::{EventConfig, Event, Events, setup_terminal, destruct_terminal};
use std::time::{Duration, Instant};
use crate::util::{destruct_terminal, setup_terminal, Event, EventConfig, Events};
use std::env;
use std::error::Error;
use std::io::{stdout, Write};
use std::io;
use std::io::{stdout, Write};
use std::process::Command;
use std::time::{Duration, Instant};
use tui::backend::Backend;
use unicode_width::UnicodeWidthStr;
use std::env;
use std::process::Command;
use app::App;
use app::InputMode;
fn main() -> Result<(), Box<dyn Error>> {
// Terminal initialization
let mut terminal = setup_terminal();
terminal.clear()?;
@ -45,7 +44,7 @@ fn main() -> Result<(), Box<dyn Error>> {
if app.should_quit {
destruct_terminal(terminal);
break
break;
}
}
Ok(())

View file

@ -7,11 +7,10 @@ use crossterm::{
#[cfg(feature = "crossterm")]
use tui::{backend::CrosstermBackend, Terminal};
#[cfg(all(feature = "termion", not(feature = "crossterm")))]
use termion::{
event,
input::{TermRead,MouseTerminal},
input::{MouseTerminal, TermRead},
raw::{IntoRawMode, RawTerminal},
screen::AlternateScreen,
};
@ -78,9 +77,9 @@ pub fn destruct_terminal(mut terminal: Terminal<CrosstermBackend<io::Stdout>>) {
terminal.show_cursor().unwrap();
}
#[cfg(all(feature = "termion", not(feature = "crossterm")))]
pub fn setup_terminal() -> Terminal<TermionBackend<AlternateScreen<MouseTerminal<RawTerminal<io::Stdout>>>>> {
pub fn setup_terminal(
) -> Terminal<TermionBackend<AlternateScreen<MouseTerminal<RawTerminal<io::Stdout>>>>> {
let stdout = io::stdout().into_raw_mode().unwrap();
let stdout = MouseTerminal::from(stdout);
let stdout = AlternateScreen::from(stdout);
@ -89,10 +88,11 @@ pub fn setup_terminal() -> Terminal<TermionBackend<AlternateScreen<MouseTerminal
}
#[cfg(all(feature = "termion", not(feature = "crossterm")))]
pub fn destruct_terminal(terminal: Terminal<TermionBackend<AlternateScreen<MouseTerminal<RawTerminal<io::Stdout>>>>> ) {
pub fn destruct_terminal(
terminal: Terminal<TermionBackend<AlternateScreen<MouseTerminal<RawTerminal<io::Stdout>>>>>,
) {
}
pub struct Events {
rx: mpsc::Receiver<Event<Key>>,
}