development/cargo
development/cargo
1
0
Fork 0
mirror of https://github.com/rust-lang/cargo synced 2024-10-01 21:43:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Account for trailing / in URLs when determining on-disk location. Fixes #84.

Browse source 
No tests because there's no preexisting network tests.
This commit is contained in:
Brian Anderson 2014-06-28 15:39:48 -07:00
parent 9288b6e618
commit 12d1a512ea
1 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/cargo/sources/git/source.rs
View file

@ -67,7 +67,13 @@ fn ident(location: &Location) -> String {
let last = path.components().last().unwrap();
str::from_utf8(last).unwrap().to_str()
}
Remote(ref url) => url.path.as_slice().split('/').last().unwrap().to_str()
Remote(ref url) => {
// Remove the trailing '/' so that 'split' doesn't give us
// an empty string, making '../foo/' and '../foo' both
// result in the name 'foo' (#84)
let path = strip_trailing_slash(url.path.as_slice());
path.split('/').last().unwrap().to_str()
}
};
let ident = if ident.as_slice() == "" {
@ -79,6 +85,14 @@ fn ident(location: &Location) -> String {
format!("{}-{}", ident, to_hex(hasher.hash(&location.to_str())))
}
fn strip_trailing_slash<'a>(path: &'a str) -> &'a str {
if path.as_bytes().last() != Some(&('/' as u8)) {
path.clone()
} else {
path.slice(0, path.len() - 1)
}
}
impl<'a, 'b> Show for GitSource<'a, 'b> {
fn fmt(&self, f: &mut Formatter) -> fmt::Result {
try!(write!(f, "git repo at {}", self.remote.get_location()));