diff options
| author | Michael Darakananda <pongad@gmail.com> | 2014-02-06 02:34:33 -0500 |
|---|---|---|
| committer | Michael Darakananda <pongad@gmail.com> | 2014-02-13 20:12:59 -0500 |
| commit | bf1464c413bb2564c7be0eaceef9515bc0f94f1f (patch) | |
| tree | b956233c5e7c587d1faecbadb307117cda24952a /src/libglob/lib.rs | |
| parent | 94d453e459107ed1c5d76f693686b29d31cdc58c (diff) | |
| download | rust-bf1464c413bb2564c7be0eaceef9515bc0f94f1f.tar.gz rust-bf1464c413bb2564c7be0eaceef9515bc0f94f1f.zip | |
Removed num::Orderable
Diffstat (limited to 'src/libglob/lib.rs')
| -rw-r--r-- | src/libglob/lib.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libglob/lib.rs b/src/libglob/lib.rs index 25634b1808d..cb6f5b24a09 100644 --- a/src/libglob/lib.rs +++ b/src/libglob/lib.rs @@ -29,7 +29,7 @@ #[license = "MIT/ASL2"]; use std::cell::Cell; -use std::{os, path}; +use std::{cmp, os, path}; use std::io::fs; use std::path::is_sep; @@ -106,7 +106,7 @@ pub fn glob_with(pattern: &str, options: MatchOptions) -> Paths { } let root_len = pat_root.map_or(0u, |p| p.as_vec().len()); - let dir_patterns = pattern.slice_from(root_len.min(&pattern.len())) + let dir_patterns = pattern.slice_from(cmp::min(root_len, pattern.len())) .split_terminator(is_sep).map(|s| Pattern::new(s)).to_owned_vec(); let todo = list_dir_sorted(&root).move_iter().map(|x|(x,0u)).to_owned_vec(); |
