Skip to content

Commit 4338fbe

Browse files
committed
---
yaml --- r: 140439 b: refs/heads/try2 c: 9f76ca6 h: refs/heads/master i: 140437: bc7e421 140435: a1f5c29 140431: af2993a v: v3
1 parent c541101 commit 4338fbe

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
55
refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
8-
refs/heads/try2: c42f1218a0a7b3a5c84502f9cb4b123d65148f4c
8+
refs/heads/try2: 9f76ca6508d82036e6ff1723dcd395998a4baa81
99
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
1010
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1111
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/metadata/filesearch.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,8 @@ pub fn mk_filesearch(maybe_sysroot: &Option<@Path>,
3939
fn sysroot(&self) -> @Path { self.sysroot }
4040
fn for_each_lib_search_path(&self, f: &fn(&Path) -> bool) {
4141
debug!("filesearch: searching additional lib search paths");
42-
if !self.addl_lib_search_paths.each(f) {
43-
return;
44-
}
42+
// a little weird
43+
self.addl_lib_search_paths.each(f);
4544

4645
debug!("filesearch: searching target lib path");
4746
if !f(&make_target_lib_path(self.sysroot,
@@ -59,7 +58,7 @@ pub fn mk_filesearch(maybe_sysroot: &Option<@Path>,
5958
match get_rustpkg_lib_path() {
6059
result::Ok(ref p) => f(p),
6160
result::Err(_) => true
62-
}
61+
};
6362
}
6463
fn get_target_lib_path(&self) -> Path {
6564
make_target_lib_path(self.sysroot, self.target_triple)

0 commit comments

Comments
 (0)