summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Krüger <matthias.krueger@famsik.de>2020-05-01 21:28:43 +0200
committerGitHub <noreply@github.com>2020-05-01 19:28:43 +0000
commit6b45780f3afa23e9e4277bf43e6bf381172fa1ea (patch)
tree6a48c108cf607973b79821326f1cb89a280775e7
parent7901b454ee04c7873e611986ed2dbe5c3d6331eb (diff)
downloadalacritty-6b45780f3afa23e9e4277bf43e6bf381172fa1ea.tar.gz
alacritty-6b45780f3afa23e9e4277bf43e6bf381172fa1ea.zip
Fix clippy warnings
-rw-r--r--alacritty/src/renderer/mod.rs2
-rw-r--r--alacritty/src/window.rs11
-rw-r--r--alacritty_terminal/src/term/mod.rs1
3 files changed, 1 insertions, 13 deletions
diff --git a/alacritty/src/renderer/mod.rs b/alacritty/src/renderer/mod.rs
index caa2443f..764b5ec5 100644
--- a/alacritty/src/renderer/mod.rs
+++ b/alacritty/src/renderer/mod.rs
@@ -777,7 +777,7 @@ impl QuadRenderer {
if let Ok(Msg::ShaderReload) = self.rx.try_recv() {
self.reload_shaders(props);
}
- while let Ok(_) = self.rx.try_recv() {}
+ while self.rx.try_recv().is_ok() {}
unsafe {
gl::UseProgram(self.program.id);
diff --git a/alacritty/src/window.rs b/alacritty/src/window.rs
index 042ec87d..9083fa3e 100644
--- a/alacritty/src/window.rs
+++ b/alacritty/src/window.rs
@@ -345,13 +345,6 @@ impl Window {
}
pub fn set_fullscreen(&mut self, fullscreen: bool) {
- #[cfg(macos)]
- {
- if self.window().simple_fullscreen() {
- return;
- }
- }
-
if fullscreen {
let current_monitor = self.window().current_monitor();
self.window().set_fullscreen(Some(Fullscreen::Borderless(current_monitor)));
@@ -362,10 +355,6 @@ impl Window {
#[cfg(target_os = "macos")]
pub fn set_simple_fullscreen(&mut self, simple_fullscreen: bool) {
- if self.window().fullscreen().is_some() {
- return;
- }
-
self.window().set_simple_fullscreen(simple_fullscreen);
}
diff --git a/alacritty_terminal/src/term/mod.rs b/alacritty_terminal/src/term/mod.rs
index dbfd3f49..b036fc00 100644
--- a/alacritty_terminal/src/term/mod.rs
+++ b/alacritty_terminal/src/term/mod.rs
@@ -2667,7 +2667,6 @@ mod benches {
use std::fs;
use std::mem;
- use std::path::Path;
use crate::clipboard::Clipboard;
use crate::config::MockConfig;