Add inner module and const blocks

Author: mejrs

tests/ui/attributes/positions/README.md

@@ -50,9 +50,6 @@ pub mod empty_crate;
 
 #[ATTRIBUTE] //~ WARN
 pub mod module {
-    #![ATTRIBUTE] //~ WARN
-    //~^ WARN unused attribute
-    //~^^ WARN this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
     #[ATTRIBUTE] //~ WARN
     pub static GLOBAL: u32 = 42;
@@ -146,8 +143,26 @@ pub mod module {
         #[ATTRIBUTE] //~ WARN
         fn trait_method() {}
     }
+
+    fn x() {
+        #[ATTRIBUTE] //~ WARN
+        const {
+            // ..
+        }
+    }
 }
 
+pub mod inner_module {
+    #![ATTRIBUTE] //~ WARN
+
+    fn x() {
+        const {
+            #![ATTRIBUTE] //~ WARN
+        }
+    }
+}
+
+
 #[ATTRIBUTE] //~ WARN
 fn main() {
     let _closure = #[ATTRIBUTE] //~ ERROR attributes on expressions are experimental

tests/ui/attributes/positions/allow.rs

@@ -14,7 +14,6 @@ pub mod empty_crate;
 
 #[allow()] // OK
 pub mod module {
-    #![allow()] // OK
 
     #[allow()] // OK
     pub static GLOBAL: u32 = 42;
@@ -101,6 +100,23 @@ pub mod module {
         #[allow()] // OK
         fn trait_method() {}
     }
+
+    fn x() {
+        #[allow()] // OK
+        const {
+            // ..
+        }
+    }
+}
+
+pub mod inner_module {
+    #![allow()] // OK
+
+    fn x() {
+        const {
+            #![allow()] // OK
+        }
+    }
 }
 
 #[allow()] // OK

tests/ui/attributes/positions/allow.stderr

@@ -1,5 +1,5 @@
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/allow.rs:73:13
+  --> $DIR/allow.rs:72:13
    |
 LL |             #[allow()]
    |             ^^^^^^^^^^
@@ -9,7 +9,7 @@ LL |             #[allow()]
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/allow.rs:108:20
+  --> $DIR/allow.rs:124:20
    |
 LL |     let _closure = #[allow()]
    |                    ^^^^^^^^^^
@@ -19,7 +19,7 @@ LL |     let _closure = #[allow()]
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/allow.rs:111:25
+  --> $DIR/allow.rs:127:25
    |
 LL |     let _move_closure = #[allow()]
    |                         ^^^^^^^^^^
@@ -29,7 +29,7 @@ LL |     let _move_closure = #[allow()]
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/allow.rs:121:22
+  --> $DIR/allow.rs:137:22
    |
 LL |         let _array = #[allow()]
    |                      ^^^^^^^^^^
@@ -39,7 +39,7 @@ LL |         let _array = #[allow()]
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: attributes on expressions are experimental
-  --> $DIR/allow.rs:127:22
+  --> $DIR/allow.rs:143:22
    |
 LL |         let _tuple = #[allow()]
    |                      ^^^^^^^^^^
@@ -49,7 +49,7 @@ LL |         let _tuple = #[allow()]
    = note: this compiler was built on YYYY-MM-DD; consider upgrading it if it is out of date
 
 error[E0658]: trait aliases are experimental
-  --> $DIR/allow.rs:32:5
+  --> $DIR/allow.rs:31:5
    |
 LL |     trait TraitAlias = Debug;
    |     ^^^^^^^^^^^^^^^^^^^^^^^^^

tests/ui/attributes/positions/must_use.rs

@@ -15,9 +15,6 @@ pub mod empty_crate;
 
 #[must_use] //~ WARN
 pub mod module {
-    #![must_use] //~ WARN
-    //~^ WARN unused attribute
-    //~^^ WARN this was previously accepted by the compiler but is being phased out; it will become a hard error in a future release!
 
     #[must_use] //~ WARN
     pub static GLOBAL: u32 = 42;
@@ -112,6 +109,23 @@ pub mod module {
         #[must_use] // OK
         fn trait_method() {}
     }
+
+    fn x() {
+        #[must_use] //~ WARN
+        const {
+            // ..
+        }
+    }
+}
+
+pub mod inner_module {
+    #![must_use] //~ WARN
+
+    fn x() {
+        const {
+            #![must_use] //~ WARN
+        }
+    }
 }
 
 #[must_use] // OK