Skip to content

Commit 3cc473f

Browse files
committed
rename FromBuffers::bind method to from_buffers
1 parent e39d3c6 commit 3cc473f

File tree

2 files changed

+26
-26
lines changed

2 files changed

+26
-26
lines changed

src/buffers.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ impl<'a, 'b> Buffers<'a, 'b> {
112112
pub fn collect<B: FromBuffers<'a, 'b>>(self) -> Option<B> {
113113
let mut iter = self.into_iter();
114114

115-
let result = B::bind(&mut iter)?;
115+
let result = B::from_buffers(&mut iter)?;
116116

117117
if iter.next().is_none() {
118118
Some(result)

src/buffers/collect.rs

+25-25
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ use std::array;
33
use super::{AnyBuffer, Buffer, BufferMut};
44

55
pub trait FromBuffers<'a, 'b>: Sized {
6-
fn bind<I>(buffers: &mut I) -> Option<Self>
6+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
77
where
88
I: Iterator<Item = AnyBuffer<'a, 'b>>;
99
}
1010

1111
impl<'a, 'b> FromBuffers<'a, 'b> for Buffer<'a, 'b> {
1212
#[inline]
13-
fn bind<I>(buffers: &mut I) -> Option<Self>
13+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
1414
where
1515
I: Iterator<Item = AnyBuffer<'a, 'b>>,
1616
{
@@ -23,17 +23,17 @@ impl<'a, 'b> FromBuffers<'a, 'b> for Buffer<'a, 'b> {
2323

2424
impl<'a, 'b, const N: usize> FromBuffers<'a, 'b> for [&'b [f32]; N] {
2525
#[inline]
26-
fn bind<I>(buffers: &mut I) -> Option<Self>
26+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
2727
where
2828
I: Iterator<Item = AnyBuffer<'a, 'b>>,
2929
{
30-
Buffer::bind(buffers)?.collect()
30+
Buffer::from_buffers(buffers)?.collect()
3131
}
3232
}
3333

3434
impl<'a, 'b> FromBuffers<'a, 'b> for BufferMut<'a, 'b> {
3535
#[inline]
36-
fn bind<I>(buffers: &mut I) -> Option<Self>
36+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
3737
where
3838
I: Iterator<Item = AnyBuffer<'a, 'b>>,
3939
{
@@ -46,59 +46,59 @@ impl<'a, 'b> FromBuffers<'a, 'b> for BufferMut<'a, 'b> {
4646

4747
impl<'a, 'b, const N: usize> FromBuffers<'a, 'b> for [&'b mut [f32]; N] {
4848
#[inline]
49-
fn bind<I>(buffers: &mut I) -> Option<Self>
49+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
5050
where
5151
I: Iterator<Item = AnyBuffer<'a, 'b>>,
5252
{
53-
BufferMut::bind(buffers)?.collect()
53+
BufferMut::from_buffers(buffers)?.collect()
5454
}
5555
}
5656

57-
macro_rules! bind_buffers {
58-
($($binding:ident),*) => {
59-
impl<'a, 'b, $($binding),*> FromBuffers<'a, 'b> for ($($binding,)*)
57+
macro_rules! from_buffers {
58+
($($buffer:ident),*) => {
59+
impl<'a, 'b, $($buffer),*> FromBuffers<'a, 'b> for ($($buffer,)*)
6060
where
61-
$($binding: FromBuffers<'a, 'b>),*
61+
$($buffer: FromBuffers<'a, 'b>),*
6262
{
6363
#[inline]
64-
fn bind<I>(buffers: &mut I) -> Option<Self>
64+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
6565
where
6666
I: Iterator<Item = AnyBuffer<'a, 'b>>,
6767
{
6868
Some((
6969
$(
70-
$binding::bind(buffers)?,
70+
$buffer::from_buffers(buffers)?,
7171
)*
7272
))
7373
}
7474
}
7575
}
7676
}
7777

78-
bind_buffers!(B0);
79-
bind_buffers!(B0, B1);
80-
bind_buffers!(B0, B1, B2);
81-
bind_buffers!(B0, B1, B2, B3);
82-
bind_buffers!(B0, B1, B2, B3, B4);
83-
bind_buffers!(B0, B1, B2, B3, B4, B5);
84-
bind_buffers!(B0, B1, B2, B3, B4, B5, B6);
85-
bind_buffers!(B0, B1, B2, B3, B4, B5, B6, B7);
86-
bind_buffers!(B0, B1, B2, B3, B4, B5, B6, B7, B8);
87-
bind_buffers!(B0, B1, B2, B3, B4, B5, B6, B7, B8, B9);
78+
from_buffers!(B0);
79+
from_buffers!(B0, B1);
80+
from_buffers!(B0, B1, B2);
81+
from_buffers!(B0, B1, B2, B3);
82+
from_buffers!(B0, B1, B2, B3, B4);
83+
from_buffers!(B0, B1, B2, B3, B4, B5);
84+
from_buffers!(B0, B1, B2, B3, B4, B5, B6);
85+
from_buffers!(B0, B1, B2, B3, B4, B5, B6, B7);
86+
from_buffers!(B0, B1, B2, B3, B4, B5, B6, B7, B8);
87+
from_buffers!(B0, B1, B2, B3, B4, B5, B6, B7, B8, B9);
8888

8989
impl<'a, 'b, const N: usize, B> FromBuffers<'a, 'b> for [B; N]
9090
where
9191
B: FromBuffers<'a, 'b>,
9292
{
9393
#[inline]
94-
fn bind<I>(buffers: &mut I) -> Option<Self>
94+
fn from_buffers<I>(buffers: &mut I) -> Option<Self>
9595
where
9696
I: Iterator<Item = AnyBuffer<'a, 'b>>,
9797
{
9898
let mut results = array::from_fn(|_| None);
9999

100100
for result in results.iter_mut() {
101-
*result = Some(B::bind(buffers)?);
101+
*result = Some(B::from_buffers(buffers)?);
102102
}
103103

104104
Some(results.map(|result| result.unwrap()))

0 commit comments

Comments
 (0)