Skip to content

Commit d74c3de

Browse files
committed
Expand scope of dim4 & seq macros args to accept all expressions
1 parent ed03341 commit d74c3de

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

src/core/macros.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -136,16 +136,16 @@ macro_rules! eval {
136136
/// The user can pass 1 or more sizes and the left over values will default to 1.
137137
#[macro_export]
138138
macro_rules! dim4 {
139-
($dim0:literal) => {
139+
($dim0:expr) => {
140140
$crate::Dim4::new(&[$dim0, 1, 1, 1])
141141
};
142-
($dim0:literal, $dim1:literal) => {
142+
($dim0:expr, $dim1:expr) => {
143143
$crate::Dim4::new(&[$dim0, $dim1, 1, 1])
144144
};
145-
($dim0:literal, $dim1:literal, $dim2:literal) => {
145+
($dim0:expr, $dim1:expr, $dim2:expr) => {
146146
$crate::Dim4::new(&[$dim0, $dim1, $dim2, 1])
147147
};
148-
($dim0:literal, $dim1:literal, $dim2:literal, $dim3:literal) => {
148+
($dim0:expr, $dim1:expr, $dim2:expr, $dim3:expr) => {
149149
$crate::Dim4::new(&[$dim0, $dim1, $dim2, $dim3])
150150
};
151151
}
@@ -158,10 +158,10 @@ macro_rules! seq {
158158
() => {
159159
$crate::Seq::<i32>::default()
160160
};
161-
($sty:ty; $start:literal : $end:literal : $step:literal) => {
161+
($sty:ty; $start:expr : $end:expr : $step:expr) => {
162162
$crate::Seq::<$sty>::new($start, $end, $step)
163163
};
164-
($start:literal : $end:literal : $step:literal) => {
164+
($start:expr : $end:expr : $step:expr) => {
165165
$crate::Seq::<i32>::new($start, $end, $step)
166166
};
167167
}

0 commit comments

Comments
 (0)