update to 2018 edition

2 files changed, 71 insertions, 52 deletions

diff --git a/benches/maildir.rs b/benches/maildir.rs
index c83ecd72..2b970769 100644
--- a/benches/maildir.rs
+++ b/benches/maildir.rs
@@ -1,43 +1,62 @@
-#![feature(test)]
-extern crate melib;
-use melib::conf::Folder;
-use melib::mailbox::backends::maildir::*;
-
-extern crate test;
-use self::test::Bencher;
-
-#[bench]
-fn bench_threads_1(b: &mut Bencher) {
-    b.iter(|| {
-        let folder = Folder::new(String::from(""), String::from(""), vec![]);
-        MaildirType::new("").multicore(1, &folder)
-    });
-}
-#[bench]
-fn bench_threads_2(b: &mut Bencher) {
-    b.iter(|| {
-        let folder = Folder::new(String::from(""), String::from(""), vec![]);
-        MaildirType::new("").multicore(2, &folder)
-    });
-}
-#[bench]
-fn bench_threads_3(b: &mut Bencher) {
-    b.iter(|| {
-        let folder = Folder::new(String::from(""), String::from(""), vec![]);
-        MaildirType::new("").multicore(3, &folder)
-    });
-}
-#[bench]
-fn bench_threads_4(b: &mut Bencher) {
-    b.iter(|| {
-        let folder = Folder::new(String::from(""), String::from(""), vec![]);
-        MaildirType::new("").multicore(4, &folder)
-    });
-}
-#[bench]
-fn bench_threads_6(b: &mut Bencher) {
-    b.iter(|| {
-        let folder = Folder::new(String::from(""), String::from(""), vec![]);
-        MaildirType::new("").multicore(6, &folder)
-    });
-}
+//#![feature(test)]
+//use melib::conf::AccountSettings;
+//use melib::mailbox::backends::maildir::*;
+//
+//extern crate test;
+//use self::test::Bencher;
+//
+//#[bench]
+//fn bench_threads_1(b: &mut Bencher) {
+//    b.iter(|| {
+//        let folder = Folder::new(
+//            String::from(""),
+//            String::from(""),
+//            vec![],
+//        );
+//        MaildirType::new("").multicore(1, &folder)
+//    });
+//}
+//#[bench]
+//fn bench_threads_2(b: &mut Bencher) {
+//    b.iter(|| {
+//        let folder = Folder::new(
+//            String::from(""),
+//            String::from(""),
+//            vec![],
+//        );
+//        MaildirType::new("").multicore(2, &folder)
+//    });
+//}
+//#[bench]
+//fn bench_threads_3(b: &mut Bencher) {
+//    b.iter(|| {
+//        let folder = Folder::new(
+//            String::from(""),
+//            String::from(""),
+//            vec![],
+//        );
+//        MaildirType::new("").multicore(3, &folder)
+//    });
+//}
+//#[bench]
+//fn bench_threads_4(b: &mut Bencher) {
+//    b.iter(|| {
+//        let folder = Folder::new(
+//            String::from(""),
+//            String::from(""),
+//            vec![],
+//        );
+//        MaildirType::new("").multicore(4, &folder)
+//    });
+//}
+//#[bench]
+//fn bench_threads_6(b: &mut Bencher) {
+//    b.iter(|| {
+//        let folder = Folder::new(
+//            String::from(""),
+//            String::from(""),
+//            vec![],
+//        );
+//        MaildirType::new("").multicore(6, &folder)
+//    });
+//}
diff --git a/benches/parse.rs b/benches/parse.rs
index e389841e..d5a07214 100644
--- a/benches/parse.rs
+++ b/benches/parse.rs
@@ -1,12 +1,12 @@
-#![feature(test)]
-extern crate melib;
-
-use melib::mailbox::backends::maildir::MaildirOp;
-use melib::mailbox::backends::BackendOpGenerator;
-use melib::mailbox::email::Envelope;
-
-extern crate test;
-use self::test::Bencher;
+//#![feature(test)]
+//extern crate melib;
+//
+//use melib::mailbox::backends::maildir::MaildirOp;
+//use melib::mailbox::backends::BackendOpGenerator;
+//use melib::mailbox::email::Envelope;
+//
+//extern crate test;
+//use self::test::Bencher;
 
 /*
 #[bench]