0
0
Fork 0
mirror of https://github.com/denoland/deno.git synced 2025-02-12 16:59:32 -05:00
This commit is contained in:
Bert Belder 2018-09-16 18:37:05 -07:00
parent b0958073ba
commit bdfaf12186
No known key found for this signature in database
GPG key ID: 7A77887B2E2ED461
2 changed files with 8 additions and 4 deletions

View file

@ -154,7 +154,8 @@ fn parse_core_args(args: Vec<String>) -> (Vec<String>, Vec<String>) {
} }
true true
}).collect(); })
.collect();
// Replace args being sent to V8 // Replace args being sent to V8
for idx in 0..args.len() { for idx in 0..args.len() {
@ -221,6 +222,7 @@ pub fn v8_set_flags(args: Vec<String>) -> Vec<String> {
let cstr = CStr::from_ptr(*ptr as *const i8); let cstr = CStr::from_ptr(*ptr as *const i8);
let slice = cstr.to_str().unwrap(); let slice = cstr.to_str().unwrap();
slice.to_string() slice.to_string()
}).chain(rest.into_iter()) })
.chain(rest.into_iter())
.collect() .collect()
} }

View file

@ -288,7 +288,8 @@ fn handle_env(d: *const DenoC, base: &msg::Base) -> Box<Op> {
..Default::default() ..Default::default()
}, },
) )
}).collect(); })
.collect();
let tables = builder.create_vector(&vars); let tables = builder.create_vector(&vars);
let msg = msg::EnvironRes::create( let msg = msg::EnvironRes::create(
builder, builder,
@ -401,7 +402,8 @@ where
.and_then(|_| { .and_then(|_| {
cb(); cb();
Ok(()) Ok(())
}).select(cancel_rx) })
.select(cancel_rx)
.map(|_| ()) .map(|_| ())
.map_err(|_| ()); .map_err(|_| ());