Skip to content

Commit dff8ef3

Browse files
authored
Merge branch 'golang:master' into master
2 parents 34b3199 + fb020a0 commit dff8ef3

File tree

186 files changed

+3613
-2852
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+3613
-2852
lines changed

cmd/deadcode/deadcode.go

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ import (
3333
"golang.org/x/tools/go/packages"
3434
"golang.org/x/tools/go/ssa"
3535
"golang.org/x/tools/go/ssa/ssautil"
36+
"golang.org/x/tools/internal/typesinternal"
3637
)
3738

3839
//go:embed doc.go
@@ -384,11 +385,8 @@ func prettyName(fn *ssa.Function, qualified bool) string {
384385

385386
// method receiver?
386387
if recv := fn.Signature.Recv(); recv != nil {
387-
t := recv.Type()
388-
if ptr, ok := t.(*types.Pointer); ok {
389-
t = ptr.Elem()
390-
}
391-
buf.WriteString(t.(*types.Named).Obj().Name())
388+
_, named := typesinternal.ReceiverNamed(recv)
389+
buf.WriteString(named.Obj().Name())
392390
buf.WriteByte('.')
393391
}
394392

cmd/getgo/.dockerignore

Lines changed: 0 additions & 5 deletions
This file was deleted.

cmd/getgo/.gitignore

Lines changed: 0 additions & 2 deletions
This file was deleted.

cmd/getgo/Dockerfile

Lines changed: 0 additions & 20 deletions
This file was deleted.

cmd/getgo/LICENSE

Lines changed: 0 additions & 27 deletions
This file was deleted.

cmd/getgo/README.md

Lines changed: 0 additions & 71 deletions
This file was deleted.

cmd/getgo/download.go

Lines changed: 0 additions & 190 deletions
This file was deleted.

cmd/getgo/download_test.go

Lines changed: 0 additions & 36 deletions
This file was deleted.

0 commit comments

Comments
 (0)