Auto merge of #56962 - nivkner:fixme_fixup4, r=pnkfelix

address some FIXME whose associated issues were marked as closed

part of #44366

18 files changed, 20 insertions, 39 deletions

diff --git a/src/test/auxiliary/rust_test_helpers.c b/src/test/auxiliary/rust_test_helpers.c
index 2a14b3da7b7..feb51557ec6 100644
--- a/src/test/auxiliary/rust_test_helpers.c
+++ b/src/test/auxiliary/rust_test_helpers.c
@@ -163,11 +163,7 @@ rust_get_null_ptr() {
     return 0;
 }
 
-/* Debug helpers strictly to verify ABI conformance.
- *
- * FIXME (#2665): move these into a testcase when the testsuite
- * understands how to have explicit C files included.
- */
+// Debug helpers strictly to verify ABI conformance.
 
 struct quad {
     uint64_t a;
diff --git a/src/test/run-pass/impl-trait/lifetimes.rs b/src/test/run-pass/impl-trait/lifetimes.rs
index e5a98962ff3..920fe07c914 100644
--- a/src/test/run-pass/impl-trait/lifetimes.rs
+++ b/src/test/run-pass/impl-trait/lifetimes.rs
@@ -41,7 +41,6 @@ impl<'a> SingleRegionTrait<'a> for &'a u32 {}
 struct SingleRegionStruct<'a>(&'a u32);
 
 fn simple_type_hrtb<'b>() -> impl for<'a> SingleRegionTrait<'a> { 5 }
-// FIXME(cramertj) add test after #45992 lands to ensure lint is triggered
 fn elision_single_region_trait(x: &u32) -> impl SingleRegionTrait { x }
 fn elision_single_region_struct(x: SingleRegionStruct) -> impl Into<SingleRegionStruct> { x }
 
diff --git a/src/test/run-pass/auxiliary/issue-31702-1.rs b/src/test/run-pass/issues/auxiliary/issue-31702-1.rs
index 50a31630df3..50a31630df3 100644
--- a/src/test/run-pass/auxiliary/issue-31702-1.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-31702-1.rs
diff --git a/src/test/run-pass/auxiliary/issue-31702-2.rs b/src/test/run-pass/issues/auxiliary/issue-31702-2.rs
index c5b1bc6dfb0..ae8743b62ee 100644
--- a/src/test/run-pass/auxiliary/issue-31702-2.rs
+++ b/src/test/run-pass/issues/auxiliary/issue-31702-2.rs
@@ -16,7 +16,7 @@ use std::collections::HashMap;
 use issue_31702_1::U256;
 
 pub struct Ethash {
-    engine_params: for<'a> fn() -> Option<&'a Vec<u8>>,
+    engine_params: fn() -> Option<&'static Vec<u8>>,
     u256_params: HashMap<String, U256>,
 }
 
diff --git a/src/test/run-pass/issues/issue-31702.rs b/src/test/run-pass/issues/issue-31702.rs
index 8ce06e8d343..4011d12ad96 100644
--- a/src/test/run-pass/issues/issue-31702.rs
+++ b/src/test/run-pass/issues/issue-31702.rs
@@ -11,11 +11,6 @@
 // run-pass
 // aux-build:issue-31702-1.rs
 // aux-build:issue-31702-2.rs
-// ignore-test: FIXME(#31702) when this test was added it was thought that the
-//                            accompanying llvm update would fix it, but
-//                            unfortunately it appears that was not the case. In
-//                            the interest of not deleting the test, though,
-//                            this is just tagged with ignore-test
 
 // this test is actually entirely in the linked library crates
 
diff --git a/src/test/ui/borrowck/assign_mutable_fields.rs b/src/test/ui/borrowck/assign_mutable_fields.rs
index 4e41f44ef5b..1b9ecbeafe4 100644
--- a/src/test/ui/borrowck/assign_mutable_fields.rs
+++ b/src/test/ui/borrowck/assign_mutable_fields.rs
@@ -12,7 +12,7 @@
 // var, but we do not permit you to use the complete var afterwards.
 // We hope to fix this at some point.
 //
-// FIXME(#21232)
+// FIXME(#54987)
 
 fn assign_both_fields_and_use() {
     let mut x: (u32, u32);
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr
index 3c457bff7cf..9cf0d24211b 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr
@@ -10,7 +10,7 @@ LL |             *y = 1;
    |             ------ first borrow later used here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-describe-lvalue.rs:307:20
+  --> $DIR/borrowck-describe-lvalue.rs:306:20
    |
 LL |                    let y = &mut x;
    |                            ------ first mutable borrow occurs here
@@ -21,7 +21,7 @@ LL |                    *y = 1;
    |                    ------ first borrow later used here
 
 error: captured variable cannot escape `FnMut` closure body
-  --> $DIR/borrowck-describe-lvalue.rs:305:16
+  --> $DIR/borrowck-describe-lvalue.rs:304:16
    |
 LL |              || {
    |               - inferred to be a `FnMut` closure
@@ -368,7 +368,7 @@ LL |             drop(x);
    = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-describe-lvalue.rs:318:22
+  --> $DIR/borrowck-describe-lvalue.rs:317:22
    |
 LL |                 drop(x);
    |                      - value moved here
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
index bc6385ffd92..c028b2c4868 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.ast.stderr
@@ -220,7 +220,7 @@ LL |         };
    |         - first borrow ends here
 
 error[E0499]: cannot borrow `**x` as mutable more than once at a time
-  --> $DIR/borrowck-describe-lvalue.rs:307:25
+  --> $DIR/borrowck-describe-lvalue.rs:306:25
    |
 LL |                    let y = &mut x;
    |                                 - first mutable borrow occurs here
@@ -231,7 +231,7 @@ LL |                 }
    |                 - first borrow ends here
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-describe-lvalue.rs:318:22
+  --> $DIR/borrowck-describe-lvalue.rs:317:22
    |
 LL |                 drop(x);
    |                      - value moved here
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
index 5721c52ba21..69855cc9841 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr
@@ -10,7 +10,7 @@ LL |             *y = 1;
    |             ------ first borrow later used here
 
 error[E0499]: cannot borrow `x` as mutable more than once at a time
-  --> $DIR/borrowck-describe-lvalue.rs:307:20
+  --> $DIR/borrowck-describe-lvalue.rs:306:20
    |
 LL |                    let y = &mut x;
    |                            ------ first mutable borrow occurs here
@@ -21,7 +21,7 @@ LL |                    *y = 1;
    |                    ------ first borrow later used here
 
 error: captured variable cannot escape `FnMut` closure body
-  --> $DIR/borrowck-describe-lvalue.rs:305:16
+  --> $DIR/borrowck-describe-lvalue.rs:304:16
    |
 LL |              || {
    |               - inferred to be a `FnMut` closure
@@ -362,7 +362,7 @@ LL |             drop(x);
    |                  - mutable borrow later used here
 
 error[E0382]: use of moved value: `x`
-  --> $DIR/borrowck-describe-lvalue.rs:318:22
+  --> $DIR/borrowck-describe-lvalue.rs:317:22
    |
 LL |                 drop(x);
    |                      - value moved here
diff --git a/src/test/ui/borrowck/borrowck-describe-lvalue.rs b/src/test/ui/borrowck/borrowck-describe-lvalue.rs
index 649de888ab0..29f29f106df 100644
--- a/src/test/ui/borrowck/borrowck-describe-lvalue.rs
+++ b/src/test/ui/borrowck/borrowck-describe-lvalue.rs
@@ -299,7 +299,6 @@ fn main() {
     }
     // Field from upvar nested
     {
-        // FIXME(#49824) -- the free region error below should probably not be there
         let mut x = 0;
            || {
                || { //[mir]~ ERROR captured variable cannot escape `FnMut` closure body
diff --git a/src/test/ui/issues/issue-36082.ast.nll.stderr b/src/test/ui/issues/issue-36082.ast.nll.stderr
index 7fa7cee0aec..4a6fa787d31 100644
--- a/src/test/ui/issues/issue-36082.ast.nll.stderr
+++ b/src/test/ui/issues/issue-36082.ast.nll.stderr
@@ -1,5 +1,5 @@
 error[E0716]: temporary value dropped while borrowed
-  --> $DIR/issue-36082.rs:23:19
+  --> $DIR/issue-36082.rs:21:19
    |
 LL |     let val: &_ = x.borrow().0;
    |                   ^^^^^^^^^^  - temporary value is freed at the end of this statement
diff --git a/src/test/ui/issues/issue-36082.ast.stderr b/src/test/ui/issues/issue-36082.ast.stderr
index b79958de5cb..720a11bfe44 100644
--- a/src/test/ui/issues/issue-36082.ast.stderr
+++ b/src/test/ui/issues/issue-36082.ast.stderr
@@ -1,5 +1,5 @@
 error[E0597]: borrowed value does not live long enough
-  --> $DIR/issue-36082.rs:23:19
+  --> $DIR/issue-36082.rs:21:19
    |
 LL |     let val: &_ = x.borrow().0;
    |                   ^^^^^^^^^^  - temporary value dropped here while still borrowed
diff --git a/src/test/ui/issues/issue-36082.mir.stderr b/src/test/ui/issues/issue-36082.mir.stderr
index 7fa7cee0aec..4a6fa787d31 100644
--- a/src/test/ui/issues/issue-36082.mir.stderr
+++ b/src/test/ui/issues/issue-36082.mir.stderr
@@ -1,5 +1,5 @@
 error[E0716]: temporary value dropped while borrowed
-  --> $DIR/issue-36082.rs:23:19
+  --> $DIR/issue-36082.rs:21:19
    |
 LL |     let val: &_ = x.borrow().0;
    |                   ^^^^^^^^^^  - temporary value is freed at the end of this statement
diff --git a/src/test/ui/issues/issue-36082.rs b/src/test/ui/issues/issue-36082.rs
index b8a498a4dc8..c8b92bba6e7 100644
--- a/src/test/ui/issues/issue-36082.rs
+++ b/src/test/ui/issues/issue-36082.rs
@@ -11,8 +11,6 @@
 // revisions: ast mir
 //[mir]compile-flags: -Z borrowck=mir
 
-// FIXME(#49821) -- No tip about using a let binding
-
 use std::cell::RefCell;
 
 fn main() {
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
index 4bef6cf8cd1..76105afb13e 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.rs
@@ -12,9 +12,6 @@
 // approximate the shorter end-point (`'y`) to with `'static`. This is
 // because `'y` is higher-ranked but we know of no relations to other
 // regions. Note that `'static` shows up in the stderr output as `'0`.
-//
-// FIXME(#45827) Because of shortcomings in the MIR type checker,
-// these errors are not (yet) reported.
 
 // compile-flags:-Zborrowck=mir -Zverbose
 
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
index f22dbdba934..2b0474332d6 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-no-bound.stderr
@@ -1,5 +1,5 @@
 note: External requirements
-  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:47
+  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:42:47
    |
 LL |       establish_relationships(&cell_a, &cell_b, |_outlives, x, y| {
    |  _______________________________________________^
@@ -20,7 +20,7 @@ LL | |     });
    = note: where '_#1r: '_#0r
 
 note: No external requirements
-  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:44:1
+  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:41:1
    |
 LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
 LL | |     establish_relationships(&cell_a, &cell_b, |_outlives, x, y| {
@@ -34,7 +34,7 @@ LL | | }
    = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_no_bound[317d]::supply[0]) with substs []
 
 error[E0521]: borrowed data escapes outside of function
-  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:45:5
+  --> $DIR/propagate-approximated-shorter-to-static-no-bound.rs:42:5
    |
 LL |   fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
    |                     ------ `cell_a` is a reference that is only valid in the function body
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
index 05e9818b91e..79bd029411e 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.rs
@@ -13,9 +13,6 @@
 // because `'y` is higher-ranked but we know of only irrelevant
 // relations to other regions. Note that `'static` shows up in the
 // stderr output as `'0`.
-//
-// FIXME(#45827) Because of shortcomings in the MIR type checker,
-// these errors are not (yet) reported.
 
 // compile-flags:-Zborrowck=mir -Zverbose
 
diff --git a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
index 2b1cb5a30ce..f76787c8d7d 100644
--- a/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
+++ b/src/test/ui/nll/closure-requirements/propagate-approximated-shorter-to-static-wrong-bound.stderr
@@ -1,5 +1,5 @@
 note: External requirements
-  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:47
+  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:45:47
    |
 LL |       establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
    |  _______________________________________________^
@@ -20,7 +20,7 @@ LL | |     });
    = note: where '_#1r: '_#0r
 
 note: No external requirements
-  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:47:1
+  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:44:1
    |
 LL | / fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
 LL | |     establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
@@ -34,7 +34,7 @@ LL | | }
    = note: defining type: DefId(0/0:6 ~ propagate_approximated_shorter_to_static_wrong_bound[317d]::supply[0]) with substs []
 
 error[E0521]: borrowed data escapes outside of function
-  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:48:5
+  --> $DIR/propagate-approximated-shorter-to-static-wrong-bound.rs:45:5
    |
 LL |   fn supply<'a, 'b>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>) {
    |                     ------ `cell_a` is a reference that is only valid in the function body