Skip to content

Commit 65a499d

Browse files
Fix linter
1 parent c87b752 commit 65a499d

File tree

12 files changed

+16
-25
lines changed

12 files changed

+16
-25
lines changed

src/client/chat/systems.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,9 +247,9 @@ pub fn focus_chat_system(
247247
#[cfg(test)]
248248
mod tests {
249249
use super::*;
250+
use crate::ChatMessage;
250251
use bevy::ecs::event::Events;
251252
use chat_events::{ChatClearEvent, SingleChatSendEvent};
252-
use crate::ChatMessage;
253253

254254
fn get_chat_messages(app: &mut App) -> Vec<String> {
255255
let mut messages = app

src/client/collider/systems.rs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -123,10 +123,7 @@ mod tests {
123123
));
124124

125125
let block = BlockId::Dirt;
126-
let mut resource = app
127-
.world_mut()
128-
.get_resource_mut::<ChunkManager>()
129-
.unwrap();
126+
let mut resource = app.world_mut().get_resource_mut::<ChunkManager>().unwrap();
130127
let chunks = ChunkManager::instantiate_chunks(
131128
Vec3 {
132129
x: 0.0,

src/client/networking/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
pub mod systems;
22

3+
use crate::connection_config;
34
use bevy_renet::{
45
netcode::{ClientAuthentication, NetcodeClientPlugin, NetcodeClientTransport},
56
RenetClientPlugin,
67
};
7-
use crate::connection_config;
88

99
use crate::prelude::*;
1010

src/client/prelude.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ pub use terrain_util::CubeFace;
4545

4646
// my crates
4747
pub use crate::states::GameState;
48-
pub use rsmc as lib;
4948
pub use lib::*;
49+
pub use rsmc as lib;
5050

5151
pub use crate::collider::components as collider_components;
5252
pub use crate::collider::events as collider_events;

src/server/networking/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
pub mod systems;
22

3+
use crate::connection_config;
34
#[cfg(feature = "renet_visualizer")]
45
use bevy_inspector_egui::bevy_egui::EguiPlugin;
56
#[cfg(feature = "renet_visualizer")]
67
use renet_visualizer::RenetServerVisualizer;
7-
use crate::connection_config;
88

99
use crate::prelude::*;
1010

src/server/networking/systems.rs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,11 +30,8 @@ pub fn receive_message_system(
3030
server.broadcast_message_except(
3131
client_id,
3232
DefaultChannel::ReliableOrdered,
33-
bincode::serialize(&NetworkingMessage::BlockUpdate {
34-
position,
35-
block,
36-
})
37-
.unwrap(),
33+
bincode::serialize(&NetworkingMessage::BlockUpdate { position, block })
34+
.unwrap(),
3835
);
3936
}
4037
NetworkingMessage::ChatMessageSend(message) => {

src/server/prelude.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ pub use bevy_renet::netcode::ServerAuthentication;
1818
pub use bevy_renet::netcode::ServerConfig;
1919
pub use bevy_renet::RenetServerPlugin;
2020
pub use renet::DefaultChannel;
21-
pub use serde::Deserialize;
2221
pub use renet::*;
22+
pub use serde::Deserialize;
2323

2424
// other crates
2525
pub use rayon::iter::IntoParallelIterator;
2626
pub use rayon::iter::IntoParallelRefMutIterator;
2727
pub use rayon::iter::ParallelIterator;
2828

29+
pub use lib::*;
2930
pub use noise::NoiseFn;
3031
pub use noise::Perlin;
3132
pub use rsmc as lib;
32-
pub use lib::*;
3333

3434
// my crates
3535
pub use crate::networking::systems as networking_systems;

src/server/terrain/systems.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ pub fn setup_world_system(mut chunk_manager: ResMut<ChunkManager>) {
77

88
info!("Generating chunks");
99

10-
let mut chunks =
11-
ChunkManager::instantiate_chunks(Vec3::new(0.0, 0.0, 0.0), render_distance);
10+
let mut chunks = ChunkManager::instantiate_chunks(Vec3::new(0.0, 0.0, 0.0), render_distance);
1211

1312
chunks.par_iter_mut().for_each(|chunk| {
1413
info!("Generating chunk at {:?}", chunk.position);

src/shared/chunk_serializer.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
use bevy::math::Vec3;
2-
use serde::ser::SerializeStruct;
3-
use serde::{Deserialize, Serialize};
41
use crate::deserialize_buffer;
2+
use crate::serialize_buffer;
53
use crate::BlockId;
64
use crate::Chunk;
7-
use crate::serialize_buffer;
85
use crate::CHUNK_LENGTH;
6+
use bevy::math::Vec3;
7+
use serde::ser::SerializeStruct;
8+
use serde::{Deserialize, Serialize};
99

1010
impl Serialize for Chunk {
1111
fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>

src/shared/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,5 @@ pub mod terrain;
66

77
pub use blocks::*;
88
pub use buffer_serializer::*;
9-
pub use chunk_serializer::*;
109
pub use networking::*;
1110
pub use terrain::*;

0 commit comments

Comments
 (0)