go/hcl
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Define Body.JustAttributes as returning Attributes

Browse Source 
This was missed when updating the previous direct references to
map[string]*Attribute.
This commit is contained in:
Martin Atkins 2017-05-21 15:43:41 -07:00
parent e765ff422a
commit c5df265cd0
5 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
zcl/json/structure.go
View File

@ -125,7 +125,7 @@ func (b *body) PartialContent(schema *zcl.BodySchema) (*zcl.BodyContent, zcl.Bod
// JustAttributes for JSON bodies interprets all properties of the wrapped // JustAttributes for JSON bodies interprets all properties of the wrapped
// JSON object as attributes and returns them. // JSON object as attributes and returns them.
func (b *body) JustAttributes() (map[string]*zcl.Attribute, zcl.Diagnostics) { func (b *body) JustAttributes() (zcl.Attributes, zcl.Diagnostics) {
attrs := make(map[string]*zcl.Attribute) attrs := make(map[string]*zcl.Attribute)
for name, jsonAttr := range b.obj.Attrs { for name, jsonAttr := range b.obj.Attrs {
if _, hidden := b.hiddenAttrs[name]; hidden { if _, hidden := b.hiddenAttrs[name]; hidden {

2
zcl/json/structure_test.go
View File

@ -629,7 +629,7 @@ func TestJustAttributes(t *testing.T) {
// this test focuses on the handling of extraneous attributes. // this test focuses on the handling of extraneous attributes.
tests := []struct { tests := []struct {
src string src string
want map[string]*zcl.Attribute want zcl.Attributes
}{ }{
{ {
`{}`, `{}`,

2
zcl/merged.go
View File

@ -93,7 +93,7 @@ func (mb mergedBodies) PartialContent(schema *BodySchema) (*BodyContent, Body, D
return mb.mergedContent(schema, true) return mb.mergedContent(schema, true)
} }
func (mb mergedBodies) JustAttributes() (map[string]*Attribute, Diagnostics) { func (mb mergedBodies) JustAttributes() (Attributes, Diagnostics) {
attrs := make(map[string]*Attribute) attrs := make(map[string]*Attribute)
var diags Diagnostics var diags Diagnostics

2
zcl/merged_test.go
View File

@ -412,7 +412,7 @@ func (v *testMergedBodiesVictim) PartialContent(schema *BodySchema) (*BodyConten
return content, emptyBody, diags return content, emptyBody, diags
} }
func (v *testMergedBodiesVictim) JustAttributes() (map[string]*Attribute, Diagnostics) { func (v *testMergedBodiesVictim) JustAttributes() (Attributes, Diagnostics) {
attrs := make(map[string]*Attribute) attrs := make(map[string]*Attribute)
rng := Range{ rng := Range{

2
zcl/structure.go
View File

@ -63,7 +63,7 @@ type Body interface {
// //
// Diagnostics may be produced for other reasons too, such as duplicate // Diagnostics may be produced for other reasons too, such as duplicate
// declarations of the same attribute. // declarations of the same attribute.
JustAttributes() (map[string]*Attribute, Diagnostics) JustAttributes() (Attributes, Diagnostics)
// MissingItemRange returns a range that represents where a missing item // MissingItemRange returns a range that represents where a missing item
// might hypothetically be inserted. This is used when producing // might hypothetically be inserted. This is used when producing