From dcf39f9247994772b2c24da6c4c79281ab8a202c Mon Sep 17 00:00:00 2001 From: Erik Vroon Date: Sun, 1 Sep 2024 16:16:09 +0200 Subject: [PATCH] Disallow wildcard imports (#28) --- Cargo.toml | 3 +++ src/simple_3d_scene/mod.rs | 2 +- src/terrain/hydrology_compute.rs | 6 +++++- src/terrain/mod.rs | 2 +- src/terrain/uniforms.rs | 5 ++++- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index feea196..cb42729 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -54,3 +54,6 @@ bevy_panorbit_camera = "0.19.3" [build-dependencies] embed-resource = "1.8.0" + +[lints.clippy] +wildcard_imports = "deny" diff --git a/src/simple_3d_scene/mod.rs b/src/simple_3d_scene/mod.rs index 5edee39..25de8b3 100644 --- a/src/simple_3d_scene/mod.rs +++ b/src/simple_3d_scene/mod.rs @@ -1,6 +1,6 @@ mod system; use bevy_egui::EguiPlugin; -use system::*; +use system::{simple_3d_scene, ui_system}; use bevy::prelude::*; diff --git a/src/terrain/hydrology_compute.rs b/src/terrain/hydrology_compute.rs index 76df75d..c6ee3df 100644 --- a/src/terrain/hydrology_compute.rs +++ b/src/terrain/hydrology_compute.rs @@ -7,7 +7,11 @@ use bevy::{ extract_resource::ExtractResourcePlugin, render_asset::RenderAssets, render_graph::{Node, NodeRunError, RenderGraph, RenderGraphContext, RenderLabel}, - render_resource::{binding_types::uniform_buffer, *}, + render_resource::{ + binding_types::uniform_buffer, AsBindGroup, BindGroup, BindGroupEntries, + BindGroupLayout, BindGroupLayoutEntries, CachedComputePipelineId, CachedPipelineState, + ComputePassDescriptor, ComputePipelineDescriptor, PipelineCache, ShaderStages, + }, renderer::{RenderContext, RenderDevice, RenderQueue}, texture::GpuImage, Extract, Render, RenderApp, RenderSet, diff --git a/src/terrain/mod.rs b/src/terrain/mod.rs index 859d8ac..e4f6ce6 100644 --- a/src/terrain/mod.rs +++ b/src/terrain/mod.rs @@ -1,5 +1,5 @@ mod mesh; -use mesh::*; +use mesh::{setup_low_poly_terrain, TerrainBuildConfig, TerrainShaderExtension}; mod hydrology_compute; mod images; mod ui; diff --git a/src/terrain/uniforms.rs b/src/terrain/uniforms.rs index e6b0d57..b530116 100644 --- a/src/terrain/uniforms.rs +++ b/src/terrain/uniforms.rs @@ -1,6 +1,9 @@ use bevy::{ prelude::*, - render::{extract_resource::ExtractResource, render_resource::*}, + render::{ + extract_resource::ExtractResource, + render_resource::{AsBindGroup, ShaderType, UniformBuffer}, + }, }; #[derive(Clone, Resource, ExtractResource, Reflect, ShaderType)]