Skip to content

Fixed build warnings due to deprecated try!() and Error::description #13

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

Open
wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fixed build warnings due to deprecated try!() and Error::description #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4c92ac8
try!() macro replaced by ?
luukvanderduim Dec 10, 2020
6acd5db
Removed a duplicate '&'
luukvanderduim Dec 10, 2020
bc7db5e
Reinstated Error trait implementation and import.
luukvanderduim Dec 11, 2020
bfac4a0
- implemented Error traits source() method
luukvanderduim Dec 11, 2020
7637197
Update src/error.rs
luukvanderduim Dec 11, 2020
9db49dc
add formatter to write!() in Display for Error impl
luukvanderduim Dec 11, 2020
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
78 changes: 39 additions & 39 deletions src/device/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ impl Builder {
/// Create a builder from the specified path.
pub fn open<P: AsRef<Path>>(path: P) -> Res<Self> {
Ok(Builder {
fd: try!(fcntl::open(path.as_ref(), fcntl::OFlag::O_WRONLY | fcntl::OFlag::O_NONBLOCK, stat::Mode::empty())),
fd: fcntl::open(path.as_ref(), fcntl::OFlag::O_WRONLY | fcntl::OFlag::O_NONBLOCK, stat::Mode::empty())?,
def: unsafe { mem::zeroed() },
abs: None,
})
Expand All @@ -32,16 +32,16 @@ impl Builder {
#[cfg(feature = "udev")]
/// Create a builder from the default path taken from udev.
pub fn default() -> Res<Self> {
let context = try!(udev::Context::new());
let mut enumerator = try!(udev::Enumerator::new(&context));
let context = udev::Context::new()?;
let mut enumerator = udev::Enumerator::new(&context)?;

try!(enumerator.match_subsystem("misc"));
try!(enumerator.match_sysname("uinput"));
enumerator.match_subsystem("misc")?;
enumerator.match_sysname("uinput")?;

let device = try!(try!(enumerator.scan_devices())
.next().ok_or(Error::NotFound));
let device = enumerator.scan_devices()?
.next().ok_or(Error::NotFound)?;

Builder::open(try!(device.devnode().ok_or(Error::NotFound)))
Builder::open(device.devnode().ok_or(Error::NotFound)?)
}

#[cfg(not(feature = "udev"))]
Expand All @@ -52,11 +52,11 @@ impl Builder {

/// Set the name.
pub fn name<T: AsRef<str>>(mut self, value: T) -> Res<Self> {
let string = try!(CString::new(value.as_ref()));
let string = CString::new(value.as_ref())?;
let bytes = string.as_bytes_with_nul();

if bytes.len() > UINPUT_MAX_NAME_SIZE as usize {
try!(Err(nix::Error::from_errno(Errno::EINVAL)));
Err(nix::Error::from_errno(Errno::EINVAL))?;
}

(&mut self.def.name)[..bytes.len()]
Expand Down Expand Up @@ -95,7 +95,7 @@ impl Builder {

match value.into() {
Event::All => {
try!(self.event(Event::Keyboard(event::Keyboard::All)))
self.event(Event::Keyboard(event::Keyboard::All))?
.event(Event::Controller(event::Controller::All))
}

Expand All @@ -105,52 +105,52 @@ impl Builder {
let mut builder = self;

for item in event::keyboard::Key::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::KeyPad::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Misc::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::InputAssist::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Function::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Braille::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Numeric::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::TouchPad::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Camera::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::keyboard::Attendant::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

Ok(builder)
}

value => {
unsafe {
try!(Errno::result(ui_set_evbit(self.fd, value.kind())));
try!(Errno::result(ui_set_keybit(self.fd, value.code())));
Errno::result(ui_set_evbit(self.fd, value.kind()))?;
Errno::result(ui_set_keybit(self.fd, value.code()))?;
}

Ok(self)
Expand All @@ -164,44 +164,44 @@ impl Builder {
let mut builder = self;

for item in event::controller::Misc::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::Mouse::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::JoyStick::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::GamePad::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::Digi::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::Wheel::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::DPad::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

for item in event::controller::TriggerHappy::iter_variants() {
builder = try!(builder.event(item));
builder = builder.event(item)?;
}

Ok(builder)
}

value => {
unsafe {
try!(Errno::result(ui_set_evbit(self.fd, value.kind())));
try!(Errno::result(ui_set_keybit(self.fd, value.code())));
Errno::result(ui_set_evbit(self.fd, value.kind()))?;
Errno::result(ui_set_keybit(self.fd, value.code()))?;
}

Ok(self)
Expand All @@ -211,17 +211,17 @@ impl Builder {

Event::Relative(value) => {
unsafe {
try!(Errno::result(ui_set_evbit(self.fd, value.kind())));
try!(Errno::result(ui_set_relbit(self.fd, value.code())));
Errno::result(ui_set_evbit(self.fd, value.kind()))?;
Errno::result(ui_set_relbit(self.fd, value.code()))?;
}

Ok(self)
}

Event::Absolute(value) => {
unsafe {
try!(Errno::result(ui_set_evbit(self.fd, value.kind())));
try!(Errno::result(ui_set_absbit(self.fd, value.code())));
Errno::result(ui_set_evbit(self.fd, value.kind()))?;
Errno::result(ui_set_absbit(self.fd, value.code()))?;
}

self.abs = Some(value.code());
Expand Down Expand Up @@ -261,8 +261,8 @@ impl Builder {
let ptr = &self.def as *const _ as *const u8;
let size = mem::size_of_val(&self.def);

try!(unistd::write(self.fd, slice::from_raw_parts(ptr, size)));
try!(Errno::result(ui_dev_create(self.fd)));
unistd::write(self.fd, slice::from_raw_parts(ptr, size))?;
Errno::result(ui_dev_create(self.fd))?;
}

Ok(Device::new(self.fd))
Expand Down
6 changes: 3 additions & 3 deletions src/device/device.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ impl Device {
let ptr = &event as *const _ as *const u8;
let size = mem::size_of_val(&event);

try!(unistd::write(self.fd, slice::from_raw_parts(ptr, size)));
unistd::write(self.fd, slice::from_raw_parts(ptr, size))?;
}

Ok(())
Expand Down Expand Up @@ -63,8 +63,8 @@ impl Device {

/// Send a press and release event.
pub fn click<T: event::Press + event::Release>(&mut self, event: &T) -> Res<()> {
try!(self.press(event));
try!(self.release(event));
self.press(event)?;
self.release(event)?;

Ok(())
}
Expand Down
31 changes: 17 additions & 14 deletions src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,25 +44,28 @@ impl From<udev::Error> for Error {

impl fmt::Display for Error {
fn fmt(&self, f: &mut fmt::Formatter) -> Result<(), fmt::Error> {
f.write_str(error::Error::description(self))
match self {
Error::Nix(err) => write!(f, "{}", err),
Error::Nul(err) => write!(f, "{}", err),
#[cfg(feature="udev")]
Error::Udev(err) => write!(f, "{}", err),
Error::NotFound => write!(f, "The uinput file could not be found."),
}
}
}

impl error::Error for Error {
fn description(&self) -> &str {
fn source(&self) -> Option<&(dyn error::Error + 'static)> {
match self {
&Error::Nix(ref err) =>
err.description(),

&Error::Nul(ref err) =>
err.description(),

#[cfg(feature = "udev")]
&Error::Udev(ref err) =>
err.description(),

&Error::NotFound =>
"Device not found.",
Error::Nix(err) => Some(err),

Error::Nul(err) => Some(err),

#[cfg(feature="udev")]
Error::Udev(err) => Some(err),

// NotFound does not have a source to refer to
Error::NotFound => None,
}
}
}