rlp/rlpgen: fix error handling when target type not found (#25547)

jtraglia · web-flow · commit cce7f084388a · 2022-08-19T00:34:57.000+02:00
typ will be nil when lookupStructType returns an error. cfg.Type should be used instead.
diff --git a/rlp/rlpgen/main.go b/rlp/rlpgen/main.go
@@ -106,7 +106,7 @@ func (cfg *Config) process() (code []byte, err error) {
 	// Find the type and generate.
 	typ, err := lookupStructType(pkg.Scope(), cfg.Type)
 	if err != nil {
-		return nil, fmt.Errorf("can't find %s in %s: %v", typ, pkg, err)
+		return nil, fmt.Errorf("can't find %s in %s: %v", cfg.Type, pkg, err)
 	}
 	code, err = bctx.generate(typ, cfg.GenerateEncoder, cfg.GenerateDecoder)
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ func (cfg *Config) process() (code []byte, err error) {`
`106`	`106`	`// Find the type and generate.`
`107`	`107`	`typ, err := lookupStructType(pkg.Scope(), cfg.Type)`
`108`	`108`	`if err != nil {`
`109`		`- return nil, fmt.Errorf("can't find %s in %s: %v", typ, pkg, err)`
	`109`	`+ return nil, fmt.Errorf("can't find %s in %s: %v", cfg.Type, pkg, err)`
`110`	`110`	`}`
`111`	`111`	`code, err = bctx.generate(typ, cfg.GenerateEncoder, cfg.GenerateDecoder)`
`112`	`112`	`if err != nil {`