From 122a949ec49f84a49e7a5bec657a93a65faadce1 Mon Sep 17 00:00:00 2001
From: boasting-squirrel <boasting.squirrel@gmail.com>
Date: Tue, 12 Mar 2019 20:16:45 +0100
Subject: Better error messages for invalid path

---
 src/errors.rs | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'src/errors.rs')

diff --git a/src/errors.rs b/src/errors.rs
index 191d382..6781bc6 100644
--- a/src/errors.rs
+++ b/src/errors.rs
@@ -11,10 +11,10 @@ pub enum CompressionErrorKind {
     CreateTemporaryFileError,
     #[fail(display = "Could not create file {}", path)]
     CreateFileError { path: String },
-    #[fail(display = "Could not retrieve entity name from the given path. 
-        This can either mean that the entity has non UTF-8 characters in its name, 
-        or that its name ends with \"..\"")]
+    #[fail(display = "Invalid path: directory name cannot end with \"..\"")]
     InvalidDirectoryName,
+    #[fail(display = "Directory name contains invalid UTF-8 characters")]
+    InvalidUTF8DirectoryName,
     #[fail(display = "Failed to create the TAR archive: {}", message)]
     TarBuildingError { message: String },
     #[fail(display = "Failed to create the GZIP archive: {}", message)]
@@ -56,7 +56,7 @@ pub struct CompressionError {
 }
 
 impl CompressionError {
-    fn new(kind: CompressionErrorKind) -> CompressionError {
+    pub fn new(kind: CompressionErrorKind) -> CompressionError {
         CompressionError {
             inner: Context::new(kind),
         }
@@ -98,9 +98,3 @@ impl From<CompressionErrorKind> for CompressionError {
         }
     }
 }
-
-impl From<std::option::NoneError> for CompressionError {
-    fn from(_: std::option::NoneError) -> CompressionError {
-        CompressionError::new(CompressionErrorKind::InvalidDirectoryName)
-    }
-}
-- 
cgit v1.2.3