---

yaml
---
r: 20847
b: refs/heads/snap-stage3
c: e349201
h: refs/heads/master
i:
  20845: 6493891
  20843: 42c07c0
  20839: c7098a9
  20831: e63a15e
v: v3

Author: Daniel Patterson

[refs]

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

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

@@ -78,7 +78,8 @@ fn encode_inner(s: ~str, full_url: bool) -> ~str {
     }
 }
 
-/** Encodes a URI by replacing reserved characters with percent encoded character
+/** 
+ * Encodes a URI by replacing reserved characters with percent encoded character
  * sequences.
  *
  * This function is compliant with RFC 3986.
@@ -87,7 +88,8 @@ fn encode(s: ~str) -> ~str {
     encode_inner(s, true)
 }
 
-/** Encodes a URI component by replacing reserved characters with percent encoded
+/** 
+ * Encodes a URI component by replacing reserved characters with percent encoded
  * character sequences.
  *
  * This function is compliant with RFC 3986.
@@ -134,15 +136,17 @@ fn decode_inner(s: ~str, full_url: bool) -> ~str {
     }
 }
 
-/** Decode a string encoded with percent encoding.
+/**
+ * Decode a string encoded with percent encoding.
  * 
  * This will only decode escape sequences generated by encode_uri.
  */
 fn decode(s: ~str) -> ~str {
     decode_inner(s, true)
 }
 
-/** Decode a string encoded with percent encoding.
+/** 
+ * Decode a string encoded with percent encoding.
  */
 fn decode_component(s: ~str) -> ~str {
     decode_inner(s, false)
@@ -167,7 +171,8 @@ fn encode_plus(s: ~str) -> ~str {
     }
 }
 
-/** Encode a hashmap to the 'application/x-www-form-urlencoded' media type.
+/** 
+ * Encode a hashmap to the 'application/x-www-form-urlencoded' media type.
  */
 fn encode_form_urlencoded(m: hashmap<~str, @dvec<@~str>>) -> ~str {
     let mut out = ~"";
@@ -191,7 +196,8 @@ fn encode_form_urlencoded(m: hashmap<~str, @dvec<@~str>>) -> ~str {
     out
 }
 
-/** Decode a string encoded with the 'application/x-www-form-urlencoded' media
+/** 
+ * Decode a string encoded with the 'application/x-www-form-urlencoded' media
  * type into a hashmap.
  */
 fn decode_form_urlencoded(s: ~[u8]) -> hashmap<~str, @dvec<@~str>> {
@@ -415,6 +421,18 @@ impl of to_str::to_str for url {
 
 #[cfg(test)]
 mod tests {
+    #[test]
+    fn test_url_parse() {
+        let url = ~"http://user:[email protected]/doc?s=v#something";
+        let u = result::unwrap(from_str(url));
+        assert u.scheme == ~"http";
+        assert option::unwrap(u.user).user == ~"user";
+        assert option::unwrap(option::unwrap(u.user).pass) == ~"pass";
+        assert u.host == ~"rust-lang.org";
+        assert u.path == ~"/doc";
+        assert u.query.get(~"s") == ~"v";
+        assert option::unwrap(u.fragment) == "something";
+    }
     #[test]
     fn test_full_url_parse_and_format() {
         let url = ~"http://user:[email protected]/doc?s=v#something";