diff options
| author | bors <bors@rust-lang.org> | 2019-04-12 11:46:01 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-04-12 11:46:01 +0000 |
| commit | 5b96425699476ccfc4c56185067d80cb792044a3 (patch) | |
| tree | 93661aac57f5072c15308e697c06f199e0b6853c /src/liballoc | |
| parent | 876a3bcb157a0ceb752adf972955d7413f870650 (diff) | |
| parent | 7a8329f5dacae9352a0ea72f9ab136c38403d20a (diff) | |
| download | rust-5b96425699476ccfc4c56185067d80cb792044a3.tar.gz rust-5b96425699476ccfc4c56185067d80cb792044a3.zip | |
Auto merge of #59910 - Centril:rollup-yjv7b06, r=Centril
Rollup of 15 pull requests Successful merges: - #59680 (Document the -Z flag to the rustc book) - #59711 (Add back the substring test) - #59806 (compiletest: Improve no_prefer_dynamic docs) - #59809 (Make trait_methods_not_found use a lock) - #59811 (Kill dead code dominator code.) - #59814 (Fix broken links on std::boxed doc page) - #59821 (improve unknown enum variant errors) - #59831 (Remove strange formatting in `Ordering` docs.) - #59836 (std::ops::Div examples: correct nominator to numerator) - #59857 (SGX target: fix cfg(test) build) - #59876 (Update TRPL to use mdbook 0.2) - #59880 (Remove note about transmute for float bitpatterns.) - #59889 (Update diagnostics.rs) - #59891 (Fix the link to sort_by_cached_key) - #59894 (save-analysis: Pull associated type definition using `qpath_def`) Failed merges: r? @ghost
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/boxed.rs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index cb33b4d4784..6a6a9146e24 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -63,6 +63,8 @@ //! //! [dereferencing]: ../../std/ops/trait.Deref.html //! [`Box`]: struct.Box.html +//! [`Global`]: ../alloc/struct.Global.html +//! [`Layout`]: ../alloc/struct.Layout.html #![stable(feature = "rust1", since = "1.0.0")] |