about summary refs log tree commit diff
diff options
context:
space:
mode:
authorDylan DPC <dylan.dpc@gmail.com>2020-10-05 02:29:29 +0200
committerGitHub <noreply@github.com>2020-10-05 02:29:29 +0200
commit583269d8c5df4456da75ef888913c8760645f046 (patch)
tree7101502a0eac6c124c780d5f7e815ff1aa92100c
parente6e7ccc28d3a574f87824af0532440d28b17311d (diff)
parentbadf4afdd5010fa057d42c0fce56afd10eca54f7 (diff)
downloadrust-583269d8c5df4456da75ef888913c8760645f046.tar.gz
rust-583269d8c5df4456da75ef888913c8760645f046.zip
Rollup merge of #77219 - mightyiam:issue_77100, r=jyn514
core::global_allocator docs link to std::alloc::GlobalAlloc

Closes #77100
-rw-r--r--library/core/src/macros/mod.rs2
1 files changed, 2 insertions, 0 deletions
diff --git a/library/core/src/macros/mod.rs b/library/core/src/macros/mod.rs
index a1b0821004b..4c62c16f506 100644
--- a/library/core/src/macros/mod.rs
+++ b/library/core/src/macros/mod.rs
@@ -1365,6 +1365,8 @@ pub(crate) mod builtin {
     }
 
     /// Attribute macro applied to a static to register it as a global allocator.
+    ///
+    /// See also [`std::alloc::GlobalAlloc`](../std/alloc/trait.GlobalAlloc.html).
     #[stable(feature = "global_allocator", since = "1.28.0")]
     #[allow_internal_unstable(rustc_attrs)]
     #[rustc_builtin_macro]