Update version and remove usage of or_patterns (#607)

EmbarkStudios · May 3, 2021 · ff171ed · ff171ed
1 parent 53bc324
commit ff171ed
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 16 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/rustc_codegen_spirv/Cargo.toml b/crates/rustc_codegen_spirv/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "rustc_codegen_spirv"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-builder/Cargo.toml b/crates/spirv-builder/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-builder"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-std"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-std/macros/Cargo.toml b/crates/spirv-std/macros/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "spirv-std-macros"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/crates/spirv-std/macros/src/image.rs b/crates/spirv-std/macros/src/image.rs
@@ -77,9 +77,9 @@ impl Parse for ImageType {
  let int = input.parse::<syn::LitInt>().unwrap();
  set_unique!(
  dimensionality = match (int.base10_digits(), int.suffix()) {
- ("1", "D" | "d") => Dimensionality::OneD,
- ("2", "D" | "d") => Dimensionality::TwoD,
- ("3", "D" | "d") => Dimensionality::ThreeD,
+ ("1", "D") | ("1", "d") => Dimensionality::OneD,
+ ("2", "D") | ("2", "d") => Dimensionality::TwoD,
+ ("3", "D") | ("3", "d") => Dimensionality::ThreeD,
  _ => return Err(syn::Error::new(int.span(), "Unexpected integer")),
  }
  );

diff --git a/crates/spirv-std/macros/src/lib.rs b/crates/spirv-std/macros/src/lib.rs
@@ -51,7 +51,8 @@
 )]
 // END - Embark standard lints v0.3
 // crate-specific exceptions:
-#![allow()]
+// `or_patterns` is not stable yet.
+#![allow(clippy::unnested_or_patterns)]
 
 mod image;
 

diff --git a/crates/spirv-std/shared/Cargo.toml b/crates/spirv-std/shared/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "spirv-types"
 description = "SPIR-V types shared between spirv-std and spirv-std-macros"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"

diff --git a/examples/shaders/compute-shader/Cargo.toml b/examples/shaders/compute-shader/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "compute-shader"
-version = "0.4.0-alpha.6"
+version = "0.4.0-alpha.7"
 authors = ["Embark <[email protected]>"]
 edition = "2018"
 license = "MIT OR Apache-2.0"