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

Clippy lints for 1.42

Browse source
This commit is contained in:
Maik Klein 2020-03-15 00:55:26 +01:00
parent de05ff6702
commit c32f0dd739
2 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/src/lib.rs
View file

@ -388,10 +388,10 @@ impl ExampleBase {
None None
} }
}) })
.nth(0) .next()
}) })
.filter_map(|v| v) .filter_map(|v| v)
.nth(0) .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()];
@ -429,7 +429,7 @@ impl ExampleBase {
}, },
_ => *sfmt, _ => *sfmt,
}) })
.nth(0) .next()
.expect("Unable to find suitable surface format."); .expect("Unable to find suitable surface format.");
let surface_capabilities = surface_loader let surface_capabilities = surface_loader
.get_physical_device_surface_capabilities(pdevice, surface) .get_physical_device_surface_capabilities(pdevice, surface)

14
generator/src/lib.rs
View file

@ -403,7 +403,7 @@ impl ConstantExt for vkxml::ExtensionEnum {
Constant::from_extension_enum(self).expect("").to_tokens() Constant::from_extension_enum(self).expect("").to_tokens()
} }
fn notation(&self) -> Option<&str> { fn notation(&self) -> Option<&str> {
self.notation.as_ref().map(|s| s.as_str()) self.notation.as_deref()
} }
} }
@ -415,7 +415,7 @@ impl ConstantExt for vkxml::Constant {
Constant::from_constant(self).to_tokens() Constant::from_constant(self).to_tokens()
} }
fn notation(&self) -> Option<&str> { fn notation(&self) -> Option<&str> {
self.notation.as_ref().map(|s| s.as_str()) self.notation.as_deref()
} }
} }
@ -672,7 +672,7 @@ impl FieldExt for vkxml::Field {
true true
} }
fn param_ident(&self) -> Ident { fn param_ident(&self) -> Ident {
let name = self.name.as_ref().map(|s| s.as_str()).unwrap_or("field"); let name = self.name.as_deref().unwrap_or("field");
let name_corrected = match name { let name_corrected = match name {
"type" => "ty", "type" => "ty",
_ => name, _ => name,
@ -1112,7 +1112,7 @@ pub fn variant_ident(enum_name: &str, variant_name: &str) -> Ident {
.replace(vendor, ""); .replace(vendor, "");
let is_digit = new_variant_name let is_digit = new_variant_name
.chars() .chars()
.nth(0) .next()
.map(|c| c.is_digit(10)) .map(|c| c.is_digit(10))
.unwrap_or(false); .unwrap_or(false);
if is_digit { if is_digit {
@ -1246,7 +1246,7 @@ pub fn generate_result(ident: Ident, _enum: &vkxml::Enumeration) -> Tokens {
let (variant_name, notation) = match *elem { let (variant_name, notation) = match *elem {
vkxml::EnumerationElement::Enum(ref constant) => ( vkxml::EnumerationElement::Enum(ref constant) => (
constant.name.as_str(), constant.name.as_str(),
constant.notation.as_ref().map(|s| s.as_str()).unwrap_or(""), constant.notation.as_deref().unwrap_or(""),
), ),
_ => { _ => {
return None; return None;
@ -1319,7 +1319,7 @@ pub fn derive_default(_struct: &vkxml::Struct) -> Option<Tokens> {
let ty = field let ty = field
.type_enums .type_enums
.as_ref() .as_ref()
.and_then(|ty| ty.split(',').nth(0)); .and_then(|ty| ty.split(',').next());
if let Some(variant) = ty { if let Some(variant) = ty {
let variant_ident = variant_ident("VkStructureType", variant); let variant_ident = variant_ident("VkStructureType", variant);
@ -2139,7 +2139,7 @@ pub fn write_source_code(path: &Path) {
vk_parse::RegistryChild::Extensions(ref ext) => Some(&ext.children), vk_parse::RegistryChild::Extensions(ref ext) => Some(&ext.children),
_ => None, _ => None,
}) })
.nth(0) .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