@@ -24,9 +24,9 @@ use smallvec::SmallVec;
24
24
use bevy_ecs:: prelude:: { Entity , World } ;
25
25
26
26
use crate :: {
27
- add_listener_to_source, Accessed , AddOperation , AnyBuffer , AnyBufferKey , AnyMessageBox ,
28
- Buffer , BufferKeyBuilder , Buffered , Builder , Chain , Gate , GateState , Join , Joined ,
29
- OperationError , OperationResult , OperationRoster , Output , UnusedTarget , Bufferable ,
27
+ add_listener_to_source, Accessed , AddOperation , AnyBuffer , AnyBufferKey , AnyMessageBox , Buffer ,
28
+ BufferKeyBuilder , Bufferable , Buffered , Builder , Chain , Gate , GateState , Join , Joined ,
29
+ OperationError , OperationResult , OperationRoster , Output , UnusedTarget ,
30
30
} ;
31
31
32
32
#[ derive( Clone , Default ) ]
@@ -59,7 +59,11 @@ pub struct IncompatibleLayout {
59
59
60
60
impl IncompatibleLayout {
61
61
/// Check whether a named buffer is compatible with a specific concrete message type.
62
- pub fn require_message_type < Message : ' static > ( & mut self , expected_name : & str , buffers : & BufferMap ) -> Result < Buffer < Message > , ( ) > {
62
+ pub fn require_message_type < Message : ' static > (
63
+ & mut self ,
64
+ expected_name : & str ,
65
+ buffers : & BufferMap ,
66
+ ) -> Result < Buffer < Message > , ( ) > {
63
67
if let Some ( ( name, buffer) ) = buffers. inner . get_key_value ( expected_name) {
64
68
if let Some ( buffer) = buffer. downcast_for_message :: < Message > ( ) {
65
69
return Ok ( buffer) ;
@@ -80,7 +84,11 @@ impl IncompatibleLayout {
80
84
81
85
/// Check whether a named buffer is compatible with a specialized buffer type,
82
86
/// such as `JsonBuffer`.
83
- pub fn require_buffer_type < BufferType : ' static > ( & mut self , expected_name : & str , buffers : & BufferMap ) -> Result < BufferType , ( ) > {
87
+ pub fn require_buffer_type < BufferType : ' static > (
88
+ & mut self ,
89
+ expected_name : & str ,
90
+ buffers : & BufferMap ,
91
+ ) -> Result < BufferType , ( ) > {
84
92
if let Some ( ( name, buffer) ) = buffers. inner . get_key_value ( expected_name) {
85
93
if let Some ( buffer) = buffer. downcast_buffer :: < BufferType > ( ) {
86
94
return Ok ( buffer) ;
@@ -139,11 +147,7 @@ impl<T: BufferMapLayout> Buffered for T {
139
147
}
140
148
}
141
149
142
- fn buffered_count (
143
- & self ,
144
- session : Entity ,
145
- world : & World ,
146
- ) -> Result < usize , OperationError > {
150
+ fn buffered_count ( & self , session : Entity , world : & World ) -> Result < usize , OperationError > {
147
151
let mut min_count = None ;
148
152
149
153
for buffer in self . buffer_list ( ) {
@@ -158,11 +162,7 @@ impl<T: BufferMapLayout> Buffered for T {
158
162
Ok ( min_count. unwrap_or ( 0 ) )
159
163
}
160
164
161
- fn ensure_active_session (
162
- & self ,
163
- session : Entity ,
164
- world : & mut World ,
165
- ) -> OperationResult {
165
+ fn ensure_active_session ( & self , session : Entity , world : & mut World ) -> OperationResult {
166
166
for buffer in self . buffer_list ( ) {
167
167
buffer. ensure_active_session ( session, world) ?;
168
168
}
@@ -238,7 +238,7 @@ pub trait JoinedValue: 'static + Send + Sync + Sized {
238
238
239
239
/// Trait to describe a layout of buffer keys
240
240
pub trait BufferKeyMap : ' static + Send + Sync + Sized + Clone {
241
- type Buffers : ' static + BufferMapLayout + Accessed < Key = Self > + Send + Sync ;
241
+ type Buffers : ' static + BufferMapLayout + Accessed < Key = Self > + Send + Sync ;
242
242
}
243
243
244
244
impl BufferMapLayout for BufferMap {
@@ -402,10 +402,7 @@ mod tests {
402
402
|chain : Chain < _ > | chain. connect ( buffer_string. input_slot ( ) ) ,
403
403
) ) ;
404
404
405
- builder
406
- . try_join ( & buffers)
407
- . unwrap ( )
408
- . connect ( scope. terminate ) ;
405
+ builder. try_join ( & buffers) . unwrap ( ) . connect ( scope. terminate ) ;
409
406
} ) ;
410
407
411
408
let mut promise = context. command ( |commands| {
@@ -439,9 +436,7 @@ mod tests {
439
436
|chain : Chain < _ > | chain. connect ( buffers. string . input_slot ( ) ) ,
440
437
) ) ;
441
438
442
- builder
443
- . join ( buffers)
444
- . connect ( scope. terminate ) ;
439
+ builder. join ( buffers) . connect ( scope. terminate ) ;
445
440
} ) ;
446
441
447
442
let mut promise = context. command ( |commands| {
0 commit comments