Auto merge of #160331 - Walnut356:pretty-std-repr, r=<try>

Convert `tests/debuginfo/pretty-std.rs` to `lldb-repr`


try-job: aarch64-apple-1

Author: bors

src/ci/github-actions/jobs.yml

@@ -594,7 +594,7 @@ auto:
     env:
       # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set1.sh`
       SCRIPT: >-
-        ./x.py --stage 2 test
+        ./x.py test tests/debuginfo
         --host=aarch64-apple-darwin
         --target=aarch64-apple-darwin
         --skip compiler
@@ -646,7 +646,7 @@ auto:
     env:
       # NOTE: keep in sync with `src/ci/docker/scripts/stage_2_test_set1.sh`
       SCRIPT: >-
-        ./x.py --stage 2 test
+        ./x.py test tests/debuginfo
         --host=aarch64-apple-darwin
         --target=aarch64-apple-darwin
         --skip compiler

src/etc/lldb_batchmode/check_lldb.py

@@ -14,6 +14,8 @@
 from .common import (
     BLESS,
     INPUT_DATA,
+    ArrayChild,
+    ArrayLikeChildren,
     Child,
     Variable,
     Result,
@@ -92,6 +94,7 @@ def type_matches(
     """Checks a type and all field/generic types (recursively) against the data contained in
     `INPUT_DATA`."""
     name: str = sbtype.GetName()
+    print(f"  [repr testing type {name}]")
     error_source = f"type '{name}'"
 
     if (r := TYPES_TESTED.get(name)) is not None:
@@ -136,7 +139,7 @@ def type_matches(
 
         ty_result = ty.matches(expected, name, provider_ok)
 
-        result = basic_type_result and type_class_result and ty_result
+        result = type_class_result and ty_result
 
     TYPES_TESTED[name] = result
 
@@ -212,11 +215,19 @@ def var_matches(var: Variable, expected: Variable, valobj: lldb.SBValue) -> Resu
     format_ok = var.format == expected.format
 
     type_ok = var.type == expected.type
-    type_match_ok = type_matches(
-        valobj.GetType(),
-        valobj.GetTarget(),
-        summary_ok & synthetic_ok & format_ok & pretty_type_name_ok & pretty_print_ok,
-    )
+
+    if var.has_visualizer() or expected.has_visualizer():
+        type_match_ok = type_matches(
+            valobj.GetType(),
+            valobj.GetTarget(),
+            summary_ok
+            & synthetic_ok
+            & format_ok
+            & pretty_type_name_ok
+            & pretty_print_ok,
+        )
+    else:
+        type_match_ok = Result.Ok
 
     value_ok = var.value == expected.value
 
@@ -237,7 +248,10 @@ def var_matches(var: Variable, expected: Variable, valobj: lldb.SBValue) -> Resu
             else:
                 child_types_ok = False
 
-        child_types_ok &= type_matches(obj.GetType(), target) == Result.Ok
+        if var.has_visualizer() or expected.has_visualizer():
+            child_types_ok &= type_matches(obj.GetType(), target) == Result.Ok
+        else:
+            type_match_ok = Result.Ok
 
     children_ok = children_match(
         var.children, expected.children, valobj.GetName(), valobj
@@ -259,6 +273,8 @@ def var_matches(var: Variable, expected: Variable, valobj: lldb.SBValue) -> Resu
 
     error_source = f"var '{valobj.GetName()}'"
 
+    print("[repr var does not match]")
+
     # otherwise, we want to output exactly what doesn't match
     # and any additional helpful information
 
@@ -392,6 +408,8 @@ def children_match(
     invalid_count = 0
 
     for i in range(len(expected)):
+        print(f"  [repr testing child {i}]")
+
         exp = expected[i]
 
         if i >= len(children):
@@ -400,6 +418,18 @@ def children_match(
 
         got = children[i]
 
+        if isinstance(children, ArrayLikeChildren):
+            if isinstance(got, ArrayChild):
+                got = Child(f"[{i}]", children.type, got.value, got.children)
+            else:
+                got = Child(f"[{i}]", children.type, got, [])
+
+        if isinstance(expected, ArrayLikeChildren):
+            if isinstance(exp, ArrayChild):
+                exp = Child(f"[{i}]", expected.type, exp.value, exp.children)
+            else:
+                exp = Child(f"[{i}]", expected.type, exp, [])
+
         if got.name is None:
             result = Result.Mismatch
             invalid_count += 1