From 3d31f9860abf19ed45b4197505e140c4e8207fbb Mon Sep 17 00:00:00 2001 From: Ivan Molodetskikh Date: Fri, 8 Nov 2024 09:10:54 +0300 Subject: Extract format_make_model_serial() --- niri-config/src/lib.rs | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/niri-config/src/lib.rs b/niri-config/src/lib.rs index bc8d3d14..76f892cb 100644 --- a/niri-config/src/lib.rs +++ b/niri-config/src/lib.rs @@ -1918,13 +1918,17 @@ impl OutputName { if self.make.is_none() && self.model.is_none() && self.serial.is_none() { self.connector.to_string() } else { - let make = self.make.as_deref().unwrap_or("Unknown"); - let model = self.model.as_deref().unwrap_or("Unknown"); - let serial = self.serial.as_deref().unwrap_or("Unknown"); - format!("{make} {model} {serial}") + self.format_make_model_serial() } } + pub fn format_make_model_serial(&self) -> String { + let make = self.make.as_deref().unwrap_or("Unknown"); + let model = self.model.as_deref().unwrap_or("Unknown"); + let serial = self.serial.as_deref().unwrap_or("Unknown"); + format!("{make} {model} {serial}") + } + pub fn matches(&self, target: &str) -> bool { // Match by connector. if target.eq_ignore_ascii_case(&self.connector) { -- cgit