Fix warnings (#573)

* Fix warnings associated with neovide-derive

* Remove unused transparency member

Sdl2WindowWrapper had a property called transparency that was never
read and was causing a warning.

* Add Lint with Clippy to build workflow
macos-click-through
Benjamin Davies 4 years ago committed by GitHub
parent 308a92e7e3
commit 764633d2ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -14,6 +14,10 @@ jobs:
run: | run: |
cargo fmt --all -- --check cargo fmt --all -- --check
- name: Lint with Clippy
run: |
cargo clippy --all -- -D warnings
- name: Install Neovim - name: Install Neovim
run: | run: |
choco install -y neovim choco install -y neovim
@ -49,6 +53,11 @@ jobs:
rustup component add rustfmt --toolchain stable-x86_64-apple-darwin rustup component add rustfmt --toolchain stable-x86_64-apple-darwin
cargo fmt --all -- --check cargo fmt --all -- --check
- name: Lint with Clippy
run: |
rustup component add clippy --toolchain stable-x86_64-apple-darwin
cargo clippy --all -- -D warnings
- name: Uninstall Conflicting LLVM - name: Uninstall Conflicting LLVM
run: | run: |
brew uninstall llvm brew uninstall llvm
@ -111,6 +120,10 @@ jobs:
run: | run: |
cargo fmt --all -- --check cargo fmt --all -- --check
- name: Lint with Clippy
run: |
cargo clippy --all -- -D warnings
- name: Install Neovim - name: Install Neovim
run: | run: |
sudo apt-get install -y neovim sudo apt-get install -y neovim

@ -7,12 +7,12 @@ pub fn setting_group(item: TokenStream) -> TokenStream {
let input = parse_macro_input!(item as DeriveInput); let input = parse_macro_input!(item as DeriveInput);
let prefix = setting_prefix(input.attrs.as_ref()) let prefix = setting_prefix(input.attrs.as_ref())
.map(|p| format!("{}_", p)) .map(|p| format!("{}_", p))
.unwrap_or("".to_string()); .unwrap_or_else(|| "".to_string());
stream(input, prefix) stream(input, prefix)
} }
fn stream(input: DeriveInput, prefix: String) -> TokenStream { fn stream(input: DeriveInput, prefix: String) -> TokenStream {
const ERR_MSG: &'static str = "Derive macro expects a struct"; const ERR_MSG: &str = "Derive macro expects a struct";
match input.data { match input.data {
Data::Struct(ref data) => struct_stream(input.ident, prefix, data), Data::Struct(ref data) => struct_stream(input.ident, prefix, data),
Data::Enum(data) => Error::new_spanned(data.enum_token, ERR_MSG) Data::Enum(data) => Error::new_spanned(data.enum_token, ERR_MSG)

@ -20,8 +20,8 @@ const DEFAULT_CELL_PERCENTAGE: f32 = 1.0 / 8.0;
const STANDARD_CORNERS: &[(f32, f32); 4] = &[(-0.5, -0.5), (0.5, -0.5), (0.5, 0.5), (-0.5, 0.5)]; const STANDARD_CORNERS: &[(f32, f32); 4] = &[(-0.5, -0.5), (0.5, -0.5), (0.5, 0.5), (-0.5, 0.5)];
#[setting_prefix = "cursor"]
#[derive(Clone, SettingGroup)] #[derive(Clone, SettingGroup)]
#[setting_prefix = "cursor"]
pub struct CursorSettings { pub struct CursorSettings {
antialiasing: bool, antialiasing: bool,
animation_length: f32, animation_length: f32,

@ -19,8 +19,8 @@ use crate::editor::{Colors, DrawCommand, Style, WindowDrawCommand};
use crate::settings::*; use crate::settings::*;
use cursor_renderer::CursorRenderer; use cursor_renderer::CursorRenderer;
#[setting_prefix = "window"]
#[derive(Clone, SettingGroup)] #[derive(Clone, SettingGroup)]
#[setting_prefix = "window"]
pub struct RendererSettings { pub struct RendererSettings {
position_animation_length: f32, position_animation_length: f32,
scroll_animation_length: f32, scroll_animation_length: f32,

@ -1,8 +1,8 @@
use super::KeyboardLayout; use super::KeyboardLayout;
use crate::settings::FromValue; use crate::settings::FromValue;
#[setting_prefix = "keyboard"]
#[derive(Clone, SettingGroup)] #[derive(Clone, SettingGroup)]
#[setting_prefix = "keyboard"]
pub struct KeyboardSettings { pub struct KeyboardSettings {
pub layout: KeyboardLayout, pub layout: KeyboardLayout,
} }

@ -47,7 +47,6 @@ pub struct Sdl2WindowWrapper {
grid_id_under_mouse: u64, grid_id_under_mouse: u64,
title: String, title: String,
previous_size: LogicalSize, previous_size: LogicalSize,
transparency: f32,
fullscreen: bool, fullscreen: bool,
cached_size: (u32, u32), cached_size: (u32, u32),
cached_position: (i32, i32), cached_position: (i32, i32),
@ -115,7 +114,6 @@ impl Sdl2WindowWrapper {
if let Ok(opacity) = self.window.opacity() { if let Ok(opacity) = self.window.opacity() {
if (opacity - transparency).abs() > std::f32::EPSILON { if (opacity - transparency).abs() > std::f32::EPSILON {
self.window.set_opacity(transparency).ok(); self.window.set_opacity(transparency).ok();
self.transparency = transparency;
} }
} }
@ -477,7 +475,6 @@ pub fn start_loop(
grid_id_under_mouse: 0, grid_id_under_mouse: 0,
title: String::from("Neovide"), title: String::from("Neovide"),
previous_size: logical_size, previous_size: logical_size,
transparency: 1.0,
fullscreen: false, fullscreen: false,
cached_size: (0, 0), cached_size: (0, 0),
cached_position: (0, 0), cached_position: (0, 0),

Loading…
Cancel
Save