Skip to content

Commit c97a7fc

Browse files
Use macro implementation for tuple of size 1
Signed-off-by: Luca Della Vedova <[email protected]>
1 parent 903663c commit c97a7fc

File tree

1 file changed

+2
-81
lines changed

1 file changed

+2
-81
lines changed

src/stream.rs

Lines changed: 2 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -484,85 +484,6 @@ impl StreamPack for () {
484484
}
485485
}
486486

487-
impl<T1: StreamPack> StreamPack for (T1,) {
488-
type StreamAvailableBundle = T1::StreamAvailableBundle;
489-
type StreamFilter = T1::StreamFilter;
490-
type StreamStorageBundle = T1::StreamStorageBundle;
491-
type StreamInputPack = T1::StreamInputPack;
492-
type StreamOutputPack = T1::StreamOutputPack;
493-
type Receiver = T1::Receiver;
494-
type Channel = T1::Channel;
495-
type Buffer = T1::Buffer;
496-
497-
fn spawn_scope_streams(
498-
in_scope: Entity,
499-
out_scope: Entity,
500-
commands: &mut Commands,
501-
) -> (
502-
Self::StreamInputPack,
503-
Self::StreamOutputPack,
504-
) {
505-
T1::spawn_scope_streams(in_scope, out_scope, commands)
506-
}
507-
508-
fn spawn_workflow_streams(builder: &mut Builder) -> Self::StreamInputPack {
509-
T1::spawn_workflow_streams(builder)
510-
}
511-
512-
fn spawn_node_streams(
513-
map: &mut StreamTargetMap,
514-
builder: &mut Builder,
515-
) -> (
516-
Self::StreamStorageBundle,
517-
Self::StreamOutputPack,
518-
) {
519-
T1::spawn_node_streams(map, builder)
520-
}
521-
522-
fn take_streams(source: Entity, map: &mut StreamTargetMap, builder: &mut Commands) -> (
523-
Self::StreamStorageBundle,
524-
Self::Receiver,
525-
) {
526-
T1::take_streams(source, map, builder)
527-
}
528-
529-
fn collect_streams(
530-
source: Entity,
531-
target: Entity,
532-
map: &mut StreamTargetMap,
533-
commands: &mut Commands,
534-
) -> Self::StreamStorageBundle {
535-
T1::collect_streams(source, target, map, commands)
536-
}
537-
538-
fn make_channel(
539-
inner: &Arc<InnerChannel>,
540-
world: &World,
541-
) -> Self::Channel {
542-
T1::make_channel(inner, world)
543-
}
544-
545-
fn make_buffer(source: Entity, world: &World) -> Self::Buffer {
546-
T1::make_buffer(source, world)
547-
}
548-
549-
fn process_buffer(
550-
buffer: Self::Buffer,
551-
source: Entity,
552-
session: Entity,
553-
unused: &mut UnusedStreams,
554-
world: &mut World,
555-
roster: &mut OperationRoster,
556-
) -> OperationResult {
557-
T1::process_buffer(buffer, source, session, unused, world, roster)?;
558-
Ok(())
559-
}
560-
561-
fn has_streams() -> bool {
562-
T1::has_streams()
563-
}
564-
}
565-
566487
macro_rules! impl_streampack_for_tuple {
567488
($($T:ident),*) => {
568489
#[allow(non_snake_case)]
@@ -720,9 +641,9 @@ macro_rules! impl_streampack_for_tuple {
720641
}
721642
}
722643

723-
// Implements the `StreamPack` trait for all tuples between size 2 and 12
644+
// Implements the `StreamPack` trait for all tuples between size 1 and 12
724645
// (inclusive) made of types that implement `StreamPack`
725-
all_tuples!(impl_streampack_for_tuple, 2, 12, T);
646+
all_tuples!(impl_streampack_for_tuple, 1, 12, T);
726647

727648
/// Used by [`ServiceDiscovery`](crate::ServiceDiscovery) to filter services
728649
/// based on what streams they provide. If a stream is required, you should wrap

0 commit comments

Comments
 (0)