Transitioning to CircleCI and running latest clippy and rustfmt

Connects-To: #105
Change-Type: patch

Author: majorz

.circleci/config.yml

@@ -0,0 +1,41 @@
+
+build: &build
+  docker:
+    - image: majorz/rust-$CIRCLE_JOB:rust-1.23.0
+  steps:
+    - checkout
+    - run: cargo build
+
+version: 2
+
+jobs:
+  aarch64:
+    <<: *build
+  rpi:
+    <<: *build
+  armv7hf:
+    <<: *build
+  i386:
+    <<: *build
+  amd64:
+    <<: *build
+  test:
+    docker:
+      - image: majorz/rust-test-deploy:rust-nightly-2018-01-08
+    steps:
+      - checkout
+      - run: cargo fmt -- --write-mode=diff
+      - run: cargo clippy -- -D warnings
+
+workflows:
+  version: 2
+  test:
+    jobs:
+      - test
+  build:
+    jobs:
+      - aarch64
+      - rpi
+      - armv7hf
+      - i386
+      - amd64

.editorconfig

@@ -8,3 +8,6 @@ indent_size = 4
 
 [*.md]
 trim_trailing_whitespace = false
+
+[*.yml]
+indent_size = 2

.travis.yml

@@ -1,24 +1,4 @@
-dist: trusty
-sudo: required
-language: rust
-cache: cargo
-rust:
-  - nightly
-  - beta
-  - stable
-before_install:
-  - sudo apt-get -qq update
-  - sudo apt-get install -yq --no-install-recommends libdbus-1-dev
-install:
-  - type -p cargo-install-update || cargo install cargo-update
-  - cargo install-update -i cargo-update
-  - cargo install-update -i rustfmt
-  - if [ $TRAVIS_RUST_VERSION == nightly ]; then
-      cargo install-update -i clippy;
-    fi
-script:
-  - cargo fmt -- --write-mode=diff
-  - if [ $TRAVIS_RUST_VERSION == nightly ]; then
-      cargo clippy -- -D warnings;
-    fi
-  - cargo build
+language: generic
+script: printf 'empty'
+notifications:
+  email: false

README.md

@@ -1,6 +1,28 @@
 network-manager
-==============
+===============
 
-[![License](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](https://github.com/resin-io-modules/NetworkManager/blob/master/LICENSE)
-[![Build Status](https://travis-ci.org/resin-io-modules/network-manager.svg?branch=master)](https://travis-ci.org/resin-io-modules/network-manager)
 > Rust NetworkManager bindings
+
+[![Current Release](https://img.shields.io/github/release/resin-io-modules/network-manager.svg?style=flat-square)](https://github.com/resin-io-modules/network-manager/releases/latest)
+[![CircleCI status](https://img.shields.io/circleci/project/github/resin-io-modules/network-manager.svg?style=flat-square)](https://circleci.com/gh/resin-io-modules/network-manager)
+[![License](https://img.shields.io/github/license/resin-io-modules/network-manager.svg?style=flat-square)](https://github.com/resin-io-modules/network-manager/blob/master/LICENSE)
+[![Issues](https://img.shields.io/github/issues/resin-io-modules/network-manager.svg?style=flat-square)](https://github.com/resin-io-modules/network-manager/issues)
+
+<div align="center">
+  <sub>an open source :satellite: project by <a href="https://resin.io">resin.io</a></sub>
+</div>
+
+***
+
+Support
+-------
+
+If you're having any problem, please [raise an issue](https://github.com/resin-io-modules/network-manager/issues/new) on GitHub or [contact us](https://resin.io/community/), and the resin.io team will be happy to help.
+
+***
+
+License
+-------
+
+network-manager is free software, and may be redistributed under the terms specified in
+the [license](https://github.com/resin-io-modules/network-manager/blob/master/LICENSE).

examples/create.rs

@@ -3,8 +3,7 @@ extern crate network_manager;
 use std::env;
 use std::process;
 
-use network_manager::{NetworkManager, DeviceType};
-
+use network_manager::{DeviceType, NetworkManager};
 
 fn main() {
     let args: Vec<String> = env::args().collect();

examples/hotspot.rs

@@ -3,22 +3,19 @@ extern crate network_manager;
 use std::env;
 use std::process;
 
-use network_manager::{NetworkManager, Device, DeviceType};
-
+use network_manager::{Device, DeviceType, NetworkManager};
 
 struct Options {
     interface: Option<String>,
     ssid: String,
     password: Option<String>,
 }
 
-
 fn print_usage_and_exit() {
     println!("USAGE: hotspot [-i INTERFACE] SSID [PASSWORD]");
     process::exit(1);
 }
 
-
 fn parse_options() -> Options {
     let args: Vec<String> = env::args().collect();
 
@@ -51,7 +48,6 @@ fn parse_options() -> Options {
     }
 }
 
-
 fn find_device(manager: &NetworkManager, interface: Option<String>) -> Option<Device> {
     if let Some(interface) = interface {
         let device = manager.get_device_by_interface(&interface).unwrap();
@@ -64,9 +60,9 @@ fn find_device(manager: &NetworkManager, interface: Option<String>) -> Option<De
     } else {
         let devices = manager.get_devices().unwrap();
 
-        let index = devices.iter().position(
-            |d| *d.device_type() == DeviceType::WiFi,
-        );
+        let index = devices
+            .iter()
+            .position(|d| *d.device_type() == DeviceType::WiFi);
 
         if let Some(index) = index {
             Some(devices[index].clone())
@@ -76,7 +72,6 @@ fn find_device(manager: &NetworkManager, interface: Option<String>) -> Option<De
     }
 }
 
-
 fn main() {
     let Options {
         interface,

rustfmt.toml

@@ -1,11 +1,2 @@
-array_layout = "Block"
-chain_indent = "Block"
-control_style = "Rfc"
-fn_args_layout = "Block"
-fn_args_paren_newline = false
-fn_call_style = "Block"
-fn_call_width = 80
 match_block_trailing_comma = true
-struct_lit_multiline_style = "ForceMulti"
-struct_lit_style = "Block"
 use_try_shorthand = true

src/connection.rs

@@ -7,9 +7,8 @@ use ascii::AsAsciiStr;
 use dbus_nm::DBusNetworkManager;
 
 use wifi::Security;
-use device::{Device, get_active_connection_devices};
-use ssid::{Ssid, SsidSlice, AsSsidSlice};
-
+use device::{get_active_connection_devices, Device};
+use ssid::{AsSsidSlice, Ssid, SsidSlice};
 
 #[derive(Clone)]
 pub struct Connection {
@@ -64,14 +63,20 @@ impl Connection {
 
         match state {
             ConnectionState::Activated => Ok(ConnectionState::Activated),
-            ConnectionState::Activating => {
-                wait(self, &ConnectionState::Activated, self.dbus_manager.method_timeout())
-            },
+            ConnectionState::Activating => wait(
+                self,
+                &ConnectionState::Activated,
+                self.dbus_manager.method_timeout(),
+            ),
             ConnectionState::Unknown => Err("Unable to get connection state".to_string()),
             _ => {
                 self.dbus_manager.activate_connection(&self.path)?;
 
-                wait(self, &ConnectionState::Activated, self.dbus_manager.method_timeout())
+                wait(
+                    self,
+                    &ConnectionState::Activated,
+                    self.dbus_manager.method_timeout(),
+                )
             },
         }
     }
@@ -91,9 +96,11 @@ impl Connection {
 
         match state {
             ConnectionState::Deactivated => Ok(ConnectionState::Deactivated),
-            ConnectionState::Deactivating => {
-                wait(self, &ConnectionState::Deactivated, self.dbus_manager.method_timeout())
-            },
+            ConnectionState::Deactivating => wait(
+                self,
+                &ConnectionState::Deactivated,
+                self.dbus_manager.method_timeout(),
+            ),
             ConnectionState::Unknown => Err("Unable to get connection state".to_string()),
             _ => {
                 let active_path_option =
@@ -102,7 +109,11 @@ impl Connection {
                 if let Some(active_path) = active_path_option {
                     self.dbus_manager.deactivate_connection(&active_path)?;
 
-                    wait(self, &ConnectionState::Deactivated, self.dbus_manager.method_timeout())
+                    wait(
+                        self,
+                        &ConnectionState::Deactivated,
+                        self.dbus_manager.method_timeout(),
+                    )
                 } else {
                     Ok(ConnectionState::Deactivated)
                 }
@@ -143,7 +154,11 @@ impl Eq for Connection {}
 
 impl fmt::Debug for Connection {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f, "Connection {{ path: {:?}, settings: {:?} }}", self.path, self.settings)
+        write!(
+            f,
+            "Connection {{ path: {:?}, settings: {:?} }}",
+            self.path, self.settings
+        )
     }
 }
 
@@ -159,7 +174,6 @@ impl<'a> From<&'a Connection> for i32 {
     }
 }
 
-
 #[derive(Default, Debug, Clone, Eq, PartialEq)]
 pub struct ConnectionSettings {
     pub kind: String, // `type` is a reserved word, so we are using `kind` instead
@@ -194,7 +208,6 @@ impl From<i64> for ConnectionState {
     }
 }
 
-
 pub fn get_connections(dbus_manager: &Rc<DBusNetworkManager>) -> Result<Vec<Connection>, String> {
     let paths = dbus_manager.list_connections()?;
 
@@ -209,7 +222,6 @@ pub fn get_connections(dbus_manager: &Rc<DBusNetworkManager>) -> Result<Vec<Conn
     Ok(connections)
 }
 
-
 pub fn get_active_connections(
     dbus_manager: &Rc<DBusNetworkManager>,
 ) -> Result<Vec<Connection>, String> {
@@ -228,7 +240,6 @@ pub fn get_active_connections(
     Ok(connections)
 }
 
-
 pub fn connect_to_access_point<P>(
     dbus_manager: &Rc<DBusNetworkManager>,
     device_path: &str,
@@ -250,7 +261,11 @@ where
 
     let connection = Connection::init(dbus_manager, &path)?;
 
-    let state = wait(&connection, &ConnectionState::Activated, dbus_manager.method_timeout())?;
+    let state = wait(
+        &connection,
+        &ConnectionState::Activated,
+        dbus_manager.method_timeout(),
+    )?;
 
     Ok((connection, state))
 }
@@ -267,17 +282,15 @@ where
     S: AsSsidSlice + ?Sized,
     P: AsAsciiStr + ?Sized,
 {
-    let (path, _) = dbus_manager.create_hotspot(
-        device_path,
-        interface,
-        ssid,
-        password,
-        address,
-    )?;
+    let (path, _) = dbus_manager.create_hotspot(device_path, interface, ssid, password, address)?;
 
     let connection = Connection::init(dbus_manager, &path)?;
 
-    let state = wait(&connection, &ConnectionState::Activated, dbus_manager.method_timeout())?;
+    let state = wait(
+        &connection,
+        &ConnectionState::Activated,
+        dbus_manager.method_timeout(),
+    )?;
 
     Ok((connection, state))
 }
@@ -320,25 +333,24 @@ fn wait(
         total_time += 1;
 
         if state == *target_state {
-            debug!("Connection target state reached: {:?} / {}s elapsed", state, total_time);
+            debug!(
+                "Connection target state reached: {:?} / {}s elapsed",
+                state, total_time
+            );
 
             return Ok(state);
         } else if total_time >= timeout {
             debug!(
                 "Timeout reached in waiting for connection state ({:?}): {:?} / {}s elapsed",
-                target_state,
-                state,
-                total_time
+                target_state, state, total_time
             );
 
             return Ok(state);
         }
 
         debug!(
             "Still waiting for connection state ({:?}): {:?} / {}s elapsed",
-            target_state,
-            state,
-            total_time
+            target_state, state, total_time
         );
     }
 }
@@ -358,15 +370,16 @@ mod tests {
         // e.g.  export TEST_WIFI_SSID="Resin.io Wifi"
         let wifi_env_var = "TEST_WIFI_SSID";
         let connection = match ::std::env::var(wifi_env_var) {
-            Ok(ssid) => {
-                connections
-                    .iter()
-                    .filter(|c| c.settings().ssid.as_str().unwrap() == ssid)
-                    .nth(0)
-                    .unwrap()
-                    .clone()
-            },
-            Err(e) => panic!("couldn't retrieve environment variable {}: {}", wifi_env_var, e),
+            Ok(ssid) => connections
+                .iter()
+                .filter(|c| c.settings().ssid.as_str().unwrap() == ssid)
+                .nth(0)
+                .unwrap()
+                .clone(),
+            Err(e) => panic!(
+                "couldn't retrieve environment variable {}: {}",
+                wifi_env_var, e
+            ),
         };
 
         let state = connection.get_state().unwrap();