Skip to content

Commit e9ad52f

Browse files
committed
cue/testdata: update out/eval/stats after concurrent merges
Marcel and Matthew merged changes to the evaluator around the same time, which resulted in this testdata file now having out of date stats. This sort of post-merge CI breakage can happen at times, even without git merge conflicts, given that we don't enforce rebasing, testing, and merging changes in sequence - at least not yet. Signed-off-by: Daniel Martí <[email protected]> Change-Id: I4ccd36fd7bf82a5de7c9cdde25e2daffdba13880 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1207919 Reviewed-by: Matthew Sackman <[email protected]> TryBot-Result: CUEcueckoo <[email protected]>
1 parent 60c33d8 commit e9ad52f

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

Diff for: cue/testdata/resolve/048_builtins.txtar

+5-5
Original file line numberDiff line numberDiff line change
@@ -101,14 +101,14 @@ o3: o1 & {
101101
<0>{a1: <1>{a: (=~"oo" & =~"fo"), b: =~"oo", c: =~"fo"}, a2: <2>{a: "foo", b: =~"oo", c: =~"fo"}, a3: <3>{a: _|_((=~"oo" & "bar"):invalid value "bar" (does not match =~"oo")), b: =~"oo", c: =~"fo"}, o1: <4>{a: string, b: string, c: "bar"}, o2: <5>{a: "foo", b: string, c: "bar"}, o3: <6>{a: _|_(("baz" & "foo"):empty disjunction: conflicting values "baz" and "foo";("bar" & "foo"):empty disjunction: conflicting values "bar" and "foo"), b: "baz", c: "bar"}}
102102
-- out/eval/stats --
103103
Leaks: 6
104-
Freed: 82
105-
Reused: 73
104+
Freed: 79
105+
Reused: 70
106106
Allocs: 15
107107
Retain: 26
108108

109-
Unifications: 76
110-
Conjuncts: 156
111-
Disjuncts: 100
109+
Unifications: 73
110+
Conjuncts: 152
111+
Disjuncts: 97
112112
-- out/evalalpha --
113113
Errors:
114114
o3.a: 2 errors in empty disjunction:

0 commit comments

Comments
 (0)