Merge pull request #44 from RandomInsano/upgrade_nix

posborne · web-flow · commit d75f4f4f2895 · 2018-10-01T15:27:29.000-05:00
Upgrade nix to 0.11
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,7 +18,7 @@ https://www.kernel.org/doc/Documentation/i2c/dev-interface
 libc = "0.2"
 bitflags = "1"
 byteorder = "1"
-nix = "0.10"
+nix = "0.11"
 
 [dev-dependencies]
 docopt = "0.8"
diff --git a/src/ffi.rs b/src/ffi.rs
@@ -175,8 +175,8 @@ mod ioctl {
     use super::{I2C_SLAVE, I2C_SMBUS};
     pub use super::i2c_smbus_ioctl_data;
 
-    ioctl!(bad write_int set_i2c_slave_address with I2C_SLAVE);
-    ioctl!(bad write_ptr i2c_smbus with I2C_SMBUS; i2c_smbus_ioctl_data);
+    ioctl_write_int_bad!(set_i2c_slave_address, I2C_SLAVE);
+    ioctl_write_ptr_bad!(i2c_smbus, I2C_SMBUS, i2c_smbus_ioctl_data);
 }
 
 

Original file line number	Diff line number	Diff line change
`@@ -175,8 +175,8 @@ mod ioctl {`
`175`	`175`	`use super::{I2C_SLAVE, I2C_SMBUS};`
`176`	`176`	`pub use super::i2c_smbus_ioctl_data;`
`177`	`177`
`178`		`- ioctl!(bad write_int set_i2c_slave_address with I2C_SLAVE);`
`179`		`- ioctl!(bad write_ptr i2c_smbus with I2C_SMBUS; i2c_smbus_ioctl_data);`
	`178`	`+ ioctl_write_int_bad!(set_i2c_slave_address, I2C_SLAVE);`
	`179`	`+ ioctl_write_ptr_bad!(i2c_smbus, I2C_SMBUS, i2c_smbus_ioctl_data);`
`180`	`180`	`}`
`181`	`181`
`182`	`182`