Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 1 addition & 2 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ rustflags = [
"-Wclippy::dbg_macro",
"-Wclippy::debug_assert_with_mut_call",
"-Wclippy::doc_markdown",
"-Wclippy::empty_enum",
"-Wclippy::empty_enums",
"-Wclippy::enum_glob_use",
"-Wclippy::exit",
"-Wclippy::expl_impl_clone_on_copy",
Expand Down Expand Up @@ -63,7 +63,6 @@ rustflags = [
"-Wclippy::string_add_assign",
"-Wclippy::string_add",
"-Wclippy::string_lit_as_bytes",
"-Wclippy::string_to_string",
"-Wclippy::todo",
"-Wclippy::trait_duplication_in_bounds",
"-Wclippy::unimplemented",
Expand Down
10 changes: 2 additions & 8 deletions spirv-tools-sys/src/shared.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use std::fmt;
/// This enum MUST be kept in sync with the `typedef enum spv_target_env` in
/// `spirv-tools-sys/spirv-tools/include/spirv-tools/libspirv.h`, it is being
/// sent across the ffi boundary.
#[derive(Copy, Clone, Debug, PartialEq)]
#[derive(Copy, Clone, Debug, Default, PartialEq)]
#[repr(C)]
#[allow(non_camel_case_types, clippy::upper_case_acronyms)]
pub enum TargetEnv {
Expand Down Expand Up @@ -56,6 +56,7 @@ pub enum TargetEnv {
/// Vulkan 1.1 with `VK_KHR_spirv_1_4`, i.e. SPIR-V 1.4 binary.
Vulkan_1_1_Spirv_1_4,
/// SPIR-V 1.5 latest revision, no other restrictions.
#[default] // This is the default target environment for (AFAICT) all spirv-tools
Universal_1_5,
/// Vulkan 1.2 latest revision.
Vulkan_1_2,
Expand Down Expand Up @@ -110,13 +111,6 @@ impl TargetEnv {
}
}

impl Default for TargetEnv {
fn default() -> Self {
// This is the default target environment for (AFAICT) all spirv-tools
Self::Universal_1_5
}
}

impl std::str::FromStr for TargetEnv {
type Err = SpirvResult;

Expand Down