From 879a28fbb6bcd0e62a6a150b7065264c1cb6ed7b Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Sun, 24 Sep 2023 16:30:17 +0100 Subject: [PATCH] Fixed warnings --- common/net/src/synced_components.rs | 2 +- server/src/cmd.rs | 4 +++- voxygen/src/scene/tether.rs | 13 +++---------- 3 files changed, 7 insertions(+), 12 deletions(-) diff --git a/common/net/src/synced_components.rs b/common/net/src/synced_components.rs index ffa398087e..4819cb1880 100755 --- a/common/net/src/synced_components.rs +++ b/common/net/src/synced_components.rs @@ -75,7 +75,7 @@ macro_rules! reexport_comps { ($($name:ident: $type:ident,)*) => { mod inner { pub use common::comp::*; - use common::link::Is + use common::link::Is; use common::{ mounting::{Mount, Rider, VolumeRider}, tether::{Leader, Follower}, diff --git a/server/src/cmd.rs b/server/src/cmd.rs index 1f87300ee9..5177993d62 100644 --- a/server/src/cmd.rs +++ b/server/src/cmd.rs @@ -40,6 +40,8 @@ use common::{ effect::Effect, event::{EventBus, ServerEvent}, generation::{EntityConfig, EntityInfo}, + link::Is, + mounting::Rider, npc::{self, get_npc_name}, outcome::Outcome, parse_cmd_args, @@ -47,7 +49,7 @@ use common::{ rtsim::{Actor, Role}, terrain::{Block, BlockKind, CoordinateConversions, SpriteKind, TerrainChunkSize}, tether::Tethered, - uid::{IdMaps, Uid}, + uid::Uid, vol::ReadVol, weather, Damage, DamageKind, DamageSource, Explosion, LoadoutBuilder, RadiusEffect, }; diff --git a/voxygen/src/scene/tether.rs b/voxygen/src/scene/tether.rs index 8b3f15e435..b5a759c891 100644 --- a/voxygen/src/scene/tether.rs +++ b/voxygen/src/scene/tether.rs @@ -1,20 +1,13 @@ -use crate::{ - render::{ - pipelines::tether::{BoundLocals, Locals, Vertex}, - Consts, CullingMode, FirstPassDrawer, Instances, LodObjectInstance, LodObjectVertex, Mesh, - Model, Quad, Renderer, Tri, - }, - scene::{camera, Camera}, - settings::Settings, +use crate::render::{ + pipelines::tether::{BoundLocals, Locals, Vertex}, + FirstPassDrawer, Mesh, Model, Quad, Renderer, }; use client::Client; use common::{ - assets::{AssetExt, ObjAsset}, comp, link::Is, tether::Follower, uid::{IdMaps, Uid}, - util::srgba_to_linear, }; use hashbrown::HashMap; use specs::{Join, WorldExt};