Rename test files

diff --git a/tests/ui/cfg_attr_lint.rs b/tests/ui/cfg_attr_lint.rs
deleted file mode 100644 (file)
index 614cd3e..0000000
--- a/tests/ui/cfg_attr_lint.rs
+++ /dev/null
@@ -1,38 +0,0 @@
-// 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(stmt_expr_attributes)]
-
-#![warn(clippy::deprecated_cfg_attr)]
-
-// This doesn't get linted, see known problems
-#![cfg_attr(rustfmt, rustfmt_skip)]
-
-#[rustfmt::skip]
-trait Foo
-{
-fn foo(
-);
-}
-
-fn skip_on_statements() {
-    #[cfg_attr(rustfmt, rustfmt::skip)]
-    5+3;
-}
-
-#[cfg_attr(rustfmt, rustfmt_skip)]
-fn main() {
-    foo::f();
-}
-
-mod foo {
-    #![cfg_attr(rustfmt, rustfmt_skip)]
-
-    pub fn f() {}
-}

diff --git a/tests/ui/cfg_attr_lint.stderr b/tests/ui/cfg_attr_lint.stderr
deleted file mode 100644 (file)
index b166d40..0000000
--- a/tests/ui/cfg_attr_lint.stderr
+++ /dev/null
@@ -1,16 +0,0 @@
-error: `cfg_attr` is deprecated for rustfmt and got replaced by tool_attributes
- --> $DIR/cfg_attr_lint.rs:8:1
-  |
-8 | #[cfg_attr(rustfmt, rustfmt_skip)]
-  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `#[rustfmt::skip]`
-  |
-  = note: `-D clippy::deprecated-cfg-attr` implied by `-D warnings`
-
-error: `cfg_attr` is deprecated for rustfmt and got replaced by tool_attributes
-  --> $DIR/cfg_attr_lint.rs:14:5
-   |
-14 |     #![cfg_attr(rustfmt, rustfmt_skip)]
-   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `#![rustfmt::skip]`
-
-error: aborting due to 2 previous errors
-

diff --git a/tests/ui/cfg_attr_rustfmt.rs b/tests/ui/cfg_attr_rustfmt.rs
new file mode 100644 (file)
index 0000000..614cd3e
--- /dev/null
+++ b/tests/ui/cfg_attr_rustfmt.rs
@@ -0,0 +1,38 @@
+// 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(stmt_expr_attributes)]
+
+#![warn(clippy::deprecated_cfg_attr)]
+
+// This doesn't get linted, see known problems
+#![cfg_attr(rustfmt, rustfmt_skip)]
+
+#[rustfmt::skip]
+trait Foo
+{
+fn foo(
+);
+}
+
+fn skip_on_statements() {
+    #[cfg_attr(rustfmt, rustfmt::skip)]
+    5+3;
+}
+
+#[cfg_attr(rustfmt, rustfmt_skip)]
+fn main() {
+    foo::f();
+}
+
+mod foo {
+    #![cfg_attr(rustfmt, rustfmt_skip)]
+
+    pub fn f() {}
+}

diff --git a/tests/ui/cfg_attr_rustfmt.stderr b/tests/ui/cfg_attr_rustfmt.stderr
new file mode 100644 (file)
index 0000000..b166d40
--- /dev/null
+++ b/tests/ui/cfg_attr_rustfmt.stderr
@@ -0,0 +1,16 @@
+error: `cfg_attr` is deprecated for rustfmt and got replaced by tool_attributes
+ --> $DIR/cfg_attr_lint.rs:8:1
+  |
+8 | #[cfg_attr(rustfmt, rustfmt_skip)]
+  | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `#[rustfmt::skip]`
+  |
+  = note: `-D clippy::deprecated-cfg-attr` implied by `-D warnings`
+
+error: `cfg_attr` is deprecated for rustfmt and got replaced by tool_attributes
+  --> $DIR/cfg_attr_lint.rs:14:5
+   |
+14 |     #![cfg_attr(rustfmt, rustfmt_skip)]
+   |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ help: use: `#![rustfmt::skip]`
+
+error: aborting due to 2 previous errors
+