From c3bce178b88160920c68245c0da0ff5adb9564f0 Mon Sep 17 00:00:00 2001 From: Ryan Dahl Date: Fri, 5 Oct 2018 10:20:51 -0400 Subject: Clean up helpers in src/errors.rs * Add errors::bad_resource() * Move permission_denied() to errors.rs * Make op_symlink's not_implemented() into a runtime panic. --- src/errors.rs | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'src/errors.rs') diff --git a/src/errors.rs b/src/errors.rs index 872f3492e..ab6504e64 100644 --- a/src/errors.rs +++ b/src/errors.rs @@ -94,7 +94,7 @@ impl DenoError { impl fmt::Display for DenoError { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { match self.repr { - Repr::Simple(_kind, ref _msg) => panic!("todo"), + Repr::Simple(_kind, ref err_str) => f.pad(err_str), Repr::IoErr(ref err) => err.fmt(f), Repr::UrlErr(ref err) => err.fmt(f), Repr::HyperErr(ref err) => err.fmt(f), @@ -109,7 +109,6 @@ impl std::error::Error for DenoError { Repr::IoErr(ref err) => err.description(), Repr::UrlErr(ref err) => err.description(), Repr::HyperErr(ref err) => err.description(), - // Repr::Simple(..) => "FIXME", } } @@ -119,7 +118,6 @@ impl std::error::Error for DenoError { Repr::IoErr(ref err) => Some(err), Repr::UrlErr(ref err) => Some(err), Repr::HyperErr(ref err) => Some(err), - // Repr::Simple(..) => None, } } } @@ -150,3 +148,17 @@ impl From for DenoError { } } } + +pub fn bad_resource() -> DenoError { + new( + ErrorKind::BadFileDescriptor, // TODO Rename to BadResource + String::from("bad resource id"), + ) +} + +pub fn permission_denied() -> DenoError { + new( + ErrorKind::PermissionDenied, + String::from("permission denied"), + ) +} -- cgit v1.2.3