diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-07-02 11:08:21 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-07-02 11:08:21 -0700 |
| commit | ff1dd44b40a7243f43a8d32ba8bd6026197c320b (patch) | |
| tree | 4460cbf0a917a289d1d3744d9645c5ab131ea9df /src/liburl | |
| parent | aa1163b92de7717eb7c5eba002b4012e0574a7fe (diff) | |
| parent | ca2778ede7c21efc3cf2e4e1152875ec09360770 (diff) | |
| download | rust-ff1dd44b40a7243f43a8d32ba8bd6026197c320b.tar.gz rust-ff1dd44b40a7243f43a8d32ba8bd6026197c320b.zip | |
Merge remote-tracking branch 'origin/master' into 0.11.0-release
Conflicts: src/libstd/lib.rs
Diffstat (limited to 'src/liburl')
| -rw-r--r-- | src/liburl/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/liburl/lib.rs b/src/liburl/lib.rs index 93072095f9d..a60cc8e992b 100644 --- a/src/liburl/lib.rs +++ b/src/liburl/lib.rs @@ -546,7 +546,7 @@ fn get_authority(rawurl: &str) -> let mut host = "".to_string(); let mut port = None; - let mut colon_count = 0; + let mut colon_count = 0u; let mut pos = 0; let mut begin = 2; let mut end = len; |