diff options
| author | bors <bors@rust-lang.org> | 2019-11-07 03:54:25 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-07 03:54:25 +0000 |
| commit | 7a76fe76f756895b8cda1e10398f2268656a2e0f (patch) | |
| tree | a630f58f51bc8e94ffe1eb7eed1a2806d91843b6 /src/liballoc/string.rs | |
| parent | caf018714189db0b15f9f803adfcb4572ab7a988 (diff) | |
| parent | b59d16600628fc9b9c82eb0140c74325a44e262a (diff) | |
| download | rust-7a76fe76f756895b8cda1e10398f2268656a2e0f.tar.gz rust-7a76fe76f756895b8cda1e10398f2268656a2e0f.zip | |
Auto merge of #66175 - JohnTitor:rollup-ihqk5vn, r=JohnTitor
Rollup of 12 pull requests Successful merges: - #65794 (gate rustc_on_unimplemented under rustc_attrs) - #65945 (Optimize long-linker-command-line test) - #66044 (Improve uninit/zeroed lint) - #66076 (HIR docs: mention how to resolve method paths) - #66084 (Do not require extra LLVM backends for `x.py test` to pass) - #66111 (improve from_raw_parts docs) - #66114 (Improve std::thread::Result documentation) - #66117 (Fixed PhantomData markers in Arc and Rc) - #66146 (Remove unused parameters in `__thread_local_inner`) - #66147 (Miri: Refactor to_scalar_ptr out of existence) - #66162 (Fix broken link in README) - #66171 (Update link on CONTRIBUTING.md) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc/string.rs')
| -rw-r--r-- | src/liballoc/string.rs | 2 |
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. /// |
