Skip to content
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.

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

Fix CI #156

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@ jobs:
- name: Format
run: cargo fmt --check
- name: Clippy
run: cargo clippy
run: cargo clippy && cargo clippy --all-features
- name: Build
run: cargo build --verbose
run: cargo build --verbose --all-features
- name: Run tests
run: cargo test --verbose
- name: Doc
run: cargo doc
run: cargo doc --all-features

cross-linux:
runs-on: ubuntu-latest
Expand Down Expand Up @@ -68,12 +68,12 @@ jobs:
run: cargo doc --target ${{ matrix.target.rust }}

freebsd:
runs-on: macos-12
runs-on: ubuntu-latest
name: build (FreeBSD)
steps:
- uses: actions/checkout@v3
- name: Build
uses: vmactions/freebsd-vm@v0
uses: vmactions/freebsd-vm@v1
with:
envs: 'RUSTFLAGS'
usesh: true
Expand All @@ -83,5 +83,5 @@ jobs:
run: |
curl https://sh.rustup.rs -sSf | sh -s -- --profile minimal -y
. "$HOME/.cargo/env"
cargo build
cargo build --all-features
cargo test
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ license = "Apache-2.0 OR MIT"
repository = "https://github.com/cmr/evdev"
documentation = "https://docs.rs/evdev"
edition = "2021"
rust-version = "1.63"
rust-version = "1.64"

[features]
serde = ["dep:serde"]
Expand Down
2 changes: 1 addition & 1 deletion src/event_variants.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ macro_rules! input_event_newtype {
}
impl Deref for $name {
type Target = InputEvent;
fn deref<'a>(&'a self) -> &'a InputEvent {
fn deref(&self) -> &InputEvent {
&self.0
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -536,7 +536,7 @@ fn fd_write_all(fd: std::os::fd::BorrowedFd<'_>, mut data: &[u8]) -> nix::Result
match nix::unistd::write(fd, data) {
Ok(0) => return Ok(()),
Ok(n) => data = &data[n..],
Err(e) if e == nix::Error::EINTR => {}
Err(nix::Error::EINTR) => {}
Err(e) => return Err(e),
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/sync_stream.rs
Original file line number Diff line number Diff line change
Expand Up @@ -571,7 +571,7 @@ fn compensate_events(state: &mut Option<SyncState>, dev: &mut Device) -> Option<
}
}

impl<'a> Iterator for FetchEventsSynced<'a> {
impl Iterator for FetchEventsSynced<'_> {
type Item = InputEvent;
fn next(&mut self) -> Option<InputEvent> {
// first: check if we need to emit compensatory events due to a SYN_DROPPED we found in the
Expand Down Expand Up @@ -599,7 +599,7 @@ impl<'a> Iterator for FetchEventsSynced<'a> {
}
}

impl<'a> Drop for FetchEventsSynced<'a> {
impl Drop for FetchEventsSynced<'_> {
fn drop(&mut self) {
self.dev.raw.event_buf.drain(..self.consumed_to);
}
Expand Down
Loading