Update Bitflags Version

Switch to the 1.0 version of bitflags and fixup the breaking changes.
rust-onig · Sep 16, 2017 · 947357e · 947357e
1 parent 5fe35dc
commit 947357e
Show file tree

Hide file tree

Showing 11 changed files with 170 additions and 140 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -19,7 +19,7 @@ static-libonig = ["onig_sys/static_onig"]
 
 [dependencies]
 libc = "0.2"
-bitflags = "0.7"
+bitflags = "1.0"
 lazy_static = "0.2"
 
 [target.'cfg(not(target_env = "musl"))'.dependencies.onig_sys]

diff --git a/examples/listcap.rs b/examples/listcap.rs
@@ -5,7 +5,7 @@ use onig::*;
 fn ex(hay: &str, pattern: &str, syntax: &Syntax) {
 
     let reg = Regex::with_options(pattern,
-                                  REGEX_OPTION_NONE,
+                                  RegexOptions::REGEX_OPTION_NONE,
                                   syntax).unwrap();
 
     println!("number of captures: {}", reg.captures_len());
@@ -16,7 +16,7 @@ fn ex(hay: &str, pattern: &str, syntax: &Syntax) {
     let r = reg.search_with_options(hay,
                                     0,
                                     hay.len(),
-                                    SEARCH_OPTION_NONE,
+                                    SearchOptions::SEARCH_OPTION_NONE,
                                     Some(&mut region));
     if let Some(pos) = r {
         println!("match at {}", pos);
@@ -34,7 +34,7 @@ fn ex(hay: &str, pattern: &str, syntax: &Syntax) {
 
 fn main() {
     let mut syn = Syntax::default().clone();
-    syn.enable_operators(SYNTAX_OPERATOR_ATMARK_CAPTURE_HISTORY);
+    syn.enable_operators(SyntaxOperator::SYNTAX_OPERATOR_ATMARK_CAPTURE_HISTORY);
 
     ex("((())())", "\\g<p>(?@<p>\\(\\g<s>\\)){0}(?@<s>(?:\\g<p>)*|){0}", &syn);
     ex("x00x00x00", "(?@x(?@\\d+))+", &syn);

diff --git a/examples/names.rs b/examples/names.rs
@@ -17,7 +17,7 @@ fn main() {
     let mut region = Region::new();
 
     if let Some(position) = r.search_with_options(string, 0, string.len(),
-                                                  SEARCH_OPTION_NONE, Some(&mut region))
+                                                  SearchOptions::SEARCH_OPTION_NONE, Some(&mut region))
     {
         println!("match at {} in {:?}", position, string);
 

diff --git a/examples/simple_grep.rs b/examples/simple_grep.rs
@@ -12,7 +12,7 @@ fn main() {
         println!("Compiling '{}'", arg);
         let regex_compilation = Regex::with_options(
             &arg,
-            onig::REGEX_OPTION_SINGLELINE,
+            onig::RegexOptions::REGEX_OPTION_SINGLELINE,
             onig::Syntax::emacs());
         match regex_compilation {
             Ok(regex) => {regexes.insert(arg, regex);},
@@ -26,7 +26,7 @@ fn main() {
             for (name, regex) in regexes.iter() {
                 let res = regex.search_with_options(&line,
                                                     0, line.len(),
-                                                    onig::SEARCH_OPTION_NONE,
+                                                    onig::SearchOptions::SEARCH_OPTION_NONE,
                                                     None);
                 match res {
                     Some(pos) => println!("{} => matched @ {}", name, pos),

diff --git a/examples/sql.rs b/examples/sql.rs
@@ -7,19 +7,19 @@ fn main() {
 
     let mut syntax = Syntax::default().clone();
 
-    syntax.set_operators(SYNTAX_OPERATOR_VARIABLE_META_CHARACTERS);
+    syntax.set_operators(SyntaxOperator::SYNTAX_OPERATOR_VARIABLE_META_CHARACTERS);
     syntax.set_behavior(SyntaxBehavior::empty());
-    syntax.set_options(REGEX_OPTION_MULTILINE);
+    syntax.set_options(RegexOptions::REGEX_OPTION_MULTILINE);
 
-    syntax.set_meta_char(META_CHAR_ESCAPE, MetaChar::Character('\\'));
-    syntax.set_meta_char(META_CHAR_ANYCHAR, MetaChar::Character('_'));
-    syntax.set_meta_char(META_CHAR_ANYTIME, MetaChar::Ineffective);
-    syntax.set_meta_char(META_CHAR_ZERO_OR_ONE_TIME, MetaChar::Ineffective);
-    syntax.set_meta_char(META_CHAR_ONE_OR_MORE_TIME, MetaChar::Ineffective);
-    syntax.set_meta_char(META_CHAR_ANYCHAR_ANYTIME, MetaChar::Character('%'));
+    syntax.set_meta_char(MetaCharType::META_CHAR_ESCAPE, MetaChar::Character('\\'));
+    syntax.set_meta_char(MetaCharType::META_CHAR_ANYCHAR, MetaChar::Character('_'));
+    syntax.set_meta_char(MetaCharType::META_CHAR_ANYTIME, MetaChar::Ineffective);
+    syntax.set_meta_char(MetaCharType::META_CHAR_ZERO_OR_ONE_TIME, MetaChar::Ineffective);
+    syntax.set_meta_char(MetaCharType::META_CHAR_ONE_OR_MORE_TIME, MetaChar::Ineffective);
+    syntax.set_meta_char(MetaCharType::META_CHAR_ANYCHAR_ANYTIME, MetaChar::Character('%'));
 
     let reg = Regex::with_options("\\_%\\\\__zz",
-                                  REGEX_OPTION_NONE,
+                                  RegexOptions::REGEX_OPTION_NONE,
                                   &syntax).unwrap();
 
     match reg.captures("a_abcabcabc\\ppzz") {

diff --git a/examples/syntax.rs b/examples/syntax.rs
@@ -4,7 +4,7 @@ use onig::*;
 
 fn exec(syntax: &Syntax, pattern: &str, to_search: &str) {
 
-    let reg = Regex::with_options(pattern, REGEX_OPTION_NONE, syntax).unwrap();
+    let reg = Regex::with_options(pattern, RegexOptions::REGEX_OPTION_NONE, syntax).unwrap();
 
     match reg.captures(to_search) {
         Some(caps) => {

diff --git a/src/find.rs b/src/find.rs
@@ -1,13 +1,17 @@
 use std::iter::Iterator;
-use super::{Region, Regex, SearchOptions, SEARCH_OPTION_NONE};
+use super::{Region, Regex, SearchOptions};
 
 impl Regex {
     /// Returns the capture groups corresponding to the leftmost-first match
     /// in text. Capture group `0` always corresponds to the entire match.
     /// If no match is found, then `None` is returned.
     pub fn captures<'t>(&self, text: &'t str) -> Option<Captures<'t>> {
         let mut region = Region::new();
-        self.search_with_options(text, 0, text.len(), SEARCH_OPTION_NONE, Some(&mut region))
+        self.search_with_options(text,
+                                 0,
+                                 text.len(),
+                                 SearchOptions::SEARCH_OPTION_NONE,
+                                 Some(&mut region))
             .map(|pos| {
                 Captures {
                     text: text,
@@ -181,7 +185,10 @@ impl Regex {
     {
 
         let mut region = Region::new();
-        self.scan_with_region(to_search, &mut region, SEARCH_OPTION_NONE, |n, s, region| {
+        self.scan_with_region(to_search,
+                              &mut region,
+                              SearchOptions::SEARCH_OPTION_NONE,
+                              |n, s, region| {
             let captures = Captures {
                 text: to_search,
                 region: region.clone(),
@@ -339,7 +346,7 @@ impl<'r, 't> Iterator for FindMatches<'r, 't> {
         let r = self.regex.search_with_options(self.text,
                                                self.last_end,
                                                self.text.len(),
-                                               SEARCH_OPTION_NONE,
+                                               SearchOptions::SEARCH_OPTION_NONE,
                                                Some(&mut self.region));
         if r.is_none() {
             return None;
@@ -393,7 +400,7 @@ impl<'r, 't> Iterator for FindCaptures<'r, 't> {
         let r = self.regex.search_with_options(self.text,
                                                self.last_end,
                                                self.text.len(),
-                                               SEARCH_OPTION_NONE,
+                                               SearchOptions::SEARCH_OPTION_NONE,
                                                Some(&mut region));
         if r.is_none() {
             return None;