Merge pull request #52 from eldruin/code-formatting

Format code and check formatting on CI

Author: posborne

.travis.yml

@@ -6,5 +6,7 @@ os:
 - osx
 
 script:
+- rustup component add rustfmt
 - cargo build --verbose
 - if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then cargo test --verbose; fi
+- cargo fmt -- --check

examples/nunchuck.rs

@@ -22,9 +22,9 @@ use i2cdev::linux::*;
 #[cfg(any(target_os = "linux", taret_os = "android"))]
 mod nunchuck {
     use std::error::Error;
+    use std::fmt;
     use std::thread;
     use std::time::Duration;
-    use std::fmt;
 
     use i2cdev::core::I2CDevice;
 
@@ -130,11 +130,10 @@ mod nunchuck {
             let mut buf: [u8; 6] = [0; 6];
 
             // tell the nunchuck to prepare a sample
-            try!(
-                self.i2cdev
-                    .smbus_write_byte(0x00)
-                    .map_err(NunchuckError::Error)
-            );
+            try!(self
+                .i2cdev
+                .smbus_write_byte(0x00)
+                .map_err(NunchuckError::Error));
 
             // now, read it!
             thread::sleep(Duration::from_millis(10));
@@ -196,8 +195,8 @@ mod nunchuck {
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use nunchuck::*;
 
-use std::env::args;
 use docopt::Docopt;
+use std::env::args;
 
 const USAGE: &'static str = "
 Reading Wii Nunchuck data via Linux i2cdev.

examples/pca9956b.rs

@@ -6,16 +6,16 @@
 // option.  This file may not be copied, modified, or distributed
 // except according to those terms.extern crate i2cdev;
 
-extern crate i2cdev;
 extern crate docopt;
+extern crate i2cdev;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
-use i2cdev::core::{I2CTransfer, I2CMessage};
+use i2cdev::core::{I2CMessage, I2CTransfer};
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use i2cdev::linux::{LinuxI2CBus, LinuxI2CMessage};
 
-use std::env::args;
 use docopt::Docopt;
+use std::env::args;
 
 const USAGE: &str = "
 Reads registers from a PCA9956B IC via Linux i2cdev.

examples/sensors.rs

@@ -17,13 +17,13 @@ extern crate byteorder;
 extern crate docopt;
 extern crate i2cdev;
 
-use std::thread;
-use std::time::Duration;
-use std::env::args;
 use docopt::Docopt;
-use sensors::{Accelerometer, Barometer, Thermometer};
-use sensors::mpl115a2_barometer::*;
 use sensors::adxl345_accelerometer::*;
+use sensors::mpl115a2_barometer::*;
+use sensors::{Accelerometer, Barometer, Thermometer};
+use std::env::args;
+use std::thread;
+use std::time::Duration;
 
 #[cfg(any(target_os = "linux", target_os = "android"))]
 use i2cdev::linux::*;
@@ -101,8 +101,8 @@ mod sensors {
 
     pub mod adxl345_accelerometer {
         use super::*;
-        use i2cdev::core::I2CDevice;
         use byteorder::{ByteOrder, LittleEndian};
+        use i2cdev::core::I2CDevice;
 
         // TODO: read/write data format (for now, assumed 0x00)
 
@@ -173,12 +173,8 @@ mod sensors {
                 i2cdev.smbus_write_byte_data(REGISTER_POWER_CTL, 0x00)?;
 
                 // configure some defaults
-                try!(
-                    i2cdev.smbus_write_byte_data(
-                        REGISTER_BW_RATE,
-                        ADXL345DataRate::RATE_1600HZ as u8
-                    )
-                );
+                try!(i2cdev
+                    .smbus_write_byte_data(REGISTER_BW_RATE, ADXL345DataRate::RATE_1600HZ as u8));
                 i2cdev.smbus_write_byte_data(REGISTER_DATA_FORMAT, 0x08)?;
                 i2cdev.smbus_write_byte_data(REGISTER_OFSX, 0xFD)?;
                 i2cdev.smbus_write_byte_data(REGISTER_OFSY, 0x03)?;
@@ -226,11 +222,11 @@ mod sensors {
 
     pub mod mpl115a2_barometer {
         use super::*;
+        use byteorder::{BigEndian, ByteOrder};
+        use i2cdev::core::I2CDevice;
+        use std::error::Error;
         use std::thread;
         use std::time::Duration;
-        use std::error::Error;
-        use i2cdev::core::I2CDevice;
-        use byteorder::{BigEndian, ByteOrder};
 
         pub const MPL115A2_I2C_ADDR: u16 = 0x60; // appears to always be this
 
@@ -398,29 +394,31 @@ mod sensors {
 
         #[cfg(test)]
         mod tests {
-            use super::*;
             use super::calc_coefficient;
-            use sensors::*;
+            use super::*;
             use mock::MockI2CDevice;
+            use sensors::*;
 
             macro_rules! assert_almost_eq {
-                ($left:expr, $right:expr) => ({
+                ($left:expr, $right:expr) => {{
                     match (&($left), &($right)) {
                         (left_val, right_val) => {
                             if (*left_val - *right_val).abs() > 0.0001 {
                                 panic!("assertion failed: ({:?} != {:?})", *left_val, *right_val);
                             }
                         }
                     }
-                })
+                }};
             }
 
             fn make_dev(mut i2cdev: MockI2CDevice) -> MPL115A2BarometerThermometer<MockI2CDevice> {
                 (&mut i2cdev.regmap).write_regs(
                     0x04,
                     &[
-                        74, 98 /* A0 */, 165, 150 /* B1 */, 182, 106 /* B2 */, 63,
-                        232,
+                        74, 98, /* A0 */
+                        165, 150, /* B1 */
+                        182, 106, /* B2 */
+                        63, 232,
                     ],
                 ); // C12
                 MPL115A2BarometerThermometer::new(i2cdev).unwrap()
@@ -455,7 +453,6 @@ mod sensors {
                 let mut dev = make_dev(i2cdev);
                 assert_almost_eq!(dev.temperature_celsius().unwrap(), 21.448599);
             }
-
         }
     }
 }

src/core.rs

@@ -105,7 +105,11 @@ pub trait I2CDevice {
     /// Write a block of up to 32 bytes from a device
     ///
     /// Uses write_i2c_block_data instead write_block_data.
-    fn smbus_write_i2c_block_data(&mut self, register: u8, values: &[u8]) -> Result<(), Self::Error>;
+    fn smbus_write_i2c_block_data(
+        &mut self,
+        register: u8,
+        values: &[u8],
+    ) -> Result<(), Self::Error>;
 
     /// Select a register, send 1 to 31 bytes of data to it, and reads
     /// 1 to 31 bytes of data from it.