about summary refs log tree commit diff
diff options
context:
space:
mode:
authorAlex Crichton <alex@alexcrichton.com>2015-02-11 14:02:13 -0800
committerAlex Crichton <alex@alexcrichton.com>2015-02-11 14:02:13 -0800
commit48767165070ceabb8615b03e396dc093e843ce46 (patch)
treef74784d724dcec49b3af4fce85d81449e19cfce5
parent5e2b69c1b239a24ef7fea882c78e237b1b3fb8f9 (diff)
parentd8d3761899720dd07a4be84d455f1ab1ee2f9f34 (diff)
downloadrust-48767165070ceabb8615b03e396dc093e843ce46.tar.gz
rust-48767165070ceabb8615b03e396dc093e843ce46.zip
rollup merge of #22164: huonw/alloc--
It doesn't have to be a literal memory allocation (ala malloc), e.g. it
can be in static memory, so saying "allocated" is mildly misleading.

Thanks to @mahkoh for pointing it out.

r? @steveklabnik
-rw-r--r--src/libcore/intrinsics.rs11
1 files changed, 6 insertions, 5 deletions
diff --git a/src/libcore/intrinsics.rs b/src/libcore/intrinsics.rs
index 5562845e11d..050c144b742 100644
--- a/src/libcore/intrinsics.rs
+++ b/src/libcore/intrinsics.rs
@@ -262,11 +262,12 @@ extern "rust-intrinsic" {
     ///
     /// # Safety
     ///
-    /// Beyond requiring that both regions of memory be allocated, it is Undefined Behaviour
-    /// for source and destination to overlap. Care must also be taken with the ownership of
-    /// `src` and `dst`. This method semantically moves the values of `src` into `dst`.
-    /// However it does not drop the contents of `dst`, or prevent the contents of `src`
-    /// from being dropped or used.
+    /// Beyond requiring that the program must be allowed to access both regions
+    /// of memory, it is Undefined Behaviour for source and destination to
+    /// overlap. Care must also be taken with the ownership of `src` and
+    /// `dst`. This method semantically moves the values of `src` into `dst`.
+    /// However it does not drop the contents of `dst`, or prevent the contents
+    /// of `src` from being dropped or used.
     ///
     /// # Examples
     ///