Align CLI generator with changes in string type handling

There was some duplicated logic here.
This commit is contained in:
Sebastian Thiel
2019-07-05 18:39:18 +08:00
parent aceb717ead
commit 5b370e4190
3 changed files with 2 additions and 4 deletions

View File

@@ -278,7 +278,7 @@ impl<'n> Engine<'n> {
let (key, value) = parse_kv_arg(&*parg, err, false);
match key {
"timed-count-duration" => {
call = call.timed_count_duration(arg_from_str(value.unwrap_or("-0"), err, "timed-count-duration", "int64"));
call = call.timed_count_duration(value.unwrap_or(""));
},
"time-range-period" => {
call = call.time_range_period(value.unwrap_or(""));

View File

@@ -56,7 +56,7 @@ impl<'n> Engine<'n> {
call = call.start_change_id(value.unwrap_or(""));
},
"max-change-id-count" => {
call = call.max_change_id_count(arg_from_str(value.unwrap_or("-0"), err, "max-change-id-count", "int64"));
call = call.max_change_id_count(value.unwrap_or(""));
},
"include-subscribed" => {
call = call.include_subscribed(arg_from_str(value.unwrap_or("false"), err, "include-subscribed", "boolean"));

View File

@@ -151,8 +151,6 @@ def docopt_mode(protocols):
# Returns a possibly remapped type, based on its name.
# Useful to map strings to more suitable types, i.e. counts
def actual_json_type(name, type):
if type == 'string' and 'Count' in name:
return 'int64'
return type
# return a string representing property `p` suitable for docopt argument parsing