Skip to content

Commit 4c087ea

Browse files
committed
Fix style
Signed-off-by: Michael X. Grey <[email protected]>
1 parent 617e22f commit 4c087ea

File tree

7 files changed

+59
-56
lines changed

7 files changed

+59
-56
lines changed

src/buffer/any_buffer.rs

+14-4
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,10 @@ impl<'w, 's, 'a> AnyBufferMut<'w, 's, 'a> {
389389
/// If the input value does not match the message type of the buffer, this
390390
/// will return [`Err`] and give back an error with the message that you
391391
/// tried to push and the type information for the expected message type.
392-
pub fn push_any(&mut self, value: AnyMessageBox) -> Result<Option<AnyMessageBox>, AnyMessageError> {
392+
pub fn push_any(
393+
&mut self,
394+
value: AnyMessageBox,
395+
) -> Result<Option<AnyMessageBox>, AnyMessageError> {
393396
self.storage.any_push(self.session, value)
394397
}
395398

@@ -525,7 +528,8 @@ trait AnyBufferViewing {
525528

526529
trait AnyBufferManagement: AnyBufferViewing {
527530
fn any_push(&mut self, session: Entity, value: AnyMessageBox) -> AnyMessagePushResult;
528-
fn any_push_as_oldest(&mut self, session: Entity, value: AnyMessageBox) -> AnyMessagePushResult;
531+
fn any_push_as_oldest(&mut self, session: Entity, value: AnyMessageBox)
532+
-> AnyMessagePushResult;
529533
fn any_pull(&mut self, session: Entity) -> Option<AnyMessageBox>;
530534
fn any_pull_newest(&mut self, session: Entity) -> Option<AnyMessageBox>;
531535
fn any_oldest_mut<'a>(&'a mut self, session: Entity) -> Option<AnyMessageMut<'a>>;
@@ -675,7 +679,11 @@ impl<T: 'static + Send + Sync + Any> AnyBufferManagement for Mut<'_, BufferStora
675679
Ok(self.push(session, value).map(to_any_message))
676680
}
677681

678-
fn any_push_as_oldest(&mut self, session: Entity, value: AnyMessageBox) -> AnyMessagePushResult {
682+
fn any_push_as_oldest(
683+
&mut self,
684+
session: Entity,
685+
value: AnyMessageBox,
686+
) -> AnyMessagePushResult {
679687
let value = from_any_message::<T>(value)?;
680688
Ok(self.push_as_oldest(session, value).map(to_any_message))
681689
}
@@ -721,7 +729,9 @@ fn to_any_message<T: 'static + Send + Sync + Any>(x: T) -> AnyMessageBox {
721729
Box::new(x)
722730
}
723731

724-
fn from_any_message<T: 'static + Send + Sync + Any>(value: AnyMessageBox) -> Result<T, AnyMessageError>
732+
fn from_any_message<T: 'static + Send + Sync + Any>(
733+
value: AnyMessageBox,
734+
) -> Result<T, AnyMessageError>
725735
where
726736
T: 'static,
727737
{

src/buffer/buffer_map.rs

+18-23
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ use smallvec::SmallVec;
2424
use bevy_ecs::prelude::{Entity, World};
2525

2626
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,
3030
};
3131

3232
#[derive(Clone, Default)]
@@ -59,7 +59,11 @@ pub struct IncompatibleLayout {
5959

6060
impl IncompatibleLayout {
6161
/// 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>, ()> {
6367
if let Some((name, buffer)) = buffers.inner.get_key_value(expected_name) {
6468
if let Some(buffer) = buffer.downcast_for_message::<Message>() {
6569
return Ok(buffer);
@@ -80,7 +84,11 @@ impl IncompatibleLayout {
8084

8185
/// Check whether a named buffer is compatible with a specialized buffer type,
8286
/// 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, ()> {
8492
if let Some((name, buffer)) = buffers.inner.get_key_value(expected_name) {
8593
if let Some(buffer) = buffer.downcast_buffer::<BufferType>() {
8694
return Ok(buffer);
@@ -139,11 +147,7 @@ impl<T: BufferMapLayout> Buffered for T {
139147
}
140148
}
141149

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> {
147151
let mut min_count = None;
148152

149153
for buffer in self.buffer_list() {
@@ -158,11 +162,7 @@ impl<T: BufferMapLayout> Buffered for T {
158162
Ok(min_count.unwrap_or(0))
159163
}
160164

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 {
166166
for buffer in self.buffer_list() {
167167
buffer.ensure_active_session(session, world)?;
168168
}
@@ -238,7 +238,7 @@ pub trait JoinedValue: 'static + Send + Sync + Sized {
238238

239239
/// Trait to describe a layout of buffer keys
240240
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;
242242
}
243243

244244
impl BufferMapLayout for BufferMap {
@@ -402,10 +402,7 @@ mod tests {
402402
|chain: Chain<_>| chain.connect(buffer_string.input_slot()),
403403
));
404404

405-
builder
406-
.try_join(&buffers)
407-
.unwrap()
408-
.connect(scope.terminate);
405+
builder.try_join(&buffers).unwrap().connect(scope.terminate);
409406
});
410407

411408
let mut promise = context.command(|commands| {
@@ -439,9 +436,7 @@ mod tests {
439436
|chain: Chain<_>| chain.connect(buffers.string.input_slot()),
440437
));
441438

442-
builder
443-
.join(buffers)
444-
.connect(scope.terminate);
439+
builder.join(buffers).connect(scope.terminate);
445440
});
446441

447442
let mut promise = context.command(|commands| {

src/buffer/bufferable.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ use bevy_utils::all_tuples;
1919
use smallvec::SmallVec;
2020

2121
use crate::{
22-
Accessed, AddOperation, Buffer, BufferSettings, Buffered, Builder, Chain,
23-
CloneFromBuffer, Join, Joined, Output, UnusedTarget,
22+
Accessed, AddOperation, Buffer, BufferSettings, Buffered, Builder, Chain, CloneFromBuffer,
23+
Join, Joined, Output, UnusedTarget,
2424
};
2525

2626
pub type BufferKeys<B> = <<B as Bufferable>::BufferType as Accessed>::Key;

src/buffer/buffered.rs

+4-6
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,10 @@ use bevy_utils::all_tuples;
2222
use smallvec::SmallVec;
2323

2424
use crate::{
25-
Buffer, BufferAccessors, BufferKey, BufferKeyBuilder, BufferStorage, CloneFromBuffer,
26-
ForkTargetStorage, Gate, GateState, InspectBuffer, ManageBuffer, OperationError,
27-
OperationResult, OperationRoster, OrBroken, SingleInputStorage, Join, Output,
28-
AddOperation, Chain, Builder, UnusedTarget, Listen, CleanupWorkflowConditions,
29-
Scope, ScopeSettings, BeginCleanupWorkflow,
25+
AddOperation, BeginCleanupWorkflow, Buffer, BufferAccessors, BufferKey, BufferKeyBuilder,
26+
BufferStorage, Builder, Chain, CleanupWorkflowConditions, CloneFromBuffer, ForkTargetStorage,
27+
Gate, GateState, InspectBuffer, Join, Listen, ManageBuffer, OperationError, OperationResult,
28+
OperationRoster, OrBroken, Output, Scope, ScopeSettings, SingleInputStorage, UnusedTarget,
3029
};
3130

3231
pub trait Buffered: 'static + Send + Sync + Clone {
@@ -110,7 +109,6 @@ pub trait Accessed: Buffered {
110109
Output::new(scope, target).chain(builder)
111110
}
112111

113-
114112
/// Alternative way to call [`Builder::on_cleanup`].
115113
fn on_cleanup<Settings>(
116114
self,

src/buffer/json_buffer.rs

+7-8
Original file line numberDiff line numberDiff line change
@@ -1404,7 +1404,11 @@ mod tests {
14041404
impl crate::Joined for TestJoinedValueJsonBuffers {
14051405
type Item = TestJoinedValueJson;
14061406

1407-
fn pull(&self, session: Entity, world: &mut World) -> Result<Self::Item, crate::OperationError> {
1407+
fn pull(
1408+
&self,
1409+
session: Entity,
1410+
world: &mut World,
1411+
) -> Result<Self::Item, crate::OperationError> {
14081412
let integer = self.integer.pull(session, world)?;
14091413
let float = self.float.pull(session, world)?;
14101414
let json = self.json.pull(session, world)?;
@@ -1443,10 +1447,7 @@ mod tests {
14431447
|chain: Chain<_>| chain.connect(buffer_json.input_slot()),
14441448
));
14451449

1446-
builder
1447-
.try_join(&buffers)
1448-
.unwrap()
1449-
.connect(scope.terminate);
1450+
builder.try_join(&buffers).unwrap().connect(scope.terminate);
14501451
});
14511452

14521453
let mut promise = context.command(|commands| {
@@ -1484,9 +1485,7 @@ mod tests {
14841485
|chain: Chain<_>| chain.connect(json_buffer.input_slot()),
14851486
));
14861487

1487-
builder
1488-
.join(buffers)
1489-
.connect(scope.terminate);
1488+
builder.join(buffers).connect(scope.terminate);
14901489
});
14911490

14921491
let mut promise = context.command(|commands| {

src/builder.rs

+10-9
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,13 @@ use std::future::Future;
2222
use smallvec::SmallVec;
2323

2424
use crate::{
25-
AddOperation, AsMap, Buffer, BufferKeys, BufferLocation, BufferMap,
26-
BufferSettings, Bufferable, Buffered, Chain, Collect, ForkClone, ForkCloneOutput,
27-
ForkTargetStorage, Gate, GateRequest, IncompatibleLayout, Injection, InputSlot, IntoAsyncMap,
28-
IntoBlockingMap, JoinedItem, JoinedValue, Node, OperateBuffer, OperateBufferAccess,
29-
OperateDynamicGate, OperateScope, OperateSplit, OperateStaticGate, Output, Provider,
30-
RequestOfMap, ResponseOfMap, Scope, ScopeEndpoints, ScopeSettings, ScopeSettingsStorage,
31-
Sendish, Service, SplitOutputs, Splittable, StreamPack, StreamTargetMap, StreamsOfMap, Trim,
32-
TrimBranch, UnusedTarget, Joined, Accessed,
25+
Accessed, AddOperation, AsMap, Buffer, BufferKeys, BufferLocation, BufferMap, BufferSettings,
26+
Bufferable, Buffered, Chain, Collect, ForkClone, ForkCloneOutput, ForkTargetStorage, Gate,
27+
GateRequest, IncompatibleLayout, Injection, InputSlot, IntoAsyncMap, IntoBlockingMap, Joined,
28+
JoinedItem, JoinedValue, Node, OperateBuffer, OperateBufferAccess, OperateDynamicGate,
29+
OperateScope, OperateSplit, OperateStaticGate, Output, Provider, RequestOfMap, ResponseOfMap,
30+
Scope, ScopeEndpoints, ScopeSettings, ScopeSettingsStorage, Sendish, Service, SplitOutputs,
31+
Splittable, StreamPack, StreamTargetMap, StreamsOfMap, Trim, TrimBranch, UnusedTarget,
3332
};
3433

3534
pub(crate) mod connect;
@@ -456,7 +455,9 @@ impl<'w, 's, 'a> Builder<'w, 's, 'a> {
456455
B::BufferType: Accessed,
457456
Settings: Into<ScopeSettings>,
458457
{
459-
from_buffers.into_buffer(self).on_cleanup_if(self, conditions, build);
458+
from_buffers
459+
.into_buffer(self)
460+
.on_cleanup_if(self, conditions, build);
460461
}
461462

462463
/// Create a node that trims (cancels) other nodes in the workflow when it

src/lib.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -336,10 +336,10 @@ impl Plugin for ImpulsePlugin {
336336
pub mod prelude {
337337
pub use crate::{
338338
buffer::{
339-
Accessible, AnyBuffer, AnyBufferKey, AnyBufferMut, AnyBufferWorldAccess, AnyMessageBox, Buffer,
340-
BufferAccess, BufferAccessMut, BufferKey, BufferKeyMap, BufferMap, BufferMapLayout,
341-
BufferSettings, Bufferable, Buffered, IncompatibleLayout, IterBufferable, Joinable, JoinedValue,
342-
RetentionPolicy,
339+
Accessible, AnyBuffer, AnyBufferKey, AnyBufferMut, AnyBufferWorldAccess, AnyMessageBox,
340+
Buffer, BufferAccess, BufferAccessMut, BufferKey, BufferKeyMap, BufferMap,
341+
BufferMapLayout, BufferSettings, Bufferable, Buffered, IncompatibleLayout,
342+
IterBufferable, Joinable, JoinedValue, RetentionPolicy,
343343
},
344344
builder::Builder,
345345
callback::{AsCallback, Callback, IntoAsyncCallback, IntoBlockingCallback},

0 commit comments

Comments
 (0)