Skip to content

Commit 941f67d

Browse files
robjtederobjtede
committed
s/e/err
1 parent 3e624b8 commit 941f67d

File tree

9 files changed

+35
-32
lines changed

9 files changed

+35
-32
lines changed

‎actix-codec/src/framed.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ impl<T, U> Framed<T, U> {
193193
match this.codec.decode_eof(this.read_buf) {
194194
Ok(Some(frame)) => return Poll::Ready(Some(Ok(frame))),
195195
Ok(None) => return Poll::Ready(None),
196-
Err(e) => return Poll::Ready(Some(Err(e))),
196+
Err(err) => return Poll::Ready(Some(Err(err))),
197197
}
198198
}
199199

@@ -204,7 +204,7 @@ impl<T, U> Framed<T, U> {
204204
log::trace!("frame decoded from buffer");
205205
return Poll::Ready(Some(Ok(frame)));
206206
}
207-
Err(e) => return Poll::Ready(Some(Err(e))),
207+
Err(err) => return Poll::Ready(Some(Err(err))),
208208
_ => (), // Need more data
209209
}
210210

@@ -221,7 +221,7 @@ impl<T, U> Framed<T, U> {
221221

222222
let cnt = match tokio_util::io::poll_read_buf(this.io, cx, this.read_buf) {
223223
Poll::Pending => return Poll::Pending,
224-
Poll::Ready(Err(e)) => return Poll::Ready(Some(Err(e.into()))),
224+
Poll::Ready(Err(err)) => return Poll::Ready(Some(Err(err.into()))),
225225
Poll::Ready(Ok(cnt)) => cnt,
226226
};
227227

‎actix-codec/tests/test_framed_sink.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ impl Write for Bilateral {
5050
assert_eq!(&data[..], &src[..data.len()]);
5151
Ok(data.len())
5252
}
53-
Some(Err(e)) => Err(e),
53+
Some(Err(err)) => Err(err),
5454
None => panic!("unexpected write; {:?}", src),
5555
}
5656
}
@@ -67,13 +67,13 @@ impl AsyncWrite for Bilateral {
6767
buf: &[u8],
6868
) -> Poll<Result<usize, io::Error>> {
6969
match Pin::get_mut(self).write(buf) {
70-
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Pending,
70+
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => Pending,
7171
other => Ready(other),
7272
}
7373
}
7474
fn poll_flush(self: Pin<&mut Self>, _cx: &mut Context<'_>) -> Poll<Result<(), io::Error>> {
7575
match Pin::get_mut(self).flush() {
76-
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => Pending,
76+
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => Pending,
7777
other => Ready(other),
7878
}
7979
}
@@ -99,8 +99,8 @@ impl AsyncRead for Bilateral {
9999
buf.put_slice(&data);
100100
Ready(Ok(()))
101101
}
102-
Some(Err(ref e)) if e.kind() == WouldBlock => Pending,
103-
Some(Err(e)) => Ready(Err(e)),
102+
Some(Err(ref err)) if err.kind() == WouldBlock => Pending,
103+
Some(Err(err)) => Ready(Err(err)),
104104
None => Ready(Ok(())),
105105
}
106106
}

‎actix-rt/examples/hyper.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ fn main() {
2121
let server =
2222
Server::bind(&SocketAddr::from(([127, 0, 0, 1], 3000))).serve(make_service);
2323

24-
if let Err(e) = server.await {
25-
eprintln!("server error: {}", e);
24+
if let Err(err) = server.await {
25+
eprintln!("server error: {}", err);
2626
}
2727
})
2828
}

‎actix-server/src/accept.rs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,10 @@ impl Accept {
127127
let mut events = mio::Events::with_capacity(256);
128128

129129
loop {
130-
if let Err(e) = self.poll.poll(&mut events, self.timeout) {
131-
match e.kind() {
130+
if let Err(err) = self.poll.poll(&mut events, self.timeout) {
131+
match err.kind() {
132132
io::ErrorKind::Interrupted => {}
133-
_ => panic!("Poll error: {}", e),
133+
_ => panic!("Poll error: {}", err),
134134
}
135135
}
136136

@@ -298,15 +298,15 @@ impl Accept {
298298
fn register_logged(&self, info: &mut ServerSocketInfo) {
299299
match self.register(info) {
300300
Ok(_) => debug!("Resume accepting connections on {}", info.lst.local_addr()),
301-
Err(e) => error!("Can not register server socket {}", e),
301+
Err(err) => error!("Can not register server socket {}", err),
302302
}
303303
}
304304

305305
fn deregister_logged(&self, info: &mut ServerSocketInfo) {
306306
match self.poll.registry().deregister(&mut info.lst) {
307307
Ok(_) => debug!("Paused accepting connections on {}", info.lst.local_addr()),
308-
Err(e) => {
309-
error!("Can not deregister server socket {}", e)
308+
Err(err) => {
309+
error!("Can not deregister server socket {}", err)
310310
}
311311
}
312312
}
@@ -396,10 +396,10 @@ impl Accept {
396396
let conn = Conn { io, token };
397397
self.accept_one(conn);
398398
}
399-
Err(ref e) if e.kind() == io::ErrorKind::WouldBlock => return,
400-
Err(ref e) if connection_error(e) => continue,
401-
Err(e) => {
402-
error!("Error accepting connection: {}", e);
399+
Err(ref err) if err.kind() == io::ErrorKind::WouldBlock => return,
400+
Err(ref err) if connection_error(err) => continue,
401+
Err(err) => {
402+
error!("Error accepting connection: {}", err);
403403

404404
// deregister listener temporary
405405
self.deregister_logged(info);

‎actix-server/src/builder.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -220,10 +220,10 @@ impl ServerBuilder {
220220
{
221221
// The path must not exist when we try to bind.
222222
// Try to remove it to avoid bind error.
223-
if let Err(e) = std::fs::remove_file(addr.as_ref()) {
223+
if let Err(err) = std::fs::remove_file(addr.as_ref()) {
224224
// NotFound is expected and not an issue. Anything else is.
225-
if e.kind() != std::io::ErrorKind::NotFound {
226-
return Err(e);
225+
if err.kind() != std::io::ErrorKind::NotFound {
226+
return Err(err);
227227
}
228228
}
229229

@@ -273,7 +273,7 @@ pub(super) fn bind_addr<S: ToSocketAddrs>(
273273
success = true;
274274
sockets.push(lst);
275275
}
276-
Err(e) => err = Some(e),
276+
Err(err) => err = Some(err),
277277
}
278278
}
279279

‎actix-server/src/service.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ where
7777
});
7878
Ok(())
7979
}
80-
Err(e) => {
81-
error!("Can not convert to an async tcp stream: {}", e);
80+
Err(err) => {
81+
error!("Can not convert to an async tcp stream: {}", err);
8282
Err(())
8383
}
8484
})

‎actix-service/src/map.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -97,7 +97,7 @@ where
9797

9898
match this.fut.poll(cx) {
9999
Poll::Ready(Ok(resp)) => Poll::Ready(Ok((this.f)(resp))),
100-
Poll::Ready(Err(e)) => Poll::Ready(Err(e)),
100+
Poll::Ready(Err(err)) => Poll::Ready(Err(err)),
101101
Poll::Pending => Poll::Pending,
102102
}
103103
}

‎actix-tls/src/connect/openssl.rs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,12 @@ where
141141
trace!("SSL Handshake success: {:?}", stream.hostname());
142142
Poll::Ready(Ok(stream.replace_io(this.io.take().unwrap()).1))
143143
}
144-
Err(e) => {
145-
trace!("SSL Handshake error: {:?}", e);
146-
Poll::Ready(Err(io::Error::new(io::ErrorKind::Other, format!("{}", e))))
144+
Err(err) => {
145+
trace!("SSL Handshake error: {:?}", err);
146+
Poll::Ready(Err(io::Error::new(
147+
io::ErrorKind::Other,
148+
format!("{}", err),
149+
)))
147150
}
148151
}
149152
}

‎actix-tls/src/connect/resolver.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -164,8 +164,8 @@ impl<R: Host> Future for ResolverFut<R> {
164164
Self::LookUp(fut, req) => {
165165
let res = match ready!(Pin::new(fut).poll(cx)) {
166166
Ok(Ok(res)) => Ok(res),
167-
Ok(Err(e)) => Err(ConnectError::Resolver(Box::new(e))),
168-
Err(e) => Err(ConnectError::Io(e.into())),
167+
Ok(Err(err)) => Err(ConnectError::Resolver(Box::new(err))),
168+
Err(err) => Err(ConnectError::Io(err.into())),
169169
};
170170

171171
let req = req.take().unwrap();

0 commit comments

Comments
 (0)