Skip to content

Commit

Permalink
Fix indention
Browse files Browse the repository at this point in the history
  • Loading branch information
jhasse committed Jan 12, 2014
1 parent 76967a0 commit 6ccc1e8
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/librustpkg/path_util.rs
Expand Up @@ -261,21 +261,21 @@ fn library_in(short_name: &str, version: &Version, dir_to_search: &Path) -> Opti
Some(i) => {
debug!("Maybe {} is a version", f_name.slice(i + 1, f_name.len()));
match try_parsing_version(f_name.slice(i + 1, f_name.len())) {
Some(ref found_vers) if version == found_vers => {
match f_name.slice(0, i).rfind('-') {
Some(j) => {
Some(ref found_vers) if version == found_vers => {
match f_name.slice(0, i).rfind('-') {
Some(j) => {
let lib_prefix = match p_path.extension_str() {
Some(ref s) if dll_filetype == *s => &dll_prefix,
_ => &rlib_prefix,
};
debug!("Maybe {} equals {}", f_name.slice(0, j), *lib_prefix);
if f_name.slice(0, j) == *lib_prefix {
result_filename = Some(p_path.clone());
}
break;
}
None => break
}
result_filename = Some(p_path.clone());
}
break;
}
None => break
}

}
_ => { f_name = f_name.slice(0, i); }
Expand Down

5 comments on commit 6ccc1e8

@bors
Copy link
Contributor

@bors bors commented on 6ccc1e8 Jan 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

saw approval from alexcrichton
at jhasse@6ccc1e8

@bors
Copy link
Contributor

@bors bors commented on 6ccc1e8 Jan 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

merging jhasse/rust/patch-rlib = 6ccc1e8 into auto

@bors
Copy link
Contributor

@bors bors commented on 6ccc1e8 Jan 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

jhasse/rust/patch-rlib = 6ccc1e8 merged ok, testing candidate = f8477c9

@bors
Copy link
Contributor

@bors bors commented on 6ccc1e8 Jan 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@bors
Copy link
Contributor

@bors bors commented on 6ccc1e8 Jan 22, 2014

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

fast-forwarding master to auto = f8477c9

Please sign in to comment.