diff --git a/Cargo.lock b/Cargo.lock index 04049ba..b7fbffe 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -401,7 +401,7 @@ dependencies = [ [[package]] name = "cargo-gpu" version = "0.1.0" -source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=f2244a3f7f9f30998918a543075a1ce17b42af64#f2244a3f7f9f30998918a543075a1ce17b42af64" +source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=7f1995823a82ee6e6b7a63b57313c4a829856e3d#7f1995823a82ee6e6b7a63b57313c4a829856e3d" dependencies = [ "anyhow", "cargo-gpu-install", @@ -419,7 +419,7 @@ dependencies = [ [[package]] name = "cargo-gpu-install" version = "0.1.0" -source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=f2244a3f7f9f30998918a543075a1ce17b42af64#f2244a3f7f9f30998918a543075a1ce17b42af64" +source = "git+https://github.com/Rust-GPU/cargo-gpu?rev=7f1995823a82ee6e6b7a63b57313c4a829856e3d#7f1995823a82ee6e6b7a63b57313c4a829856e3d" dependencies = [ "anyhow", "cargo_metadata", @@ -3000,7 +3000,7 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" [[package]] name = "rustc_codegen_spirv-types" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=e7e447a9395a77caec5cbddea556af86bc68c573#e7e447a9395a77caec5cbddea556af86bc68c573" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=6a67e7b5954f37989ad540a555b5d6969073592e#6a67e7b5954f37989ad540a555b5d6969073592e" dependencies = [ "rspirv", "semver", @@ -3323,7 +3323,7 @@ dependencies = [ [[package]] name = "spirv-builder" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=e7e447a9395a77caec5cbddea556af86bc68c573#e7e447a9395a77caec5cbddea556af86bc68c573" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=6a67e7b5954f37989ad540a555b5d6969073592e#6a67e7b5954f37989ad540a555b5d6969073592e" dependencies = [ "cargo_metadata", "clap", @@ -3341,7 +3341,7 @@ dependencies = [ [[package]] name = "spirv-std" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=79acad1f916d953275c93c16f006543ce18a14b1#79acad1f916d953275c93c16f006543ce18a14b1" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" dependencies = [ "bitflags 1.3.2", "glam", @@ -3354,7 +3354,7 @@ dependencies = [ [[package]] name = "spirv-std-macros" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=79acad1f916d953275c93c16f006543ce18a14b1#79acad1f916d953275c93c16f006543ce18a14b1" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" dependencies = [ "proc-macro2", "quote", @@ -3365,7 +3365,7 @@ dependencies = [ [[package]] name = "spirv-std-types" version = "0.9.0" -source = "git+https://github.com/Rust-GPU/rust-gpu?rev=79acad1f916d953275c93c16f006543ce18a14b1#79acad1f916d953275c93c16f006543ce18a14b1" +source = "git+https://github.com/Rust-GPU/rust-gpu?rev=30896871ba00e668029ccb724f1438202b284708#30896871ba00e668029ccb724f1438202b284708" [[package]] name = "stable_deref_trait" diff --git a/Cargo.toml b/Cargo.toml index e181802..dfd8fd0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,9 +13,6 @@ edition = "2024" license = "MIT" repository = "" -[workspace.lints.rust] -unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'] } - [workspace.dependencies] # API ash = "0.38" @@ -25,8 +22,8 @@ wgpu = { version = "27.0.1", default-features = false, features = ["std", "parki pollster = "0.4.0" # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } @@ -35,3 +32,80 @@ raw-window-handle = "0.6.2" winit = "0.30.0" env_logger = "0.11.8" anyhow = "1.0.98" + + + +[workspace.lints.rust] +unexpected_cfgs = { level = "allow", check-cfg = ['cfg(target_arch, values("spirv"))'], priority = 1 } +# copied from rust-gpu +future_incompatible = "warn" +nonstandard_style = "warn" +rust_2018_idioms = "warn" + +[workspace.lints.clippy] +# copied from rust-gpu +all = { level = "warn", priority = -1 } +await_holding_lock = "warn" +char_lit_as_u8 = "warn" +checked_conversions = "warn" +dbg_macro = "warn" +debug_assert_with_mut_call = "warn" +doc_markdown = "warn" +empty_enums = "warn" +enum_glob_use = "warn" +#exit = "warn" +expl_impl_clone_on_copy = "warn" +explicit_deref_methods = "warn" +explicit_into_iter_loop = "warn" +fallible_impl_from = "warn" +filter_map_next = "warn" +flat_map_option = "warn" +float_cmp_const = "warn" +fn_params_excessive_bools = "warn" +from_iter_instead_of_collect = "warn" +if_let_mutex = "warn" +implicit_clone = "warn" +imprecise_flops = "warn" +inefficient_to_string = "warn" +invalid_upcast_comparisons = "warn" +large_digit_groups = "warn" +large_stack_arrays = "warn" +large_types_passed_by_value = "warn" +let_unit_value = "warn" +linkedlist = "warn" +lossy_float_literal = "warn" +macro_use_imports = "warn" +manual_ok_or = "warn" +map_err_ignore = "warn" +map_flatten = "warn" +map_unwrap_or = "warn" +match_same_arms = "warn" +match_wild_err_arm = "warn" +match_wildcard_for_single_variants = "warn" +mem_forget = "warn" +missing_enforced_import_renames = "warn" +mut_mut = "warn" +mutex_integer = "warn" +needless_borrow = "warn" +needless_continue = "warn" +needless_for_each = "warn" +option_option = "warn" +path_buf_push_overwrite = "warn" +ptr_as_ptr = "warn" +rc_mutex = "warn" +ref_option_ref = "warn" +rest_pat_in_fully_bound_structs = "warn" +same_functions_in_if_condition = "warn" +semicolon_if_nothing_returned = "warn" +single_match_else = "warn" +string_add_assign = "warn" +string_add = "warn" +string_lit_as_bytes = "warn" +todo = "warn" +trait_duplication_in_bounds = "warn" +unimplemented = "warn" +unnested_or_patterns = "warn" +unused_self = "warn" +useless_transmute = "warn" +verbose_file_reads = "warn" +zero_sized_map_values = "warn" diff --git a/generated/graphics/ash/cargo-gpu/Cargo.toml b/generated/graphics/ash/cargo-gpu/Cargo.toml index 83b62cb..d14c222 100644 --- a/generated/graphics/ash/cargo-gpu/Cargo.toml +++ b/generated/graphics/ash/cargo-gpu/Cargo.toml @@ -22,8 +22,8 @@ ash-window = "0.13" gpu-allocator = { version = "0.28.0", default-features = false, features = ["std", "vulkan"] } # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/ash/cargo-gpu/mygraphics/src/lib.rs b/generated/graphics/ash/cargo-gpu/mygraphics/src/lib.rs index 73ba8a6..86677f1 100644 --- a/generated/graphics/ash/cargo-gpu/mygraphics/src/lib.rs +++ b/generated/graphics/ash/cargo-gpu/mygraphics/src/lib.rs @@ -1,74 +1,2 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - pub mod ash_renderer; pub mod util; diff --git a/generated/graphics/ash/spirv-builder/Cargo.toml b/generated/graphics/ash/spirv-builder/Cargo.toml index eac6d6b..3e2d877 100644 --- a/generated/graphics/ash/spirv-builder/Cargo.toml +++ b/generated/graphics/ash/spirv-builder/Cargo.toml @@ -23,8 +23,8 @@ gpu-allocator = { version = "0.28.0", default-features = false, features = ["std # rust-gpu # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/ash/spirv-builder/mygraphics/src/lib.rs b/generated/graphics/ash/spirv-builder/mygraphics/src/lib.rs index 73ba8a6..86677f1 100644 --- a/generated/graphics/ash/spirv-builder/mygraphics/src/lib.rs +++ b/generated/graphics/ash/spirv-builder/mygraphics/src/lib.rs @@ -1,74 +1,2 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - pub mod ash_renderer; pub mod util; diff --git a/generated/graphics/ash/spirv-builder/rust-toolchain.toml b/generated/graphics/ash/spirv-builder/rust-toolchain.toml index c817176..df80c0c 100644 --- a/generated/graphics/ash/spirv-builder/rust-toolchain.toml +++ b/generated/graphics/ash/spirv-builder/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-30" +channel = "nightly-2025-11-13" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/generated/graphics/wgpu/cargo-gpu/Cargo.toml b/generated/graphics/wgpu/cargo-gpu/Cargo.toml index 7d8af33..d525049 100644 --- a/generated/graphics/wgpu/cargo-gpu/Cargo.toml +++ b/generated/graphics/wgpu/cargo-gpu/Cargo.toml @@ -21,8 +21,8 @@ wgpu = { version = "27.0.1", default-features = false, features = ["std", "parki pollster = "0.4.0" # rust-gpu -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/wgpu/cargo-gpu/mygraphics/src/lib.rs b/generated/graphics/wgpu/cargo-gpu/mygraphics/src/lib.rs index 48b8478..00d9995 100644 --- a/generated/graphics/wgpu/cargo-gpu/mygraphics/src/lib.rs +++ b/generated/graphics/wgpu/cargo-gpu/mygraphics/src/lib.rs @@ -1,74 +1,2 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - pub mod util; pub mod wgpu_renderer; diff --git a/generated/graphics/wgpu/spirv-builder/Cargo.toml b/generated/graphics/wgpu/spirv-builder/Cargo.toml index ec529b5..6ec6efe 100644 --- a/generated/graphics/wgpu/spirv-builder/Cargo.toml +++ b/generated/graphics/wgpu/spirv-builder/Cargo.toml @@ -22,8 +22,8 @@ pollster = "0.4.0" # rust-gpu # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } diff --git a/generated/graphics/wgpu/spirv-builder/mygraphics/src/lib.rs b/generated/graphics/wgpu/spirv-builder/mygraphics/src/lib.rs index 48b8478..00d9995 100644 --- a/generated/graphics/wgpu/spirv-builder/mygraphics/src/lib.rs +++ b/generated/graphics/wgpu/spirv-builder/mygraphics/src/lib.rs @@ -1,74 +1,2 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - pub mod util; pub mod wgpu_renderer; diff --git a/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml b/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml index c817176..df80c0c 100644 --- a/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml +++ b/generated/graphics/wgpu/spirv-builder/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-30" +channel = "nightly-2025-11-13" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/graphics/Cargo.toml.liquid b/graphics/Cargo.toml.liquid index 2bb48cd..9be8257 100644 --- a/graphics/Cargo.toml.liquid +++ b/graphics/Cargo.toml.liquid @@ -30,12 +30,12 @@ pollster = "0.4.0" # rust-gpu {% if integration == "spirv-builder" -%} # The version of the dependencies `spirv-builder` and `spirv-std` must match exactly! -spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +spirv-builder = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } {% endif -%} {% if integration == "cargo-gpu" -%} -cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "f2244a3f7f9f30998918a543075a1ce17b42af64" } +cargo-gpu = { git = "https://github.com/Rust-GPU/cargo-gpu", rev = "7f1995823a82ee6e6b7a63b57313c4a829856e3d" } {% endif -%} -spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "79acad1f916d953275c93c16f006543ce18a14b1" } +spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu", rev = "30896871ba00e668029ccb724f1438202b284708" } # other glam = { version = "0.32.0", default-features = false } diff --git a/graphics/mygraphics/src/lib.rs b/graphics/mygraphics/src/lib.rs index bde0fc5..da82c87 100644 --- a/graphics/mygraphics/src/lib.rs +++ b/graphics/mygraphics/src/lib.rs @@ -1,75 +1,3 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - pub mod ash_renderer; pub mod util; pub mod wgpu_renderer; diff --git a/graphics/mygraphics/src/lib.rs.liquid b/graphics/mygraphics/src/lib.rs.liquid index 22e2631..eea8d32 100644 --- a/graphics/mygraphics/src/lib.rs.liquid +++ b/graphics/mygraphics/src/lib.rs.liquid @@ -1,75 +1,3 @@ -// FIXME(eddyb) update/review these lints. -// -// BEGIN - Embark standard lints v0.4 -// do not change or add/remove here, but one can add exceptions after this section -// for more info see: -//#![deny(unsafe_code)] // impractical in this crate dealing with unsafe `ash` -#![warn( - clippy::all, - clippy::await_holding_lock, - clippy::char_lit_as_u8, - clippy::checked_conversions, - clippy::dbg_macro, - clippy::debug_assert_with_mut_call, - clippy::doc_markdown, - clippy::empty_enum, - clippy::enum_glob_use, - clippy::exit, - clippy::expl_impl_clone_on_copy, - clippy::explicit_deref_methods, - clippy::explicit_into_iter_loop, - clippy::fallible_impl_from, - clippy::filter_map_next, - clippy::float_cmp_const, - clippy::fn_params_excessive_bools, - clippy::if_let_mutex, - clippy::implicit_clone, - clippy::imprecise_flops, - clippy::inefficient_to_string, - clippy::invalid_upcast_comparisons, - clippy::large_types_passed_by_value, - clippy::let_unit_value, - clippy::linkedlist, - clippy::lossy_float_literal, - clippy::macro_use_imports, - clippy::manual_ok_or, - clippy::map_err_ignore, - clippy::map_flatten, - clippy::map_unwrap_or, - clippy::match_same_arms, - clippy::match_wildcard_for_single_variants, - clippy::mem_forget, - clippy::mut_mut, - clippy::mutex_integer, - clippy::needless_borrow, - clippy::needless_continue, - clippy::option_option, - clippy::path_buf_push_overwrite, - clippy::ptr_as_ptr, - clippy::ref_option_ref, - clippy::rest_pat_in_fully_bound_structs, - clippy::same_functions_in_if_condition, - clippy::semicolon_if_nothing_returned, - clippy::string_add_assign, - clippy::string_add, - clippy::string_lit_as_bytes, - clippy::string_to_string, - clippy::todo, - clippy::trait_duplication_in_bounds, - clippy::unimplemented, - clippy::unnested_or_patterns, - clippy::unused_self, - clippy::useless_transmute, - clippy::verbose_file_reads, - clippy::zero_sized_map_values, - future_incompatible, - nonstandard_style, - rust_2018_idioms -)] -// END - Embark standard lints v0.4 -// crate-specific exceptions: -// #![allow()] - {% if api == "ash" -%} pub mod ash_renderer; {% endif -%} diff --git a/graphics/rust-toolchain.toml b/graphics/rust-toolchain.toml index c817176..df80c0c 100644 --- a/graphics/rust-toolchain.toml +++ b/graphics/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-30" +channel = "nightly-2025-11-13" components = ["rust-src", "rustc-dev", "llvm-tools"] diff --git a/rust-toolchain.toml b/rust-toolchain.toml index c817176..df80c0c 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "nightly-2025-06-30" +channel = "nightly-2025-11-13" components = ["rust-src", "rustc-dev", "llvm-tools"]