mirror of https://github.com/smol-rs/smol
fix clippy lints
This commit is contained in:
parent
4f24a6df68
commit
b605f2d578
|
@ -17,7 +17,7 @@ use std::net::{SocketAddr, TcpListener, TcpStream};
|
|||
|
||||
use futures::io::{self, BufReader};
|
||||
use futures::prelude::*;
|
||||
use piper::{Receiver, Sender, Arc};
|
||||
use piper::{Arc, Receiver, Sender};
|
||||
use smol::{Async, Task};
|
||||
|
||||
type Client = Arc<Async<TcpStream>>;
|
||||
|
|
|
@ -6,7 +6,7 @@ use futures::prelude::*;
|
|||
|
||||
fn main() {
|
||||
let (s, ctrl_c) = piper::chan(100);
|
||||
let handle = move || drop(s.send(()).now_or_never());
|
||||
let handle = move || s.send(()).now_or_never().unwrap_or(());
|
||||
ctrlc::set_handler(handle).unwrap();
|
||||
|
||||
smol::run(async {
|
||||
|
|
|
@ -50,11 +50,11 @@ fn main() -> Result<()> {
|
|||
tasks -= 1;
|
||||
|
||||
for mut url in links(body) {
|
||||
if url.starts_with("/") {
|
||||
if url.starts_with('/') {
|
||||
url = format!("{}{}", ROOT, url);
|
||||
}
|
||||
if url.starts_with(ROOT) && seen.insert(url.clone()) {
|
||||
url = url.trim_end_matches("/").to_string();
|
||||
url = url.trim_end_matches('/').to_string();
|
||||
queue.push_back(url);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -55,7 +55,7 @@ pub fn block_on<T>(future: impl Future<Output = T>) -> T {
|
|||
|
||||
CACHE.with(|cache| {
|
||||
// Panic if `block_on()` is called recursively.
|
||||
let (parker, waker) = &mut *cache.try_borrow_mut().ok().expect("recursive `block_on()`");
|
||||
let (parker, waker) = &mut *cache.try_borrow_mut().expect("recursive `block_on()`");
|
||||
|
||||
// If enabled, set up tokio before execution begins.
|
||||
context::enter(|| {
|
||||
|
|
|
@ -75,9 +75,12 @@ impl IoEvent {
|
|||
pub async fn notified(&self) {
|
||||
self.0
|
||||
.reader
|
||||
.with(|_| match self.0.flag.load(Ordering::SeqCst) {
|
||||
true => Ok(()),
|
||||
false => Err(io::Error::new(io::ErrorKind::WouldBlock, "")),
|
||||
.with(|_| {
|
||||
if self.0.flag.load(Ordering::SeqCst) {
|
||||
Ok(())
|
||||
} else {
|
||||
Err(io::Error::new(io::ErrorKind::WouldBlock, ""))
|
||||
}
|
||||
})
|
||||
.await
|
||||
.expect("failure while waiting on a self-pipe");
|
||||
|
|
|
@ -434,7 +434,7 @@ mod sys {
|
|||
KEvent::new(fd as _, EventFilter::EVFILT_WRITE, flags, FFLAGS, 0, udata),
|
||||
KEvent::new(fd as _, EventFilter::EVFILT_READ, flags, FFLAGS, 0, udata),
|
||||
];
|
||||
let mut eventlist = changelist.clone();
|
||||
let mut eventlist = changelist;
|
||||
kevent_ts(self.0, &changelist, &mut eventlist, None).map_err(io_err)?;
|
||||
for ev in &eventlist {
|
||||
// See https://github.com/tokio-rs/mio/issues/582
|
||||
|
@ -454,7 +454,7 @@ mod sys {
|
|||
KEvent::new(fd as _, EventFilter::EVFILT_WRITE, flags, FFLAGS, 0, 0),
|
||||
KEvent::new(fd as _, EventFilter::EVFILT_READ, flags, FFLAGS, 0, 0),
|
||||
];
|
||||
let mut eventlist = changelist.clone();
|
||||
let mut eventlist = changelist;
|
||||
kevent_ts(self.0, &changelist, &mut eventlist, None).map_err(io_err)?;
|
||||
for ev in &eventlist {
|
||||
let (flags, data) = (ev.flags(), ev.data());
|
||||
|
|
Loading…
Reference in New Issue