Merge #362

362: [testsuite] Scan for warning diagnostics, too r=philberty a=tschwinge



Co-authored-by: Thomas Schwinge <[email protected]>

Author: bors[bot]

gcc/testsuite/lib/rust.exp

@@ -178,11 +178,10 @@ proc rust_target_compile { source dest type options } {
     set options [concat "$ALWAYS_RUSTFLAGS" $options]
     set options [dg-additional-files-options $options $source]
 
-    ## FIXME: until the compiler is made less verbose, we need to prune its output completely.
-    # Only keep line containing error so that the test will correctly report the error and the test
-    # can FAIL or XFAIL
+    ## FIXME: until the compiler is made less verbose, we need to prune its output almost completely.
+    # Only keep lines containing certain diagnostics so that we can check these.
     global additional_prunes
-    set additional_prunes "^((?!error).)*$"
+    lappend additional_prunes "^((?!(error: |warning: )).)*$"
 
     return [target_compile $source $dest $type $options]
 }

gcc/testsuite/rust.test/compile/arithmetic_expressions1.rs

@@ -1,3 +1,5 @@
+// { dg-prune-output "warning: unused name" } as there are many of these expected.
+
 fn main() {
     let a: i32 = 1;
     let b: f32 = 5f32;

gcc/testsuite/rust.test/compile/array_type_infer.rs

@@ -1,3 +1,4 @@
 fn main() {
     let arr: [_; 5] = [1, 2, 3, 4, 5];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/array_zero_length.rs

@@ -1,3 +1,4 @@
 fn main() {
     let arr = ["Hello"; 0];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/arrays1.rs

@@ -3,5 +3,7 @@ fn main() {
     let xy = [6, 7, 8];
 
     let a = xs[0];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let b = xy[2];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/arrays2.rs

@@ -2,6 +2,7 @@ fn main() {
     let mut array: [i32; 3] = [0; 3];
 
     let a = array[0];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let mut c;
     c = array[2];
 }

gcc/testsuite/rust.test/compile/arrays_index1.rs

@@ -2,6 +2,7 @@ fn main() {
     let mut array: [i32; 3] = [0; 3];
 
     let a = array[0];
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let x = 0;
     let mut c;
     c = array[x+1];

gcc/testsuite/rust.test/compile/block_expr1.rs

@@ -20,7 +20,9 @@ fn test5(x: i32) -> i32 {
 
 fn main() {
     let call3: i32 = { test3(3) + 2 };
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let call5 = {
+        // { dg-warning "unused name" "" { target *-*-* } .-1 }
         let a = test5(5);
         a + 1
     };

gcc/testsuite/rust.test/compile/block_expr2.rs

@@ -5,6 +5,7 @@ fn test() -> i32 {
 fn main() {
     let a = { test() };
     let b = {
+        // { dg-warning "unused name" "" { target *-*-* } .-1 }
         if a > 10 {
             a - 1
         } else {

gcc/testsuite/rust.test/compile/block_expr3.rs

@@ -2,6 +2,7 @@ fn main() {
     let x = 111;
 
     let a = {
+        // { dg-warning "unused name" "" { target *-*-* } .-1 }
         if x == 10 {
             123
         } else if x < 10 {

gcc/testsuite/rust.test/compile/block_expr4.rs

@@ -4,4 +4,5 @@ fn foo() -> isize {
 
 fn main() {
     let a = foo();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/block_expr_parser_bug.rs

@@ -1,4 +1,5 @@
 fn main() {
     let a = 123;
     let b = if a > 10 { a - 1 } else { a + 1 };
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/cfg_attr.rs

@@ -2,6 +2,7 @@ use std::env; // Add one line so gccrs doesn't believe we're parsing a shebang
 
 #[cfg_attr(feature = "somefeature", attribute = "someattr")]
 struct Feature;
+// { dg-warning "unused name" "" { target *-*-* } .-1 }
 
 fn main() {
 }

gcc/testsuite/rust.test/compile/comparison_expr1.rs

@@ -28,7 +28,11 @@ fn main() {
     let c: bool = is_positive(3);
     let d: bool = is_negative(4);
     let e: bool = is_positive_or_zero(5);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let f: bool = is_negative_or_zero(6);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let g: bool = a || b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let h: bool = c && d;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/compile.exp

@@ -28,7 +28,7 @@ dg-init
 set saved-dg-do-what-default ${dg-do-what-default}
 
 set dg-do-what-default "compile"
-gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" "-w"
+gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.rs]] "" ""
 set dg-do-what-default ${saved-dg-do-what-default}
 
 # All done.

gcc/testsuite/rust.test/compile/constant1.rs

@@ -5,4 +5,5 @@ fn main() {
     x = x + 1;
 
     let mut y = x + TEST_CONST;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/deadcode1.rs

@@ -1,5 +1,6 @@
 fn test1() -> i32 {
     return 2;
+    // { dg-warning "unreachable expression" "" { target *-*-* } .+1 }
     1
 }
 
@@ -9,10 +10,13 @@ fn test2(x: i32) -> i32 {
     } else {
         return 0;
     }
+    // { dg-warning "unreachable statement" "" { target *-*-* } .+1 }
     return 1;
 }
 
 fn main() {
     let call1 = test1();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let call2 = test2(2);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/deref1.rs

@@ -2,4 +2,5 @@ fn main() {
     let a = 123;
     let b = &a;
     let c = *b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/float1.rs

@@ -5,4 +5,5 @@ fn test(x: f32) -> f32 {
 fn main() {
     let a_float = 5.123;
     let call_test = test(a_float + 1.0);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/float_types.rs

@@ -1,3 +1,5 @@
+// { dg-prune-output "warning: unused name" } as there are many of these expected.
+
 fn main() {
     let a1: f32 = 1.0f32;
     let a2: f64 = 2.0f64;

gcc/testsuite/rust.test/compile/forward_decl_1.rs

@@ -3,6 +3,7 @@ fn main() {
     an_integer = test(1) + 3;
 
     let call_test = test(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }
 
 fn test(x: i32) -> i32 {

gcc/testsuite/rust.test/compile/forward_decl_2.rs

@@ -1,5 +1,6 @@
 fn main() {
     let y = x + 1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }
 
 static x: i32 = 3;

gcc/testsuite/rust.test/compile/forward_decl_3.rs

@@ -1,5 +1,6 @@
 fn main() {
     let struct_test = Foo { one: 1, two: 2 };
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }
 
 struct Foo {

gcc/testsuite/rust.test/compile/forward_decl_4.rs

@@ -3,6 +3,7 @@ fn main() {
     x = x + 1;
 
     let mut y = x + TEST_CONST;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }
 
 const TEST_CONST: i32 = 10;

gcc/testsuite/rust.test/compile/function_reference1.rs

@@ -5,4 +5,5 @@ fn test(a: i32) -> i32 {
 fn main() {
     let a = test;
     let b = a(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/function_reference2.rs

@@ -5,4 +5,5 @@ fn test(a: i32) -> i32 {
 fn main() {
     let a: fn(i32) -> i32 = test;
     let b = a(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/function_reference3.rs

@@ -9,10 +9,12 @@ fn test(a: i32) -> i32 {
 
 fn main() {
     let a = test(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let b: fn(i32) -> i32 = test;
     let c = b(1);
 
     let d = Foo { a: test, b: c };
     let e = (d.a)(d.b);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/function_reference4.rs

@@ -5,4 +5,5 @@ fn test(a: i32) -> i32 {
 fn main() {
     let a: fn(_) -> _ = test;
     let b = a(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics1.rs

@@ -13,29 +13,39 @@ fn main() {
     a1 = Foo { a: 1.0, b: false };
 
     let b1: f32 = a1.a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c1: bool = a1.b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a2: GenericStruct<i8>;
     a2 = GenericStruct::<i8> { a: 1, b: 456 };
 
     let b2: i8 = a2.a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c2: usize = a2.b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a3;
     a3 = GenericStruct::<i32> { a: 123, b: 456 };
 
     let b3: i32 = a3.a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c3: usize = a3.b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a4;
     a4 = GenericStruct { a: 1.0, b: 456 };
 
     let b4: f32 = a4.a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c4: usize = a4.b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a5;
     a5 = GenericStruct::<_> { a: true, b: 456 };
 
     let b5: bool = a5.a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c5: usize = a5.b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics10.rs

@@ -15,4 +15,5 @@ fn main() {
         b: true,
     };
     let b: Foo<i32> = test(a);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics12.rs

@@ -13,4 +13,5 @@ impl GenericStruct<i32> {
 fn main() {
     let a: GenericStruct<i32> = GenericStruct::<i32>::new(123, 456);
     let aa: i32 = a.get();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics2.rs

@@ -7,29 +7,39 @@ fn main() {
     a1 = Foo(1.0, false);
 
     let b1: f32 = a1.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c1: bool = a1.1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a2: GenericStruct<i8>;
     a2 = GenericStruct::<i8>(1, 456);
 
     let b2: i8 = a2.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c2: usize = a2.1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a3;
     a3 = GenericStruct::<i32>(123, 456);
 
     let b3: i32 = a3.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c3: usize = a3.1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a4;
     a4 = GenericStruct(1.0, 456);
 
     let b4: f32 = a4.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c4: usize = a4.1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let a5;
     a5 = GenericStruct::<_>(true, 456);
 
     let b5: bool = a5.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let c5: usize = a5.1;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics3.rs

@@ -6,8 +6,10 @@ fn main() {
     let a;
     a = test(123);
     let aa: i32 = a;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let b;
     b = test::<u32>(456);
     let bb: u32 = b;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics4.rs

@@ -9,5 +9,7 @@ fn test<T>(a: T) -> Foo<T> {
 
 fn main() {
     let a: Foo<i32> = test(123);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let b: Foo<u32> = test(456);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics5.rs

@@ -4,5 +4,7 @@ fn test<T>(a: T) -> T {
 
 fn main() {
     let a: i32 = test(123);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
     let b: i32 = test(456);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics6.rs

@@ -11,4 +11,5 @@ fn main() {
         b: true,
     };
     let b: i32 = a.a.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics7.rs

@@ -9,4 +9,5 @@ fn main() {
     let a = Foo::<i32>(123);
     let b: Bar = Bar { a: a, b: true };
     let c: i32 = b.a.0;
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics8.rs

@@ -8,8 +8,11 @@ impl<T> GenericStruct<T> {
 
 fn main() {
     let a: GenericStruct<i32> = GenericStruct::<i32>::new(123, 456);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let b: GenericStruct<u32> = GenericStruct::<_>::new(123, 456);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let c: GenericStruct<f32> = GenericStruct::new(123f32, 456);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/generics9.rs

@@ -13,10 +13,13 @@ impl<T> GenericStruct<T> {
 fn main() {
     let a: GenericStruct<i32> = GenericStruct::<i32>::new(123, 456);
     let aa: i32 = a.get();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let b: GenericStruct<u32> = GenericStruct::<_>::new(123, 456);
     let bb: u32 = b.get();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 
     let c: GenericStruct<f32> = GenericStruct::new(123f32, 456);
     let cc: f32 = c.get();
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/if_elif_else_expr1.rs

@@ -10,4 +10,5 @@ fn test(x: i32) -> i32 {
 
 fn main() {
     let a = test(1);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }

gcc/testsuite/rust.test/compile/impl_block3.rs

@@ -28,4 +28,5 @@ fn main() {
     let p1 = Point::origin();
     let p2 = Point::new(3.0, 4.0);
     let rect = Rectangle::from(p1, p2);
+    // { dg-warning "unused name" "" { target *-*-* } .-1 }
 }