---

yaml
---
r: 20851
b: refs/heads/snap-stage3
c: 8e3105b
h: refs/heads/master
i:
  20849: ba72b38
  20847: 8079c71
v: v3

Author: Daniel Patterson

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: e430a699f2c60890d9b86069fd0c68a70ece7120
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 21187206c3521f10d91627771d682c513a4356dc
+refs/heads/snap-stage3: 8e3105b6db6eb30a95061b56e78581dae0a98996
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libstd/net_url.rs

@@ -644,6 +644,11 @@ fn to_str(url: url) -> ~str {
     } else {
        ~""
     };
+    let authority = if str::len(url.host) != 0 {
+        str::concat(~[~"//", user, copy url.host])
+    } else {
+        ~""
+    };
     let query = if url.query.len() == 0 {
         ~""
     } else {
@@ -657,12 +662,11 @@ fn to_str(url: url) -> ~str {
     };
 
     return str::concat(~[copy url.scheme,
-                      ~"://",
-                      user,
-                      copy url.host,
-                      copy url.path,
-                      query,
-                      fragment]);
+                         ~":",
+                         authority,
+                         copy url.path,
+                         query,
+                         fragment]);
 }
 
 impl of to_str::to_str for url {
@@ -849,6 +853,12 @@ mod tests {
             .get().second() == ~"#&+";
     }
 
+    #[test]
+    fn test_url_without_authority() {
+        let url = ~"mailto:test@email.com";
+        assert to_str(result::unwrap(from_str(url))) == url;
+    }
+
     #[test]
     fn test_encode() {
         assert encode(~"") == ~"";