Merge branch 'songtronix/clean-voxygen-rs-files' into 'master'

clean voxygen rs files

See merge request veloren/veloren!292

voxygen/src/error.rs

@@ -8,7 +8,7 @@ pub enum Error {
     /// An error relating to the internal client.
     ClientError(client::Error),
     /// A miscellaneous error relating to a backend dependency.
-    BackendError(Box<any::Any>),
+    BackendError(Box<dyn any::Any>),
     /// An error relating the rendering subsystem.
     RenderError(RenderError),
     /// A miscellaneous error with an unknown or unspecified source.

voxygen/src/session.rs

@@ -24,7 +24,7 @@ pub struct SessionState {
 /// Represents an active game session (i.e., the one being played).
 impl SessionState {
     /// Create a new `SessionState`.
-    pub fn new(window: &mut Window, client: Rc<RefCell<Client>>, settings: Settings) -> Self {
+    pub fn new(window: &mut Window, client: Rc<RefCell<Client>>, _settings: Settings) -> Self {
         // Create a scene for this session. The scene handles visible elements of the game world.
         let scene = Scene::new(window.renderer_mut(), &client.borrow());
         Self {

voxygen/src/singleplayer.rs

@@ -19,7 +19,7 @@ enum Msg {
 /// Used to start and stop the background thread running the server
 /// when in singleplayer mode.
 pub struct Singleplayer {
-    server_thread: JoinHandle<()>,
+    _server_thread: JoinHandle<()>,
     sender: Sender<Msg>,
 }
 
@@ -46,7 +46,7 @@ impl Singleplayer {
 
         (
             Singleplayer {
-                server_thread: thread,
+                _server_thread: thread,
                 sender,
             },
             sock,
@@ -74,9 +74,9 @@ fn run_server(mut server: Server, rec: Receiver<Msg>) {
 
         for event in events {
             match event {
-                Event::ClientConnected { entity } => info!("Client connected!"),
-                Event::ClientDisconnected { entity } => info!("Client disconnected!"),
-                Event::Chat { entity, msg } => info!("[Client] {}", msg),
+                Event::ClientConnected { .. } => info!("Client connected!"),
+                Event::ClientDisconnected { .. } => info!("Client disconnected!"),
+                Event::Chat { entity: _, msg } => info!("[Client] {}", msg),
             }
         }
 

voxygen/src/window.rs

@@ -181,7 +181,7 @@ impl Window {
         let window = &mut self.window;
         let focused = &mut self.focused;
         let key_map = &self.key_map;
-        let mut keypress_map = &mut self.keypress_map;
+        let keypress_map = &mut self.keypress_map;
         let pan_sensitivity = self.pan_sensitivity;
         let zoom_sensitivity = self.zoom_sensitivity;
         let mut toggle_fullscreen = false;