internal/diff: use new definitions in test
Change-Id: Ia211b5124fa31a6a04a57d7418e2351e11bb41a2
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/6645
Reviewed-by: Marcel van Lohuizen <mpvl@golang.org>
diff --git a/internal/diff/diff.go b/internal/diff/diff.go
index 6c8689a..b11946b 100644
--- a/internal/diff/diff.go
+++ b/internal/diff/diff.go
@@ -110,11 +110,7 @@
if f.IsOptional {
str += "?"
}
- if f.IsDefinition {
- str += " ::"
- } else {
- str += ":"
- }
+ str += ":"
return str
}
diff --git a/internal/diff/diff_test.go b/internal/diff/diff_test.go
index 775c7c3..c994bd6 100644
--- a/internal/diff/diff_test.go
+++ b/internal/diff/diff_test.go
@@ -254,38 +254,38 @@
}, {
name: "optional and definitions",
x: `{
- s :: {
- a :: 1
+ #s: {
+ #a: 1
b: 2
}
o?: 3
- od? :: 1
+ #od?: 1
oc?: 5
}`,
y: `{
- s :: {
+ #s: {
a: 2
- b :: 2
+ #b: 2
}
o?: 4
- od :: 1
- oc? :: 5
+ #od: 1
+ #oc?: 5
}
`,
kind: Modified,
diff: ` {
- s :: {
-- a :: 1
-+ a: 2
+ #s: {
+- #a: 1
- b: 2
-+ b :: 2
++ a: 2
++ #b: 2
}
- o?: 3
+ o?: 4
-- od? :: 1
-+ od :: 1
+- #od?: 1
++ #od: 1
- oc?: 5
-+ oc? :: 5
++ #oc?: 5
}
`,
}, {
@@ -306,10 +306,10 @@
`,
}, {
x: `
- Directory :: {
+ #Directory: {
{
// Directory from another directory (e.g. subdirectory)
- from: Directory
+ from: #Directory
} | {
// Reference to remote directory
ref: string
@@ -321,10 +321,10 @@
}
`,
y: `
- Directory :: {
+ #Directory: {
{
// Directory from another directory (e.g. subdirectory)
- from: Directory
+ from: #Directory
} | {
// Reference to remote directory
ref: string
@@ -338,10 +338,10 @@
profile: Final,
}, {
x: `
- Directory :: {
+ #Directory: {
{
// Directory from another directory (e.g. subdirectory)
- from: Directory
+ from: #Directory
} | {
// Reference to remote directory
ref: string
@@ -353,10 +353,10 @@
}
`,
y: `
- Directory :: {
+ #Directory: {
{
// Directory from another directory (e.g. subdirectory)
- from: Directory
+ from: #Directory
} | {
// Reference to remote directory
ref: string
