matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

imag-link: Use util function warn_exit()

Browse source
This commit is contained in:
Matthias Beyer 2016-09-05 19:29:06 +02:00
parent a200031eb1
commit ac5ee9fb51
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -26,7 +26,6 @@ extern crate libimagstore;
extern crate libimagerror; extern crate libimagerror;
extern crate libimagutil; extern crate libimagutil;
use std::process::exit;
use std::ops::Deref; use std::ops::Deref;
use libimagrt::runtime::Runtime; use libimagrt::runtime::Runtime;
@ -38,6 +37,7 @@ use libimagstore::store::Store;
use libimagerror::trace::{trace_error, trace_error_exit}; use libimagerror::trace::{trace_error, trace_error_exit};
use libimagentrylink::external::ExternalLinker; use libimagentrylink::external::ExternalLinker;
use libimagutil::warn_result::*; use libimagutil::warn_result::*;
use libimagutil::warn_exit::warn_exit;
use clap::ArgMatches; use clap::ArgMatches;
use url::Url; use url::Url;
@ -57,10 +57,7 @@ fn main() {
match name { match name {
"internal" => handle_internal_linking(&rt), "internal" => handle_internal_linking(&rt),
"external" => handle_external_linking(&rt), "external" => handle_external_linking(&rt),
_ => { _ => warn_exit("No commandline call", 1)
warn!("No commandline call");
exit(1);
},
} }
}); });
} }
@ -112,8 +109,7 @@ fn handle_internal_linking(rt: &Runtime) {
let mut from = { let mut from = {
let from = get_from_entry(&rt); let from = get_from_entry(&rt);
if from.is_none() { if from.is_none() {
warn!("No 'from' entry"); warn_exit("No 'from' entry", 1);
exit(1);
} }
from.unwrap() from.unwrap()
}; };
@ -122,8 +118,7 @@ fn handle_internal_linking(rt: &Runtime) {
let to = { let to = {
let to = get_to_entries(&rt); let to = get_to_entries(&rt);
if to.is_none() { if to.is_none() {
warn!("No 'to' entry"); warn_exit("No 'to' entry", 1);
exit(1);
} }
to.unwrap() to.unwrap()
}; };