forked from mirror/async-std
Merge pull request #571 from killercup/more-errors
Add context to more errors
This commit is contained in:
commit
46cafffc31
22 changed files with 220 additions and 45 deletions
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::{Path, PathBuf};
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Returns the canonical form of a path.
|
||||
///
|
||||
|
@ -32,5 +33,10 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn canonicalize<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::canonicalize(&path).map(Into::into)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::canonicalize(&path)
|
||||
.map(Into::into)
|
||||
.context(|| format!("could not canonicalize `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Copies the contents and permissions of a file to a new location.
|
||||
///
|
||||
|
@ -41,5 +42,9 @@ use crate::task::spawn_blocking;
|
|||
pub async fn copy<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<u64> {
|
||||
let from = from.as_ref().to_owned();
|
||||
let to = to.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::copy(&from, &to)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::copy(&from, &to)
|
||||
.context(|| format!("could not copy `{}` to `{}`", from.display(), to.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Creates a new directory.
|
||||
///
|
||||
|
@ -34,5 +35,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn create_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::create_dir(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::create_dir(&path)
|
||||
.context(|| format!("could not create directory `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Creates a new directory and all of its parents if they are missing.
|
||||
///
|
||||
|
@ -29,5 +30,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn create_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::create_dir_all(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::create_dir_all(&path)
|
||||
.context(|| format!("could not create directory path `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -9,11 +9,11 @@ use std::sync::{Arc, Mutex};
|
|||
|
||||
use crate::fs::{Metadata, Permissions};
|
||||
use crate::future;
|
||||
use crate::utils::Context as _;
|
||||
use crate::io::{self, Read, Seek, SeekFrom, Write};
|
||||
use crate::path::Path;
|
||||
use crate::prelude::*;
|
||||
use crate::task::{self, spawn_blocking, Context, Poll, Waker};
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// An open file on the filesystem.
|
||||
///
|
||||
|
@ -114,8 +114,7 @@ impl File {
|
|||
pub async fn open<P: AsRef<Path>>(path: P) -> io::Result<File> {
|
||||
let path = path.as_ref().to_owned();
|
||||
let file = spawn_blocking(move || {
|
||||
std::fs::File::open(&path)
|
||||
.context(|| format!("Could not open {}", path.display()))
|
||||
std::fs::File::open(&path).context(|| format!("could not open `{}`", path.display()))
|
||||
})
|
||||
.await?;
|
||||
Ok(File::new(file, true))
|
||||
|
@ -154,7 +153,7 @@ impl File {
|
|||
let path = path.as_ref().to_owned();
|
||||
let file = spawn_blocking(move || {
|
||||
std::fs::File::create(&path)
|
||||
.context(|| format!("Could not create {}", path.display()))
|
||||
.context(|| format!("could not create `{}`", path.display()))
|
||||
})
|
||||
.await?;
|
||||
Ok(File::new(file, true))
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Creates a hard link on the filesystem.
|
||||
///
|
||||
|
@ -32,5 +33,14 @@ use crate::task::spawn_blocking;
|
|||
pub async fn hard_link<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
|
||||
let from = from.as_ref().to_owned();
|
||||
let to = to.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::hard_link(&from, &to)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::hard_link(&from, &to).context(|| {
|
||||
format!(
|
||||
"could not create a hard link from `{}` to `{}`",
|
||||
from.display(),
|
||||
to.display()
|
||||
)
|
||||
})
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Reads the entire contents of a file as raw bytes.
|
||||
///
|
||||
|
@ -36,5 +37,8 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn read<P: AsRef<Path>>(path: P) -> io::Result<Vec<u8>> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::read(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::read(&path).context(|| format!("could not read file `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
use std::pin::Pin;
|
||||
use std::future::Future;
|
||||
use std::pin::Pin;
|
||||
|
||||
use crate::fs::DirEntry;
|
||||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::stream::Stream;
|
||||
use crate::task::{spawn_blocking, Context, JoinHandle, Poll};
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Returns a stream of entries in a directory.
|
||||
///
|
||||
|
@ -45,9 +46,12 @@ use crate::task::{spawn_blocking, Context, JoinHandle, Poll};
|
|||
/// ```
|
||||
pub async fn read_dir<P: AsRef<Path>>(path: P) -> io::Result<ReadDir> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::read_dir(path))
|
||||
.await
|
||||
.map(ReadDir::new)
|
||||
spawn_blocking(move || {
|
||||
std::fs::read_dir(&path)
|
||||
.context(|| format!("could not read directory `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
.map(ReadDir::new)
|
||||
}
|
||||
|
||||
/// A stream of entries in a directory.
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::{Path, PathBuf};
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Reads a symbolic link and returns the path it points to.
|
||||
///
|
||||
|
@ -28,5 +29,10 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn read_link<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::read_link(path).map(Into::into)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::read_link(&path)
|
||||
.map(Into::into)
|
||||
.context(|| format!("could not read link `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Reads the entire contents of a file as a string.
|
||||
///
|
||||
|
@ -37,5 +38,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn read_to_string<P: AsRef<Path>>(path: P) -> io::Result<String> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::read_to_string(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::read_to_string(&path)
|
||||
.context(|| format!("could not read file `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Removes an empty directory.
|
||||
///
|
||||
|
@ -29,5 +30,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn remove_dir<P: AsRef<Path>>(path: P) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::remove_dir(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::remove_dir(&path)
|
||||
.context(|| format!("could not remove directory `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Removes a directory and all of its contents.
|
||||
///
|
||||
|
@ -29,5 +30,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn remove_dir_all<P: AsRef<Path>>(path: P) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::remove_dir_all(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::remove_dir_all(&path)
|
||||
.context(|| format!("could not remove directory `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Removes a file.
|
||||
///
|
||||
|
@ -29,5 +30,9 @@ use crate::task::spawn_blocking;
|
|||
/// ```
|
||||
pub async fn remove_file<P: AsRef<Path>>(path: P) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::remove_file(path)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::remove_file(&path)
|
||||
.context(|| format!("could not remove file `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Renames a file or directory to a new location.
|
||||
///
|
||||
|
@ -34,5 +35,14 @@ use crate::task::spawn_blocking;
|
|||
pub async fn rename<P: AsRef<Path>, Q: AsRef<Path>>(from: P, to: Q) -> io::Result<()> {
|
||||
let from = from.as_ref().to_owned();
|
||||
let to = to.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::rename(&from, &to)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::rename(&from, &to).context(|| {
|
||||
format!(
|
||||
"could not rename `{}` to `{}`",
|
||||
from.display(),
|
||||
to.display()
|
||||
)
|
||||
})
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
use crate::io;
|
||||
use crate::path::Path;
|
||||
use crate::task::spawn_blocking;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Writes a slice of bytes as the new contents of a file.
|
||||
///
|
||||
|
@ -33,5 +34,9 @@ use crate::task::spawn_blocking;
|
|||
pub async fn write<P: AsRef<Path>, C: AsRef<[u8]>>(path: P, contents: C) -> io::Result<()> {
|
||||
let path = path.as_ref().to_owned();
|
||||
let contents = contents.as_ref().to_owned();
|
||||
spawn_blocking(move || std::fs::write(path, contents)).await
|
||||
spawn_blocking(move || {
|
||||
std::fs::write(&path, contents)
|
||||
.context(|| format!("could not write to file `{}`", path.display()))
|
||||
})
|
||||
.await
|
||||
}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
use std::pin::Pin;
|
||||
use std::future::Future;
|
||||
use std::pin::Pin;
|
||||
|
||||
use pin_project_lite::pin_project;
|
||||
|
||||
use crate::io::{self, BufRead, BufReader, Read, Write};
|
||||
use crate::task::{Context, Poll};
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// Copies the entire contents of a reader into a writer.
|
||||
///
|
||||
|
@ -90,7 +91,7 @@ where
|
|||
writer,
|
||||
amt: 0,
|
||||
};
|
||||
future.await
|
||||
future.await.context(|| String::from("io::copy failed"))
|
||||
}
|
||||
|
||||
/// Copies the entire contents of a reader into a writer.
|
||||
|
@ -177,5 +178,5 @@ where
|
|||
writer,
|
||||
amt: 0,
|
||||
};
|
||||
future.await
|
||||
future.await.context(|| String::from("io::copy failed"))
|
||||
}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
use std::future::Future;
|
||||
use std::pin::Pin;
|
||||
use std::sync::Mutex;
|
||||
use std::future::Future;
|
||||
|
||||
use crate::future;
|
||||
use crate::io::{self, Read};
|
||||
use crate::task::{spawn_blocking, Context, JoinHandle, Poll};
|
||||
use crate::utils::Context as _;
|
||||
|
||||
cfg_unstable! {
|
||||
use once_cell::sync::Lazy;
|
||||
|
@ -162,6 +163,7 @@ impl Stdin {
|
|||
}
|
||||
})
|
||||
.await
|
||||
.context(|| String::from("could not read line on stdin"))
|
||||
}
|
||||
|
||||
/// Locks this handle to the standard input stream, returning a readable guard.
|
||||
|
|
|
@ -1,11 +1,12 @@
|
|||
use std::future::Future;
|
||||
use std::mem;
|
||||
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr};
|
||||
use std::net::{SocketAddr, SocketAddrV4, SocketAddrV6};
|
||||
use std::pin::Pin;
|
||||
use std::future::Future;
|
||||
|
||||
use crate::io;
|
||||
use crate::task::{spawn_blocking, Context, JoinHandle, Poll};
|
||||
use crate::utils::Context as ErrorContext;
|
||||
|
||||
cfg_not_docs! {
|
||||
macro_rules! ret {
|
||||
|
@ -67,6 +68,18 @@ pub enum ToSocketAddrsFuture<I> {
|
|||
Done,
|
||||
}
|
||||
|
||||
/// Wrap `std::io::Error` with additional message
|
||||
///
|
||||
/// Keeps the original error kind and stores the original I/O error as `source`.
|
||||
impl<T> ErrorContext for ToSocketAddrsFuture<T> {
|
||||
fn context(self, message: impl Fn() -> String) -> Self {
|
||||
match self {
|
||||
ToSocketAddrsFuture::Ready(res) => ToSocketAddrsFuture::Ready(res.context(message)),
|
||||
x => x,
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl<I: Iterator<Item = SocketAddr>> Future for ToSocketAddrsFuture<I> {
|
||||
type Output = io::Result<I>;
|
||||
|
||||
|
@ -110,7 +123,9 @@ impl ToSocketAddrs for SocketAddrV4 {
|
|||
impl Future<Output = Self::Iter>,
|
||||
ToSocketAddrsFuture<Self::Iter>
|
||||
) {
|
||||
SocketAddr::V4(*self).to_socket_addrs()
|
||||
SocketAddr::V4(*self)
|
||||
.to_socket_addrs()
|
||||
.context(|| format!("could not resolve address `{}`", self))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -123,7 +138,9 @@ impl ToSocketAddrs for SocketAddrV6 {
|
|||
impl Future<Output = Self::Iter>,
|
||||
ToSocketAddrsFuture<Self::Iter>
|
||||
) {
|
||||
SocketAddr::V6(*self).to_socket_addrs()
|
||||
SocketAddr::V6(*self)
|
||||
.to_socket_addrs()
|
||||
.context(|| format!("could not resolve address `{}`", self))
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -195,7 +212,9 @@ impl ToSocketAddrs for (&str, u16) {
|
|||
|
||||
let host = host.to_string();
|
||||
let task = spawn_blocking(move || {
|
||||
std::net::ToSocketAddrs::to_socket_addrs(&(host.as_str(), port))
|
||||
let addr = (host.as_str(), port);
|
||||
std::net::ToSocketAddrs::to_socket_addrs(&addr)
|
||||
.context(|| format!("could not resolve address `{:?}`", addr))
|
||||
});
|
||||
ToSocketAddrsFuture::Resolving(task)
|
||||
}
|
||||
|
@ -215,7 +234,10 @@ impl ToSocketAddrs for str {
|
|||
}
|
||||
|
||||
let addr = self.to_string();
|
||||
let task = spawn_blocking(move || std::net::ToSocketAddrs::to_socket_addrs(addr.as_str()));
|
||||
let task = spawn_blocking(move || {
|
||||
std::net::ToSocketAddrs::to_socket_addrs(addr.as_str())
|
||||
.context(|| format!("could not resolve address `{:?}`", addr))
|
||||
});
|
||||
ToSocketAddrsFuture::Resolving(task)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use std::net::SocketAddr;
|
||||
use std::future::Future;
|
||||
use std::net::SocketAddr;
|
||||
use std::pin::Pin;
|
||||
|
||||
use crate::future;
|
||||
|
@ -75,8 +75,11 @@ impl TcpListener {
|
|||
/// [`local_addr`]: #method.local_addr
|
||||
pub async fn bind<A: ToSocketAddrs>(addrs: A) -> io::Result<TcpListener> {
|
||||
let mut last_err = None;
|
||||
let addrs = addrs
|
||||
.to_socket_addrs()
|
||||
.await?;
|
||||
|
||||
for addr in addrs.to_socket_addrs().await? {
|
||||
for addr in addrs {
|
||||
match mio::net::TcpListener::bind(&addr) {
|
||||
Ok(mio_listener) => {
|
||||
return Ok(TcpListener {
|
||||
|
|
|
@ -7,6 +7,7 @@ use crate::io::{self, Read, Write};
|
|||
use crate::net::driver::Watcher;
|
||||
use crate::net::ToSocketAddrs;
|
||||
use crate::task::{spawn_blocking, Context, Poll};
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// A TCP stream between a local and a remote socket.
|
||||
///
|
||||
|
@ -71,11 +72,16 @@ impl TcpStream {
|
|||
/// ```
|
||||
pub async fn connect<A: ToSocketAddrs>(addrs: A) -> io::Result<TcpStream> {
|
||||
let mut last_err = None;
|
||||
let addrs = addrs
|
||||
.to_socket_addrs()
|
||||
.await?;
|
||||
|
||||
for addr in addrs.to_socket_addrs().await? {
|
||||
for addr in addrs {
|
||||
let res = spawn_blocking(move || {
|
||||
let std_stream = std::net::TcpStream::connect(addr)?;
|
||||
let mio_stream = mio::net::TcpStream::from_stream(std_stream)?;
|
||||
let std_stream = std::net::TcpStream::connect(addr)
|
||||
.context(|| format!("could not connect to {}", addr))?;
|
||||
let mio_stream = mio::net::TcpStream::from_stream(std_stream)
|
||||
.context(|| format!("could not open async connection to {}", addr))?;
|
||||
Ok(TcpStream {
|
||||
watcher: Watcher::new(mio_stream),
|
||||
})
|
||||
|
|
|
@ -5,6 +5,7 @@ use std::net::{Ipv4Addr, Ipv6Addr};
|
|||
use crate::future;
|
||||
use crate::net::driver::Watcher;
|
||||
use crate::net::ToSocketAddrs;
|
||||
use crate::utils::Context as _;
|
||||
|
||||
/// A UDP socket.
|
||||
///
|
||||
|
@ -66,10 +67,13 @@ impl UdpSocket {
|
|||
/// #
|
||||
/// # Ok(()) }) }
|
||||
/// ```
|
||||
pub async fn bind<A: ToSocketAddrs>(addr: A) -> io::Result<UdpSocket> {
|
||||
pub async fn bind<A: ToSocketAddrs>(addrs: A) -> io::Result<UdpSocket> {
|
||||
let mut last_err = None;
|
||||
let addrs = addrs
|
||||
.to_socket_addrs()
|
||||
.await?;
|
||||
|
||||
for addr in addr.to_socket_addrs().await? {
|
||||
for addr in addrs {
|
||||
match mio::net::UdpSocket::bind(&addr) {
|
||||
Ok(mio_socket) => {
|
||||
return Ok(UdpSocket {
|
||||
|
@ -106,7 +110,10 @@ impl UdpSocket {
|
|||
/// # Ok(()) }) }
|
||||
/// ```
|
||||
pub fn local_addr(&self) -> io::Result<SocketAddr> {
|
||||
self.watcher.get_ref().local_addr()
|
||||
self.watcher
|
||||
.get_ref()
|
||||
.local_addr()
|
||||
.context(|| String::from("could not get local address"))
|
||||
}
|
||||
|
||||
/// Sends data on the socket to the given address.
|
||||
|
@ -151,6 +158,7 @@ impl UdpSocket {
|
|||
.poll_write_with(cx, |inner| inner.send_to(buf, &addr))
|
||||
})
|
||||
.await
|
||||
.context(|| format!("could not send packet to {}", addr))
|
||||
}
|
||||
|
||||
/// Receives data from the socket.
|
||||
|
@ -178,6 +186,17 @@ impl UdpSocket {
|
|||
.poll_read_with(cx, |inner| inner.recv_from(buf))
|
||||
})
|
||||
.await
|
||||
.context(|| {
|
||||
use std::fmt::Write;
|
||||
|
||||
let mut error = String::from("could not receive data on ");
|
||||
if let Ok(addr) = self.local_addr() {
|
||||
let _ = write!(&mut error, "{}", addr);
|
||||
} else {
|
||||
error.push_str("socket");
|
||||
}
|
||||
error
|
||||
})
|
||||
}
|
||||
|
||||
/// Connects the UDP socket to a remote address.
|
||||
|
@ -195,7 +214,7 @@ impl UdpSocket {
|
|||
/// ```no_run
|
||||
/// # fn main() -> std::io::Result<()> { async_std::task::block_on(async {
|
||||
/// #
|
||||
/// use async_std::net::UdpSocket;
|
||||
/// use async_std::net::UdpSocket;
|
||||
///
|
||||
/// let socket = UdpSocket::bind("127.0.0.1:0").await?;
|
||||
/// socket.connect("127.0.0.1:8080").await?;
|
||||
|
@ -204,8 +223,12 @@ impl UdpSocket {
|
|||
/// ```
|
||||
pub async fn connect<A: ToSocketAddrs>(&self, addrs: A) -> io::Result<()> {
|
||||
let mut last_err = None;
|
||||
let addrs = addrs
|
||||
.to_socket_addrs()
|
||||
.await
|
||||
.context(|| String::from("could not resolve addresses"))?;
|
||||
|
||||
for addr in addrs.to_socket_addrs().await? {
|
||||
for addr in addrs {
|
||||
// TODO(stjepang): connect on the blocking pool
|
||||
match self.watcher.get_ref().connect(addr) {
|
||||
Ok(()) => return Ok(()),
|
||||
|
@ -248,7 +271,19 @@ impl UdpSocket {
|
|||
/// # Ok(()) }) }
|
||||
/// ```
|
||||
pub async fn send(&self, buf: &[u8]) -> io::Result<usize> {
|
||||
future::poll_fn(|cx| self.watcher.poll_write_with(cx, |inner| inner.send(buf))).await
|
||||
future::poll_fn(|cx| self.watcher.poll_write_with(cx, |inner| inner.send(buf)))
|
||||
.await
|
||||
.context(|| {
|
||||
use std::fmt::Write;
|
||||
|
||||
let mut error = String::from("could not send data on ");
|
||||
if let Ok(addr) = self.local_addr() {
|
||||
let _ = write!(&mut error, "{}", addr);
|
||||
} else {
|
||||
error.push_str("socket");
|
||||
}
|
||||
error
|
||||
})
|
||||
}
|
||||
|
||||
/// Receives data from the socket.
|
||||
|
@ -271,7 +306,19 @@ impl UdpSocket {
|
|||
/// # Ok(()) }) }
|
||||
/// ```
|
||||
pub async fn recv(&self, buf: &mut [u8]) -> io::Result<usize> {
|
||||
future::poll_fn(|cx| self.watcher.poll_read_with(cx, |inner| inner.recv(buf))).await
|
||||
future::poll_fn(|cx| self.watcher.poll_read_with(cx, |inner| inner.recv(buf)))
|
||||
.await
|
||||
.context(|| {
|
||||
use std::fmt::Write;
|
||||
|
||||
let mut error = String::from("could not receive data on ");
|
||||
if let Ok(addr) = self.local_addr() {
|
||||
let _ = write!(&mut error, "{}", addr);
|
||||
} else {
|
||||
error.push_str("socket");
|
||||
}
|
||||
error
|
||||
})
|
||||
}
|
||||
|
||||
/// Gets the value of the `SO_BROADCAST` option for this socket.
|
||||
|
@ -415,7 +462,7 @@ impl UdpSocket {
|
|||
/// use async_std::net::UdpSocket;
|
||||
///
|
||||
/// let socket_addr = SocketAddr::new(Ipv6Addr::new(0, 0, 0, 0, 0, 0, 0, 0).into(), 0);
|
||||
/// let mdns_addr = Ipv6Addr::new(0xFF02, 0, 0, 0, 0, 0, 0, 0x0123) ;
|
||||
/// let mdns_addr = Ipv6Addr::new(0xFF02, 0, 0, 0, 0, 0, 0, 0x0123);
|
||||
/// let socket = UdpSocket::bind(&socket_addr).await?;
|
||||
///
|
||||
/// socket.join_multicast_v6(&mdns_addr, 0)?;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
use async_std::{fs, task};
|
||||
use async_std::{fs, io, net::ToSocketAddrs, task};
|
||||
|
||||
#[test]
|
||||
fn open_file() {
|
||||
|
@ -8,7 +8,22 @@ fn open_file() {
|
|||
match res {
|
||||
Ok(_) => panic!("Found file with random name: We live in a simulation"),
|
||||
Err(e) => assert_eq!(
|
||||
"Could not open /ashjudlkahasdasdsikdhajik/asdasdasdasdasdasd/fjuiklashdbflasas",
|
||||
"Could not open `/ashjudlkahasdasdsikdhajik/asdasdasdasdasdasd/fjuiklashdbflasas`",
|
||||
&format!("{}", e)
|
||||
),
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn resolve_address() {
|
||||
task::block_on(async {
|
||||
let non_existing_addr = "ashjudlkahasdasdsikdhajik.asdasdasdasdasdasd.fjuiklashdbflasas:80";
|
||||
let res: Result<_, io::Error> = non_existing_addr.to_socket_addrs().await;
|
||||
match res {
|
||||
Ok(_) => panic!("Found address with random name: We live in a simulation"),
|
||||
Err(e) => assert_eq!(
|
||||
"could not resolve address `\"ashjudlkahasdasdsikdhajik.asdasdasdasdasdasd.fjuiklashdbflasas:80\"`",
|
||||
&format!("{}", e)
|
||||
),
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue