this seems to compile even in 2018 mode

Cargo.toml

@@ -3,6 +3,7 @@ cargo-features = ["default-run"]
 [package]
 name = "kirby"
 version = "0.1.0"
+edition = "2018"
 authors = ["André Arko <andre@arko.net>"]
 repository = "https://rubytogether.org/kirby"
 default-run = "kirby"

src/bin/kirby-s3.rs

@@ -3,26 +3,22 @@ extern crate log;
 #[macro_use]
 extern crate serde_json;
 
-extern crate aws_lambda as lambda;
-extern crate flate2;
-extern crate futures;
 extern crate kirby;
-extern crate rusoto_core;
-extern crate rusoto_s3;
-extern crate time;
 
+use aws_lambda as lambda;
+use crate::lambda::event::s3::S3Event;
 use flate2::read::GzDecoder;
 use futures::stream::Stream;
 use futures::Future;
-use kirby::stream_stats;
 use kirby::Options;
-use crate::lambda::event::s3::S3Event;
 use rusoto_core::region::Region;
 use rusoto_s3::*;
 use std::io::BufRead;
 use std::io::BufReader;
 use std::io::Cursor;
 
+use kirby::stream_stats;
+
 fn read_object(bucket_name: &str, key: &str) -> Box<BufRead> {
   let get_req = GetObjectRequest {
     bucket: bucket_name.to_owned(),

src/lib.rs

@@ -6,13 +6,6 @@ extern crate lazy_static;
 extern crate serde_derive;
 #[macro_use]
 extern crate enum_map;
-extern crate flate2;
-extern crate hashbrown;
-extern crate nom;
-extern crate regex;
-extern crate serde;
-extern crate serde_json;
-extern crate test;
 
 use enum_map::EnumMap;
 use hashbrown::HashMap;
@@ -59,7 +52,7 @@ pub fn combine_stats(left: &TimeMap, right: &TimeMap) -> TimeMap {
       .entry(time.to_string())
       .or_insert(enum_map!{_ => HashMap::default()});
     for (name, versions) in names {
-      let mut left_versions = &mut left_names[name];
+      let left_versions = &mut left_names[name];
       for (version, count) in versions {
         let left_count = left_versions.entry(version.to_string()).or_insert(0);
         *left_count += count;