From 36372b929e9d44c7421827b160505854ceeb9a83 Mon Sep 17 00:00:00 2001 From: Alex Crichton Date: Mon, 24 Nov 2014 15:54:14 -0800 Subject: std: Export BinarySearchResult At the same time remove the `pub use` of the variants in favor of accessing through the enum type itself. This is a breaking change as the `Found` and `NotFound` variants must now be imported through `BinarySearchResult` instead of just `std::slice`. [breaking-change] Closes #19272 --- src/libregex/parse.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/libregex') 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> { 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, } } -- cgit 1.4.1-3-g733a5