remove markers package changes

Signed-off-by: Bryce Palmer <bpalmer@redhat.com>

Author: everettraven

pkg/analysis/helpers/markers/analyzer.go

@@ -81,15 +81,15 @@ func (m *markers) TypeMarkers(typ *ast.TypeSpec) MarkerSet {
 }
 
 func (m *markers) insertFieldMarkers(field *ast.Field, ms MarkerSet) {
-	m.fieldMarkers[field] = mergeMarkerSets(m.fieldMarkers[field], ms)
+	m.fieldMarkers[field] = ms
 }
 
 func (m *markers) insertStructMarkers(sTyp *ast.StructType, ms MarkerSet) {
-	m.structMarkers[sTyp] = mergeMarkerSets(m.structMarkers[sTyp], ms)
+	m.structMarkers[sTyp] = ms
 }
 
 func (m *markers) insertTypeMarkers(typ *ast.TypeSpec, ms MarkerSet) {
-	m.typeMarkers[typ] = mergeMarkerSets(m.typeMarkers[typ], ms)
+	m.typeMarkers[typ] = ms
 }
 
 // Analyzer is the analyzer for the markers package.
@@ -328,18 +328,6 @@ func NewMarkerSet(markers ...Marker) MarkerSet {
 	return ms
 }
 
-func mergeMarkerSets(markerSets ...MarkerSet) MarkerSet {
-	ms := make(MarkerSet)
-
-	for _, markerSet := range markerSets {
-		for _, markers := range markerSet {
-			ms.Insert(markers...)
-		}
-	}
-
-	return ms
-}
-
 // Insert adds the given markers to the MarkerSet.
 // If any markers have the same value, the latter marker in the list
 // will take precedence, no duplication checks are implemented.