implement and use From<bool> for enum and back

implement and use  From<bool> for EventBubbles (and back direction)
implement and use From<bool> for EventCancelable (and back direction)

1 files changed, 4 insertions, 12 deletions

diff --git a/components/script/dom/closeevent.rs b/components/script/dom/closeevent.rs
index edf0c6199df..b7181baa2ea 100644
--- a/components/script/dom/closeevent.rs
+++ b/components/script/dom/closeevent.rs
@@ -46,8 +46,8 @@ impl CloseEvent {
         {
             let event = ev.upcast::<Event>();
             event.init_event(type_,
-                             bubbles == EventBubbles::Bubbles,
-                             cancelable == EventCancelable::Cancelable);
+                             bool::from(bubbles),
+                             bool::from(cancelable));
         }
         ev
     }
@@ -56,16 +56,8 @@ impl CloseEvent {
                        type_: DOMString,
                        init: &CloseEventBinding::CloseEventInit)
                        -> Fallible<Root<CloseEvent>> {
-        let bubbles = if init.parent.bubbles {
-            EventBubbles::Bubbles
-        } else {
-            EventBubbles::DoesNotBubble
-        };
-        let cancelable = if init.parent.cancelable {
-            EventCancelable::Cancelable
-        } else {
-            EventCancelable::NotCancelable
-        };
+        let bubbles = EventBubbles::from(init.parent.bubbles);
+        let cancelable = EventCancelable::from(init.parent.cancelable);
         Ok(CloseEvent::new(global,
                            Atom::from(type_),
                            bubbles,