about summary refs log tree commit diff
path: root/src/libcore/alloc
diff options
context:
space:
mode:
authorChristopher Durham <cad97@cad97.com>2020-04-20 12:28:30 -0400
committerGitHub <noreply@github.com>2020-04-20 12:28:30 -0400
commit9c3adaf89c48931229aca910c6909e6a1c4ddedf (patch)
tree27c4e208a3c03e64d2def2c42ffd85af10307d31 /src/libcore/alloc
parenta01b00faf877deab0ef3896ce655351398fe4a47 (diff)
downloadrust-9c3adaf89c48931229aca910c6909e6a1c4ddedf.tar.gz
rust-9c3adaf89c48931229aca910c6909e6a1c4ddedf.zip
Update src/libcore/alloc/layout.rs
Co-Authored-By: Amanieu d'Antras <amanieu@gmail.com>
Diffstat (limited to 'src/libcore/alloc')
-rw-r--r--src/libcore/alloc/layout.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libcore/alloc/layout.rs b/src/libcore/alloc/layout.rs
index b2a109d1cd1..3881f0685d4 100644
--- a/src/libcore/alloc/layout.rs
+++ b/src/libcore/alloc/layout.rs
@@ -264,8 +264,8 @@ impl Layout {
     /// (There is no way to match the default Rust representation
     /// layout `repr(Rust)`, as it is unspecified.)
     ///
-    /// Note that the resulting layout will satisfy the alignment properties
-    /// of both `self` and `next`, in order to ensure alignment of both parts.
+    /// Note that the alignment of the resulting layout will be the maximum of
+    /// those of `self` and `next`, in order to ensure alignment of both parts.
     ///
     /// Returns `Ok((k, offset))`, where `k` is layout of the concatenated
     /// record and `offset` is the relative location, in bytes, of the