about summary refs log tree commit diff
path: root/src/test
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-01-18 06:29:59 +0000
committerbors <bors@rust-lang.org>2016-01-18 06:29:59 +0000
commit9d21acaf9b41ea2529b15d5efd06266e924c0496 (patch)
tree04b0e3c24c04aaf6887c4899f621cdd7a215d2e2 /src/test
parent257d3244f0da284607afe01859781312430438ba (diff)
parent8a41eb55d88459f127cec54f5977534070cdaab1 (diff)
downloadrust-9d21acaf9b41ea2529b15d5efd06266e924c0496.tar.gz
rust-9d21acaf9b41ea2529b15d5efd06266e924c0496.zip
Auto merge of #30953 - KalitaAlexey:17823-get-rid-of-duplicate-error, r=nrc
Diffstat (limited to 'src/test')
-rw-r--r--src/test/compile-fail/if-branch-types.rs2


-rw-r--r--src/test/compile-fail/integer-literal-suffix-inference.rs72


-rw-r--r--src/test/compile-fail/issue-13359.rs4


-rw-r--r--src/test/compile-fail/issue-3477.rs2


-rw-r--r--src/test/compile-fail/issue-5100.rs2


-rw-r--r--src/test/compile-fail/issue-8761.rs4


-rw-r--r--src/test/compile-fail/pattern-error-continue.rs2


-rw-r--r--src/test/compile-fail/pptypedef.rs4


-rw-r--r--src/test/compile-fail/repeat_count.rs6


-rw-r--r--src/test/compile-fail/shift-various-bad-types.rs2


-rw-r--r--src/test/compile-fail/tutorial-suffix-inference-test.rs7


-rw-r--r--src/test/compile-fail/type-mismatch-multiple.rs3


12 files changed, 1 insertions, 109 deletions
diff --git a/src/test/compile-fail/if-branch-types.rs b/src/test/compile-fail/if-branch-types.rs
index b7a5b991c6d..2c730531b82 100644
--- a/src/test/compile-fail/if-branch-types.rs
+++ b/src/test/compile-fail/if-branch-types.rs
@@ -13,6 +13,4 @@ fn main() {
     //~^ ERROR if and else have incompatible types
     //~| expected `i32`
     //~| found `u32`
-    //~| expected i32
-    //~| found u32
 }
diff --git a/src/test/compile-fail/integer-literal-suffix-inference.rs b/src/test/compile-fail/integer-literal-suffix-inference.rs
index 5d9314faef9..8f04b58b778 100644
--- a/src/test/compile-fail/integer-literal-suffix-inference.rs
+++ b/src/test/compile-fail/integer-literal-suffix-inference.rs
@@ -43,79 +43,55 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i16`
-    //~| expected i8
-    //~| found i16
     id_i8(a32);
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i32`
-    //~| expected i8
-    //~| found i32
     id_i8(a64);
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i64`
-    //~| expected i8
-    //~| found i64
 
     id_i16(a8);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i8`
-    //~| expected i16
-    //~| found i8
     id_i16(a16); // ok
     id_i16(a32);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i32`
-    //~| expected i16
-    //~| found i32
     id_i16(a64);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i64`
-    //~| expected i16
-    //~| found i64
 
     id_i32(a8);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i8`
-    //~| expected i32
-    //~| found i8
     id_i32(a16);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i16`
-    //~| expected i32
-    //~| found i16
     id_i32(a32); // ok
     id_i32(a64);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i64`
-    //~| expected i32
-    //~| found i64
 
     id_i64(a8);
     //~^ ERROR mismatched types
     //~| expected `i64`
     //~| found `i8`
-    //~| expected i64
-    //~| found i8
     id_i64(a16);
     //~^ ERROR mismatched types
     //~| expected `i64`
     //~| found `i16`
-    //~| expected i64
-    //~| found i16
     id_i64(a32);
     //~^ ERROR mismatched types
     //~| expected `i64`
     //~| found `i32`
-    //~| expected i64
-    //~| found i32
     id_i64(a64); // ok
 
     id_i8(c8); // ok
@@ -123,79 +99,55 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i16`
-    //~| expected i8
-    //~| found i16
     id_i8(c32);
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i32`
-    //~| expected i8
-    //~| found i32
     id_i8(c64);
     //~^ ERROR mismatched types
     //~| expected `i8`
     //~| found `i64`
-    //~| expected i8
-    //~| found i64
 
     id_i16(c8);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i8`
-    //~| expected i16
-    //~| found i8
     id_i16(c16); // ok
     id_i16(c32);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i32`
-    //~| expected i16
-    //~| found i32
     id_i16(c64);
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `i64`
-    //~| expected i16
-    //~| found i64
 
     id_i32(c8);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i8`
-    //~| expected i32
-    //~| found i8
     id_i32(c16);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i16`
-    //~| expected i32
-    //~| found i16
     id_i32(c32); // ok
     id_i32(c64);
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i64`
-    //~| expected i32
-    //~| found i64
 
     id_i64(a8);
     //~^ ERROR mismatched types
     //~| expected `i64`
     //~| found `i8`
-    //~| expected i64
-    //~| found i8
     id_i64(a16);
     //~^ ERROR mismatched types
     //~| expected `i64`
-    //~| found `i16`
-    //~| expected i64
     //~| found i16
     id_i64(a32);
     //~^ ERROR mismatched types
     //~| expected `i64`
     //~| found `i32`
-    //~| expected i64
-    //~| found i32
     id_i64(a64); // ok
 
     id_u8(b8); // ok
@@ -203,78 +155,54 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `u8`
     //~| found `u16`
-    //~| expected u8
-    //~| found u16
     id_u8(b32);
     //~^ ERROR mismatched types
     //~| expected `u8`
     //~| found `u32`
-    //~| expected u8
-    //~| found u32
     id_u8(b64);
     //~^ ERROR mismatched types
     //~| expected `u8`
     //~| found `u64`
-    //~| expected u8
-    //~| found u64
 
     id_u16(b8);
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `u8`
-    //~| expected u16
-    //~| found u8
     id_u16(b16); // ok
     id_u16(b32);
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `u32`
-    //~| expected u16
-    //~| found u32
     id_u16(b64);
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `u64`
-    //~| expected u16
-    //~| found u64
 
     id_u32(b8);
     //~^ ERROR mismatched types
     //~| expected `u32`
     //~| found `u8`
-    //~| expected u32
-    //~| found u8
     id_u32(b16);
     //~^ ERROR mismatched types
     //~| expected `u32`
     //~| found `u16`
-    //~| expected u32
-    //~| found u16
     id_u32(b32); // ok
     id_u32(b64);
     //~^ ERROR mismatched types
     //~| expected `u32`
     //~| found `u64`
-    //~| expected u32
-    //~| found u64
 
     id_u64(b8);
     //~^ ERROR mismatched types
     //~| expected `u64`
     //~| found `u8`
-    //~| expected u64
-    //~| found u8
     id_u64(b16);
     //~^ ERROR mismatched types
     //~| expected `u64`
     //~| found `u16`
-    //~| expected u64
-    //~| found u16
     id_u64(b32);
     //~^ ERROR mismatched types
     //~| expected `u64`
     //~| found `u32`
-    //~| expected u64
-    //~| found u32
     id_u64(b64); // ok
 }
diff --git a/src/test/compile-fail/issue-13359.rs b/src/test/compile-fail/issue-13359.rs
index c53e5760941..775412a12ca 100644
--- a/src/test/compile-fail/issue-13359.rs
+++ b/src/test/compile-fail/issue-13359.rs
@@ -17,13 +17,9 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `i16`
     //~| found `isize`
-    //~| expected i16
-    //~| found isize
 
     bar(1*(1 as usize));
     //~^ ERROR mismatched types
     //~| expected `u32`
     //~| found `usize`
-    //~| expected u32
-    //~| found usize
 }
diff --git a/src/test/compile-fail/issue-3477.rs b/src/test/compile-fail/issue-3477.rs
index 5e7c23164cb..43ef1b59ccf 100644
--- a/src/test/compile-fail/issue-3477.rs
+++ b/src/test/compile-fail/issue-3477.rs
@@ -13,6 +13,4 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `char`
     //~| found `u8`
-    //~| expected char
-    //~| found u8
 }
diff --git a/src/test/compile-fail/issue-5100.rs b/src/test/compile-fail/issue-5100.rs
index 35096110e8f..304b6f185fe 100644
--- a/src/test/compile-fail/issue-5100.rs
+++ b/src/test/compile-fail/issue-5100.rs
@@ -71,6 +71,4 @@ fn main() {
     let x: char = true; //~  ERROR mismatched types
                         //~| expected `char`
                         //~| found `bool`
-                        //~| expected char
-                        //~| found bool
 }
diff --git a/src/test/compile-fail/issue-8761.rs b/src/test/compile-fail/issue-8761.rs
index 30e4ec8ad0e..35be01970cb 100644
--- a/src/test/compile-fail/issue-8761.rs
+++ b/src/test/compile-fail/issue-8761.rs
@@ -13,14 +13,10 @@ enum Foo {
     //~^ ERROR mismatched types
     //~| expected `isize`
     //~| found `i64`
-    //~| expected isize
-    //~| found i64
     B = 2u8
     //~^ ERROR mismatched types
     //~| expected `isize`
     //~| found `u8`
-    //~| expected isize
-    //~| found u8
 }
 
 fn main() {}
diff --git a/src/test/compile-fail/pattern-error-continue.rs b/src/test/compile-fail/pattern-error-continue.rs
index aa7202574ab..9ebdcf1a9ec 100644
--- a/src/test/compile-fail/pattern-error-continue.rs
+++ b/src/test/compile-fail/pattern-error-continue.rs
@@ -42,6 +42,4 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `char`
     //~| found `bool`
-    //~| expected char
-    //~| found bool
 }
diff --git a/src/test/compile-fail/pptypedef.rs b/src/test/compile-fail/pptypedef.rs
index ccf82e90b7a..1a1c87ff47d 100644
--- a/src/test/compile-fail/pptypedef.rs
+++ b/src/test/compile-fail/pptypedef.rs
@@ -15,13 +15,9 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `u32`
     //~| found `i32`
-    //~| expected u32
-    //~| found i32
 
     let_in(3i32, |i| { assert!(i == 3u32); });
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `u32`
-    //~| expected i32
-    //~| found u32
 }
diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs
index 7a0623ba44f..9aa61418d6d 100644
--- a/src/test/compile-fail/repeat_count.rs
+++ b/src/test/compile-fail/repeat_count.rs
@@ -25,8 +25,6 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `usize`
     //~| found `bool`
-    //~| expected usize
-    //~| found bool) [E0308]
     //~| ERROR expected positive integer for repeat count, found boolean [E0306]
     let d = [0; 0.5];
     //~^ ERROR mismatched types
@@ -46,15 +44,11 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `usize`
     //~| found `isize`
-    //~| expected usize
-    //~| found isize) [E0308]
     //~| ERROR expected positive integer for repeat count, found negative integer [E0306]
     let f = [0_usize; -1_isize];
     //~^ ERROR mismatched types
     //~| expected `usize`
     //~| found `isize`
-    //~| expected usize
-    //~| found isize) [E0308]
     //~| ERROR expected positive integer for repeat count, found negative integer [E0306]
     struct G {
         g: (),
diff --git a/src/test/compile-fail/shift-various-bad-types.rs b/src/test/compile-fail/shift-various-bad-types.rs
index c980572fa15..560af9193b3 100644
--- a/src/test/compile-fail/shift-various-bad-types.rs
+++ b/src/test/compile-fail/shift-various-bad-types.rs
@@ -36,8 +36,6 @@ fn foo(p: &Panolpy) {
     //~^ ERROR mismatched types
     //~| expected `i32`
     //~| found `i64`
-    //~| expected i32
-    //~| found i64)
 }
 
 fn main() {
diff --git a/src/test/compile-fail/tutorial-suffix-inference-test.rs b/src/test/compile-fail/tutorial-suffix-inference-test.rs
index bb1e199920d..99d6437c02e 100644
--- a/src/test/compile-fail/tutorial-suffix-inference-test.rs
+++ b/src/test/compile-fail/tutorial-suffix-inference-test.rs
@@ -20,14 +20,10 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `u8`
-    //~| expected u16
-    //~| found u8
     identity_u16(y);
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `i32`
-    //~| expected u16
-    //~| found i32
 
     let a = 3;
 
@@ -38,7 +34,4 @@ fn main() {
     //~^ ERROR mismatched types
     //~| expected `u16`
     //~| found `isize`
-    //~| expected u16
-    //~| found isize
-
 }
diff --git a/src/test/compile-fail/type-mismatch-multiple.rs b/src/test/compile-fail/type-mismatch-multiple.rs
index 627300a0377..dd8f54cdabb 100644
--- a/src/test/compile-fail/type-mismatch-multiple.rs
+++ b/src/test/compile-fail/type-mismatch-multiple.rs
@@ -19,5 +19,4 @@ fn main() { let a: bool = 1; let b: i32 = true; }
 //~| ERROR mismatched types
 //~| expected `i32`
 //~| found `bool`
-//~| expected i32
-//~| found bool
+

 

generated by cgit-pink 1.4.1-3-g733a5 (git 2.37.1) at 2026-07-15 10:29:00 +0000