mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

all: update repo to use the new error handling syntax (#8950)

Browse Source
This commit is contained in:
spaceface
2021-02-28 21:20:21 +01:00
committed by GitHub
parent b9a381f101
commit d63b7bc35a
135 changed files with 487 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
vlib/x/websocket/io.v
View File

@@ -18,7 +18,7 @@ fn (mut ws Client) socket_read(mut buffer []byte) ?int {
if err.code == net.err_timed_out_code {
continue
}
return error(err)
return err
}
return r
}
@@ -42,7 +42,7 @@ fn (mut ws Client) socket_read_ptr(buf_ptr byteptr, len int) ?int {
if err.code == net.err_timed_out_code {
continue
}
return error(err)
return err
}
return r
}
@@ -66,7 +66,7 @@ fn (mut ws Client) socket_write(bytes []byte) ?int {
if err.code == net.err_timed_out_code {
continue
}
return error(err)
return err
}
return n
}

2
vlib/x/websocket/message.v
View File

@@ -148,7 +148,7 @@ pub fn (mut ws Client) read_next_message() ?Message {
ws.validate_utf_8(frame.opcode, frame_payload) or {
ws.logger.error('UTF8 validation error: $err, len of payload($frame_payload.len)')
ws.send_error_event('UTF8 validation error: $err, len of payload($frame_payload.len)')
return error(err)
return err
}
msg := Message{
opcode: OPCode(frame.opcode)

2
vlib/x/websocket/tests/autobahn/autobahn_client.v
View File

@@ -29,5 +29,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
}

2
vlib/x/websocket/tests/autobahn/autobahn_client_wss.v
View File

@@ -31,5 +31,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
}

4
vlib/x/websocket/tests/autobahn/autobahn_server.v
View File

@@ -6,7 +6,7 @@ import x.websocket
fn main() {
mut s := websocket.new_server(9002, '/')
s.on_message(on_message)
s.listen() or { panic(err) }
s.listen() or { panic(err.msg) }
}
fn handle_case(case_nr int) ? {
@@ -23,5 +23,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
}

2
vlib/x/websocket/tests/autobahn/local_run/autobahn_client.v
View File

@@ -29,5 +29,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
}

2
vlib/x/websocket/tests/autobahn/local_run/autobahn_client_wss.v
View File

@@ -31,5 +31,5 @@ fn on_message(mut ws websocket.Client, msg &websocket.Message) ? {
// We just wanna pass text and binary message back to autobahn
return
}
ws.write(msg.payload, msg.opcode) or { panic(err) }
ws.write(msg.payload, msg.opcode) or { panic(err.msg) }
}

4
vlib/x/websocket/websocket_client.v
View File

@@ -121,7 +121,7 @@ pub fn (mut ws Client) listen() ? {
}
ws.debug_log('failed to read next message: $err')
ws.send_error_event('failed to read next message: $err')
return error(err)
return err
}
if ws.state in [.closed, .closing] {
return
@@ -146,7 +146,7 @@ pub fn (mut ws Client) listen() ? {
ws.logger.error('error in message callback sending PONG: $err')
ws.send_error_event('error in message callback sending PONG: $err')
if ws.panic_on_callback {
panic(err)
panic(err.msg)
}
continue
}

4
vlib/x/websocket/websocket_server.v
View File

@@ -120,8 +120,8 @@ fn (mut s Server) serve_client(mut c Client) ? {
}
s.setup_callbacks(mut server_client)
c.listen() or {
s.logger.error(err)
return error(err)
s.logger.error(err.msg)
return err
}
}

4
vlib/x/websocket/websocket_test.v
View File

@@ -40,8 +40,8 @@ fn start_server(listen_port int) ? {
}) ?
s.on_message(fn (mut ws websocket.Client, msg &websocket.Message) ? {
match msg.opcode {
.pong { ws.write_str('pong') or { panic(err) } }
else { ws.write(msg.payload, msg.opcode) or { panic(err) } }
.pong { ws.write_str('pong') or { panic(err.msg) } }
else { ws.write(msg.payload, msg.opcode) or { panic(err.msg) } }
}
})