internal/cueexperiment: file embedding is always on now

The experiment was added in v0.10.0, and enabled by default in v0.12.0.
The ability to disable the feature is removed for the upcoming v0.14.

Tweak cueexperiment.TestInit to use active experiments too.

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

Author: mvdan

cmd/cue/cmd/help.go

@@ -257,9 +257,6 @@ can be embedded. Embedding is forbidden when outside a module.
 
 Note that embedding CUE files is not supported at this time.
 
-For the time being, embedding support can still be disabled via
-CUE_EXPERIMENT=embed=0.
-
 For more details and discussion, see the proposal linked from
 https://cuelang.org/discussion/3264.
 `[1:],
@@ -303,9 +300,6 @@ If an environment variable is unset or empty, sensible default setting is used.
 		evalv3 (default true)
 			Enable the new CUE evaluator, addressing performance issues
 			and bringing a better disjunction algorithm.
-		embed (default true)
-			Enable support for embedded data files as described in
-			https://cuelang.org/discussion/3264.
 		toposort (default true)
 			Enable topological sorting of struct fields.
 			Provide feedback via https://cuelang.org/issue/3558

cmd/cue/cmd/root.go

@@ -135,12 +135,10 @@ func mkRunE(c *Command, f runFunction) func(*cobra.Command, []string) error {
 		if wasmInterp != nil {
 			opts = append(opts, cuecontext.Interpreter(wasmInterp))
 		}
-		// CUE_EXPERIMENT=embed should probably be obeyed by [cuecontext.New] just like
-		// other flags such as evalv3 or toposort. Currently that causes an import cycle.
+		// Embedding should work with [cuecontext.New] too.
+		// Currently that causes an import cycle.
 		// See: https://cuelang.org/issue/3613
-		if cueexperiment.Flags.Embed {
-			opts = append(opts, cuecontext.Interpreter(embed.New()))
-		}
+		opts = append(opts, cuecontext.Interpreter(embed.New()))
 		c.ctx = cuecontext.New(opts...)
 		// Some init work, such as in internal/filetypes, evaluates CUE by design.
 		// We don't want that work to count towards $CUE_STATS.

cmd/cue/cmd/testdata/script/embed.txtar

@@ -1,4 +1,4 @@
-# Embedding is enabled by default, but it can still be disabled.
+# Embedding can no longer be disabled.
 env CUE_EXPERIMENT=embed=0
 ! exec cue eval
 cmp stderr out/noembed
@@ -151,8 +151,7 @@ language: version: "v0.9.0"
     }
 }
 -- out/noembed --
-no interpreter defined for "embed":
-    ./test.cue:1:1
+cannot parse CUE_EXPERIMENT: cannot change default value of deprecated flag "embed"
 -- out/eval --
 a: {
     x: 34

internal/cueexperiment/exp.go

@@ -15,11 +15,6 @@ var Flags struct {
 	// and bringing better algorithms for disjunctions, closedness, and cycles.
 	EvalV3 bool `envflag:"default:true"`
 
-	// Embed enables support for embedded data files as described in
-	// https://cuelang.org/discussion/3264.
-	// TODO(v0.14): deprecate this flag to forbid disabling this feature.
-	Embed bool `envflag:"default:true"`
-
 	// TopoSort enables topological sorting of struct fields.
 	// Provide feedback via https://cuelang.org/issue/3558.
 	// TODO(v0.14): deprecate this flag to forbid disabling this feature.
@@ -49,6 +44,11 @@ var Flags struct {
 	// to ensure consistency with 32-bit platforms.
 	// This experiment ran from late 2024 to mid 2025.
 	DecodeInt64 bool `envflag:"deprecated,default:true"`
+
+	// Embed enables support for embedded data files as described in
+	// https://cuelang.org/discussion/3264.
+	// This experiment ran from mid 2024 to mid 2025.
+	Embed bool `envflag:"deprecated,default:true"`
 }
 
 // Init initializes Flags. Note: this isn't named "init" because we

internal/cueexperiment/exp_test.go

@@ -8,9 +8,9 @@ import (
 
 func TestInit(t *testing.T) {
 	// This is just a smoke test to make sure it's all wired up OK.
-	t.Setenv("CUE_EXPERIMENT", "evalv3,embed=0")
+	t.Setenv("CUE_EXPERIMENT", "evalv3=0,cmdreferencepkg")
 	err := Init()
 	qt.Assert(t, qt.IsNil(err))
-	qt.Assert(t, qt.IsTrue(Flags.EvalV3))
-	qt.Assert(t, qt.IsFalse(Flags.Embed))
+	qt.Assert(t, qt.IsFalse(Flags.EvalV3))
+	qt.Assert(t, qt.IsTrue(Flags.CmdReferencePkg))
 }