remove kr/fs dependency

This commit is contained in:
Quentin Perez 2016-12-14 10:33:08 +01:00
parent 2ae75f6702
commit b4d1f1f9bb
No known key found for this signature in database
GPG Key ID: 7C6DCB859CF22206

View File

@ -11,7 +11,6 @@ import (
"github.com/golang/protobuf/protoc-gen-go/descriptor" "github.com/golang/protobuf/protoc-gen-go/descriptor"
"github.com/golang/protobuf/protoc-gen-go/plugin" "github.com/golang/protobuf/protoc-gen-go/plugin"
"github.com/kr/fs"
"github.com/moul/funcmap" "github.com/moul/funcmap"
) )
@ -53,32 +52,27 @@ func NewGenericTemplateBasedEncoder(templateDir string, service *descriptor.Serv
func (e *GenericTemplateBasedEncoder) templates() ([]string, error) { func (e *GenericTemplateBasedEncoder) templates() ([]string, error) {
filenames := []string{} filenames := []string{}
walker := fs.Walk(e.templateDir) err := filepath.Walk(e.templateDir, func(path string, info os.FileInfo, err error) error {
for walker.Step() {
if err := walker.Err(); err != nil {
return nil, err
}
if walker.Stat().IsDir() {
continue
}
if filepath.Ext(walker.Path()) != ".tmpl" {
continue
}
rel, err := filepath.Rel(e.templateDir, walker.Path())
if err != nil { if err != nil {
return nil, err return err
}
if info.IsDir() {
return nil
}
if filepath.Ext(path) != ".tmpl" {
return nil
}
rel, err := filepath.Rel(e.templateDir, path)
if err != nil {
return err
} }
if e.debug { if e.debug {
log.Printf("new template: %q", rel) log.Printf("new template: %q", rel)
} }
filenames = append(filenames, rel) filenames = append(filenames, rel)
} return nil
})
return filenames, nil return filenames, err
} }
func (e *GenericTemplateBasedEncoder) genAst(templateFilename string) (*Ast, error) { func (e *GenericTemplateBasedEncoder) genAst(templateFilename string) (*Ast, error) {