matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Add missing level of unpacking in cli helpers

Browse source
This commit is contained in:
Matthias Beyer 2016-04-12 21:56:01 +02:00
parent 92b471bb13
commit 1910dc0449
1 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
imag-link/src/main.rs
View file

@ -110,10 +110,15 @@ fn get_from_entry<'a>(rt: &'a Runtime) -> Option<FileLockEntry<'a>> {
rt.cli() rt.cli()
.subcommand_matches("internal") .subcommand_matches("internal")
.unwrap() // safe, we know there is an "internal" subcommand" .unwrap() // safe, we know there is an "internal" subcommand"
.subcommand_matches("add")
.unwrap() // safe, we know there is an "add" subcommand
.value_of("from") .value_of("from")
.and_then(|from_name| { .and_then(|from_name| {
match get_entry_by_name(rt, from_name) { match get_entry_by_name(rt, from_name) {
Err(e) => { trace_error(&e); None }, Err(e) => {
debug!("We couldn't get the entry from name: '{:?}'", from_name);
trace_error(&e); None
},
Ok(e) => Some(e), Ok(e) => Some(e),
} }
@ -124,6 +129,8 @@ fn get_to_entries<'a>(rt: &'a Runtime) -> Option<Vec<FileLockEntry<'a>>> {
rt.cli() rt.cli()
.subcommand_matches("internal") .subcommand_matches("internal")
.unwrap() // safe, we know there is an "internal" subcommand" .unwrap() // safe, we know there is an "internal" subcommand"
.subcommand_matches("add")
.unwrap() // safe, we know there is an "add" subcommand
.values_of("to") .values_of("to")
.map(|values| { .map(|values| {
let mut v = vec![]; let mut v = vec![];