josh11b 4 лет назад
Родитель
Сommit
958fb8e529

+ 0 - 1
executable_semantics/testdata/class/class_function.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 0 - 1
executable_semantics/testdata/class/class_function_from_instance.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 0 - 1
executable_semantics/testdata/class/class_function_value.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 1 - 2
executable_semantics/testdata/class/fail_method_from_class.carbon

@@ -7,12 +7,11 @@
 // RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
 // RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
 // AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/class/fail_method_from_class.carbon:29: GetX is not a class function
+// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/class/fail_method_from_class.carbon:28: GetX is not a class function
 
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 0 - 1
executable_semantics/testdata/class/method.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 0 - 1
executable_semantics/testdata/class/method_call_method.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }

+ 1 - 2
executable_semantics/testdata/generic_class/fail_bad_parameter_type.carbon

@@ -7,12 +7,11 @@
 // RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
 // RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
 // AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/generic_class/fail_bad_parameter_type.carbon:16: unexpected type of deduced parameter i32
+// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/generic_class/fail_bad_parameter_type.carbon:15: unexpected type of deduced parameter i32
 
 package ExecutableSemanticsTest api;
 
 class Point(T:! i32) {
-
   fn Origin(zero: T) -> Point(T) {
     return {.x = zero, .y = zero};
   }

+ 0 - 1
executable_semantics/testdata/generic_class/generic_point.carbon

@@ -12,7 +12,6 @@
 package ExecutableSemanticsTest api;
 
 class Point(T:! Type) {
-
   fn Origin(zero: T) -> Point(T) {
     return {.x = zero, .y = zero};
   }

+ 3 - 3
executable_semantics/testdata/interface/class_function.carbon

@@ -22,13 +22,13 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Zero() -> Point {
-        return {.x = 0, .y = 0};
+      return {.x = 0, .y = 0};
     }
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point](v: i32) -> Point {
-        return {.x = me.x * v, .y = me.y * v};
+      return {.x = me.x * v, .y = me.y * v};
     }
   }
 }

+ 2 - 2
executable_semantics/testdata/interface/external_impl_point_vector.carbon

@@ -23,10 +23,10 @@ class Point {
 
 external impl Point as Vector {
   fn Add[me: Point](b: Point) -> Point {
-      return {.x = me.x + b.x, .y = me.y + b.y};
+    return {.x = me.x + b.x, .y = me.y + b.y};
   }
   fn Scale[me: Point](v: i32) -> Point {
-      return {.x = me.x * v, .y = me.y * v};
+    return {.x = me.x * v, .y = me.y * v};
   }
 }
 

+ 2 - 2
executable_semantics/testdata/interface/fail_impl_bad_member.carbon

@@ -21,10 +21,10 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point](v: i32) -> i32 {
-        return 0;
+      return 0;
     }
   }
 }

+ 1 - 1
executable_semantics/testdata/interface/fail_impl_missing_member.carbon

@@ -21,7 +21,7 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
   }
 }

+ 1 - 1
executable_semantics/testdata/interface/fail_interface_missing_member.carbon

@@ -24,7 +24,7 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
   }
 }

+ 2 - 2
executable_semantics/testdata/interface/generic_call_generic.carbon

@@ -21,10 +21,10 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point](v: i32) -> Point {
-        return {.x = me.x * v, .y = me.y * v};
+      return {.x = me.x * v, .y = me.y * v};
     }
   }
 }

+ 4 - 4
executable_semantics/testdata/interface/generic_with_two_params.carbon

@@ -21,10 +21,10 @@ class Point1 {
   var y: i32;
   impl Point1 as Vector {
     fn Add[me: Point1](b: Point1) -> Point1 {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point1](v: i32) -> Point1 {
-        return {.x = me.x * v, .y = me.y * v};
+      return {.x = me.x * v, .y = me.y * v};
     }
   }
 }
@@ -34,10 +34,10 @@ class Point2 {
   var y: i32;
   impl Point2 as Vector {
     fn Add[me: Point2](b: Point2) -> Point2 {
-        return {.x = me.x + b.x + 1, .y = me.y + b.y + 1};
+      return {.x = me.x + b.x + 1, .y = me.y + b.y + 1};
     }
     fn Scale[me: Point2](v: i32) -> Point2 {
-        return {.x = me.x * v * 2, .y = me.y * v * 2};
+      return {.x = me.x * v * 2, .y = me.y * v * 2};
     }
   }
 }

+ 2 - 2
executable_semantics/testdata/interface/tuple_vector_add_scale.carbon

@@ -21,10 +21,10 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point](v: i32) -> Point {
-        return {.x = me.x * v, .y = me.y * v};
+      return {.x = me.x * v, .y = me.y * v};
     }
   }
 }

+ 2 - 2
executable_semantics/testdata/interface/vector_point_add_scale.carbon

@@ -21,10 +21,10 @@ class Point {
   var y: i32;
   impl Point as Vector {
     fn Add[me: Point](b: Point) -> Point {
-        return {.x = me.x + b.x, .y = me.y + b.y};
+      return {.x = me.x + b.x, .y = me.y + b.y};
     }
     fn Scale[me: Point](v: i32) -> Point {
-        return {.x = me.x * v, .y = me.y * v};
+      return {.x = me.x * v, .y = me.y * v};
     }
   }
 }

+ 1 - 2
executable_semantics/testdata/let/fail_method_args.carbon

@@ -7,12 +7,11 @@
 // RUN: %{not} %{executable_semantics} --parser_debug --trace_file=- %s 2>&1 | \
 // RUN:   %{FileCheck} --match-full-lines --allow-unused-prefixes %s
 // AUTOUPDATE: %{executable_semantics} %s
-// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/let/fail_method_args.carbon:21: Cannot assign to rvalue 'x'
+// CHECK: COMPILATION ERROR: {{.*}}/executable_semantics/testdata/let/fail_method_args.carbon:20: Cannot assign to rvalue 'x'
 
 package ExecutableSemanticsTest api;
 
 class Point {
-
   fn Origin() -> Point {
     return {.x = 0, .y = 0};
   }