diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-10-21 09:47:25 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-10-21 09:47:25 -0400 |
| commit | 6ed7927fa0d99b2321d3fa44334e63d5412ba696 (patch) | |
| tree | 823d9a763ba57432396794516a06c87408d451f9 /src/liballoc/allocator.rs | |
| parent | d86c5d00a248d069abe015163261d4cff3e8cd3d (diff) | |
| parent | f8f9005e57852d4775b952d3b430e458a6a414bb (diff) | |
| download | rust-6ed7927fa0d99b2321d3fa44334e63d5412ba696.tar.gz rust-6ed7927fa0d99b2321d3fa44334e63d5412ba696.zip | |
Rollup merge of #45419 - steveklabnik:fix-commonmark-renderings, r=QuietMisdreavus
Fix most rendering warnings from switching to CommonMark There's one big one lift, I'm filing a bug for it soon. r? @rust-lang/docs
Diffstat (limited to 'src/liballoc/allocator.rs')
| -rw-r--r-- | src/liballoc/allocator.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/liballoc/allocator.rs b/src/liballoc/allocator.rs index 5a9cd82b9d1..3a2022ad429 100644 --- a/src/liballoc/allocator.rs +++ b/src/liballoc/allocator.rs @@ -70,7 +70,7 @@ impl Layout { /// /// * `align` must be a power of two, /// - /// * `align` must not exceed 2^31 (i.e. `1 << 31`), + /// * `align` must not exceed 2<sup>31</sup> (i.e. `1 << 31`), /// /// * `size`, when rounded up to the nearest multiple of `align`, /// must not overflow (i.e. the rounded value must be less than @@ -113,7 +113,7 @@ impl Layout { /// # Safety /// /// This function is unsafe as it does not verify that `align` is - /// a power-of-two that is also less than or equal to 2^31, nor + /// a power-of-two that is also less than or equal to 2<sup>31</sup>, nor /// that `size` aligned to `align` fits within the address space /// (i.e. the `Layout::from_size_align` preconditions). #[inline] @@ -227,7 +227,7 @@ impl Layout { }; // We can assume that `self.align` is a power-of-two that does - // not exceed 2^31. Furthermore, `alloc_size` has already been + // not exceed 2<sup>31</sup>. Furthermore, `alloc_size` has already been // rounded up to a multiple of `self.align`; therefore, the // call to `Layout::from_size_align` below should never panic. Some((Layout::from_size_align(alloc_size, self.align).unwrap(), padded_size)) |
