Auto merge of #16139 - servo:rustup, r=emilio

Update rustc to 1.17.0-nightly (7dd4e2db7 2017-03-26)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16139)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-26 11:36:51 -07:00 committed by GitHub
commit 7f2a4e01b1
2 changed files with 3 additions and 3 deletions

View file

@ -180,9 +180,9 @@ pub enum AdjacentPosition {
}
impl<'a> TryFrom<&'a str> for AdjacentPosition {
type Err = Error;
type Error = Error;
fn try_from(position: &'a str) -> Result<AdjacentPosition, Self::Err> {
fn try_from(position: &'a str) -> Result<AdjacentPosition, Self::Error> {
match_ignore_ascii_case! { &*position,
"beforebegin" => Ok(AdjacentPosition::BeforeBegin),
"afterbegin" => Ok(AdjacentPosition::AfterBegin),