cue: remove uses of log.Panicf

Fixes #174. Change-Id: I4858443a8e347add551405c59332f3bcdb4a60c1 Reviewed-on: https://cue-review.googlesource.com/c/cue/+/4021 Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
cuelang · Nov 16, 2019 · 030b9b7 · 030b9b7
1 parent 31cd2b7
commit 030b9b7
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/cue/build/import.go b/cue/build/import.go
@@ -15,7 +15,6 @@
 package build
 
 import (
-	"log"
 	"sort"
 	"strconv"
 
@@ -64,8 +63,11 @@ func (inst *Instance) complete() errors.Error {
 				quoted := spec.Path.Value
 				path, err := strconv.Unquote(quoted)
 				if err != nil {
-					// TODO: remove panic
-					log.Panicf("%s: parser returned invalid quoted string: <%s>", f.Filename, quoted)
+					inst.Err = errors.Append(inst.Err,
+						errors.Newf(
+							spec.Path.Pos(),
+							"%s: parser returned invalid quoted string: <%s>",
+							f.Filename, quoted))
 				}
 				imported[path] = append(imported[path], spec.Pos())
 			}

diff --git a/cue/load/import.go b/cue/load/import.go
@@ -16,7 +16,6 @@ package load
 
 import (
 	"bytes"
-	"log"
 	"os"
 	"path/filepath"
 	"sort"
@@ -396,7 +395,10 @@ func (fp *fileProcessor) add(pos token.Pos, root, path string, mode importMode)
 			quoted := spec.Path.Value
 			path, err := strconv.Unquote(quoted)
 			if err != nil {
-				log.Panicf("%s: parser returned invalid quoted string: <%s>", filename, quoted)
+				badFile(errors.Newf(
+					spec.Path.Pos(),
+					"%s: parser returned invalid quoted string: <%s>", filename, quoted,
+				))
 			}
 			if !isTest || fp.c.Tests {
 				fp.imported[path] = append(fp.imported[path], spec.Pos())