Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply clippy fixes #1090

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Apply clippy fixes
jayvdb committed Jan 23, 2025
commit b3a3c5ce28a6e71a91a049c62cf4c344d180212a
4 changes: 2 additions & 2 deletions src/fs/file.rs
Original file line number Diff line number Diff line change
@@ -696,7 +696,7 @@ impl LockGuard<State> {
// file. This call should not block because it doesn't touch the actual file on disk.
if pos == SeekFrom::Current(0) {
// Poll the internal file cursor.
let internal = (&*self.file).seek(SeekFrom::Current(0))?;
let internal = (&*self.file).stream_position()?;

// Factor in the difference caused by caching.
let actual = match self.mode {
@@ -714,7 +714,7 @@ impl LockGuard<State> {
if let Some(new) = (start as i64).checked_add(diff) {
if 0 <= new && new <= self.cache.len() as i64 {
// Poll the internal file cursor.
let internal = (&*self.file).seek(SeekFrom::Current(0))?;
let internal = (&*self.file).stream_position()?;

// Adjust the current position in the read cache.
self.mode = Mode::Reading(new as usize);
2 changes: 1 addition & 1 deletion src/future/poll_fn.rs
Original file line number Diff line number Diff line change
@@ -44,6 +44,6 @@ where
type Output = T;

fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<T> {
(&mut self.f)(cx)
(self.f)(cx)
}
}
4 changes: 2 additions & 2 deletions src/io/buf_read/lines.rs
Original file line number Diff line number Diff line change
@@ -50,7 +50,7 @@ impl<R: BufRead> Stream for Lines<R> {
this.buf.pop();
}
}
Poll::Ready(Some(Ok(mem::replace(this.buf, String::new()))))
Poll::Ready(Some(Ok(mem::take(this.buf))))
}
}

@@ -62,7 +62,7 @@ pub fn read_line_internal<R: BufRead + ?Sized>(
read: &mut usize,
) -> Poll<io::Result<usize>> {
let ret = futures_core::ready!(read_until_internal(reader, cx, b'\n', bytes, read));
if str::from_utf8(&bytes).is_err() {
if str::from_utf8(bytes).is_err() {
Poll::Ready(ret.and_then(|_| {
Err(io::Error::new(
io::ErrorKind::InvalidData,
2 changes: 1 addition & 1 deletion src/io/buf_read/mod.rs
Original file line number Diff line number Diff line change
@@ -136,7 +136,7 @@ pub trait BufReadExt: BufRead {
{
ReadLineFuture {
reader: self,
bytes: unsafe { mem::replace(buf.as_mut_vec(), Vec::new()) },
bytes: unsafe { std::mem::take(buf.as_mut_vec()) },
buf,
read: 0,
}
2 changes: 1 addition & 1 deletion src/io/buf_read/read_line.rs
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ impl<T: BufRead + Unpin + ?Sized> Future for ReadLineFuture<'_, T> {
let reader = Pin::new(reader);

let ret = futures_core::ready!(read_until_internal(reader, cx, b'\n', bytes, read));
if str::from_utf8(&bytes).is_err() {
if str::from_utf8(bytes).is_err() {
Poll::Ready(ret.and_then(|_| {
Err(io::Error::new(
io::ErrorKind::InvalidData,
2 changes: 1 addition & 1 deletion src/io/buf_read/split.rs
Original file line number Diff line number Diff line change
@@ -46,6 +46,6 @@ impl<R: BufRead> Stream for Split<R> {
if this.buf[this.buf.len() - 1] == *this.delim {
this.buf.pop();
}
Poll::Ready(Some(Ok(mem::replace(this.buf, vec![]))))
Poll::Ready(Some(Ok(mem::take(this.buf))))
}
}
2 changes: 1 addition & 1 deletion src/io/read/chain.rs
Original file line number Diff line number Diff line change
@@ -144,7 +144,7 @@ impl<T: BufRead, U: BufRead> BufRead for Chain<T, U> {
let this = self.project();
if !*this.done_first {
match futures_core::ready!(this.first.poll_fill_buf(cx)) {
Ok(buf) if buf.is_empty() => {
Ok([]) => {
*this.done_first = true;
}
Ok(buf) => return Poll::Ready(Ok(buf)),
2 changes: 1 addition & 1 deletion src/io/read/mod.rs
Original file line number Diff line number Diff line change
@@ -168,7 +168,7 @@ pub trait ReadExt: Read {
let start_len = buf.len();
ReadToStringFuture {
reader: self,
bytes: unsafe { mem::replace(buf.as_mut_vec(), Vec::new()) },
bytes: unsafe { mem::take(buf.as_mut_vec()) },
buf,
start_len,
}
2 changes: 1 addition & 1 deletion src/io/read/read_exact.rs
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ impl<T: Read + Unpin + ?Sized> Future for ReadExactFuture<'_, T> {

while !buf.is_empty() {
let n = futures_core::ready!(Pin::new(&mut *reader).poll_read(cx, buf))?;
let (_, rest) = mem::replace(buf, &mut []).split_at_mut(n);
let (_, rest) = mem::take(buf).split_at_mut(n);
*buf = rest;

if n == 0 {
2 changes: 1 addition & 1 deletion src/io/read/read_to_string.rs
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ impl<T: Read + Unpin + ?Sized> Future for ReadToStringFuture<'_, T> {
let reader = Pin::new(reader);

let ret = futures_core::ready!(read_to_end_internal(reader, cx, bytes, *start_len));
if str::from_utf8(&bytes).is_err() {
if str::from_utf8(bytes).is_err() {
Poll::Ready(ret.and_then(|_| {
Err(io::Error::new(
io::ErrorKind::InvalidData,
2 changes: 1 addition & 1 deletion src/io/write/write_all.rs
Original file line number Diff line number Diff line change
@@ -20,7 +20,7 @@ impl<T: Write + Unpin + ?Sized> Future for WriteAllFuture<'_, T> {

while !buf.is_empty() {
let n = futures_core::ready!(Pin::new(&mut **writer).poll_write(cx, buf))?;
let (_, rest) = mem::replace(buf, &[]).split_at(n);
let (_, rest) = mem::take(buf).split_at(n);
*buf = rest;

if n == 0 {
2 changes: 1 addition & 1 deletion src/net/addr.rs
Original file line number Diff line number Diff line change
@@ -280,6 +280,6 @@ impl ToSocketAddrs for String {
impl Future<Output = Self::Iter>,
ToSocketAddrsFuture<Self::Iter>
) {
(&**self).to_socket_addrs()
(**self).to_socket_addrs()
}
}
4 changes: 2 additions & 2 deletions src/path/path.rs
Original file line number Diff line number Diff line change
@@ -261,7 +261,7 @@ impl Path {
/// assert_eq!(ancestors.next(), None);
/// ```
pub fn ancestors(&self) -> Ancestors<'_> {
Ancestors { next: Some(&self) }
Ancestors { next: Some(self) }
}

/// Returns the final component of the `Path`, if there is one.
@@ -1011,7 +1011,7 @@ impl_cmp_os_str!(&'a Path, OsString);

impl<'a> From<&'a std::path::Path> for &'a Path {
fn from(path: &'a std::path::Path) -> &'a Path {
&Path::new(path.as_os_str())
Path::new(path.as_os_str())
}
}

2 changes: 1 addition & 1 deletion src/stream/from_fn.rs
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ where
type Item = T;

fn poll_next(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let item = (&mut self.f)();
let item = (self.f)();
Poll::Ready(item)
}
}
2 changes: 1 addition & 1 deletion src/stream/repeat_with.rs
Original file line number Diff line number Diff line change
@@ -78,7 +78,7 @@ where
type Item = T;

fn poll_next(mut self: Pin<&mut Self>, _: &mut Context<'_>) -> Poll<Option<Self::Item>> {
let item = (&mut self.f)();
let item = (self.f)();
Poll::Ready(Some(item))
}
}
2 changes: 1 addition & 1 deletion src/stream/stream/all.rs
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ where

match next {
Some(v) => {
let result = (&mut self.f)(v);
let result = (self.f)(v);

if result {
// don't forget to wake this task again to pull the next item from stream
2 changes: 1 addition & 1 deletion src/stream/stream/any.rs
Original file line number Diff line number Diff line change
@@ -37,7 +37,7 @@ where

match next {
Some(v) => {
let result = (&mut self.f)(v);
let result = (self.f)(v);

if result {
Poll::Ready(true)
2 changes: 1 addition & 1 deletion src/stream/stream/find.rs
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ where
let item = futures_core::ready!(Pin::new(&mut *self.stream).poll_next(cx));

match item {
Some(v) if (&mut self.p)(&v) => Poll::Ready(Some(v)),
Some(v) if (self.p)(&v) => Poll::Ready(Some(v)),
Some(_) => {
cx.waker().wake_by_ref();
Poll::Pending
2 changes: 1 addition & 1 deletion src/stream/stream/find_map.rs
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ where
let item = futures_core::ready!(Pin::new(&mut *self.stream).poll_next(cx));

match item {
Some(v) => match (&mut self.f)(v) {
Some(v) => match (self.f)(v) {
Some(v) => Poll::Ready(Some(v)),
None => {
cx.waker().wake_by_ref();
2 changes: 1 addition & 1 deletion src/stream/stream/position.rs
Original file line number Diff line number Diff line change
@@ -36,7 +36,7 @@ where

match next {
Some(v) => {
if (&mut self.predicate)(v) {
if (self.predicate)(v) {
Poll::Ready(Some(self.index))
} else {
cx.waker().wake_by_ref();
2 changes: 1 addition & 1 deletion src/stream/stream/try_fold.rs
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ where
match next {
Some(v) => {
let old = self.acc.take().unwrap();
let new = (&mut self.f)(old, v);
let new = (self.f)(old, v);

match new {
Ok(o) => self.acc = Some(o),
2 changes: 1 addition & 1 deletion src/stream/stream/try_for_each.rs
Original file line number Diff line number Diff line change
@@ -33,7 +33,7 @@ where
match item {
None => return Poll::Ready(Ok(())),
Some(v) => {
let res = (&mut self.f)(v);
let res = (self.f)(v);
if let Err(e) = res {
return Poll::Ready(Err(e));
}
2 changes: 1 addition & 1 deletion src/task/builder.rs
Original file line number Diff line number Diff line change
@@ -154,7 +154,7 @@ impl Builder {

thread_local! {
/// Tracks the number of nested block_on calls.
static NUM_NESTED_BLOCKING: Cell<usize> = Cell::new(0);
static NUM_NESTED_BLOCKING: Cell<usize> = const { Cell::new(0) };
}

// Run the future as a task.
2 changes: 1 addition & 1 deletion src/task/task_id.rs
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ impl TaskId {
static COUNTER: AtomicUsize = AtomicUsize::new(1);

let id = COUNTER.fetch_add(1, Ordering::Relaxed);
if id > usize::max_value() / 2 {
if id > usize::MAX / 2 {
std::process::abort();
}
TaskId(id)
2 changes: 1 addition & 1 deletion src/task/task_local.rs
Original file line number Diff line number Diff line change
@@ -120,7 +120,7 @@ impl<T: Send + 'static> LocalKey<T> {
static COUNTER: AtomicU32 = AtomicU32::new(1);

let counter = COUNTER.fetch_add(1, Ordering::Relaxed);
if counter > u32::max_value() / 2 {
if counter > u32::MAX / 2 {
std::process::abort();
}

2 changes: 1 addition & 1 deletion src/task/task_locals_wrapper.rs
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ use crate::utils::abort_on_panic;

thread_local! {
/// A pointer to the currently running task.
static CURRENT: Cell<*const TaskLocalsWrapper> = Cell::new(ptr::null_mut());
static CURRENT: Cell<*const TaskLocalsWrapper> = const { Cell::new(ptr::null_mut()) };
}

/// A wrapper to store task local data.
2 changes: 1 addition & 1 deletion src/utils.rs
Original file line number Diff line number Diff line change
@@ -71,7 +71,7 @@ pub(crate) fn timer_after(dur: std::time::Duration) -> timer::Timer {
Timer::after(dur)
}

#[cfg(any(all(target_arch = "wasm32", feature = "default"),))]
#[cfg(all(target_arch = "wasm32", feature = "default"))]
mod timer {
use std::pin::Pin;
use std::task::Poll;
2 changes: 1 addition & 1 deletion tests/tcp.rs
Original file line number Diff line number Diff line change
@@ -60,7 +60,7 @@ fn smoke_std_stream_to_async_listener() -> io::Result<()> {
let listener = TcpListener::bind("127.0.0.1:0").await?;
let addr = listener.local_addr()?;

let mut std_stream = std::net::TcpStream::connect(&addr)?;
let mut std_stream = std::net::TcpStream::connect(addr)?;
std_stream.write_all(THE_WINTERS_TALE)?;

let mut buf = vec![0; 1024];
4 changes: 2 additions & 2 deletions tests/uds.rs
Original file line number Diff line number Diff line change
@@ -96,7 +96,7 @@ async fn ping_pong_server(listener: UnixListener, iterations: u32) -> std::io::R
let mut s = s?;
let n = s.read(&mut buf[..]).await?;
assert_eq!(&buf[..n], PING);
s.write_all(&PONG).await?;
s.write_all(PONG).await?;
}
}
Ok(())
@@ -106,7 +106,7 @@ async fn ping_pong_client(socket: &std::path::PathBuf, iterations: u32) -> std::
let mut buf = [0; 1024];
for _ix in 0..iterations {
let mut socket = UnixStream::connect(&socket).await?;
socket.write_all(&PING).await?;
socket.write_all(PING).await?;
let n = async_std::io::timeout(TEST_TIMEOUT, socket.read(&mut buf[..])).await?;
assert_eq!(&buf[..n], PONG);
}