Skip to content

Commit 326f31a

Browse files
committed
target enum: fixup usages in this repo
1 parent 61a51d6 commit 326f31a

File tree

3 files changed

+4
-5
lines changed

3 files changed

+4
-5
lines changed

crates/rustc_codegen_spirv-target-specs/src/lib.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ impl SpirvTargetEnv {
8080
let env = target
8181
.strip_prefix(SPIRV_TARGET_PREFIX)
8282
.ok_or_else(|| SpirvTargetParseError::WrongPrefix(target.to_string()))?;
83-
FromStr::from_str(env).map_err(|_| SpirvTargetParseError::UnknownEnv(env.to_string()))
83+
FromStr::from_str(env).map_err(|_e| SpirvTargetParseError::UnknownEnv(env.to_string()))
8484
}
8585

8686
pub fn as_str(&self) -> &'static str {

crates/spirv-builder/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,10 @@ It takes care of pulling in the `SPIR-V` backend for Rust, `rustc_codegen_spirv`
1111
## Example
1212

1313
```rust,no_run
14-
use spirv_builder::{MetadataPrintout, SpirvBuilder};
14+
use spirv_builder::{MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
1515
1616
fn main() -> Result<(), Box<dyn std::error::Error>> {
17-
SpirvBuilder::new("my_shaders", "spirv-unknown-vulkan1.1")
17+
SpirvBuilder::new("my_shaders", SpirvTargetEnv::Vulkan_1_1)
1818
.print_metadata(MetadataPrintout::Full)
1919
.build()?;
2020
Ok(())

examples/runners/wgpu/src/lib.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,6 @@
7373

7474
use clap::Parser;
7575
use clap::ValueEnum;
76-
use spirv_builder::SpirvTargetEnv;
7776
use std::borrow::Cow;
7877
use strum::{Display, EnumString};
7978

@@ -129,7 +128,7 @@ fn maybe_watch(
129128
) -> CompiledShaderModules {
130129
#[cfg(not(any(target_os = "android", target_arch = "wasm32")))]
131130
{
132-
use spirv_builder::{CompileResult, MetadataPrintout, SpirvBuilder};
131+
use spirv_builder::{CompileResult, MetadataPrintout, SpirvBuilder, SpirvTargetEnv};
133132
use std::path::PathBuf;
134133
// Hack: spirv_builder builds into a custom directory if running under cargo, to not
135134
// deadlock, and the default target directory if not. However, packages like `proc-macro2`

0 commit comments

Comments
 (0)