diff --git a/src/slice.rs b/src/slice.rs index 0a8a620ec..8b52c9c80 100644 --- a/src/slice.rs +++ b/src/slice.rs @@ -553,7 +553,7 @@ macro_rules! s( #[allow(unsafe_code)] unsafe { $crate::SliceInfo::new_unchecked( - [$($stack)* s!(@convert r, $s)], + [$($stack)* $crate::s!(@convert r, $s)], out_dim, ) } @@ -568,7 +568,7 @@ macro_rules! s( #[allow(unsafe_code)] unsafe { $crate::SliceInfo::new_unchecked( - [$($stack)* s!(@convert r)], + [$($stack)* $crate::s!(@convert r)], out_dim, ) } @@ -577,19 +577,19 @@ macro_rules! s( }; // convert a..b;c into @convert(a..b, c), final item, trailing comma (@parse $dim:expr, [$($stack:tt)*] $r:expr;$s:expr ,) => { - s![@parse $dim, [$($stack)*] $r;$s] + $crate::s![@parse $dim, [$($stack)*] $r;$s] }; // convert a..b into @convert(a..b), final item, trailing comma (@parse $dim:expr, [$($stack:tt)*] $r:expr ,) => { - s![@parse $dim, [$($stack)*] $r] + $crate::s![@parse $dim, [$($stack)*] $r] }; // convert a..b;c into @convert(a..b, c) (@parse $dim:expr, [$($stack:tt)*] $r:expr;$s:expr, $($t:tt)*) => { match $r { r => { - s![@parse + $crate::s![@parse $crate::SliceNextDim::next_dim(&r, $dim), - [$($stack)* s!(@convert r, $s),] + [$($stack)* $crate::s!(@convert r, $s),] $($t)* ] } @@ -599,9 +599,9 @@ macro_rules! s( (@parse $dim:expr, [$($stack:tt)*] $r:expr, $($t:tt)*) => { match $r { r => { - s![@parse + $crate::s![@parse $crate::SliceNextDim::next_dim(&r, $dim), - [$($stack)* s!(@convert r),] + [$($stack)* $crate::s!(@convert r),] $($t)* ] } @@ -618,6 +618,6 @@ macro_rules! s( ($($t:tt)*) => { // The extra `*&` is a workaround for this compiler bug: // https://github.com/rust-lang/rust/issues/23014 - &*&s![@parse ::std::marker::PhantomData::<$crate::Ix0>, [] $($t)*] + &*&$crate::s![@parse ::std::marker::PhantomData::<$crate::Ix0>, [] $($t)*] }; ); diff --git a/src/zip/zipmacro.rs b/src/zip/zipmacro.rs index 19d627f67..e4bfa53da 100644 --- a/src/zip/zipmacro.rs +++ b/src/zip/zipmacro.rs @@ -85,11 +85,11 @@ macro_rules! azip { // Build Zip Rule (index) (@parse [index => $a:expr, $($aa:expr,)*] $t1:tt in $t2:tt) => { - azip!(@finish ($crate::Zip::indexed($a)) [$($aa,)*] $t1 in $t2) + $crate::azip!(@finish ($crate::Zip::indexed($a)) [$($aa,)*] $t1 in $t2) }; // Build Zip Rule (no index) (@parse [$a:expr, $($aa:expr,)*] $t1:tt in $t2:tt) => { - azip!(@finish ($crate::Zip::from($a)) [$($aa,)*] $t1 in $t2) + $crate::azip!(@finish ($crate::Zip::from($a)) [$($aa,)*] $t1 in $t2) }; // Build Finish Rule (both) (@finish ($z:expr) [$($aa:expr,)*] [$($p:pat,)+] in { $($t:tt)*}) => { @@ -105,32 +105,32 @@ macro_rules! azip { // parsing stack: [expressions] [patterns] (one per operand) // index uses empty [] -- must be first (@parse [] [] index $i:pat, $($t:tt)*) => { - azip!(@parse [index =>] [$i,] $($t)*); + $crate::azip!(@parse [index =>] [$i,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] mut $x:ident ($e:expr) $($t:tt)*) => { - azip!(@parse [$($exprs)* $e,] [$($pats)* mut $x,] $($t)*); + $crate::azip!(@parse [$($exprs)* $e,] [$($pats)* mut $x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] mut $x:ident $($t:tt)*) => { - azip!(@parse [$($exprs)* &mut $x,] [$($pats)* mut $x,] $($t)*); + $crate::azip!(@parse [$($exprs)* &mut $x,] [$($pats)* mut $x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] , $($t:tt)*) => { - azip!(@parse [$($exprs)*] [$($pats)*] $($t)*); + $crate::azip!(@parse [$($exprs)*] [$($pats)*] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] ref $x:ident ($e:expr) $($t:tt)*) => { - azip!(@parse [$($exprs)* $e,] [$($pats)* $x,] $($t)*); + $crate::azip!(@parse [$($exprs)* $e,] [$($pats)* $x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] ref $x:ident $($t:tt)*) => { - azip!(@parse [$($exprs)* &$x,] [$($pats)* $x,] $($t)*); + $crate::azip!(@parse [$($exprs)* &$x,] [$($pats)* $x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] $x:ident ($e:expr) $($t:tt)*) => { - azip!(@parse [$($exprs)* $e,] [$($pats)* &$x,] $($t)*); + $crate::azip!(@parse [$($exprs)* $e,] [$($pats)* &$x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] $x:ident $($t:tt)*) => { - azip!(@parse [$($exprs)* &$x,] [$($pats)* &$x,] $($t)*); + $crate::azip!(@parse [$($exprs)* &$x,] [$($pats)* &$x,] $($t)*); }; (@parse [$($exprs:tt)*] [$($pats:tt)*] $($t:tt)*) => { }; ($($t:tt)*) => { - azip!(@parse [] [] $($t)*); + $crate::azip!(@parse [] [] $($t)*); } }