Skip to content

Commit c781f98

Browse files
committed
(unrelated tidy up) resolveTypeAlias not needed
`types.Unalias` already does the same thing
1 parent 228c45a commit c781f98

File tree

1 file changed

+2
-10
lines changed

1 file changed

+2
-10
lines changed

go/extractor/extractor.go

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1582,18 +1582,10 @@ func isAlias(tp types.Type) bool {
15821582
return ok
15831583
}
15841584

1585-
// If the given type is a type alias, this function resolves it to its underlying type.
1586-
func resolveTypeAlias(tp types.Type) types.Type {
1587-
if isAlias(tp) {
1588-
return types.Unalias(tp) // tp.Underlying()
1589-
}
1590-
return tp
1591-
}
1592-
15931585
// extractType extracts type information for `tp` and returns its associated label;
15941586
// types are only extracted once, so the second time `extractType` is invoked it simply returns the label
15951587
func extractType(tw *trap.Writer, tp types.Type) trap.Label {
1596-
tp = resolveTypeAlias(tp)
1588+
tp = types.Unalias(tp)
15971589
lbl, exists := getTypeLabel(tw, tp)
15981590
if !exists {
15991591
var kind int
@@ -1771,7 +1763,7 @@ func extractType(tw *trap.Writer, tp types.Type) trap.Label {
17711763
// is constructed from their globally unique ID. This prevents cyclic type keys
17721764
// since type recursion in Go always goes through defined types.
17731765
func getTypeLabel(tw *trap.Writer, tp types.Type) (trap.Label, bool) {
1774-
tp = resolveTypeAlias(tp)
1766+
tp = types.Unalias(tp)
17751767
lbl, exists := tw.Labeler.TypeLabels[tp]
17761768
if !exists {
17771769
switch tp := tp.(type) {

0 commit comments

Comments
 (0)