From 87800fa902115b92f145bba2374932d5f6ac4093 Mon Sep 17 00:00:00 2001
From: Guillaume Gomez <guillaume1.gomez@gmail.com>
Date: Tue, 12 Jul 2016 23:33:49 +0200
Subject: [PATCH] Replace AdjacentPosition::parse by TryFrom

---
 components/script/dom/element.rs | 13 ++++++++-----
 components/script/lib.rs         |  1 +
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs
index 6b671d6fe6b..a4c1ed28583 100644
--- a/components/script/dom/element.rs
+++ b/components/script/dom/element.rs
@@ -78,6 +78,7 @@ use selectors::parser::{AttrSelector, NamespaceConstraint, parse_author_origin_s
 use std::ascii::AsciiExt;
 use std::borrow::Cow;
 use std::cell::{Cell, Ref};
+use std::convert::TryFrom;
 use std::default::Default;
 use std::mem;
 use std::sync::Arc;
@@ -126,8 +127,10 @@ pub enum AdjacentPosition {
     BeforeEnd,
 }
 
-impl AdjacentPosition {
-    pub fn parse(position: &str) -> Fallible<AdjacentPosition> {
+impl<'a> TryFrom<&'a str> for AdjacentPosition {
+    type Err = Error;
+
+    fn try_from(position: &'a str) -> Result<AdjacentPosition, Self::Err> {
         match_ignore_ascii_case! { &*position,
             "beforebegin" => Ok(AdjacentPosition::BeforeBegin),
             "afterbegin"  => Ok(AdjacentPosition::AfterBegin),
@@ -2028,7 +2031,7 @@ impl ElementMethods for Element {
     // https://dom.spec.whatwg.org/#dom-element-insertadjacentelement
     fn InsertAdjacentElement(&self, where_: DOMString, element: &Element)
                              -> Fallible<Option<Root<Element>>> {
-        let where_ = try!(AdjacentPosition::parse(&*where_));
+        let where_ = try!(AdjacentPosition::try_from(&*where_));
         let inserted_node = try!(self.insert_adjacent(where_, element.upcast()));
         Ok(inserted_node.map(|node| Root::downcast(node).unwrap()))
     }
@@ -2040,7 +2043,7 @@ impl ElementMethods for Element {
         let text = Text::new(data, &document_from_node(self));
 
         // Step 2.
-        let where_ = try!(AdjacentPosition::parse(&*where_));
+        let where_ = try!(AdjacentPosition::try_from(&*where_));
         self.insert_adjacent(where_, text.upcast()).map(|_| ())
     }
 
@@ -2048,7 +2051,7 @@ impl ElementMethods for Element {
     fn InsertAdjacentHTML(&self, position: DOMString, text: DOMString)
                           -> ErrorResult {
         // Step 1.
-        let position = try!(AdjacentPosition::parse(&*position));
+        let position = try!(AdjacentPosition::try_from(&*position));
 
         let context = match position {
             AdjacentPosition::BeforeBegin | AdjacentPosition::AfterEnd => {
diff --git a/components/script/lib.rs b/components/script/lib.rs
index ebc5b4a1686..2744115aff1 100644
--- a/components/script/lib.rs
+++ b/components/script/lib.rs
@@ -19,6 +19,7 @@
 #![feature(slice_patterns)]
 #![feature(stmt_expr_attributes)]
 #![feature(question_mark)]
+#![feature(try_from)]
 
 #![deny(unsafe_code)]
 #![allow(non_snake_case)]