mirrors/v
1
0
Fork 0
mirror of https://github.com/vlang/v.git synced 2025-09-16 07:52:32 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 24

all: bring back panic(err.msg) -> panic(err) (#9022)

Browse source
This commit is contained in:
spaceface 2021-03-01 00:18:14 +01:00 • committed by GitHub
parent ce115dcbe0
commit b712af56fd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
110 changed files with 383 additions and 387 deletions
Download patch file Download diff file Expand all files Collapse all files

4
vlib/cli/command.v
View file

@ -259,7 +259,7 @@ fn (cmd Command) check_version_flag() {
version_flag := cmd.flags.get_bool('version') or { return } // ignore error and handle command normally
if version_flag {
version_cmd := cmd.commands.get('version') or { return } // ignore error and handle command normally
version_cmd.execute(version_cmd) or { panic(err.msg) }
version_cmd.execute(version_cmd) or { panic(err) }
exit(0)
}
}
@ -280,7 +280,7 @@ fn (cmd Command) check_required_flags() {
pub fn (cmd Command) execute_help() {
if cmd.commands.contains('help') {
help_cmd := cmd.commands.get('help') or { return } // ignore error and handle command normally
help_cmd.execute(help_cmd) or { panic(err.msg) }
help_cmd.execute(help_cmd) or { panic(err) }
} else {
print(cmd.help_message())
}

2
vlib/cli/command_test.v
View file

@ -135,7 +135,7 @@ fn test_if_required_flags_get_set() {
}
fn flag_is_set_in_subcommand(cmd cli.Command) ? {
flag := cmd.flags.get_string('flag') or { panic(err.msg) }
flag := cmd.flags.get_string('flag') or { panic(err) }
assert flag == 'value'
}

78
vlib/cli/flag_test.v
View file

@ -5,16 +5,16 @@ fn test_if_string_flag_parses() {
flag: .string
name: 'flag'
}
flag.parse(['-flag', 'value1'], false) or { panic(err.msg) }
mut value := flag.get_string() or { panic(err.msg) }
flag.parse(['-flag', 'value1'], false) or { panic(err) }
mut value := flag.get_string() or { panic(err) }
assert value == 'value1'
flag = cli.Flag{
flag: .string
name: 'flag'
}
flag.parse(['-flag=value2'], false) or { panic(err.msg) }
value = flag.get_string() or { panic(err.msg) }
flag.parse(['-flag=value2'], false) or { panic(err) }
value = flag.get_string() or { panic(err) }
assert value == 'value2'
flag = cli.Flag{
@ -22,9 +22,9 @@ fn test_if_string_flag_parses() {
name: 'flag'
multiple: true
}
flag.parse(['-flag=value1'], false) or { panic(err.msg) }
flag.parse(['-flag=value2'], false) or { panic(err.msg) }
mut values := flag.get_strings() or { panic(err.msg) }
flag.parse(['-flag=value1'], false) or { panic(err) }
flag.parse(['-flag=value2'], false) or { panic(err) }
mut values := flag.get_strings() or { panic(err) }
assert values == ['value1', 'value2']
flags := [
@ -40,7 +40,7 @@ fn test_if_string_flag_parses() {
},
]
values = flags.get_strings('flag') or { panic(err.msg) }
values = flags.get_strings('flag') or { panic(err) }
assert values == ['a', 'b', 'c']
}
@ -50,20 +50,20 @@ fn test_if_bool_flag_parses() {
name: 'flag'
}
mut value := false
flag.parse(['-flag'], false) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-flag'], false) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == true
flag.parse(['-flag', 'false'], false) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-flag', 'false'], false) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == false
flag.parse(['-flag', 'true'], false) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-flag', 'true'], false) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == true
flag.parse(['-flag=false'], false) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-flag=false'], false) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == false
flag.parse(['-flag=true'], false) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-flag=true'], false) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == true
}
@ -74,8 +74,8 @@ fn test_if_int_flag_parses() {
}
mut value := 0
flag.parse(['-flag', '42'], false) or { panic(err.msg) }
value = flag.get_int() or { panic(err.msg) }
flag.parse(['-flag', '42'], false) or { panic(err) }
value = flag.get_int() or { panic(err) }
assert value == 42
flag = cli.Flag{
@ -83,8 +83,8 @@ fn test_if_int_flag_parses() {
name: 'flag'
}
flag.parse(['-flag=45'], false) or { panic(err.msg) }
value = flag.get_int() or { panic(err.msg) }
flag.parse(['-flag=45'], false) or { panic(err) }
value = flag.get_int() or { panic(err) }
assert value == 45
flag = cli.Flag{
@ -93,9 +93,9 @@ fn test_if_int_flag_parses() {
multiple: true
}
flag.parse(['-flag=42'], false) or { panic(err.msg) }
flag.parse(['-flag=45'], false) or { panic(err.msg) }
mut values := flag.get_ints() or { panic(err.msg) }
flag.parse(['-flag=42'], false) or { panic(err) }
flag.parse(['-flag=45'], false) or { panic(err) }
mut values := flag.get_ints() or { panic(err) }
assert values == [42, 45]
flags := [
@ -111,7 +111,7 @@ fn test_if_int_flag_parses() {
},
]
values = flags.get_ints('flag') or { panic(err.msg) }
values = flags.get_ints('flag') or { panic(err) }
assert values == [1, 2, 3]
}
@ -121,8 +121,8 @@ fn test_if_float_flag_parses() {
name: 'flag'
}
mut value := f64(0)
flag.parse(['-flag', '3.14158'], false) or { panic(err.msg) }
value = flag.get_float() or { panic(err.msg) }
flag.parse(['-flag', '3.14158'], false) or { panic(err) }
value = flag.get_float() or { panic(err) }
assert value == 3.14158
flag = cli.Flag{
@ -130,9 +130,9 @@ fn test_if_float_flag_parses() {
name: 'flag'
}
flag.parse(['-flag=3.14159'], false) or { panic(err.msg) }
flag.parse(['-flag=3.14159'], false) or { panic(err) }
assert flag.value[0].f64() == 3.14159
value = flag.get_float() or { panic(err.msg) }
value = flag.get_float() or { panic(err) }
assert value == 3.14159
flag = cli.Flag{
@ -141,9 +141,9 @@ fn test_if_float_flag_parses() {
multiple: true
}
flag.parse(['-flag=3.1'], false) or { panic(err.msg) }
flag.parse(['-flag=1.3'], false) or { panic(err.msg) }
mut values := flag.get_floats() or { panic(err.msg) }
flag.parse(['-flag=3.1'], false) or { panic(err) }
flag.parse(['-flag=1.3'], false) or { panic(err) }
mut values := flag.get_floats() or { panic(err) }
assert values == [3.1, 1.3]
flags := [
@ -159,7 +159,7 @@ fn test_if_float_flag_parses() {
},
]
values = flags.get_floats('flag') or { panic(err.msg) }
values = flags.get_floats('flag') or { panic(err) }
assert values == [1.1, 2.2, 3.3]
}
@ -170,8 +170,8 @@ fn test_if_flag_parses_with_abbrev() {
abbrev: 'f'
}
mut value := false
flag.parse(['--flag'], true) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['--flag'], true) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == true
value = false
@ -180,8 +180,8 @@ fn test_if_flag_parses_with_abbrev() {
name: 'flag'
abbrev: 'f'
}
flag.parse(['-f'], true) or { panic(err.msg) }
value = flag.get_bool() or { panic(err.msg) }
flag.parse(['-f'], true) or { panic(err) }
value = flag.get_bool() or { panic(err) }
assert value == true
}
@ -191,7 +191,7 @@ fn test_if_multiple_value_on_single_value() {
name: 'flag'
}
flag.parse(['-flag', '3.14158'], false) or { panic(err.msg) }
flag.parse(['-flag', '3.14158'], false) or { panic(err) }
if _ := flag.parse(['-flag', '3.222'], false) {
panic("No multiple value flag don't raise an error!")