Skip to content

modernize: use any instead of interface{} #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+17 −17
Open

modernize: use any instead of interface{} #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions client.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,11 @@ import (
)

type clientRequest struct {
Method string `json:"method"`
Parameters interface{} `json:"parameters"`
Oneway bool `json:"oneway,omitempty"`
More bool `json:"more,omitempty"`
Upgrade bool `json:"upgrade,omitempty"`
Method string `json:"method"`
Parameters any `json:"parameters"`
Oneway bool `json:"oneway,omitempty"`
More bool `json:"more,omitempty"`
Upgrade bool `json:"upgrade,omitempty"`
}

type clientReply struct {
Expand Down Expand Up @@ -125,7 +125,7 @@ func (c *Client) readLoop() {
//
// in is a Go value marshaled to a JSON object which contains the request
// parameters. Similarly, out will be populated with the reply parameters.
func (c *Client) Do(method string, in, out interface{}) error {
func (c *Client) Do(method string, in, out any) error {
req := clientRequest{
Method: method,
Parameters: in,
Expand All @@ -144,7 +144,7 @@ func (c *Client) Do(method string, in, out interface{}) error {

// DoMore is similar to Do, but indicates to the service that multiple replies
// are expected.
func (c *Client) DoMore(method string, in interface{}) (*ClientCall, error) {
func (c *Client) DoMore(method string, in any) (*ClientCall, error) {
req := clientRequest{
Method: method,
Parameters: in,
Expand Down Expand Up @@ -178,7 +178,7 @@ type ClientCall struct {
// Next waits for a reply.
//
// If there are no more replies, io.EOF is returned.
func (cc *ClientCall) Next(out interface{}) error {
func (cc *ClientCall) Next(out any) error {
if cc.ch == nil {
return io.EOF
}
Expand All @@ -190,7 +190,7 @@ func (cc *ClientCall) Next(out interface{}) error {
return err
}

func (cc *ClientCall) next(out interface{}) (continues bool, err error) {
func (cc *ClientCall) next(out any) (continues bool, err error) {
if out == nil {
out = new(struct{})
}
Expand Down
12 changes: 6 additions & 6 deletions server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,15 +19,15 @@ type ServerRequest struct {
}

type serverReply struct {
Parameters interface{} `json:"parameters"`
Continues bool `json:"continues,omitempty"`
Error string `json:"error,omitempty"`
Parameters any `json:"parameters"`
Continues bool `json:"continues,omitempty"`
Error string `json:"error,omitempty"`
}

// ServerError is an error to be sent to a Varlink client.
type ServerError struct {
Name string
Parameters interface{}
Parameters any
}

// Error implements the error interface.
Expand Down Expand Up @@ -65,7 +65,7 @@ func (call *ServerCall) reply(reply *serverReply) error {
// Reply sends a non-final reply.
//
// This can only be used if ServerRequest.More is set to true.
func (call *ServerCall) Reply(parameters interface{}) error {
func (call *ServerCall) Reply(parameters any) error {
return call.reply(&serverReply{
Parameters: parameters,
Continues: true,
Expand All @@ -75,7 +75,7 @@ func (call *ServerCall) Reply(parameters interface{}) error {
// CloseWithReply sends a final reply and closes the call.
//
// No more replies may be sent.
func (call *ServerCall) CloseWithReply(parameters interface{}) error {
func (call *ServerCall) CloseWithReply(parameters any) error {
return call.reply(&serverReply{Parameters: parameters})
}

Expand Down
4 changes: 2 additions & 2 deletions varlink.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ func newConn(c net.Conn) *conn {
}
}

func (c *conn) writeMessage(v interface{}) error {
func (c *conn) writeMessage(v any) error {
b, err := json.Marshal(v)
if err != nil {
return err
Expand All @@ -32,7 +32,7 @@ func (c *conn) writeMessage(v interface{}) error {
return err
}

func (c *conn) readMessage(v interface{}) error {
func (c *conn) readMessage(v any) error {
b, err := c.br.ReadBytes(0)
if err != nil {
return err
Expand Down