aboutsummaryrefslogtreecommitdiffstats
path: root/src/errors.rs
diff options
context:
space:
mode:
authorboasting-squirrel <boasting.squirrel@gmail.com>2019-03-12 19:16:45 +0000
committerboasting-squirrel <boasting.squirrel@gmail.com>2019-03-12 19:16:45 +0000
commit122a949ec49f84a49e7a5bec657a93a65faadce1 (patch)
tree1bf07eabea70fa767db1d79a002070c286bb1861 /src/errors.rs
parentAdded some error messages + reworked the print_error_chain method (diff)
downloadminiserve-122a949ec49f84a49e7a5bec657a93a65faadce1.tar.gz
miniserve-122a949ec49f84a49e7a5bec657a93a65faadce1.zip
Better error messages for invalid path
Diffstat (limited to '')
-rw-r--r--src/errors.rs14
1 files changed, 4 insertions, 10 deletions
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)
- }
-}