Merge pull request #793 from stm32-rs/cleans

fix some more warnings

Author: burrbull

src/can.rs

@@ -2,7 +2,7 @@
 //!
 
 use crate::gpio::{self, NoPin};
-use crate::pac::{CAN1, CAN2};
+use crate::pac;
 use crate::rcc;
 
 pub trait Instance: crate::Sealed + rcc::Enable + rcc::Reset + gpio::alt::CanCommon {}
@@ -16,22 +16,22 @@ macro_rules! can {
 }
 
 // Implemented by all SPI instances
-can! { CAN1: Can1 }
-can! { CAN2: Can2 }
+can! { pac::CAN1: Can1 }
+#[cfg(feature = "can2")]
+can! { pac::CAN2: Can2 }
 #[cfg(feature = "can3")]
-can! { crate::pac::CAN3: Can3 }
+can! { pac::CAN3: Can3 }
 
 /// Pins and definitions for models with a third CAN peripheral
 #[cfg(feature = "can3")]
 mod can3 {
     use super::*;
-    use crate::pac::CAN3;
 
-    unsafe impl bxcan::Instance for Can<CAN3> {
-        const REGISTERS: *mut bxcan::RegisterBlock = CAN3::ptr() as *mut _;
+    unsafe impl bxcan::Instance for Can<pac::CAN3> {
+        const REGISTERS: *mut bxcan::RegisterBlock = pac::CAN3::ptr() as *mut _;
     }
 
-    unsafe impl bxcan::FilterOwner for Can<CAN3> {
+    unsafe impl bxcan::FilterOwner for Can<pac::CAN3> {
         const NUM_FILTER_BANKS: u8 = 14;
     }
 }
@@ -110,16 +110,17 @@ impl<CAN: Instance> Can<CAN> {
     }
 }
 
-unsafe impl bxcan::Instance for Can<CAN1> {
-    const REGISTERS: *mut bxcan::RegisterBlock = CAN1::ptr() as *mut _;
+unsafe impl bxcan::Instance for Can<pac::CAN1> {
+    const REGISTERS: *mut bxcan::RegisterBlock = pac::CAN1::ptr() as *mut _;
 }
 
-unsafe impl bxcan::Instance for Can<CAN2> {
-    const REGISTERS: *mut bxcan::RegisterBlock = CAN2::ptr() as *mut _;
+#[cfg(feature = "can2")]
+unsafe impl bxcan::Instance for Can<pac::CAN2> {
+    const REGISTERS: *mut bxcan::RegisterBlock = pac::CAN2::ptr() as *mut _;
 }
 
-unsafe impl bxcan::FilterOwner for Can<CAN1> {
+unsafe impl bxcan::FilterOwner for Can<pac::CAN1> {
     const NUM_FILTER_BANKS: u8 = 28;
 }
 
-unsafe impl bxcan::MasterInstance for Can<CAN1> {}
+unsafe impl bxcan::MasterInstance for Can<pac::CAN1> {}

src/fmpi2c.rs

@@ -99,15 +99,15 @@ impl From<Hertz> for Mode {
 }
 
 pub trait I2cExt: Sized + Instance {
-    fn i2c<'a>(
+    fn i2c(
         self,
         pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
         mode: impl Into<Mode>,
     ) -> I2c<Self>;
 }
 
 impl<I2C: Instance> I2cExt for I2C {
-    fn i2c<'a>(
+    fn i2c(
         self,
         pins: (impl Into<Self::Scl>, impl Into<Self::Sda>),
         mode: impl Into<Mode>,

src/sai.rs

@@ -22,7 +22,6 @@
 use core::ops::Deref;
 
 use crate::gpio::alt::SaiChannel;
-use crate::pac::RCC;
 #[cfg(feature = "sai2")]
 use crate::pac::SAI2;
 #[cfg(any(
@@ -539,9 +538,10 @@ where
     where
         Self: Sized,
     {
-        let rcc = unsafe { &*RCC::ptr() };
-        SAI::enable(rcc);
-        SAI::reset(rcc);
+        unsafe {
+            SAI::enable_unchecked();
+            SAI::reset_unchecked();
+        }
         (
             SubBlock {
                 channel: SAIA::new(self),
@@ -565,9 +565,10 @@ where
     where
         Self: Sized,
     {
-        let rcc = unsafe { &*RCC::ptr() };
-        SAI::enable(rcc);
-        SAI::reset(rcc);
+        unsafe {
+            SAI::enable_unchecked();
+            SAI::reset_unchecked();
+        }
         (
             SubBlock {
                 channel: SAIA::new(self),
@@ -591,9 +592,10 @@ where
     where
         Self: Sized,
     {
-        let rcc = unsafe { &*RCC::ptr() };
-        SAI::enable(rcc);
-        SAI::reset(rcc);
+        unsafe {
+            SAI::enable_unchecked();
+            SAI::reset_unchecked();
+        }
         (
             SubBlock {
                 channel: SAIA::new(self),