cmd/cue: actually update the _gen.go.want gengotypes testscript files

We were doing `cmp foo.go foo.go` rather than `cmp foo.go foo.go.want`,
which always succeeded, and caused CUE_UPDATE=1 to not update the
"want" files at all.

Fix that, and update the generated files to actually reflect
what we do.

This stumped and annoyed me enough that I also sent a change to
testscript to make such silly mistakes an error:
rogpeppe/go-internal#295

Signed-off-by: Daniel Martí <[email protected]>
Change-Id: If24c6e2439a828c9da7cf3028c61126e899bd96c
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1213229
Unity-Result: CUE porcuepine <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>
Reviewed-by: Roger Peppe <[email protected]>

Author: mvdan

Diff for: cmd/cue/cmd/testdata/script/exp_gengotypes.txtar

@@ -12,9 +12,9 @@ stdout -count=5 'cue_types_.*gen\.go.want$'
 ! stdout 'unused.*'${/@R}gen_go.cue
 
 # Check the contents of the generated files.
-cmp root/cue_types_gen.go                           root/cue_types_gen.go
-cmp imported/subinst/cue_types_imported_gen.go      imported/subinst/cue_types_imported_gen.go
-cmp imported/indirect/cue_types_gen.go              imported/indirect/cue_types_gen.go
+cmp root/cue_types_gen.go                           root/cue_types_gen.go.want
+cmp imported/subinst/cue_types_imported_gen.go      imported/subinst/cue_types_imported_gen.go.want
+cmp imported/indirect/cue_types_gen.go              imported/indirect/cue_types_gen.go.want
 cmp imported/multipkg/cue_types_multipkg_one_gen.go imported/multipkg/cue_types_multipkg_one_gen.go.want
 cmp imported/multipkg/cue_types_multipkg_two_gen.go imported/multipkg/cue_types_multipkg_two_gen.go.want
 
@@ -572,9 +572,9 @@ type RemoteStructs struct {
 
 	UpperDef imported.UpperDef `json:"UpperDef,omitempty"`
 
-	MultiOne multipkg_one.One `json:"multiOne,omitempty"`
+	MultiOne multipkg.One `json:"multiOne,omitempty"`
 
-	MultiTwo multipkg_two.Two `json:"multiTwo,omitempty"`
+	MultiTwo multipkg.Two `json:"multiTwo,omitempty"`
 }
 
 type Types struct {
@@ -648,8 +648,6 @@ type Root struct {
 
 		Required int64 `json:"required,omitempty"`
 
-		QuotedField string `json:"quoted-field"`
-
 		// Optional types are represented as *T in Go if they are structs.
 		Optional int64 `json:"optional,omitempty"`
 
@@ -714,6 +712,8 @@ type Root struct {
 	MustEqual1 int64 `json:"mustEqual1,omitempty"`
 
 	MustEqual2 any/* TODO: IncompleteKind: _|_ */ `json:"mustEqual2,omitempty"`
+
+	QuotedField string `json:"quoted-field,omitempty"`
 }
 
 type EmbeddedStruct struct {
@@ -724,8 +724,14 @@ type EmbeddedStruct struct {
 
 type AttrChangedName int64
 
+type AttrChangedNameEmbed struct {
+	Field int64 `json:"field,omitempty"`
+}
+
 type AttrType constant.Kind
 
+type AttrTypeEmbed constant.Kind
+
 type Root_innerStruct struct {
 	InnerStructField int64 `json:"innerStructField,omitempty"`
 }