From 1b3e72d9d8f1cdae89136184bd26bccc458ad6bb Mon Sep 17 00:00:00 2001
From: Andy Grove <andygrove73@gmail.com>
Date: Sun, 5 Aug 2018 09:40:06 -0600
Subject: [PATCH 1/2] Change argument to rust fmt to fix build

---
 ci/travis_script_rust.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ci/travis_script_rust.sh b/ci/travis_script_rust.sh
index ff12483ea644..f85820fdbc0a 100755
--- a/ci/travis_script_rust.sh
+++ b/ci/travis_script_rust.sh
@@ -25,7 +25,7 @@ pushd $RUST_DIR
 
 # raises on any formatting errors
 rustup component add rustfmt-preview
-cargo fmt --all -- --write-mode=diff
+cargo fmt --all -- --check
 # raises on any warnings
 cargo rustc -- -D warnings
 

From 94c12773736ff843c803e93a2b31a95b88225ed9 Mon Sep 17 00:00:00 2001
From: Andy Grove <andygrove73@gmail.com>
Date: Sun, 5 Aug 2018 09:54:15 -0600
Subject: [PATCH 2/2] Update code formatting to keep latest version of rust fmt
 happy

---
 rust/src/array.rs     |  7 ++-----
 rust/src/buffer.rs    | 15 ++++++++++-----
 rust/src/datatypes.rs | 13 ++++++++-----
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/rust/src/array.rs b/rust/src/array.rs
index e4185186383c..1c4322cddb50 100644
--- a/rust/src/array.rs
+++ b/rust/src/array.rs
@@ -19,9 +19,9 @@
 use std::any::Any;
 use std::convert::From;
 use std::ops::Add;
-use std::sync::Arc;
 use std::str;
 use std::string::String;
+use std::sync::Arc;
 
 use super::bitmap::Bitmap;
 use super::buffer::*;
@@ -453,12 +453,9 @@ mod tests {
     fn test_access_array_concurrently() {
         let a = PrimitiveArray::from(Buffer::from(vec![5, 6, 7, 8, 9]));
 
-        let ret = thread::spawn(move || {
-            a.iter().collect::<Vec<i32>>()
-        }).join();
+        let ret = thread::spawn(move || a.iter().collect::<Vec<i32>>()).join();
 
         assert!(ret.is_ok());
         assert_eq!(vec![5, 6, 7, 8, 9], ret.ok().unwrap());
     }
 }
-
diff --git a/rust/src/buffer.rs b/rust/src/buffer.rs
index 0fdc2c527adc..bdc36018f36f 100644
--- a/rust/src/buffer.rs
+++ b/rust/src/buffer.rs
@@ -190,7 +190,8 @@ mod tests {
     fn test_buffer_eq() {
         let a = Buffer::from(vec![1, 2, 3, 4, 5]);
         let b = Buffer::from(vec![5, 4, 3, 2, 1]);
-        let c = a.iter()
+        let c = a
+            .iter()
             .zip(b.iter())
             .map(|(a, b)| a == b)
             .collect::<Vec<bool>>();
@@ -201,7 +202,8 @@ mod tests {
     fn test_buffer_lt() {
         let a = Buffer::from(vec![1, 2, 3, 4, 5]);
         let b = Buffer::from(vec![5, 4, 3, 2, 1]);
-        let c = a.iter()
+        let c = a
+            .iter()
             .zip(b.iter())
             .map(|(a, b)| a < b)
             .collect::<Vec<bool>>();
@@ -212,7 +214,8 @@ mod tests {
     fn test_buffer_gt() {
         let a = Buffer::from(vec![1, 2, 3, 4, 5]);
         let b = Buffer::from(vec![5, 4, 3, 2, 1]);
-        let c = a.iter()
+        let c = a
+            .iter()
             .zip(b.iter())
             .map(|(a, b)| a > b)
             .collect::<Vec<bool>>();
@@ -223,7 +226,8 @@ mod tests {
     fn test_buffer_add() {
         let a = Buffer::from(vec![1, 2, 3, 4, 5]);
         let b = Buffer::from(vec![5, 4, 3, 2, 1]);
-        let c = a.iter()
+        let c = a
+            .iter()
             .zip(b.iter())
             .map(|(a, b)| a + b)
             .collect::<Vec<i32>>();
@@ -234,7 +238,8 @@ mod tests {
     fn test_buffer_multiply() {
         let a = Buffer::from(vec![1, 2, 3, 4, 5]);
         let b = Buffer::from(vec![5, 4, 3, 2, 1]);
-        let c = a.iter()
+        let c = a
+            .iter()
             .zip(b.iter())
             .map(|(a, b)| a * b)
             .collect::<Vec<i32>>();
diff --git a/rust/src/datatypes.rs b/rust/src/datatypes.rs
index d4849da4b2ce..2adec0bb0b77 100644
--- a/rust/src/datatypes.rs
+++ b/rust/src/datatypes.rs
@@ -278,11 +278,14 @@ impl Schema {
 
 impl fmt::Display for Schema {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        f.write_str(&self.columns
-            .iter()
-            .map(|c| c.to_string())
-            .collect::<Vec<String>>()
-            .join(", "))
+        f.write_str(
+            &self
+                .columns
+                .iter()
+                .map(|c| c.to_string())
+                .collect::<Vec<String>>()
+                .join(", "),
+        )
     }
 }