From ee189ae028ce4ff620630686432f44b0ea706181 Mon Sep 17 00:00:00 2001
From: Vadim Petrochenkov <vadim.petrochenkov@gmail.com>
Date: Sat, 8 Jun 2019 23:55:09 +0300
Subject: [PATCH] Address review comments

---
 .../lint-obsolete-attr.rs => attributes/obsolete-attr.rs}   | 3 +--
 .../obsolete-attr.stderr}                                   | 4 ++--
 .../lint-unknown-attr.rs => attributes/unknown-attr.rs}     | 3 +--
 .../unknown-attr.stderr}                                    | 6 +++---
 4 files changed, 7 insertions(+), 9 deletions(-)
 rename src/test/ui/{lint/lint-obsolete-attr.rs => attributes/obsolete-attr.rs} (62%)
 rename src/test/ui/{lint/lint-obsolete-attr.stderr => attributes/obsolete-attr.stderr} (91%)
 rename src/test/ui/{lint/lint-unknown-attr.rs => attributes/unknown-attr.rs} (67%)
 rename src/test/ui/{lint/lint-unknown-attr.stderr => attributes/unknown-attr.stderr} (91%)

diff --git a/src/test/ui/lint/lint-obsolete-attr.rs b/src/test/ui/attributes/obsolete-attr.rs
similarity index 62%
rename from src/test/ui/lint/lint-obsolete-attr.rs
rename to src/test/ui/attributes/obsolete-attr.rs
index 49a8dde5da8..89e2ad2669c 100644
--- a/src/test/ui/lint/lint-obsolete-attr.rs
+++ b/src/test/ui/attributes/obsolete-attr.rs
@@ -1,5 +1,4 @@
-// When denying at the crate level, be sure to not get random warnings from the
-// injected intrinsics by the compiler.
+// Obsolete attributes fall back to feature gated custom attributes.
 
 #[ab_isize="stdcall"] extern {} //~ ERROR attribute `ab_isize` is currently unknown
 
diff --git a/src/test/ui/lint/lint-obsolete-attr.stderr b/src/test/ui/attributes/obsolete-attr.stderr
similarity index 91%
rename from src/test/ui/lint/lint-obsolete-attr.stderr
rename to src/test/ui/attributes/obsolete-attr.stderr
index 039b07e6ea5..2ed7f87935f 100644
--- a/src/test/ui/lint/lint-obsolete-attr.stderr
+++ b/src/test/ui/attributes/obsolete-attr.stderr
@@ -1,5 +1,5 @@
 error[E0658]: The attribute `fixed_stack_segment` is currently unknown to the compiler and may have meaning added to it in the future
-  --> $DIR/lint-obsolete-attr.rs:6:3
+  --> $DIR/obsolete-attr.rs:5:3
    |
 LL | #[fixed_stack_segment] fn f() {}
    |   ^^^^^^^^^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | #[fixed_stack_segment] fn f() {}
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
 error[E0658]: The attribute `ab_isize` is currently unknown to the compiler and may have meaning added to it in the future
-  --> $DIR/lint-obsolete-attr.rs:4:3
+  --> $DIR/obsolete-attr.rs:3:3
    |
 LL | #[ab_isize="stdcall"] extern {}
    |   ^^^^^^^^
diff --git a/src/test/ui/lint/lint-unknown-attr.rs b/src/test/ui/attributes/unknown-attr.rs
similarity index 67%
rename from src/test/ui/lint/lint-unknown-attr.rs
rename to src/test/ui/attributes/unknown-attr.rs
index cddac850c59..e2a4f3226d5 100644
--- a/src/test/ui/lint/lint-unknown-attr.rs
+++ b/src/test/ui/attributes/unknown-attr.rs
@@ -1,5 +1,4 @@
-// When denying at the crate level, be sure to not get random warnings from the
-// injected intrinsics by the compiler.
+// Unknown attributes fall back to feature gated custom attributes.
 
 #![feature(custom_inner_attributes)]
 
diff --git a/src/test/ui/lint/lint-unknown-attr.stderr b/src/test/ui/attributes/unknown-attr.stderr
similarity index 91%
rename from src/test/ui/lint/lint-unknown-attr.stderr
rename to src/test/ui/attributes/unknown-attr.stderr
index 4f00a51a5db..d0ac58108fc 100644
--- a/src/test/ui/lint/lint-unknown-attr.stderr
+++ b/src/test/ui/attributes/unknown-attr.stderr
@@ -1,5 +1,5 @@
 error[E0658]: The attribute `mutable_doc` is currently unknown to the compiler and may have meaning added to it in the future
-  --> $DIR/lint-unknown-attr.rs:6:4
+  --> $DIR/unknown-attr.rs:5:4
    |
 LL | #![mutable_doc]
    |    ^^^^^^^^^^^
@@ -8,7 +8,7 @@ LL | #![mutable_doc]
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
 error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future
-  --> $DIR/lint-unknown-attr.rs:8:3
+  --> $DIR/unknown-attr.rs:7:3
    |
 LL | #[dance] mod a {}
    |   ^^^^^
@@ -17,7 +17,7 @@ LL | #[dance] mod a {}
    = help: add #![feature(custom_attribute)] to the crate attributes to enable
 
 error[E0658]: The attribute `dance` is currently unknown to the compiler and may have meaning added to it in the future
-  --> $DIR/lint-unknown-attr.rs:10:3
+  --> $DIR/unknown-attr.rs:9:3
    |
 LL | #[dance] fn main() {}
    |   ^^^^^