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.

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

use if-let instead of single-arm match #68

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

use if-let instead of single-arm match #68

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
58 changes: 28 additions & 30 deletions backend/src/daemon/server.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -235,44 +235,42 @@ impl<R: Read + Send + 'static, W: Write + Send + 'static> Daemon for DaemonServe
}

for info in api.device_list() {
match (info.vendor_id(), info.product_id(), info.interface_number()) {
// System76 launch_1
//TODO: better way to determine this
(0x3384, 0x0001, 1) => {
// Skip if device already open
if self.have_device(&info) {
continue;
}

match info.open_device(&api) {
Ok(device) => match AccessHid::new(device, 10, 1000) {
Ok(access) => match unsafe { Ec::new(access) } {
Ok(ec) => {
info!("Adding USB HID EC at {:?}", info.path());
let id = BoardId(Uuid::new_v4().as_u128());
self.boards
.borrow_mut()
.insert(id, (ec.into_dyn(), Some(info.clone())));
self.board_ids.borrow_mut().push(id);
}
Err(err) => error!(
"Failed to probe USB HID EC at {:?}: {:?}",
info.path(),
err
),
},
// Skip if device already open
if self.have_device(&info) {
continue;
}

if let (0x3384, 0x0001, 1) =
(info.vendor_id(), info.product_id(), info.interface_number())
{
match info.open_device(&api) {
Ok(device) => match AccessHid::new(device, 10, 1000) {
Ok(access) => match unsafe { Ec::new(access) } {
Ok(ec) => {
info!("Adding USB HID EC at {:?}", info.path());
let id = BoardId(Uuid::new_v4().as_u128());
self.boards
.borrow_mut()
.insert(id, (ec.into_dyn(), Some(info.clone())));
self.board_ids.borrow_mut().push(id);
}
Err(err) => error!(
"Failed to access USB HID EC at {:?}: {:?}",
"Failed to probe USB HID EC at {:?}: {:?}",
info.path(),
err
),
},
Err(err) => {
error!("Failed to open USB HID EC at {:?}: {:?}", info.path(), err)
}
Err(err) => error!(
"Failed to access USB HID EC at {:?}: {:?}",
info.path(),
err
),
},
Err(err) => {
error!("Failed to open USB HID EC at {:?}: {:?}", info.path(), err)
}
}
_ => (),
}
}
}
Expand Down