v3: fix remaining macOS CI failures

Author: medvednikov

cmd/tools/vretry.v

@@ -42,31 +42,33 @@ fn quote_arg(arg string) string {
 	}
 }
 
-// windows_quote_arg applies the backslash-and-quote rules Windows uses when it
-// rebuilds argv from a command line. Wrapping in quotes is not enough on its own: a
-// trailing backslash would escape the closing quote, so `C:\work space\` has to come
-// out as `"C:\work space\\"` or it swallows the argument after it. This is the same
-// escaping `os.Process` does in vlib/os/process_windows.c.v.
-fn windows_quote_arg(arg string) string {
-	mut out := '"'
-	mut pending_backslashes := 0
-	for c in arg {
-		if c == `\\` {
-			pending_backslashes++
-			continue
-		}
-		if c == `"` {
-			// Each backslash run before a quote is doubled, and the quote escaped.
-			out += '\\'.repeat(pending_backslashes * 2 + 1) + '"'
+$if windows {
+	// windows_quote_arg applies the backslash-and-quote rules Windows uses when it
+	// rebuilds argv from a command line. Wrapping in quotes is not enough on its own: a
+	// trailing backslash would escape the closing quote, so `C:\work space\` has to come
+	// out as `"C:\work space\\"` or it swallows the argument after it. This is the same
+	// escaping `os.Process` does in vlib/os/process_windows.c.v.
+	fn windows_quote_arg(arg string) string {
+		mut out := '"'
+		mut pending_backslashes := 0
+		for c in arg {
+			if c == `\\` {
+				pending_backslashes++
+				continue
+			}
+			if c == `"` {
+				// Each backslash run before a quote is doubled, and the quote escaped.
+				out += '\\'.repeat(pending_backslashes * 2 + 1) + '"'
+				pending_backslashes = 0
+				continue
+			}
+			out += '\\'.repeat(pending_backslashes) + c.ascii_str()
 			pending_backslashes = 0
-			continue
 		}
-		out += '\\'.repeat(pending_backslashes) + c.ascii_str()
-		pending_backslashes = 0
+		// The run that ends the argument is doubled, so none of it escapes the closing quote.
+		out += '\\'.repeat(pending_backslashes * 2) + '"'
+		return out
 	}
-	// The run that ends the argument is doubled, so none of it escapes the closing quote.
-	out += '\\'.repeat(pending_backslashes * 2) + '"'
-	return out
 }
 
 // seconds_to_duration converts a fractional number of seconds, as given on the

cmd/tools/vsetup-freetype.v

@@ -1,6 +1,8 @@
 module main
 
-import os
+$if windows {
+	import os
+}
 
 fn main() {
 	$if windows {

examples/eventbus/some_module/some_module.v

@@ -20,8 +20,8 @@ pub fn do_work() {
 		println('working...')
 		if i == 5 {
 			event_metadata := &EventMetadata{'Iteration ' + i.str()}
-			eb.publish('event_foo', duration, event_metadata)
-			eb.publish('event_bar', duration, event_metadata)
+			eb.publish('event_foo', &duration, event_metadata)
+			eb.publish('event_bar', &duration, event_metadata)
 		}
 	}
 	eb.publish('event_baz', &Duration{42}, &EventMetadata{'Additional data at the end.'})

examples/pendulum-simulation/sim/runner.v

@@ -1,7 +1,6 @@
 module sim
 
 import benchmark
-import term
 
 pub type SimRequestHandler = fn (request &SimRequest) !
 
@@ -50,7 +49,7 @@ pub fn run(params SimParams, settings RunnerSettings) {
 	mut bmark := benchmark.new_benchmark()
 	for y in 0 .. height {
 		$if verbose ? {
-			term.clear_previous_line()
+			clear_verbose_line()
 		}
 		log(@MOD + '.' + @FN + ': y: ${y + 1}')
 		for x in 0 .. width {

vlib/builtin/ownership_interface_d_v3_backend.v

@@ -10,7 +10,7 @@ struct OwnershipV3InterfacePayload {
 fn drop_owned_v3_interface[T](value T) {
 	$if T.unaliased_typ is $interface {
 		mut owned := value
-		raw_interface := unsafe { &OwnershipV3InterfacePayload(&owned) }
+		raw_interface := unsafe { &OwnershipV3InterfacePayload(voidptr(&owned)) }
 		if raw_interface.is_boxed {
 			// The v3 C backend recognizes builtin.drop_owned as an intrinsic and uses
 			// the interface type id to destroy the concrete value before freeing its box.
@@ -26,7 +26,7 @@ fn drop_owned_interface[T](value T) {
 fn drop_owned_result_error_interface(err IError) {
 	// Pointer-backed errors remain borrowed; only boxed concrete values are owned.
 	mut owned := err
-	raw_interface := unsafe { &OwnershipV3InterfacePayload(&owned) }
+	raw_interface := unsafe { &OwnershipV3InterfacePayload(voidptr(&owned)) }
 	if raw_interface.is_boxed {
 		drop_owned(owned)
 	}

vlib/fasthttp/fasthttp_bsd.c.v

@@ -157,11 +157,11 @@ struct Conn {
 mut:
 	read_buf       [buf_size]u8
 	read_len       int
-	read_extra     []u8 // dynamic overflow buffer for large requests (e.g. chunked uploads)
-	write_buf      []u8
+	read_extra     []u8 = []u8{} // dynamic overflow buffer for large requests (e.g. chunked uploads)
+	write_buf      []u8 = []u8{}
 	write_pos      int
 	request_active bool
-	read_start     i64 // monotonic timestamp (in microseconds) when first data was received
+	read_start     i64 // monotonic timestamp when request data was last received
 	write_start    i64 // monotonic timestamp while a response is blocked on the socket
 	read_eof       bool
 
@@ -656,6 +656,7 @@ fn handle_read(server &Server, kq int, c_ptr voidptr, mut clients map[int]voidpt
 	if c.request_active {
 		return
 	}
+	previous_total := c.total_read_len()
 
 	// Drain the socket for this kqueue notification. EV_CLEAR only rearms once
 	// all readable data has been consumed.
@@ -703,8 +704,9 @@ fn handle_read(server &Server, kq int, c_ptr voidptr, mut clients map[int]voidpt
 		return
 	}
 
-	// Record when we first started receiving data for this request
-	if c.read_start == 0 {
+	// Treat the request timeout as an idle timeout. Active uploads can take longer
+	// than the configured interval as long as each read makes progress.
+	if total > previous_total {
 		c.read_start = time.sys_mono_now()
 	}
 

vlib/fasthttp/fasthttp_bsd_regression_test.c.v

@@ -60,3 +60,48 @@ fn test_keep_alive_completion_rearms_kqueue_read_after_consumed_edge() ! {
 	assert event.ident == u64(server_fd)
 	close_conn(server, kq, conn, mut clients)
 }
+
+fn test_request_read_progress_refreshes_idle_timeout() ! {
+	server := new_server(ServerConfig{
+		family:                  .ip
+		port:                    0
+		max_request_buffer_size: 8192
+		handler:                 bsd_reregistration_test_handler
+	})!
+	kq := C.kqueue()
+	assert kq >= 0
+	defer {
+		C.close(kq)
+	}
+	mut sockets := [2]i32{}
+	assert C.socketpair(C.AF_UNIX, C.SOCK_STREAM, 0, &sockets[0]) == 0
+	server_fd := int(sockets[0])
+	client_fd := int(sockets[1])
+	defer {
+		C.close(client_fd)
+	}
+	set_nonblocking(server_fd)
+	mut conn := &Conn{
+		fd:         server_fd
+		file_fd:    -1
+		read_start: 1
+	}
+	mut clients := {
+		server_fd: voidptr(conn)
+	}
+	assert C.write(client_fd, c'GET ', 4) == 4
+
+	handle_read(server, kq, conn, mut clients)
+
+	assert conn.total_read_len() == 4
+	assert conn.read_start > 1
+	close_conn(server, kq, conn, mut clients)
+}
+
+fn test_conn_dynamic_buffers_are_initialized() {
+	mut conn := &Conn{}
+	conn.read_extra << u8(1)
+	conn.write_buf << u8(2)
+	assert conn.read_extra == [u8(1)]
+	assert conn.write_buf == [u8(2)]
+}

vlib/json2/tests/decode_struct_test.v

@@ -204,7 +204,7 @@ fn test_error_conditions() {
 
 	mut error_count := 0
 	for case in invalid_cases {
-		result := json.decode[JsonU8](case) or {
+		_ := json.decode[JsonU8](case) or {
 			error_count++
 			continue // Expected failure, error handling works correctly
 		}

vlib/json2/tests/decoder_test.v

@@ -117,5 +117,6 @@ fn test_decode_missing_comma() {
 					"telnr": "+32333"
 				}
 			}'
-	user := json.decode[User](data) or { return }
+	_ := json.decode[User](data) or { return }
+	assert false
 }

vlib/json2/tests/json_sumtype_test.v

@@ -123,10 +123,10 @@ fn test_any_sum_type() {
 }
 
 fn test_sum_type_struct() {
-	if x := json.decode[Animal]('{"cat_name": "Tom"}') {
+	if _ := json.decode[Animal]('{"cat_name": "Tom"}') {
 		assert false
 	}
-	if x := json.decode[Animal]('{"dog_name": "Rex"}') {
+	if _ := json.decode[Animal]('{"dog_name": "Rex"}') {
 		assert false
 	}
 	assert json.decode[Animal]('{"dog_name": "Rex", "_type": "Dog"}')! == Animal(Dog{'Rex'})
@@ -155,13 +155,13 @@ fn test_sum_type_mixed() {
 // to be implemented
 fn test_sum_type_options_fail() {
 	assert json.decode[Maybes]('null')! == Maybes(?int(none))
-	if x := json.decode[Maybes]('99') {
+	if _ := json.decode[Maybes]('99') {
 		assert false
 	}
-	if x := json.decode[Maybes]('hi') {
+	if _ := json.decode[Maybes]('hi') {
 		assert false
 	}
-	if x := json.decode[Maybes]('true') {
+	if _ := json.decode[Maybes]('true') {
 		assert false
 	}
 }