From d55917ea598e761c49a1e5bb9134f372a7461062 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Tue, 4 Sep 2012 11:24:44 -0700
Subject: [PATCH] std: Fix net::url constructor names

---
 src/libstd/net_url.rs | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs
index a502ab4239e4..70d8cf704975 100644
--- a/src/libstd/net_url.rs
+++ b/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));
 }