mirror of
				https://github.com/superseriousbusiness/gotosocial.git
				synced 2025-10-31 17:02:25 -05:00 
			
		
		
		
	[chore]: Bump golang.org/x/oauth2 from 0.9.0 to 0.10.0 (#1975)
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
This commit is contained in:
		
					parent
					
						
							
								f0dad439f6
							
						
					
				
			
			
				commit
				
					
						a29b5affc8
					
				
			
		
					 16 changed files with 794 additions and 438 deletions
				
			
		
							
								
								
									
										14
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/encode.go
									
										
									
										generated
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								vendor/google.golang.org/protobuf/encoding/prototext/encode.go
									
										
									
										generated
									
									
										vendored
									
									
								
							|  | @ -101,13 +101,19 @@ func (o MarshalOptions) Format(m proto.Message) string { | |||
| // MarshalOptions object. Do not depend on the output being stable. It may | ||||
| // change over time across different versions of the program. | ||||
| func (o MarshalOptions) Marshal(m proto.Message) ([]byte, error) { | ||||
| 	return o.marshal(m) | ||||
| 	return o.marshal(nil, m) | ||||
| } | ||||
| 
 | ||||
| // MarshalAppend appends the textproto format encoding of m to b, | ||||
| // returning the result. | ||||
| func (o MarshalOptions) MarshalAppend(b []byte, m proto.Message) ([]byte, error) { | ||||
| 	return o.marshal(b, m) | ||||
| } | ||||
| 
 | ||||
| // marshal is a centralized function that all marshal operations go through. | ||||
| // For profiling purposes, avoid changing the name of this function or | ||||
| // introducing other code paths for marshal that do not go through this. | ||||
| func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) { | ||||
| func (o MarshalOptions) marshal(b []byte, m proto.Message) ([]byte, error) { | ||||
| 	var delims = [2]byte{'{', '}'} | ||||
| 
 | ||||
| 	if o.Multiline && o.Indent == "" { | ||||
|  | @ -117,7 +123,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) { | |||
| 		o.Resolver = protoregistry.GlobalTypes | ||||
| 	} | ||||
| 
 | ||||
| 	internalEnc, err := text.NewEncoder(o.Indent, delims, o.EmitASCII) | ||||
| 	internalEnc, err := text.NewEncoder(b, o.Indent, delims, o.EmitASCII) | ||||
| 	if err != nil { | ||||
| 		return nil, err | ||||
| 	} | ||||
|  | @ -125,7 +131,7 @@ func (o MarshalOptions) marshal(m proto.Message) ([]byte, error) { | |||
| 	// Treat nil message interface as an empty message, | ||||
| 	// in which case there is nothing to output. | ||||
| 	if m == nil { | ||||
| 		return []byte{}, nil | ||||
| 		return b, nil | ||||
| 	} | ||||
| 
 | ||||
| 	enc := encoder{internalEnc, o} | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue