refactored with cargo clippy

5 files changed, 10 insertions, 10 deletions

diff --git a/src/gameserver.rs b/src/gameserver.rs
index 23efc7b..ebfbe0e 100644
--- a/src/gameserver.rs
+++ b/src/gameserver.rs
@@ -77,7 +77,7 @@ impl GameServer {
 	}
 	
 	pub fn broadcast(&mut self, txt: &str){
-		for ((serverid, id), _name) in &self.players {
+		for (serverid, id) in self.players.keys() {
 			let _ = self.servers[*serverid].send(*id, txt);
 		}
 	}
@@ -106,17 +106,17 @@ impl GameServer {
 				let (firstchar, username) = name.split_at(1);
 				if firstchar == "~" {
 					if Some(username.to_string()) != self.servers[serverid].get_name(connectionid) {
-						let _ = self.send_error(id, "invalidname", &format!("A tilde name must match your username"));
+						let _ = self.send_error(id, "invalidname", "A tilde name must match your username");
 						return None;
 					}
 				}
 				if self.players.contains_key(&id) {
-					let _ = self.send_error(id, "invalidaction", &format!("You can not change your name"));
+					let _ = self.send_error(id, "invalidaction", "You can not change your name");
 					return None;
 				}
 				let player = PlayerId{name};
 				if self.connections.contains_key(&player) {
-					let _ = self.send_error(id, "nametaken", &format!("Another connections to this player exists already"));
+					let _ = self.send_error(id, "nametaken", "Another connections to this player exists already");
 					return None;
 				}
 				self.broadcast_message(&format!("{} connected", player.name));
@@ -129,7 +129,7 @@ impl GameServer {
 					let name = player.name.clone();
 					self.broadcast_message(&format!("{}: {}", name, text));
 				} else {
-					let _ = self.send_error(id, "invalidaction", &format!("Set a name before you send other messages"));
+					let _ = self.send_error(id, "invalidaction", "Set a name before you send other messages");
 				}
 				None
 			}
@@ -142,7 +142,7 @@ impl GameServer {
 						None
 					}
 				} else {
-					let _ = self.send_error(id, "invalidaction", &format!("Set a name before you send other messages"));
+					let _ = self.send_error(id, "invalidaction", "Set a name before you send other messages");
 					None
 				}
 			}
diff --git a/src/playerstate.rs b/src/playerstate.rs
index d06e3e7..f179fcc 100644
--- a/src/playerstate.rs
+++ b/src/playerstate.rs
@@ -23,7 +23,7 @@ impl PlayerState {
 
 	pub fn new(id: PlayerId) -> Self {
 		Self{
-			id: id,
+			id,
 			room: None,
 			inventory: Vec::new(),
 			inventory_capacity: 10,
diff --git a/src/room.rs b/src/room.rs
index 00decce..c826c19 100644
--- a/src/room.rs
+++ b/src/room.rs
@@ -138,7 +138,7 @@ impl <'a, 'b>Room<'a, 'b> {
 		let serialisers = self.world.read_component::<Serialise>();
 		let mut state = SaveState::new();
 		for (pos, serialiser) in (&positions, &serialisers).join() {
-			state.changes.entry(pos.pos).or_insert(Vec::new()).push(serialiser.template.clone());
+			state.changes.entry(pos.pos).or_insert_with(Vec::new).push(serialiser.template.clone());
 		}
 		state
 	}
diff --git a/src/server/streamconnection.rs b/src/server/streamconnection.rs
index 2bb111a..0d37d6a 100644
--- a/src/server/streamconnection.rs
+++ b/src/server/streamconnection.rs
@@ -54,7 +54,7 @@ impl <T: Read+Write> StreamConnection<T> {
 			messages.push(message);
 			self.buffer = rest;
 		}
-		return Ok((messages, closed));
+		Ok((messages, closed))
 	}
 	
 	pub fn send(&mut self, text: &str) -> Result<(), io::Error> {
diff --git a/src/systems/registernew.rs b/src/systems/registernew.rs
index c6b18fa..c53309f 100644
--- a/src/systems/registernew.rs
+++ b/src/systems/registernew.rs
@@ -30,7 +30,7 @@ impl <'a> System<'a> for RegisterNew {
 	);
 	fn run(&mut self, (entities, mut ground, positions, new): Self::SystemData) {
 		for (ent, pos, _new) in (&entities, &positions, &new).join() {
-			ground.cells.entry(pos.pos).or_insert(HashSet::new()).insert(ent);
+			ground.cells.entry(pos.pos).or_insert_with(HashSet::new).insert(ent);
 		}
 	}
 }