File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -21,12 +21,14 @@ package main
2121
2222import (
2323 "bytes"
24+ "errors"
2425 "flag"
2526 "fmt"
2627 "go/ast"
2728 "go/format"
2829 "go/parser"
2930 "go/token"
31+ "io/fs"
3032 "log"
3133 "os"
3234 "slices"
@@ -40,7 +42,7 @@ const (
4042
4143var (
4244 verbose = flag .Bool ("v" , false , "Print verbose log messages" )
43- check = flag .Bool ("check" , false , "check whether generated files are up to date" )
45+ check = flag .Bool ("check" , false , "Check whether generated files are up to date" )
4446
4547 sourceTmpl = template .Must (template .New ("source" ).Parse (source ))
4648 testTmpl = template .Must (template .New ("test" ).Parse (test ))
@@ -242,11 +244,10 @@ func (t *templateData) dump() error {
242244 logf ("Checking %v..." , filename )
243245 old , err := os .ReadFile (filename )
244246 if err != nil {
245- if os .IsNotExist (err ) {
246- return fmt .Errorf ("Missing file: %v\n " , t .filename )
247- } else {
248- return err
247+ if errors .Is (err , fs .ErrNotExist ) {
248+ return fmt .Errorf ("Missing file: %v\n " , filename )
249249 }
250+ return err
250251 }
251252
252253 if ! bytes .Equal (old , clean ) {
Original file line number Diff line number Diff line change @@ -14,12 +14,14 @@ package main
1414
1515import (
1616 "bytes"
17+ "errors"
1718 "flag"
1819 "fmt"
1920 "go/ast"
2021 "go/format"
2122 "go/parser"
2223 "go/token"
24+ "io/fs"
2325 "log"
2426 "os"
2527 "reflect"
@@ -35,7 +37,7 @@ const (
3537
3638var (
3739 verbose = flag .Bool ("v" , false , "Print verbose log messages" )
38- check = flag .Bool ("check" , false , "check whether generated files are up to date" )
40+ check = flag .Bool ("check" , false , "Check whether generated files are up to date" )
3941
4042 sourceTmpl = template .Must (template .New ("source" ).Funcs (template.FuncMap {
4143 "hasPrefix" : strings .HasPrefix ,
@@ -608,11 +610,10 @@ func (t *templateData) dump() error {
608610 logf ("Checking %v..." , filename )
609611 old , err := os .ReadFile (filename )
610612 if err != nil {
611- if os .IsNotExist (err ) {
612- return fmt .Errorf ("Missing file: %v\n " , t .filename )
613- } else {
614- return err
613+ if errors .Is (err , fs .ErrNotExist ) {
614+ return fmt .Errorf ("Missing file: %v\n " , filename )
615615 }
616+ return err
616617 }
617618
618619 if ! bytes .Equal (old , clean ) {
Original file line number Diff line number Diff line change @@ -17,12 +17,14 @@ package main
1717
1818import (
1919 "bytes"
20+ "errors"
2021 "flag"
2122 "fmt"
2223 "go/ast"
2324 "go/format"
2425 "go/parser"
2526 "go/token"
27+ "io/fs"
2628 "log"
2729 "os"
2830 "strings"
@@ -37,7 +39,7 @@ const (
3739
3840var (
3941 verbose = flag .Bool ("v" , false , "Print verbose log messages" )
40- check = flag .Bool ("check" , false , "check whether generated files are up to date" )
42+ check = flag .Bool ("check" , false , "Check whether generated files are up to date" )
4143
4244 // skipStructMethods lists "struct.method" combos to skip.
4345 skipStructMethods = map [string ]bool {}
@@ -362,11 +364,10 @@ func (t *templateData) dump() error {
362364 logf ("Checking %v..." , t .filename )
363365 old , err := os .ReadFile (t .filename )
364366 if err != nil {
365- if os . IsNotExist (err ) {
367+ if errors . Is (err , fs . ErrNotExist ) {
366368 return fmt .Errorf ("Missing file: %v\n " , t .filename )
367- } else {
368- return err
369369 }
370+ return err
370371 }
371372
372373 if ! bytes .Equal (old , clean ) {
You can’t perform that action at this time.
0 commit comments