Use compiletest's aux-build header instead of include macro

Author: phansch

tests/auxiliary/option_helpers.rs renamed to tests/ui/auxiliary/option_helpers.rs

@@ -1,6 +1,9 @@
+#![allow(dead_code, unused_variables)]
+
 /// Utility macro to test linting behavior in `option_methods()`
 /// The lints included in `option_methods()` should not lint if the call to map is partially
 /// within a macro
+#[macro_export]
 macro_rules! opt_map {
     ($opt:expr, $map:expr) => {
         ($opt).map($map)
@@ -9,36 +12,36 @@ macro_rules! opt_map {
 
 /// Struct to generate false positive for Iterator-based lints
 #[derive(Copy, Clone)]
-struct IteratorFalsePositives {
-    foo: u32,
+pub struct IteratorFalsePositives {
+    pub foo: u32,
 }
 
 impl IteratorFalsePositives {
-    fn filter(self) -> IteratorFalsePositives {
+    pub fn filter(self) -> IteratorFalsePositives {
         self
     }
 
-    fn next(self) -> IteratorFalsePositives {
+    pub fn next(self) -> IteratorFalsePositives {
         self
     }
 
-    fn find(self) -> Option<u32> {
+    pub fn find(self) -> Option<u32> {
         Some(self.foo)
     }
 
-    fn position(self) -> Option<u32> {
+    pub fn position(self) -> Option<u32> {
         Some(self.foo)
     }
 
-    fn rposition(self) -> Option<u32> {
+    pub fn rposition(self) -> Option<u32> {
         Some(self.foo)
     }
 
-    fn nth(self, n: usize) -> Option<u32> {
+    pub fn nth(self, n: usize) -> Option<u32> {
         Some(self.foo)
     }
 
-    fn skip(self, _: usize) -> IteratorFalsePositives {
+    pub fn skip(self, _: usize) -> IteratorFalsePositives {
         self
     }
 }

tests/ui/iter_skip_next.rs

@@ -7,10 +7,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// aux-build:option_helpers.rs
+
 #![warn(clippy::iter_skip_next)]
 #![allow(clippy::blacklisted_name)]
 
-include!("../auxiliary/option_helpers.rs");
+extern crate option_helpers;
+
+use option_helpers::IteratorFalsePositives;
 
 /// Checks implementation of `ITER_SKIP_NEXT` lint
 fn iter_skip_next() {

tests/ui/iter_skip_next.stderr

@@ -1,25 +1,25 @@
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-  --> $DIR/iter_skip_next.rs:18:13
+  --> $DIR/iter_skip_next.rs:22:13
    |
 LL |     let _ = some_vec.iter().skip(42).next();
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
    |
    = note: `-D clippy::iter-skip-next` implied by `-D warnings`
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-  --> $DIR/iter_skip_next.rs:19:13
+  --> $DIR/iter_skip_next.rs:23:13
    |
 LL |     let _ = some_vec.iter().cycle().skip(42).next();
    |             ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-  --> $DIR/iter_skip_next.rs:20:13
+  --> $DIR/iter_skip_next.rs:24:13
    |
 LL |     let _ = (1..10).skip(10).next();
    |             ^^^^^^^^^^^^^^^^^^^^^^^
 
 error: called `skip(x).next()` on an iterator. This is more succinctly expressed by calling `nth(x)`
-  --> $DIR/iter_skip_next.rs:21:14
+  --> $DIR/iter_skip_next.rs:25:14
    |
 LL |     let _ = &some_vec[..].iter().skip(3).next();
    |              ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/methods.rs

@@ -7,6 +7,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+// aux-build:option_helpers.rs
+
 #![warn(clippy::all, clippy::pedantic, clippy::option_unwrap_used)]
 #![allow(
     clippy::blacklisted_name,
@@ -22,6 +24,9 @@
     clippy::useless_format
 )]
 
+#[macro_use]
+extern crate option_helpers;
+
 use std::collections::BTreeMap;
 use std::collections::HashMap;
 use std::collections::HashSet;
@@ -31,7 +36,7 @@ use std::iter::FromIterator;
 use std::rc::{self, Rc};
 use std::sync::{self, Arc};
 
-include!("../auxiliary/option_helpers.rs");
+use option_helpers::IteratorFalsePositives;
 
 pub struct T;