@@ -240,6 +240,10 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
240
240
fatal ( "process did not return an error status" ) ;
241
241
}
242
242
243
+ let prefixes = vec:: map ( expected_errors, { |ee|
244
+ #fmt ( "%s:%u:" , testfile, ee. line )
245
+ } ) ;
246
+
243
247
// Scan and extract our error/warning messages,
244
248
// which look like:
245
249
// filename:line1:col1: line2:col2: *error:* msg
@@ -250,10 +254,9 @@ fn check_expected_errors(expected_errors: [errors::expected_error],
250
254
let was_expected = false ;
251
255
vec:: iteri ( expected_errors) { |i, ee|
252
256
if !found_flags[ i] {
253
- let needle = #fmt ( "%s:%u:" , testfile, ee. line ) ;
254
- #debug[ "needle=%s ee.kind=%s ee.msg=%s line=%s" ,
255
- needle, ee. kind , ee. msg , line] ;
256
- if ( str:: contains ( line, needle) &&
257
+ #debug[ "prefix=%s ee.kind=%s ee.msg=%s line=%s" ,
258
+ prefixes[ i] , ee. kind , ee. msg , line] ;
259
+ if ( str:: starts_with ( line, prefixes[ i] ) &&
257
260
str:: contains ( line, ee. kind ) &&
258
261
str:: contains ( line, ee. msg ) ) {
259
262
found_flags[ i] = true ;
0 commit comments