summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/flags.rs16
-rw-r--r--src/main.rs13
2 files changed, 12 insertions, 17 deletions
diff --git a/src/flags.rs b/src/flags.rs
index 11a6cff68..0dd77de42 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -2,11 +2,9 @@
use getopts::Options;
use libc::c_int;
use libdeno;
-use log;
use std::ffi::CStr;
use std::ffi::CString;
use std::mem;
-use std::process::exit;
use std::vec::Vec;
// Creates vector of strings, Vec<String>
@@ -28,20 +26,6 @@ pub struct DenoFlags {
pub types_flag: bool,
}
-pub fn process(flags: &DenoFlags, usage_string: &str) {
- if flags.help {
- println!("{}", &usage_string);
- exit(0);
- }
-
- let log_level = if flags.log_debug {
- log::LevelFilter::Debug
- } else {
- log::LevelFilter::Info
- };
- log::set_max_level(log_level);
-}
-
pub fn get_usage(opts: &Options) -> String {
format!(
"Usage: deno script.ts {}
diff --git a/src/main.rs b/src/main.rs
index ca15d468b..c080da24c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -81,8 +81,19 @@ fn main() {
eprintln!("{}", err);
std::process::exit(1)
});
+
+ if flags.help {
+ println!("{}", &usage_string);
+ std::process::exit(0);
+ }
+
+ log::set_max_level(if flags.log_debug {
+ log::LevelFilter::Debug
+ } else {
+ log::LevelFilter::Info
+ });
+
let mut isolate = isolate::Isolate::new(flags, rest_argv, ops::dispatch);
- flags::process(&isolate.state.flags, &usage_string);
tokio_util::init(|| {
isolate
.execute("deno_main.js", "denoMain();")