From 84e6b748936dda51bfaffa733251d995bb97434e Mon Sep 17 00:00:00 2001 From: Julian Orth Date: Sat, 23 Mar 2024 00:39:15 +0100 Subject: [PATCH] all: address clippy lints --- build/wire_xcon.rs | 2 +- src/gfx_apis/vulkan/instance.rs | 3 +-- toml-config/src/toml/toml_lexer.rs | 4 +--- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/build/wire_xcon.rs b/build/wire_xcon.rs index 59fbac2b..f4a82486 100644 --- a/build/wire_xcon.rs +++ b/build/wire_xcon.rs @@ -813,7 +813,7 @@ struct Extension { #[derive(Debug)] enum NamedType { Struct(Rc), - Bitmask(Rc), + Bitmask(#[allow(dead_code)] Rc), Enum(Rc), } diff --git a/src/gfx_apis/vulkan/instance.rs b/src/gfx_apis/vulkan/instance.rs index e64a7453..56985968 100644 --- a/src/gfx_apis/vulkan/instance.rs +++ b/src/gfx_apis/vulkan/instance.rs @@ -146,8 +146,7 @@ impl Drop for VulkanInstance { const REQUIRED_INSTANCE_EXTENSIONS: &[&CStr] = &[ExtDebugUtilsFn::name()]; -const VALIDATION_LAYER: &CStr = - unsafe { CStr::from_bytes_with_nul_unchecked(b"VK_LAYER_KHRONOS_validation\0") }; +const VALIDATION_LAYER: &CStr = c"VK_LAYER_KHRONOS_validation"; pub type Extensions = AHashMap; diff --git a/toml-config/src/toml/toml_lexer.rs b/toml-config/src/toml/toml_lexer.rs index 9ff85dc2..a227fc12 100644 --- a/toml-config/src/toml/toml_lexer.rs +++ b/toml-config/src/toml/toml_lexer.rs @@ -96,9 +96,7 @@ impl<'a> Lexer<'a> { self.skip_ws(); - let Some(c) = get!(0) else { - return None; - }; + let c = get!(0)?; let pos = self.pos; macro_rules! span {