about summary refs log tree commit diff
path: root/src/libstd/sys_common/os_str_bytes.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2020-04-07 13:43:30 +0000
committerbors <bors@rust-lang.org>2020-04-07 13:43:30 +0000
commit42abbd8878d3b67238f3611b0587c704ba94f39c (patch)
treef993f7af10bd88484c767278196a488c6ee5bebf /src/libstd/sys_common/os_str_bytes.rs
parent39b62533c7f9d0581a6ea9b9fc2cc51f21c3b5b0 (diff)
parent89d661f15d8249f8e808b75b1129ce28e0889ba0 (diff)
downloadrust-42abbd8878d3b67238f3611b0587c704ba94f39c.tar.gz
rust-42abbd8878d3b67238f3611b0587c704ba94f39c.zip
Auto merge of #70884 - Dylan-DPC:rollup-r3raqdf, r=jonas-schievink
Rollup of 5 pull requests

Successful merges:

 - #70201 (Small tweaks in ToOwned::clone_into)
 - #70762 (Miri leak check: memory reachable through globals is not leaked)
 - #70846 (Keep codegen units unmerged when building compiler builtins)
 - #70854 (Use assoc int submodules)
 - #70857 (Don't import integer and float modules, use assoc consts 2)

Failed merges:

r? @ghost
Diffstat (limited to 'src/libstd/sys_common/os_str_bytes.rs')
-rw-r--r--src/libstd/sys_common/os_str_bytes.rs4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/libstd/sys_common/os_str_bytes.rs b/src/libstd/sys_common/os_str_bytes.rs
index aa6cc33d831..984c032e2a3 100644
--- a/src/libstd/sys_common/os_str_bytes.rs
+++ b/src/libstd/sys_common/os_str_bytes.rs
@@ -173,6 +173,10 @@ impl Slice {
         Buf { inner: self.inner.to_vec() }
     }
 
+    pub fn clone_into(&self, buf: &mut Buf) {
+        self.inner.clone_into(&mut buf.inner)
+    }
+
     #[inline]
     pub fn into_box(&self) -> Box<Slice> {
         let boxed: Box<[u8]> = self.inner.into();