From c679639c872c91460f1761b60067be30c5b8e2a5 Mon Sep 17 00:00:00 2001
From: Keegan McAllister <kmcallister@mozilla.com>
Date: Tue, 13 Aug 2013 11:06:05 -0700
Subject: [PATCH] Update tests for new Rust

---
 test.rs | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/test.rs b/test.rs
index c50b9de..f098796 100644
--- a/test.rs
+++ b/test.rs
@@ -2,12 +2,11 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
-use extra::net::url::Url;
-use url_from_str = extra::net::url::from_str;
+use extra::url::Url;
+use std::FromStr;
 use std::cast;
 use std::libc;
 use std::cell::Cell;
-use std::result;
 use util::{DataStream, VoidPtrLike};
 use values::*;
 use types::*;
@@ -20,7 +19,7 @@ use computed::ComputedStyle;
 use complete::CompleteSelectResults;
 
 fn test_url() -> Url {
-    result::unwrap(url_from_str("http://foo.com"))
+    FromStr::from_str("http://foo.com").unwrap()
 }
 
 fn style_stream(style: &str) -> DataStream {