---

yaml
---
r: 28279
b: refs/heads/try
c: d55917e
h: refs/heads/master
i:
  28277: a063d69
  28275: 07d066b
  28271: 59d9743
v: v3

Author: brson

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
-refs/heads/try: 225cdc4894638ea36b44dec8605fc357db191e64
+refs/heads/try: d55917ea598e761c49a1e5bb9134f372a7461062
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

branches/try/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));
 }