From a5cd2978b3e8a68c8d56de55800c53fad425a4a6 Mon Sep 17 00:00:00 2001 From: Sergey Smirnykh Date: Tue, 21 Apr 2020 14:48:56 +0700 Subject: [PATCH] Fix clippy::unnecessary::filter-map warning --- src/backend/udev.rs | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/backend/udev.rs b/src/backend/udev.rs index f88972f..cc41ca4 100644 --- a/src/backend/udev.rs +++ b/src/backend/udev.rs @@ -176,22 +176,19 @@ pub fn primary_gpu>(seat: S) -> IoResult> { if let Some(path) = enumerator .scan_devices()? - .filter_map(|device| { - if device + .filter(|device| { + let seat_name = device .property_value("ID_SEAT") .map(|x| x.to_os_string()) - .unwrap_or_else(|| OsString::from("seat0")) - == *seat.as_ref() - { + .unwrap_or_else(|| OsString::from("seat0")); + if seat_name == *seat.as_ref() { if let Ok(Some(pci)) = device.parent_with_subsystem(Path::new("pci")) { if let Some(id) = pci.attribute_value("boot_vga") { - if id == "1" { - return Some(device); - } + return id == "1"; } } - }; - None + } + false }) .flat_map(|device| device.devnode().map(PathBuf::from)) .next()