Skip to content

Run clippy in the CI with warnings disallowed; address most warnings #1412

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
MarijnS95 merged 4 commits into from
Jun 15, 2022
Merged

Run clippy in the CI with warnings disallowed; address most warnings #1412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0148671
Run `cargo clippy --all --all-targets --fix`
MarijnS95 Jun 10, 2022
46ee3ba
Fix remaining clippy warnings by hand
MarijnS95 May 27, 2022
8f83a79
ci: Run clippy
MarijnS95 May 28, 2022
336504e
Use `unwrap_or_default` instead of clippy `unwrap_or_else` suggestion
MarijnS95 Jun 10, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -25,7 +26,8 @@ jobs:
- name: Check Formatting
run: cargo +stable fmt --all -- --check

Tests:
tests:
name: Tests
strategy:
fail-fast: false
matrix:
Expand Down Expand Up @@ -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')
Expand All @@ -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
Expand All @@ -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
Expand Down
7 changes: 2 additions & 5 deletions glutin/src/api/dlloader.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,8 @@ impl<T: SymTrait> SymWrapper<T> {
#[cfg(not(target_os = "windows"))]
let lib = unsafe { Library::new(path) };

if lib.is_ok() {
return Ok(SymWrapper {
inner: T::load_with(lib.as_ref().unwrap()),
_lib: Arc::new(lib.unwrap()),
});
if let Ok(lib) = lib {
return Ok(SymWrapper { inner: T::load_with(&lib), _lib: Arc::new(lib) });
}
}

Expand Down
2 changes: 1 addition & 1 deletion glutin/src/api/egl/make_current_guard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ pub struct MakeCurrentGuard {
possibly_invalid: Option<MakeCurrentGuardInner>,
}

#[derive(Debug, PartialEq)]
#[derive(Debug, PartialEq, Eq)]
struct MakeCurrentGuardInner {
old_draw_surface: ffi::egl::types::EGLSurface,
old_read_surface: ffi::egl::types::EGLSurface,
Expand Down
Loading