alex/ash
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Appease clippy (#591)

Browse source 
* Simplify .map().flatten().next() and .filter_map().next() to .find_map()

* Avoid unnecessary closures for cheap expressions

* Use character instead of string for replacement pattern

Co-authored-by: Steve Wooster <s.f.m.wooster@gmail.com>
This commit is contained in:
Steve Wooster 2022-02-26 13:01:28 -08:00 committed by GitHub
parent d180a3b655
commit b16bb4e62c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
examples/src/lib.rs
View file

@ -275,12 +275,12 @@ impl ExampleBase {
let surface_loader = Surface::new(&entry, &instance); let surface_loader = Surface::new(&entry, &instance);
let (pdevice, queue_family_index) = pdevices let (pdevice, queue_family_index) = pdevices
.iter() .iter()
.map(|pdevice| { .find_map(|pdevice| {
instance instance
.get_physical_device_queue_family_properties(*pdevice) .get_physical_device_queue_family_properties(*pdevice)
.iter() .iter()
.enumerate() .enumerate()
.filter_map(|(index, info)| { .find_map(|(index, info)| {
let supports_graphic_and_surface = let supports_graphic_and_surface =
info.queue_flags.contains(vk::QueueFlags::GRAPHICS) info.queue_flags.contains(vk::QueueFlags::GRAPHICS)
&& surface_loader && surface_loader
@ -296,10 +296,7 @@ impl ExampleBase {
None None
} }
}) })
.next()
}) })
.flatten()
.next()
.expect("Couldn't find suitable device."); .expect("Couldn't find suitable device.");
let queue_family_index = queue_family_index as u32; let queue_family_index = queue_family_index as u32;
let device_extension_names_raw = [Swapchain::name().as_ptr()]; let device_extension_names_raw = [Swapchain::name().as_ptr()];

13
generator/src/lib.rs
View file

@ -396,7 +396,7 @@ impl FeatureExt for vkxml::Feature {
version = format!("{}_0", version) version = format!("{}_0", version)
} }
version.replace(".", "_") version.replace('.', "_")
} }
} }
#[derive(Debug, Copy, Clone)] #[derive(Debug, Copy, Clone)]
@ -655,7 +655,7 @@ impl FieldExt for vkxml::Field {
let size = self let size = self
.size .size
.as_ref() .as_ref()
.or_else(|| self.size_enumref.as_ref()) .or(self.size_enumref.as_ref())
.expect("Should have size"); .expect("Should have size");
// Make sure we also rename the constant, that is // Make sure we also rename the constant, that is
// used inside the static array // used inside the static array
@ -1207,9 +1207,7 @@ pub fn variant_ident(enum_name: &str, variant_name: &str) -> Ident {
.unwrap_or(""); .unwrap_or("");
let struct_name = struct_name.strip_suffix(vendor).unwrap(); let struct_name = struct_name.strip_suffix(vendor).unwrap();
let struct_name = TRAILING_NUMBER.replace(struct_name, "_$1"); let struct_name = TRAILING_NUMBER.replace(struct_name, "_$1");
let variant_name = variant_name let variant_name = variant_name.strip_suffix(vendor).unwrap_or(&variant_name);
.strip_suffix(vendor)
.unwrap_or_else(|| variant_name.as_str());
let new_variant_name = variant_name let new_variant_name = variant_name
.strip_prefix(struct_name.as_ref()) .strip_prefix(struct_name.as_ref())
@ -1599,7 +1597,7 @@ pub fn derive_setters(
let param_ident_short = param_ident_string let param_ident_short = param_ident_string
.strip_prefix("p_") .strip_prefix("p_")
.or_else(|| param_ident_string.strip_prefix("pp_")) .or_else(|| param_ident_string.strip_prefix("pp_"))
.unwrap_or_else(|| param_ident_string.as_str()); .unwrap_or(&param_ident_string);
let param_ident_short = format_ident!("{}", &param_ident_short); let param_ident_short = format_ident!("{}", &param_ident_short);
if let Some(name) = field.name.as_ref() { if let Some(name) = field.name.as_ref() {
@ -2401,11 +2399,10 @@ pub fn write_source_code<P: AsRef<Path>>(vk_headers_dir: &Path, src_dir: P) {
let extensions: &Vec<vk_parse::Extension> = spec2 let extensions: &Vec<vk_parse::Extension> = spec2
.0 .0
.iter() .iter()
.filter_map(|item| match item { .find_map(|item| match item {
vk_parse::RegistryChild::Extensions(ref ext) => Some(&ext.children), vk_parse::RegistryChild::Extensions(ref ext) => Some(&ext.children),
_ => None, _ => None,
}) })
.next()
.expect("extension"); .expect("extension");
let mut ty_cache = HashSet::new(); let mut ty_cache = HashSet::new();
let aliases: Vec<_> = spec2 let aliases: Vec<_> = spec2