Skip to content

Commit 2fb717d

Browse files
mangelatsLuthaf
authored andcommitted
Revert use of soa slices' index in tests
This partially reverts commit 1697674.
1 parent a42e1f1 commit 2fb717d

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

tests/ptr.rs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,11 +53,11 @@ fn slice() {
5353
unsafe {
5454
let slice = ParticleSlice::from_raw_parts(ptr, 2);
5555
assert_eq!(slice.len(), 2);
56-
assert_eq!(slice.index(0).name, "Na");
57-
assert_eq!(slice.index(1).name, "Zn");
56+
assert_eq!(slice.name[0], "Na");
57+
assert_eq!(slice.name[1], "Zn");
5858

59-
assert_eq!(*slice.index(0).mass, 1.0);
60-
assert_eq!(*slice.index(1).mass, 2.0);
59+
assert_eq!(slice.mass[0], 1.0);
60+
assert_eq!(slice.mass[1], 2.0);
6161
}
6262
}
6363

@@ -77,8 +77,8 @@ fn slice_mut() {
7777
*ptr.as_mut().unwrap().mass = 42.0;
7878
}
7979

80-
assert_eq!(slice.index(0).name, "Fe");
81-
assert_eq!(*slice.index(0).mass, 42.0);
80+
assert_eq!(slice.name[0], "Fe");
81+
assert_eq!(slice.mass[0], 42.0);
8282

8383
unsafe {
8484
let slice = ParticleSliceMut::from_raw_parts_mut(ptr, 2);
@@ -88,9 +88,9 @@ fn slice_mut() {
8888
}
8989
}
9090

91-
assert_eq!(*slice.index(0).mass, -1.0);
92-
assert_eq!(*slice.index(1).mass, -1.0);
93-
assert_eq!(*slice.index(2).mass, 3.0);
91+
assert_eq!(slice.mass[0], -1.0);
92+
assert_eq!(slice.mass[1], -1.0);
93+
assert_eq!(slice.mass[2], 3.0);
9494
}
9595

9696
#[test]
@@ -119,12 +119,12 @@ fn vec() {
119119
assert_eq!(particles.len(), len);
120120
assert_eq!(particles.capacity(), capacity);
121121

122-
assert_eq!(particles.index(0).name, "Fe");
123-
assert_eq!(*particles.index(0).mass, 42.0);
122+
assert_eq!(particles.name[0], "Fe");
123+
assert_eq!(particles.mass[0], 42.0);
124124

125-
assert_eq!(particles.index(1).name, "Zn");
126-
assert_eq!(*particles.index(1).mass, 2.0);
125+
assert_eq!(particles.name[1], "Zn");
126+
assert_eq!(particles.mass[1], 2.0);
127127

128-
assert_eq!(particles.index(2).name, "Fe");
129-
assert_eq!(*particles.index(2).mass, 3.0);
128+
assert_eq!(particles.name[2], "Fe");
129+
assert_eq!(particles.mass[2], 3.0);
130130
}

0 commit comments

Comments
 (0)