mirror of
https://github.com/golang/go.git
synced 2025-12-08 06:10:04 +00:00
all: update references to symbols moved from os to io/fs
The old os references are still valid, but update our code to reflect best practices and get used to the new locations. Code compiled with the bootstrap toolchain (cmd/asm, cmd/dist, cmd/compile, debug/elf) must remain Go 1.4-compatible and is excluded. For #41190. Change-Id: I8f9526977867c10a221e2f392f78d7dec073f1bd Reviewed-on: https://go-review.googlesource.com/c/go/+/243907 Trust: Russ Cox <rsc@golang.org> Run-TryBot: Russ Cox <rsc@golang.org> TryBot-Result: Go Bot <gobot@golang.org> Reviewed-by: Rob Pike <r@golang.org>
This commit is contained in:
parent
d4da735091
commit
7bb721b938
115 changed files with 529 additions and 450 deletions
|
|
@ -16,8 +16,8 @@ import (
|
|||
"go/printer"
|
||||
"go/token"
|
||||
"io"
|
||||
"io/fs"
|
||||
"log"
|
||||
"os"
|
||||
"path/filepath"
|
||||
"strings"
|
||||
"unicode"
|
||||
|
|
@ -129,11 +129,10 @@ func (pkg *Package) Fatalf(format string, args ...interface{}) {
|
|||
// parsePackage turns the build package we found into a parsed package
|
||||
// we can then use to generate documentation.
|
||||
func parsePackage(writer io.Writer, pkg *build.Package, userPath string) *Package {
|
||||
fs := token.NewFileSet()
|
||||
// include tells parser.ParseDir which files to include.
|
||||
// That means the file must be in the build package's GoFiles or CgoFiles
|
||||
// list only (no tag-ignored files, tests, swig or other non-Go files).
|
||||
include := func(info os.FileInfo) bool {
|
||||
include := func(info fs.FileInfo) bool {
|
||||
for _, name := range pkg.GoFiles {
|
||||
if name == info.Name() {
|
||||
return true
|
||||
|
|
@ -146,7 +145,8 @@ func parsePackage(writer io.Writer, pkg *build.Package, userPath string) *Packag
|
|||
}
|
||||
return false
|
||||
}
|
||||
pkgs, err := parser.ParseDir(fs, pkg.Dir, include, parser.ParseComments)
|
||||
fset := token.NewFileSet()
|
||||
pkgs, err := parser.ParseDir(fset, pkg.Dir, include, parser.ParseComments)
|
||||
if err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
|
|
@ -203,7 +203,7 @@ func parsePackage(writer io.Writer, pkg *build.Package, userPath string) *Packag
|
|||
typedValue: typedValue,
|
||||
constructor: constructor,
|
||||
build: pkg,
|
||||
fs: fs,
|
||||
fs: fset,
|
||||
}
|
||||
p.buf.pkg = p
|
||||
return p
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue