Skip to content

Commit a6daeb9

Browse files
committed
Revert "internal/core/adt: carry over enclosing scope"
This reverts https://cuelang.org/cl/1214849, as it broke two cuelang.org/docs guides as reported in #3924. Fixes #3924. Causes #3920 to reopen, as we are reverting the fix. Signed-off-by: Daniel Martí <[email protected]> Change-Id: I61ed91546510bb519e2f19616ea928c318fcc6fb Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1215074 TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Marcel van Lohuizen <[email protected]>
1 parent 2740b68 commit a6daeb9

File tree

12 files changed

+251
-230
lines changed

12 files changed

+251
-230
lines changed

cue/testdata/cycle/builtins.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -265,8 +265,8 @@ Unifications: 399
265265
Conjuncts: 731
266266
Disjuncts: 38
267267

268-
CloseIDElems: 150
269-
NumCloseIDs: 191
268+
CloseIDElems: 116
269+
NumCloseIDs: 189
270270
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
271271
diff old new
272272
--- old
@@ -291,8 +291,8 @@ diff old new
291291
+Conjuncts: 731
292292
+Disjuncts: 38
293293
+
294-
+CloseIDElems: 150
295-
+NumCloseIDs: 191
294+
+CloseIDElems: 116
295+
+NumCloseIDs: 189
296296
-- out/eval/stats --
297297
Leaks: 25
298298
Freed: 446

cue/testdata/cycle/chain.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1705,7 +1705,7 @@ Unifications: 931
17051705
Conjuncts: 4994
17061706
Disjuncts: 1615
17071707

1708-
CloseIDElems: 19418
1708+
CloseIDElems: 20484
17091709
NumCloseIDs: 1535
17101710
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
17111711
diff old new
@@ -1731,7 +1731,7 @@ diff old new
17311731
+Conjuncts: 4994
17321732
+Disjuncts: 1615
17331733
+
1734-
+CloseIDElems: 19418
1734+
+CloseIDElems: 20484
17351735
+NumCloseIDs: 1535
17361736
-- out/eval/stats --
17371737
Leaks: 56

cue/testdata/cycle/inline.txtar

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ Unifications: 253
405405
Conjuncts: 639
406406
Disjuncts: 0
407407

408-
CloseIDElems: 363
409-
NumCloseIDs: 231
408+
CloseIDElems: 329
409+
NumCloseIDs: 229
410410
-- diff/-out/evalalpha/stats<==>+out/eval/stats --
411411
diff old new
412412
--- old
@@ -431,8 +431,8 @@ diff old new
431431
+Conjuncts: 639
432432
+Disjuncts: 0
433433
+
434-
+CloseIDElems: 363
435-
+NumCloseIDs: 231
434+
+CloseIDElems: 329
435+
+NumCloseIDs: 229
436436
-- out/eval/stats --
437437
Leaks: 286
438438
Freed: 253

0 commit comments

Comments
 (0)