From fb75d528eb20ea6cf0e1836d4308ae86002aa07d Mon Sep 17 00:00:00 2001
From: yuyi <yuyi98@163.com>
Date: Sat, 18 Sep 2021 01:56:33 +0800
Subject: [PATCH] builder: remove panics, when cleaning up tmp files after
 tests (#11525)

---
 vlib/v/builder/cc.v               | 2 +-
 vlib/v/builder/compile.v          | 2 +-
 vlib/v/builder/msvc.v             | 2 +-
 vlib/v/pref/pref.v                | 2 +-
 vlib/v/tests/repl/runner/runner.v | 4 ++--
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/vlib/v/builder/cc.v b/vlib/v/builder/cc.v
index 912d12732b..d61b78a46e 100644
--- a/vlib/v/builder/cc.v
+++ b/vlib/v/builder/cc.v
@@ -92,7 +92,7 @@ fn (mut v Builder) post_process_c_compiler_output(res os.Result) {
 				if v.pref.is_verbose {
 					eprintln('>> remove tmp file: $tmpfile')
 				}
-				os.rm(tmpfile) or { panic(err) }
+				os.rm(tmpfile) or {}
 			}
 		}
 		return
diff --git a/vlib/v/builder/compile.v b/vlib/v/builder/compile.v
index 199f23b0c4..4f7f7f8fe0 100644
--- a/vlib/v/builder/compile.v
+++ b/vlib/v/builder/compile.v
@@ -149,7 +149,7 @@ fn (mut v Builder) cleanup_run_executable_after_exit(exefile string) {
 		return
 	}
 	v.pref.vrun_elog('remove run executable: $exefile')
-	os.rm(exefile) or { panic(err) }
+	os.rm(exefile) or {}
 }
 
 // 'strings' => 'VROOT/vlib/strings'
diff --git a/vlib/v/builder/msvc.v b/vlib/v/builder/msvc.v
index a84c14829e..e556b2ae15 100644
--- a/vlib/v/builder/msvc.v
+++ b/vlib/v/builder/msvc.v
@@ -387,7 +387,7 @@ pub fn (mut v Builder) cc_msvc() {
 	// println(res)
 	// println('C OUTPUT:')
 	// Always remove the object file - it is completely unnecessary
-	os.rm(out_name_obj) or { panic(err) }
+	os.rm(out_name_obj) or {}
 }
 
 fn (mut v Builder) build_thirdparty_obj_file_with_msvc(path string, moduleflags []cflag.CFlag) {
diff --git a/vlib/v/pref/pref.v b/vlib/v/pref/pref.v
index 29a13fa857..ea0ec9d6b4 100644
--- a/vlib/v/pref/pref.v
+++ b/vlib/v/pref/pref.v
@@ -674,7 +674,7 @@ pub fn parse_args(known_external_commands []string, args []string) (&Preferences
 				os.rm(tmp_exe_file_path) or {}
 			}
 			res.vrun_elog('remove tmp v file: $tmp_v_file_path')
-			os.rm(tmp_v_file_path) or { panic(err) }
+			os.rm(tmp_v_file_path) or {}
 			exit(tmp_result)
 		}
 		must_exist(res.path)
diff --git a/vlib/v/tests/repl/runner/runner.v b/vlib/v/tests/repl/runner/runner.v
index 45a8f07400..f5f53667a9 100644
--- a/vlib/v/tests/repl/runner/runner.v
+++ b/vlib/v/tests/repl/runner/runner.v
@@ -52,10 +52,10 @@ pub fn run_repl_file(wd string, vexec string, file string) ?string {
 	rcmd := '"$vexec" repl -replfolder "$wd" -replprefix "${fname}." < $input_temporary_filename'
 	r := os.execute(rcmd)
 	if r.exit_code < 0 {
-		os.rm(input_temporary_filename) or { panic(err) }
+		os.rm(input_temporary_filename) ?
 		return error('Could not execute: $rcmd')
 	}
-	os.rm(input_temporary_filename) or { panic(err) }
+	os.rm(input_temporary_filename) ?
 	result := r.output.replace('\r', '').replace('>>> ', '').replace('>>>', '').replace('... ',
 		'').replace(wd + os.path_separator, '').replace(vexec_folder, '').replace('\\',
 		'/').trim_right('\n\r')