servo: Merge #16139 - Update rustc to 1.17.0-nightly (7dd4e2db7 2017-03-26) (from servo:rustup); r=emilio
authorAnthony Ramine <n.oxyde@gmail.com>
Sun, 26 Mar 2017 11:36:51 -0700
changeset 551734 4f8a85226fc8d938f5f4dbe7899126ce4865f372
parent 551733 be5bc1b5a566ff1ab434dfce1d40666061339973
child 551735 e2be4a6b2e00e7d1324197b71315316feb752e1a
push id51151
push usergijskruitbosch@gmail.com
push dateMon, 27 Mar 2017 12:23:52 +0000
reviewersemilio
milestone55.0a1
servo: Merge #16139 - Update rustc to 1.17.0-nightly (7dd4e2db7 2017-03-26) (from servo:rustup); r=emilio Source-Repo: https://github.com/servo/servo Source-Revision: 7f2a4e01b1c989f86a7a80af5ffe16ec93c34809
servo/components/script/dom/element.rs
servo/rust-commit-hash
--- a/servo/components/script/dom/element.rs
+++ b/servo/components/script/dom/element.rs
@@ -175,19 +175,19 @@ impl ElementCreator {
 pub enum AdjacentPosition {
     BeforeBegin,
     AfterEnd,
     AfterBegin,
     BeforeEnd,
 }
 
 impl<'a> TryFrom<&'a str> for AdjacentPosition {
-    type Err = Error;
-
-    fn try_from(position: &'a str) -> Result<AdjacentPosition, Self::Err> {
+    type Error = Error;
+
+    fn try_from(position: &'a str) -> Result<AdjacentPosition, Self::Error> {
         match_ignore_ascii_case! { &*position,
             "beforebegin" => Ok(AdjacentPosition::BeforeBegin),
             "afterbegin"  => Ok(AdjacentPosition::AfterBegin),
             "beforeend"   => Ok(AdjacentPosition::BeforeEnd),
             "afterend"    => Ok(AdjacentPosition::AfterEnd),
             _             => Err(Error::Syntax)
         }
     }
--- a/servo/rust-commit-hash
+++ b/servo/rust-commit-hash
@@ -1,1 +1,1 @@
-8c72b7651f231f589bc81d78fb9602d5a0899213
+7dd4e2db785c8ec360a989f69891b1e97dd4d369