about summary refs log tree commit diff
path: root/src/libcore
diff options
context:
space:
mode:
authorTyler Mandry <tmandry@gmail.com>2019-12-09 14:33:13 -0800
committerGitHub <noreply@github.com>2019-12-09 14:33:13 -0800
commit196ca9dc94cbdca32ec1ec31b899aa27da47bd4c (patch)
tree185e5907b1a57be781e80ed23bd4bbf803670fac /src/libcore
parentc2702e38e45d50b66839ebac8a874f84144b1d16 (diff)
parent4ea7bb8f12b36f7e6b831f92df6285686ad2557a (diff)
downloadrust-196ca9dc94cbdca32ec1ec31b899aa27da47bd4c.tar.gz
rust-196ca9dc94cbdca32ec1ec31b899aa27da47bd4c.zip
Rollup merge of #67155 - kraai:move-instead-of-binding-to-reference, r=cramertj
Move `Layout`s instead of binding by reference
Diffstat (limited to 'src/libcore')
-rw-r--r--src/libcore/alloc.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/libcore/alloc.rs b/src/libcore/alloc.rs
index d8e9fe5fbe2..f37c57e38b5 100644
--- a/src/libcore/alloc.rs
+++ b/src/libcore/alloc.rs
@@ -1142,9 +1142,9 @@ pub unsafe trait Alloc {
         where Self: Sized
     {
         match Layout::array::<T>(n) {
-            Ok(ref layout) if layout.size() > 0 => {
+            Ok(layout) if layout.size() > 0 => {
                 unsafe {
-                    self.alloc(layout.clone()).map(|p| p.cast())
+                    self.alloc(layout).map(|p| p.cast())
                 }
             }
             _ => Err(AllocErr),
@@ -1192,9 +1192,9 @@ pub unsafe trait Alloc {
         where Self: Sized
     {
         match (Layout::array::<T>(n_old), Layout::array::<T>(n_new)) {
-            (Ok(ref k_old), Ok(ref k_new)) if k_old.size() > 0 && k_new.size() > 0 => {
+            (Ok(k_old), Ok(k_new)) if k_old.size() > 0 && k_new.size() > 0 => {
                 debug_assert!(k_old.align() == k_new.align());
-                self.realloc(ptr.cast(), k_old.clone(), k_new.size()).map(NonNull::cast)
+                self.realloc(ptr.cast(), k_old, k_new.size()).map(NonNull::cast)
             }
             _ => {
                 Err(AllocErr)
@@ -1226,8 +1226,8 @@ pub unsafe trait Alloc {
         where Self: Sized
     {
         match Layout::array::<T>(n) {
-            Ok(ref k) if k.size() > 0 => {
-                Ok(self.dealloc(ptr.cast(), k.clone()))
+            Ok(k) if k.size() > 0 => {
+                Ok(self.dealloc(ptr.cast(), k))
             }
             _ => {
                 Err(AllocErr)