Skip to content

Commit fd7acd4

Browse files
committed
refresh fixmes
1 parent d66235a commit fd7acd4

File tree

11 files changed

+69
-6
lines changed

11 files changed

+69
-6
lines changed

compiler/rustc_metadata/src/native_libs.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ pub fn walk_native_lib_search_dirs<R>(
4848
f(&sess.target_tlib_path.dir.join("self-contained"), false)?;
4949
}
5050

51+
// tidy-keep-sync-with=tidy-ticket-copy_third_party_objects
5152
// Toolchains for some targets may ship `libunwind.a`, but place it into the main sysroot
5253
// library directory instead of the self-contained directories.
5354
// Sanitizer libraries have the same issue and are also linked by name on Apple targets.
@@ -57,7 +58,6 @@ pub fn walk_native_lib_search_dirs<R>(
5758
// FIXME: On AIX this also has the side-effect of making the list of library search paths
5859
// non-empty, which is needed or the linker may decide to record the LIBPATH env, if
5960
// defined, as the search path instead of appending the default search paths.
60-
// FIXME: sync me
6161
if sess.target.vendor == "fortanix"
6262
|| sess.target.os == "linux"
6363
|| sess.target.os == "fuchsia"
@@ -77,6 +77,7 @@ pub fn walk_native_lib_search_dirs<R>(
7777
}
7878

7979
ControlFlow::Continue(())
80+
// tidy-keep-sync-with=tidy-ticket-copy_third_party_objects
8081
}
8182

8283
pub fn try_find_native_static_library(

compiler/rustc_middle/src/mir/terminator.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -135,12 +135,13 @@ impl UnwindAction {
135135

136136
impl UnwindTerminateReason {
137137
pub fn as_str(self) -> &'static str {
138+
// tidy-keep-sync-with=tidy-tidy-ticket-panic-message
138139
// Keep this in sync with the messages in `core/src/panicking.rs`.
139-
// FIXME: sync me
140140
match self {
141141
UnwindTerminateReason::Abi => "panic in a function that cannot unwind",
142142
UnwindTerminateReason::InCleanup => "panic in a destructor during cleanup",
143143
}
144+
// tidy-keep-sync-with=tidy-tidy-ticket-panic-message
144145
}
145146

146147
/// A short representation of this used for MIR printing.

compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -714,9 +714,9 @@ pub(in crate::solve) fn extract_fn_def_from_const_callable<I: Interner>(
714714
}
715715
}
716716

717+
// tidy-keep-sync-with=tidy-ticket-evaluate_host_effect_for_destruct_goal
717718
// NOTE: Keep this in sync with `evaluate_host_effect_for_destruct_goal` in
718719
// the old solver, for as long as that exists.
719-
// FIXME: sync me
720720
pub(in crate::solve) fn const_conditions_for_destruct<I: Interner>(
721721
cx: I,
722722
self_ty: I::Ty,
@@ -792,6 +792,7 @@ pub(in crate::solve) fn const_conditions_for_destruct<I: Interner>(
792792
}
793793
}
794794
}
795+
// tidy-keep-sync-with=tidy-ticket-evaluate_host_effect_for_destruct_goal
795796

796797
/// Assemble a list of predicates that would be present on a theoretical
797798
/// user impl for an object type. These predicates must be checked any time

compiler/rustc_trait_selection/src/traits/effects.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -244,8 +244,8 @@ fn evaluate_host_effect_from_builtin_impls<'tcx>(
244244
}
245245
}
246246

247+
// tidy-keep-sync-with=tidy-ticket-evaluate_host_effect_for_destruct_goal
247248
// NOTE: Keep this in sync with `const_conditions_for_destruct` in the new solver.
248-
// FIXME: sync me
249249
fn evaluate_host_effect_for_destruct_goal<'tcx>(
250250
selcx: &mut SelectionContext<'_, 'tcx>,
251251
obligation: &HostEffectObligation<'tcx>,
@@ -332,6 +332,7 @@ fn evaluate_host_effect_for_destruct_goal<'tcx>(
332332
})
333333
.collect())
334334
}
335+
// tidy-keep-sync-with=tidy-ticket-evaluate_host_effect_for_destruct_goal
335336

336337
fn evaluate_host_effect_from_selection_candiate<'tcx>(
337338
selcx: &mut SelectionContext<'_, 'tcx>,

library/core/src/panicking.rs

+4-2
Original file line numberDiff line numberDiff line change
@@ -303,9 +303,10 @@ fn panic_misaligned_pointer_dereference(required: usize, found: usize) -> ! {
303303
#[lang = "panic_cannot_unwind"] // needed by codegen for panic in nounwind function
304304
#[rustc_nounwind]
305305
fn panic_cannot_unwind() -> ! {
306+
// tidy-keep-sync-with=tidy-ticket-panic-message-nounwind
306307
// Keep the text in sync with `UnwindTerminateReason::as_str` in `rustc_middle`.
307-
// FIXME: sync me
308308
panic_nounwind("panic in a function that cannot unwind")
309+
// tidy-keep-sync-with=tidy-ticket-panic-message-nounwind
309310
}
310311

311312
/// Panics because we are unwinding out of a destructor during cleanup.
@@ -320,9 +321,10 @@ fn panic_cannot_unwind() -> ! {
320321
#[lang = "panic_in_cleanup"] // needed by codegen for panic in nounwind function
321322
#[rustc_nounwind]
322323
fn panic_in_cleanup() -> ! {
324+
// tidy-keep-sync-with=tidy-ticket-panic-message-nobacktrace
323325
// Keep the text in sync with `UnwindTerminateReason::as_str` in `rustc_middle`.
324-
// FIXME: sync me
325326
panic_nounwind_nobacktrace("panic in a destructor during cleanup")
327+
// tidy-keep-sync-with=tidy-ticket-panic-message-nobacktrace
326328
}
327329

328330
/// This function is used instead of panic_fmt in const eval.

src/bootstrap/src/core/build_steps/compile.rs

+2
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,7 @@ fn copy_llvm_libunwind(builder: &Builder<'_>, target: TargetSelection, libdir: &
291291
libunwind_target
292292
}
293293

294+
// tidy-keep-sync-with=tidy-ticket-copy_third_party_objects
294295
/// Copies third party objects needed by various targets.
295296
fn copy_third_party_objects(
296297
builder: &Builder<'_>,
@@ -320,6 +321,7 @@ fn copy_third_party_objects(
320321

321322
target_deps
322323
}
324+
// tidy-keep-sync-with=tidy-ticket-copy_third_party_objects
323325

324326
/// Copies third party objects needed by various targets for self-contained linkage.
325327
fn copy_self_contained_objects(

src/bootstrap/src/core/config/config.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1462,6 +1462,7 @@ impl Config {
14621462
// Allows creating alias for profile names, allowing
14631463
// profiles to be renamed while maintaining back compatibility
14641464
// Keep in sync with `profile_aliases` in bootstrap.py
1465+
// FIXME: sync me
14651466
let profile_aliases = HashMap::from([("user", "dist")]);
14661467
let include = match profile_aliases.get(include.as_str()) {
14671468
Some(alias) => alias,

src/bootstrap/src/core/download.rs

+1
Original file line numberDiff line numberDiff line change
@@ -231,6 +231,7 @@ impl Config {
231231
// options should be kept in sync with
232232
// src/bootstrap/src/core/download.rs
233233
// for consistency
234+
// FIXME: sync with what?
234235
let mut curl = command("curl");
235236
curl.args([
236237
// follow redirect

src/bootstrap/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -644,6 +644,8 @@ impl Build {
644644
features.push("llvm");
645645
}
646646
// keep in sync with `bootstrap/compile.rs:rustc_cargo_env`
647+
// FIXME: this comment is leftover from https://github.com/rust-lang/rust/pull/93787,
648+
// remove it?
647649
if self.config.rust_randomize_layout {
648650
features.push("rustc_randomized_layouts");
649651
}

src/bootstrap/src/utils/render_tests.rs

+1
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,7 @@ impl<'a> Renderer<'a> {
167167
if let Outcome::Ignored { reason } = outcome {
168168
self.ignored_tests += 1;
169169
// Keep this in sync with the "up-to-date" ignore message inserted by compiletest.
170+
// FIXME: sync me
170171
if reason == Some("up-to-date") {
171172
self.up_to_date_tests += 1;
172173
}

src/tools/tidy/src/watcher_list.json

+50
Original file line numberDiff line numberDiff line change
@@ -201,6 +201,56 @@
201201
"tag": "tidy-ticket-sess-time-item_types_checking"
202202
}
203203
]
204+
},
205+
{
206+
"name": "group_14",
207+
"tags": [
208+
{
209+
"path": "library/core/src/panicking.rs",
210+
"hash": "b5387987dd6c927acf5ddfa33fdf3090",
211+
"tag": "tidy-ticket-panic-message-nounwind"
212+
},
213+
{
214+
"path": "library/core/src/panicking.rs",
215+
"hash": "f07f9a5af83a08e7287cd81226be8834",
216+
"tag": "tidy-ticket-panic-message-nobacktrace"
217+
},
218+
{
219+
"path": "compiler/rustc_middle/src/mir/terminator.rs",
220+
"hash": "110baa63da1da4d6ae54938b4bbd070f",
221+
"tag": "tidy-ticket-panic-message"
222+
}
223+
]
224+
},
225+
{
226+
"name": "group_15",
227+
"tags": [
228+
{
229+
"path": "compiler/rustc_next_trait_solver/src/solve/assembly/structural_traits.rs",
230+
"hash": "50a549340456169ab3119d1dfecb6f96",
231+
"tag": "tidy-ticket-evaluate_host_effect_for_destruct_goal"
232+
},
233+
{
234+
"path": "compiler/rustc_trait_selection/src/traits/effects.rs",
235+
"hash": "a280510e2a7424dd874f14ad2180a938",
236+
"tag": "tidy-ticket-evaluate_host_effect_for_destruct_goal"
237+
}
238+
]
239+
},
240+
{
241+
"name": "group_16",
242+
"tags": [
243+
{
244+
"path": "compiler/rustc_metadata/src/native_libs.rs",
245+
"hash": "332941877827af57790ac82c2a40177f",
246+
"tag": "tidy-ticket-copy_third_party_objects"
247+
},
248+
{
249+
"path": "src/bootstrap/src/core/build_steps/compile.rs",
250+
"hash": "ea843d88787238a509fdc5cb4ad3915b",
251+
"tag": "tidy-ticket-copy_third_party_objects"
252+
}
253+
]
204254
}
205255
]
206256
}

0 commit comments

Comments
 (0)