@@ -359,15 +359,15 @@ where
359
359
/// .await?;
360
360
/// # Ok(()) }
361
361
/// ```
362
- pub async fn listen < S > ( mut socket : S , mut sf : impl Agent < S > ) -> Result < ( ) , AgentError >
362
+ pub async fn listen < S > ( mut socket : S , mut agent : impl Agent < S > ) -> Result < ( ) , AgentError >
363
363
where
364
364
S : ListeningSocket + fmt:: Debug + Send ,
365
365
{
366
366
log:: info!( "Listening; socket = {:?}" , socket) ;
367
367
loop {
368
368
match socket. accept ( ) . await {
369
369
Ok ( socket) => {
370
- let session = sf . new_session ( & socket) ;
370
+ let session = agent . new_session ( & socket) ;
371
371
tokio:: spawn ( async move {
372
372
let adapter = Framed :: new ( socket, Codec :: < Request , Response > :: default ( ) ) ;
373
373
if let Err ( e) = handle_socket :: < S > ( session, adapter) . await {
@@ -417,17 +417,17 @@ where
417
417
418
418
/// Bind to a service binding listener.
419
419
#[ cfg( unix) ]
420
- pub async fn bind < SF > ( listener : service_binding:: Listener , sf : SF ) -> Result < ( ) , AgentError >
420
+ pub async fn bind < A > ( listener : service_binding:: Listener , agent : A ) -> Result < ( ) , AgentError >
421
421
where
422
- SF : Agent < tokio:: net:: UnixListener > + Agent < tokio:: net:: TcpListener > ,
422
+ A : Agent < tokio:: net:: UnixListener > + Agent < tokio:: net:: TcpListener > ,
423
423
{
424
424
match listener {
425
425
#[ cfg( unix) ]
426
426
service_binding:: Listener :: Unix ( listener) => {
427
- listen ( UnixListener :: from_std ( listener) ?, sf ) . await
427
+ listen ( UnixListener :: from_std ( listener) ?, agent ) . await
428
428
}
429
429
service_binding:: Listener :: Tcp ( listener) => {
430
- listen ( TcpListener :: from_std ( listener) ?, sf ) . await
430
+ listen ( TcpListener :: from_std ( listener) ?, agent ) . await
431
431
}
432
432
_ => Err ( AgentError :: IO ( std:: io:: Error :: other (
433
433
"Unsupported type of a listener." ,
@@ -437,16 +437,16 @@ where
437
437
438
438
/// Bind to a service binding listener.
439
439
#[ cfg( windows) ]
440
- pub async fn bind < SF > ( listener : service_binding:: Listener , sf : SF ) -> Result < ( ) , AgentError >
440
+ pub async fn bind < A > ( listener : service_binding:: Listener , agent : A ) -> Result < ( ) , AgentError >
441
441
where
442
- SF : Agent < NamedPipeListener > + Agent < tokio:: net:: TcpListener > ,
442
+ A : Agent < NamedPipeListener > + Agent < tokio:: net:: TcpListener > ,
443
443
{
444
444
match listener {
445
445
service_binding:: Listener :: Tcp ( listener) => {
446
- listen ( TcpListener :: from_std ( listener) ?, sf ) . await
446
+ listen ( TcpListener :: from_std ( listener) ?, agent ) . await
447
447
}
448
448
service_binding:: Listener :: NamedPipe ( pipe) => {
449
- listen ( NamedPipeListener :: bind ( pipe) ?, sf ) . await
449
+ listen ( NamedPipeListener :: bind ( pipe) ?, agent ) . await
450
450
}
451
451
}
452
452
}
0 commit comments