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
				
			
		
		
	
	
				
					
				
			
		
			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:
		
							
								
								
									
										6
									
								
								flag.go
									
									
									
									
									
								
							
							
						
						
									
										6
									
								
								flag.go
									
									
									
									
									
								
							| @@ -41,8 +41,12 @@ func (c *flagConfig) Options() config.Options { | |||||||
| } | } | ||||||
|  |  | ||||||
| func (c *flagConfig) Init(opts ...options.Option) error { | func (c *flagConfig) Init(opts ...options.Option) error { | ||||||
|  | 	var err error | ||||||
|  |  | ||||||
| 	for _, o := range opts { | 	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 { | 	if err := config.DefaultBeforeInit(c.opts.Context, c); err != nil && !c.opts.AllowFail { | ||||||
|   | |||||||
							
								
								
									
										2
									
								
								util.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								util.go
									
									
									
									
									
								
							| @@ -325,6 +325,7 @@ func (c *flagConfig) flagFloat64(v reflect.Value, fn, fv, fd string) error { | |||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
|  |  | ||||||
|  | /* | ||||||
| func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error { | func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error { | ||||||
| 	nv, ok := v.Addr().Interface().(*string) | 	nv, ok := v.Addr().Interface().(*string) | ||||||
| 	if !ok { | 	if !ok { | ||||||
| @@ -333,6 +334,7 @@ func (c *flagConfig) flagStringSlice(v reflect.Value, fn, fv, fd string) error { | |||||||
| 	flag.StringVar(nv, fn, fv, fd) | 	flag.StringVar(nv, fn, fv, fd) | ||||||
| 	return nil | 	return nil | ||||||
| } | } | ||||||
|  | */ | ||||||
|  |  | ||||||
| func getFlagOpts(tf string) (string, string, string) { | func getFlagOpts(tf string) (string, string, string) { | ||||||
| 	var name, desc, def string | 	var name, desc, def string | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user