From 98dff0b390b40402386e4db63a22034e3cf39b0f Mon Sep 17 00:00:00 2001
From: ice_iix <ice_ix@protonmail.ch>
Date: Mon, 29 Jun 2020 18:48:07 -0700
Subject: [PATCH] Fix redundant clones

---
 src/chunk_builder.rs | 5 +----
 src/render/mod.rs    | 5 ++---
 src/server/mod.rs    | 6 +++---
 src/server/sun.rs    | 4 ++--
 4 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/src/chunk_builder.rs b/src/chunk_builder.rs
index b3ba7f6..5bdd915 100644
--- a/src/chunk_builder.rs
+++ b/src/chunk_builder.rs
@@ -26,10 +26,7 @@ impl ChunkBuilder {
         resources: Arc<RwLock<resources::Manager>>,
         textures: Arc<RwLock<render::TextureManager>>,
     ) -> ChunkBuilder {
-        let models = Arc::new(RwLock::new(model::Factory::new(
-            resources.clone(),
-            textures,
-        )));
+        let models = Arc::new(RwLock::new(model::Factory::new(resources, textures)));
 
         let mut threads = vec![];
         let mut free = vec![];
diff --git a/src/render/mod.rs b/src/render/mod.rs
index c418ad8..325bb73 100644
--- a/src/render/mod.rs
+++ b/src/render/mod.rs
@@ -1386,7 +1386,7 @@ impl TextureManager {
             rel_height: 1.0,
             is_rel: false,
         };
-        self.textures.insert(full_name.to_owned(), t.clone());
+        self.textures.insert(full_name, t.clone());
         t
     }
 
@@ -1421,8 +1421,7 @@ impl TextureManager {
                 (height as f32) / (tex.height as f32),
             );
             let old_name = mem::replace(&mut tex.name, format!("steven-dynamic:{}", name));
-            self.dynamic_textures
-                .insert(name.to_owned(), (tex.clone(), img));
+            self.dynamic_textures.insert(name.to_owned(), (tex, img));
             // We need to rename the texture itself so that get_texture calls
             // work with the new name
             let mut old = self.textures.remove(&old_name).unwrap();
diff --git a/src/server/mod.rs b/src/server/mod.rs
index c705d7b..1ec9e87 100644
--- a/src/server/mod.rs
+++ b/src/server/mod.rs
@@ -149,7 +149,7 @@ impl Server {
                     warn!("Server is running in offline mode");
                     debug!("Login: {} {}", val.username, val.uuid);
                     let mut read = conn.clone();
-                    let mut write = conn.clone();
+                    let mut write = conn;
                     read.state = protocol::State::Play;
                     write.state = protocol::State::Play;
                     let rx = Self::spawn_reader(read);
@@ -167,7 +167,7 @@ impl Server {
                     warn!("Server is running in offline mode");
                     debug!("Login: {} {:?}", val.username, val.uuid);
                     let mut read = conn.clone();
-                    let mut write = conn.clone();
+                    let mut write = conn;
                     read.state = protocol::State::Play;
                     write.state = protocol::State::Play;
                     let rx = Self::spawn_reader(read);
@@ -214,7 +214,7 @@ impl Server {
         }
 
         let mut read = conn.clone();
-        let mut write = conn.clone();
+        let mut write = conn;
 
         read.enable_encyption(&shared, true);
         write.enable_encyption(&shared, false);
diff --git a/src/server/sun.rs b/src/server/sun.rs
index 9855c88..114113c 100644
--- a/src/server/sun.rs
+++ b/src/server/sun.rs
@@ -114,7 +114,7 @@ impl SunModel {
                     z: SIZE,
                     texture_x: 1.0,
                     texture_y: 0.0,
-                    texture: tex.clone(),
+                    texture: tex,
                     r: 255,
                     g: 255,
                     b: 255,
@@ -178,7 +178,7 @@ impl SunModel {
                     z: SIZE,
                     texture_x: mpx + (1.0 / 4.0),
                     texture_y: mpy,
-                    texture: tex.clone(),
+                    texture: tex,
                     r: 255,
                     g: 255,
                     b: 255,