Merge pull request #15 from VolumeGraphics/remove-unwraps

Remove unwraps

Author: ChrisRega

clippy.toml

@@ -0,0 +1,2 @@
+allow-unwrap-in-tests = true
+allow-expect-in-tests = true

config_scheme.json

@@ -287,6 +287,19 @@
             }
           },
           "additionalProperties": false
+        },
+        {
+          "description": "PDF text compare",
+          "type": "object",
+          "required": [
+            "PDFText"
+          ],
+          "properties": {
+            "PDFText": {
+              "$ref": "#/definitions/HTMLCompareConfig"
+            }
+          },
+          "additionalProperties": false
         }
       ],
       "required": [

src/csv/mod.rs

@@ -532,8 +532,6 @@ fn guess_format_from_reader<R: Read + Seek>(mut input: &mut R) -> Result<Delimit
 }
 
 #[cfg(test)]
-#[allow(clippy::unwrap_used)]
-#[allow(clippy::expect_used)]
 mod tests {
     use super::*;
     use crate::csv::DiffType::{DifferentValueTypes, OutOfTolerance, UnequalStrings};

src/csv/preprocessing.rs

@@ -141,8 +141,6 @@ fn extract_headers(table: &mut Table) -> Result<(), csv::Error> {
 }
 
 #[cfg(test)]
-#[allow(clippy::unwrap_used)]
-#[allow(clippy::expect_used)]
 mod tests {
     use super::*;
     use crate::csv::{Column, Delimiters, Error};

src/hash.rs

@@ -18,11 +18,11 @@ pub enum HashFunction {
 /// Errors during hash checking
 pub enum Error {
     #[error("Failed to compile regex {0}")]
-    RegexCompilationError(#[from] regex::Error),
+    RegexCompilationFailed(#[from] regex::Error),
     #[error("Problem creating hash report {0}")]
-    ReportingError(#[from] report::Error),
+    ReportingFailure(#[from] report::Error),
     #[error("File access failed {0}")]
-    FileAccessError(#[from] FatIOError),
+    FileAccessProblem(#[from] FatIOError),
 }
 
 impl HashFunction {

src/html.rs

@@ -44,11 +44,11 @@ impl Default for HTMLCompareConfig {
 /// Errors during html / plain text checking
 pub enum Error {
     #[error("Failed to compile regex {0}")]
-    RegexCompilationError(#[from] regex::Error),
+    RegexCompilationFailure(#[from] regex::Error),
     #[error("Problem creating hash report {0}")]
-    ReportingError(#[from] report::Error),
+    ReportingProblem(#[from] report::Error),
     #[error("File access failed {0}")]
-    FileAccessError(#[from] FatIOError),
+    FileAccessFailure(#[from] FatIOError),
 }
 
 pub fn compare_files<P: AsRef<Path>>(

src/lib.rs

@@ -263,8 +263,6 @@ pub fn get_schema() -> Result<String, Error> {
 }
 
 #[cfg(test)]
-#[allow(clippy::unwrap_used)]
-#[allow(clippy::expect_used)]
 mod tests {
     use super::*;
     use crate::image::ImageCompareConfig;

src/pdf.rs

@@ -11,11 +11,11 @@ use vg_errortools::FatIOError;
 /// Errors during html / plain text checking
 pub enum Error {
     #[error("Failed to compile regex {0}")]
-    RegexCompilationError(#[from] regex::Error),
+    RegexCompilationFailure(#[from] regex::Error),
     #[error("Problem creating hash report {0}")]
-    ReportingError(#[from] report::Error),
+    ReportingFailure(#[from] report::Error),
     #[error("File access failed {0}")]
-    FileAccessError(#[from] FatIOError),
+    FileAccessProblem(#[from] FatIOError),
     #[error("PDF text extraction error {0}")]
     PdfTextExtractionFailed(#[from] pdf_extract::OutputError),
 }