enable one more staticcheck check

Replace one append loop with an append, rewriting the comment which was
inside the loop so that it still makes sense.

While here, remove two unused fields which are low hanging fruit.

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

Author: mvdan

Diff for: cue/types_test.go

@@ -2167,11 +2167,9 @@ func TestUnify(t *testing.T) {
 // TestUnify2 is similar to TestUnify, but uses CompileString and Validate.
 func TestUnify2(t *testing.T) {
 	type testCase struct {
-		name   string
-		a      string
-		b      string
-		output string
-		err    bool
+		a   string
+		b   string
+		err bool
 	}
 	testCases := []testCase{{
 		a:   `null | close({})`,

Diff for: internal/core/adt/overlay.go

@@ -242,12 +242,9 @@ func (ctx *overlayContext) cloneNodeContext(n *nodeContext) *nodeContext {
 	// d.cyclicConjuncts = append(d.cyclicConjuncts, n.cyclicConjuncts...)
 
 	if len(n.disjunctions) > 0 {
-		for _, de := range n.disjunctions {
-			// Do not clone cc, as it is identified by underlying. We only need
-			// to clone the cc in disjunctCCs.
-			// de.cloneID.cc = ctx.allocCC(de.cloneID.cc)
-			d.disjunctions = append(d.disjunctions, de)
-		}
+		// Do not clone cc in disjunctions, as it is identified by underlying.
+		// We only need to clone the cc in disjunctCCs.
+		d.disjunctions = append(d.disjunctions, n.disjunctions...)
 		for _, h := range n.disjunctCCs {
 			h.cc = ctx.allocCC(h.cc)
 			d.disjunctCCs = append(d.disjunctCCs, h)

Diff for: internal/core/adt/sched.go

@@ -593,7 +593,7 @@ type task struct {
 	// scheduler.
 	blockedOn      *scheduler
 	blockCondition condition
-	blockStack     []*task // TODO: use; for error reporting.
+	// blockStack     []*task // TODO: use; for error reporting.
 
 	err *Bottom
 

Diff for: staticcheck.conf

@@ -5,6 +5,5 @@ checks = [
   "-SA1019", # use of deprecated APIs
   "-SA4000", # identical expressions in && or || logic
   "-S1008", # simplify if/else to bool expression
-  "-S1011", # simplify loop with append
   "-U1000", # unused code
 ]