From aedbe9a9634fdd821ed317557b06993b554d89a1 Mon Sep 17 00:00:00 2001
From: Niv Kaminer <nivkner@zoho.com>
Date: Mon, 17 Dec 2018 20:38:50 +0200
Subject: [PATCH] FIXME(31702) remove fixme, move auxiliaries to the right
 place and fix hr_lifetime_in_assoc_type warning

---
 src/test/run-pass/{ => issues}/auxiliary/issue-31702-1.rs | 0
 src/test/run-pass/{ => issues}/auxiliary/issue-31702-2.rs | 2 +-
 src/test/run-pass/issues/issue-31702.rs                   | 5 -----
 3 files changed, 1 insertion(+), 6 deletions(-)
 rename src/test/run-pass/{ => issues}/auxiliary/issue-31702-1.rs (100%)
 rename src/test/run-pass/{ => issues}/auxiliary/issue-31702-2.rs (94%)

diff --git a/src/test/run-pass/auxiliary/issue-31702-1.rs b/src/test/run-pass/issues/auxiliary/issue-31702-1.rs
similarity index 100%
rename from src/test/run-pass/auxiliary/issue-31702-1.rs
rename to 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
similarity index 94%
rename from src/test/run-pass/auxiliary/issue-31702-2.rs
rename to src/test/run-pass/issues/auxiliary/issue-31702-2.rs
index c5b1bc6dfb08..ae8743b62ee0 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 8ce06e8d3433..4011d12ad961 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