From 538cdd2ea760dbd8f32e82369427a8423cc17781 Mon Sep 17 00:00:00 2001 From: XAMPPRocky <4464295+XAMPPRocky@users.noreply.github.com> Date: Thu, 29 Apr 2021 10:55:51 +0200 Subject: [PATCH] Update version and remove usage of or_patterns (#607) --- Cargo.lock | 12 ++++++------ crates/rustc_codegen_spirv/Cargo.toml | 2 +- crates/spirv-builder/Cargo.toml | 2 +- crates/spirv-std/Cargo.toml | 2 +- crates/spirv-std/macros/Cargo.toml | 2 +- crates/spirv-std/macros/src/image.rs | 6 +++--- crates/spirv-std/macros/src/lib.rs | 3 ++- crates/spirv-std/shared/Cargo.toml | 2 +- examples/shaders/compute-shader/Cargo.toml | 2 +- 9 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2bd4964dec..e242e28272 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -400,7 +400,7 @@ dependencies = [ [[package]] name = "compute-shader" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" dependencies = [ "spirv-std", ] @@ -2100,7 +2100,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_codegen_spirv" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" dependencies = [ "bimap", "hashbrown", @@ -2330,7 +2330,7 @@ dependencies = [ [[package]] name = "spirv-builder" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" dependencies = [ "lazy_static", "memchr", @@ -2343,7 +2343,7 @@ dependencies = [ [[package]] name = "spirv-std" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" dependencies = [ "bitflags", "num-traits", @@ -2353,7 +2353,7 @@ dependencies = [ [[package]] name = "spirv-std-macros" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" dependencies = [ "heck", "proc-macro2", @@ -2384,7 +2384,7 @@ dependencies = [ [[package]] name = "spirv-types" -version = "0.4.0-alpha.6" +version = "0.4.0-alpha.7" [[package]] name = "spirv_cross" diff --git a/crates/rustc_codegen_spirv/Cargo.toml b/crates/rustc_codegen_spirv/Cargo.toml index 0cf9d2ceb6..4962d85036 100644 --- 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 "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/crates/spirv-builder/Cargo.toml b/crates/spirv-builder/Cargo.toml index 441bcb043e..9a69d1ca95 100644 --- 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 "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/crates/spirv-std/Cargo.toml b/crates/spirv-std/Cargo.toml index 02d0a5991b..bb31ee8024 100644 --- 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 "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/crates/spirv-std/macros/Cargo.toml b/crates/spirv-std/macros/Cargo.toml index b63d14d0b4..5dd4911978 100644 --- 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 "] 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 index 63a7d543b4..14363f3407 100644 --- 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::().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 index 34dbde6244..d46ea35af9 100644 --- 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 index e7d21136e5..ea92d03627 100644 --- 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 "] edition = "2018" license = "MIT OR Apache-2.0" diff --git a/examples/shaders/compute-shader/Cargo.toml b/examples/shaders/compute-shader/Cargo.toml index b069e8768b..e0a9b5f0ce 100644 --- 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 "] edition = "2018" license = "MIT OR Apache-2.0"