diff options
| author | Daniel Martí <mvdan@mvdan.cc> | 2018-04-05 21:28:06 +0100 |
|---|---|---|
| committer | Daniel Martí <mvdan@mvdan.cc> | 2018-04-06 13:59:29 +0000 |
| commit | 284c53498fd4f52967067eb7c2d0102467980155 (patch) | |
| tree | 321207cb1278ad76087c506bf063d01eb5417cf8 /src/cmd/internal/objfile | |
| parent | fd9d2898bd3983baa94fd2100602b06d8c487466 (diff) | |
| download | go-284c53498fd4f52967067eb7c2d0102467980155.tar.xz | |
cmd: some semi-automated cleanups
* Remove some redundant returns
* Replace HasPrefix with TrimPrefix
* Remove some obviously dead code
Passes toolstash -cmp on std cmd.
Change-Id: Ifb0d70a45cbb8a8553758a8c4878598b7fe932bc
Reviewed-on: https://go-review.googlesource.com/105017
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
Diffstat (limited to 'src/cmd/internal/objfile')
| -rw-r--r-- | src/cmd/internal/objfile/disasm.go | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/cmd/internal/objfile/disasm.go b/src/cmd/internal/objfile/disasm.go index 6ddf8d6cd7..ef8ef4324b 100644 --- a/src/cmd/internal/objfile/disasm.go +++ b/src/cmd/internal/objfile/disasm.go @@ -141,9 +141,7 @@ func (fc *FileCache) Line(filename string, line int) ([]byte, error) { // Clean filenames returned by src.Pos.SymFilename() // or src.PosBase.SymFilename() removing // the leading src.FileSymPrefix. - if strings.HasPrefix(filename, src.FileSymPrefix) { - filename = filename[len(src.FileSymPrefix):] - } + filename = strings.TrimPrefix(filename, src.FileSymPrefix) // Expand literal "$GOROOT" rewrited by obj.AbsFile() filename = filepath.Clean(os.ExpandEnv(filename)) |