forked from mirror/async-std
WIP init Path and PathBuf async stubs
This commit is contained in:
parent
30b5ca5851
commit
e27b578c27
5 changed files with 151 additions and 5 deletions
|
@ -1,4 +1,4 @@
|
||||||
use std::path::{Path, PathBuf};
|
use crate::path::{Path, PathBuf};
|
||||||
|
|
||||||
use crate::io;
|
use crate::io;
|
||||||
use crate::task::blocking;
|
use crate::task::blocking;
|
||||||
|
@ -32,6 +32,8 @@ use crate::task::blocking;
|
||||||
/// # Ok(()) }) }
|
/// # Ok(()) }) }
|
||||||
/// ```
|
/// ```
|
||||||
pub async fn canonicalize<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
|
pub async fn canonicalize<P: AsRef<Path>>(path: P) -> io::Result<PathBuf> {
|
||||||
let path = path.as_ref().to_owned();
|
let path: std::path::PathBuf = path.as_ref().to_path_buf().into();
|
||||||
blocking::spawn(async move { std::fs::canonicalize(path) }).await
|
Ok(blocking::spawn(async move { std::fs::canonicalize(&path) })
|
||||||
|
.await?
|
||||||
|
.into())
|
||||||
}
|
}
|
||||||
|
|
|
@ -55,6 +55,7 @@ pub mod future;
|
||||||
pub mod io;
|
pub mod io;
|
||||||
pub mod net;
|
pub mod net;
|
||||||
pub mod os;
|
pub mod os;
|
||||||
|
pub mod path;
|
||||||
pub mod prelude;
|
pub mod prelude;
|
||||||
pub mod stream;
|
pub mod stream;
|
||||||
pub mod sync;
|
pub mod sync;
|
||||||
|
@ -62,8 +63,6 @@ pub mod task;
|
||||||
|
|
||||||
cfg_if! {
|
cfg_if! {
|
||||||
if #[cfg(any(feature = "unstable", feature = "docs"))] {
|
if #[cfg(any(feature = "unstable", feature = "docs"))] {
|
||||||
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
|
|
||||||
pub mod path;
|
|
||||||
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
|
#[cfg_attr(feature = "docs", doc(cfg(unstable)))]
|
||||||
pub mod pin;
|
pub mod pin;
|
||||||
|
|
||||||
|
|
|
@ -4,6 +4,9 @@
|
||||||
//!
|
//!
|
||||||
//! [`std::path`]: https://doc.rust-lang.org/std/path/index.html
|
//! [`std::path`]: https://doc.rust-lang.org/std/path/index.html
|
||||||
|
|
||||||
|
mod path;
|
||||||
|
mod pathbuf;
|
||||||
|
|
||||||
// Structs re-export
|
// Structs re-export
|
||||||
#[doc(inline)]
|
#[doc(inline)]
|
||||||
pub use std::path::{Ancestors, Components, Display, Iter, PrefixComponent, StripPrefixError};
|
pub use std::path::{Ancestors, Components, Display, Iter, PrefixComponent, StripPrefixError};
|
||||||
|
@ -19,3 +22,6 @@ pub use std::path::MAIN_SEPARATOR;
|
||||||
// Functions re-export
|
// Functions re-export
|
||||||
#[doc(inline)]
|
#[doc(inline)]
|
||||||
pub use std::path::is_separator;
|
pub use std::path::is_separator;
|
||||||
|
|
||||||
|
pub use path::Path;
|
||||||
|
pub use pathbuf::PathBuf;
|
||||||
|
|
105
src/path/path.rs
Normal file
105
src/path/path.rs
Normal file
|
@ -0,0 +1,105 @@
|
||||||
|
use std::ffi::OsStr;
|
||||||
|
|
||||||
|
use crate::path::PathBuf;
|
||||||
|
use crate::{fs, io};
|
||||||
|
|
||||||
|
/// This struct is an async version of [`std::path::Path`].
|
||||||
|
///
|
||||||
|
/// [`std::path::Path`]: https://doc.rust-lang.org/std/path/struct.Path.html
|
||||||
|
pub struct Path {
|
||||||
|
inner: OsStr,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Path {
|
||||||
|
/// Yields the underlying [`OsStr`] slice.
|
||||||
|
///
|
||||||
|
/// [`OsStr`]: https://doc.rust-lang.org/std/ffi/struct.OsStr.html
|
||||||
|
pub fn as_os_str(&self) -> &OsStr {
|
||||||
|
&self.inner
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Returns the canonical, absolute form of the path with all intermediate
|
||||||
|
/// components normalized and symbolic links resolved.
|
||||||
|
///
|
||||||
|
/// This is an alias to [`fs::canonicalize`].
|
||||||
|
///
|
||||||
|
/// [`fs::canonicalize`]: ../fs/fn.canonicalize.html
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```no_run
|
||||||
|
/// use crate::path::{Path, PathBuf};
|
||||||
|
///
|
||||||
|
/// let path = Path::new("/foo/test/../test/bar.rs");
|
||||||
|
/// assert_eq!(path.canonicalize().unwrap(), PathBuf::from("/foo/test/bar.rs"));
|
||||||
|
/// ```
|
||||||
|
pub async fn canonicalize(&self) -> io::Result<PathBuf> {
|
||||||
|
fs::canonicalize(self).await
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Directly wraps a string slice as a `Path` slice.
|
||||||
|
///
|
||||||
|
/// This is a cost-free conversion.
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use crate::path::Path;
|
||||||
|
///
|
||||||
|
/// Path::new("foo.txt");
|
||||||
|
/// ```
|
||||||
|
///
|
||||||
|
/// You can create `Path`s from `String`s, or even other `Path`s:
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use crate::path::Path;
|
||||||
|
///
|
||||||
|
/// let string = String::from("foo.txt");
|
||||||
|
/// let from_string = Path::new(&string);
|
||||||
|
/// let from_path = Path::new(&from_string);
|
||||||
|
/// assert_eq!(from_string, from_path);
|
||||||
|
/// ```
|
||||||
|
pub fn new<S: AsRef<OsStr> + ?Sized>(s: &S) -> &Path {
|
||||||
|
unsafe { &*(s.as_ref() as *const OsStr as *const Path) }
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Converts a `Path` to an owned [`PathBuf`].
|
||||||
|
///
|
||||||
|
/// [`PathBuf`]: struct.PathBuf.html
|
||||||
|
///
|
||||||
|
/// # Examples
|
||||||
|
///
|
||||||
|
/// ```
|
||||||
|
/// use crate::path::{Path, PathBuf};
|
||||||
|
///
|
||||||
|
/// let path_buf = Path::new("foo.txt").to_path_buf();
|
||||||
|
/// assert_eq!(path_buf, PathBuf::from("foo.txt"));
|
||||||
|
/// ```
|
||||||
|
pub fn to_path_buf(&self) -> PathBuf {
|
||||||
|
PathBuf::from(self.inner.to_os_string())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl<'a> Into<&'a std::path::Path> for &'a Path {
|
||||||
|
fn into(self) -> &'a std::path::Path {
|
||||||
|
std::path::Path::new(&self.inner)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl AsRef<Path> for Path {
|
||||||
|
fn as_ref(&self) -> &Path {
|
||||||
|
self
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for Path {
|
||||||
|
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
std::fmt::Debug::fmt(&self.inner, formatter)
|
||||||
|
}
|
||||||
|
}
|
34
src/path/pathbuf.rs
Normal file
34
src/path/pathbuf.rs
Normal file
|
@ -0,0 +1,34 @@
|
||||||
|
use std::ffi::OsString;
|
||||||
|
|
||||||
|
/// This struct is an async version of [`std::path::PathBuf`].
|
||||||
|
///
|
||||||
|
/// [`std::path::Path`]: https://doc.rust-lang.org/std/path/struct.PathBuf.html
|
||||||
|
pub struct PathBuf {
|
||||||
|
inner: OsString,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<std::path::PathBuf> for PathBuf {
|
||||||
|
fn from(path: std::path::PathBuf) -> PathBuf {
|
||||||
|
PathBuf {
|
||||||
|
inner: path.into_os_string(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Into<std::path::PathBuf> for PathBuf {
|
||||||
|
fn into(self) -> std::path::PathBuf {
|
||||||
|
self.inner.into()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl From<OsString> for PathBuf {
|
||||||
|
fn from(path: OsString) -> PathBuf {
|
||||||
|
PathBuf { inner: path }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
impl std::fmt::Debug for PathBuf {
|
||||||
|
fn fmt(&self, formatter: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
|
std::fmt::Debug::fmt(&self.inner, formatter)
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue