diff options
| author | Kirill Chibisov <contact@kchibisov.com> | 2020-05-27 17:46:52 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-27 14:46:52 +0000 |
| commit | a14c51797f39356cf75dc8012c3a3ff3d63c042f (patch) | |
| tree | e9be244745a99c573429193c3522e678886c6005 | |
| parent | 88d87cfa86b4c4c14851a1901a6dbe59752044ad (diff) | |
Fix build warnings on macOS/Windows
| -rw-r--r-- | alacritty/src/display.rs | 2 | ||||
| -rw-r--r-- | alacritty/src/event.rs | 2 | ||||
| -rw-r--r-- | alacritty/src/renderer/mod.rs | 1 | ||||
| -rw-r--r-- | font/src/darwin/mod.rs | 3 |
4 files changed, 4 insertions, 4 deletions
diff --git a/alacritty/src/display.rs b/alacritty/src/display.rs index fcb87604..13e0454a 100644 --- a/alacritty/src/display.rs +++ b/alacritty/src/display.rs @@ -31,9 +31,9 @@ use parking_lot::MutexGuard; #[cfg(not(any(target_os = "macos", windows)))] use wayland_client::{Display as WaylandDisplay, EventQueue}; -use font::{self, Rasterize}; #[cfg(target_os = "macos")] use font::set_font_smoothing; +use font::{self, Rasterize}; use alacritty_terminal::config::{Font, StartupMode}; use alacritty_terminal::event::{Event, OnResize}; diff --git a/alacritty/src/event.rs b/alacritty/src/event.rs index 8ec2b839..e11903ef 100644 --- a/alacritty/src/event.rs +++ b/alacritty/src/event.rs @@ -22,9 +22,9 @@ use glutin::platform::unix::EventLoopWindowTargetExtUnix; use log::{debug, info, warn}; use serde_json as json; -use font::{self, Size}; #[cfg(target_os = "macos")] use font::set_font_smoothing; +use font::{self, Size}; use alacritty_terminal::clipboard::ClipboardType; use alacritty_terminal::config::Font; diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs index 296e4169..c3ab1240 100644 --- a/alacritty/src/renderer/mod.rs +++ b/alacritty/src/renderer/mod.rs @@ -930,6 +930,7 @@ impl<'a, C> RenderApi<'a, C> { } } + #[cfg(not(any(target_os = "macos", windows)))] pub fn finish(&self) { unsafe { gl::Finish(); diff --git a/font/src/darwin/mod.rs b/font/src/darwin/mod.rs index f7bf6c82..2c8d238e 100644 --- a/font/src/darwin/mod.rs +++ b/font/src/darwin/mod.rs @@ -281,7 +281,6 @@ pub struct Font { unsafe impl Send for Font {} - /// Set subpixel anti-aliasing on macOS. /// /// Sub-pixel anti-aliasing has been disabled since macOS Mojave by default. This function allows @@ -294,7 +293,7 @@ pub fn set_font_smoothing(enable: bool) { unsafe { // Check that we're running at least Mojave (10.14.0+). if !NSProcessInfo::processInfo(nil).isOperatingSystemAtLeastVersion(min_macos_version) { - return + return; } let key = NSString::alloc(nil).init_str("CGFontRenderingFontSmoothingDisabled"); |