From c8cf3a307b94349cd4948a860d62730945e8d805 Mon Sep 17 00:00:00 2001 From: Jorge Aparicio Date: Tue, 30 Dec 2014 22:49:26 -0500 Subject: [PATCH] rustc: replace `pick` alias with an unboxed closure --- src/librustc/metadata/filesearch.rs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/librustc/metadata/filesearch.rs b/src/librustc/metadata/filesearch.rs index cc67f3ddf03..82071931fe3 100644 --- a/src/librustc/metadata/filesearch.rs +++ b/src/librustc/metadata/filesearch.rs @@ -30,10 +30,6 @@ pub enum FileMatch { // FIXME (#2658): I'm not happy how this module turned out. Should // probably just be folded into cstore. -/// Functions with type `pick` take a parent directory as well as -/// a file found in that directory. -pub type pick<'a> = |path: &Path|: 'a -> FileMatch; - pub struct FileSearch<'a> { pub sysroot: &'a Path, pub search_paths: &'a SearchPaths, @@ -95,7 +91,7 @@ pub fn get_lib_path(&self) -> Path { make_target_lib_path(self.sysroot, self.triple) } - pub fn search(&self, pick: pick) { + pub fn search(&self, mut pick: F) where F: FnMut(&Path) -> FileMatch { self.for_each_lib_search_path(|lib_search_path| { debug!("searching {}", lib_search_path.display()); match fs::readdir(lib_search_path) { -- 2.44.0