Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix clippy warnings resulting from #2016 #2020

Merged
merged 1 commit into from
Oct 4, 2022
Merged

Fix clippy warnings resulting from #2016 #2020

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion vulkano/src/command_buffer/pool/standard.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ unsafe impl Sync for StandardCommandPoolAlloc {}
unsafe impl CommandPoolAlloc for StandardCommandPoolAlloc {
#[inline]
fn inner(&self) -> &UnsafeCommandPoolAlloc {
&*self.cmd
&self.cmd
}

#[inline]
Expand Down
6 changes: 3 additions & 3 deletions vulkano/src/shader/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,10 +124,10 @@ impl ShaderModule {
});
}

for capability in spirv_capabilities {
if let Err(reason) = check_spirv_capability(&device, capability.clone()) {
for &capability in spirv_capabilities {
if let Err(reason) = check_spirv_capability(&device, capability) {
return Err(ShaderCreationError::SpirvCapabilityNotSupported {
capability: capability.clone(),
capability,
reason,
});
}
Expand Down
2 changes: 1 addition & 1 deletion vulkano/src/shader/reflect.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -790,7 +790,7 @@ fn descriptor_requirements_of(spirv: &Spirv, variable_id: Id) -> DescriptorVaria
"Vulkan requires that variables of type OpTypeImage have a Sampled operand of \
1 or 2",
);
reqs.image_format = image_format.clone().into();
reqs.image_format = image_format.into();
reqs.image_multisampled = ms != 0;
reqs.image_scalar_type = Some(match *spirv.id(sampled_type).instruction() {
Instruction::TypeInt {
Expand Down