Simplify imports

Author: Sh3Rm4n

src/adc.rs

@@ -14,28 +14,20 @@ use core::ops::Deref;
 use cortex_m::asm;
 use embedded_hal::adc::{Channel, OneShot};
 
-use crate::time::rate::Hertz;
 use crate::time::duration::Microseconds;
 use crate::time::fixed_point::FixedPoint;
+use crate::time::rate::Hertz;
 
 use crate::gpio::{self, Analog};
-use crate::pac::RCC;
-use crate::pac::adc1;
 use crate::pac::{
-    adc1::{cfgr::ALIGN_A, smpr1::SMP9_A, smpr2::SMP18_A},
+    self,
+    adc1::{self, cfgr::ALIGN_A, smpr1::SMP9_A, smpr2::SMP18_A},
     adc1_2::ccr::CKMODE_A,
+    RCC,
 };
 use crate::rcc::{Clocks, AHB};
 use stm32f3::Variant;
 
-#[cfg(any(
-    feature = "stm32f303xb",
-    feature = "stm32f303xc",
-    feature = "stm32f303xd",
-    feature = "stm32f303xe",
-))]
-use crate::pac::{ADC1, ADC1_2, ADC2, ADC3, ADC3_4, ADC4};
-
 const MAX_ADVREGEN_STARTUP: Microseconds = Microseconds(10);
 
 /// Analog Digital Converter Peripheral
@@ -153,7 +145,7 @@ impl From<Align> for ALIGN_A {
 macro_rules! adc_pins {
     ($ADC:ident, $($pin:ty => $chan:expr),+ $(,)*) => {
         $(
-            impl Channel<$ADC> for $pin {
+            impl Channel<pac::$ADC> for $pin {
                 type ID = u8;
 
                 fn channel() -> u8 { $chan }
@@ -288,7 +280,6 @@ where
         common_adc: &mut <ADC as Instance>::SharedInstance,
         ahb: &mut AHB,
     ) -> Self {
-
         let mut adc = Self {
             adc,
             operation_mode: None,
@@ -514,9 +505,9 @@ macro_rules! adc {
         ),
     )+) => {
         $(
-            impl crate::private::Sealed for $ADC {}
-            impl Instance for $ADC {
-                type SharedInstance = $ADCX_Y;
+            impl crate::private::Sealed for pac::$ADC {}
+            impl Instance for pac::$ADC {
+                type SharedInstance = pac::$ADCX_Y;
                 fn enable_clock(clocks: &Clocks, ahb: &mut AHB, common_adc: &mut Self::SharedInstance) {
                     ahb.enr().modify(|_, w| w.$adcXYen().enabled());