Skip to content

Commit d55917e

Browse files
committed
std: Fix net::url constructor names
1 parent 225cdc4 commit d55917e

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

src/libstd/net_url.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ use from_str::FromStr;
88
use result::{Err, Ok};
99
use to_str::ToStr;
1010

11-
export Url, url, userinfo, query;
11+
export Url, Query;
1212
export from_str, to_str;
1313
export get_scheme;
1414
export query_to_str;
@@ -34,14 +34,14 @@ type UserInfo = {
3434

3535
type Query = ~[(~str, ~str)];
3636

37-
fn url(-scheme: ~str, -user: Option<UserInfo>, -host: ~str,
37+
fn Url(-scheme: ~str, -user: Option<UserInfo>, -host: ~str,
3838
-port: Option<~str>, -path: ~str, -query: Query,
3939
-fragment: Option<~str>) -> Url {
4040
Url { scheme: scheme, user: user, host: host, port: port,
4141
path: path, query: query, fragment: fragment }
4242
}
4343

44-
fn userinfo(-user: ~str, -pass: Option<~str>) -> UserInfo {
44+
fn UserInfo(-user: ~str, -pass: Option<~str>) -> UserInfo {
4545
{user: user, pass: pass}
4646
}
4747

@@ -300,7 +300,7 @@ fn userinfo_from_str(uinfo: ~str) -> UserInfo {
300300
} else {
301301
option::Some(p)
302302
};
303-
return userinfo(user, pass);
303+
return UserInfo(user, pass);
304304
}
305305

306306
fn userinfo_to_str(-userinfo: UserInfo) -> ~str {
@@ -648,7 +648,7 @@ fn from_str(rawurl: &str) -> result::Result<Url, ~str> {
648648
}
649649
let (query, fragment) = result::unwrap(qry);
650650

651-
return result::Ok(url(scheme, userinfo, host,
651+
return result::Ok(Url(scheme, userinfo, host,
652652
port, path, query, fragment));
653653
}
654654

0 commit comments

Comments
 (0)