Skip to content

Commit f2aa873

Browse files
committed
Auto merge of #153166 - reddevilmidzy:codegen-tidy, r=lcnr
Tidy: disallow TODO in other in-tree projects Fixes: rust-lang/rust#152280 MCP: rust-lang/compiler-team#963 TODO * [x] Add ci check to `cg_clif`: rust-lang/rustc_codegen_cranelift#1632 * [x] Add ci check to `cg_gcc`: #861 r? lcnr
2 parents 8ed9af7 + 241a104 commit f2aa873

32 files changed

+203
-203
lines changed

.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:
@@ -92,15 +92,15 @@ jobs:
9292
run: ./y.sh prepare
9393

9494
- name: Run tests
95-
# TODO: re-enable those tests for libgccjit 12.
95+
# FIXME: re-enable those tests for libgccjit 12.
9696
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
9797
id: tests
9898
run: |
9999
${{ matrix.libgccjit_version.env_extra }} ./y.sh test --release --clean --build-sysroot --test-failing-rustc ${{ matrix.libgccjit_version.extra }} 2>&1 | tee output_log
100100
rg --text "test result" output_log >> $GITHUB_STEP_SUMMARY
101101
102102
- name: Run failing ui pattern tests for ICE
103-
# TODO: re-enable those tests for libgccjit 12.
103+
# FIXME: re-enable those tests for libgccjit 12.
104104
if: matrix.libgccjit_version.gcc != 'libgccjit12.so'
105105
id: ui-tests
106106
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: 2 additions & 2 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
@@ -94,7 +94,7 @@ jobs:
9494
if: ${{ matrix.cargo_runner }}
9595
run: |
9696
# 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.
97+
# FIXME: remove --skip test_tile_ when it's implemented.
9898
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_
9999
100100
# 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
@@ -285,7 +285,7 @@ fn build_sysroot(env: &Env, args: &TestArg) -> Result<(), String> {
285285
Ok(())
286286
}
287287

288-
// TODO(GuillaumeGomez): when rewriting in Rust, refactor with the code in tests/lang_tests_common.rs if possible.
288+
// FIXME(GuillaumeGomez): when rewriting in Rust, refactor with the code in tests/lang_tests_common.rs if possible.
289289
fn maybe_run_command_in_vm(
290290
command: &[&dyn AsRef<OsStr>],
291291
env: &Env,
@@ -648,16 +648,16 @@ fn test_projects(env: &Env, args: &TestArg) -> Result<(), String> {
648648
"https://github.com/BurntSushi/memchr",
649649
"https://github.com/dtolnay/itoa",
650650
"https://github.com/rust-lang/cfg-if",
651-
//"https://github.com/rust-lang-nursery/lazy-static.rs", // TODO: re-enable when the
651+
//"https://github.com/rust-lang-nursery/lazy-static.rs", // FIXME: re-enable when the
652652
//failing test is fixed upstream.
653653
//"https://github.com/marshallpierce/rust-base64", // FIXME: one test is OOM-killed.
654-
// TODO: ignore the base64 test that is OOM-killed.
654+
// FIXME: ignore the base64 test that is OOM-killed.
655655
//"https://github.com/time-rs/time", // FIXME: one test fails (https://github.com/time-rs/time/issues/719).
656656
"https://github.com/rust-lang/log",
657657
"https://github.com/bitflags/bitflags",
658658
//"https://github.com/serde-rs/serde", // FIXME: one test fails.
659-
//"https://github.com/rayon-rs/rayon", // TODO: very slow, only run on master?
660-
//"https://github.com/rust-lang/cargo", // TODO: very slow, only run on master?
659+
//"https://github.com/rayon-rs/rayon", // FIXME: very slow, only run on master?
660+
//"https://github.com/rust-lang/cargo", // FIXME: very slow, only run on master?
661661
];
662662

663663
let mut env = env.clone();
@@ -699,7 +699,7 @@ fn test_libcore(env: &Env, args: &TestArg) -> Result<(), String> {
699699
println!("[TEST] libcore");
700700
let path = get_sysroot_dir().join("sysroot_src/library/coretests");
701701
let _ = remove_dir_all(path.join("target"));
702-
// TODO(antoyo): run in release mode when we fix the failures.
702+
// FIXME(antoyo): run in release mode when we fix the failures.
703703
run_cargo_command(&[&"test"], Some(&path), env, args)?;
704704
Ok(())
705705
}

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 ()>;

src/abi.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ pub struct FnAbiGcc<'gcc> {
105105
}
106106

107107
pub trait FnAbiGccExt<'gcc, 'tcx> {
108-
// TODO(antoyo): return a function pointer type instead?
108+
// FIXME(antoyo): return a function pointer type instead?
109109
fn gcc_type(&self, cx: &CodegenCx<'gcc, 'tcx>) -> FnAbiGcc<'gcc>;
110110
fn ptr_to_gcc_type(&self, cx: &CodegenCx<'gcc, 'tcx>) -> Type<'gcc>;
111111
#[cfg(feature = "master")]
@@ -260,7 +260,7 @@ pub fn conv_to_fn_attribute<'gcc>(conv: CanonAbi, arch: &Arch) -> Option<FnAttri
260260
&Arch::Nvptx64 => FnAttribute::NvptxKernel,
261261
arch => panic!("Arch {arch} does not support GpuKernel calling convention"),
262262
},
263-
// TODO(antoyo): check if those AVR attributes are mapped correctly.
263+
// FIXME(antoyo): check if those AVR attributes are mapped correctly.
264264
CanonAbi::Interrupt(interrupt_kind) => match interrupt_kind {
265265
InterruptKind::Avr => FnAttribute::AvrSignal,
266266
InterruptKind::AvrNonBlocking => FnAttribute::AvrInterrupt,

src/allocator.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ fn create_wrapper_function(
9898
)));
9999

100100
if tcx.sess.must_emit_unwind_tables() {
101-
// TODO(antoyo): emit unwind tables.
101+
// FIXME(antoyo): emit unwind tables.
102102
}
103103

104104
let block = func.new_block("entry");
@@ -138,6 +138,6 @@ fn create_wrapper_function(
138138
block.end_with_void_return(None);
139139
}
140140

141-
// TODO(@Commeownist): Check if we need to emit some extra debugging info in certain circumstances
141+
// FIXME(@Commeownist): Check if we need to emit some extra debugging info in certain circumstances
142142
// as described in https://github.com/rust-lang/rust/commit/77a96ed5646f7c3ee8897693decc4626fe380643
143143
}

0 commit comments

Comments
 (0)