Skip to content

Commit 445413c

Browse files
authored
Merge pull request #865 from rust-lang/sync_from_rust_2026_03_13-2
Sync from rust 2026/03/13 (2)
2 parents 552fc2f + 891c9ce commit 445413c

17 files changed

Lines changed: 178 additions & 509 deletions

File tree

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ jobs:
101101
102102
- name: Run y.sh cargo build
103103
run: |
104-
./y.sh cargo build --manifest-path tests/hello-world/Cargo.toml
104+
CARGO_PROFILE_DEV_LTO=no ./y.sh cargo build --manifest-path tests/hello-world/Cargo.toml
105105
106106
- name: Clean
107107
run: |

.github/workflows/m68k.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ jobs:
8383
run: |
8484
./y.sh prepare --only-libcore --cross
8585
./y.sh build --sysroot --target-triple m68k-unknown-linux-gnu --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
86-
CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ./y.sh cargo build -Zjson-target-spec --manifest-path=./tests/hello-world/Cargo.toml --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
86+
CARGO_PROFILE_DEV_LTO=no CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ./y.sh cargo build -Zjson-target-spec --manifest-path=./tests/hello-world/Cargo.toml --target ${{ github.workspace }}/target_specs/m68k-unknown-linux-gnu.json
8787
./y.sh clean all
8888
8989
- name: Build
@@ -110,7 +110,7 @@ jobs:
110110
111111
vm_dir=$(pwd)/vm
112112
cd tests/hello-world
113-
CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ../../y.sh cargo build --target m68k-unknown-linux-gnu
113+
CARGO_PROFILE_DEV_LTO=no CG_RUSTFLAGS="-Clinker=m68k-unknown-linux-gnu-gcc" ../../y.sh cargo build --target m68k-unknown-linux-gnu
114114
sudo cp target/m68k-unknown-linux-gnu/debug/hello_world $vm_dir/home/
115115
sudo chroot $vm_dir qemu-m68k-static /home/hello_world > hello_world_stdout
116116
expected_output="40"

example/mini_core.rs

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -628,11 +628,6 @@ impl<T: ?Sized, A: Allocator> Deref for Box<T, A> {
628628
}
629629
}
630630

631-
#[lang = "exchange_malloc"]
632-
unsafe fn allocate(size: usize, _align: usize) -> *mut u8 {
633-
libc::malloc(size)
634-
}
635-
636631
#[lang = "drop"]
637632
pub trait Drop {
638633
fn drop(&mut self);
Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
From baa9c656ba61633f2e5785fc47bc8f88ed2f738e Mon Sep 17 00:00:00 2001
2+
From: bjorn3 <17426603+bjorn3@users.noreply.github.com>
3+
Date: Wed, 11 Mar 2026 12:34:47 +0000
4+
Subject: [PATCH] Add missing feature gate
5+
6+
---
7+
coretests/benches/lib.rs | 1 +
8+
coretests/tests/lib.rs | 1 +
9+
2 file changed, 2 insertion(+)
10+
11+
diff --git a/library/coretests/benches/lib.rs b/library/coretests/benches/lib.rs
12+
index 150b9b3..281aa75 100644
13+
--- a/library/coretests/benches/lib.rs
14+
+++ b/library/coretests/benches/lib.rs
15+
@@ -8,6 +8,7 @@
16+
#![feature(iter_array_chunks)]
17+
#![feature(iter_next_chunk)]
18+
#![feature(iter_advance_by)]
19+
+#![feature(num_internals)]
20+
#![feature(uint_gather_scatter_bits)]
21+
22+
extern crate test;
23+
diff --git a/library/coretests/tests/lib.rs b/library/coretests/tests/lib.rs
24+
index ecdb687..ab2cf77 100644
25+
--- a/library/coretests/tests/lib.rs
26+
+++ b/library/coretests/tests/lib.rs
27+
@@ -88,6 +88,7 @@
28+
#![feature(non_exhaustive_omitted_patterns_lint)]
29+
#![feature(nonzero_from_str_radix)]
30+
#![feature(numfmt)]
31+
+#![feature(num_internals)]
32+
#![feature(one_sided_range)]
33+
#![feature(panic_internals)]
34+
#![feature(pattern)]
35+
--
36+
2.43.0
37+

rust-toolchain

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
[toolchain]
2-
channel = "nightly-2026-02-14"
2+
channel = "nightly-2026-03-13"
33
components = ["rust-src", "rustc-dev", "llvm-tools-preview"]

0 commit comments

Comments
 (0)