core/toposort: stop trying to order structinfos/structlits

A Vertex has a Structs field which contains StructInfos for all the
structs that contributed to this vertex. Previously, I was attempting to
build a graph from these StructInfos. This necessitated storing the
parent of a struct in its StructInfo. However, even if this is working
perfectly, the results are not perfect. For example:

```
y: b: 2

x: {
    c: 1
    y
    a: 1
}
```

Here, the Vertex for `x` would contain two StructInfos, but we still
wouldn't be able to establish that the `{b: 2}` struct should be
processed after `c: 1` and before `a: 1`. This is because the vertex for
`x` does not know there was an embedding.

However, here:

```
x: {
    c: 1
    if true {
        b: 2
    }
    a: 1
}
```

on master, this extra parent info would allow us to get the ordering
right, (i.e. c, then b, then a). This is because we would discover that
`{b: 2}`'s ancestor is `x`,

This CL removes this extra parent information completely. This means the
above two examples now behave the same (b, then c, then a), which is
wrong, but it's more consistent. It also simplifies the code
substantially. It also makes the behaviour of evalv3 closer to evalv2.

Signed-off-by: Matthew Sackman <[email protected]>
Change-Id: I973230e591894b4b4018b66e2967f65339d1026a
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1211097
Unity-Result: CUE porcuepine <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>

Author: cuematthew

.github/workflows/evict_caches.yaml

@@ -21,8 +21,8 @@ jobs:
         run: touch -t 202211302355 $(find * -type d)
       - name: Restore git file modification times
         uses: chetan/git-restore-mtime-action@075f9bc9d159805603419d50f794bd9f33252ebe
-      - name: Try to extract Dispatch-Trailer
-        id: DispatchTrailer
+      - id: DispatchTrailer
+        name: Try to extract Dispatch-Trailer
         run: |-
           x="$(git log -1 --pretty='%(trailers:key=Dispatch-Trailer,valueonly)')"
           if [[ "$x" == "" ]]
@@ -38,11 +38,11 @@ jobs:
           echo "value<<EOD" >> $GITHUB_OUTPUT
           echo "$x" >> $GITHUB_OUTPUT
           echo "EOD" >> $GITHUB_OUTPUT
-      - name: Check we don't have Dispatch-Trailer on a protected branch
-        if: |-
+      - if: |-
           ((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
           Dispatch-Trailer: {"type":"')))) && (contains(github.event.head_commit.message, '
           Dispatch-Trailer: {"type":"'))
+        name: Check we don't have Dispatch-Trailer on a protected branch
         run: |-
           echo "github.event.head_commit.message contains Dispatch-Trailer but we are on a protected branch"
           false

.github/workflows/trybot.yaml

@@ -140,12 +140,12 @@ jobs:
           Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ubuntu-24.04')
         name: gcloud setup for end-to-end tests
         uses: google-github-actions/setup-gcloud@v2
-      - env:
-          CUE_TEST_TOKEN: ${{ secrets.E2E_PORCUEPINE_CUE_TOKEN }}
-        if: |-
+      - if: |-
           github.repository == 'cue-lang/cue' && (((github.ref == 'refs/heads/master' || startsWith(github.ref, 'refs/heads/release-branch.')) && (! (contains(github.event.head_commit.message, '
           Dispatch-Trailer: {"type":"')))) || (github.ref == 'refs/heads/ci/test')) && (matrix.go-version == '1.24.x' && matrix.runner == 'ubuntu-24.04')
         name: End-to-end test
+        env:
+          CUE_TEST_TOKEN: ${{ secrets.E2E_PORCUEPINE_CUE_TOKEN }}
         run: |-
           cd internal/_e2e
           go test -race

cmd/cue/cmd/testdata/script/cmd_issue2060.txtar

@@ -136,10 +136,10 @@ StrokesName: ZenStrokes1
 PlatformName: Linux
 CommandBindingsCount: 1
 CommandBindings:
-  - BindingsMax: 0
+  - EditorCmdText: '"command": "move", "args": test'
+    BindingsMax: 0
     CmdName: CursorMoveToLineForward
     CmdHumanName: Cursor Down
-    EditorCmdText: '"command": "move", "args": test'
     BindingsCount: 1
     Bindings:
       - DefText: Down

cmd/cue/cmd/testdata/script/issue269.txtar

@@ -27,15 +27,15 @@ data: {
 }
 data: {
     a: {
-        x: 0
-        y: 0
         i: 0
         j: 0
-    }
-    b: {
         x: 0
         y: 0
+    }
+    b: {
         i: 0
         j: 0
+        x: 0
+        y: 0
     }
 }

cmd/cue/cmd/testdata/script/issue986.txtar

@@ -31,6 +31,6 @@ cmp stdout expect-stdout
 
 -- expect-stdout --
 a: aaa
-ab: aaabbb
 b: bbb
+ab: aaabbb
 cd: cccddd

cmd/cue/cmd/testdata/script/modget_initial.txtar

@@ -65,9 +65,9 @@ deps: {
 }
 -- want-stdout-1 --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.10.2",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }
@@ -93,9 +93,9 @@ deps: {
 }
 -- want-stdout-2 --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.11.0-alpha",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }

cmd/cue/cmd/testdata/script/modmirror_initial.txtar

@@ -35,9 +35,9 @@ mirroring foo.com/bar/[email protected]
 mirroring [email protected]
 -- want-export-stdout --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.10.1",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }

cmd/cue/cmd/testdata/script/modmirror_modmode.txtar

@@ -35,9 +35,9 @@ mirroring [email protected]
 mirroring foo.com/bar/[email protected]
 -- want-export-stdout --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.10.1",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }

cmd/cue/cmd/testdata/script/modmirror_nodeps.txtar

@@ -23,9 +23,9 @@ mirroring [email protected]
 failed to resolve "foo.com/bar/hello": cannot find module providing package foo.com/bar/hello
 -- want-export-stdout --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.10.1",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }

cmd/cue/cmd/testdata/script/modtidy_initial.txtar

@@ -40,9 +40,9 @@ deps: {
 }
 -- want-stdout --
 {
-    "foo.com/bar/hello@v0": "v0.2.3",
     "bar.com@v0": "v0.5.0",
     "baz.org@v0": "v0.10.1",
+    "foo.com/bar/hello@v0": "v0.2.3",
     "main": "main",
     "example.com@v0": "v0.0.1"
 }