Skip to content

Commit 9886ca5

Browse files
authored
Merge pull request #866 from rust-lang/sync_from_rust_2026_03_26
Sync from rust 2026/03/26
2 parents daf8bb9 + 0252670 commit 9886ca5

35 files changed

Lines changed: 347 additions & 256 deletions

.github/workflows/failures.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: refactor to avoid duplication with the ci.yml file.
1+
# FIXME: refactor to avoid duplication with the ci.yml file.
22
name: Failures
33

44
on:
@@ -94,15 +94,15 @@ jobs:
9494
run: ./y.sh prepare
9595

9696
- name: Run tests
97-
# TODO: re-enable those tests for libgccjit 12.
97+
# FIXME: re-enable those tests for libgccjit 12.
9898
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
9999
id: tests
100100
run: |
101101
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} 2>&1 | tee output_log
102102
rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY
103103
104104
- name: Run failing ui pattern tests for ICE
105-
# TODO: re-enable those tests for libgccjit 12.
105+
# FIXME: re-enable those tests for libgccjit 12.
106106
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
107107
id: ui-tests
108108
run: |

.github/workflows/m68k.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# TODO: check if qemu-user-static-binfmt is needed (perhaps to run some tests since it probably calls exec).
1+
# FIXME: check if qemu-user-static-binfmt is needed (perhaps to run some tests since it probably calls exec).
22

33
name: m68k CI
44

@@ -24,7 +24,7 @@ jobs:
2424
matrix:
2525
commands: [
2626
"--std-tests",
27-
# TODO(antoyo): fix those on m68k.
27+
# FIXME(antoyo): fix those on m68k.
2828
#"--test-libcore",
2929
#"--extended-rand-tests",
3030
#"--extended-regex-example-tests",

.github/workflows/stdarch.yml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: Install packages
3939
run: sudo apt-get install ninja-build ripgrep
4040

41-
# TODO: remove when we have binutils version 2.43 in the repo.
41+
# FIXME: remove when we have binutils version 2.43 in the repo.
4242
- name: Install more recent binutils
4343
run: |
4444
echo "deb http://archive.ubuntu.com/ubuntu plucky main universe" | sudo tee /etc/apt/sources.list.d/plucky-copies.list
@@ -50,9 +50,11 @@ jobs:
5050
run: |
5151
mkdir intel-sde
5252
cd intel-sde
53-
dir=sde-external-9.33.0-2024-01-07-lin
53+
version=10.8.0-2026-03-15
54+
url_path=915934
55+
dir=sde-external-$version-lin
5456
file=$dir.tar.xz
55-
wget https://downloadmirror.intel.com/813591/$file
57+
wget https://downloadmirror.intel.com/$url_path/$file
5658
tar xvf $file
5759
sudo mkdir /usr/share/intel-sde
5860
sudo cp -r $dir/* /usr/share/intel-sde
@@ -94,7 +96,7 @@ jobs:
9496
if: ${{ matrix.cargo_runner }}
9597
run: |
9698
# FIXME: these tests fail when the sysroot is compiled with LTO because of a missing symbol in proc-macro.
97-
# TODO: remove --skip test_tile_ when it's implemented.
99+
# FIXME: remove --skip test_tile_ when it's implemented.
98100
STDARCH_TEST_SKIP_FUNCTION="xsave,xsaveopt,xsave64,xsaveopt64" STDARCH_TEST_EVERYTHING=1 CHANNEL=release CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUNNER="${{ matrix.cargo_runner }}" TARGET=x86_64-unknown-linux-gnu CG_RUSTFLAGS="-Ainternal_features" ./y.sh cargo test --manifest-path build/build_sysroot/sysroot_src/library/stdarch/Cargo.toml -- --skip rtm --skip tbm --skip sse4a --skip test_tile_
99101
100102
# Summary job for the merge queue.

build_system/src/prepare.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ fn prepare_libcore(
148148
Ok(())
149149
}
150150

151-
// TODO: remove when we can ignore warnings in rustdoc tests.
151+
// FIXME: remove when we can ignore warnings in rustdoc tests.
152152
fn prepare_rand() -> Result<(), String> {
153153
// Apply patch for the rand crate.
154154
let file_path = "patches/crates/0001-Remove-deny-warnings.patch";

build_system/src/test.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -286,7 +286,7 @@ fn build_sysroot(env: &Env, args: &TestArg) -> Result<(), String> {
286286
Ok(())
287287
}
288288

289-
// TODO(GuillaumeGomez): when rewriting in Rust, refactor with the code in tests/lang_tests_common.rs if possible.
289+
// FIXME(GuillaumeGomez): when rewriting in Rust, refactor with the code in tests/lang_tests_common.rs if possible.
290290
fn maybe_run_command_in_vm(
291291
command: &[&dyn AsRef<OsStr>],
292292
env: &Env,
@@ -708,16 +708,16 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
708708
"https://github.com/BurntSushi/memchr",
709709
"https://github.com/dtolnay/itoa",
710710
"https://github.com/rust-lang/cfg-if",
711-
//"https://github.com/rust-lang-nursery/lazy-static.rs", // TODO: re-enable when the
711+
//"https://github.com/rust-lang-nursery/lazy-static.rs", // FIXME: re-enable when the
712712
//failing test is fixed upstream.
713713
//"https://github.com/marshallpierce/rust-base64", // FIXME: one test is OOM-killed.
714-
// TODO: ignore the base64 test that is OOM-killed.
714+
// FIXME: ignore the base64 test that is OOM-killed.
715715
//"https://github.com/time-rs/time", // FIXME: one test fails (https://github.com/time-rs/time/issues/719).
716716
"https://github.com/rust-lang/log",
717717
"https://github.com/bitflags/bitflags",
718718
//"https://github.com/serde-rs/serde", // FIXME: one test fails.
719-
//"https://github.com/rayon-rs/rayon", // TODO: very slow, only run on master?
720-
//"https://github.com/rust-lang/cargo", // TODO: very slow, only run on master?
719+
//"https://github.com/rayon-rs/rayon", // FIXME: very slow, only run on master?
720+
//"https://github.com/rust-lang/cargo", // FIXME: very slow, only run on master?
721721
];
722722

723723
let mut env = env.clone();
@@ -759,7 +759,7 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
759759
println!("[TEST] libcore");
760760
let path = get_sysroot_dir().join("sysroot_src/library/coretests");
761761
let _ = remove_dir_all(path.join("target"));
762-
// TODO(antoyo): run in release mode when we fix the failures.
762+
// FIXME(antoyo): run in release mode when we fix the failures.
763763
run_cargo_command(&[&"test"], Some(&path), env, args)?;
764764
Ok(())
765765
}

doc/debugging-libgccjit.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,4 @@ Maybe by calling the following at the beginning of gdb:
7171
set substitute-path /usr/src/debug/gcc /path/to/gcc-repo/gcc
7272
```
7373
74-
TODO(antoyo): but that's not what I remember I was doing.
74+
FIXME(antoyo): but that's not what I remember I was doing.

doc/subtree.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ git push
4747
PATH="$HOME/bin:$PATH" ~/bin/git-subtree push -P compiler/rustc_codegen_gcc/ ../rustc_codegen_gcc/ sync_branch_name
4848
```
4949

50-
TODO: write a script that does the above.
50+
FIXME: write a script that does the above.
5151

5252
https://rust-lang.zulipchat.com/#narrow/stream/301329-t-devtools/topic/subtree.20madness/near/258877725

example/mini_core_hello_world.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -275,7 +275,7 @@ fn main() {
275275
}
276276
}
277277

278-
// TODO(antoyo): to make this work, support weak linkage.
278+
// FIXME(antoyo): to make this work, support weak linkage.
279279
//unsafe { assert_eq!(ABC as usize, 0); }
280280

281281
&mut (|| Some(0 as *const ())) as &mut dyn FnMut() -> Option<*const ()>;

libgccjit.version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2e6a09afb8d9ee9e190a81b0d7e3118251ebcb9a
1+
6f155cc3f5a2dff33afe6cc3ed6c2e0e605ae6a3

patches/0030-Add-missing-feature-gate.patch

Lines changed: 0 additions & 37 deletions
This file was deleted.

0 commit comments

Comments
 (0)