Skip to content

Commit fee36ea

Browse files
committed
fix clippy CI
1 parent f67d84a commit fee36ea

2 files changed

Lines changed: 3 additions & 10 deletions

File tree

.cargo/config.toml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ rustflags = [
1212
"-Wclippy::dbg_macro",
1313
"-Wclippy::debug_assert_with_mut_call",
1414
"-Wclippy::doc_markdown",
15-
"-Wclippy::empty_enum",
15+
"-Wclippy::empty_enums",
1616
"-Wclippy::enum_glob_use",
1717
"-Wclippy::exit",
1818
"-Wclippy::expl_impl_clone_on_copy",
@@ -63,7 +63,6 @@ rustflags = [
6363
"-Wclippy::string_add_assign",
6464
"-Wclippy::string_add",
6565
"-Wclippy::string_lit_as_bytes",
66-
"-Wclippy::string_to_string",
6766
"-Wclippy::todo",
6867
"-Wclippy::trait_duplication_in_bounds",
6968
"-Wclippy::unimplemented",

spirv-tools-sys/src/shared.rs

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ use std::fmt;
77
/// This enum MUST be kept in sync with the `typedef enum spv_target_env` in
88
/// `spirv-tools-sys/spirv-tools/include/spirv-tools/libspirv.h`, it is being
99
/// sent across the ffi boundary.
10-
#[derive(Copy, Clone, Debug, PartialEq)]
10+
#[derive(Copy, Clone, Debug, Default, PartialEq)]
1111
#[repr(C)]
1212
#[allow(non_camel_case_types, clippy::upper_case_acronyms)]
1313
pub enum TargetEnv {
@@ -56,6 +56,7 @@ pub enum TargetEnv {
5656
/// Vulkan 1.1 with `VK_KHR_spirv_1_4`, i.e. SPIR-V 1.4 binary.
5757
Vulkan_1_1_Spirv_1_4,
5858
/// SPIR-V 1.5 latest revision, no other restrictions.
59+
#[default] // This is the default target environment for (AFAICT) all spirv-tools
5960
Universal_1_5,
6061
/// Vulkan 1.2 latest revision.
6162
Vulkan_1_2,
@@ -110,13 +111,6 @@ impl TargetEnv {
110111
}
111112
}
112113

113-
impl Default for TargetEnv {
114-
fn default() -> Self {
115-
// This is the default target environment for (AFAICT) all spirv-tools
116-
Self::Universal_1_5
117-
}
118-
}
119-
120114
impl std::str::FromStr for TargetEnv {
121115
type Err = SpirvResult;
122116

0 commit comments

Comments
 (0)