diff options
author | Nora <nora.widdecke@tu-bs.de> | 2018-12-29 13:59:33 +0100 |
---|---|---|
committer | Nora <nora.widdecke@tu-bs.de> | 2018-12-29 13:59:33 +0100 |
commit | 5d39dc3a29c77240824e1836b31dca8d2b7d13ad (patch) | |
tree | 36e6b10906af174c2d694e8291a84bc5dc6b259c | |
parent | 3398d3938384070f89d868c148d66873ae9f0053 (diff) |
order use statements alphabetically
-rw-r--r-- | src/agenda.rs | 9 | ||||
-rw-r--r-- | src/bin/khaleesi.rs | 16 | ||||
-rw-r--r-- | src/bucketable.rs | 5 | ||||
-rw-r--r-- | src/cal.rs | 2 | ||||
-rw-r--r-- | src/calutil.rs | 7 | ||||
-rw-r--r-- | src/config.rs | 7 | ||||
-rw-r--r-- | src/edit.rs | 5 | ||||
-rw-r--r-- | src/grep.rs | 2 | ||||
-rw-r--r-- | src/icalwrap.rs | 4 | ||||
-rw-r--r-- | src/index.rs | 5 | ||||
-rw-r--r-- | src/select.rs | 3 | ||||
-rw-r--r-- | src/seq.rs | 7 | ||||
-rw-r--r-- | src/show.rs | 1 | ||||
-rw-r--r-- | src/unroll.rs | 3 | ||||
-rw-r--r-- | src/utils.rs | 9 |
15 files changed, 47 insertions, 38 deletions
diff --git a/src/agenda.rs b/src/agenda.rs index a3ea013..a2d3f0e 100644 --- a/src/agenda.rs +++ b/src/agenda.rs @@ -1,9 +1,10 @@ -use utils; -use icalwrap::*; -use yansi::{Style}; -use config::{self,Config,CalendarConfig}; use chrono::{Datelike, TimeZone, Local, Date}; use itertools::Itertools; +use yansi::{Style}; + +use icalwrap::*; +use utils; +use config::{self,Config,CalendarConfig}; pub fn show_events(config: Config, lines: &mut Iterator<Item = String>) { let cals = utils::read_calendars_from_files(lines).unwrap(); diff --git a/src/bin/khaleesi.rs b/src/bin/khaleesi.rs index f3e1e46..a8a0d46 100644 --- a/src/bin/khaleesi.rs +++ b/src/bin/khaleesi.rs @@ -5,21 +5,21 @@ extern crate stderrlog; #[macro_use] extern crate log; -use khaleesi::prettyprint; use khaleesi::agenda; use khaleesi::cal; +use khaleesi::config::{self,Config}; +use khaleesi::defaults::*; +use khaleesi::edit; +use khaleesi::grep; use khaleesi::index; -use khaleesi::sort; use khaleesi::list; +use khaleesi::prettyprint; use khaleesi::select; use khaleesi::seq; -use khaleesi::utils; -use khaleesi::unroll; -use khaleesi::grep; use khaleesi::show; -use khaleesi::edit; -use khaleesi::config::{self,Config}; -use khaleesi::defaults::*; +use khaleesi::sort; +use khaleesi::unroll; +use khaleesi::utils; use std::env; use std::path::{Path,PathBuf}; diff --git a/src/bucketable.rs b/src/bucketable.rs index ab6c190..0607a07 100644 --- a/src/bucketable.rs +++ b/src/bucketable.rs @@ -1,7 +1,8 @@ -use icalwrap::{IcalVEvent, IcalVCalendar}; use chrono::{Local, Date, Datelike, Duration}; use std::collections::HashMap; -use std::{hash,cmp}; +use std::{hash, cmp}; + +use icalwrap::{IcalVEvent, IcalVCalendar}; use utils; pub trait Bucketable { @@ -1,5 +1,5 @@ -use chrono::prelude::*; use chrono::Duration; +use chrono::prelude::*; use yansi::{Style,Color}; use utils; diff --git a/src/calutil.rs b/src/calutil.rs index 6dfb275..17ceea7 100644 --- a/src/calutil.rs +++ b/src/calutil.rs @@ -1,8 +1,7 @@ -use chrono::prelude::*; -use chrono::MAX_DATE; -use chrono::IsoWeek; use chrono::Duration; - +use chrono::IsoWeek; +use chrono::MAX_DATE; +use chrono::prelude::*; // from https://github.com/chronotope/chrono/pull/209/files diff --git a/src/config.rs b/src/config.rs index 9e59ddf..63dbfe6 100644 --- a/src/config.rs +++ b/src/config.rs @@ -1,10 +1,11 @@ use std::collections::HashMap; -use utils; -use defaults; use toml; -use icalwrap::IcalVCalendar; use yansi::{self,Style,Color}; +use defaults; +use icalwrap::IcalVCalendar; +use utils; + #[derive(Deserialize)] #[serde(default)] pub struct Config { diff --git a/src/edit.rs b/src/edit.rs index 81864ba..bcbf09b 100644 --- a/src/edit.rs +++ b/src/edit.rs @@ -1,7 +1,8 @@ -use utils; +use std::env; use std::fs; use std::process::Command; -use std::env; + +use utils; pub fn do_edit(filenames: &mut Iterator<Item = String>, _args: &[String]) { diff --git a/src/grep.rs b/src/grep.rs index 99cb554..acd0698 100644 --- a/src/grep.rs +++ b/src/grep.rs @@ -1,5 +1,5 @@ -use utils; use icalwrap::IcalVCalendar; +use utils; pub fn grep(filenames: &mut Iterator<Item = String>, args: &[String]) { if args.len() == 0 { diff --git a/src/icalwrap.rs b/src/icalwrap.rs index c795623..93a7dcf 100644 --- a/src/icalwrap.rs +++ b/src/icalwrap.rs @@ -1,9 +1,9 @@ use chrono::{NaiveDate, Duration, DateTime, Date, Utc, TimeZone, Local}; use std::ffi::{CStr,CString}; -use std::path::PathBuf; use std::fmt; -use std::rc::Rc; use std::ops::Deref; +use std::path::PathBuf; +use std::rc::Rc; use ical; diff --git a/src/index.rs b/src/index.rs index 933a90e..07c0f42 100644 --- a/src/index.rs +++ b/src/index.rs @@ -3,10 +3,11 @@ extern crate libc; use icalwrap::*; use std::collections::HashMap; -use utils; -use std::path::{Path,PathBuf}; use std::fs; +use std::path::{Path,PathBuf}; + use defaults::*; +use utils; fn add_buckets_for_calendar(buckets: &mut HashMap<String, Vec<String>>, cal: &IcalVCalendar) { use bucketable::Bucketable; diff --git a/src/select.rs b/src/select.rs index 06b966a..1325181 100644 --- a/src/select.rs +++ b/src/select.rs @@ -1,8 +1,9 @@ use chrono::*; use std::path::PathBuf; -use utils; + use defaults; use icalwrap::IcalVEvent; +use utils; struct SelectFilters { from: Option<Date<Local>>, @@ -1,10 +1,11 @@ extern crate atty; -use utils; -use std::io; use itertools::Itertools; -use defaults::*; use std::fs::rename; +use std::io; + +use defaults::*; +use utils; pub fn do_seq(_args: &[String]) { if atty::isnt(atty::Stream::Stdin) { diff --git a/src/show.rs b/src/show.rs index 872b3e8..ad252a0 100644 --- a/src/show.rs +++ b/src/show.rs @@ -1,4 +1,5 @@ use std::path::Path; + use utils; pub fn do_show(filenames: &mut Iterator<Item = String>, _args: &[String]) { diff --git a/src/unroll.rs b/src/unroll.rs index 29c5f12..f29a6b9 100644 --- a/src/unroll.rs +++ b/src/unroll.rs @@ -1,6 +1,7 @@ -use utils; use std::path::Path; +use utils; + pub fn do_unroll(filepath: &Path) { let cal = utils::read_calendar_from_path(filepath).unwrap(); for event in cal.events_iter() { diff --git a/src/utils.rs b/src/utils.rs index c685c89..a12d9bf 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -1,12 +1,13 @@ extern crate walkdir; -use std::{fs, io, time}; -use std::path::{Path,PathBuf}; +use chrono::*; +use std::fmt::Display; use std::io::prelude::*; use std::io::{BufRead, BufReader}; -use std::fmt::Display; +use std::path::{Path,PathBuf}; +use std::{fs, io, time}; + use icalwrap::IcalVCalendar; -use chrono::*; pub fn joinlines(first: &str, second: &str) -> String { use itertools::Itertools; |