Permalink
Browse files

this seems to compile even in 2018 mode

  • Loading branch information...
indirect committed Nov 29, 2018
1 parent d9a9a58 commit 1571ff116c4920bea596186b3f1cbbb397af548e
Showing with 6 additions and 16 deletions.
  1. +1 −0 Cargo.toml
  2. +4 −8 src/bin/kirby-s3.rs
  3. +1 −8 src/lib.rs
@@ -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"
@@ -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(),
@@ -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;

0 comments on commit 1571ff1

Please sign in to comment.