about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiv Kaminer <nivkner@zoho.com>2018-12-17 20:38:50 +0200
committerNiv Kaminer <nivkner@zoho.com>2018-12-19 10:51:47 +0200
commitaedbe9a9634fdd821ed317557b06993b554d89a1 (patch)
treed3dd842d5eeb0dbfc0eeefce8f11779ee7c5249f
parente06b81e029c8e37a4b5e153e85977022b0167f9e (diff)
downloadrust-aedbe9a9634fdd821ed317557b06993b554d89a1.tar.gz
rust-aedbe9a9634fdd821ed317557b06993b554d89a1.zip
FIXME(31702) remove fixme, move auxiliaries to the right place and fix hr_lifetime_in_assoc_type warning
-rw-r--r--src/test/run-pass/issues/auxiliary/issue-31702-1.rs (renamed from src/test/run-pass/auxiliary/issue-31702-1.rs)0
-rw-r--r--src/test/run-pass/issues/auxiliary/issue-31702-2.rs (renamed from src/test/run-pass/auxiliary/issue-31702-2.rs)2
-rw-r--r--src/test/run-pass/issues/issue-31702.rs5
3 files changed, 1 insertions, 6 deletions
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