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

32
src/pipewire/pw_ifs/pw_client_node.rs
View file

@ -533,23 +533,23 @@ impl PwClientNode {
if let Some(mt) = obj.get_param(SPA_FORMAT_VIDEO_size.0)? {
format.video_size = Some(mt.pod.get_rectangle()?);
}
if let Some(mt) = obj.get_param(SPA_FORMAT_VIDEO_format.0)? {
if let Some(fmt) = pw_formats().get(&SpaVideoFormat(mt.pod.get_id()?)) {
format.format = Some(*fmt);
}
if let Some(mt) = obj.get_param(SPA_FORMAT_VIDEO_format.0)?
&& let Some(fmt) = pw_formats().get(&SpaVideoFormat(mt.pod.get_id()?))
{
format.format = Some(*fmt);
}
if let Some(mt) = obj.get_param(SPA_FORMAT_VIDEO_modifier.0)? {
if let PwPod::Choice(mods) = mt.pod {
let mut p1 = mods.elements.elements;
p1.read_pod_body_packed(PW_TYPE_Long, 8)?;
while p1.len() > 0 {
let modifier = p1.read_pod_body_packed(PW_TYPE_Long, 8)?;
if let PwPod::Long(modifier) = modifier {
format
.modifiers
.get_or_insert_default_ext()
.push(modifier as u64);
}
if let Some(mt) = obj.get_param(SPA_FORMAT_VIDEO_modifier.0)?
&& let PwPod::Choice(mods) = mt.pod
{
let mut p1 = mods.elements.elements;
p1.read_pod_body_packed(PW_TYPE_Long, 8)?;
while p1.len() > 0 {
let modifier = p1.read_pod_body_packed(PW_TYPE_Long, 8)?;
if let PwPod::Long(modifier) = modifier {
format
.modifiers
.get_or_insert_default_ext()
.push(modifier as u64);
}
}
}

10
src/pipewire/pw_ifs/pw_core.rs
View file

@ -71,11 +71,11 @@ impl PwCore {
let mut p2 = s1.fields;
let id = p2.read_uint()?;
let seq = p2.read_uint()?;
if let Some(obj) = self.con.objects.get(&id) {
if obj.data().sync_id.get() <= seq {
obj.data().sync_id.set(seq);
obj.done();
}
if let Some(obj) = self.con.objects.get(&id)
&& obj.data().sync_id.get() <= seq
{
obj.data().sync_id.set(seq);
obj.done();
}
Ok(())
}

15
src/pipewire/pw_parser.rs
View file

@ -177,13 +177,14 @@ impl<'a> PwParser<'a> {
pub fn read_value(&mut self) -> Result<PwPod<'a>, PwParserError> {
let mut v = self.read_pod();
if let Ok(PwPod::Choice(v)) = &mut v {
if v.ty == PW_CHOICE_None && v.elements.n_elements > 0 {
return v
.elements
.elements
.read_pod_body_packed(v.elements.ty, v.elements.child_len);
}
if let Ok(PwPod::Choice(v)) = &mut v
&& v.ty == PW_CHOICE_None
&& v.elements.n_elements > 0
{
return v
.elements
.elements
.read_pod_body_packed(v.elements.ty, v.elements.child_len);
}
v
}

15
src/pipewire/pw_pod.rs
View file

@ -1202,13 +1202,14 @@ impl<'a> PwPod<'a> {
}
pub fn get_value(mut self) -> Result<PwPod<'a>, PwParserError> {
if let PwPod::Choice(v) = &mut self {
if v.ty == PW_CHOICE_None && v.elements.n_elements > 0 {
return v
.elements
.elements
.read_pod_body_packed(v.elements.ty, v.elements.child_len);
}
if let PwPod::Choice(v) = &mut self
&& v.ty == PW_CHOICE_None
&& v.elements.n_elements > 0
{
return v
.elements
.elements
.read_pod_body_packed(v.elements.ty, v.elements.child_len);
}
Ok(self)
}

10
src/pipewire/pw_pod/pw_debug.rs
View file

@ -325,11 +325,11 @@ impl<'a> Debug for PwPodObject<'a> {
s.field("type", &self.ty);
let name;
let mut id: &dyn Debug = &self.id;
if let Some(d) = debugger {
if let Some(n) = d.id_name(self.id) {
name = n;
id = &name;
}
if let Some(d) = debugger
&& let Some(n) = d.id_name(self.id)
{
name = n;
id = &name;
}
s.field("id", id);
s.field(