Update conformance

Author: fangyi-zhou

conformance/third_party/conformance.exp

@@ -10031,6 +10031,16 @@
       "name": "bad-override",
       "stop_column": 5,
       "stop_line": 55
+    },
+    {
+      "code": -2,
+      "column": 7,
+      "concise_description": "Inconsistent types for field `x` inherited from multiple base classes: `int` from `X2`, `str` from `Y2`",
+      "description": "Inconsistent types for field `x` inherited from multiple base classes: `int` from `X2`, `str` from `Y2`",
+      "line": 65,
+      "name": "inconsistent-overload",
+      "stop_column": 11,
+      "stop_line": 65
     }
   ],
   "typeddicts_operations.py": [

conformance/third_party/conformance.result

@@ -357,9 +357,7 @@
   "typeddicts_class_syntax.py": [],
   "typeddicts_extra_items.py": [],
   "typeddicts_final.py": [],
-  "typeddicts_inheritance.py": [
-    "Line 65: Expected 1 errors"
-  ],
+  "typeddicts_inheritance.py": [],
   "typeddicts_operations.py": [],
   "typeddicts_readonly.py": [],
   "typeddicts_readonly_consistency.py": [],

conformance/third_party/results.json

@@ -1,9 +1,9 @@
 {
   "total": 138,
-  "pass": 93,
-  "fail": 45,
-  "pass_rate": 0.67,
-  "differences": 193,
+  "pass": 94,
+  "fail": 44,
+  "pass_rate": 0.68,
+  "differences": 192,
   "passing": [
     "aliases_explicit.py",
     "aliases_newtype.py",
@@ -91,6 +91,7 @@
     "typeddicts_class_syntax.py",
     "typeddicts_extra_items.py",
     "typeddicts_final.py",
+    "typeddicts_inheritance.py",
     "typeddicts_operations.py",
     "typeddicts_readonly.py",
     "typeddicts_readonly_consistency.py",
@@ -142,7 +143,6 @@
     "qualifiers_final_annotation.py": 12,
     "specialtypes_never.py": 1,
     "specialtypes_type.py": 8,
-    "typeddicts_inheritance.py": 1,
     "typeddicts_readonly_inheritance.py": 4,
     "typeddicts_required.py": 1
   },