Merge pull request #51 from canndrew/master

fmt::FormatError has been renamed to fmt::Error

src/format.rs

@@ -12,7 +12,7 @@
 //!
 //! You can use `<formatter>.to_string()`, as the formatters implement `Show`.
 
-use std::fmt::{Show, Formatter, FormatError};
+use std::fmt::{mod, Show, Formatter};
 use super::Url;
 
 /// Formatter and serializer for URL path data.
@@ -22,7 +22,7 @@ pub struct PathFormatter<'a, T:'a> {
 }
 
 impl<'a, T: Str + Show> Show for PathFormatter<'a, T> {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         if self.path.is_empty() {
             formatter.write(b"/")
         } else {
@@ -48,7 +48,7 @@ pub struct UserInfoFormatter<'a> {
 }
 
 impl<'a> Show for UserInfoFormatter<'a> {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         if !self.username.is_empty() || self.password.is_some() {
             try!(formatter.write(self.username.as_bytes()));
             match self.password {
@@ -71,7 +71,7 @@ pub struct UrlNoFragmentFormatter<'a> {
 }
 
 impl<'a> Show for UrlNoFragmentFormatter<'a> {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         try!(formatter.write(self.url.scheme.as_bytes()));
         try!(formatter.write(b":"));
         try!(self.url.scheme_data.fmt(formatter));

src/host.rs

@@ -10,7 +10,7 @@ pub use Host::{Domain,Ipv6};
 
 use std::ascii::OwnedAsciiExt;
 use std::cmp;
-use std::fmt::{Formatter, FormatError, Show};
+use std::fmt::{mod, Formatter, Show};
 use parser::{
     ParseResult,
     InvalidIpv6Address, EmptyHost, NonAsciiDomainsNotSupportedYet, InvalidDomainCharacter,
@@ -96,7 +96,7 @@ impl Host {
 
 
 impl Show for Host {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         match *self {
             Domain(ref domain) => domain.fmt(formatter),
             Ipv6(ref address) => {
@@ -237,7 +237,7 @@ impl Ipv6Address {
 
 
 impl Show for Ipv6Address {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         let (compress_start, compress_end) = longest_zero_sequence(&self.pieces);
         let mut i = 0;
         while i < 8 {

src/lib.rs

@@ -122,7 +122,7 @@ assert!(css_url.serialize() == "http://servo.github.io/rust-url/main.css".to_str
 extern crate encoding;
 extern crate serialize;
 
-use std::fmt::{Formatter, FormatError, Show};
+use std::fmt::{mod, Formatter, Show};
 use std::hash;
 use std::path;
 
@@ -771,7 +771,7 @@ impl<E, D: serialize::Decoder<E>> serialize::Decodable<D, E> for Url {
 
 
 impl Show for Url {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         try!(UrlNoFragmentFormatter{ url: self }.fmt(formatter));
         match self.fragment {
             None => (),
@@ -786,7 +786,7 @@ impl Show for Url {
 
 
 impl Show for SchemeData {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         match *self {
             RelativeSchemeData(ref scheme_data) => scheme_data.fmt(formatter),
             NonRelativeSchemeData(ref scheme_data) => scheme_data.fmt(formatter),
@@ -891,7 +891,7 @@ impl UrlRelativeSchemeData {
 
 
 impl Show for UrlRelativeSchemeData {
-    fn fmt(&self, formatter: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, formatter: &mut Formatter) -> fmt::Result {
         // Write the scheme-trailing double slashes.
         try!(formatter.write(b"//"));
 

src/parser.rs

@@ -16,7 +16,7 @@ pub use ParseError::{
 
 pub use self::Context::{SetterContext,UrlParserContext};
 use std::ascii::AsciiExt;
-use std::fmt::{Formatter, FormatError, Show};
+use std::fmt::{mod, Formatter, Show};
 use std::str::CharRange;
 
 use encoding;
@@ -66,7 +66,7 @@ pub enum ParseError {
 }
 
 impl Show for ParseError {
-    fn fmt(&self, fmt: &mut Formatter) -> Result<(), FormatError> {
+    fn fmt(&self, fmt: &mut Formatter) -> fmt::Result {
         match *self {
             EmptyHost => "empty host",
             InvalidScheme => "invalid scheme",