diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2018-07-03 00:11:24 +0200 |
|---|---|---|
| committer | Christian Duerr <chrisduerr@users.noreply.github.com> | 2018-07-02 22:11:24 +0000 |
| commit | 21eb50aa50586ae95d553ae097cb1199334ac1c0 (patch) | |
| tree | 85eca46c21a4e440c8c528c5efafc8c8162b8ec7 | |
| parent | 985ba306c78857e07f3f267ab954ad069d30a465 (diff) | |
| download | alacritty-21eb50aa50586ae95d553ae097cb1199334ac1c0.tar.gz alacritty-21eb50aa50586ae95d553ae097cb1199334ac1c0.zip | |
Enable clippy in font/copypasta crates
Enabled clippy in the sub-crates font and copypasta. All issues
that were discovered by this change have also been fixed.
| -rw-r--r-- | copypasta/src/lib.rs | 2 | ||||
| -rw-r--r-- | font/src/ft/mod.rs | 6 | ||||
| -rw-r--r-- | font/src/lib.rs | 3 |
3 files changed, 8 insertions, 3 deletions
diff --git a/copypasta/src/lib.rs b/copypasta/src/lib.rs index 2857ce82..f0b3c53e 100644 --- a/copypasta/src/lib.rs +++ b/copypasta/src/lib.rs @@ -1,5 +1,7 @@ //! A cross-platform clipboard library +#![cfg_attr(feature = "cargo-clippy", deny(clippy, if_not_else, enum_glob_use, wrong_pub_self_convention))] + // This has to be here due to macro_use #[cfg(target_os = "macos")] #[macro_use] extern crate objc; diff --git a/font/src/ft/mod.rs b/font/src/ft/mod.rs index cdae88cb..516f3b9c 100644 --- a/font/src/ft/mod.rs +++ b/font/src/ft/mod.rs @@ -232,15 +232,15 @@ impl FreeTypeRasterizer { let ft_face = self.library.new_face(&path, index)?; // Get available pixel sizes if font isn't scalable. - let non_scalable = if !pattern.scalable().next().unwrap_or(true) { + let non_scalable = if pattern.scalable().next().unwrap_or(true) { + None + } else { let mut pixelsize = pattern.pixelsize(); debug!("pixelsizes: {:?}", pixelsize); Some(FixedSize { pixelsize: pixelsize.next().expect("has 1+ pixelsize"), }) - } else { - None }; let face = Face { diff --git a/font/src/lib.rs b/font/src/lib.rs index ad94d084..fe9e9e85 100644 --- a/font/src/lib.rs +++ b/font/src/lib.rs @@ -17,6 +17,9 @@ //! CoreText is used on Mac OS. //! FreeType is used on everything that's not Mac OS. //! Eventually, ClearType support will be available for windows + +#![cfg_attr(feature = "cargo-clippy", deny(clippy, if_not_else, enum_glob_use, wrong_pub_self_convention))] + #[cfg(not(target_os = "macos"))] extern crate fontconfig; #[cfg(not(target_os = "macos"))] |