Auto merge of #6304 - matthiaskrgr:crash_6302, r=llogiq

[rust.git] / tests / ui / complex_types.rs

diff --git a/tests/ui/complex_types.rs b/tests/ui/complex_types.rs
index ef5cd68972db2b6628003a58453f4652b1f57b46..be61fb6b9be613cca8bd66f622644b253af6cabd 100644 (file)
--- a/tests/ui/complex_types.rs
+++ b/tests/ui/complex_types.rs
@@ -1,8 +1,6 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-#![deny(clippy)]
-#![allow(unused)]
-#![feature(associated_consts, associated_type_defaults)]
+#![warn(clippy::all)]
+#![allow(unused, clippy::needless_pass_by_value, clippy::vec_box)]
+#![feature(associated_type_defaults)]
 
 type Alias = Vec<Vec<Box<(u32, u32, u32, u32)>>>; // no warning here
 
@@ -22,23 +20,41 @@ enum E {
 
 impl S {
     const A: (u32, (u32, (u32, (u32, u32)))) = (0, (0, (0, (0, 0))));
-    fn impl_method(&self, p: Vec<Vec<Box<(u32, u32, u32, u32)>>>) { }
+    fn impl_method(&self, p: Vec<Vec<Box<(u32, u32, u32, u32)>>>) {}
 }
 
 trait T {
     const A: Vec<Vec<Box<(u32, u32, u32, u32)>>>;
     type B = Vec<Vec<Box<(u32, u32, u32, u32)>>>;
     fn method(&self, p: Vec<Vec<Box<(u32, u32, u32, u32)>>>);
-    fn def_method(&self, p: Vec<Vec<Box<(u32, u32, u32, u32)>>>) { }
+    fn def_method(&self, p: Vec<Vec<Box<(u32, u32, u32, u32)>>>) {}
 }
 
-fn test1() -> Vec<Vec<Box<(u32, u32, u32, u32)>>> { vec![] }
+fn test1() -> Vec<Vec<Box<(u32, u32, u32, u32)>>> {
+    vec![]
+}
 
-fn test2(_x: Vec<Vec<Box<(u32, u32, u32, u32)>>>) { }
+fn test2(_x: Vec<Vec<Box<(u32, u32, u32, u32)>>>) {}
 
 fn test3() {
     let _y: Vec<Vec<Box<(u32, u32, u32, u32)>>> = vec![];
 }
 
-fn main() {
+#[repr(C)]
+struct D {
+    // should not warn, since we don't have control over the signature (#3222)
+    test4: extern "C" fn(
+        itself: &D,
+        a: usize,
+        b: usize,
+        c: usize,
+        d: usize,
+        e: usize,
+        f: usize,
+        g: usize,
+        h: usize,
+        i: usize,
+    ),
 }
+
+fn main() {}