Skip to content

Commit e68c620

Browse files
authored
Merge pull request #247 from H1rono/rename-on-event
💥 Rename `{EventKind}Service` to `On{EventKind}`
2 parents 8bbdf9b + 1220841 commit e68c620

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

src/macros.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -448,15 +448,15 @@ macro_rules! event_service {
448448
) => { ::paste::paste! {
449449
$( #[$m] )*
450450
$v struct
451-
[< $e:camel Service >] <Service, Fallback, Req>
451+
[< On $e:camel >] <Service, Fallback, Req>
452452
{
453453
_req: ::std::marker::PhantomData<Req>,
454454
inner: Service,
455455
fallback: Fallback,
456456
}
457457

458458
impl<Service, Fallback> ::tower::Service<$crate::Event>
459-
for [< $e:camel Service >] <Service, Fallback, $crate::payloads::[< $e:camel Payload >] >
459+
for [< On $e:camel >] <Service, Fallback, $crate::payloads::[< $e:camel Payload >] >
460460
where
461461
Service: ::tower::Service<$crate::payloads::[< $e:camel Payload >], Response = ()>,
462462
Service::Error: ::std::convert::Into<::std::boxed::Box<
@@ -473,7 +473,7 @@ macro_rules! event_service {
473473
}
474474

475475
impl<State, Service, Fallback> ::tower::Service<(State, $crate::handler::Event)>
476-
for [< $e:camel Service >] <Service, Fallback, $crate::payloads::[< $e:camel Payload >] >
476+
for [< On $e:camel >] <Service, Fallback, $crate::payloads::[< $e:camel Payload >] >
477477
where
478478
Service: ::tower::Service<$crate::payloads::[< $e:camel Payload >], Response = ()>,
479479
Service::Error: ::std::convert::Into<::std::boxed::Box<
@@ -490,7 +490,7 @@ macro_rules! event_service {
490490
}
491491

492492
impl<State, Service, Fallback> ::tower::Service<(State, $crate::handler::Event)>
493-
for [< $e:camel Service >] <Service, Fallback, ($crate::payloads::[< $e:camel Payload >],) >
493+
for [< On $e:camel >] <Service, Fallback, ($crate::payloads::[< $e:camel Payload >],) >
494494
where
495495
Service: ::tower::Service<
496496
($crate::payloads::[< $e:camel Payload >],),
@@ -510,7 +510,7 @@ macro_rules! event_service {
510510
}
511511

512512
impl<State, Service, Fallback> ::tower::Service<(State, $crate::handler::Event)>
513-
for [< $e:camel Service >] <Service, Fallback, (State, $crate::payloads::[< $e:camel Payload >] )>
513+
for [< On $e:camel >] <Service, Fallback, (State, $crate::payloads::[< $e:camel Payload >] )>
514514
where
515515
Service: ::tower::Service<
516516
(State, $crate::payloads::[< $e:camel Payload >]),
@@ -541,7 +541,7 @@ macro_rules! handler_on_events {
541541
$(
542542
$( #[$m] )*
543543
$v fn [< on_ $e:snake:lower >] <Service2, Req> (self, service: Service2)
544-
-> $crate::Handler<$crate::handler::[< $e:camel Service >] <Service2, Service1, Req>>
544+
-> $crate::Handler<$crate::handler::[< On $e:camel >] <Service2, Service1, Req>>
545545
where
546546
Service2: ::tower::Service<Req>,
547547
{
@@ -550,7 +550,7 @@ macro_rules! handler_on_events {
550550
parser,
551551
} = self;
552552
$crate::Handler {
553-
service: $crate::handler::[< $e:camel Service >] {
553+
service: $crate::handler::[< On $e:camel >] {
554554
_req: ::std::marker::PhantomData,
555555
inner: service,
556556
fallback,

0 commit comments

Comments
 (0)