From fb828a6db214db2351788d9e73de824ad7ba9d1b Mon Sep 17 00:00:00 2001 From: Rua Date: Sat, 7 Oct 2023 14:13:17 +0200 Subject: [PATCH] Clippy fixes for Rust 1.73.0 (#2347) * Clippy fixes for Rust 1.73.0 * Doc fixes too --- vulkano-macros/src/derive_buffer_contents.rs | 7 +- vulkano-util/src/renderer.rs | 4 +- vulkano/autogen/extensions.rs | 149 ++++++++++++------- vulkano/autogen/formats.rs | 25 ++-- vulkano/src/library.rs | 2 +- vulkano/src/memory/alignment.rs | 2 +- 6 files changed, 115 insertions(+), 74 deletions(-) diff --git a/vulkano-macros/src/derive_buffer_contents.rs b/vulkano-macros/src/derive_buffer_contents.rs index 9ab823f7..a3089b5c 100644 --- a/vulkano-macros/src/derive_buffer_contents.rs +++ b/vulkano-macros/src/derive_buffer_contents.rs @@ -23,11 +23,8 @@ pub fn derive_buffer_contents(mut ast: DeriveInput) -> Result { if !ast .attrs .iter() - .filter_map(|attr| { - attr.path - .is_ident("repr") - .then(|| attr.parse_meta().unwrap()) - }) + .filter(|&attr| attr.path.is_ident("repr")) + .map(|attr| attr.parse_meta().unwrap()) .any(|meta| match meta { Meta::List(MetaList { nested, .. }) => { nested.iter().any(|nested_meta| match nested_meta { diff --git a/vulkano-util/src/renderer.rs b/vulkano-util/src/renderer.rs index 4e0a0a14..3d566b60 100644 --- a/vulkano-util/src/renderer.rs +++ b/vulkano-util/src/renderer.rs @@ -50,7 +50,7 @@ pub struct VulkanoWindowRenderer { impl VulkanoWindowRenderer { /// Creates a new [`VulkanoWindowRenderer`] which is used to orchestrate your rendering with /// Vulkano. Pass [`WindowDescriptor`] and optionally a function modifying the - /// [`SwapchainCreateInfo`](vulkano::swapchain::SwapchainCreateInfo) parameters. + /// [`SwapchainCreateInfo`] parameters. pub fn new( vulkano_context: &VulkanoContext, window: winit::window::Window, @@ -254,7 +254,7 @@ impl VulkanoWindowRenderer { } /// Begin your rendering by calling `acquire`. - /// Returns a [`GpuFuture`](vulkano::sync::GpuFuture) representing the time after which the + /// Returns a [`GpuFuture`] representing the time after which the /// swapchain image has been acquired and previous frame ended. /// Execute your command buffers after calling this function and finish rendering by calling /// [`VulkanoWindowRenderer::present`]. diff --git a/vulkano/autogen/extensions.rs b/vulkano/autogen/extensions.rs index fc6ce0e4..8df8fac0 100644 --- a/vulkano/autogen/extensions.rs +++ b/vulkano/autogen/extensions.rs @@ -95,16 +95,26 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream { }| { let name_string = name.to_string(); - let dependency_check_items = requires_all_of.iter().filter_map( - |RequiresOneOf { - api_version, - device_extensions, - instance_extensions, - features: _, - }| { - (device_extensions.is_empty() - && (api_version.is_some() || !instance_extensions.is_empty())) - .then(|| { + let dependency_check_items = requires_all_of + .iter() + .filter( + |&RequiresOneOf { + api_version, + device_extensions, + instance_extensions, + features: _, + }| { + device_extensions.is_empty() + && (api_version.is_some() || !instance_extensions.is_empty()) + }, + ) + .map( + |RequiresOneOf { + api_version, + device_extensions: _, + instance_extensions, + features: _, + }| { let condition_items = (api_version.iter().map(|version| { let version = format_ident!("V{}_{}", version.0, version.1); quote! { api_version >= crate::Version::#version } @@ -141,9 +151,8 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream { })); } } - }) - }, - ); + }, + ); let problem = format!( "contains `{}`, but this extension is not supported by the physical device", name_string, @@ -164,21 +173,38 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream { }, ); - let enable_dependencies_items = members.iter().filter_map( - |ExtensionsMember { - name, - requires_all_of, - .. - }| { - (!requires_all_of.is_empty()).then(|| { - let requires_all_of_items = requires_all_of.iter().filter_map( - |RequiresOneOf { - api_version, - device_extensions, - instance_extensions: _, - features: _, - }| { - (!device_extensions.is_empty()).then(|| { + let enable_dependencies_items = members + .iter() + .filter( + |&ExtensionsMember { + name: _, + requires_all_of, + .. + }| (!requires_all_of.is_empty()), + ) + .map( + |ExtensionsMember { + name, + requires_all_of, + .. + }| { + let requires_all_of_items = requires_all_of + .iter() + .filter( + |&RequiresOneOf { + api_version: _, + device_extensions, + instance_extensions: _, + features: _, + }| (!device_extensions.is_empty()), + ) + .map( + |RequiresOneOf { + api_version, + device_extensions, + instance_extensions: _, + features: _, + }| { let condition_items = api_version .iter() .map(|(major, minor)| { @@ -226,18 +252,16 @@ fn device_extensions_output(members: &[ExtensionsMember]) -> TokenStream { } } } - }) - }, - ); + }, + ); quote! { if self.#name { #(#requires_all_of_items)* } } - }) - }, - ); + }, + ); quote! { #common @@ -325,21 +349,38 @@ fn instance_extensions_output(members: &[ExtensionsMember]) -> TokenStream { }, ); - let enable_dependencies_items = members.iter().filter_map( - |ExtensionsMember { - name, - requires_all_of, - .. - }| { - (!requires_all_of.is_empty()).then(|| { - let requires_all_of_items = requires_all_of.iter().filter_map( - |RequiresOneOf { - api_version, - device_extensions: _, - instance_extensions, - features: _, - }| { - (!instance_extensions.is_empty()).then(|| { + let enable_dependencies_items = members + .iter() + .filter( + |&ExtensionsMember { + name: _, + requires_all_of, + .. + }| (!requires_all_of.is_empty()), + ) + .map( + |ExtensionsMember { + name, + requires_all_of, + .. + }| { + let requires_all_of_items = requires_all_of + .iter() + .filter( + |&RequiresOneOf { + api_version: _, + device_extensions: _, + instance_extensions, + features: _, + }| (!instance_extensions.is_empty()), + ) + .map( + |RequiresOneOf { + api_version, + device_extensions: _, + instance_extensions, + features: _, + }| { let condition_items = api_version .iter() .map(|(major, minor)| { @@ -387,18 +428,16 @@ fn instance_extensions_output(members: &[ExtensionsMember]) -> TokenStream { } } } - }) - }, - ); + }, + ); quote! { if self.#name { #(#requires_all_of_items)* } } - }) - }, - ); + }, + ); quote! { #common diff --git a/vulkano/autogen/formats.rs b/vulkano/autogen/formats.rs index 1bfddc99..1d840d79 100644 --- a/vulkano/autogen/formats.rs +++ b/vulkano/autogen/formats.rs @@ -170,18 +170,23 @@ fn formats_output(members: &[FormatMember]) -> TokenStream { Some(quote! { Self::#name => &[#(Self::#planes),*], }) } }); - let texels_per_block_items = members.iter().filter_map( - |FormatMember { - name, - texels_per_block, - .. - }| { - (*texels_per_block != 1).then(|| { + let texels_per_block_items = members + .iter() + .filter( + |&FormatMember { + texels_per_block, .. + }| (*texels_per_block != 1), + ) + .map( + |FormatMember { + name, + texels_per_block, + .. + }| { let texels_per_block = Literal::u8_unsuffixed(*texels_per_block); quote! { Self::#name => #texels_per_block, } - }) - }, - ); + }, + ); let numeric_format_color_items = members.iter().filter_map( |FormatMember { name, diff --git a/vulkano/src/library.rs b/vulkano/src/library.rs index bbb3f38e..4fe7f457 100644 --- a/vulkano/src/library.rs +++ b/vulkano/src/library.rs @@ -211,7 +211,7 @@ impl VulkanLibrary { /// Returns the list of layers that are available when creating an instance. /// /// On success, this function returns an iterator that produces - /// [`LayerProperties`](crate::instance::LayerProperties) objects. In order to enable a layer, + /// [`LayerProperties`] objects. In order to enable a layer, /// you need to pass its name (returned by `LayerProperties::name()`) when creating the /// [`Instance`](crate::instance::Instance). /// diff --git a/vulkano/src/memory/alignment.rs b/vulkano/src/memory/alignment.rs index 290240bb..6e39dcd4 100644 --- a/vulkano/src/memory/alignment.rs +++ b/vulkano/src/memory/alignment.rs @@ -156,7 +156,7 @@ impl Hash for DeviceAlignment { impl PartialOrd for DeviceAlignment { #[inline] fn partial_cmp(&self, other: &Self) -> Option { - self.as_nonzero().partial_cmp(&other.as_nonzero()) + Some(self.cmp(other)) } }