From 7a16c8e95d377619e1fe8a8a8a6284eff5c0c874 Mon Sep 17 00:00:00 2001
From: Marijn Suijten <marijns95@gmail.com>
Date: Sat, 28 May 2022 18:16:35 +0200
Subject: [PATCH] ci: Run clippy

---
 .github/workflows/ci.yml                    | 13 ++++++++++---
 glutin/src/lib.rs                           |  3 ++-
 glutin_egl_sys/src/lib.rs                   |  2 ++
 glutin_emscripten_sys/src/lib.rs            |  2 ++
 glutin_examples/ios-example/rust/src/lib.rs |  3 +++
 glutin_gles2_sys/src/lib.rs                 |  2 ++
 glutin_glx_sys/src/lib.rs                   |  2 ++
 glutin_wgl_sys/src/lib.rs                   |  2 ++
 8 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fe81bafcb39..0237e0a0f9e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -14,7 +14,8 @@ on:
       - '.github/workflows/ci.yml'
 
 jobs:
-  Check_Formatting:
+  check-formatting:
+    name: Check formatting
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v1
@@ -25,7 +26,8 @@ jobs:
     - name: Check Formatting
       run: cargo +stable fmt --all -- --check
 
-  Tests:
+  tests:
+    name: Tests
     strategy:
       fail-fast: false
       matrix:
@@ -70,6 +72,7 @@ jobs:
       with:
         rust-version: ${{ matrix.rust_version }}${{ matrix.platform.host }}
         targets: ${{ matrix.platform.target }}
+        components: clippy
 
     - name: Install GCC Multilib
       if: (matrix.platform.os == 'ubuntu-latest') && contains(matrix.platform.target, 'i686')
@@ -84,6 +87,11 @@ jobs:
       if: matrix.platform.target != 'wasm32-unknown-unknown'
       run: cd glutin && cargo doc --no-deps --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES --document-private-items
 
+    - name: Lint with clippy
+      shell: bash
+      if: matrix.rust_version != 'nightly'
+      run: cargo clippy --workspace --all-targets --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES -- -Dwarnings
+
     - name: Build glutin
       shell: bash
       run: cd glutin && cargo $WEB build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
@@ -104,7 +112,6 @@ jobs:
       if: (!contains(matrix.platform.target, 'ios') && !contains(matrix.platform.target, 'wasm32'))
       run: cd glutin && cargo $WEB test --verbose --target ${{ matrix.platform.target }} $OPTIONS --features $FEATURES
 
-
     - name: Build with serde enabled
       shell: bash
       run: cd glutin && cargo $WEB build --verbose --target ${{ matrix.platform.target }} $OPTIONS --features serde,$FEATURES
diff --git a/glutin/src/lib.rs b/glutin/src/lib.rs
index fa447cf928b..ca8941c5149 100644
--- a/glutin/src/lib.rs
+++ b/glutin/src/lib.rs
@@ -65,8 +65,9 @@
 [`RawContextExt`]: os/unix/trait.RawContextExt.html
 "
 )]
-#![deny(missing_debug_implementations)]
+#![deny(clippy::all, missing_debug_implementations)]
 #![allow(clippy::missing_safety_doc, clippy::too_many_arguments)]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 #[cfg(any(
     target_os = "windows",
diff --git a/glutin_egl_sys/src/lib.rs b/glutin_egl_sys/src/lib.rs
index b34af96edac..cf2a225ec40 100644
--- a/glutin_egl_sys/src/lib.rs
+++ b/glutin_egl_sys/src/lib.rs
@@ -7,12 +7,14 @@
     target_os = "netbsd",
     target_os = "openbsd"
 ))]
+#![deny(clippy::all)]
 #![allow(
     clippy::manual_non_exhaustive,
     clippy::missing_safety_doc,
     clippy::unnecessary_cast,
     non_camel_case_types
 )]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 pub mod egl {
     pub type khronos_utime_nanoseconds_t = super::khronos_utime_nanoseconds_t;
diff --git a/glutin_emscripten_sys/src/lib.rs b/glutin_emscripten_sys/src/lib.rs
index dcbd1ef87ee..94a1277aee5 100644
--- a/glutin_emscripten_sys/src/lib.rs
+++ b/glutin_emscripten_sys/src/lib.rs
@@ -1,5 +1,7 @@
 #![cfg(target_os = "emscripten")]
 #![allow(dead_code, non_snake_case, non_camel_case_types)]
+#![deny(clippy::all)]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 use std::os::raw;
 
diff --git a/glutin_examples/ios-example/rust/src/lib.rs b/glutin_examples/ios-example/rust/src/lib.rs
index d12a517e1b2..91e7e539bb1 100644
--- a/glutin_examples/ios-example/rust/src/lib.rs
+++ b/glutin_examples/ios-example/rust/src/lib.rs
@@ -1,3 +1,6 @@
+#![deny(clippy::all)]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
+
 use glutin::event::{Event, WindowEvent};
 use glutin::event_loop::{ControlFlow, EventLoop};
 use glutin::window::WindowBuilder;
diff --git a/glutin_gles2_sys/src/lib.rs b/glutin_gles2_sys/src/lib.rs
index ee683e97fbe..b4f78469dcf 100644
--- a/glutin_gles2_sys/src/lib.rs
+++ b/glutin_gles2_sys/src/lib.rs
@@ -1,4 +1,5 @@
 #![cfg(target_os = "ios")]
+#![deny(clippy::all)]
 #![allow(
     clippy::missing_safety_doc,
     clippy::too_many_arguments,
@@ -7,6 +8,7 @@
     non_snake_case,
     non_upper_case_globals
 )]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 pub mod gles {
     include!(concat!(env!("OUT_DIR"), "/gles2_bindings.rs"));
diff --git a/glutin_glx_sys/src/lib.rs b/glutin_glx_sys/src/lib.rs
index b411bacfbf5..289b7a06abb 100644
--- a/glutin_glx_sys/src/lib.rs
+++ b/glutin_glx_sys/src/lib.rs
@@ -5,12 +5,14 @@
     target_os = "netbsd",
     target_os = "openbsd"
 ))]
+#![deny(clippy::all)]
 #![allow(
     clippy::manual_non_exhaustive,
     clippy::missing_safety_doc,
     clippy::redundant_static_lifetimes,
     clippy::unused_unit
 )]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 pub use self::glx::types::GLXContext;
 pub use x11_dl::xlib::*;
diff --git a/glutin_wgl_sys/src/lib.rs b/glutin_wgl_sys/src/lib.rs
index 3686c496078..e1d3f72c62c 100644
--- a/glutin_wgl_sys/src/lib.rs
+++ b/glutin_wgl_sys/src/lib.rs
@@ -1,5 +1,7 @@
 #![cfg(any(target_os = "windows"))]
+#![deny(clippy::all)]
 #![allow(clippy::manual_non_exhaustive, clippy::missing_safety_doc, clippy::too_many_arguments)]
+#![cfg_attr(feature = "cargo-clippy", deny(warnings))]
 
 /// WGL bindings
 pub mod wgl {