Skip to content

Commit dd188a6

Browse files
mpvlmpvl
committed
cue: move more labels and values to end of error message
Fixes #963 Change-Id: I3fc9fde1a3649f743d534cf7593c2cfcfd8ed3f7 Reviewed-on: https://cue-review.googlesource.com/c/cue/+/9761 Reviewed-by: CUE cueckoo <[email protected]> Reviewed-by: Paul Jolly <[email protected]>
1 parent 7180c7d commit dd188a6

28 files changed

+77
-77
lines changed

‎cmd/cue/cmd/testdata/script/export_err.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ cmp stdout expect-stdout
1111
cmp stderr expect-stderr
1212
-- expect-stderr --
1313
a.b.2.c: incomplete value int
14-
out: invalid interpolation: undefined field d:
14+
out: invalid interpolation: undefined field: d:
1515
./exporterr/export_err.cue:7:6
1616
./exporterr/export_err.cue:7:16
1717
-- expect-stdout --

‎cue/testdata/basicrewrite/012_selecting.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,11 @@ Result:
7979
// ./in.cue:4:16
8080
}
8181
f: (_|_){
82-
// [incomplete] f: undefined field b:
82+
// [incomplete] f: undefined field: b:
8383
// ./in.cue:5:16
8484
}
8585
g: (_|_){
86-
// [incomplete] g: undefined field b:
86+
// [incomplete] g: undefined field: b:
8787
// ./in.cue:6:16
8888
}
8989
h: (_|_){

‎cue/testdata/builtins/all.txtar

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ Errors:
2323
fatalArg.x: invalid operands "eee" and 'eee' to '+' (type string and bytes):
2424
./in.cue:3:12
2525
./in.cue:3:20
26-
0.a: undefined field c:
26+
0.a: undefined field: c:
2727
./in.cue:9:20
2828

2929
Result:
@@ -42,7 +42,7 @@ Result:
4242
#b: (#struct){
4343
}
4444
x: (_|_){
45-
// [eval] 0.a: undefined field c:
45+
// [eval] 0.a: undefined field: c:
4646
// ./in.cue:9:20
4747
}
4848
}
@@ -51,7 +51,7 @@ Result:
5151
}
5252
x: (struct){
5353
a: (_|_){
54-
// [incomplete] okIncompleteChild.x.a: undefined field c:
54+
// [incomplete] okIncompleteChild.x.a: undefined field: c:
5555
// ./in.cue:17:19
5656
}
5757
b: (int){ 1 }

‎cue/testdata/builtins/incomplete.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ Result:
126126
}
127127
}
128128
_Sub: (_|_){
129-
// [incomplete] list1._Sub: undefined field b:
129+
// [incomplete] list1._Sub: undefined field: b:
130130
// ./in.cue:19:13
131131
}
132132
a: (struct){
@@ -150,7 +150,7 @@ Result:
150150
// ./in.cue:30:21
151151
}
152152
#Sub: (_|_){
153-
// [incomplete] list2.#Sub: undefined field b:
153+
// [incomplete] list2.#Sub: undefined field: b:
154154
// ./in.cue:33:13
155155
}
156156
a: (struct){

‎cue/testdata/comprehensions/iferror.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,9 +135,9 @@ Result:
135135
// ./in.cue:10:2
136136
}
137137
incomplete: (_|_){
138-
// [incomplete] incomplete: undefined field d:
138+
// [incomplete] incomplete: undefined field: d:
139139
// ./in.cue:16:7
140-
// incomplete: undefined field d:
140+
// incomplete: undefined field: d:
141141
// ./in.cue:23:21
142142
list: (#list){
143143
0: (int){ 1 }

‎cue/testdata/comprehensions/incomplete.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ c: { for x in top {} }
1212
}
1313
top: (_){ _ }
1414
a: (_|_){
15-
// [incomplete] a: incomplete bool value 'bool'
15+
// [incomplete] a: incomplete bool: bool
1616
}
1717
b: (_|_){
18-
// [incomplete] b: undefined field foo:
18+
// [incomplete] b: undefined field: foo:
1919
// ./in.cue:5:19
2020
}
2121
c: (_|_){

‎cue/testdata/comprehensions/issue837.txtar

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -74,11 +74,11 @@ _params.hsize.$_instances: conflicting values >=0 and {$_instances:(>=0|*1)} (mi
7474
./in.cue:35:13
7575
./in.cue:54:12
7676
./in.cue:55:15
77-
#DoDeploy._params.manifest.description.service.description: undefined field service:
77+
#DoDeploy._params.manifest.description.service.description: undefined field: service:
7878
./in.cue:5:28
7979
_params.hsize.$_instances: 2 errors in empty disjunction::
8080
./in.cue:33:20
81-
#RelabelService.out.labstr: undefined field label:
81+
#RelabelService.out.labstr: undefined field: label:
8282
./in.cue:50:14
8383

8484
Result:
@@ -94,7 +94,7 @@ Result:
9494
kind: (string){ "service" }
9595
}
9696
description: (_|_){
97-
// [incomplete] #DeploymentManifest.description.service.description: undefined field service:
97+
// [incomplete] #DeploymentManifest.description.service.description: undefined field: service:
9898
// ./in.cue:5:28
9999
}
100100
}
@@ -122,7 +122,7 @@ Result:
122122
kind: (string){ "service" }
123123
}
124124
description: (_|_){
125-
// [incomplete] #KumoriKinds.deployment.service.description: undefined field service:
125+
// [incomplete] #KumoriKinds.deployment.service.description: undefined field: service:
126126
// ./in.cue:5:28
127127
}
128128
}
@@ -143,7 +143,7 @@ Result:
143143
kind: (string){ "service" }
144144
}
145145
description: (_|_){
146-
// [eval] #DoDeploy._params.manifest.description.service.description: undefined field service:
146+
// [eval] #DoDeploy._params.manifest.description.service.description: undefined field: service:
147147
// ./in.cue:5:28
148148
}
149149
}
@@ -157,7 +157,7 @@ Result:
157157
description: (_|_){
158158
// [eval]
159159
service: (_|_){
160-
// [eval] #DoDeploy._params.manifest.description.service.description: undefined field service:
160+
// [eval] #DoDeploy._params.manifest.description.service.description: undefined field: service:
161161
// ./in.cue:5:28
162162
}
163163
}
@@ -200,7 +200,7 @@ Result:
200200
out: (_|_){
201201
// [eval]
202202
labstr: (_|_){
203-
// [eval] #RelabelService.out.labstr: undefined field label:
203+
// [eval] #RelabelService.out.labstr: undefined field: label:
204204
// ./in.cue:50:14
205205
}
206206
}
@@ -214,7 +214,7 @@ Result:
214214
kind: (string){ "service" }
215215
}
216216
description: (_|_){
217-
// [incomplete] #Deployment.service.description: undefined field service:
217+
// [incomplete] #Deployment.service.description: undefined field: service:
218218
// ./in.cue:5:28
219219
}
220220
}
@@ -226,7 +226,7 @@ Result:
226226
kind: (string){ "service" }
227227
}
228228
description: (_|_){
229-
// [incomplete] #ServiceManifest.description: undefined field service:
229+
// [incomplete] #ServiceManifest.description: undefined field: service:
230230
// ./in.cue:5:28
231231
}
232232
}

‎cue/testdata/comprehensions/nested.txtar

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ for k, v in deployment {
7171
}
7272
}
7373
selector: (_|_){
74-
// [incomplete] service."node-exporter".spec.selector: undefined field metadata:
74+
// [incomplete] service."node-exporter".spec.selector: undefined field: metadata:
7575
// ./in.cue:47:35
7676
}
7777
}

‎cue/testdata/cycle/compbottomnofinal.txtar

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -412,7 +412,7 @@ Result:
412412
port: (string){ "" }
413413
}
414414
#Y: (_|_){
415-
// [incomplete] small.p2.#Y: undefined field port:
415+
// [incomplete] small.p2.#Y: undefined field: port:
416416
// ./in.cue:50:50
417417
port: (string){ "" }
418418
}
@@ -482,7 +482,7 @@ Result:
482482
port: (string){ "" }
483483
}
484484
#Y: (_|_){
485-
// [incomplete] medium.p5.#Y: undefined field port:
485+
// [incomplete] medium.p5.#Y: undefined field: port:
486486
// ./in.cue:158:56
487487
port: (string){ "" }
488488
}
@@ -496,7 +496,7 @@ Result:
496496
Y: (struct){
497497
}
498498
#Y: (_|_){
499-
// [incomplete] medium.p6.#Y: undefined field port:
499+
// [incomplete] medium.p6.#Y: undefined field: port:
500500
// ./in.cue:186:56
501501
port: (string){ "" }
502502
}

‎cue/testdata/definitions/comprehensions.txtar

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ issue595: {
1111
}
1212
-- out/eval --
1313
Errors:
14-
issue595.files: undefined field nam:
14+
issue595.files: undefined field: nam:
1515
./in.cue:8:20
1616

1717
Result:
@@ -25,7 +25,7 @@ Result:
2525
}
2626
}
2727
files: (_|_){
28-
// [eval] issue595.files: undefined field nam:
28+
// [eval] issue595.files: undefined field: nam:
2929
// ./in.cue:8:20
3030
}
3131
}

0 commit comments

Comments
 (0)