Просмотр исходного кода

Fix test failure due to racing commits. (#1802)

Richard Smith 3 лет назад
Родитель
Сommit
f3127d2e83

+ 1 - 1
explorer/testdata/function/fail_invalid_fnty.carbon

@@ -13,7 +13,7 @@ package ExplorerTest api;
 // TODO: We should type-check the prelude before the main input so that we can
 // use it within the types of top-level declarations.
 // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_invalid_fnty.carbon:[[@LINE+2]]: type error in `-`:
-// CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/function/fail_invalid_fnty.carbon:[[@LINE+1]]: missing declaration for builtin `Negate`
+// CHECK: missing declaration for builtin `Negate`
 fn f(g: __Fn(-true) -> true) {
 }
 

+ 1 - 1
explorer/testdata/generic_function/fail_not_addable.carbon

@@ -12,7 +12,7 @@ package ExplorerTest api;
 
 fn id[T:! Type](x: T) -> T {
   // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_not_addable.carbon:[[@LINE+2]]: type error in `+`:
-  // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/generic_function/fail_not_addable.carbon:[[@LINE+1]]: could not find implementation of interface AddWith(U = i32) for T:! Type
+  // CHECK: could not find implementation of interface AddWith(U = i32) for T:! Type
   return x + 0;
 }
 

+ 1 - 1
explorer/testdata/operators/fail_no_add.carbon

@@ -15,7 +15,7 @@ class A {}
 fn Main() -> i32 {
   var a: A = {};
   // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_add.carbon:[[@LINE+2]]: type error in `+`:
-  // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_add.carbon:[[@LINE+1]]: could not find implementation of interface AddWith(U = i32) for class A
+  // CHECK: could not find implementation of interface AddWith(U = i32) for class A
   a + 1;
   return 0;
 }

+ 1 - 1
explorer/testdata/operators/fail_no_mul.carbon

@@ -15,7 +15,7 @@ class A {}
 fn Main() -> i32 {
   var a: A = {};
   // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_mul.carbon:[[@LINE+2]]: type error in `*`:
-  // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_mul.carbon:[[@LINE+1]]: could not find implementation of interface MulWith(U = i32) for class A
+  // CHECK: could not find implementation of interface MulWith(U = i32) for class A
   a * 1;
   return 0;
 }

+ 1 - 1
explorer/testdata/operators/fail_no_negate.carbon

@@ -15,7 +15,7 @@ class A {}
 fn Main() -> i32 {
   var a: A = {};
   // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_negate.carbon:[[@LINE+2]]: type error in `-`:
-  // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_negate.carbon:[[@LINE+1]]: could not find implementation of interface Negate for class A
+  // CHECK: could not find implementation of interface Negate for class A
   -a;
   return 0;
 }

+ 1 - 1
explorer/testdata/operators/fail_no_sub.carbon

@@ -15,7 +15,7 @@ class A {}
 fn Main() -> i32 {
   var a: A = {};
   // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_sub.carbon:[[@LINE+2]]: type error in `-`:
-  // CHECK: COMPILATION ERROR: {{.*}}/explorer/testdata/operators/fail_no_sub.carbon:[[@LINE+1]]: could not find implementation of interface SubWith(U = i32) for class A
+  // CHECK: could not find implementation of interface SubWith(U = i32) for class A
   a - 1;
   return 0;
 }