Add issue number, fix into_iter FIXME

rust-lang · Sep 21, 2024 · d33d913 · d33d913
1 parent d22fb9a
commit d33d913
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/compiler/rustc_feature/src/tests.rs b/compiler/rustc_feature/src/tests.rs
@@ -2,7 +2,7 @@ use super::UnstableFeatures;
 
 #[test]
 fn rustc_bootstrap_parsing() {
-    // FIXME(edition_2024): Audit this for safety. This is probably racey, per:
+    // FIXME(edition_2024, #130672): Audit this for safety. This is probably racey, per:
     // <https://github.com/rust-lang/rust/pull/129636#pullrequestreview-2314766092>.
     let is_bootstrap = |env, krate| {
         unsafe {

diff --git a/compiler/rustc_llvm/build.rs b/compiler/rustc_llvm/build.rs
@@ -51,12 +51,12 @@ fn detect_llvm_link() -> (&'static str, &'static str) {
 fn restore_library_path() {
     let key = tracked_env_var_os("REAL_LIBRARY_PATH_VAR").expect("REAL_LIBRARY_PATH_VAR");
     if let Some(env) = tracked_env_var_os("REAL_LIBRARY_PATH") {
-        // FIXME(edition_2024): Audit this for safety.
+        // FIXME(edition_2024, #130672): Audit this for safety.
         unsafe {
             env::set_var(&key, env);
         }
     } else {
-        // FIXME(edition_2024): Audit this for safety.
+        // FIXME(edition_2024, #130672): Audit this for safety.
         unsafe {
             env::remove_var(&key);
         }

diff --git a/compiler/rustc_mir_transform/src/inline.rs b/compiler/rustc_mir_transform/src/inline.rs
@@ -799,8 +799,7 @@ impl<'tcx> Inliner<'tcx> {
         //
         // and the vector is `[closure_ref, tmp0, tmp1, tmp2]`.
         if callsite.fn_sig.abi() == Abi::RustCall && callee_body.spread_arg.is_none() {
-            // FIXME(edition_2024): switch back to a normal method call.
-            let mut args = <_>::into_iter(args);
+            let mut args = args.into_iter();
             let self_ = self.create_temp_if_necessary(
                 args.next().unwrap().node,
                 callsite,
@@ -834,8 +833,7 @@ impl<'tcx> Inliner<'tcx> {
 
             closure_ref_arg.chain(tuple_tmp_args).collect()
         } else {
-            // FIXME(edition_2024): switch back to a normal method call.
-            <_>::into_iter(args)
+            args.into_iter()
                 .map(|a| self.create_temp_if_necessary(a.node, callsite, caller_body, return_block))
                 .collect()
         }