@@ -3,14 +3,14 @@ use std::array;
3
3
use super :: { AnyBuffer , Buffer , BufferMut } ;
4
4
5
5
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 >
7
7
where
8
8
I : Iterator < Item = AnyBuffer < ' a , ' b > > ;
9
9
}
10
10
11
11
impl < ' a , ' b > FromBuffers < ' a , ' b > for Buffer < ' a , ' b > {
12
12
#[ inline]
13
- fn bind < I > ( buffers : & mut I ) -> Option < Self >
13
+ fn from_buffers < I > ( buffers : & mut I ) -> Option < Self >
14
14
where
15
15
I : Iterator < Item = AnyBuffer < ' a , ' b > > ,
16
16
{
@@ -23,17 +23,17 @@ impl<'a, 'b> FromBuffers<'a, 'b> for Buffer<'a, 'b> {
23
23
24
24
impl < ' a , ' b , const N : usize > FromBuffers < ' a , ' b > for [ & ' b [ f32 ] ; N ] {
25
25
#[ inline]
26
- fn bind < I > ( buffers : & mut I ) -> Option < Self >
26
+ fn from_buffers < I > ( buffers : & mut I ) -> Option < Self >
27
27
where
28
28
I : Iterator < Item = AnyBuffer < ' a , ' b > > ,
29
29
{
30
- Buffer :: bind ( buffers) ?. collect ( )
30
+ Buffer :: from_buffers ( buffers) ?. collect ( )
31
31
}
32
32
}
33
33
34
34
impl < ' a , ' b > FromBuffers < ' a , ' b > for BufferMut < ' a , ' b > {
35
35
#[ inline]
36
- fn bind < I > ( buffers : & mut I ) -> Option < Self >
36
+ fn from_buffers < I > ( buffers : & mut I ) -> Option < Self >
37
37
where
38
38
I : Iterator < Item = AnyBuffer < ' a , ' b > > ,
39
39
{
@@ -46,59 +46,59 @@ impl<'a, 'b> FromBuffers<'a, 'b> for BufferMut<'a, 'b> {
46
46
47
47
impl < ' a , ' b , const N : usize > FromBuffers < ' a , ' b > for [ & ' b mut [ f32 ] ; N ] {
48
48
#[ inline]
49
- fn bind < I > ( buffers : & mut I ) -> Option < Self >
49
+ fn from_buffers < I > ( buffers : & mut I ) -> Option < Self >
50
50
where
51
51
I : Iterator < Item = AnyBuffer < ' a , ' b > > ,
52
52
{
53
- BufferMut :: bind ( buffers) ?. collect ( )
53
+ BufferMut :: from_buffers ( buffers) ?. collect ( )
54
54
}
55
55
}
56
56
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 , ) * )
60
60
where
61
- $( $binding : FromBuffers <' a, ' b>) ,*
61
+ $( $buffer : FromBuffers <' a, ' b>) ,*
62
62
{
63
63
#[ inline]
64
- fn bind <I >( buffers: & mut I ) -> Option <Self >
64
+ fn from_buffers <I >( buffers: & mut I ) -> Option <Self >
65
65
where
66
66
I : Iterator <Item = AnyBuffer <' a, ' b>>,
67
67
{
68
68
Some ( (
69
69
$(
70
- $binding :: bind ( buffers) ?,
70
+ $buffer :: from_buffers ( buffers) ?,
71
71
) *
72
72
) )
73
73
}
74
74
}
75
75
}
76
76
}
77
77
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 ) ;
88
88
89
89
impl < ' a , ' b , const N : usize , B > FromBuffers < ' a , ' b > for [ B ; N ]
90
90
where
91
91
B : FromBuffers < ' a , ' b > ,
92
92
{
93
93
#[ inline]
94
- fn bind < I > ( buffers : & mut I ) -> Option < Self >
94
+ fn from_buffers < I > ( buffers : & mut I ) -> Option < Self >
95
95
where
96
96
I : Iterator < Item = AnyBuffer < ' a , ' b > > ,
97
97
{
98
98
let mut results = array:: from_fn ( |_| None ) ;
99
99
100
100
for result in results. iter_mut ( ) {
101
- * result = Some ( B :: bind ( buffers) ?) ;
101
+ * result = Some ( B :: from_buffers ( buffers) ?) ;
102
102
}
103
103
104
104
Some ( results. map ( |result| result. unwrap ( ) ) )
0 commit comments