Skip to content

Commit a68a0bc

Browse files
zmodemcopybara-github
authored andcommitted
[rust] Remove __rust_no_alloc_shim_is_unstable
We rely on __rust_no_alloc_shim_is_unstable_v2 now, after having rolled past rust-lang/rust#141061 in https://crrev.com/1477839 Bug: 422538133 Change-Id: Ia5be23a0231b82d9f090b706a2fcc64f58b8f331 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6686150 Auto-Submit: Hans Wennborg <hans@chromium.org> Commit-Queue: Łukasz Anforowicz <lukasza@chromium.org> Reviewed-by: Łukasz Anforowicz <lukasza@chromium.org> Cr-Commit-Position: refs/heads/main@{#1480510} NOKEYCHECK=True GitOrigin-RevId: 8393b61ba876c8e1614275c97767f9b06b889f48
1 parent de5b56f commit a68a0bc

File tree

1 file changed

+0
-6
lines changed

1 file changed

+0
-6
lines changed

rust/allocator/lib.rs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,12 +90,6 @@ mod both_allocators {
9090
#[linkage = "weak"]
9191
fn __rust_no_alloc_shim_is_unstable_v2() {}
9292

93-
// TODO(crbug.com/422538133) Remove after rolling past
94-
// https://github.com/rust-lang/rust/pull/141061
95-
#[no_mangle]
96-
#[linkage = "weak"]
97-
static __rust_no_alloc_shim_is_unstable: u8 = 0;
98-
9993
// Mangle the symbol name as rustc expects.
10094
#[rustc_std_internal_symbol]
10195
#[allow(non_upper_case_globals)]

0 commit comments

Comments
 (0)