Skip to content

Commit d33d913

Browse files
Add issue number, fix into_iter FIXME
1 parent d22fb9a commit d33d913

File tree

3 files changed

+5
-7
lines changed

3 files changed

+5
-7
lines changed

compiler/rustc_feature/src/tests.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ use super::UnstableFeatures;
22

33
#[test]
44
fn rustc_bootstrap_parsing() {
5-
// FIXME(edition_2024): Audit this for safety. This is probably racey, per:
5+
// FIXME(edition_2024, #130672): Audit this for safety. This is probably racey, per:
66
// <https://github.com/rust-lang/rust/pull/129636#pullrequestreview-2314766092>.
77
let is_bootstrap = |env, krate| {
88
unsafe {

compiler/rustc_llvm/build.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,12 @@ fn detect_llvm_link() -> (&'static str, &'static str) {
5151
fn restore_library_path() {
5252
let key = tracked_env_var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
5353
if let Some(env) = tracked_env_var_os("REAL_LIBRARY_PATH") {
54-
// FIXME(edition_2024): Audit this for safety.
54+
// FIXME(edition_2024, #130672): Audit this for safety.
5555
unsafe {
5656
env::set_var(&key, env);
5757
}
5858
} else {
59-
// FIXME(edition_2024): Audit this for safety.
59+
// FIXME(edition_2024, #130672): Audit this for safety.
6060
unsafe {
6161
env::remove_var(&key);
6262
}

compiler/rustc_mir_transform/src/inline.rs

+2-4
Original file line numberDiff line numberDiff line change
@@ -799,8 +799,7 @@ impl<'tcx> Inliner<'tcx> {
799799
//
800800
// and the vector is `[closure_ref, tmp0, tmp1, tmp2]`.
801801
if callsite.fn_sig.abi() == Abi::RustCall && callee_body.spread_arg.is_none() {
802-
// FIXME(edition_2024): switch back to a normal method call.
803-
let mut args = <_>::into_iter(args);
802+
let mut args = args.into_iter();
804803
let self_ = self.create_temp_if_necessary(
805804
args.next().unwrap().node,
806805
callsite,
@@ -834,8 +833,7 @@ impl<'tcx> Inliner<'tcx> {
834833

835834
closure_ref_arg.chain(tuple_tmp_args).collect()
836835
} else {
837-
// FIXME(edition_2024): switch back to a normal method call.
838-
<_>::into_iter(args)
836+
args.into_iter()
839837
.map(|a| self.create_temp_if_necessary(a.node, callsite, caller_body, return_block))
840838
.collect()
841839
}

0 commit comments

Comments
 (0)