Skip to content

Commit c42ec1f

Browse files
mangelatsLuthaf
mangelats
authored and
Luthaf
committed
Rename SoaIndex to SoAIndex and SoaMutIndex to SoAIndexMut 
1 parent 6b4e961 commit c42ec1f

File tree

5 files changed

+47
-47
lines changed

5 files changed

+47
-47
lines changed

‎soa-derive-internal/src/index.rs

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ pub fn derive(input: &Input) -> TokenStream {
1818

1919
quote!{
2020
// usize
21-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for usize {
21+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for usize {
2222
type RefOutput = #ref_name<'a>;
2323

2424
#[inline]
@@ -45,7 +45,7 @@ pub fn derive(input: &Input) -> TokenStream {
4545
}
4646
}
4747

48-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for usize {
48+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for usize {
4949
type MutOutput = #ref_mut_name<'a>;
5050

5151
#[inline]
@@ -75,7 +75,7 @@ pub fn derive(input: &Input) -> TokenStream {
7575

7676

7777
// Range<usize>
78-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::Range<usize> {
78+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::Range<usize> {
7979
type RefOutput = #slice_name<'a>;
8080

8181
#[inline]
@@ -102,7 +102,7 @@ pub fn derive(input: &Input) -> TokenStream {
102102
}
103103
}
104104

105-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::Range<usize> {
105+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::Range<usize> {
106106
type MutOutput = #slice_mut_name<'a>;
107107

108108
#[inline]
@@ -132,7 +132,7 @@ pub fn derive(input: &Input) -> TokenStream {
132132

133133

134134
// RangeTo<usize>
135-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::RangeTo<usize> {
135+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::RangeTo<usize> {
136136
type RefOutput = #slice_name<'a>;
137137

138138
#[inline]
@@ -151,7 +151,7 @@ pub fn derive(input: &Input) -> TokenStream {
151151
}
152152
}
153153

154-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::RangeTo<usize> {
154+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::RangeTo<usize> {
155155
type MutOutput = #slice_mut_name<'a>;
156156

157157
#[inline]
@@ -172,7 +172,7 @@ pub fn derive(input: &Input) -> TokenStream {
172172

173173

174174
// RangeFrom<usize>
175-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::RangeFrom<usize> {
175+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::RangeFrom<usize> {
176176
type RefOutput = #slice_name<'a>;
177177

178178
#[inline]
@@ -191,7 +191,7 @@ pub fn derive(input: &Input) -> TokenStream {
191191
}
192192
}
193193

194-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::RangeFrom<usize> {
194+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::RangeFrom<usize> {
195195
type MutOutput = #slice_mut_name<'a>;
196196

197197
#[inline]
@@ -212,7 +212,7 @@ pub fn derive(input: &Input) -> TokenStream {
212212

213213

214214
// RangeFull
215-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::RangeFull {
215+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::RangeFull {
216216
type RefOutput = #slice_name<'a>;
217217

218218
#[inline]
@@ -231,7 +231,7 @@ pub fn derive(input: &Input) -> TokenStream {
231231
}
232232
}
233233

234-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::RangeFull {
234+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::RangeFull {
235235
type MutOutput = #slice_mut_name<'a>;
236236

237237
#[inline]
@@ -252,7 +252,7 @@ pub fn derive(input: &Input) -> TokenStream {
252252

253253

254254
// RangeInclusive<usize>
255-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::RangeInclusive<usize> {
255+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::RangeInclusive<usize> {
256256
type RefOutput = #slice_name<'a>;
257257

258258
#[inline]
@@ -275,7 +275,7 @@ pub fn derive(input: &Input) -> TokenStream {
275275
}
276276
}
277277

278-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::RangeInclusive<usize> {
278+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::RangeInclusive<usize> {
279279
type MutOutput = #slice_mut_name<'a>;
280280

281281
#[inline]
@@ -300,7 +300,7 @@ pub fn derive(input: &Input) -> TokenStream {
300300

301301

302302
// RangeToInclusive<usize>
303-
impl<'a> ::soa_derive::SoaIndex<&'a #vec_name> for ::std::ops::RangeToInclusive<usize> {
303+
impl<'a> ::soa_derive::SoAIndex<&'a #vec_name> for ::std::ops::RangeToInclusive<usize> {
304304
type RefOutput = #slice_name<'a>;
305305

306306
#[inline]
@@ -319,7 +319,7 @@ pub fn derive(input: &Input) -> TokenStream {
319319
}
320320
}
321321

322-
impl<'a> ::soa_derive::SoaMutIndex<&'a mut #vec_name> for ::std::ops::RangeToInclusive<usize> {
322+
impl<'a> ::soa_derive::SoAIndexMut<&'a mut #vec_name> for ::std::ops::RangeToInclusive<usize> {
323323
type MutOutput = #slice_mut_name<'a>;
324324

325325
#[inline]
@@ -339,7 +339,7 @@ pub fn derive(input: &Input) -> TokenStream {
339339
}
340340

341341
// usize
342-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for usize {
342+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for usize {
343343
type RefOutput = #ref_name<'a>;
344344

345345
#[inline]
@@ -366,7 +366,7 @@ pub fn derive(input: &Input) -> TokenStream {
366366
}
367367
}
368368

369-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for usize {
369+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for usize {
370370
type MutOutput = #ref_mut_name<'a>;
371371

372372
#[inline]
@@ -396,7 +396,7 @@ pub fn derive(input: &Input) -> TokenStream {
396396

397397

398398
// Range<usize>
399-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::Range<usize> {
399+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::Range<usize> {
400400
type RefOutput = #slice_name<'a>;
401401

402402
#[inline]
@@ -423,7 +423,7 @@ pub fn derive(input: &Input) -> TokenStream {
423423
}
424424
}
425425

426-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::Range<usize> {
426+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::Range<usize> {
427427
type MutOutput = #slice_mut_name<'a>;
428428

429429
#[inline]
@@ -453,7 +453,7 @@ pub fn derive(input: &Input) -> TokenStream {
453453

454454

455455
// RangeTo<usize>
456-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::RangeTo<usize> {
456+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::RangeTo<usize> {
457457
type RefOutput = #slice_name<'a>;
458458

459459
#[inline]
@@ -472,7 +472,7 @@ pub fn derive(input: &Input) -> TokenStream {
472472
}
473473
}
474474

475-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::RangeTo<usize> {
475+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::RangeTo<usize> {
476476
type MutOutput = #slice_mut_name<'a>;
477477

478478
#[inline]
@@ -493,7 +493,7 @@ pub fn derive(input: &Input) -> TokenStream {
493493

494494

495495
// RangeFrom<usize>
496-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::RangeFrom<usize> {
496+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::RangeFrom<usize> {
497497
type RefOutput = #slice_name<'a>;
498498

499499
#[inline]
@@ -512,7 +512,7 @@ pub fn derive(input: &Input) -> TokenStream {
512512
}
513513
}
514514

515-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::RangeFrom<usize> {
515+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::RangeFrom<usize> {
516516
type MutOutput = #slice_mut_name<'a>;
517517

518518
#[inline]
@@ -533,7 +533,7 @@ pub fn derive(input: &Input) -> TokenStream {
533533

534534

535535
// RangeFull
536-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::RangeFull {
536+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::RangeFull {
537537
type RefOutput = #slice_name<'a>;
538538

539539
#[inline]
@@ -552,7 +552,7 @@ pub fn derive(input: &Input) -> TokenStream {
552552
}
553553
}
554554

555-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::RangeFull {
555+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::RangeFull {
556556
type MutOutput = #slice_mut_name<'a>;
557557

558558
#[inline]
@@ -573,7 +573,7 @@ pub fn derive(input: &Input) -> TokenStream {
573573

574574

575575
// RangeInclusive<usize>
576-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::RangeInclusive<usize> {
576+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::RangeInclusive<usize> {
577577
type RefOutput = #slice_name<'a>;
578578

579579
#[inline]
@@ -596,7 +596,7 @@ pub fn derive(input: &Input) -> TokenStream {
596596
}
597597
}
598598

599-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::RangeInclusive<usize> {
599+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::RangeInclusive<usize> {
600600
type MutOutput = #slice_mut_name<'a>;
601601

602602
#[inline]
@@ -621,7 +621,7 @@ pub fn derive(input: &Input) -> TokenStream {
621621

622622

623623
// RangeToInclusive<usize>
624-
impl<'a> ::soa_derive::SoaIndex<#slice_name<'a>> for ::std::ops::RangeToInclusive<usize> {
624+
impl<'a> ::soa_derive::SoAIndex<#slice_name<'a>> for ::std::ops::RangeToInclusive<usize> {
625625
type RefOutput = #slice_name<'a>;
626626

627627
#[inline]
@@ -640,7 +640,7 @@ pub fn derive(input: &Input) -> TokenStream {
640640
}
641641
}
642642

643-
impl<'a> ::soa_derive::SoaMutIndex<#slice_mut_name<'a>> for ::std::ops::RangeToInclusive<usize> {
643+
impl<'a> ::soa_derive::SoAIndexMut<#slice_mut_name<'a>> for ::std::ops::RangeToInclusive<usize> {
644644
type MutOutput = #slice_mut_name<'a>;
645645

646646
#[inline]

‎soa-derive-internal/src/slice.rs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ pub fn derive(input: &Input) -> TokenStream {
155155
/// ::get()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get).
156156
pub fn get<'b, I>(&'b self, index: I) -> Option<I::RefOutput>
157157
where
158-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
158+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
159159
'a: 'b
160160
{
161161
let slice: #slice_name<'b> = self.reborrow();
@@ -167,7 +167,7 @@ pub fn derive(input: &Input) -> TokenStream {
167167
/// ::get_unchecked()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_unchecked).
168168
pub unsafe fn get_unchecked<'b, I>(&'b self, index: I) -> I::RefOutput
169169
where
170-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
170+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
171171
'a: 'b
172172
{
173173
let slice: #slice_name<'b> = self.reborrow();
@@ -180,7 +180,7 @@ pub fn derive(input: &Input) -> TokenStream {
180180
/// This is required because we cannot implement that trait.
181181
pub fn index<'b, I>(&'b self, index: I) -> I::RefOutput
182182
where
183-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
183+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
184184
'a: 'b
185185
{
186186
let slice: #slice_name<'b> = self.reborrow();
@@ -408,7 +408,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
408408
/// ::get()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get).
409409
pub fn get<'b, I>(&'b self, index: I) -> Option<I::RefOutput>
410410
where
411-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
411+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
412412
'a: 'b
413413
{
414414
let slice: #slice_name<'b> = self.as_slice();
@@ -420,7 +420,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
420420
/// ::get_unchecked()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_unchecked).
421421
pub unsafe fn get_unchecked<'b, I>(&'b self, index: I) -> I::RefOutput
422422
where
423-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
423+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
424424
'a: 'b
425425
{
426426
let slice: #slice_name<'b> = self.as_slice();
@@ -434,7 +434,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
434434
/// This is required because we cannot implement that trait.
435435
pub fn index<'b, I>(&'b self, index: I) -> I::RefOutput
436436
where
437-
I: ::soa_derive::SoaIndex<#slice_name<'b>>,
437+
I: ::soa_derive::SoAIndex<#slice_name<'b>>,
438438
'a: 'b
439439
{
440440
let slice: #slice_name<'b> = self.as_slice();
@@ -446,7 +446,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
446446
/// ::get_mut()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_mut).
447447
pub fn get_mut<'b, I>(&'b mut self, index: I) -> Option<I::MutOutput>
448448
where
449-
I: ::soa_derive::SoaMutIndex<#slice_mut_name<'b>>,
449+
I: ::soa_derive::SoAIndexMut<#slice_mut_name<'b>>,
450450
'a: 'b
451451
{
452452
let slice: #slice_mut_name<'b> = #slice_mut_name {
@@ -460,7 +460,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
460460
/// ::get_unchecked_mut()`](https://doc.rust-lang.org/std/primitive.slice.html#method.get_unchecked_mut).
461461
pub unsafe fn get_unchecked_mut<'b, I>(&'b mut self, index: I) -> I::MutOutput
462462
where
463-
I: ::soa_derive::SoaMutIndex<#slice_mut_name<'b>>,
463+
I: ::soa_derive::SoAIndexMut<#slice_mut_name<'b>>,
464464
'a: 'b
465465
{
466466
let slice: #slice_mut_name<'b> = self.reborrow();
@@ -473,7 +473,7 @@ pub fn derive_mut(input: &Input) -> TokenStream {
473473
/// This is required because we cannot implement that trait.
474474
pub fn index_mut<'b, I>(&'b mut self, index: I) -> I::MutOutput
475475
where
476-
I: ::soa_derive::SoaMutIndex<#slice_mut_name<'b>>,
476+
I: ::soa_derive::SoAIndexMut<#slice_mut_name<'b>>,
477477
'a: 'b
478478
{
479479
let slice: #slice_mut_name<'b> = self.reborrow();

‎soa-derive-internal/src/vec.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ pub fn derive(input: &Input) -> TokenStream {
264264
/// ::get<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.get).
265265
pub fn get<'a, I>(&'a self, index: I) -> Option<I::RefOutput>
266266
where
267-
I: ::soa_derive::SoaIndex<&'a #vec_name>
267+
I: ::soa_derive::SoAIndex<&'a #vec_name>
268268
{
269269
index.get(self)
270270
}
@@ -274,7 +274,7 @@ pub fn derive(input: &Input) -> TokenStream {
274274
/// ::get_unchecked<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.get_unchecked).
275275
pub unsafe fn get_unchecked<'a, I>(&'a self, index: I) -> I::RefOutput
276276
where
277-
I: ::soa_derive::SoaIndex<&'a #vec_name>
277+
I: ::soa_derive::SoAIndex<&'a #vec_name>
278278
{
279279
index.get_unchecked(self)
280280
}
@@ -284,7 +284,7 @@ pub fn derive(input: &Input) -> TokenStream {
284284
/// ::index<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.index).
285285
pub fn index<'a, I>(&'a self, index: I) -> I::RefOutput
286286
where
287-
I: ::soa_derive::SoaIndex<&'a #vec_name>
287+
I: ::soa_derive::SoAIndex<&'a #vec_name>
288288
{
289289
index.index(self)
290290
}
@@ -294,7 +294,7 @@ pub fn derive(input: &Input) -> TokenStream {
294294
/// ::get_mut<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.get_mut).
295295
pub fn get_mut<'a, I>(&'a mut self, index: I) -> Option<I::MutOutput>
296296
where
297-
I: ::soa_derive::SoaMutIndex<&'a mut #vec_name>
297+
I: ::soa_derive::SoAIndexMut<&'a mut #vec_name>
298298
{
299299
index.get_mut(self)
300300
}
@@ -304,7 +304,7 @@ pub fn derive(input: &Input) -> TokenStream {
304304
/// ::get_unchecked_mut<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.get_unchecked_mut).
305305
pub unsafe fn get_unchecked_mut<'a, I>(&'a mut self, index: I) -> I::MutOutput
306306
where
307-
I: ::soa_derive::SoaMutIndex<&'a mut #vec_name>
307+
I: ::soa_derive::SoAIndexMut<&'a mut #vec_name>
308308
{
309309
index.get_unchecked_mut(self)
310310
}
@@ -314,7 +314,7 @@ pub fn derive(input: &Input) -> TokenStream {
314314
/// ::index_mut<I>()`](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.index_mut).
315315
pub fn index_mut<'a, I>(&'a mut self, index: I) -> I::MutOutput
316316
where
317-
I: ::soa_derive::SoaMutIndex<&'a mut #vec_name>
317+
I: ::soa_derive::SoAIndexMut<&'a mut #vec_name>
318318
{
319319
index.index_mut(self)
320320
}

0 commit comments

Comments
 (0)