Merge pull request #27 from FabioBatSilva/nightly-2019-06-14

Upgrade to nightly-2019-06-14
FabioBatSilva · Jun 15, 2019 · fdce5f3 · fdce5f3
2 parents 4135122 + c86e601
commit fdce5f3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -1,7 +1,7 @@
 language: rust
 cache: cargo
 rust:
-- nightly-2019-04-26
+- nightly-2019-06-14
 
 env:
   global:

diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2019-04-26
+nightly-2019-06-14
diff --git a/src/api.rs b/src/api.rs
@@ -177,7 +177,7 @@ pub(in crate) mod tests {
 
     #[allow(clippy::borrowed_box)]
     fn write_simple_row_group(
-        row_group_writer: &mut Box<RowGroupWriter>,
+        row_group_writer: &mut Box<dyn RowGroupWriter>,
         vec: &[SimpleMessage],
     ) {
         write_next_col_writer!(row_group_writer, Int32ColumnWriter, vec, |m| {

diff --git a/src/output.rs b/src/output.rs
@@ -66,7 +66,7 @@ fn format_row(
 }
 
 fn write_tabular<W: Write>(
-    values: &mut Iterator<Item = Result<Vec<String>>>,
+    values: &mut dyn Iterator<Item = Result<Vec<String>>>,
     config: &OutputConfig,
     headers: &[String],
     out: &mut W,
@@ -90,7 +90,7 @@ fn write_tabular<W: Write>(
 }
 
 fn write_vertical<W: Write>(
-    values: &mut Iterator<Item = Result<Vec<String>>>,
+    values: &mut dyn Iterator<Item = Result<Vec<String>>>,
     config: &OutputConfig,
     headers: &[String],
     out: &mut W,
@@ -119,7 +119,7 @@ fn write_vertical<W: Write>(
 }
 
 fn write_csv<W: Write>(
-    values: &mut Iterator<Item = Result<Vec<String>>>,
+    values: &mut dyn Iterator<Item = Result<Vec<String>>>,
     config: &OutputConfig,
     headers: &[String],
     out: &mut W,

diff --git a/src/reader.rs b/src/reader.rs
@@ -83,7 +83,7 @@ fn get_row_filters(
                 .map(|t| ((t.1).1.to_lowercase(), t.0))
                 .collect::<HashMap<_, _>>();
 
-            for (field, regex) in filter_map.into_iter() {
+            for (field, regex) in filter_map.iter() {
                 if let Some(index) = field_map.get(&field.to_lowercase()) {
                     result.insert(*index, regex.clone());
                 }
@@ -272,7 +272,7 @@ where
     }
 
     fn next_row(
-        iter: &mut Iterator<Item = Row>,
+        iter: &mut dyn Iterator<Item = Row>,
         fields: &[(usize, String)],
         filters: &Option<HashMap<usize, Regex>>,
     ) -> Option<Result<Vec<String>>> {