mirror/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2023-08-10 21:13:21 +03:00
Code Issues Projects Releases Wiki Activity

checker: make using err.msg and err.code produce an *actual* notice, even with the present compatibility hack (will be *removed* in 2022-06-01)

Browse Source
This commit is contained in:
Delyan Angelov
2022-04-12 13:38:40 +03:00
parent 4c7cdd2a2d
commit 8788512c4d
28 changed files with 107 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
cmd/tools/vbin2v.v
View File

@ -77,7 +77,7 @@ fn (context Context) bname_and_bytes(file string) ?(string, []byte) {
fname := os.file_name(file)
fname_escaped := fname.replace_each(['.', '_', '-', '_'])
byte_name := '$context.prefix$fname_escaped'.to_lower()
fbytes := os.read_bytes(file) or { return error('Error: $err.msg') }
fbytes := os.read_bytes(file) or { return error('Error: $err.msg()') }
return byte_name, fbytes
}
@ -108,7 +108,7 @@ fn main() {
exit(0)
}
files := fp.finalize() or {
eprintln('Error: $err.msg')
eprintln('Error: $err.msg()')
exit(1)
}
real_files := files.filter(it != 'bin2v')
@ -123,7 +123,7 @@ fn main() {
mut file_byte_map := map[string][]byte{}
for file in real_files {
bname, fbytes := context.bname_and_bytes(file) or {
eprintln(err.msg)
eprintln(err.msg())
exit(1)
}
file_byte_map[bname] = fbytes

5
cmd/tools/vbuild-tools.v
View File

@ -66,8 +66,9 @@ fn main() {
}
target_path := os.join_path(tfolder, texe)
os.mv_by_cp(tpath, target_path) or {
if !err.msg.contains('vbuild-tools') && !err.msg.contains('vtest-all') {
eprintln('error while moving $tpath to $target_path: $err.msg')
emsg := err.msg()
if !emsg.contains('vbuild-tools') && !emsg.contains('vtest-all') {
eprintln('error while moving $tpath to $target_path: $emsg')
}
continue
}

6
cmd/tools/vdoc/vdoc.v
View File

@ -244,8 +244,8 @@ fn (vd VDoc) get_readme(path string) string {
fn (vd VDoc) emit_generate_err(err IError) {
cfg := vd.cfg
mut err_msg := err.msg
if err.code == 1 {
mut err_msg := err.msg()
if err.code() == 1 {
mod_list := get_modules_list(cfg.input_path, []string{})
println('Available modules:\n==================')
for mod in mod_list {
@ -467,7 +467,7 @@ fn parse_arguments(args []string) Config {
exit(1)
}
selected_platform := doc.platform_from_string(platform_str) or {
eprintln(err.msg)
eprintln(err.msg())
exit(1)
}
cfg.platform = selected_platform

2
cmd/tools/vfmt.v
View File

@ -82,7 +82,7 @@ fn main() {
eprintln('vfmt possible_files: ' + possible_files.str())
}
files := util.find_all_v_files(possible_files) or {
verror(err.msg)
verror(err.msg())
return
}
if os.is_atty(0) == 0 && files.len == 0 {

2
cmd/tools/vgret.v
View File

@ -211,7 +211,7 @@ fn generate_screenshots(mut opt Options, output_path string) ? {
app_config.screenshots_path = screenshot_path
app_config.screenshots = take_screenshots(opt, app_config) or {
return error('Failed taking screenshots of `$app_path`:\n$err.msg')
return error('Failed taking screenshots of `$app_path`:\n$err.msg()')
}
}
}

4
cmd/tools/vpm.v
View File

@ -485,7 +485,7 @@ fn vpm_remove(module_names []string) {
println('Removing module "$name" ...')
verbose_println('removing folder $final_module_path')
os.rmdir_all(final_module_path) or {
verbose_println('error while removing "$final_module_path": $err.msg')
verbose_println('error while removing "$final_module_path": $err.msg()')
}
// delete author directory if it is empty
author := name.split('.')[0]
@ -496,7 +496,7 @@ fn vpm_remove(module_names []string) {
if os.is_dir_empty(author_dir) {
verbose_println('removing author folder $author_dir')
os.rmdir(author_dir) or {
verbose_println('error while removing "$author_dir": $err.msg')
verbose_println('error while removing "$author_dir": $err.msg()')
}
}
}

8
cmd/tools/vself.v
View File

@ -30,7 +30,7 @@ fn main() {
// The user just wants an independent copy of v, and so we are done.
return
}
backup_old_version_and_rename_newer(short_v_name) or { panic(err.msg) }
backup_old_version_and_rename_newer(short_v_name) or { panic(err.msg()) }
println('V built successfully as executable "$vexe_name".')
}
@ -71,17 +71,17 @@ fn backup_old_version_and_rename_newer(short_v_name string) ?bool {
list_folder(short_v_name, 'before:', 'removing $bak_file ...')
if os.exists(bak_file) {
os.rm(bak_file) or { errors << 'failed removing $bak_file: $err.msg' }
os.rm(bak_file) or { errors << 'failed removing $bak_file: $err.msg()' }
}
list_folder(short_v_name, '', 'moving $v_file to $bak_file ...')
os.mv(v_file, bak_file) or { errors << err.msg }
os.mv(v_file, bak_file) or { errors << err.msg() }
list_folder(short_v_name, '', 'removing $v_file ...')
os.rm(v_file) or {}
list_folder(short_v_name, '', 'moving $v2_file to $v_file ...')
os.mv_by_cp(v2_file, v_file) or { panic(err.msg) }
os.mv_by_cp(v2_file, v_file) or { panic(err.msg()) }
list_folder(short_v_name, 'after:', '')

4
cmd/tools/vsymlink.v
View File

@ -106,7 +106,7 @@ fn setup_symlink_windows(vexe string) {
println('Symlink $vsymlink to $vexe created.')
println('Checking system %PATH%...')
reg_sys_env_handle := get_reg_sys_env_handle() or {
warn_and_exit(err.msg)
warn_and_exit(err.msg())
return
}
// TODO: Fix defers inside ifs
@ -133,7 +133,7 @@ fn setup_symlink_windows(vexe string) {
println('Adding symlink directory to system %PATH%...')
set_reg_value(reg_sys_env_handle, 'Path', new_sys_env_path) or {
C.RegCloseKey(reg_sys_env_handle)
warn_and_exit(err.msg)
warn_and_exit(err.msg())
}
println('Done.')
}

2
cmd/tools/vtest-parser.v
View File

@ -121,7 +121,7 @@ fn process_cli_args() &Context {
exit(0)
}
context.all_paths = fp.finalize() or {
context.error(err.msg)
context.error(err.msg())
exit(1)
}
if !context.is_worker && context.all_paths.len == 0 {

4
cmd/tools/vup.v
View File

@ -124,9 +124,9 @@ fn (app App) show_current_v_version() {
fn (app App) backup(file string) {
backup_file := '${file}_old.exe'
if os.exists(backup_file) {
os.rm(backup_file) or { eprintln('failed removing $backup_file: $err.msg') }
os.rm(backup_file) or { eprintln('failed removing $backup_file: $err.msg()') }
}
os.mv(file, backup_file) or { eprintln('failed moving $file: $err.msg') }
os.mv(file, backup_file) or { eprintln('failed moving $file: $err.msg()') }
}
fn (app App) git_command(command string) {