about summary refs log tree commit diff
path: root/example
diff options
context:
space:
mode:
authorGuillaume Gomez <guillaume.gomez@huawei.com>2024-03-09 18:04:39 +0100
committerGuillaume Gomez <guillaume.gomez@huawei.com>2024-03-09 18:04:39 +0100
commitd9a491b776529aeca09a4983f71b7f5d74463aec (patch)
treee4412a274b2c63ace48d2796b628e4e789af632b /example
parentc860ac459e3f92aea06c62bf42b01634a940610d (diff)
parent568d3949c16c0f7d9d872fafc8c2115931cce0c6 (diff)
downloadrust-d9a491b776529aeca09a4983f71b7f5d74463aec.tar.gz
rust-d9a491b776529aeca09a4983f71b7f5d74463aec.zip
Merge remote-tracking branch 'upstream/master' into HEAD
Diffstat (limited to 'example')
-rw-r--r--example/mini_core.rs1
1 files changed, 1 insertions, 0 deletions
diff --git a/example/mini_core.rs b/example/mini_core.rs
index 230009741dc..cc3d647c8c8 100644
--- a/example/mini_core.rs
+++ b/example/mini_core.rs
@@ -472,6 +472,7 @@ pub trait Allocator {
 
 impl Allocator for () {}
 
+#[lang = "global_alloc_ty"]
 pub struct Global;
 
 impl Allocator for Global {}