all: super_batch6 fixes

Author: medvednikov

bench/bench_gc.v

@@ -269,8 +269,7 @@ fn run_comparison() {
 
 	// Print comparison table
 	println('')
-	println('  ${rpad('test', 44)} ${lpad('boehm', 9)} ${lpad('vgc', 9)} ${lpad('ratio',
-		9)}')
+	println('  ${rpad('test', 44)} ${lpad('boehm', 9)} ${lpad('vgc', 9)} ${lpad('ratio', 9)}')
 	println('  ${'—'.repeat(44)} ${'—'.repeat(9)} ${'—'.repeat(9)} ${'—'.repeat(9)}')
 
 	for ti in 0 .. 5 {
@@ -287,8 +286,8 @@ fn run_comparison() {
 			''
 		}
 		label := '${ratio:.2f}x${winner}'
-		println('  ${rpad(test_name(ti), 44)} ${lpad('${mb} ms', 9)} ${lpad('${mv} ms',
-			9)} ${lpad(label, 9)}')
+		println('  ${rpad(test_name(ti), 44)} ${lpad('${mb} ms', 9)} ${lpad('${mv} ms', 9)} ${lpad(label,
+			9)}')
 	}
 
 	// Heap usage

bench/bench_soa_structs.v

@@ -374,6 +374,7 @@ fn main() {
 	mut soa_integrate := build_soa()
 	result_aos_integrate := bench_integrate_aos(mut aos_integrate)
 	result_soa_integrate := bench_integrate_soa(mut soa_integrate)
-	print_result('integrate position, velocity, and life', result_aos_integrate, result_soa_integrate)
+	print_result('integrate position, velocity, and life', result_aos_integrate,
+		result_soa_integrate)
 	C.Particle_SOA_free(&soa_integrate)
 }

ci/common/runner.v

@@ -7,13 +7,23 @@ import time
 
 // exec is a helper function, to execute commands and exit early, if they fail.
 pub fn exec(command string) {
-	log.info('cmd: ${command}')
-	result := os.system(command)
+	cmd := resolve_v_command(command)
+	log.info('cmd: ${cmd}')
+	result := os.system(cmd)
 	if result != 0 {
 		exit(result)
 	}
 }
 
+// resolve_v_command ensures that commands starting with `v ` use the V from @VEXEROOT,
+// not a potentially different V found via PATH.
+fn resolve_v_command(command string) string {
+	if command.starts_with('v ') {
+		return os.quoted_path(os.join_path_single(@VEXEROOT, 'v')) + command[1..]
+	}
+	return command
+}
+
 // unset is a helper function to unset a specific env variable.
 pub fn unset(evar string) {
 	log.info('unsetting env variable: ${evar}')
@@ -37,7 +47,7 @@ pub fn file_size_greater_than(fpath string, min_fsize u64) {
 	}
 }
 
-const self_command = 'v ' +
+const self_command = os.quoted_path(os.join_path_single(@VEXEROOT, 'v')) + ' ' +
 	os.real_path(os.executable()).replace_once(os.real_path(@VEXEROOT), '').trim_left('/\\') +
 	'.vsh'
 

cmd/tools/changelog_helper.v

@@ -265,6 +265,7 @@ fn (mut app App) process_line(text string) ! {
 			}
 			else {}
 		}
+
 		app.counter++
 	} else {
 		line := Line{category, s}

cmd/tools/modules/testing/output_normal.v

@@ -114,6 +114,7 @@ fn (r &NormalReporter) show_longest(label string, limit int, kind TaskKind) {
 			tasks = mall.values()
 		}
 	}
+
 	tasks.sort(a.duration > b.duration)
 	for tidx, task in tasks {
 		npath := task.path.replace('\\', '/').replace(r.vroot, '')

cmd/tools/vast/vast.v

@@ -10,6 +10,7 @@ import v.pref
 import v.errors
 import v.checker
 import strings
+import context
 
 struct Context {
 mut:
@@ -397,6 +398,7 @@ fn (t Tree) scope_object(node ast.ScopeObject) &Node {
 		ast.Var { t.var(node) }
 		ast.AsmRegister { t.asm_register(node) }
 	}
+
 	return obj
 }
 
@@ -488,6 +490,7 @@ fn (t Tree) stmt(node ast.Stmt) &Node {
 		ast.EmptyStmt { return t.empty_stmt(node) }
 		ast.DebuggerStmt { return t.debugger_stmt(node) }
 	}
+
 	return t.null_node()
 }
 

cmd/tools/vcheck-md.v

@@ -586,6 +586,7 @@ fn (mut f MDFile) check_link_target_match(ad AnchorData) {
 							anchor.line
 						}
 					}
+
 					wprintln(wline(f.path, line, 0,
 						'multiple link target for non existing link (#${link})'))
 					found_error_warning = true

cmd/tools/vcomplete.v

@@ -533,6 +533,7 @@ fn auto_complete(args []string) {
 		}
 		else {}
 	}
+
 	exit(0)
 }
 
@@ -653,6 +654,7 @@ fn auto_complete_request(args []string) []string {
 					}
 				}
 			}
+
 			// Clear the list if the result is identical to the part examined
 			// (the flag must have already been completed)
 			if list.len == 1 && part == list[0] {
@@ -798,6 +800,7 @@ Register-ArgumentCompleter -Native -CommandName v -ScriptBlock {
 		}
 		else {}
 	}
+
 	return setup
 }
 

cmd/tools/vcompress.v

@@ -22,6 +22,7 @@ fn main() {
 			exit(1)
 		}
 	}
+
 	path := os.args[3]
 	content := os.read_bytes(path) or {
 		eprintln('unable to read "${path}": ${err}')
@@ -35,6 +36,7 @@ fn main() {
 			}
 		}
 	}
+
 	out_path := os.args[4]
 
 	os.write_file_array(out_path, compressed) or {

cmd/tools/vcreate/vcreate.v

@@ -331,5 +331,6 @@ fn (mut c Create) create_files_and_directories() {
 		.lib { 'library' }
 		.web { 'web' }
 	}
+
 	println('Created ${kind} project `${c.name}`')
 }