diff options
| author | bors <bors@rust-lang.org> | 2014-11-27 04:32:12 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-11-27 04:32:12 +0000 |
| commit | f358ca45c8cf8a5ea8922b5c66403d6a4f4d52ad (patch) | |
| tree | 755e6d6f67ea238da49c5a697375b20b2513bc66 /src/libregex | |
| parent | fac5a07679cac21a580badc84b755b8df0f975cf (diff) | |
| parent | 5816d7f5305ce4401326568785d624e689064311 (diff) | |
| download | rust-f358ca45c8cf8a5ea8922b5c66403d6a4f4d52ad.tar.gz rust-f358ca45c8cf8a5ea8922b5c66403d6a4f4d52ad.zip | |
auto merge of #19342 : alexcrichton/rust/rollup, r=alexcrichton
Diffstat (limited to 'src/libregex')
| -rw-r--r-- | src/libregex/parse.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs index c6f09e46971..2bf3fa992cd 100644 --- a/src/libregex/parse.rs +++ b/src/libregex/parse.rs @@ -18,7 +18,7 @@ use std::cmp; use std::fmt; use std::iter; use std::num; -use std::slice; +use std::slice::BinarySearchResult; /// Static data containing Unicode ranges for general categories and scripts. use unicode::regex::{UNICODE_CLASSES, PERLD, PERLS, PERLW}; @@ -1027,8 +1027,8 @@ fn is_valid_cap(c: char) -> bool { fn find_class(classes: NamedClasses, name: &str) -> Option<Vec<(char, char)>> { match classes.binary_search(|&(s, _)| s.cmp(name)) { - slice::Found(i) => Some(classes[i].val1().to_vec()), - slice::NotFound(_) => None, + BinarySearchResult::Found(i) => Some(classes[i].val1().to_vec()), + BinarySearchResult::NotFound(_) => None, } } |
