From bda0ca26fb03f339f5eea32dd13b880e31a9d496 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20J=C3=B6rdens?= Date: Sun, 24 Nov 2019 14:55:20 +0100 Subject: [PATCH] i2c/eeprom: lint --- src/eeprom.rs | 2 +- src/i2c.rs | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/eeprom.rs b/src/eeprom.rs index 70cb3cf..ce2efc4 100644 --- a/src/eeprom.rs +++ b/src/eeprom.rs @@ -3,7 +3,7 @@ use super::i2c; const I2C_ADDR: u8 = 0xa0; -pub fn read_eui48<'a>(i2c: &pac::I2C2) -> Result<[u8; 6], i2c::Error> { +pub fn read_eui48(i2c: &pac::I2C2) -> Result<[u8; 6], i2c::Error> { let mut buffer = [0u8; 6]; i2c::write_read(i2c, I2C_ADDR, &[0xFAu8], &mut buffer)?; Ok(buffer) diff --git a/src/i2c.rs b/src/i2c.rs index 05989c9..5b3a17b 100644 --- a/src/i2c.rs +++ b/src/i2c.rs @@ -101,7 +101,7 @@ fn poll_for_start_ack( } } - return Err(Error::Timeout); + Err(Error::Timeout) } @@ -111,10 +111,10 @@ pub fn write_read( bytes: &[u8], buffer: &mut [u8], ) -> Result<(), Error> { - assert!(bytes.len() < 256 && bytes.len() > 0); - assert!(buffer.len() < 256 && buffer.len() > 0); + assert!(bytes.len() < 256 && !bytes.is_empty()); + assert!(buffer.len() < 256 && !buffer.is_empty()); - poll_for_start_ack(i2c, addr|0, false, bytes.len(), false, true)?; + poll_for_start_ack(i2c, addr, false, bytes.len(), false, true)?; for byte in bytes { // Wait until we are allowed to send data (START has been ACKed or last