From f9cfee9e2cd1884f68cfa3ce2729c64981fb05a4 Mon Sep 17 00:00:00 2001 From: Stjepan Glavina Date: Tue, 15 Oct 2019 01:11:32 +0200 Subject: [PATCH] Formatting --- src/fs/canonicalize.rs | 9 +++------ src/fs/read_link.rs | 4 +--- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/src/fs/canonicalize.rs b/src/fs/canonicalize.rs index a671aba..a763e4e 100644 --- a/src/fs/canonicalize.rs +++ b/src/fs/canonicalize.rs @@ -1,6 +1,5 @@ -use crate::path::{Path, PathBuf}; - use crate::io; +use crate::path::{Path, PathBuf}; use crate::task::blocking; /// Returns the canonical form of a path. @@ -32,8 +31,6 @@ use crate::task::blocking; /// # Ok(()) }) } /// ``` pub async fn canonicalize>(path: P) -> io::Result { - let path: PathBuf = path.as_ref().to_owned(); - Ok(blocking::spawn(async move { std::fs::canonicalize(&path) }) - .await? - .into()) + let path = path.as_ref().to_owned(); + blocking::spawn(async move { std::fs::canonicalize(&path).map(Into::into) }).await } diff --git a/src/fs/read_link.rs b/src/fs/read_link.rs index 37ef2c6..53080dd 100644 --- a/src/fs/read_link.rs +++ b/src/fs/read_link.rs @@ -28,7 +28,5 @@ use crate::task::blocking; /// ``` pub async fn read_link>(path: P) -> io::Result { let path = path.as_ref().to_owned(); - Ok(blocking::spawn(async move { std::fs::read_link(path) }) - .await? - .into()) + blocking::spawn(async move { std::fs::read_link(path).map(Into::into) }).await }