diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-04 11:24:44 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-04 11:28:38 -0700 |
| commit | d55917ea598e761c49a1e5bb9134f372a7461062 (patch) | |
| tree | 1b52fd6dc57974e8dd57a0905066f99b48062834 /src/libstd | |
| parent | 225cdc4894638ea36b44dec8605fc357db191e64 (diff) | |
std: Fix net::url constructor names
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/net_url.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstd/net_url.rs b/src/libstd/net_url.rs index a502ab4239e..70d8cf70497 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)); } |
