checker: cleanup err removal (#25043)

felipensp · web-flow · commit af89eb27c7f6 · 2025-08-05T21:16:22.000+03:00
diff --git a/vlib/v/checker/fn.v b/vlib/v/checker/fn.v
@@ -3812,15 +3812,15 @@ fn (mut c Checker) check_for_mut_receiver(mut expr ast.Expr) (string, token.Pos)
 }
 
 fn scope_register_it(mut s ast.Scope, pos token.Pos, typ ast.Type) {
-	scope_register_var_name(mut s, pos, typ, 'it')
+	scope_register_special_var_name(mut s, pos, typ, 'it')
 }
 
 fn scope_register_a_b(mut s ast.Scope, pos token.Pos, typ ast.Type) {
-	scope_register_var_name(mut s, pos, typ.ref(), 'a')
-	scope_register_var_name(mut s, pos, typ.ref(), 'b')
+	scope_register_special_var_name(mut s, pos, typ.ref(), 'a')
+	scope_register_special_var_name(mut s, pos, typ.ref(), 'b')
 }
 
-fn scope_register_var_name(mut s ast.Scope, pos token.Pos, typ ast.Type, name string) {
+fn scope_register_special_var_name(mut s ast.Scope, pos token.Pos, typ ast.Type, name string) {
 	s.register(ast.Var{
 		name:       name
 		pos:        pos
diff --git a/vlib/v/gen/c/cgen.v b/vlib/v/gen/c/cgen.v
@@ -7177,7 +7177,7 @@ fn (mut g Gen) or_block(var_name string, or_block ast.OrExpr, return_type ast.Ty
 	}
 	if or_block.kind == .block {
 		g.or_expr_return_type = return_type.clear_option_and_result()
-		if !g.pref.skip_unused || or_block.err_used
+		if or_block.err_used
 			|| (g.fn_decl != unsafe { nil } && (g.fn_decl.is_main || g.fn_decl.is_test)) {
 			g.writeln('\tIError err = ${cvar_name}${tmp_op}err;')
 		}
diff --git a/vlib/v/gen/c/if.v b/vlib/v/gen/c/if.v
@@ -311,7 +311,7 @@ fn (mut g Gen) if_expr(node ast.IfExpr) {
 			// define `err` for the last branch after a `if val := opt {...}' guard
 			if is_guard && guard_idx == i - 1 {
 				if err_var := branch.scope.find_var('err') {
-					if !g.pref.skip_unused || err_var.is_used {
+					if err_var.is_used {
 						cvar_name := guard_vars[guard_idx]
 						g.writeln('\tIError err = ${cvar_name}.err;')
 					}

Original file line number	Diff line number	Diff line change
`@@ -3812,15 +3812,15 @@ fn (mut c Checker) check_for_mut_receiver(mut expr ast.Expr) (string, token.Pos)`
`3812`	`3812`	`}`
`3813`	`3813`
`3814`	`3814`	`fn scope_register_it(mut s ast.Scope, pos token.Pos, typ ast.Type) {`
`3815`		`- scope_register_var_name(mut s, pos, typ, 'it')`
	`3815`	`+ scope_register_special_var_name(mut s, pos, typ, 'it')`
`3816`	`3816`	`}`
`3817`	`3817`
`3818`	`3818`	`fn scope_register_a_b(mut s ast.Scope, pos token.Pos, typ ast.Type) {`
`3819`		`- scope_register_var_name(mut s, pos, typ.ref(), 'a')`
`3820`		`- scope_register_var_name(mut s, pos, typ.ref(), 'b')`
	`3819`	`+ scope_register_special_var_name(mut s, pos, typ.ref(), 'a')`
	`3820`	`+ scope_register_special_var_name(mut s, pos, typ.ref(), 'b')`
`3821`	`3821`	`}`
`3822`	`3822`
`3823`		`-fn scope_register_var_name(mut s ast.Scope, pos token.Pos, typ ast.Type, name string) {`
	`3823`	`+fn scope_register_special_var_name(mut s ast.Scope, pos token.Pos, typ ast.Type, name string) {`
`3824`	`3824`	`s.register(ast.Var{`
`3825`	`3825`	`name: name`
`3826`	`3826`	`pos: pos`
Original file line number	Diff line number	Diff line change
`@@ -7177,7 +7177,7 @@ fn (mut g Gen) or_block(var_name string, or_block ast.OrExpr, return_type ast.Ty`
`7177`	`7177`	`}`
`7178`	`7178`	`if or_block.kind == .block {`
`7179`	`7179`	`g.or_expr_return_type = return_type.clear_option_and_result()`
`7180`		`- if !g.pref.skip_unused \|\| or_block.err_used`
	`7180`	`+ if or_block.err_used`
`7181`	`7181`	`\|\| (g.fn_decl != unsafe { nil } && (g.fn_decl.is_main \|\| g.fn_decl.is_test)) {`
`7182`	`7182`	`g.writeln('\tIError err = ${cvar_name}${tmp_op}err;')`
`7183`	`7183`	`}`
Original file line number	Diff line number	Diff line change
`@@ -311,7 +311,7 @@ fn (mut g Gen) if_expr(node ast.IfExpr) {`
`311`	`311`	// define `err` for the last branch after a `if val := opt {...}' guard
`312`	`312`	`if is_guard && guard_idx == i - 1 {`
`313`	`313`	`if err_var := branch.scope.find_var('err') {`
`314`		`- if !g.pref.skip_unused \|\| err_var.is_used {`
	`314`	`+ if err_var.is_used {`
`315`	`315`	`cvar_name := guard_vars[guard_idx]`
`316`	`316`	`g.writeln('\tIError err = ${cvar_name}.err;')`
`317`	`317`	`}`