diff options
author | Ryan Dahl <ry@tinyclouds.org> | 2018-09-02 01:59:16 -0400 |
---|---|---|
committer | Ryan Dahl <ry@tinyclouds.org> | 2018-09-03 10:45:58 -0400 |
commit | 787832c68ec2a735717eb32c295a3aa570294ae2 (patch) | |
tree | fa3fa70a0a6fac546e11e8e9f9229a3e7b29e2ca /src | |
parent | f949ded933aad669b952adcaa5a92f8a5df2b38e (diff) |
Format.
Diffstat (limited to 'src')
-rw-r--r-- | src/flags.rs | 22 | ||||
-rw-r--r-- | src/handlers.rs | 23 |
2 files changed, 31 insertions, 14 deletions
diff --git a/src/flags.rs b/src/flags.rs index 851bacb6b..05c7cf872 100644 --- a/src/flags.rs +++ b/src/flags.rs @@ -61,7 +61,9 @@ pub fn set_flags(args: Vec<String>) -> (DenoFlags, Vec<String>) { fn test_set_flags_1() { let (flags, rest) = set_flags(svec!["deno", "--version"]); assert_eq!(rest, svec!["deno"]); - assert_eq!(flags, DenoFlags { + assert_eq!( + flags, + DenoFlags { version: true, ..DenoFlags::default() } @@ -72,7 +74,9 @@ fn test_set_flags_1() { fn test_set_flags_2() { let (flags, rest) = set_flags(svec!["deno", "-r", "-D", "script.ts"]); assert_eq!(rest, svec!["deno", "script.ts"]); - assert_eq!(flags, DenoFlags { + assert_eq!( + flags, + DenoFlags { log_debug: true, reload: true, ..DenoFlags::default() @@ -85,7 +89,9 @@ fn test_set_flags_3() { let (flags, rest) = set_flags(svec!["deno", "-r", "script.ts", "--allow-write"]); assert_eq!(rest, svec!["deno", "script.ts"]); - assert_eq!(flags, DenoFlags { + assert_eq!( + flags, + DenoFlags { reload: true, allow_write: true, ..DenoFlags::default() @@ -125,13 +131,19 @@ fn parse_core_args(args: Vec<String>) -> (Vec<String>, Vec<String>) { fn test_parse_core_args_1() { let js_args = parse_core_args(vec!["deno".to_string(), "--v8-options".to_string()]); - assert_eq!(js_args, (vec!["deno".to_string(), "--help".to_string()], vec![])); + assert_eq!( + js_args, + (vec!["deno".to_string(), "--help".to_string()], vec![]) + ); } #[test] fn test_parse_core_args_2() { let js_args = parse_core_args(vec!["deno".to_string(), "--help".to_string()]); - assert_eq!(js_args, (vec!["deno".to_string()], vec!["--help".to_string()])); + assert_eq!( + js_args, + (vec!["deno".to_string()], vec!["--help".to_string()]) + ); } // Pass the command line arguments to v8. diff --git a/src/handlers.rs b/src/handlers.rs index 407ecf5c8..7950423d2 100644 --- a/src/handlers.rs +++ b/src/handlers.rs @@ -284,16 +284,21 @@ fn handle_env( return Err(err.into()); } - let vars: Vec<_> = std::env::vars().map(|(key, value)| { - let key = builder.create_string(&key); - let value = builder.create_string(&value); - - msg::EnvPair::create(builder, &msg::EnvPairArgs { - key: Some(key), - value: Some(value), - ..Default::default() + let vars: Vec<_> = std::env::vars() + .map(|(key, value)| { + let key = builder.create_string(&key); + let value = builder.create_string(&value); + + msg::EnvPair::create( + builder, + &msg::EnvPairArgs { + key: Some(key), + value: Some(value), + ..Default::default() + }, + ) }) - }).collect(); + .collect(); let tables = builder.create_vector_of_reverse_offsets(&vars); |