Merge commit '7ea7cd165ad6705603852771bf82cc2fd6560db5' into clippyup2

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

diff --git a/tests/ui/regex.rs b/tests/ui/regex.rs
index 6e77c58902334d722d3321733e5a9bfca45737ed..b523fa5b711ae68e611aa3580ea59e9ccc2a7dc9 100644 (file)
--- a/tests/ui/regex.rs
+++ b/tests/ui/regex.rs
@@ -1,23 +1,10 @@
-// Copyright 2014-2018 The Rust Project Developers. See the COPYRIGHT
-// file at the top-level directory of this distribution.
-//
-// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
-// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
-// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
-// option. This file may not be copied, modified, or distributed
-// except according to those terms.
-
-
-#![feature(tool_lints)]
-
-
 #![allow(unused)]
 #![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: &str = "(";
 const NOT_A_REAL_REGEX: &str = "foobar";
@@ -37,24 +24,15 @@ fn syntax_error() {
     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,
-        r"[a-z]+\.(com|org|net)",
-    ]);
-    let bset_error = BRegexSet::new(&[
-        OPENING_PAREN,
-        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#"[...\/...]"#);