@@ -8,7 +8,7 @@ use from_str::FromStr;
8
8
use result:: { Err , Ok } ;
9
9
use to_str:: ToStr ;
10
10
11
- export Url , url , userinfo , query ;
11
+ export Url , Query ;
12
12
export from_str, to_str;
13
13
export get_scheme;
14
14
export query_to_str;
@@ -34,14 +34,14 @@ type UserInfo = {
34
34
35
35
type Query = ~[ ( ~str , ~str ) ] ;
36
36
37
- fn url ( -scheme : ~str , -user : Option < UserInfo > , -host : ~str ,
37
+ fn Url ( -scheme : ~str , -user : Option < UserInfo > , -host : ~str ,
38
38
-port : Option < ~str > , -path : ~str , -query : Query ,
39
39
-fragment : Option < ~str > ) -> Url {
40
40
Url { scheme : scheme, user : user, host : host, port : port,
41
41
path : path, query : query, fragment : fragment }
42
42
}
43
43
44
- fn userinfo ( -user : ~str , -pass : Option < ~str > ) -> UserInfo {
44
+ fn UserInfo ( -user : ~str , -pass : Option < ~str > ) -> UserInfo {
45
45
{ user: user, pass: pass}
46
46
}
47
47
@@ -300,7 +300,7 @@ fn userinfo_from_str(uinfo: ~str) -> UserInfo {
300
300
} else {
301
301
option:: Some ( p)
302
302
} ;
303
- return userinfo ( user, pass) ;
303
+ return UserInfo ( user, pass) ;
304
304
}
305
305
306
306
fn userinfo_to_str ( -userinfo : UserInfo ) -> ~str {
@@ -648,7 +648,7 @@ fn from_str(rawurl: &str) -> result::Result<Url, ~str> {
648
648
}
649
649
let ( query, fragment) = result:: unwrap ( qry) ;
650
650
651
- return result:: Ok ( url ( scheme, userinfo, host,
651
+ return result:: Ok ( Url ( scheme, userinfo, host,
652
652
port, path, query, fragment) ) ;
653
653
}
654
654
0 commit comments