Skip to content

Commit ab042e1

Browse files
committed
Tiny cleanups
1 parent ff90e4a commit ab042e1

File tree

3 files changed

+21
-17
lines changed

3 files changed

+21
-17
lines changed

bindings/rust/src/lib.rs

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,11 +94,16 @@ impl blst_fp12 {
9494
if n_elems != p.len() || n_elems == 0 {
9595
panic!("inputs' lengths mismatch");
9696
}
97-
let qs: [*const _; 2] = [&q[0], ptr::null()];
98-
let ps: [*const _; 2] = [&p[0], ptr::null()];
97+
let qs = [q.as_ptr(), ptr::null()];
98+
let ps = [p.as_ptr(), ptr::null()];
9999
let mut out = MaybeUninit::<blst_fp12>::uninit();
100100
unsafe {
101-
blst_miller_loop_n(out.as_mut_ptr(), &qs[0], &ps[0], n_elems);
101+
blst_miller_loop_n(
102+
out.as_mut_ptr(),
103+
qs.as_ptr(),
104+
ps.as_ptr(),
105+
n_elems,
106+
);
102107
out.assume_init()
103108
}
104109
}

bindings/rust/src/pippenger-no_std.rs

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,9 @@ macro_rules! pippenger_mult_impl {
5252
points: Vec::with_capacity(npoints),
5353
};
5454

55-
let p: [*const $point; 2] = [&points[0], ptr::null()];
55+
let p = [points.as_ptr(), ptr::null()];
5656
unsafe {
57-
$to_affines(&mut ret.points[0], &p[0], npoints);
57+
$to_affines(ret.points.as_mut_ptr(), p.as_ptr(), npoints);
5858
ret.points.set_len(npoints);
5959
}
6060
ret
@@ -68,19 +68,18 @@ macro_rules! pippenger_mult_impl {
6868
panic!("scalars length mismatch");
6969
}
7070

71-
let p: [*const $point_affine; 2] =
72-
[&self.points[0], ptr::null()];
73-
let s: [*const u8; 2] = [&scalars[0], ptr::null()];
71+
let p = [self.points.as_ptr(), ptr::null()];
72+
let s = [scalars.as_ptr(), ptr::null()];
7473

7574
let mut ret = <$point>::default();
7675
unsafe {
7776
let mut scratch: Vec<u64> =
7877
Vec::with_capacity($scratch_sizeof(npoints) / 8);
7978
$multi_scalar_mult(
8079
&mut ret,
81-
&p[0],
80+
p.as_ptr(),
8281
npoints,
83-
&s[0],
82+
s.as_ptr(),
8483
nbits,
8584
scratch.as_mut_ptr(),
8685
);
@@ -91,9 +90,9 @@ macro_rules! pippenger_mult_impl {
9190
pub fn add(&self) -> $point {
9291
let npoints = self.points.len();
9392

94-
let p: [*const _; 2] = [&self.points[0], ptr::null()];
93+
let p = [self.points.as_ptr(), ptr::null()];
9594
let mut ret = <$point>::default();
96-
unsafe { $add(&mut ret, &p[0], npoints) };
95+
unsafe { $add(&mut ret, p.as_ptr(), npoints) };
9796

9897
ret
9998
}

bindings/rust/src/pippenger.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -215,11 +215,11 @@ macro_rules! pippenger_mult_impl {
215215
unsafe {
216216
$tile_mult(
217217
grid[work].1.as_ptr(),
218-
&p[0],
218+
p.as_ptr(),
219219
grid[work].0.dx,
220-
&s[0],
220+
s.as_ptr(),
221221
nbits,
222-
&mut scratch[0],
222+
scratch.as_mut_ptr(),
223223
y,
224224
window,
225225
);
@@ -273,7 +273,7 @@ macro_rules! pippenger_mult_impl {
273273
if ncpus < 2 || npoints < 384 {
274274
let p = [self.points.as_ptr(), ptr::null()];
275275
let mut ret = <$point>::default();
276-
unsafe { $add(&mut ret, &p[0], npoints) };
276+
unsafe { $add(&mut ret, p.as_ptr(), npoints) };
277277
return ret;
278278
}
279279

@@ -302,7 +302,7 @@ macro_rules! pippenger_mult_impl {
302302
}
303303
unsafe {
304304
let mut t = MaybeUninit::<$point>::uninit();
305-
$add(t.as_mut_ptr(), &p[0], chunk);
305+
$add(t.as_mut_ptr(), p.as_ptr(), chunk);
306306
$add_or_double(&mut acc, &acc, t.as_ptr());
307307
};
308308
processed += 1;

0 commit comments

Comments
 (0)