From b0958073ba426db9636a98900a153af857e129c1 Mon Sep 17 00:00:00 2001
From: "Kevin (Kun) \"Kassimo\" Qian" <kevinkassimo@gmail.com>
Date: Sun, 16 Sep 2018 13:35:16 -0700
Subject: Remove remove_timer asserts (#760)

* Remove remove_timer asserts

* Add clearTimeout invalid id no-panic test

* Move timer test to its file AND some lint side-effects
---
 src/flags.rs    | 6 ++----
 src/handlers.rs | 8 ++------
 2 files changed, 4 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/flags.rs b/src/flags.rs
index 13f065735..2e4862218 100644
--- a/src/flags.rs
+++ b/src/flags.rs
@@ -154,8 +154,7 @@ fn parse_core_args(args: Vec<String>) -> (Vec<String>, Vec<String>) {
       }
 
       true
-    })
-    .collect();
+    }).collect();
 
   // Replace args being sent to V8
   for idx in 0..args.len() {
@@ -222,7 +221,6 @@ pub fn v8_set_flags(args: Vec<String>) -> Vec<String> {
       let cstr = CStr::from_ptr(*ptr as *const i8);
       let slice = cstr.to_str().unwrap();
       slice.to_string()
-    })
-    .chain(rest.into_iter())
+    }).chain(rest.into_iter())
     .collect()
 }
diff --git a/src/handlers.rs b/src/handlers.rs
index 0917fd22a..39f2d51aa 100644
--- a/src/handlers.rs
+++ b/src/handlers.rs
@@ -288,8 +288,7 @@ fn handle_env(d: *const DenoC, base: &msg::Base) -> Box<Op> {
           ..Default::default()
         },
       )
-    })
-    .collect();
+    }).collect();
   let tables = builder.create_vector(&vars);
   let msg = msg::EnvironRes::create(
     builder,
@@ -402,8 +401,7 @@ where
     .and_then(|_| {
       cb();
       Ok(())
-    })
-    .select(cancel_rx)
+    }).select(cancel_rx)
     .map(|_| ())
     .map_err(|_| ());
 
@@ -604,9 +602,7 @@ fn handle_write_file(d: *const DenoC, base: &msg::Base) -> Box<Op> {
 // TODO(ry) Use Deno instead of DenoC as first arg.
 fn remove_timer(d: *const DenoC, timer_id: u32) {
   let deno = from_c(d);
-  assert!(deno.timers.contains_key(&timer_id));
   deno.timers.remove(&timer_id);
-  assert!(!deno.timers.contains_key(&timer_id));
 }
 
 // Prototype: https://github.com/ry/deno/blob/golang/timers.go#L25-L39
-- 
cgit v1.2.3