Skip to content

Commit

Permalink
Update aya to 0.12
Browse files Browse the repository at this point in the history
Signed-off-by: Sean Young <[email protected]>
  • Loading branch information
seanyoung committed Mar 2, 2024
1 parent 37471dd commit 2709b7f
Show file tree
Hide file tree
Showing 5 changed files with 10 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@ itertools = "0.12"
evdev = "0.12.1"
mio = { version = "0.8", features = [ "os-poll", "os-ext" ] }
libc = "0.2"
nix = { version = "0.27", features = [ "fs", "ioctl" ] }
nix = { version = "0.28", features = [ "fs", "ioctl" ] }
regex = "1"
humantime = "2.1"
aya = "0.11"
aya = "0.12"
bitflags = "2.3"
num-integer = "0.1"
terminal_size = "0.3"
Expand Down
2 changes: 1 addition & 1 deletion irp/tests/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -647,7 +647,7 @@ fn arithmetic_in_bitspec() {

let irp = Irp::parse("{.0k}<2,-3||-1>(1m,-100m)");

assert_eq!(irp.err(), Some("parse error at error at 1:11: expected one of \",\", \".\", \">\", \"m\", \"p\", \"u\", ['0' ..= '9']".into()));
assert_eq!(irp.err(), Some("parse error at error at 1:11: expected one of \",\", \".\", \">\", \"m\", \"p\", \"u\", ['0'..='9']".into()));

let irp = Irp::parse("{100}<>(1,-2,2u,-100m)").unwrap();

Expand Down
2 changes: 1 addition & 1 deletion irp/tests/transmogrifier_compare/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,6 @@ publish = false
irp = { path = "../.." }
irptransmogrifier = { path = "../rust-irptransmogrifier" }
rand = "0.8"
itertools = "0.11"
itertools = "0.12"

[workspace]
4 changes: 2 additions & 2 deletions src/bin/cir.rs
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ use clap::{Arg, ArgGroup, Command};
use evdev::Device;
use itertools::Itertools;
use log::{Level, LevelFilter, Metadata, Record};
use std::{convert::TryInto, os::unix::io::AsRawFd, path::PathBuf};
use std::{convert::TryInto, path::PathBuf};

mod commands;

Expand Down Expand Up @@ -612,7 +612,7 @@ fn print_rc_dev(list: &[rcdev::Rcdev], matches: &clap::ArgMatches) {
}
);

match LircMode2::query(lircdev.as_raw_fd()) {
match LircMode2::query(lircdev.as_file()) {
Ok(list) => {
print!("\tBPF protocols\t\t: ");

Expand Down
4 changes: 4 additions & 0 deletions src/lirc.rs
Original file line number Diff line number Diff line change
Expand Up @@ -449,6 +449,10 @@ impl Lirc {

Ok(res)
}

pub fn as_file(&self) -> &File {
&self.file
}
}

impl AsRawFd for Lirc {
Expand Down

0 comments on commit 2709b7f

Please sign in to comment.