aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Duerr <chrisduerr@users.noreply.github.com>2018-01-06 01:42:55 +0000
committerChristian Duerr <contact@christianduerr.com>2018-02-16 22:41:55 +0100
commitc720c4d3f4146f0e3a99910b1306a435038c8c5a (patch)
tree76a67b002e9458bf59b6b27a7aaecbe564deaf07
parent4cf18ef995ca3b050765a03adc2db681dd60624b (diff)
downloadalacritty-c720c4d3f4146f0e3a99910b1306a435038c8c5a.tar.gz
alacritty-c720c4d3f4146f0e3a99910b1306a435038c8c5a.zip
Add clippy check to travis
This commit adds clippy as a required step of the build process. To make this possible, all existing clippy issues have been resolved.
-rw-r--r--src/renderer/mod.rs6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/renderer/mod.rs b/src/renderer/mod.rs
index 49b30203..27c52fa0 100644
--- a/src/renderer/mod.rs
+++ b/src/renderer/mod.rs
@@ -749,9 +749,9 @@ impl<'a> RenderApi<'a> {
let (flash, intensity) = (self.config.visual_bell().color(), self.visual_bell_intensity);
unsafe {
gl::ClearColor(
- mix(color.r as f32 / 255.0, flash.r as f32 / 255.0, intensity).min(1.0) * alpha,
- mix(color.g as f32 / 255.0, flash.g as f32 / 255.0, intensity).min(1.0) * alpha,
- mix(color.b as f32 / 255.0, flash.b as f32 / 255.0, intensity).min(1.0) * alpha,
+ mix(f32::from(color.r) / 255.0, f32::from(flash.r) / 255.0, intensity).min(1.0) * alpha,
+ mix(f32::from(color.g) / 255.0, f32::from(flash.g) / 255.0, intensity).min(1.0) * alpha,
+ mix(f32::from(color.b) / 255.0, f32::from(flash.b) / 255.0, intensity).min(1.0) * alpha,
alpha
);
gl::Clear(gl::COLOR_BUFFER_BIT);