Skip to content

Commit

Permalink
Remove unused funcs and vars
Browse files Browse the repository at this point in the history
Signed-off-by: Bogdan Drutu <bogdandrutu@gmail.com>
  • Loading branch information
bogdandrutu committed Nov 6, 2020
1 parent 91eabc8 commit 89a8653
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 35 deletions.
26 changes: 0 additions & 26 deletions cmd/pdatagen/internal/base_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -124,8 +124,6 @@ type baseField interface {
generateSetWithTestValue(sb *strings.Builder)

generateCopyToValue(sb *strings.Builder)

generateIsEmpty(sb *strings.Builder)
}

type sliceField struct {
Expand All @@ -134,10 +132,6 @@ type sliceField struct {
returnSlice *sliceStruct
}

func (sf *sliceField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\tms." + sf.fieldName + "().IsEmpty()")
}

func (sf *sliceField) generateAccessors(ms baseStruct, sb *strings.Builder) {
sb.WriteString(os.Expand(accessorSliceTemplate, func(name string) string {
switch name {
Expand Down Expand Up @@ -231,10 +225,6 @@ func (mf *messagePtrField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\tms." + mf.fieldName + "().CopyTo(dest." + mf.fieldName + "())")
}

func (mf *messagePtrField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\tms." + mf.fieldName + "().IsEmpty())")
}

var _ baseField = (*messagePtrField)(nil)

type messageValueField struct {
Expand Down Expand Up @@ -287,10 +277,6 @@ func (mf *messageValueField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\tms." + mf.fieldName + "().CopyTo(dest." + mf.fieldName + "())")
}

func (mf *messageValueField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\tms." + mf.fieldName + "().IsEmpty())")
}

var _ baseField = (*messageValueField)(nil)

type primitiveField struct {
Expand Down Expand Up @@ -345,10 +331,6 @@ func (pf *primitiveField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\tdest.Set" + pf.fieldName + "(ms." + pf.fieldName + "())")
}

func (pf *primitiveField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\tms." + pf.fieldName + "() == " + pf.defaultVal)
}

var _ baseField = (*primitiveField)(nil)

// Types that has defined a custom type (e.g. "type TimestampUnixNano uint64")
Expand Down Expand Up @@ -414,10 +396,6 @@ func (ptf *primitiveTypedField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\tdest.Set" + ptf.fieldName + "(ms." + ptf.fieldName + "())")
}

func (ptf *primitiveTypedField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\tms." + ptf.fieldName + "() == " + ptf.defaultVal)
}

var _ baseField = (*primitiveTypedField)(nil)

// oneofField is used in case where the proto defines an "oneof".
Expand All @@ -442,8 +420,4 @@ func (one oneofField) generateCopyToValue(sb *strings.Builder) {
sb.WriteString("\t" + one.copyFuncName + "((*ms.orig), (*dest.orig))")
}

func (one oneofField) generateIsEmpty(sb *strings.Builder) {
sb.WriteString("\t true /* oneof */")
}

var _ baseField = (*oneofField)(nil)
2 changes: 0 additions & 2 deletions cmd/pdatagen/internal/base_structs.go
Original file line number Diff line number Diff line change
Expand Up @@ -354,8 +354,6 @@ type ${structName} struct {
orig *${originName}
}
var emptyValue${structName} = ${originName}{}
func new${structName}(orig *${originName}) ${structName} {
return ${structName}{orig: orig}
}
Expand Down
5 changes: 0 additions & 5 deletions consumer/pdata/common.go
Original file line number Diff line number Diff line change
Expand Up @@ -615,11 +615,6 @@ func (am AttributeMap) UpsertBool(k string, v bool) {
}
}

// IsEmpty returns true if the underlying data are equivalent with an empty message.
func (am AttributeMap) IsEmpty() bool {
return len(*am.orig) == 0
}

// Sort sorts the entries in the AttributeMap so two instances can be compared.
// Returns the same instance to allow nicer code like:
// assert.EqualValues(t, expected.Sort(), actual.Sort())
Expand Down
2 changes: 0 additions & 2 deletions consumer/pdata/generated_resource.go

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 89a8653

Please sign in to comment.