Skip to content

Commit b477a12

Browse files
authored
Merge pull request #196 from the8472/fix-layout-randomization
move size assert from const to tests
2 parents fe2e4a7 + e9813a6 commit b477a12

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/green/node.rs

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ use crate::{
1212
GreenToken, NodeOrToken, TextRange, TextSize,
1313
arc::{Arc, HeaderSlice, ThinArc},
1414
green::{GreenElement, GreenElementRef, SyntaxKind},
15-
utility_types::static_assert,
1615
};
1716

1817
#[derive(Debug, Clone, PartialEq, Eq, Hash)]
@@ -28,8 +27,6 @@ pub(crate) enum GreenChild {
2827
Node { rel_offset: TextSize, node: GreenNode },
2928
Token { rel_offset: TextSize, token: GreenToken },
3029
}
31-
#[cfg(target_pointer_width = "64")]
32-
static_assert!(mem::size_of::<GreenChild>() == mem::size_of::<usize>() * 2);
3330

3431
type Repr = HeaderSlice<GreenNodeHead, [GreenChild]>;
3532
type ReprThin = HeaderSlice<GreenNodeHead, [GreenChild; 0]>;
@@ -356,3 +353,16 @@ impl DoubleEndedIterator for Children<'_> {
356353
}
357354

358355
impl FusedIterator for Children<'_> {}
356+
357+
#[cfg(test)]
358+
mod test {
359+
360+
#[test]
361+
#[cfg(target_pointer_width = "64")]
362+
fn check_green_child_size() {
363+
use super::GreenChild;
364+
use std::mem;
365+
366+
assert_eq!(mem::size_of::<GreenChild>(), mem::size_of::<usize>() * 2);
367+
}
368+
}

src/utility_types.rs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,14 +149,6 @@ impl<T> Iterator for TokenAtOffset<T> {
149149

150150
impl<T> ExactSizeIterator for TokenAtOffset<T> {}
151151

152-
macro_rules! _static_assert {
153-
($expr:expr) => {
154-
const _: i32 = 0 / $expr as i32;
155-
};
156-
}
157-
158-
pub(crate) use _static_assert as static_assert;
159-
160152
#[derive(Copy, Clone, Debug)]
161153
pub(crate) enum Delta<T> {
162154
Add(T),

0 commit comments

Comments
 (0)