Skip to content

Commit f24a9fa

Browse files
committed
Fix clippy warnings
1 parent 15f797b commit f24a9fa

File tree

4 files changed

+10
-11
lines changed

4 files changed

+10
-11
lines changed

examples/nunchuck.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -122,10 +122,9 @@ mod nunchuck {
122122
let mut buf: [u8; 6] = [0; 6];
123123

124124
// tell the nunchuck to prepare a sample
125-
try!(self
126-
.i2cdev
125+
self.i2cdev
127126
.smbus_write_byte(0x00)
128-
.map_err(NunchuckError::Error));
127+
.map_err(NunchuckError::Error)?;
129128

130129
// now, read it!
131130
thread::sleep(Duration::from_millis(10));

examples/sensors.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,8 @@ mod sensors {
173173
i2cdev.smbus_write_byte_data(REGISTER_POWER_CTL, 0x00)?;
174174

175175
// configure some defaults
176-
try!(i2cdev
177-
.smbus_write_byte_data(REGISTER_BW_RATE, ADXL345DataRate::RATE_1600HZ as u8));
176+
i2cdev
177+
.smbus_write_byte_data(REGISTER_BW_RATE, ADXL345DataRate::RATE_1600HZ as u8)?;
178178
i2cdev.smbus_write_byte_data(REGISTER_DATA_FORMAT, 0x08)?;
179179
i2cdev.smbus_write_byte_data(REGISTER_OFSX, 0xFD)?;
180180
i2cdev.smbus_write_byte_data(REGISTER_OFSY, 0x03)?;

src/ffi.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -174,15 +174,15 @@ unsafe fn i2c_smbus_access(
174174
size: I2CSMBusSize,
175175
data: *mut i2c_smbus_data,
176176
) -> Result<(), I2CError> {
177-
let mut args = i2c_smbus_ioctl_data {
177+
let args = i2c_smbus_ioctl_data {
178178
read_write: read_write as u8,
179179
command,
180180
size: size as u32,
181181
data,
182182
};
183183

184184
// remove type information
185-
ioctl::i2c_smbus(fd, &mut args).map(drop)
185+
ioctl::i2c_smbus(fd, &args).map(drop)
186186
}
187187

188188
#[inline]
@@ -375,7 +375,7 @@ fn copy_to_i2c_block_data(values: &[u8], max_size: usize) -> i2c_smbus_data {
375375

376376
#[inline]
377377
pub fn i2c_smbus_write_block_data(fd: RawFd, register: u8, values: &[u8]) -> Result<(), I2CError> {
378-
let mut data = copy_to_i2c_block_data(&values, 32);
378+
let mut data = copy_to_i2c_block_data(values, 32);
379379
unsafe {
380380
i2c_smbus_access(
381381
fd,
@@ -393,7 +393,7 @@ pub fn i2c_smbus_write_i2c_block_data(
393393
register: u8,
394394
values: &[u8],
395395
) -> Result<(), I2CError> {
396-
let mut data = copy_to_i2c_block_data(&values, 32);
396+
let mut data = copy_to_i2c_block_data(values, 32);
397397
unsafe {
398398
i2c_smbus_access(
399399
fd,
@@ -411,7 +411,7 @@ pub fn i2c_smbus_process_call_block(
411411
register: u8,
412412
values: &[u8],
413413
) -> Result<Vec<u8>, I2CError> {
414-
let mut data = copy_to_i2c_block_data(&values, 31);
414+
let mut data = copy_to_i2c_block_data(values, 31);
415415
unsafe {
416416
i2c_smbus_access(
417417
fd,

src/mock.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ impl I2CRegisterMap {
3535
/// Set several registers starting at the given offset
3636
pub fn write_regs(&mut self, offset: usize, data: &[u8]) {
3737
println!("WRITE | 0x{:X} : {:?}", offset, data);
38-
self.registers[offset..(data.len() + offset)].clone_from_slice(&data);
38+
self.registers[offset..(data.len() + offset)].clone_from_slice(data);
3939
}
4040
}
4141

0 commit comments

Comments
 (0)