@@ -90,9 +90,8 @@ impl ActiveSocketData {
9090// Put the buffer back and try again later.
9191self . send_queue . push_front ( Outgoing { addr, buffer, result} ) ;
9292} else {
93- let cause =format ! ( "failed to send on socket: {:?}" , errno) ;
94- error ! ( "poll_send(): {}" , cause) ;
95- result. set ( Some ( Err ( Fail :: new ( errno, & cause) ) ) ) ;
93+ error ! ( "poll_send(): failed on socket: {:?}" , errno) ;
94+ result. set ( Some ( Err ( Fail :: new ( errno, "send failed on socket" ) ) ) ) ;
9695}
9796} ,
9897}
@@ -126,9 +125,8 @@ impl ActiveSocketData {
126125Err ( e) =>{
127126let errno =get_libc_err ( e) ;
128127if !DemiRuntime :: should_retry ( errno) {
129- let cause =format ! ( "failed to receive on socket: {:?}" , errno) ;
130- error ! ( "poll_recv(): {}" , cause) ;
131- self . recv_queue . push ( Err ( Fail :: new ( errno, & cause) ) ) ;
128+ error ! ( "poll_recv(): failed on socket: {:?}" , errno) ;
129+ self . recv_queue . push ( Err ( Fail :: new ( errno, "receive failed on socket" ) ) ) ;
132130}
133131} ,
134132}
@@ -153,21 +151,22 @@ impl ActiveSocketData {
153151}
154152}
155153
156- ///Pops data from the socket. Blocks until some data is found but does not wait until the buf has reached [size].
154+ /// Blocks until some data is found but does not wait until the buf has reached [size].
157155pub async fn pop (
158156& mut self ,
159157size : usize ,
160158timeout : Option < Duration > ,
161159) ->Result < ( Option < SocketAddr > , DemiBuffer ) , Fail > {
162160let ( addr, mut buffer) =self . recv_queue . pop ( timeout) . await ??;
163- // Figure out how much data we got.
164161let bytes_read =min ( buffer. len ( ) , size) ;
162+
165163// Trim the buffer and leave for next read if we got more than expected.
166164if let Ok ( remainder) = buffer. split_back ( bytes_read) {
167165if !remainder. is_empty ( ) {
168- self . push_front ( remainder, addr. clone ( ) ) ;
166+ self . push_front ( remainder, addr) ;
169167}
170168}
169+
171170Ok ( ( addr, buffer) )
172171}
173172