about summary refs log tree commit diff
path: root/src/libregex
diff options
context:
space:
mode:
authorJorge Aparicio <japaricious@gmail.com>2014-10-29 20:21:37 -0500
committerJorge Aparicio <japaricious@gmail.com>2014-11-05 20:12:14 -0500
commit1e5f311d1615ab4bca5b23d09dd678c2662022e6 (patch)
treecf69b14249e1d7b8be7cd2c61ad46f0f39a748fd /src/libregex
parent2896278313ede1b24b47c88bafe684adabbc92d4 (diff)
downloadrust-1e5f311d1615ab4bca5b23d09dd678c2662022e6.tar.gz
rust-1e5f311d1615ab4bca5b23d09dd678c2662022e6.zip
Fix fallout of DSTifying PartialEq, PartialOrd, Eq, Ord
Diffstat (limited to 'src/libregex')
-rw-r--r--src/libregex/parse.rs10
1 files changed, 10 insertions, 0 deletions
diff --git a/src/libregex/parse.rs b/src/libregex/parse.rs
index 3115161682f..6723ea725a3 100644
--- a/src/libregex/parse.rs
+++ b/src/libregex/parse.rs
@@ -1020,6 +1020,8 @@ fn is_valid_cap(c: char) -> bool {
     || (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')
 }
 
+// NOTE(stage0): remove function after a snapshot
+#[cfg(stage0)]
 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()),
@@ -1027,6 +1029,14 @@ fn find_class(classes: NamedClasses, name: &str) -> Option<Vec<(char, char)>> {
     }
 }
 
+#[cfg(not(stage0))]  // NOTE(stage0): remove cfg after a snapshot
+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,
+    }
+}
+
 type Class = &'static [(char, char)];
 type NamedClasses = &'static [(&'static str, &'static Class)];