about summary refs log tree commit diff
path: root/src/liballoc
diff options
context:
space:
mode:
authorYuki Okushi <huyuumi.dev@gmail.com>2019-11-07 09:20:41 +0900
committerGitHub <noreply@github.com>2019-11-07 09:20:41 +0900
commitb94a2f9e388c98f0f21d97558d0205578482422d (patch)
treee9d666b619dfae01c964010f793012377fec86bf /src/liballoc
parent64b2f5cc9f7aa7f93ade55ecdf40cbac5c3c40db (diff)
parent11a48a0423410376dbe9a6080b41aa90e43cead2 (diff)
downloadrust-b94a2f9e388c98f0f21d97558d0205578482422d.tar.gz
rust-b94a2f9e388c98f0f21d97558d0205578482422d.zip
Rollup merge of #66111 - RalfJung:from_raw_parts, r=Centril
improve from_raw_parts docs

Triggered by https://github.com/rust-lang/rfcs/pull/2806. Hopefully this helps clarify that joining slices across allocations is not possible in Rust currently.

r? @Centril
Diffstat (limited to 'src/liballoc')
-rw-r--r--src/liballoc/string.rs2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liballoc/string.rs b/src/liballoc/string.rs
index 0e5746d0d9d..f7dff4c21f7 100644
--- a/src/liballoc/string.rs
+++ b/src/liballoc/string.rs
@@ -687,7 +687,7 @@ impl String {
     /// checked:
     ///
     /// * The memory at `ptr` needs to have been previously allocated by the
-    ///   same allocator the standard library uses.
+    ///   same allocator the standard library uses, with a required alignment of exactly 1.
     /// * `length` needs to be less than or equal to `capacity`.
     /// * `capacity` needs to be the correct value.
     ///