diff --git a/src/findings.rs b/src/findings.rs index 64ad176..01c3223 100644 --- a/src/findings.rs +++ b/src/findings.rs @@ -3,7 +3,7 @@ use std::path::{Path, PathBuf}; use mime::Mime; use crate::inspectors::mime_extension_lookup; -use crate::string_type::String; +use crate::String; #[cfg(feature = "json")] use serde::{ser::SerializeStruct, Serializer}; diff --git a/src/inspectors.rs b/src/inspectors.rs index a598181..b39db5b 100644 --- a/src/inspectors.rs +++ b/src/inspectors.rs @@ -9,7 +9,7 @@ use std::str::FromStr; use cached::cached; use mime::Mime; -use crate::string_type::String; +use crate::String; use crate::MimeDb; /// The number of bytes to read initially. diff --git a/src/lib.rs b/src/lib.rs index 5f0f56d..32436e2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -7,14 +7,24 @@ pub mod formats; pub mod inspectors; pub mod mime_db; pub mod parameters; -pub mod string_type; pub mod utils; use crate::findings::Findings; use crate::mime_db::MimeDb; + use cfg_if::cfg_if; use once_cell::sync::OnceCell; +cfg_if! { + if #[cfg(not(all(target_endian = "big", target_pointer_width = "32")))] { + // most architectures + pub use smartstring::alias::String; + } else { + // powerpc and other big endian 32-bit archs + pub use std::string::String; + } +} + cfg_if! { if #[cfg(any(all(unix, feature = "infer-backend"), all(not(unix), not(feature = "xdg-mime-backend"))))] { /// A [OnceCell] holding an instance of [mime_db::MimeDb]. diff --git a/src/parameters.rs b/src/parameters.rs index 6672cab..f567a93 100644 --- a/src/parameters.rs +++ b/src/parameters.rs @@ -1,6 +1,6 @@ //! [Clap] struct used to parse command line arguments. -use crate::string_type::String as StringType; +use crate::String as StringType; use crate::utils::{clap_long_version, clap_version}; use cfg_if::cfg_if; use clap::{AppSettings, Clap}; diff --git a/src/string_type.rs b/src/string_type.rs deleted file mode 100644 index 9794220..0000000 --- a/src/string_type.rs +++ /dev/null @@ -1,11 +0,0 @@ -use cfg_if::cfg_if; - -cfg_if! { - if #[cfg(not(all(target_endian = "big", target_pointer_width = "32")))] { - // most architectures - pub use smartstring::alias::String; - } else { - // powerpc and other big endian 32-bit archs - pub use std::string::String; - } -} diff --git a/src/tests/mod.rs b/src/tests/mod.rs index c3da0df..8b32f6c 100644 --- a/src/tests/mod.rs +++ b/src/tests/mod.rs @@ -3,7 +3,7 @@ use fif::findings::Findings; use fif::formats::{Format, PowerShell, Shell}; use fif::inspectors::{mime_extension_lookup, BUF_SIZE}; use fif::mime_db::MimeDb; -use fif::string_type::String; +use fif::String; use crate::parameters::Parameters; use clap::Clap;