From d16721e5b8e499efc7ac76b7404467ff05a74b2b Mon Sep 17 00:00:00 2001 From: Tim Basel Date: Sun, 17 Jan 2021 05:33:39 +0100 Subject: [PATCH] cli: remove flags.get_*_or variants (#8102) --- vlib/cli/flag.v | 20 -------------------- vlib/cli/{cli_flag_test.v => flag_test.v} | 0 2 files changed, 20 deletions(-) rename vlib/cli/{cli_flag_test.v => flag_test.v} (100%) diff --git a/vlib/cli/flag.v b/vlib/cli/flag.v index 411968dd54..d9ae118386 100644 --- a/vlib/cli/flag.v +++ b/vlib/cli/flag.v @@ -36,11 +36,6 @@ pub fn (flags []Flag) get_bool(name string) ?bool { return flag.get_bool() } -pub fn (flags []Flag) get_bool_or(name string, or_value bool) bool { - value := flags.get_bool(name) or { return or_value } - return value -} - pub fn (flag Flag) get_int() ?int { if flag.flag != .int { return error('$flag.name: Invalid flag type `$flag.flag`, expected `int`') @@ -53,11 +48,6 @@ pub fn (flags []Flag) get_int(name string) ?int { return flag.get_int() } -pub fn (flags []Flag) get_int_or(name string, or_value int) int { - value := flags.get_int(name) or { return or_value } - return value -} - pub fn (flag Flag) get_float() ?f64 { if flag.flag != .float { return error('$flag.name: Invalid flag type `$flag.flag`, expected `float`') @@ -70,11 +60,6 @@ pub fn (flags []Flag) get_float(name string) ?f64 { return flag.get_float() } -pub fn (flags []Flag) get_float_or(name string, or_value f64) f64 { - value := flags.get_float(name) or { return or_value } - return value -} - pub fn (flag Flag) get_string() ?string { if flag.flag != .string { return error('$flag.name: Invalid flag type `$flag.flag`, expected `string`') @@ -87,11 +72,6 @@ pub fn (flags []Flag) get_string(name string) ?string { return flag.get_string() } -pub fn (flags []Flag) get_string_or(name string, or_value string) string { - value := flags.get_string(name) or { return or_value } - return value -} - // parse flag value from arguments and return arguments with all consumed element removed fn (mut flag Flag) parse(args []string, with_abbrev bool) ?[]string { if flag.matches(args, with_abbrev) { diff --git a/vlib/cli/cli_flag_test.v b/vlib/cli/flag_test.v similarity index 100% rename from vlib/cli/cli_flag_test.v rename to vlib/cli/flag_test.v