Merge branch 'master' into master
Some checks failed
dependabot-automerge / automerge (pull_request) Has been skipped
automerge / automerge (pull_request) Failing after 17s
autoapprove / autoapprove (pull_request) Failing after 31s
lint / lint (pull_request) Successful in 1m5s
test / test (pull_request) Successful in 11m58s

This commit is contained in:
Василий Толстов 2024-12-12 11:42:08 +03:00
commit 62396f149d
2 changed files with 7 additions and 1 deletions

View File

@ -41,8 +41,12 @@ func (c *flagConfig) Options() config.Options {
}
func (c *flagConfig) Init(opts ...options.Option) error {
var err error
for _, o := range opts {
o(&c.opts)
if err = o(&c.opts); err != nil {
return err
}
}
if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail {

View File

@ -325,6 +325,7 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error {
return nil
}
/*
func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
nv, ok := v.Addr().Interface().(*string)
if !ok {
@ -333,6 +334,7 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error {
flag.StringVar(nv, fn, fv, fd)
return nil
}
*/
func getFlagOpts(tf string) (string, string, string) {
var name, desc, def string