entailz/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

8
toml-config/src/config/parsers/config.rs
View file

@ -340,10 +340,10 @@ impl Parser for ConfigParser<'_> {
}
}
let mut window_management_key = None;
if let Some(value) = window_management_key_val {
if let Some(key) = parse_modified_keysym_str(self.0, value.span, value.value) {
window_management_key = Some(key);
}
if let Some(value) = window_management_key_val
&& let Some(key) = parse_modified_keysym_str(self.0, value.span, value.value)
{
window_management_key = Some(key);
}
let mut vrr = None;
if let Some(value) = vrr_val {

176
toml-config/src/lib.rs
View file

@ -387,35 +387,35 @@ impl DrmDeviceMatch {
return false;
}
}
if let Some(syspath) = syspath {
if d.syspath() != *syspath {
return false;
}
if let Some(syspath) = syspath
&& d.syspath() != *syspath
{
return false;
}
if let Some(devnode) = devnode {
if d.devnode() != *devnode {
return false;
}
if let Some(devnode) = devnode
&& d.devnode() != *devnode
{
return false;
}
if let Some(model) = model_name {
if d.model() != *model {
return false;
}
if let Some(model) = model_name
&& d.model() != *model
{
return false;
}
if let Some(vendor) = vendor_name {
if d.vendor() != *vendor {
return false;
}
if let Some(vendor) = vendor_name
&& d.vendor() != *vendor
{
return false;
}
if let Some(vendor) = vendor {
if d.pci_id().vendor != *vendor {
return false;
}
if let Some(vendor) = vendor
&& d.pci_id().vendor != *vendor
{
return false;
}
if let Some(model) = model {
if d.pci_id().model != *model {
return false;
}
if let Some(model) = model
&& d.pci_id().model != *model
{
return false;
}
true
}
@ -449,10 +449,10 @@ impl InputMatch {
is_gesture,
is_switch,
} => {
if let Some(name) = name {
if d.name() != *name {
return false;
}
if let Some(name) = name
&& d.name() != *name
{
return false;
}
if let Some(tag) = tag {
let matches = apply_recursive_match(
@ -466,22 +466,22 @@ impl InputMatch {
return false;
}
}
if let Some(syspath) = syspath {
if d.syspath() != *syspath {
return false;
}
if let Some(syspath) = syspath
&& d.syspath() != *syspath
{
return false;
}
if let Some(devnode) = devnode {
if d.devnode() != *devnode {
return false;
}
if let Some(devnode) = devnode
&& d.devnode() != *devnode
{
return false;
}
macro_rules! check_cap {
($is:expr, $cap:ident) => {
if let Some(is) = *$is {
if d.has_capability(jay_config::input::capability::$cap) != is {
return false;
}
if let Some(is) = *$is
&& d.has_capability(jay_config::input::capability::$cap) != is
{
return false;
}
};
}
@ -527,10 +527,10 @@ impl Input {
if let Some(v) = self.transform_matrix {
c.set_transform_matrix(v);
}
if let Some(v) = &self.keymap {
if let Some(km) = state.get_keymap(v) {
c.set_keymap(km);
}
if let Some(v) = &self.keymap
&& let Some(km) = state.get_keymap(v)
{
c.set_keymap(km);
}
if let Some(output) = &self.output {
if let Some(output) = output {
@ -590,25 +590,25 @@ impl OutputMatch {
return false;
}
}
if let Some(connector) = &connector {
if c.name() != *connector {
return false;
}
if let Some(connector) = &connector
&& c.name() != *connector
{
return false;
}
if let Some(serial_number) = &serial_number {
if c.serial_number() != *serial_number {
return false;
}
if let Some(serial_number) = &serial_number
&& c.serial_number() != *serial_number
{
return false;
}
if let Some(manufacturer) = &manufacturer {
if c.manufacturer() != *manufacturer {
return false;
}
if let Some(manufacturer) = &manufacturer
&& c.manufacturer() != *manufacturer
{
return false;
}
if let Some(model) = &model {
if c.model() != *model {
return false;
}
if let Some(model) = &model
&& c.model() != *model
{
return false;
}
true
}
@ -624,10 +624,10 @@ impl ConnectorMatch {
match self {
ConnectorMatch::Any(m) => m.iter().any(|m| m.matches(c)),
ConnectorMatch::All { connector } => {
if let Some(connector) = &connector {
if c.name() != *connector {
return false;
}
if let Some(connector) = &connector
&& c.name() != *connector
{
return false;
}
true
}
@ -679,10 +679,10 @@ impl Output {
c.set_vrr_cursor_hz(hz);
}
}
if let Some(tearing) = &self.tearing {
if let Some(mode) = tearing.mode {
c.set_tearing_mode(mode);
}
if let Some(tearing) = &self.tearing
&& let Some(mode) = tearing.mode
{
c.set_tearing_mode(mode);
}
if let Some(format) = self.format {
c.set_format(format);
@ -858,10 +858,10 @@ impl State {
let actions = actions.clone();
dev.on_switch_event(move |ev| {
for (match_, actions) in &*actions {
if match_.matches(dev, &state) {
if let Some(action) = actions.get(&ev) {
action();
}
if match_.matches(dev, &state)
&& let Some(action) = actions.get(&ev)
{
action();
}
}
});
@ -1214,10 +1214,10 @@ fn load_config(initial_load: bool, persistent: &Rc<PersistentState>) {
set_vrr_cursor_hz(hz);
}
}
if let Some(tearing) = config.tearing {
if let Some(mode) = tearing.mode {
set_tearing_mode(mode);
}
if let Some(tearing) = config.tearing
&& let Some(mode) = tearing.mode
{
set_tearing_mode(mode);
}
set_libei_socket_enabled(config.libei.enable_socket.unwrap_or(false));
if let Some(enabled) = config.ui_drag.enabled {
@ -1226,20 +1226,20 @@ fn load_config(initial_load: bool, persistent: &Rc<PersistentState>) {
if let Some(threshold) = config.ui_drag.threshold {
set_ui_drag_threshold(threshold);
}
if let Some(xwayland) = config.xwayland {
if let Some(mode) = xwayland.scaling_mode {
set_x_scaling_mode(mode);
}
if let Some(xwayland) = config.xwayland
&& let Some(mode) = xwayland.scaling_mode
{
set_x_scaling_mode(mode);
}
if let Some(cm) = config.color_management {
if let Some(enabled) = cm.enabled {
set_color_management_enabled(enabled);
}
if let Some(cm) = config.color_management
&& let Some(enabled) = cm.enabled
{
set_color_management_enabled(enabled);
}
if let Some(float) = config.float {
if let Some(show) = float.show_pin_icon {
set_show_float_pin_icon(show);
}
if let Some(float) = config.float
&& let Some(show) = float.show_pin_icon
{
set_show_float_pin_icon(show);
}
if let Some(key) = config.pointer_revert_key {
persistent.seat.set_pointer_revert_key(key);

52
toml-config/src/toml/toml_parser.rs
View file

@ -179,16 +179,14 @@ impl<'a> Parser<'a, '_> {
b'u' => 4,
_ => 8,
};
if s.len() - pos >= len {
if let Ok(s) = std::str::from_utf8(&s[pos..pos + len]) {
if let Ok(n) = u32::from_str_radix(s, 16) {
if let Some(c) = char::from_u32(n) {
pos += len;
let _ = write!(res, "{c}");
break 'unicode;
}
}
}
if s.len() - pos >= len
&& let Ok(s) = std::str::from_utf8(&s[pos..pos + len])
&& let Ok(n) = u32::from_str_radix(s, 16)
&& let Some(c) = char::from_u32(n)
{
pos += len;
let _ = write!(res, "{c}");
break 'unicode;
}
res.extend_from_slice(&s[pos - 2..]);
}
@ -322,11 +320,11 @@ impl<'a> Parser<'a, '_> {
fn parse_table_header(&mut self) -> Result<(Spanned<Key>, bool), Spanned<ParserError>> {
let lo = self.next(false)?.span.lo;
let mut append = false;
if let Some(token) = self.lexer.peek(false) {
if token.value == Token::LeftBracket {
let _ = self.next(false);
append = true;
}
if let Some(token) = self.lexer.peek(false)
&& token.value == Token::LeftBracket
{
let _ = self.next(false);
append = true;
}
let key = self.parse_key()?;
let mut hi = self.parse_exact(Token::RightBracket, false)?.hi;
@ -366,21 +364,19 @@ impl<'a> Parser<'a, '_> {
if let RawEntryMut::Occupied(mut old) =
dst.raw_entry_mut_v1().from_key(key.value.as_str())
{
if append_last {
if let Value::Array(array) = &mut old.get_mut().value {
array.push(value);
return;
}
if append_last && let Value::Array(array) = &mut old.get_mut().value {
array.push(value);
return;
}
if let Value::Table(old) = &mut old.get_mut().value {
if let Value::Table(new) = value.value {
for (k, v) in new {
let mut keys = Key::new();
keys.push_back(k);
self.insert(old, &mut keys, v, false, false);
}
return;
if let Value::Table(old) = &mut old.get_mut().value
&& let Value::Table(new) = value.value
{
for (k, v) in new {
let mut keys = Key::new();
keys.push_back(k);
self.insert(old, &mut keys, v, false, false);
}
return;
}
self.error_handler
.redefinition(ParserError::Redefined.spanned(key.span), old.key().span);