kossLAN/wry
1
0
Fork 0
forked from wry/wry
Code Pull requests Activity

all: use let chains

Browse source
This commit is contained in:
Julian Orth 2025-07-01 11:20:48 +02:00
parent 3d5d146d65
commit 286857971a
89 changed files with 1516 additions and 1574 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/video/drm.rs
View file

@ -165,10 +165,8 @@ fn reopen(fd: c::c_int, need_primary: bool) -> Result<Rc<OwnedFd>, DrmError> {
if get_node_type_from_fd(fd).map_err(DrmError::GetDeviceType)? == NodeType::Render {
break 'path uapi::format_ustr!("/proc/self/fd/{}", fd);
}
if !need_primary {
if let Ok(path) = render_node_name(fd) {
break 'path path;
}
if !need_primary && let Ok(path) = render_node_name(fd) {
break 'path path;
}
device_node_name(fd)?
};
@ -441,10 +439,10 @@ impl DrmMaster {
Err(e) => return Err(DrmError::GemHandle(e)),
};
let mut handles = self.gem_handles.borrow_mut();
if let Some(h) = handles.get(&handle) {
if let Some(h) = h.upgrade() {
return Ok(h);
}
if let Some(h) = handles.get(&handle)
&& let Some(h) = h.upgrade()
{
return Ok(h);
}
let h = Rc::new(GemHandle {
master: self.clone(),