From 58d5ac7e750588e055ce500c73dab960bd95e9ef Mon Sep 17 00:00:00 2001 From: Lynnesbian Date: Wed, 6 Oct 2021 01:41:08 +1000 Subject: [PATCH] mostly just formatting --- src/lib.rs | 8 +++++++- src/main.rs | 8 +++++++- src/mime_db.rs | 7 ++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index cca3ecb..e446041 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -9,7 +9,13 @@ //! You can view [fif's README](https://gitlab.com/Lynnesbian/fif/-/blob/master/README.md#fif) to learn more. #![forbid(unsafe_code)] -#![warn(trivial_casts, unused_lifetimes, unused_qualifications, missing_copy_implementations, unused_allocation)] +#![warn( + trivial_casts, + unused_lifetimes, + unused_qualifications, + missing_copy_implementations, + unused_allocation +)] pub mod files; pub mod findings; diff --git a/src/main.rs b/src/main.rs index 09959d6..9bd6c36 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,7 +4,13 @@ // fif - a command-line tool for detecting and optionally correcting files with incorrect extensions. #![forbid(unsafe_code)] -#![warn(trivial_casts, unused_lifetimes, unused_qualifications, missing_copy_implementations, unused_allocation)] +#![warn( + trivial_casts, + unused_lifetimes, + unused_qualifications, + missing_copy_implementations, + unused_allocation +)] use std::io::{stdin, stdout, BufWriter, Write}; use std::process::exit; diff --git a/src/mime_db.rs b/src/mime_db.rs index 0a81a7e..e97774d 100644 --- a/src/mime_db.rs +++ b/src/mime_db.rs @@ -103,7 +103,12 @@ cfg_if! { } fn get_type(&self, data: &[u8]) -> Option { - self.db.get(data).map(|f| Mime::from_str(f.mime_type())).ok() + if let Some(mime) = self.db.get(data) { + match Mime::from_str(mime.mime_type()) { + Err(_) => None, + Ok(m) => Some(m), + } + } else { None } } } } else {