From b6358f093b6e7fea3f6021f9b3035b9e879b9504 Mon Sep 17 00:00:00 2001 From: Alexander Medvednikov Date: Sun, 24 May 2026 20:21:00 +0300 Subject: [PATCH] all: vfmt --- vlib/fasthttp/fasthttp_linux.v | 41 +++++++++++-------- vlib/v/builder/cc.v | 3 +- vlib/v/checker/infix.v | 3 +- vlib/v/parser/expr.v | 8 ++-- .../tests/projects_that_should_compile_test.v | 4 +- .../struct_init_short_in_for_expr_test.v | 4 +- 6 files changed, 37 insertions(+), 26 deletions(-) diff --git a/vlib/fasthttp/fasthttp_linux.v b/vlib/fasthttp/fasthttp_linux.v index e5448eff8..2a63c2db3 100644 --- a/vlib/fasthttp/fasthttp_linux.v +++ b/vlib/fasthttp/fasthttp_linux.v @@ -397,6 +397,7 @@ fn try_drain_write(client_fd int, mut state ClientWriteState) DrainStatus { eprintln('ERROR: sendfile() failed with errno=${errno_val}') } } + return .failed } // Done with the file -- close the fd eagerly so keep-alive doesn't hold it open. @@ -532,8 +533,9 @@ fn process_request(server &Server, epoll_fd int, client_fd int, request_buffer [ server.end_request() } if server.is_shutting_down() || response.should_close { - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } return } @@ -609,8 +611,9 @@ fn process_request(server &Server, epoll_fd int, client_fd int, request_buffer [ client_read_starts.delete(client_fd) if arm_epollout(epoll_fd, client_fd) == -1 { eprintln('ERROR: epoll_ctl(MOD, EPOLLOUT) failed errno=${C.errno}') - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } else { state.epollout_armed = true } @@ -673,8 +676,9 @@ fn process_events(server &Server, epoll_fd int, listen_fd int) { C.send(client_fd, status_444_response.data, status_444_response.len, C.MSG_NOSIGNAL) } - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } else { eprintln('ERROR: Invalid FD from epoll: ${client_fd}') } @@ -691,13 +695,15 @@ fn process_events(server &Server, epoll_fd int, listen_fd int) { } if events[i].events & u32(C.EPOLLIN) != 0 { if server.is_shutting_down() { - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) continue } if closing_client_fds[client_fd] or { false } { - drain_closing_client(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + drain_closing_client(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) continue } if client_fd in client_write_states { @@ -785,12 +791,14 @@ fn process_events(server &Server, epoll_fd int, listen_fd int) { // Unexpected recv error - send 444 No Response C.send(client_fd, status_444_response.data, status_444_response.len, C.MSG_NOSIGNAL) - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } else if peer_closed || (total_bytes_read == 0 && readed_request_buffer.len == 0) { // Normal client closure (FIN received) - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } else if readed_request_buffer.len > 0 { client_buffers[client_fd] = readed_request_buffer } @@ -812,8 +820,9 @@ fn process_events(server &Server, epoll_fd int, listen_fd int) { for client_fd in client_write_states.keys() { state := client_write_states[client_fd] or { continue } if state.start_ns > 0 && now - state.start_ns >= timeout_ns { - handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut client_buffers, mut - client_read_starts, mut closing_client_fds, mut client_write_states) + handle_client_closure(server, epoll_fd, client_fd, mut client_fds, mut + client_buffers, mut client_read_starts, mut closing_client_fds, mut + client_write_states) } } } diff --git a/vlib/v/builder/cc.v b/vlib/v/builder/cc.v index 6a1d28c73..cc6a2f0bb 100644 --- a/vlib/v/builder/cc.v +++ b/vlib/v/builder/cc.v @@ -785,8 +785,7 @@ fn (mut v Builder) setup_ccompiler_options(ccompiler string) { // `-sharedlive` is skipped: live reload resolves `impl_live_*` symbols // via `dlsym` from the host process, and those are emitted without // `VV_EXP` on non-Windows (see vlib/v/gen/c/fn.v). - if !v.pref.is_liveshared && v.pref.os !in [.windows, .wasm32] - && ccoptions.cc != .msvc { + if !v.pref.is_liveshared && v.pref.os !in [.windows, .wasm32] && ccoptions.cc != .msvc { ccoptions.args << '-fvisibility=hidden' } if v.pref.os == .linux && 'gcboehm' in v.pref.compile_defines_all { diff --git a/vlib/v/checker/infix.v b/vlib/v/checker/infix.v index 32416eb3c..c42716829 100644 --- a/vlib/v/checker/infix.v +++ b/vlib/v/checker/infix.v @@ -693,7 +693,8 @@ fn (mut c Checker) infix_expr(mut node ast.InfixExpr) ast.Type { right_name := c.table.type_to_str(unwrapped_right_type) c.error('mismatched types `${left_name}` and `${right_name}`', left_right_pos) - } else if promoted_type.has_flag(.result) || unwrapped_left_type.has_flag(.result) + } else if promoted_type.has_flag(.result) + || unwrapped_left_type.has_flag(.result) || unwrapped_right_type.has_flag(.result) { result_type := if unwrapped_left_type.has_flag(.result) { unwrapped_left_type diff --git a/vlib/v/parser/expr.v b/vlib/v/parser/expr.v index 4ad36e542..4fe645acc 100644 --- a/vlib/v/parser/expr.v +++ b/vlib/v/parser/expr.v @@ -84,10 +84,10 @@ fn (mut p Parser) check_expr(precedence int) !ast.Expr { } else if p.tok.kind == .question && p.peek_tok.kind == .amp { node = p.prefix_expr() } else if p.inside_for_expr && p.tok.kind == .name && ((p.tok.lit[0].is_capital() - && p.peek_tok.kind == .lcbr - && (p.peek_token(2).kind in [.rcbr, .name] || p.inside_array_lit)) - || (p.inside_array_lit && p.peek_tok.kind == .dot && p.peek_token(2).kind == .name - && p.peek_token(2).lit[0].is_capital() && p.peek_token(3).kind == .lcbr)) { + && p.peek_tok.kind == .lcbr && (p.peek_token(2).kind in [.rcbr, .name] + || p.inside_array_lit)) || (p.inside_array_lit && p.peek_tok.kind == .dot + && p.peek_token(2).kind == .name && p.peek_token(2).lit[0].is_capital() + && p.peek_token(3).kind == .lcbr)) { node = p.struct_init(p.mod + '.' + p.tok.lit, .normal, false) } else if p.is_generic_name() && p.peek_tok.kind == .lcbr && p.peek_token(2).kind == .rcbr && p.peek_token(2).line_nr == p.tok.line_nr { diff --git a/vlib/v/tests/projects_that_should_compile_test.v b/vlib/v/tests/projects_that_should_compile_test.v index a744e5094..5eb2dae71 100644 --- a/vlib/v/tests/projects_that_should_compile_test.v +++ b/vlib/v/tests/projects_that_should_compile_test.v @@ -193,9 +193,9 @@ fn test_importing_submodule_through_nested_vmod_works_issue_27138() { os.write_file(os.join_path(root, 'v.mod'), "Module {\n\tname: 'bug_project'\n}\n")! os.write_file(os.join_path(root, 'dep', 'v.mod'), "Module {\n\tname: 'dep'\n}\n")! os.write_file(os.join_path(root, 'dep', 'mymod', 'types.v'), - 'module mymod\n\npub enum Color {\n\tred\n\tgreen\n}\n\npub fn color_name(c Color) string {\n\treturn match c {\n\t\t.red { \'red\' }\n\t\t.green { \'green\' }\n\t}\n}\n')! + "module mymod\n\npub enum Color {\n\tred\n\tgreen\n}\n\npub fn color_name(c Color) string {\n\treturn match c {\n\t\t.red { 'red' }\n\t\t.green { 'green' }\n\t}\n}\n")! os.write_file(os.join_path(root, 'main.v'), - "module main\n\nimport dep.mymod\n\nfn main() {\n\tprintln(mymod.color_name(mymod.Color.red))\n}\n")! + 'module main\n\nimport dep.mymod\n\nfn main() {\n\tprintln(mymod.color_name(mymod.Color.red))\n}\n')! res := vrun_ok_in_dir(root, 'run', '.') assert res.trim_space() == 'red' } diff --git a/vlib/v/tests/structs/struct_init_short_in_for_expr_test.v b/vlib/v/tests/structs/struct_init_short_in_for_expr_test.v index a7ce4f7f2..f8fcf612a 100644 --- a/vlib/v/tests/structs/struct_init_short_in_for_expr_test.v +++ b/vlib/v/tests/structs/struct_init_short_in_for_expr_test.v @@ -28,7 +28,9 @@ fn test_short_struct_init_multi_fields_in_for_in_array() { fn test_mixed_struct_init_styles_in_for_in_array() { mut got := []int{} - for x in [Int{}, Int{5}, Int{val: 6}] { + for x in [Int{}, Int{5}, Int{ + val: 6 + }] { got << x.val } assert got == [0, 5, 6] -- 2.39.5