From ffdb5121f49e16e4f82f63cb034452881a77a91d Mon Sep 17 00:00:00 2001 From: Alexander Wang Date: Thu, 13 Jul 2023 08:37:22 -0700 Subject: [PATCH] err msg --- d2compiler/compile_test.go | 2 +- d2ir/compile.go | 2 +- .../d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/d2compiler/compile_test.go b/d2compiler/compile_test.go index 15ed52962..33336b247 100644 --- a/d2compiler/compile_test.go +++ b/d2compiler/compile_test.go @@ -3841,7 +3841,7 @@ z: { ...${x} c } -`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite`) +`, `d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite`) }, }, { diff --git a/d2ir/compile.go b/d2ir/compile.go index fb9ca598e..2f28ce9b6 100644 --- a/d2ir/compile.go +++ b/d2ir/compile.go @@ -157,7 +157,7 @@ func (c *compiler) resolveSubstitutions(varsStack []*Map, node Node) { } if box.Substitution.Spread { if resolvedField.Composite == nil { - c.errorf(box.Substitution, "cannot spread non-composite into composite") + c.errorf(box.Substitution, "cannot spread non-composite") continue } switch n := node.(type) { diff --git a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json index b713c683f..85b10a3ce 100644 --- a/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json +++ b/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.exp.json @@ -4,7 +4,7 @@ "errs": [ { "range": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2,5:2:26-5:9:33", - "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite into composite" + "errmsg": "d2/testdata/d2compiler/TestCompile2/vars/errors/spread-non-map.d2:6:3: cannot spread non-composite" } ] }