mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 16:12:24 -05:00 
			
		
		
		
	[chore]: Bump github.com/gin-contrib/cors from 1.4.0 to 1.5.0 (#2388)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								e4e0a5e3f6
							
						
					
				
			
			
				commit
				
					
						66b77acb1c
					
				
			
		
					 169 changed files with 173005 additions and 56262 deletions
				
			
		
							
								
								
									
										3
									
								
								vendor/github.com/pelletier/go-toml/v2/.goreleaser.yaml
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/pelletier/go-toml/v2/.goreleaser.yaml
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -18,6 +18,7 @@ builds: | |||
|       - linux_amd64 | ||||
|       - linux_arm64 | ||||
|       - linux_arm | ||||
|       - linux_riscv64 | ||||
|       - windows_amd64 | ||||
|       - windows_arm64 | ||||
|       - windows_arm | ||||
|  | @ -37,6 +38,7 @@ builds: | |||
|       - linux_amd64 | ||||
|       - linux_arm64 | ||||
|       - linux_arm | ||||
|       - linux_riscv64 | ||||
|       - windows_amd64 | ||||
|       - windows_arm64 | ||||
|       - windows_arm | ||||
|  | @ -55,6 +57,7 @@ builds: | |||
|     targets: | ||||
|       - linux_amd64 | ||||
|       - linux_arm64 | ||||
|       - linux_riscv64 | ||||
|       - linux_arm | ||||
|       - windows_amd64 | ||||
|       - windows_arm64 | ||||
|  |  | |||
							
								
								
									
										3
									
								
								vendor/github.com/pelletier/go-toml/v2/LICENSE
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										3
									
								
								vendor/github.com/pelletier/go-toml/v2/LICENSE
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -1,6 +1,7 @@ | |||
| The MIT License (MIT) | ||||
| 
 | ||||
| Copyright (c) 2013 - 2022 Thomas Pelletier, Eric Anderton | ||||
| go-toml v2 | ||||
| Copyright (c) 2021 - 2023 Thomas Pelletier | ||||
| 
 | ||||
| Permission is hereby granted, free of charge, to any person obtaining a copy | ||||
| of this software and associated documentation files (the "Software"), to deal | ||||
|  |  | |||
							
								
								
									
										44
									
								
								vendor/github.com/pelletier/go-toml/v2/README.md
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										44
									
								
								vendor/github.com/pelletier/go-toml/v2/README.md
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -45,16 +45,15 @@ to check for typos. [See example in the documentation][strict]. | |||
| 
 | ||||
| ### Contextualized errors | ||||
| 
 | ||||
| When most decoding errors occur, go-toml returns [`DecodeError`][decode-err]), | ||||
| When most decoding errors occur, go-toml returns [`DecodeError`][decode-err], | ||||
| which contains a human readable contextualized version of the error. For | ||||
| example: | ||||
| 
 | ||||
| ``` | ||||
| 2| key1 = "value1" | ||||
| 3| key2 = "missing2" | ||||
|  | ~~~~ missing field | ||||
| 4| key3 = "missing3" | ||||
| 5| key4 = "value4" | ||||
| 1| [server] | ||||
| 2| path = 100 | ||||
|  |        ~~~ cannot decode TOML integer into struct field toml_test.Server.Path of type string | ||||
| 3| port = 50 | ||||
| ``` | ||||
| 
 | ||||
| [decode-err]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#DecodeError | ||||
|  | @ -73,6 +72,26 @@ representation. | |||
| [tlt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalTime | ||||
| [tldt]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#LocalDateTime | ||||
| 
 | ||||
| ### Commented config | ||||
| 
 | ||||
| Since TOML is often used for configuration files, go-toml can emit documents | ||||
| annotated with [comments and commented-out values][comments-example]. For | ||||
| example, it can generate the following file: | ||||
| 
 | ||||
| ```toml | ||||
| # Host IP to connect to. | ||||
| host = '127.0.0.1' | ||||
| # Port of the remote server. | ||||
| port = 4242 | ||||
| 
 | ||||
| # Encryption parameters (optional) | ||||
| # [TLS] | ||||
| # cipher = 'AEAD-AES128-GCM-SHA256' | ||||
| # version = 'TLS 1.3' | ||||
| ``` | ||||
| 
 | ||||
| [comments-example]: https://pkg.go.dev/github.com/pelletier/go-toml/v2#example-Marshal-Commented | ||||
| 
 | ||||
| ## Getting started | ||||
| 
 | ||||
| Given the following struct, let's see how to read it and write it as TOML: | ||||
|  | @ -497,27 +516,20 @@ is not necessary anymore. | |||
| 
 | ||||
| V1 used to provide multiple struct tags: `comment`, `commented`, `multiline`, | ||||
| `toml`, and `omitempty`. To behave more like the standard library, v2 has merged | ||||
| `toml`, `multiline`, and `omitempty`. For example: | ||||
| `toml`, `multiline`, `commented`, and `omitempty`. For example: | ||||
| 
 | ||||
| ```go | ||||
| type doc struct { | ||||
| 	// v1 | ||||
| 	F string `toml:"field" multiline:"true" omitempty:"true"` | ||||
| 	F string `toml:"field" multiline:"true" omitempty:"true" commented:"true"` | ||||
| 	// v2 | ||||
| 	F string `toml:"field,multiline,omitempty"` | ||||
| 	F string `toml:"field,multiline,omitempty,commented"` | ||||
| } | ||||
| ``` | ||||
| 
 | ||||
| Has a result, the `Encoder.SetTag*` methods have been removed, as there is just | ||||
| one tag now. | ||||
| 
 | ||||
| 
 | ||||
| #### `commented` tag has been removed | ||||
| 
 | ||||
| There is no replacement for the `commented` tag. This feature would be better | ||||
| suited in a proper document model for go-toml v2, which has been [cut from | ||||
| scope][nodoc] at the moment. | ||||
| 
 | ||||
| #### `Encoder.ArraysWithOneElementPerLine` has been renamed | ||||
| 
 | ||||
| The new name is `Encoder.SetArraysMultiline`. The behavior should be the same. | ||||
|  |  | |||
							
								
								
									
										1
									
								
								vendor/github.com/pelletier/go-toml/v2/ci.sh
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										1
									
								
								vendor/github.com/pelletier/go-toml/v2/ci.sh
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -79,6 +79,7 @@ cover() { | |||
|     go test -covermode=atomic  -coverpkg=./... -coverprofile=coverage.out.tmp ./... | ||||
|     cat coverage.out.tmp | grep -v fuzz | grep -v testsuite | grep -v tomltestgen | grep -v gotoml-test-decoder > coverage.out | ||||
|     go tool cover -func=coverage.out | ||||
|     echo "Coverage profile for ${branch}: ${dir}/coverage.out" >&2 | ||||
|     popd | ||||
| 
 | ||||
|     if [ "${branch}" != "HEAD" ]; then | ||||
|  |  | |||
							
								
								
									
										2
									
								
								vendor/github.com/pelletier/go-toml/v2/decode.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								vendor/github.com/pelletier/go-toml/v2/decode.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -318,7 +318,7 @@ func parseFloat(b []byte) (float64, error) { | |||
| 	if cleaned[0] == '+' || cleaned[0] == '-' { | ||||
| 		start = 1 | ||||
| 	} | ||||
| 	if cleaned[start] == '0' && isDigit(cleaned[start+1]) { | ||||
| 	if cleaned[start] == '0' && len(cleaned) > start+1 && isDigit(cleaned[start+1]) { | ||||
| 		return 0, unstable.NewParserError(b, "float integer part cannot have leading zeroes") | ||||
| 	} | ||||
| 
 | ||||
|  |  | |||
							
								
								
									
										40
									
								
								vendor/github.com/pelletier/go-toml/v2/marshaler.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										40
									
								
								vendor/github.com/pelletier/go-toml/v2/marshaler.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -148,6 +148,9 @@ func (enc *Encoder) SetIndentTables(indent bool) *Encoder { | |||
| // | ||||
| // The "omitempty" option prevents empty values or groups from being emitted. | ||||
| // | ||||
| // The "commented" option prefixes the value and all its children with a comment | ||||
| // symbol. | ||||
| // | ||||
| // In addition to the "toml" tag struct tag, a "comment" tag can be used to emit | ||||
| // a TOML comment before the value being annotated. Comments are ignored inside | ||||
| // inline tables. For array tables, the comment is only present before the first | ||||
|  | @ -180,6 +183,7 @@ func (enc *Encoder) Encode(v interface{}) error { | |||
| type valueOptions struct { | ||||
| 	multiline bool | ||||
| 	omitempty bool | ||||
| 	commented bool | ||||
| 	comment   string | ||||
| } | ||||
| 
 | ||||
|  | @ -205,6 +209,9 @@ type encoderCtx struct { | |||
| 	// Indentation level | ||||
| 	indent int | ||||
| 
 | ||||
| 	// Prefix the current value with a comment. | ||||
| 	commented bool | ||||
| 
 | ||||
| 	// Options coming from struct tags | ||||
| 	options valueOptions | ||||
| } | ||||
|  | @ -273,7 +280,7 @@ func (enc *Encoder) encode(b []byte, ctx encoderCtx, v reflect.Value) ([]byte, e | |||
| 		return enc.encodeMap(b, ctx, v) | ||||
| 	case reflect.Struct: | ||||
| 		return enc.encodeStruct(b, ctx, v) | ||||
| 	case reflect.Slice: | ||||
| 	case reflect.Slice, reflect.Array: | ||||
| 		return enc.encodeSlice(b, ctx, v) | ||||
| 	case reflect.Interface: | ||||
| 		if v.IsNil() { | ||||
|  | @ -357,6 +364,7 @@ func (enc *Encoder) encodeKv(b []byte, ctx encoderCtx, options valueOptions, v r | |||
| 
 | ||||
| 	if !ctx.inline { | ||||
| 		b = enc.encodeComment(ctx.indent, options.comment, b) | ||||
| 		b = enc.commented(ctx.commented, b) | ||||
| 		b = enc.indent(ctx.indent, b) | ||||
| 	} | ||||
| 
 | ||||
|  | @ -378,6 +386,13 @@ func (enc *Encoder) encodeKv(b []byte, ctx encoderCtx, options valueOptions, v r | |||
| 	return b, nil | ||||
| } | ||||
| 
 | ||||
| func (enc *Encoder) commented(commented bool, b []byte) []byte { | ||||
| 	if commented { | ||||
| 		return append(b, "# "...) | ||||
| 	} | ||||
| 	return b | ||||
| } | ||||
| 
 | ||||
| func isEmptyValue(v reflect.Value) bool { | ||||
| 	switch v.Kind() { | ||||
| 	case reflect.Struct: | ||||
|  | @ -526,6 +541,8 @@ func (enc *Encoder) encodeTableHeader(ctx encoderCtx, b []byte) ([]byte, error) | |||
| 
 | ||||
| 	b = enc.encodeComment(ctx.indent, ctx.options.comment, b) | ||||
| 
 | ||||
| 	b = enc.commented(ctx.commented, b) | ||||
| 
 | ||||
| 	b = enc.indent(ctx.indent, b) | ||||
| 
 | ||||
| 	b = append(b, '[') | ||||
|  | @ -704,6 +721,7 @@ func walkStruct(ctx encoderCtx, t *table, v reflect.Value) { | |||
| 		options := valueOptions{ | ||||
| 			multiline: opts.multiline, | ||||
| 			omitempty: opts.omitempty, | ||||
| 			commented: opts.commented, | ||||
| 			comment:   fieldType.Tag.Get("comment"), | ||||
| 		} | ||||
| 
 | ||||
|  | @ -763,6 +781,7 @@ type tagOptions struct { | |||
| 	multiline bool | ||||
| 	inline    bool | ||||
| 	omitempty bool | ||||
| 	commented bool | ||||
| } | ||||
| 
 | ||||
| func parseTag(tag string) (string, tagOptions) { | ||||
|  | @ -790,6 +809,8 @@ func parseTag(tag string) (string, tagOptions) { | |||
| 			opts.inline = true | ||||
| 		case "omitempty": | ||||
| 			opts.omitempty = true | ||||
| 		case "commented": | ||||
| 			opts.commented = true | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
|  | @ -825,8 +846,10 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro | |||
| 		hasNonEmptyKV = true | ||||
| 
 | ||||
| 		ctx.setKey(kv.Key) | ||||
| 		ctx2 := ctx | ||||
| 		ctx2.commented = kv.Options.commented || ctx2.commented | ||||
| 
 | ||||
| 		b, err = enc.encodeKv(b, ctx, kv.Options, kv.Value) | ||||
| 		b, err = enc.encodeKv(b, ctx2, kv.Options, kv.Value) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
|  | @ -851,8 +874,10 @@ func (enc *Encoder) encodeTable(b []byte, ctx encoderCtx, t table) ([]byte, erro | |||
| 		ctx.setKey(table.Key) | ||||
| 
 | ||||
| 		ctx.options = table.Options | ||||
| 		ctx2 := ctx | ||||
| 		ctx2.commented = ctx2.commented || ctx.options.commented | ||||
| 
 | ||||
| 		b, err = enc.encode(b, ctx, table.Value) | ||||
| 		b, err = enc.encode(b, ctx2, table.Value) | ||||
| 		if err != nil { | ||||
| 			return nil, err | ||||
| 		} | ||||
|  | @ -930,7 +955,7 @@ func willConvertToTableOrArrayTable(ctx encoderCtx, v reflect.Value) bool { | |||
| 		return willConvertToTableOrArrayTable(ctx, v.Elem()) | ||||
| 	} | ||||
| 
 | ||||
| 	if t.Kind() == reflect.Slice { | ||||
| 	if t.Kind() == reflect.Slice || t.Kind() == reflect.Array { | ||||
| 		if v.Len() == 0 { | ||||
| 			// An empty slice should be a kv = []. | ||||
| 			return false | ||||
|  | @ -970,6 +995,9 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect. | |||
| 	ctx.shiftKey() | ||||
| 
 | ||||
| 	scratch := make([]byte, 0, 64) | ||||
| 
 | ||||
| 	scratch = enc.commented(ctx.commented, scratch) | ||||
| 
 | ||||
| 	scratch = append(scratch, "[["...) | ||||
| 
 | ||||
| 	for i, k := range ctx.parentKey { | ||||
|  | @ -985,6 +1013,10 @@ func (enc *Encoder) encodeSliceAsArrayTable(b []byte, ctx encoderCtx, v reflect. | |||
| 
 | ||||
| 	b = enc.encodeComment(ctx.indent, ctx.options.comment, b) | ||||
| 
 | ||||
| 	if enc.indentTables { | ||||
| 		ctx.indent++ | ||||
| 	} | ||||
| 
 | ||||
| 	for i := 0; i < v.Len(); i++ { | ||||
| 		if i != 0 { | ||||
| 			b = append(b, "\n"...) | ||||
|  |  | |||
							
								
								
									
										16
									
								
								vendor/github.com/pelletier/go-toml/v2/unmarshaler.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										16
									
								
								vendor/github.com/pelletier/go-toml/v2/unmarshaler.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -149,12 +149,16 @@ type errorContext struct { | |||
| } | ||||
| 
 | ||||
| func (d *decoder) typeMismatchError(toml string, target reflect.Type) error { | ||||
| 	return fmt.Errorf("toml: %s", d.typeMismatchString(toml, target)) | ||||
| } | ||||
| 
 | ||||
| func (d *decoder) typeMismatchString(toml string, target reflect.Type) string { | ||||
| 	if d.errorContext != nil && d.errorContext.Struct != nil { | ||||
| 		ctx := d.errorContext | ||||
| 		f := ctx.Struct.FieldByIndex(ctx.Field) | ||||
| 		return fmt.Errorf("toml: cannot decode TOML %s into struct field %s.%s of type %s", toml, ctx.Struct, f.Name, f.Type) | ||||
| 		return fmt.Sprintf("cannot decode TOML %s into struct field %s.%s of type %s", toml, ctx.Struct, f.Name, f.Type) | ||||
| 	} | ||||
| 	return fmt.Errorf("toml: cannot decode TOML %s into a Go value of type %s", toml, target) | ||||
| 	return fmt.Sprintf("cannot decode TOML %s into a Go value of type %s", toml, target) | ||||
| } | ||||
| 
 | ||||
| func (d *decoder) expr() *unstable.Node { | ||||
|  | @ -963,7 +967,7 @@ func (d *decoder) unmarshalInteger(value *unstable.Node, v reflect.Value) error | |||
| 	case reflect.Interface: | ||||
| 		r = reflect.ValueOf(i) | ||||
| 	default: | ||||
| 		return d.typeMismatchError("integer", v.Type()) | ||||
| 		return unstable.NewParserError(d.p.Raw(value.Raw), d.typeMismatchString("integer", v.Type())) | ||||
| 	} | ||||
| 
 | ||||
| 	if !r.Type().AssignableTo(v.Type()) { | ||||
|  | @ -982,7 +986,7 @@ func (d *decoder) unmarshalString(value *unstable.Node, v reflect.Value) error { | |||
| 	case reflect.Interface: | ||||
| 		v.Set(reflect.ValueOf(string(value.Data))) | ||||
| 	default: | ||||
| 		return unstable.NewParserError(d.p.Raw(value.Raw), "cannot store TOML string into a Go %s", v.Kind()) | ||||
| 		return unstable.NewParserError(d.p.Raw(value.Raw), d.typeMismatchString("string", v.Type())) | ||||
| 	} | ||||
| 
 | ||||
| 	return nil | ||||
|  | @ -1170,10 +1174,10 @@ func initAndDereferencePointer(v reflect.Value) reflect.Value { | |||
| 
 | ||||
| // Same as reflect.Value.FieldByIndex, but creates pointers if needed. | ||||
| func fieldByIndex(v reflect.Value, path []int) reflect.Value { | ||||
| 	for i, x := range path { | ||||
| 	for _, x := range path { | ||||
| 		v = v.Field(x) | ||||
| 
 | ||||
| 		if i < len(path)-1 && v.Kind() == reflect.Ptr { | ||||
| 		if v.Kind() == reflect.Ptr { | ||||
| 			if v.IsNil() { | ||||
| 				v.Set(reflect.New(v.Type().Elem())) | ||||
| 			} | ||||
|  |  | |||
							
								
								
									
										6
									
								
								vendor/github.com/pelletier/go-toml/v2/unstable/parser.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										6
									
								
								vendor/github.com/pelletier/go-toml/v2/unstable/parser.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -1013,6 +1013,7 @@ func (p *Parser) parseIntOrFloatOrDateTime(b []byte) (reference, []byte, error) | |||
| 		return p.builder.Push(Node{ | ||||
| 			Kind: Float, | ||||
| 			Data: b[:3], | ||||
| 			Raw:  p.Range(b[:3]), | ||||
| 		}), b[3:], nil | ||||
| 	case 'n': | ||||
| 		if !scanFollowsNan(b) { | ||||
|  | @ -1022,6 +1023,7 @@ func (p *Parser) parseIntOrFloatOrDateTime(b []byte) (reference, []byte, error) | |||
| 		return p.builder.Push(Node{ | ||||
| 			Kind: Float, | ||||
| 			Data: b[:3], | ||||
| 			Raw:  p.Range(b[:3]), | ||||
| 		}), b[3:], nil | ||||
| 	case '+', '-': | ||||
| 		return p.scanIntOrFloat(b) | ||||
|  | @ -1146,6 +1148,7 @@ func (p *Parser) scanIntOrFloat(b []byte) (reference, []byte, error) { | |||
| 		return p.builder.Push(Node{ | ||||
| 			Kind: Integer, | ||||
| 			Data: b[:i], | ||||
| 			Raw:  p.Range(b[:i]), | ||||
| 		}), b[i:], nil | ||||
| 	} | ||||
| 
 | ||||
|  | @ -1169,6 +1172,7 @@ func (p *Parser) scanIntOrFloat(b []byte) (reference, []byte, error) { | |||
| 				return p.builder.Push(Node{ | ||||
| 					Kind: Float, | ||||
| 					Data: b[:i+3], | ||||
| 					Raw:  p.Range(b[:i+3]), | ||||
| 				}), b[i+3:], nil | ||||
| 			} | ||||
| 
 | ||||
|  | @ -1180,6 +1184,7 @@ func (p *Parser) scanIntOrFloat(b []byte) (reference, []byte, error) { | |||
| 				return p.builder.Push(Node{ | ||||
| 					Kind: Float, | ||||
| 					Data: b[:i+3], | ||||
| 					Raw:  p.Range(b[:i+3]), | ||||
| 				}), b[i+3:], nil | ||||
| 			} | ||||
| 
 | ||||
|  | @ -1202,6 +1207,7 @@ func (p *Parser) scanIntOrFloat(b []byte) (reference, []byte, error) { | |||
| 	return p.builder.Push(Node{ | ||||
| 		Kind: kind, | ||||
| 		Data: b[:i], | ||||
| 		Raw:  p.Range(b[:i]), | ||||
| 	}), b[i:], nil | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue