From d574f75d23696a75f133fd98c7ec2d6989f6dd50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Mart=C3=AD?= Date: Fri, 10 Apr 2026 14:20:37 +0100 Subject: [PATCH] internal: remove cuetest.Chunker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was only used by the kubernetes tutorial deleted in mid 2024. Remove cuetxtar.EvalV2 while here too, as it's also unused now. Signed-off-by: Daniel Martí Change-Id: I6949f4ae1ed741654c514ec871f057d120d3d0d4 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1235343 Unity-Result: CUE porcuepine Reviewed-by: Roger Peppe TryBot-Result: CUEcueckoo --- internal/cuetest/chunker.go | 73 ------------------------------------- internal/cuetxtar/txtar.go | 6 --- 2 files changed, 79 deletions(-) delete mode 100644 internal/cuetest/chunker.go diff --git a/internal/cuetest/chunker.go b/internal/cuetest/chunker.go deleted file mode 100644 index edcbb1bc6..000000000 --- a/internal/cuetest/chunker.go +++ /dev/null @@ -1,73 +0,0 @@ -// Copyright 2019 CUE Authors -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. - -package cuetest - -import ( - "bytes" - "testing" -) - -// A Chunker is used to find segments in text. -type Chunker struct { - t *testing.T - b []byte - s []byte - p int -} - -// NewChunker returns a new chunker. -func NewChunker(t *testing.T, b []byte) *Chunker { - return &Chunker{t: t, b: b} -} - -// Next finds the first occurrence from the current scan position of beg, -// records the segment from that position until the first occurrence of end -// and then updates the current position. It reports whether a segment enclosed -// by beg and end can be found. -func (c *Chunker) Next(beg, end string) bool { - if !c.Find(beg) { - return false - } - if !c.Find(end) { - c.t.Fatalf("quotes at position %d not terminated", c.p) - } - return true -} - -// Text returns the text segment captured by the last call to Next or Find. -func (c *Chunker) Text() string { - return string(c.s) -} - -// Bytes returns the segment captured by the last call to Next or Find. -func (c *Chunker) Bytes() []byte { - return c.s -} - -// Find searches for key from the current position and sets the current segment -// to the text from current position up till the key's position. If successful, -// the position is updated to point directly after the occurrence of key. -func (c *Chunker) Find(key string) bool { - p := bytes.Index(c.b, []byte(key)) - if p == -1 { - c.s = c.b - return false - } - c.p += p + len(key) - b := c.b - c.s = b[:p] - c.b = b[p+len(key):] - return true -} diff --git a/internal/cuetxtar/txtar.go b/internal/cuetxtar/txtar.go index 618e768ef..df685fc0b 100644 --- a/internal/cuetxtar/txtar.go +++ b/internal/cuetxtar/txtar.go @@ -46,12 +46,6 @@ import ( "golang.org/x/tools/txtar" ) -// We are removing any references to evalv2 in the testing infrastructure. -// However, in the evaluator test, we will keep the evalv2 outputs around for -// a while to be able to compare the outputs of the two versions. -// TODO: at some point we should promote evalv3 to the default version. -const EvalV2 = "v2" - // A TxTarTest represents a test run that process all CUE tests in the txtar // format rooted in a given directory. See the [Test] documentation for // more details. -- 2.51.2