pkg/encoding/json: fix validator

cuelang.org/cl/1208701 introduced a bug
where the call to Validate would refer to the
original schema value, instead of the unified
result. This could lead to spurious errors.

Fixes #3932

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I03420535698b803c4f39a1a250c87243fdbb62be
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1215528
Unity-Result: CUE porcuepine <[email protected]>
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: mpvl

pkg/encoding/json/manual.go

@@ -148,8 +148,8 @@ func validate(c *adt.OpContext, b []byte, v pkg.Schema) (bool, error) {
 	}
 
 	vx := adt.Unify(c, value.Vertex(v2), value.Vertex(v))
-	x := value.Make(c, vx)
-	if err := x.Err(); err != nil {
+	v = value.Make(c, vx)
+	if err := v.Err(); err != nil {
 		return false, err
 	}
 

pkg/encoding/json/testdata/gen.txtar

@@ -152,11 +152,7 @@ validate: {
 	}
 }
 issue3932: {
-	f: json.Validate({
-		name!: string
-	}) & json.Marshal({
-		name: "foo"
-	})
+	f: "{\"name\":\"foo\"}"
 }
 valid: {
 	t1: {