]> git.lizzy.rs Git - rust.git/commitdiff
Rollup merge of #33335 - cramertj:master, r=alexcrichton
authorManish Goregaokar <manishsmail@gmail.com>
Mon, 2 May 2016 19:32:45 +0000 (01:02 +0530)
committerManish Goregaokar <manishsmail@gmail.com>
Tue, 3 May 2016 02:35:29 +0000 (08:05 +0530)
docs: Changed docs for `size_of` to describe size as a stride offset

Current documentation for `std::mem::size_of` is ambiguous, and the documentation for `std::intrinsics::size_of` incorrectly defines size.

This fix re-defines size as the offset in bytes between successive instances of a type, as described in LLVM's [getTypeAllocSize](http://llvm.org/docs/doxygen/html/classllvm_1_1DataLayout.html#a1d6fcc02e91ba24510aba42660c90e29).

Fixes: #33266

Trivial merge