Skip to content

Commit 2e96625

Browse files
authored
Revert "Update subtree to 2025-02-11 (#259)"
This reverts commit dcae9fe.
1 parent dcae9fe commit 2e96625

File tree

646 files changed

+9498
-17926
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

646 files changed

+9498
-17926
lines changed

library/Cargo.lock

+35-26
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

library/Cargo.toml

+1-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ resolver = "1"
33
members = [
44
"std",
55
"sysroot",
6-
"coretests",
76
]
87

98
exclude = [
@@ -33,7 +32,7 @@ codegen-units = 10000
3332
[profile.release.package]
3433
addr2line.debug = 0
3534
addr2line.opt-level = "s"
36-
adler2.debug = 0
35+
adler.debug = 0
3736
gimli.debug = 0
3837
gimli.opt-level = "s"
3938
miniz_oxide.debug = 0

library/alloc/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ edition = "2021"
1010

1111
[dependencies]
1212
core = { path = "../core" }
13-
compiler_builtins = { version = "=0.1.145", features = ['rustc-dep-of-std'] }
13+
compiler_builtins = { version = "=0.1.138", features = ['rustc-dep-of-std'] }
1414
safety = { path = "../contracts/safety" }
1515

1616
[dev-dependencies]

library/alloc/benches/btree/map.rs

-1
Original file line numberDiff line numberDiff line change
@@ -353,7 +353,6 @@ pub fn iter_10k(b: &mut Bencher) {
353353
}
354354

355355
#[bench]
356-
#[cfg_attr(target_os = "emscripten", ignore)] // hits an OOM
357356
pub fn iter_1m(b: &mut Bencher) {
358357
bench_iter(b, 1_000, 1_000_000);
359358
}

library/alloc/benches/lib.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
#![feature(iter_next_chunk)]
55
#![feature(repr_simd)]
66
#![feature(slice_partition_dedup)]
7-
#![feature(strict_provenance_lints)]
7+
#![cfg_attr(bootstrap, feature(strict_provenance))]
8+
#![cfg_attr(not(bootstrap), feature(strict_provenance_lints))]
89
#![feature(test)]
910
#![deny(fuzzy_provenance_casts)]
1011

library/alloc/benches/slice.rs

-11
Original file line numberDiff line numberDiff line change
@@ -366,25 +366,14 @@ rotate!(rotate_medium_half, gen_random, 9158, 9158 / 2);
366366
rotate!(rotate_medium_half_plus_one, gen_random, 9158, 9158 / 2 + 1);
367367

368368
// Intended to use more RAM than the machine has cache
369-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
370369
rotate!(rotate_huge_by1, gen_random, 5 * 1024 * 1024, 1);
371-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
372370
rotate!(rotate_huge_by9199_u64, gen_random, 5 * 1024 * 1024, 9199);
373-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
374371
rotate!(rotate_huge_by9199_bytes, gen_random_bytes, 5 * 1024 * 1024, 9199);
375-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
376372
rotate!(rotate_huge_by9199_strings, gen_strings, 5 * 1024 * 1024, 9199);
377-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
378373
rotate!(rotate_huge_by9199_big, gen_big_random, 5 * 1024 * 1024, 9199);
379-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
380374
rotate!(rotate_huge_by1234577_u64, gen_random, 5 * 1024 * 1024, 1234577);
381-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
382375
rotate!(rotate_huge_by1234577_bytes, gen_random_bytes, 5 * 1024 * 1024, 1234577);
383-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
384376
rotate!(rotate_huge_by1234577_strings, gen_strings, 5 * 1024 * 1024, 1234577);
385-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
386377
rotate!(rotate_huge_by1234577_big, gen_big_random, 5 * 1024 * 1024, 1234577);
387-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
388378
rotate!(rotate_huge_half, gen_random, 5 * 1024 * 1024, 5 * 1024 * 1024 / 2);
389-
#[cfg(not(target_os = "emscripten"))] // hits an OOM
390379
rotate!(rotate_huge_half_plus_one, gen_random, 5 * 1024 * 1024, 5 * 1024 * 1024 / 2 + 1);

library/alloc/benches/vec.rs

-5
Original file line numberDiff line numberDiff line change
@@ -547,11 +547,6 @@ fn bench_in_place_collect_droppable(b: &mut Bencher) {
547547
})
548548
}
549549

550-
// node.js gives out of memory error to use with length 1_100_000
551-
#[cfg(target_os = "emscripten")]
552-
const LEN: usize = 4096;
553-
554-
#[cfg(not(target_os = "emscripten"))]
555550
const LEN: usize = 16384;
556551

557552
#[bench]

library/alloc/src/alloc.rs

+4-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,9 @@ use core::hint;
1010
#[cfg(not(test))]
1111
use core::ptr::{self, NonNull};
1212

13+
#[cfg(test)]
14+
mod tests;
15+
1316
extern "Rust" {
1417
// These are the magic symbols to call the global allocator. rustc generates
1518
// them to call `__rg_alloc` etc. if there is a `#[global_allocator]` attribute
@@ -339,7 +342,7 @@ unsafe impl Allocator for Global {
339342
}
340343
}
341344

342-
/// The allocator for `Box`.
345+
/// The allocator for unique pointers.
343346
#[cfg(all(not(no_global_oom_handling), not(test)))]
344347
#[lang = "exchange_malloc"]
345348
#[inline]

library/alloc/tests/alloc.rs renamed to library/alloc/src/alloc/tests.rs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
use alloc::alloc::*;
2-
use alloc::boxed::Box;
1+
use super::*;
32

43
extern crate test;
54
use test::Bencher;
65

6+
use crate::boxed::Box;
7+
78
#[test]
89
fn allocate_zeroed() {
910
unsafe {

0 commit comments

Comments
 (0)