@@ -47,15 +47,15 @@ async fn read_to_end_uring(
4747
4848 // if buffer has no room and no size_hint, start with a small probe_read from 0 offset
4949 if ( size_hint. is_none ( ) || size_hint == Some ( 0 ) ) && buf. capacity ( ) - buf. len ( ) < ( PROBE_SIZE ) {
50- let ( _size_read , _fd , _buf ) = small_probe_read ( fd, buf, offset) . await ?;
50+ let ( size_read , r_fd , r_buf ) = small_probe_read ( fd, buf, offset) . await ?;
5151
52- if _size_read == 0 {
52+ if size_read == 0 {
5353 return Ok ( _buf) ;
5454 }
5555
56- buf = _buf ;
57- fd = _fd ;
58- offset += _size_read as u64 ;
56+ buf = r_buf ;
57+ fd = f_fd ;
58+ offset += size_read as u64 ;
5959 }
6060
6161 loop {
@@ -64,15 +64,15 @@ async fn read_to_end_uring(
6464 // and see if it returns `Ok(0)`. If so, we've avoided an
6565 // unnecessary increasing of the capacity. But if not, append the
6666 // probe buffer to the primary buffer and let its capacity grow.
67- let ( _size_read , _fd , _buf ) = small_probe_read ( fd, buf, offset) . await ?;
67+ let ( size_read , r_fd , r_buf ) = small_probe_read ( fd, buf, offset) . await ?;
6868
69- if _size_read == 0 {
70- return Ok ( _buf ) ;
69+ if size_read == 0 {
70+ return Ok ( r_buf ) ;
7171 }
7272
73- buf = _buf ;
74- fd = _fd ;
75- offset += _size_read as u64 ;
73+ buf = r_buf ;
74+ fd = r_fd ;
75+ offset += size_read as u64 ;
7676 }
7777
7878 // buf is full, need more capacity
@@ -102,26 +102,26 @@ async fn read_to_end_uring(
102102
103103 loop {
104104 // read into spare capacity
105- let ( res, _fd , mut _buf ) = Op :: read ( fd, buf, read_len, offset) . await ;
105+ let ( res, r_fd , mut r_buf ) = Op :: read ( fd, buf, read_len, offset) . await ;
106106
107107 match res {
108- Ok ( _size_read ) => {
109- if _size_read == 0 {
110- return Ok ( _buf ) ;
108+ Ok ( size_read ) => {
109+ if size_read == 0 {
110+ return Ok ( r_buf ) ;
111111 }
112112
113- let size_read_usize = _size_read as usize ;
113+ let size_read_usize = r_size_read as usize ;
114114
115115 let new_len = size_read_usize + _buf. len ( ) ;
116116 // SAFETY: We didn't read more than what as reserved
117117 // as capacity, the _size_read was initialized by the kernel
118118 // via a mutable pointer
119- unsafe { _buf . set_len ( new_len) }
119+ unsafe { r_buf . set_len ( new_len) }
120120
121- fd = _fd ;
122- buf = _buf ;
123- offset += _size_read as u64 ;
124- read_len -= _size_read ;
121+ fd = r_fd ;
122+ buf = r_buf ;
123+ offset += size_read as u64 ;
124+ read_len -= size_read ;
125125
126126 // 1. In case of no size_hint and a large file, if we keep reading
127127 // PROBE_SIZE, we want to increment number of short reads in order to gradually
@@ -143,8 +143,8 @@ async fn read_to_end_uring(
143143 }
144144 Err ( e) => {
145145 if e. kind ( ) == ErrorKind :: Interrupted {
146- buf = _buf ;
147- fd = _fd ;
146+ buf = r_buf ;
147+ fd = r_fd ;
148148
149149 continue ;
150150 } else {
@@ -166,24 +166,24 @@ async fn small_probe_read(
166166 buf. reserve_exact ( PROBE_SIZE ) ;
167167
168168 loop {
169- let ( res, _fd , mut _buf ) = Op :: read ( fd, buf, PROBE_SIZE_U32 , offset) . await ;
169+ let ( res, r_fd , mut r_buf ) = Op :: read ( fd, buf, PROBE_SIZE_U32 , offset) . await ;
170170
171171 match res {
172- Ok ( _size_read ) => {
173- let size_read_usize = _size_read as usize ;
172+ Ok ( size_read ) => {
173+ let size_read_usize = size_read as usize ;
174174
175- let new_len = size_read_usize + _buf . len ( ) ;
175+ let new_len = size_read_usize + r_buf . len ( ) ;
176176 // SAFETY: We didn't read more than what as reserved
177177 // as capacity, the _size_read was initialized by the kernel
178178 // via a mutable pointer
179- unsafe { _buf . set_len ( new_len) }
179+ unsafe { r_buf . set_len ( new_len) }
180180
181- return Ok ( ( _size_read , _fd , _buf ) ) ;
181+ return Ok ( ( r_size_read , r_fd , r_buf ) ) ;
182182 }
183183 Err ( e) => {
184184 if e. kind ( ) == ErrorKind :: Interrupted {
185- buf = _buf ;
186- fd = _fd ;
185+ buf = r_buf ;
186+ fd = r_fd ;
187187
188188 continue ;
189189 } else {
0 commit comments