---

yaml
---
r: 30301
b: refs/heads/incoming
c: d55917e
h: refs/heads/master
i:
  30299: 0d2ad9d
v: v3

Author: brson

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 225cdc4894638ea36b44dec8605fc357db191e64
+refs/heads/incoming: d55917ea598e761c49a1e5bb9134f372a7461062
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/net_url.rs

@@ -8,7 +8,7 @@ use from_str::FromStr;
 use result::{Err, Ok};
 use to_str::ToStr;
 
-export Url, url, userinfo, query;
+export Url, Query;
 export from_str, to_str;
 export get_scheme;
 export query_to_str;
@@ -34,14 +34,14 @@ type UserInfo = {
 
 type Query = ~[(~str, ~str)];
 
-fn url(-scheme: ~str, -user: Option<UserInfo>, -host: ~str,
+fn Url(-scheme: ~str, -user: Option<UserInfo>, -host: ~str,
        -port: Option<~str>, -path: ~str, -query: Query,
        -fragment: Option<~str>) -> Url {
     Url { scheme: scheme, user: user, host: host, port: port,
      path: path, query: query, fragment: fragment }
 }
 
-fn userinfo(-user: ~str, -pass: Option<~str>) -> UserInfo {
+fn UserInfo(-user: ~str, -pass: Option<~str>) -> UserInfo {
     {user: user, pass: pass}
 }
 
@@ -300,7 +300,7 @@ fn userinfo_from_str(uinfo: ~str) -> UserInfo {
     } else {
         option::Some(p)
     };
-    return userinfo(user, pass);
+    return UserInfo(user, pass);
 }
 
 fn userinfo_to_str(-userinfo: UserInfo) -> ~str {
@@ -648,7 +648,7 @@ fn from_str(rawurl: &str) -> result::Result<Url, ~str> {
     }
     let (query, fragment) = result::unwrap(qry);
 
-    return result::Ok(url(scheme, userinfo, host,
+    return result::Ok(Url(scheme, userinfo, host,
                        port, path, query, fragment));
 }