Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2

[rust.git] / tests / ui / regex.rs

diff --git a/tests/ui/regex.rs b/tests/ui/regex.rs
index d6287b881a19334222210dc43fefedc078db0a2c..b523fa5b711ae68e611aa3580ea59e9ccc2a7dc9 100644 (file)
--- a/tests/ui/regex.rs
+++ b/tests/ui/regex.rs
@@ -1,106 +1,66 @@
-#![feature(plugin)]
-#![plugin(clippy)]
-
 #![allow(unused)]
-#![deny(invalid_regex, trivial_regex, regex_macro)]
+#![warn(clippy::invalid_regex, clippy::trivial_regex, clippy::regex_macro)]
 
 extern crate regex;
 
-use regex::{Regex, RegexSet, RegexBuilder};
-use regex::bytes::{Regex as BRegex, RegexSet as BRegexSet, RegexBuilder as BRegexBuilder};
+use regex::bytes::{Regex as BRegex, RegexBuilder as BRegexBuilder, RegexSet as BRegexSet};
+use regex::{Regex, RegexBuilder, RegexSet};
 
-const OPENING_PAREN : &'static str = "(";
-const NOT_A_REAL_REGEX : &'static str = "foobar";
+const OPENING_PAREN: &str = "(";
+const NOT_A_REAL_REGEX: &str = "foobar";
 
 fn syntax_error() {
     let pipe_in_wrong_position = Regex::new("|");
-    //~^ERROR: regex syntax error: empty alternate
     let pipe_in_wrong_position_builder = RegexBuilder::new("|");
-    //~^ERROR: regex syntax error: empty alternate
     let wrong_char_ranice = Regex::new("[z-a]");
-    //~^ERROR: regex syntax error: invalid character class range
     let some_unicode = Regex::new("[é-è]");
-    //~^ERROR: regex syntax error: invalid character class range
 
     let some_regex = Regex::new(OPENING_PAREN);
-    //~^ERROR: regex syntax error on position 0: unclosed
 
     let binary_pipe_in_wrong_position = BRegex::new("|");
-    //~^ERROR: regex syntax error: empty alternate
     let some_binary_regex = BRegex::new(OPENING_PAREN);
-    //~^ERROR: regex syntax error on position 0: unclosed
     let some_binary_regex_builder = BRegexBuilder::new(OPENING_PAREN);
-    //~^ERROR: regex syntax error on position 0: unclosed
 
     let closing_paren = ")";
     let not_linted = Regex::new(closing_paren);
 
-    let set = RegexSet::new(&[
-        r"[a-z]+@[a-z]+\.(com|org|net)",
-        r"[a-z]+\.(com|org|net)",
-    ]);
+    let set = RegexSet::new(&[r"[a-z]+@[a-z]+\.(com|org|net)", r"[a-z]+\.(com|org|net)"]);
     let bset = BRegexSet::new(&[
         r"[a-z]+@[a-z]+\.(com|org|net)",
         r"[a-z]+\.(com|org|net)",
+        r".", // regression test
     ]);
 
-    let set_error = RegexSet::new(&[
-        OPENING_PAREN,
-        //~^ERROR: regex syntax error on position 0: unclosed
-        r"[a-z]+\.(com|org|net)",
-    ]);
-    let bset_error = BRegexSet::new(&[
-        OPENING_PAREN,
-        //~^ERROR: regex syntax error on position 0: unclosed
-        r"[a-z]+\.(com|org|net)",
-    ]);
+    let set_error = RegexSet::new(&[OPENING_PAREN, r"[a-z]+\.(com|org|net)"]);
+    let bset_error = BRegexSet::new(&[OPENING_PAREN, r"[a-z]+\.(com|org|net)"]);
+
+    let raw_string_error = Regex::new(r"[...\/...]");
+    let raw_string_error = Regex::new(r#"[...\/...]"#);
 }
 
 fn trivial_regex() {
     let trivial_eq = Regex::new("^foobar$");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `==` on `str`s
 
     let trivial_eq_builder = RegexBuilder::new("^foobar$");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `==` on `str`s
 
     let trivial_starts_with = Regex::new("^foobar");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::starts_with`
 
     let trivial_ends_with = Regex::new("foobar$");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::ends_with`
 
     let trivial_contains = Regex::new("foobar");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::contains`
 
     let trivial_contains = Regex::new(NOT_A_REAL_REGEX);
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::contains`
 
     let trivial_backslash = Regex::new("a\\.b");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::contains`
 
     // unlikely corner cases
     let trivial_empty = Regex::new("");
-    //~^ERROR: trivial regex
-    //~|HELP the regex is unlikely to be useful
 
     let trivial_empty = Regex::new("^");
-    //~^ERROR: trivial regex
-    //~|HELP the regex is unlikely to be useful
 
     let trivial_empty = Regex::new("^$");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::is_empty`
 
     let binary_trivial_empty = BRegex::new("^$");
-    //~^ERROR: trivial regex
-    //~|HELP consider using `str::is_empty`
 
     // non-trivial regexes
     let non_trivial_dot = Regex::new("a.b");