vlib: use defer(fn) { syntax where appropriate (part 2 of #25639) (#25653)

Author: StunxFS

cmd/tools/vbug.v

@@ -67,7 +67,7 @@ fn get_v_build_output(is_verbose bool, is_yes bool, file_path string, user_args
 	}
 	if result.exit_code == 0 {
 		real_generated_file := os.real_path(generated_file)
-		defer {
+		defer(fn) {
 			os.rm(generated_file) or {
 				if is_verbose {
 					elog('> unable to delete generated file: ${err}')

vlib/net/mbedtls/ssl_connection.c.v

@@ -522,7 +522,7 @@ pub fn (s &SSLConn) peer_addr() !net.Addr {
 pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
 	mut res := 0
 	$if trace_ssl ? {
-		defer {
+		defer(fn) {
 			if len > 0 {
 				eprintln('${@METHOD} res: ${res}: buf_ptr: ${voidptr(buf_ptr):x}, len: ${len}, hex: ${unsafe { buf_ptr.vbytes(len).hex() }} data: `${unsafe { buf_ptr.vstring_with_len(len) }}`')
 			}
@@ -590,7 +590,7 @@ pub fn (mut s SSLConn) read(mut buffer []u8) !int {
 pub fn (mut s SSLConn) write_ptr(bytes &u8, len int) !int {
 	mut total_sent := 0
 	$if trace_ssl ? {
-		defer {
+		defer(fn) {
 			eprintln('${@METHOD} total_sent: ${total_sent}, bytes: ${voidptr(bytes):x}, len: ${len}, hex: ${unsafe { bytes.vbytes(len).hex() }}, data:-=-=-=-\n${unsafe { bytes.vstring_with_len(len) }}\n-=-=-=-')
 		}
 	}

vlib/net/openssl/ssl_connection.c.v

@@ -270,7 +270,7 @@ pub fn (s &SSLConn) peer_addr() !net.Addr {
 pub fn (mut s SSLConn) socket_read_into_ptr(buf_ptr &u8, len int) !int {
 	mut res := 0
 	$if trace_ssl ? {
-		defer {
+		defer(fn) {
 			if len > 0 {
 				eprintln('${@METHOD} res: ${res}: buf_ptr: ${voidptr(buf_ptr):x}, len: ${len}, hex: ${unsafe { buf_ptr.vbytes(len).hex() }} data: `${unsafe { buf_ptr.vstring_with_len(len) }}`')
 			}
@@ -338,7 +338,7 @@ pub fn (mut s SSLConn) read(mut buffer []u8) !int {
 pub fn (mut s SSLConn) write_ptr(bytes &u8, len int) !int {
 	mut total_sent := 0
 	$if trace_ssl ? {
-		defer {
+		defer(fn) {
 			eprintln('${@METHOD} total_sent: ${total_sent}, bytes: ${voidptr(bytes):x}, len: ${len}, hex: ${unsafe { bytes.vbytes(len).hex() }}, data:-=-=-=-\n${unsafe { bytes.vstring_with_len(len) }}\n-=-=-=-')
 		}
 	}

vlib/os/os.c.v

@@ -753,7 +753,7 @@ pub fn executable() string {
 		if unsafe { C.sysctl(&mib[0], mib.len, C.NULL, &bufsize, C.NULL, 0) } == 0 {
 			if bufsize > max_path_buffer_size {
 				pbuf = unsafe { &&u8(malloc(int(bufsize))) }
-				defer {
+				defer(fn) {
 					unsafe { free(pbuf) }
 				}
 			}
@@ -856,9 +856,7 @@ pub fn real_path(fpath string) string {
 		}
 		file := C.CreateFile(fpath_wide, 0x80000000, 1, 0, 3, 0x80, 0)
 		if file != voidptr(-1) {
-			defer {
-				C.CloseHandle(file)
-			}
+			defer { C.CloseHandle(file) }
 			// https://docs.microsoft.com/en-us/windows/win32/api/fileapi/nf-fileapi-getfinalpathnamebyhandlew
 			final_len := C.GetFinalPathNameByHandleW(file, pu16_fullpath, max_path_buffer_size,
 				0)

vlib/os/process_windows.c.v

@@ -152,7 +152,7 @@ fn (mut p Process) win_spawn_process() int {
 		}
 		env_block << u16(0)
 		creation_flags |= C.CREATE_UNICODE_ENVIRONMENT
-		defer {
+		defer(fn) {
 			unsafe { env_block.free() }
 		}
 	}

vlib/v/ast/table.v

@@ -907,7 +907,7 @@ fn (mut t Table) rewrite_already_registered_symbol(typ TypeSymbol, existing_idx
 pub fn (mut t Table) register_sym(sym TypeSymbol) int {
 	mut idx := -2
 	$if trace_register_sym ? {
-		defer {
+		defer(fn) {
 			eprintln('>> register_sym: ${sym.name:-60} | idx: ${idx}')
 		}
 	}

vlib/v/checker/assign.v

@@ -207,7 +207,7 @@ fn (mut c Checker) assign_stmt(mut node ast.AssignStmt) {
 			mut expr := node.right[i]
 			if left is ast.Ident && left.is_mut() && expr is ast.StructInit && expr.is_anon {
 				c.anon_struct_should_be_mut = true
-				defer {
+				defer(fn) {
 					c.anon_struct_should_be_mut = false
 				}
 			}

vlib/v/checker/checker.v

@@ -3233,7 +3233,7 @@ pub fn (mut c Checker) expr(mut node ast.Expr) ast.Type {
 		ast.LambdaExpr {
 			c.inside_lambda = true
 			c.table.cur_lambda = unsafe { &node }
-			defer {
+			defer(fn) {
 				c.inside_lambda = false
 				c.table.cur_lambda = unsafe { nil }
 			}

vlib/v/checker/for.v

@@ -169,7 +169,7 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
 				c.type_resolver.update_ct_type(node.val_var, val_type)
 				node.scope.update_ct_var_kind(node.val_var, .value_var)
 
-				defer {
+				defer(fn) {
 					c.type_resolver.type_map.delete(node.val_var)
 				}
 			}
@@ -194,7 +194,7 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
 					c.type_resolver.update_ct_type(node.key_var, key_type)
 					node.scope.update_ct_var_kind(node.key_var, .key_var)
 
-					defer {
+					defer(fn) {
 						c.type_resolver.type_map.delete(node.key_var)
 					}
 				}
@@ -211,7 +211,7 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
 				c.type_resolver.update_ct_type(node.val_var, value_type)
 				node.scope.update_ct_var_kind(node.val_var, .value_var)
 
-				defer {
+				defer(fn) {
 					c.type_resolver.type_map.delete(node.val_var)
 				}
 			}
@@ -236,7 +236,7 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
 					c.type_resolver.update_ct_type(node.key_var, key_type)
 					node.scope.update_ct_var_kind(node.key_var, .key_var)
 
-					defer {
+					defer(fn) {
 						c.type_resolver.type_map.delete(node.key_var)
 					}
 				}
@@ -300,7 +300,7 @@ fn (mut c Checker) for_in_stmt(mut node ast.ForInStmt) {
 				c.type_resolver.update_ct_type(node.val_var, value_type)
 				node.scope.update_ct_var_kind(node.val_var, .value_var)
 
-				defer {
+				defer(fn) {
 					c.type_resolver.type_map.delete(node.val_var)
 				}
 			}

vlib/v/checker/if.v

@@ -77,7 +77,7 @@ fn (mut c Checker) if_expr(mut node ast.IfExpr) ast.Type {
 	former_expected_type := c.expected_type
 	if node_is_expr {
 		c.expected_expr_type = c.expected_type
-		defer {
+		defer(fn) {
 			c.expected_expr_type = ast.void_type
 		}
 	}