Cleanup (#69)

* Cleanup

 - Change lingering refs.
 - use latest stable rustfmt to cleanup files.
 - Update travis.yml to use distinct stages.
 - Bump some deps to latest.

Signed-off-by: Joe Grund <jgrund@whamcloud.io>

* bump deps in prep for update

Signed-off-by: Joe Grund <jgrund@whamcloud.io>

* fixups

Signed-off-by: Joe Grund <jgrund@whamcloud.io>

Author: jgrund

.travis.yml

@@ -5,35 +5,32 @@ services:
 jobs:
     include:
         - stage: test
-          env: Type='bindgen test'
+          name: "bindgen test"
           script:
               - docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
               - docker exec -i libzfs bash -c 'cd /rust-libzfs/node-libzfs && cargo build'
               - docker exec -i libzfs bash -c 'cd /rust-libzfs/libzfs-sys && cargo test bindgen_test_layout'
         - stage: test
-          env: Type='mock build'
+          name: "mock build"
           language: node_js
           node_js: "10"
           script:
               - cd node-libzfs
               - npm run mock
-        - stage: deploy
-          env: Type='libzfs-sys'
-          if: branch =~ ^v.+libzfs-sys$
+        - stage: deploy-libzfs-sys
+          name: "libzfs-sys"
           script:
               - docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
               - docker exec -i libzfs bash -c "cd /rust-libzfs/libzfs-sys && cargo package && cargo publish --token $CARGO_TOKEN"
-        - stage: deploy
-          env: Type='libzfs'
-          if: branch =~ ^v.+\dlibzfs$
+        - stage: deploy-libzfs
+          name: "libzfs"
           script:
               - docker run -d -it --name libzfs -v $(pwd):/rust-libzfs:rw imlteam/zfs
               - docker exec -i libzfs bash -c "cd /rust-libzfs/libzfs && cargo package && cargo publish --token $CARGO_TOKEN"
-        - stage: deploy
-          env: Type='@iml/node-libzfs'
+        - stage: deploy-node-libzfs
+          name: "@iml/node-libzfs"
           language: node_js
           node_js: "10"
-          if: branch =~ ^v.+node-libzfs$
           before_deploy:
               - cd node-libzfs
           deploy:
@@ -43,9 +40,8 @@ jobs:
               skip_cleanup: true
               on:
                   tags: true
-        - stage: deploy
-          if: branch =~ ^v\d+\.\d+\.\d+-.+node-libzfs$
-          env: Type='Copr deploy'
+        - stage: deploy-copr
+          name: "Copr deploy"
           before_deploy:
               - include/travis/copr-deploy.sh prepare
           deploy:
@@ -54,3 +50,13 @@ jobs:
               script: ./travis_wait "./include/travis/run_in_centos7_docker.sh ./include/travis/copr-deploy.sh build"
               on:
                   all_branches: true
+stages:
+    - test
+    - name: deploy-libzfs-sys
+      if: branch =~ ^v\d+\.\d+\.\d+libzfs-sys$
+    - name: deploy-libzfs
+      if: branch =~ ^v\d+\.\d+\.\d+libzfs$
+    - name: deploy-node-libzfs
+      if: branch =~ ^v\d+\.\d+\.\d+node-libzfs$
+    - name: deploy-copr
+      if: branch =~ ^v\d+\.\d+\.\d+-.+node-libzfs$

Cargo.lock

@@ -1,10 +1,10 @@
 [package]
 name = "libzfs-sys"
-version = "0.5.6"
+version = "0.5.7"
 description = "Rust bindings to libzfs"
 license = "MIT"
-repository = "https://github.com/intel-hpdd/rust-libzfs"
-authors = ["Iml Team <iml@intel.com>"]
+repository = "https://github.com/whamcloud/rust-libzfs"
+authors = ["Iml Team <iml@whamcloud.com>"]
 links = "zfs"
 build = "build.rs"
 

libzfs-sys/Cargo.toml

@@ -15,12 +15,12 @@
 //! to the src dir. To rebuild bindings run `cargo build`.
 //!
 //! ## ZFS version
-//! These bindings were compiled against ZFS 0.7.9. As `libzfs` is not a stable interface,
+//! These bindings were compiled against ZFS 0.7.11. As `libzfs` is not a stable interface,
 //! they should only be used against this version.
 //!
 //! ## OS
 //!
-//! These bindings were compiled on Centos 7.4.x. They are likely to work against other
+//! These bindings were compiled on Centos 7.5.x. They are likely to work against other
 //! OS, but make sure to test first.
 //!
 
@@ -133,10 +133,10 @@ pub fn to_vdev_aux(n: u32) -> Option<vdev_aux_t> {
 #[cfg(test)]
 mod tests {
     use super::*;
-    use std::ptr;
+    use std::ffi::{CStr, CString};
     use std::mem;
     use std::os::raw::{c_int, c_void};
-    use std::ffi::{CStr, CString};
+    use std::ptr;
 
     fn create_libzfs_handle() -> *mut libzfs_handle_t {
         unsafe { libzfs_init() }

libzfs-sys/src/lib.rs

@@ -1,15 +1,15 @@
 [package]
 name = "libzfs"
-version = "0.6.7"
-authors = ["IML Team <iml@intel.com>"]
+version = "0.6.8"
+authors = ["IML Team <iml@whamcloud.com>"]
 description = "Rust wrapper around libzfs-sys"
 license = "MIT"
 
 [dependencies]
-libzfs-sys = { path = "../libzfs-sys", version = "0.5.6" }
+libzfs-sys = { path = "../libzfs-sys", version = "0.5.7" }
 nvpair-sys = "0.1"
 serde = "1.0"
 serde_derive = "1.0"
 foreign-types = "0.3"
-cstr-argument = "0.0"
-lazy_static = "1.0"
+cstr-argument = "0.1"
+lazy_static = "1.1"

libzfs/Cargo.toml

@@ -16,8 +16,8 @@ extern crate lazy_static;
 
 extern crate libzfs_sys as sys;
 
-mod nvpair;
 mod libzfs_error;
+mod nvpair;
 
 pub mod vdev;
 pub use vdev::VDev;

libzfs/src/lib.rs

@@ -2,9 +2,9 @@
 // Use of this source code is governed by a MIT-style
 // license that can be found in the LICENSE file.
 
-use std::{error, fmt, result, str};
-use std::io::Error;
 use std::ffi::IntoStringError;
+use std::io::Error;
+use std::{error, fmt, result, str};
 
 #[derive(Debug)]
 pub enum LibZfsError {

libzfs/src/libzfs_error.rs

@@ -1,13 +1,13 @@
-extern crate nvpair_sys as nv_sys;
 extern crate cstr_argument;
+extern crate nvpair_sys as nv_sys;
 
 use self::cstr_argument::CStrArgument;
-use std::mem;
-use std::io;
-use std::ptr;
+pub use foreign_types::{ForeignType, ForeignTypeRef, Opaque};
 use std::ffi;
+use std::io;
+use std::mem;
 use std::os::raw::{c_int, c_uint};
-pub use foreign_types::{Opaque, ForeignTypeRef, ForeignType};
+use std::ptr;
 
 pub trait NvEncode {
     fn insert<S: CStrArgument>(&self, S, &mut NvListRef) -> io::Result<()>;
@@ -211,7 +211,7 @@ impl NvListRef {
         v != nv_sys::boolean::B_FALSE
     }
 
-    /* 
+    /*
     // not allowed because `pair` is borrowed from `self`. Need to fiddle around so that we can
     // check:
     //  - `pair` is from `self`
@@ -291,7 +291,6 @@ impl NvListRef {
         }
     }
 
-
     pub fn lookup_nv_list_array<S: CStrArgument>(&self, name: S) -> io::Result<Vec<NvList>> {
         let name = name.into_cstr();
 

libzfs/src/nvpair.rs

@@ -4,9 +4,9 @@
 
 extern crate libzfs_sys as sys;
 
+use libzfs_error::{LibZfsError, Result};
 use nvpair;
 use std::ffi::CStr;
-use libzfs_error::{LibZfsError, Result};
 use std::io::{Error, ErrorKind};
 
 /// Represents vdevs
@@ -90,12 +90,12 @@ pub fn enumerate_vdev_tree(tree: &nvpair::NvList) -> Result<VDev> {
     }
 
     fn lookup_guid(tree: &nvpair::NvList) -> Option<u64> {
-        tree.lookup_uint64(sys::zpool_config_guid())
-            .ok()
+        tree.lookup_uint64(sys::zpool_config_guid()).ok()
     }
 
     fn lookup_state(tree: &nvpair::NvList) -> Result<String> {
-        let vdev_stats = tree.lookup_uint64_array(sys::zpool_config_vdev_stats())
+        let vdev_stats = tree
+            .lookup_uint64_array(sys::zpool_config_vdev_stats())
             .map(sys::to_vdev_stat)?;
 
         let state = unsafe {
@@ -116,10 +116,13 @@ pub fn enumerate_vdev_tree(tree: &nvpair::NvList) -> Result<VDev> {
 
     match x {
         x if x == sys::VDEV_TYPE_DISK => {
-            let path = tree.lookup_string(sys::zpool_config_path())?.into_string()?;
+            let path = tree
+                .lookup_string(sys::zpool_config_path())?
+                .into_string()?;
             let dev_id = lookup_tree_str(tree, sys::zpool_config_dev_id())?;
             let phys_path = lookup_tree_str(tree, sys::zpool_config_phys_path())?;
-            let whole_disk = tree.lookup_uint64(sys::zpool_config_whole_disk())
+            let whole_disk = tree
+                .lookup_uint64(sys::zpool_config_whole_disk())
                 .map(|x| x == 1)
                 .ok();
 
@@ -134,7 +137,9 @@ pub fn enumerate_vdev_tree(tree: &nvpair::NvList) -> Result<VDev> {
             })
         }
         x if x == sys::VDEV_TYPE_FILE => {
-            let path = tree.lookup_string(sys::zpool_config_path())?.into_string()?;
+            let path = tree
+                .lookup_string(sys::zpool_config_path())?
+                .into_string()?;
 
             Ok(VDev::File {
                 guid: lookup_guid(tree),
@@ -145,7 +150,8 @@ pub fn enumerate_vdev_tree(tree: &nvpair::NvList) -> Result<VDev> {
         }
         x if x == sys::VDEV_TYPE_MIRROR => {
             let children = get_children(tree)?;
-            let is_log = tree.lookup_uint64(sys::zpool_config_is_log())
+            let is_log = tree
+                .lookup_uint64(sys::zpool_config_is_log())
                 .map(|x| x == 1)
                 .ok();