move to Rust Edition 2018

44 files changed, 162 insertions, 161 deletions

diff --git a/Cargo.toml b/Cargo.toml
index a546c78..6c52d29 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -2,6 +2,7 @@
 name = "khaleesi"
 version = "0.1.0"
 authors = ["Nora <nora.widdecke@tu-bs.de>"]
+edition = "2018"
 
 [dependencies]
 libc = "0.2.43"
diff --git a/src/actions/agenda.rs b/src/actions/agenda.rs
index ebe36ad..6316d2d 100644
--- a/src/actions/agenda.rs
+++ b/src/actions/agenda.rs
@@ -2,12 +2,12 @@ use chrono::{DateTime, Datelike, TimeZone, Local, Date};
 use yansi::{Style};
 use itertools::Itertools;
 
-use cursorfile;
-use icalwrap::*;
-use input;
-use config::{Config,CalendarConfig};
-use khline::KhLine;
-use KhResult;
+use crate::cursorfile;
+use crate::icalwrap::*;
+use crate::input;
+use crate::config::{Config,CalendarConfig};
+use crate::khline::KhLine;
+use crate::KhResult;
 
 pub fn show_events(config: &Config, args: &[&str]) -> KhResult<()> {
   let mut events = input::selection(args)?;
@@ -180,10 +180,10 @@ impl IcalVEvent {
 #[cfg(test)]
 mod integration {
   use super::*;
-  use testdata;
-  use testutils::*;
-  use utils::stdioutils;
-  use config::Config;
+  use crate::testdata;
+  use crate::testutils::*;
+  use crate::utils::stdioutils;
+  use crate::config::Config;
 
   use chrono::{Local, TimeZone};
 
diff --git a/src/actions/copy.rs b/src/actions/copy.rs
index ca6dda4..3aaeb8f 100644
--- a/src/actions/copy.rs
+++ b/src/actions/copy.rs
@@ -1,8 +1,8 @@
-use input;
-use utils::fileutil;
-use utils::misc;
+use crate::input;
+use crate::utils::fileutil;
+use crate::utils::misc;
 
-use KhResult;
+use crate::KhResult;
 
 pub fn do_copy(_args: &[&str]) -> KhResult<()> {
   let khline = input::default_input_khline()?;
@@ -24,9 +24,9 @@ mod integration {
   use super::*;
 
   use assert_fs::prelude::*;
-  use khline::KhLine;
-  use testutils::prepare_testdir;
-  use utils::stdioutils;
+  use crate::khline::KhLine;
+  use crate::testutils::prepare_testdir;
+  use crate::utils::stdioutils;
   use predicates::prelude::*;
 
   #[test]
diff --git a/src/actions/cursor.rs b/src/actions/cursor.rs
index 3ee7615..b8e878e 100644
--- a/src/actions/cursor.rs
+++ b/src/actions/cursor.rs
@@ -1,9 +1,9 @@
 extern crate atty;
 
-use cursorfile;
-use utils::stdioutils;
-use KhResult;
-use seqfile;
+use crate::cursorfile;
+use crate::utils::stdioutils;
+use crate::KhResult;
+use crate::seqfile;
 
 enum Direction {
   Up,
@@ -77,7 +77,7 @@ fn cursor_sequence_move(direction: &Direction) -> KhResult<()> {
 mod integration {
   use super::*;
 
-  use testutils;
+  use crate::testutils;
   use assert_fs::prelude::*;
   use predicates::prelude::*;
 
diff --git a/src/actions/edit.rs b/src/actions/edit.rs
index faf90b4..b3720a9 100644
--- a/src/actions/edit.rs
+++ b/src/actions/edit.rs
@@ -1,11 +1,11 @@
 use tempfile::NamedTempFile;
 
-use backup::backup;
-use edit;
-use input;
-use khline::KhLine;
-use utils::fileutil;
-use KhResult;
+use crate::backup::backup;
+use crate::edit;
+use crate::input;
+use crate::khline::KhLine;
+use crate::utils::fileutil;
+use crate::KhResult;
 
 pub fn do_edit(_args: &[&str]) -> KhResult<()> {
   let khline = input::default_input_khline()?;
@@ -33,8 +33,8 @@ fn edit(khline: &KhLine) -> KhResult<()> {
 mod integration {
   use super::*;
 
-  use testutils::prepare_testdir;
-  use icalwrap::IcalComponent;
+  use crate::testutils::prepare_testdir;
+  use crate::icalwrap::IcalComponent;
 
   #[test]
   fn edit_test() {
diff --git a/src/actions/get.rs b/src/actions/get.rs
index 2d1f0ca..8877bb7 100644
--- a/src/actions/get.rs
+++ b/src/actions/get.rs
@@ -1,5 +1,5 @@
-use calendars;
-use KhResult;
+use crate::calendars;
+use crate::KhResult;
 
 pub fn action_get(args: &[&str]) -> KhResult<()> {
   if args.is_empty() {
@@ -23,8 +23,8 @@ pub fn action_get_calendars() -> KhResult<()> {
 mod integration {
   use super::*;
 
-  use testutils;
-  use utils::stdioutils;
+  use crate::testutils;
+  use crate::utils::stdioutils;
 
   #[test]
   fn test_get_calendars() {
diff --git a/src/actions/index/action.rs b/src/actions/index/action.rs
index 2e27bb0..ddf77ee 100644
--- a/src/actions/index/action.rs
+++ b/src/actions/index/action.rs
@@ -1,17 +1,17 @@
 use chrono::prelude::*;
-use icalwrap::*;
+use crate::icalwrap::*;
 use std::collections::HashMap;
 use std::fs;
 use std::path::{Path,PathBuf};
 use std::time::SystemTime;
 use walkdir::DirEntry;
 
-use defaults::*;
+use crate::defaults::*;
 use super::indextime;
-use utils::fileutil;
-use utils::lock;
-use utils::misc;
-use KhResult;
+use crate::utils::fileutil;
+use crate::utils::lock;
+use crate::utils::misc;
+use crate::KhResult;
 
 pub fn action_index(mut args: &[&str]) -> KhResult<()> {
   let reindex = !args.is_empty() && args[0] == "--reindex";
@@ -115,7 +115,7 @@ fn read_buckets(ics_files: impl Iterator<Item = PathBuf>) -> HashMap<String, Vec
       Ok(content) => {
         total_files += 1;
         match IcalVCalendar::from_str(&content, Some(&file)) {
-          Ok(mut cal) => add_buckets_for_calendar(&mut buckets, &cal),
+          Ok(cal) => add_buckets_for_calendar(&mut buckets, &cal),
           Err(error) => error!("{:?}: {}", file, error)
         }
       }
@@ -163,7 +163,7 @@ fn prepare_index_dir(indexdir: &Path, clear_index_dir: bool) -> Result<(), std::
 mod integration {
   use super::*;
 
-  use testutils::prepare_testdir;
+  use crate::testutils::prepare_testdir;
   use assert_fs::prelude::*;
 
   #[test]
diff --git a/src/actions/index/bucketable.rs b/src/actions/index/bucketable.rs
index 1125b1c..9eaa812 100644
--- a/src/actions/index/bucketable.rs
+++ b/src/actions/index/bucketable.rs
@@ -2,9 +2,9 @@ use chrono::{Local, Date, Datelike, Duration};
 use std::collections::HashMap;
 use std::{hash, cmp};
 
-use icalwrap::{IcalVEvent, IcalVCalendar};
-use utils::misc;
-use khline::KhLine;
+use crate::icalwrap::{IcalVEvent, IcalVCalendar};
+use crate::utils::misc;
+use crate::khline::KhLine;
 
 pub trait Bucketable {
   fn get_buckets(&self) -> Result<HashMap<String, Vec<String>>, String>;
@@ -107,7 +107,7 @@ mod tests {
 
   #[test]
   fn buckets_multi_day_allday() {
-    use testdata;
+    use crate::testdata;
     use std::path::PathBuf;
 
     let path = PathBuf::from("test/path");
@@ -127,7 +127,7 @@ mod tests {
 
   #[test]
   fn buckets_single_event() {
-    use testdata;
+    use crate::testdata;
     use std::path::PathBuf;
 
     let path = PathBuf::from("test/path");
@@ -139,7 +139,7 @@ mod tests {
 
   #[test]
   fn buckets_simple_recurring_event() {
-    use testdata;
+    use crate::testdata;
     use std::path::PathBuf;
 
     let path = PathBuf::from("test/path");
diff --git a/src/actions/index/indextime.rs b/src/actions/index/indextime.rs
index b078b2f..6d56688 100644
--- a/src/actions/index/indextime.rs
+++ b/src/actions/index/indextime.rs
@@ -2,7 +2,7 @@ use std::fs;
 use std::io::{Read,Write};
 use chrono::prelude::*;
 
-use defaults::*;
+use crate::defaults::*;
 
 pub fn write_index_time(index_time: &DateTime<Utc>) {
   let mut timefile = fs::File::create(get_indextimefile()).unwrap();
@@ -21,7 +21,7 @@ pub fn get_index_time() -> Option<DateTime<Utc>> {
 mod tests {
   use super::*;
 
-  use testutils;
+  use crate::testutils;
   use assert_fs::prelude::*;
 
   #[test]
diff --git a/src/actions/list.rs b/src/actions/list.rs
index 93fb9af..b7958b1 100644
--- a/src/actions/list.rs
+++ b/src/actions/list.rs
@@ -1,6 +1,6 @@
-use selectors::SelectFilters;
-use input;
-use KhResult;
+use crate::selectors::SelectFilters;
+use crate::input;
+use crate::KhResult;
 
 pub fn list_by_args(args: &[&str]) -> KhResult<()> {
   let lines = input::default_input_khlines()?;
diff --git a/src/actions/modify.rs b/src/actions/modify.rs
index c246b9c..72554e6 100644
--- a/src/actions/modify.rs
+++ b/src/actions/modify.rs
@@ -1,5 +1,5 @@
-use input;
-use KhResult;
+use crate::input;
+use crate::KhResult;
 
 pub fn do_modify(args: &[&str]) -> KhResult<()> {
   info!("do_modify");
diff --git a/src/actions/new.rs b/src/actions/new.rs
index 863eeb7..48ecfc6 100644
--- a/src/actions/new.rs
+++ b/src/actions/new.rs
@@ -1,11 +1,11 @@
-use defaults;
-use icalwrap::{IcalVCalendar,IcalTime,IcalTimeZone};
-use khline::KhLine;
-use utils::{misc,fileutil};
+use crate::defaults;
+use crate::icalwrap::{IcalVCalendar,IcalTime,IcalTimeZone};
+use crate::khline::KhLine;
+use crate::utils::{misc,fileutil};
 
-use KhResult;
-use cursorfile;
-use calendars;
+use crate::KhResult;
+use crate::cursorfile;
+use crate::calendars;
 
 struct EventProperties {
   calendar: String,
@@ -127,8 +127,8 @@ mod integration {
   use predicates::prelude::*;
 
   use super::*;
-  use testutils;
-  use testdata;
+  use crate::testutils;
+  use crate::testdata;
 
   #[test]
   fn test_parse_calendar() {
diff --git a/src/actions/prettyprint.rs b/src/actions/prettyprint.rs
index a64c15f..51a0251 100644
--- a/src/actions/prettyprint.rs
+++ b/src/actions/prettyprint.rs
@@ -1,7 +1,7 @@
-use icalwrap::{IcalComponent,IcalProperty};
+use crate::icalwrap::{IcalComponent,IcalProperty};
 use std::path::Path;
-use input;
-use KhResult;
+use crate::input;
+use crate::KhResult;
 
 pub fn prettyprint() -> KhResult<()> {
   let lines = input::default_input_khlines()?;
diff --git a/src/actions/select.rs b/src/actions/select.rs
index c141003..67697a5 100644
--- a/src/actions/select.rs
+++ b/src/actions/select.rs
@@ -1,10 +1,10 @@
 use std::path::PathBuf;
 
-use defaults;
-use selectors::{SelectFilters,daterange::SelectFilterFrom,daterange::SelectFilterTo};
-use utils::fileutil as utils;
-use khline::KhLine;
-use KhResult;
+use crate::defaults;
+use crate::selectors::{SelectFilters,daterange::SelectFilterFrom,daterange::SelectFilterTo};
+use crate::utils::fileutil as utils;
+use crate::khline::KhLine;
+use crate::KhResult;
 
 impl SelectFilters {
   fn predicate_path_skip_while(&self) -> impl Fn(&PathBuf) -> bool + '_ {
diff --git a/src/actions/seq.rs b/src/actions/seq.rs
index 1b12751..83487ce 100644
--- a/src/actions/seq.rs
+++ b/src/actions/seq.rs
@@ -1,6 +1,6 @@
-use seqfile;
-use utils::stdioutils;
-use KhResult;
+use crate::seqfile;
+use crate::utils::stdioutils;
+use crate::KhResult;
 
 pub fn action_seq(_args: &[&str]) -> KhResult<()> {
   if !stdioutils::is_stdin_tty() {
@@ -39,8 +39,8 @@ mod integration {
 
   use assert_fs::prelude::*;
   use predicates::prelude::*;
-  use testutils;
-  use utils::stdioutils;
+  use crate::testutils;
+  use crate::utils::stdioutils;
 
   #[test]
   fn test_with_stdin() {
diff --git a/src/actions/show.rs b/src/actions/show.rs
index 7b0ccb1..2f9b8a7 100644
--- a/src/actions/show.rs
+++ b/src/actions/show.rs
@@ -1,6 +1,6 @@
-use input;
-use utils::fileutil;
-use KhResult;
+use crate::input;
+use crate::utils::fileutil;
+use crate::KhResult;
 
 pub fn do_show(_args: &[&str]) -> KhResult<()> {
   info!("do_show");
@@ -18,8 +18,8 @@ pub fn do_show(_args: &[&str]) -> KhResult<()> {
 mod integration {
   use super::*;
 
-  use testutils::*;
-  use utils::stdioutils::*;
+  use crate::testutils::*;
+  use crate::utils::stdioutils::*;
 
   #[test]
   fn test_() {
diff --git a/src/actions/unroll.rs b/src/actions/unroll.rs
index d3eebbd..16a9c31 100644
--- a/src/actions/unroll.rs
+++ b/src/actions/unroll.rs
@@ -1,7 +1,7 @@
 use std::path::Path;
 
-use khline::KhLine;
-use KhResult;
+use crate::khline::KhLine;
+use crate::KhResult;
 
 pub fn action_unroll(args: &[&str]) -> KhResult<()> {
   let file = &args[0];
diff --git a/src/backup.rs b/src/backup.rs
index e1a4e5b..35bc1e3 100644
--- a/src/backup.rs
+++ b/src/backup.rs
@@ -3,8 +3,8 @@ use std::fs;
 use chrono::Local;
 use std::path::{Path,PathBuf};
 
-use defaults;
-use khline::KhLine;
+use crate::defaults;
+use crate::khline::KhLine;
 
 pub fn backup(khline: &KhLine) -> io::Result<PathBuf> {
   let backupdir = defaults::get_backupdir();
@@ -42,7 +42,7 @@ fn prepare_backup_dir(backupdir: &Path) -> io::Result<()> {
 mod tests {
   use super::*;
 
-  use testutils::prepare_testdir;
+  use crate::testutils::prepare_testdir;
   use assert_fs::prelude::*;
   use predicates::prelude::*;
 
diff --git a/src/calendars.rs b/src/calendars.rs
index 950cb55..3b861d4 100644
--- a/src/calendars.rs
+++ b/src/calendars.rs
@@ -1,5 +1,5 @@
-use utils::fileutil;
-use defaults;
+use crate::utils::fileutil;
+use crate::defaults;
 
 pub fn calendar_list() -> Vec<String> {
   let caldir = defaults::get_caldir();
@@ -20,7 +20,7 @@ pub fn calendar_list() -> Vec<String> {
 mod tests {
   use super::*;
 
-  use testutils;
+  use crate::testutils;
 
   #[test]
   fn test() {
diff --git a/src/config.rs b/src/config.rs
index 89258a8..df96b12 100644
--- a/src/config.rs
+++ b/src/config.rs
@@ -2,8 +2,8 @@ use std::collections::HashMap;
 use toml;
 use yansi::{self,Style,Color};
 
-use defaults;
-use utils::fileutil as utils;
+use crate::defaults;
+use crate::utils::fileutil as utils;
 
 #[derive(Deserialize,Debug,PartialEq)]
 #[serde(default)]
@@ -69,7 +69,7 @@ impl Default for Config {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use testutils;
+  use crate::testutils;
 
   #[test]
   fn test_read_config_none() {
diff --git a/src/cursorfile.rs b/src/cursorfile.rs
index 92dcf17..43c9979 100644
--- a/src/cursorfile.rs
+++ b/src/cursorfile.rs
@@ -1,10 +1,10 @@
 use std::fs::rename;
 use std::io;
 
-use defaults::*;
-use khline::KhLine;
-use utils::fileutil;
-use KhResult;
+use crate::defaults::*;
+use crate::khline::KhLine;
+use crate::utils::fileutil;
+use crate::KhResult;
 
 pub fn write_cursorfile(line: &str) -> KhResult<()> {
   let tmpfilename = get_datafile("tmpcursor");
@@ -34,10 +34,10 @@ mod tests {
 
   use std::fs;
 
-  use testutils::*;
+  use crate::testutils::*;
   use assert_fs::prelude::*;
   use predicates::prelude::*;
-  use utils::fileutil;
+  use crate::utils::fileutil;
 
   #[test]
   fn read_cursorfile_ok() {
diff --git a/src/edit.rs b/src/edit.rs
index cc763f4..c1e94e7 100644
--- a/src/edit.rs
+++ b/src/edit.rs
@@ -3,9 +3,9 @@ use std::fs;
 use std::path::Path;
 use std::process::Command;
 
-use khline::KhLine;
-use KhResult;
-use utils::stdioutils;
+use crate::khline::KhLine;
+use crate::KhResult;
+use crate::utils::stdioutils;
 
 pub fn edit_loop(path: &Path) -> KhResult<()> {
   loop {
diff --git a/src/icalwrap/icalcomponent.rs b/src/icalwrap/icalcomponent.rs
index 43aeacc..4da7eba 100644
--- a/src/icalwrap/icalcomponent.rs
+++ b/src/icalwrap/icalcomponent.rs
@@ -1,7 +1,7 @@
 use std::ffi::CString;
 
 use super::IcalProperty;
-use ical;
+use crate::ical;
 
 pub trait IcalComponent {
   fn get_ptr(&self) -> *mut ical::icalcomponent;
@@ -77,8 +77,8 @@ pub trait IcalComponent {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use testdata;
-  use icalwrap::IcalVCalendar;
+  use crate::testdata;
+  use crate::icalwrap::IcalVCalendar;
 
   #[test]
   fn get_property_test() {
diff --git a/src/icalwrap/icalduration.rs b/src/icalwrap/icalduration.rs
index ad6646d..7ad1d13 100644
--- a/src/icalwrap/icalduration.rs
+++ b/src/icalwrap/icalduration.rs
@@ -1,6 +1,6 @@
 use std::ops::{Deref,Add};
 use std::ffi::{CStr,CString};
-use ical;
+use crate::ical;
 use std::fmt::{Error,Display,Formatter};
 use std::str::FromStr;
 use std::cmp::Ordering;
diff --git a/src/icalwrap/icalproperty.rs b/src/icalwrap/icalproperty.rs
index 85bad3d..ad903c1 100644
--- a/src/icalwrap/icalproperty.rs
+++ b/src/icalwrap/icalproperty.rs
@@ -3,7 +3,7 @@ use std::ffi::CStr;
 use std::fmt;
 
 use super::icalcomponent::IcalComponent;
-use ical;
+use crate::ical;
 
 pub struct IcalProperty<'a> {
   pub ptr: *mut ical::icalproperty,
diff --git a/src/icalwrap/icaltime.rs b/src/icalwrap/icaltime.rs
index cfd79ec..18a2b80 100644
--- a/src/icalwrap/icaltime.rs
+++ b/src/icalwrap/icaltime.rs
@@ -1,8 +1,8 @@
 use std::ops::{Add,Deref};
 use std::ffi::{CStr,CString};
 use chrono::{Date,DateTime,TimeZone,Utc,Local};
-use ical;
-use utils::dateutil;
+use crate::ical;
+use crate::utils::dateutil;
 use super::IcalTimeZone;
 use super::IcalDuration;
 use super::TZ_MUTEX;
@@ -227,7 +227,7 @@ impl From<IcalTime> for DateTime<Utc> {
 mod tests {
   use super::*;
 
-  use testdata;
+  use crate::testdata;
 
   #[test]
   fn test_now() {
diff --git a/src/icalwrap/icaltimezone.rs b/src/icalwrap/icaltimezone.rs
index 465c2b1..90fe4cf 100644
--- a/src/icalwrap/icaltimezone.rs
+++ b/src/icalwrap/icaltimezone.rs
@@ -1,8 +1,8 @@
 use std::ops::Deref;
 use std::ffi::{CString,CStr};
-use ical;
+use crate::ical;
 
-use utils::dateutil;
+use crate::utils::dateutil;
 use super::IcalTime;
 
 pub struct IcalTimeZone {
@@ -73,7 +73,7 @@ impl IcalTimeZone {
 mod tests {
   use super::*;
 
-  use testdata;
+  use crate::testdata;
 
   #[test]
   fn test_utc() {
diff --git a/src/icalwrap/icalvcalendar.rs b/src/icalwrap/icalvcalendar.rs
index 0dd0b49..cb9753b 100644
--- a/src/icalwrap/icalvcalendar.rs
+++ b/src/icalwrap/icalvcalendar.rs
@@ -6,7 +6,7 @@ use std::io;
 use super::IcalVEvent;
 use super::IcalComponent;
 use super::IcalTime;
-use ical;
+use crate::ical;
 
 pub struct IcalVCalendar {
   comp: Rc<IcalComponentOwner>,
@@ -367,7 +367,7 @@ impl Drop for IcalComponentOwner {
 #[cfg(test)]
 mod tests {
   use super::*;
-  use testdata;
+  use crate::testdata;
 
   #[test]
   fn test_from_str_empty() {
diff --git a/src/icalwrap/icalvevent.rs b/src/icalwrap/icalvevent.rs
index 15bd9c0..fdaa487 100644
--- a/src/icalwrap/icalvevent.rs
+++ b/src/icalwrap/icalvevent.rs
@@ -5,7 +5,7 @@ use super::IcalVCalendar;
 use super::IcalTime;
 use super::IcalTimeZone;
 use super::IcalDuration;
-use ical;
+use crate::ical;
 
 pub struct IcalVEvent {
   ptr: *mut ical::icalcomponent,
@@ -219,7 +219,7 @@ extern "C" fn recur_callback(
 #[cfg(test)]
 mod tests {
   use super::*;
-  use testdata;
+  use crate::testdata;
   use chrono::NaiveDate;
 
   #[test]
diff --git a/src/input.rs b/src/input.rs
index a969f6e..44e3244 100644
--- a/src/input.rs
+++ b/src/input.rs
@@ -1,11 +1,11 @@
 use std::io;
 
-use seqfile;
-use cursorfile;
-use khline::{KhLine,khlines_to_events,lines_to_khlines};
-use utils::stdioutils;
-use icalwrap::IcalVEvent;
-use selectors::SelectFilters;
+use crate::seqfile;
+use crate::cursorfile;
+use crate::khline::{KhLine,lines_to_khlines,khlines_to_events};
+use crate::utils::stdioutils;
+use crate::icalwrap::IcalVEvent;
+use crate::selectors::SelectFilters;
 
 pub fn selection(args: &[&str]) -> Result<Box<dyn Iterator<Item = IcalVEvent>>, String> {
   if args.is_empty() {
@@ -60,7 +60,7 @@ pub fn default_input_khline() -> io::Result<KhLine> {
 mod tests {
   use super::*;
 
-  use utils::stdioutils;
+  use crate::utils::stdioutils;
 
   #[test]
   fn test_default_input_khline() {
diff --git a/src/khline.rs b/src/khline.rs
index c60c5a8..314cdde 100644
--- a/src/khline.rs
+++ b/src/khline.rs
@@ -3,9 +3,9 @@ use std::io;
 use std::path::{PathBuf,Path};
 use std::str::FromStr;
 
-use icalwrap::{IcalVCalendar,IcalVEvent,IcalTime};
-use utils::{fileutil,dateutil};
-use defaults;
+use crate::icalwrap::{IcalVCalendar,IcalVEvent,IcalTime};
+use crate::utils::{fileutil,dateutil};
+use crate::defaults;
 
 #[derive(PartialEq,Eq,Debug)]
 pub struct KhLine {
@@ -136,9 +136,9 @@ mod tests {
 
   use assert_fs::prelude::*;
 
-  use testdata;
-  use testutils::*;
-  use icalwrap::IcalVCalendar;
+  use crate::testdata;
+  use crate::testutils::*;
+  use crate::icalwrap::IcalVCalendar;
 
   #[test]
   fn test_parse_absolute() {
diff --git a/src/macros.rs b/src/macros.rs
index 2dc64da..911ac85 100644
--- a/src/macros.rs
+++ b/src/macros.rs
@@ -15,7 +15,7 @@ macro_rules! khprint {
 macro_rules! khprintln {
   () => ({
     #[cfg(test)] {
-      use utils::stdioutils;
+      use crate::utils::stdioutils;
       stdioutils::test_stdout_write("\n");
     }
     println!();
@@ -23,7 +23,7 @@ macro_rules! khprintln {
   ($($arg:tt)*) => ({
     let line = format!($($arg)*);
     #[cfg(test)] {
-      use utils::stdioutils;
+      use crate::utils::stdioutils;
       stdioutils::test_stdout_write(&line);
       stdioutils::test_stdout_write("\n");
     }
diff --git a/src/selectors/cal.rs b/src/selectors/cal.rs
index 234cdb2..9567742 100644
--- a/src/selectors/cal.rs
+++ b/src/selectors/cal.rs
@@ -1,6 +1,6 @@
 use super::*;