vfmt: change all '$expr' to '${expr}' (#16428)

This commit is contained in:
yuyi 2022-11-15 21:53:13 +08:00 committed by GitHub
parent 56239b4a23
commit 017ace6ea7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
859 changed files with 7156 additions and 7135 deletions

View file

@ -15,12 +15,12 @@ fn setup() (&net.TcpListener, &net.TcpConn, &net.TcpConn) {
c := chan &net.TcpConn{}
spawn accept(mut server, c)
mut client := net.dial_tcp('localhost$server_port') or { panic(err) }
mut client := net.dial_tcp('localhost${server_port}') or { panic(err) }
socket := <-c
$if debug_peer_ip ? {
eprintln('$server.addr()\n$client.peer_addr(), $client.addr()\n$socket.peer_addr(), $socket.addr()')
eprintln('${server.addr()}\n${client.peer_addr()}, ${client.addr()}\n${socket.peer_addr()}, ${socket.addr()}')
}
assert true
return server, client, socket
@ -44,10 +44,10 @@ fn test_socket() {
}
assert true
$if debug {
println('message send: $message')
println('message send: ${message}')
}
$if debug {
println('send socket: $socket.sock.handle')
println('send socket: ${socket.sock.handle}')
}
mut buf := []u8{len: 1024}
nbytes := client.read(mut buf) or {
@ -56,10 +56,10 @@ fn test_socket() {
}
received := buf[0..nbytes].bytestr()
$if debug {
println('message received: $received')
println('message received: ${received}')
}
$if debug {
println('client: $client.sock.handle')
println('client: ${client.sock.handle}')
}
assert message == received
}
@ -87,7 +87,7 @@ fn test_socket_read_line() {
cleanup(mut server, mut client, mut socket)
}
message1, message2 := 'message1', 'message2'
message := '$message1\n$message2\n'
message := '${message1}\n${message2}\n'
socket.write_string(message) or { assert false }
assert true
//
@ -124,7 +124,7 @@ fn test_socket_write_fail_without_panic() {
// TODO: fix segfaulting on Solaris and FreeBSD
for i := 0; i < 3; i++ {
socket.write_string(message2) or {
println('write to a socket without a recipient should produce an option fail: $err | $message2')
println('write to a socket without a recipient should produce an option fail: ${err} | ${message2}')
assert true
}
}