Prevent masking value variables with imports

adamgreig · Sep 22, 2021 · 5e58739 · 5e58739
1 parent 5516810
commit 5e58739
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/src/lib.rs b/src/lib.rs
@@ -280,7 +280,7 @@ macro_rules! write_reg {
  use $periph::{*};
  #[allow(unused_imports)]
  (*$instance).$reg.write(
- $({ use $periph::{$reg::$field::{mask, offset, W::*, RW::*}}; ($value << offset) & mask }) | *
+ $({ use $periph::{$reg::$field::{W::*, RW::*}}; ($value << { use $periph::$reg::$field::offset; offset }) & { use $periph::$reg::$field::mask; mask } }) | *
  );
  }};
  ( $periph:path, $instance:expr, $reg:ident, $value:expr ) => {{
@@ -410,7 +410,7 @@ macro_rules! modify_reg {
  #[allow(unused_imports)]
  (*$instance).$reg.write(
  ((*$instance).$reg.read() & !( $({ use $periph::{$reg::$field::mask}; mask }) | * ))
- | $({ use $periph::{$reg::$field::{mask, offset, W::*, RW::*}}; ($value << offset) & mask }) | *);
+ | $({ use $periph::{$reg::$field::{W::*, RW::*}}; ($value << { use $periph::$reg::$field::offset; offset }) & { use $periph::$reg::$field::mask; mask } }) | *);
  }};
  ( $periph:path, $instance:expr, $reg:ident, $fn:expr ) => {{
  #[allow(unused_imports)]