Add missing licenses and tune the scanning workflow (#1288)

* Add missing Cumulus licenses

* Typo

* Add missing Substrate licenses

* Single job checking the sub-repos in steps

* Remove dates

* Remove dates

* Add missing (C)

* Update FRAME UI tests

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

* Update more UI tests

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

---------

Signed-off-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>
Co-authored-by: Oliver Tale-Yazdi <oliver.tale-yazdi@parity.io>

substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/abundant_where_param.stderr

@@ -1,5 +1,5 @@
 error: `Block` was declared above. Please use exactly one declaration for `Block`.
- --> $DIR/abundant_where_param.rs:7:3
-  |
-7 |         Block = Block1,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/abundant_where_param.rs:24:3
+   |
+24 |         Block = Block1,
+   |         ^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;

substrate/frame/support/test/tests/construct_runtime_ui/both_use_and_excluded_parts.stderr

@@ -1,22 +1,22 @@
 error: Unexpected tokens, expected one of `=`, `,`
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:26:43
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:43:43
    |
-26 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
+43 |         Pallet: pallet exclude_parts { Pallet } use_parts { Pallet },
    |                                                 ^^^^^^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:18:64
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:35:64
    |
-18 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-18 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:20:25
+  --> tests/construct_runtime_ui/both_use_and_excluded_parts.rs:37:25
    |
-20 | impl pallet::Config for Runtime {}
+37 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index.stderr

@@ -1,11 +1,11 @@
 error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
- --> $DIR/conflicting_index.rs:9:3
-  |
-9 |         System: system::{},
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/conflicting_index.rs:26:3
+   |
+26 |         System: system::{},
+   |         ^^^^^^
 
 error: Pallet indices are conflicting: Both pallets System and Pallet1 are at index 0
-  --> $DIR/conflicting_index.rs:10:3
+  --> tests/construct_runtime_ui/conflicting_index.rs:27:3
    |
-10 |         Pallet1: pallet1::{} = 0,
+27 |         Pallet1: pallet1::{} = 0,
    |         ^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_index_2.stderr

@@ -1,11 +1,11 @@
 error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
- --> $DIR/conflicting_index_2.rs:9:3
-  |
-9 |         System: system::{} = 5,
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/conflicting_index_2.rs:26:3
+   |
+26 |         System: system::{} = 5,
+   |         ^^^^^^
 
 error: Pallet indices are conflicting: Both pallets System and Pallet3 are at index 5
-  --> $DIR/conflicting_index_2.rs:12:3
+  --> tests/construct_runtime_ui/conflicting_index_2.rs:29:3
    |
-12 |         Pallet3: pallet3::{},
+29 |         Pallet3: pallet3::{},
    |         ^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/conflicting_module_name.stderr

@@ -1,11 +1,11 @@
 error: Two pallets with the same name!
- --> tests/construct_runtime_ui/conflicting_module_name.rs:7:3
-  |
-7 |         Balance: balances::{Pallet},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/conflicting_module_name.rs:24:3
+   |
+24 |         Balance: balances::{Pallet},
+   |         ^^^^^^^
 
 error: Two pallets with the same name!
- --> tests/construct_runtime_ui/conflicting_module_name.rs:8:3
-  |
-8 |         Balance: balances::{Pallet},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/conflicting_module_name.rs:25:3
+   |
+25 |         Balance: balances::{Pallet},
+   |         ^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/deprecated_where_block.stderr

@@ -5,30 +5,30 @@ error: use of deprecated constant `WhereSection::_w`:
 
                For more info see:
                    <https://github.com/paritytech/substrate/pull/14437>
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | / construct_runtime! {
-4  | |     pub struct Runtime where
-5  | |         Block = Block,
-6  | |         NodeBlock = Block,
+20 | / construct_runtime! {
+21 | |     pub struct Runtime where
+22 | |         Block = Block,
+23 | |         NodeBlock = Block,
 ...  |
-10 | |     }
-11 | | }
+27 | |     }
+28 | | }
    | |_^
    |
    = note: `-D deprecated` implied by `-D warnings`
    = note: this error originates in the macro `frame_support::match_and_insert` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -40,28 +40,28 @@ note: required by a bound in `frame_system::Event`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Clone`
@@ -72,28 +72,28 @@ note: required by a bound in `Clone`
    = note: this error originates in the derive macro `Clone` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
@@ -104,28 +104,28 @@ note: required by a bound in `EncodeLike`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
@@ -136,15 +136,15 @@ note: required by a bound in `Decode`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `frame_system::Event<Runtime>`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -157,15 +157,15 @@ note: required by a bound in `From`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `frame_system::Event<Runtime>`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -178,38 +178,38 @@ note: required by a bound in `TryInto`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
- --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
-  |
-3 | construct_runtime! {
-  | ^ the trait `Config` is not implemented for `Runtime`
-  |
-  = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
+   |
+20 | construct_runtime! {
+   | ^ the trait `Config` is not implemented for `Runtime`
+   |
+   = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `RawOrigin<_>: TryFrom<OriginCaller>` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -217,15 +217,15 @@ error[E0277]: the trait bound `RawOrigin<_>: TryFrom<OriginCaller>` is not satis
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -234,29 +234,29 @@ error[E0277]: the trait bound `Runtime: Config` is not satisfied
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Clone`
@@ -267,29 +267,29 @@ note: required by a bound in `Clone`
    = note: this error originates in the derive macro `Clone` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `EncodeLike`
@@ -300,29 +300,29 @@ note: required by a bound in `EncodeLike`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Decode`
@@ -333,40 +333,40 @@ note: required by a bound in `Decode`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
- --> tests/construct_runtime_ui/deprecated_where_block.rs:9:3
-  |
-9 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-  |         ^^^^^^ the trait `Config` is not implemented for `Runtime`
-  |
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:26:3
+   |
+26 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+   |         ^^^^^^ the trait `Config` is not implemented for `Runtime`
+   |
 note: required by a bound in `frame_system::GenesisConfig`
- --> $WORKSPACE/substrate/frame/system/src/lib.rs
-  |
-  |     pub struct GenesisConfig<T: Config> {
-  |                                 ^^^^^^ required by this bound in `GenesisConfig`
+  --> $WORKSPACE/substrate/frame/system/src/lib.rs
+   |
+   |     pub struct GenesisConfig<T: Config> {
+   |                                 ^^^^^^ required by this bound in `GenesisConfig`
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Result`
@@ -377,28 +377,28 @@ note: required by a bound in `Result`
    = note: this error originates in the derive macro `self::sp_api_hidden_includes_construct_runtime::hidden_include::__private::codec::Decode` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied in `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
 note: required because it appears within the type `RuntimeEvent`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `TryInto`
@@ -409,29 +409,29 @@ note: required by a bound in `TryInto`
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0277]: the trait bound `Runtime: Config` is not satisfied
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
    |
    = note: required for `Pallet<Runtime>` to implement `Callable<Runtime>`
 note: required because it appears within the type `RuntimeCall`
-  --> tests/construct_runtime_ui/deprecated_where_block.rs:3:1
+  --> tests/construct_runtime_ui/deprecated_where_block.rs:20:1
    |
-3  | // construct_runtime! {
-4  | ||     pub struct Runtime where
-5  | ||         Block = Block,
-6  | ||         NodeBlock = Block,
+20 | // construct_runtime! {
+21 | ||     pub struct Runtime where
+22 | ||         Block = Block,
+23 | ||         NodeBlock = Block,
 ...  ||
-10 | ||     }
-11 | || }
+27 | ||     }
+28 | || }
    | ||_- in this macro invocation
 ...  |
 note: required by a bound in `Result`

substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/double_module_parts.stderr

@@ -1,5 +1,5 @@
 error: `Config` was already declared before. Please remove the duplicate declaration
- --> tests/construct_runtime_ui/double_module_parts.rs:7:37
-  |
-7 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
-  |                                           ^^^^^^
+  --> tests/construct_runtime_ui/double_module_parts.rs:24:37
+   |
+24 |         Balance: balances::{Config, Call, Config<T>, Origin<T>},
+   |                                           ^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/duplicate_exclude.stderr

@@ -1,5 +1,5 @@
 error: `Call` was already declared before. Please remove the duplicate declaration
- --> $DIR/duplicate_exclude.rs:9:46
-  |
-9 |         System: frame_system exclude_parts { Call, Call },
-  |                                                    ^^^^
+  --> tests/construct_runtime_ui/duplicate_exclude.rs:26:46
+   |
+26 |         System: frame_system exclude_parts { Call, Call },
+   |                                                    ^^^^

substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/empty_pallet_path.stderr

@@ -1,5 +1,5 @@
 error: expected one of: `crate`, `self`, `super`, identifier
- --> tests/construct_runtime_ui/empty_pallet_path.rs:6:11
-  |
-6 |         system: ,
-  |                 ^
+  --> tests/construct_runtime_ui/empty_pallet_path.rs:23:11
+   |
+23 |         system: ,
+   |                 ^

substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/exclude_missspell.stderr

@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> $DIR/exclude_missspell.rs:9:24
-  |
-9 |         System: frame_system exclude_part { Call },
-  |                              ^^^^^^^^^^^^
+  --> tests/construct_runtime_ui/exclude_missspell.rs:26:24
+   |
+26 |         System: frame_system exclude_part { Call },
+   |                              ^^^^^^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;

substrate/frame/support/test/tests/construct_runtime_ui/exclude_undefined_part.stderr

@@ -1,22 +1,22 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:31:34
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:48:34
    |
-31 |         Pallet: pallet exclude_parts { Call },
+48 |         Pallet: pallet exclude_parts { Call },
    |                                        ^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:23:64
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:40:64
    |
-23 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-23 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/exclude_undefined_part.rs:25:25
+  --> tests/construct_runtime_ui/exclude_undefined_part.rs:42:25
    |
-25 | impl pallet::Config for Runtime {}
+42 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope

substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/feature_gated_system_pallet.stderr

@@ -1,5 +1,5 @@
 error: `System` pallet declaration is feature gated, please remove any `#[cfg]` attributes
- --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:7:3
-  |
-7 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-  |         ^^^^^^
+  --> tests/construct_runtime_ui/feature_gated_system_pallet.rs:24:3
+   |
+24 |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+   |         ^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/generics_in_invalid_module.stderr

@@ -1,5 +1,5 @@
 error: `Call` is not allowed to have generics. Only the following pallets are allowed to have generics: `Event`, `Error`, `Origin`, `Config`.
- --> tests/construct_runtime_ui/generics_in_invalid_module.rs:7:36
-  |
-7 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
-  |                                          ^^^^
+  --> tests/construct_runtime_ui/generics_in_invalid_module.rs:24:36
+   |
+24 |         Balance: balances::<Instance1>::{Call<T>, Origin<T>},
+   |                                          ^^^^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_meta_literal.stderr

@@ -1,6 +1,6 @@
 error: feature = 1
                  ^ expected one of `<key>`, `all`, `any`, `not` here
- --> tests/construct_runtime_ui/invalid_meta_literal.rs:7:3
-  |
-7 |         #[cfg(feature = 1)]
-  |         ^
+  --> tests/construct_runtime_ui/invalid_meta_literal.rs:24:3
+   |
+24 |         #[cfg(feature = 1)]
+   |         ^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details.stderr

@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> tests/construct_runtime_ui/invalid_module_details.rs:6:17
-  |
-6 |         system: System::(),
-  |                       ^
+  --> tests/construct_runtime_ui/invalid_module_details.rs:23:17
+   |
+23 |         system: System::(),
+   |                       ^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_details_keyword.stderr

@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Error`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
- --> tests/construct_runtime_ui/invalid_module_details_keyword.rs:6:20
-  |
-6 |         system: System::{enum},
-  |                          ^^^^
+  --> tests/construct_runtime_ui/invalid_module_details_keyword.rs:23:20
+   |
+23 |         system: System::{enum},
+   |                          ^^^^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_module_entry.stderr

@@ -1,5 +1,5 @@
 error: expected one of: `Pallet`, `Call`, `Storage`, `Event`, `Error`, `Config`, `Origin`, `Inherent`, `ValidateUnsigned`, `FreezeReason`, `HoldReason`, `LockId`, `SlashReason`
- --> tests/construct_runtime_ui/invalid_module_entry.rs:7:23
-  |
-7 |         Balance: balances::{Unexpected},
-  |                             ^^^^^^^^^^
+  --> tests/construct_runtime_ui/invalid_module_entry.rs:24:23
+   |
+24 |         Balance: balances::{Unexpected},
+   |                             ^^^^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_module.stderr

@@ -1,5 +1,5 @@
 error: Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`
- --> tests/construct_runtime_ui/invalid_token_after_module.rs:6:18
-  |
-6 |         system: System ?
-  |                        ^
+  --> tests/construct_runtime_ui/invalid_token_after_module.rs:23:18
+   |
+23 |         system: System ?
+   |                        ^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_token_after_name.stderr

@@ -1,5 +1,5 @@
 error: expected `:`
- --> tests/construct_runtime_ui/invalid_token_after_name.rs:6:10
-  |
-6 |         system ?
-  |                ^
+  --> tests/construct_runtime_ui/invalid_token_after_name.rs:23:10
+   |
+23 |         system ?
+   |                ^

substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/invalid_where_param.stderr

@@ -1,5 +1,5 @@
 error: expected one of: `Block`, `NodeBlock`, `UncheckedExtrinsic`
- --> $DIR/invalid_where_param.rs:7:3
-  |
-7 |         TypeX = Block,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/invalid_where_param.rs:24:3
+   |
+24 |         TypeX = Block,
+   |         ^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.stderr

@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Event` cannot be constructed: pallet `Balance` must have generic `Event`
- --> tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs:7:3
-  |
-7 |         Balance: balances::<Instance1> expanded::{}::{Event},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/missing_event_generic_on_module_with_instance.rs:24:3
+   |
+24 |         Balance: balances::<Instance1> expanded::{}::{Event},
+   |         ^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/missing_module_instance.stderr

@@ -1,5 +1,5 @@
 error: expected identifier
- --> tests/construct_runtime_ui/missing_module_instance.rs:6:20
-  |
-6 |         system: System::<>,
-  |                          ^
+  --> tests/construct_runtime_ui/missing_module_instance.rs:23:20
+   |
+23 |         system: System::<>,
+   |                          ^

substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.stderr

@@ -1,5 +1,5 @@
 error: Instantiable pallet with no generic `Origin` cannot be constructed: pallet `Balance` must have generic `Origin`
- --> tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs:7:3
-  |
-7 |         Balance: balances::<Instance1> expanded::{}::{Origin},
-  |         ^^^^^^^
+  --> tests/construct_runtime_ui/missing_origin_generic_on_module_with_instance.rs:24:3
+   |
+24 |         Balance: balances::<Instance1> expanded::{}::{Origin},
+   |         ^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr

@@ -1,6 +1,6 @@
 error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},`
- --> tests/construct_runtime_ui/missing_system_module.rs:5:2
-  |
-5 | /     {
-6 | |     }
-  | |_____^
+  --> tests/construct_runtime_ui/missing_system_module.rs:22:2
+   |
+22 | /     {
+23 | |     }
+   | |_____^

substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/missing_where_param.stderr

@@ -1,5 +1,5 @@
 error: Missing associated type for `UncheckedExtrinsic`. Add `UncheckedExtrinsic` = ... to where section.
- --> tests/construct_runtime_ui/missing_where_param.rs:7:2
-  |
-7 |     {}
-  |     ^
+  --> tests/construct_runtime_ui/missing_where_param.rs:24:2
+   |
+24 |     {}
+   |     ^

substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/more_than_256_modules.stderr

@@ -1,5 +1,5 @@
 error: Pallet index doesn't fit into u8, index is 256
-  --> $DIR/more_than_256_modules.rs:10:3
+  --> tests/construct_runtime_ui/more_than_256_modules.rs:27:3
    |
-10 |         Pallet256: pallet256::{},
+27 |         Pallet256: pallet256::{},
    |         ^^^^^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/no_comma_after_where.stderr

@@ -1,5 +1,5 @@
 error: Expected `,` or `{`
- --> $DIR/no_comma_after_where.rs:6:3
-  |
-6 |         Block = Block,
-  |         ^^^^^
+  --> tests/construct_runtime_ui/no_comma_after_where.rs:23:3
+   |
+23 |         Block = Block,
+   |         ^^^^^

substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.stderr

@@ -1,63 +1,63 @@
 error: The number of pallets exceeds the maximum number of tuple elements. To increase this limit, enable the tuples-96 feature of [frame_support].
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:2
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:66:2
    |
-49 |     pub struct Runtime
+66 |     pub struct Runtime
    |     ^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:18:64
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:35:64
    |
-18 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-18 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+35 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:20:25
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:37:25
    |
-20 | impl pallet::Config for Runtime {}
+37 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:22:31
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:39:31
    |
-22 | impl frame_system::Config for Runtime {
+39 | impl frame_system::Config for Runtime {
    |                               ^^^^^^^ not found in this scope
 
 error[E0412]: cannot find type `RuntimeOrigin` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:24:23
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:41:23
    |
-24 |     type RuntimeOrigin = RuntimeOrigin;
+41 |     type RuntimeOrigin = RuntimeOrigin;
    |                          ^^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeOrigin`
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:26:21
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:43:21
    |
-26 |     type RuntimeCall = RuntimeCall;
+43 |     type RuntimeCall = RuntimeCall;
    |                        ^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeCall`
 
 error[E0412]: cannot find type `RuntimeEvent` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:32:22
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:49:22
    |
-32 |     type RuntimeEvent = RuntimeEvent;
+49 |     type RuntimeEvent = RuntimeEvent;
    |                         ^^^^^^^^^^^^ help: you might have meant to use the associated type: `Self::RuntimeEvent`
 
 error[E0412]: cannot find type `PalletInfo` in this scope
-  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:38:20
+  --> tests/construct_runtime_ui/number_of_pallets_exceeds_tuple_size.rs:55:20
    |
-38 |     type PalletInfo = PalletInfo;
+55 |     type PalletInfo = PalletInfo;
    |                       ^^^^^^^^^^
    |
 help: you might have meant to use the associated type
    |
-38 |     type PalletInfo = Self::PalletInfo;
+55 |     type PalletInfo = Self::PalletInfo;
    |                       ~~~~~~~~~~~~~~~~
 help: consider importing one of these items
    |
-1  + use frame_benchmarking::__private::traits::PalletInfo;
+18 + use frame_benchmarking::__private::traits::PalletInfo;
    |
-1  + use frame_support::traits::PalletInfo;
+18 + use frame_support::traits::PalletInfo;
    |

substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/pallet_error_too_large.stderr

@@ -1,13 +1,13 @@
 error[E0080]: evaluation of constant value failed
-  --> tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
+  --> tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
    |
-73 | / construct_runtime! {
-74 | |     pub struct Runtime
-75 | |     {
-76 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-77 | |         Pallet: pallet::{Pallet},
-78 | |     }
-79 | | }
-   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:73:1
+90 | / construct_runtime! {
+91 | |     pub struct Runtime
+92 | |     {
+93 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+94 | |         Pallet: pallet::{Pallet},
+95 | |     }
+96 | | }
+   | |_^ the evaluated program panicked at 'The maximum encoded size of the error type in the `Pallet` pallet exceeds `MAX_MODULE_ERROR_ENCODED_SIZE`', $DIR/tests/construct_runtime_ui/pallet_error_too_large.rs:90:1
    |
    = note: this error originates in the macro `$crate::panic::panic_2021` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)

substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_call_part.stderr

@@ -1,16 +1,16 @@
 error: `Pallet` does not have #[pallet::call] defined, perhaps you should remove `Call` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_call_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_call_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet::{Pallet, Call},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet::{Pallet, Call},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_call_check::is_call_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)

substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_event_part.stderr

@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::event] defined, perhaps you should remove `Event` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_event_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_event_check::is_event_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Event` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_event_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_event_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Event},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Event},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_support_test::Event;
+18 + use frame_support_test::Event;
    |
-1  + use frame_system::Event;
+18 + use frame_system::Event;
    |

substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_genesis_config_part.stderr

@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::genesis_config] defined, perhaps you should remove `Config` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_genesis_config_check::is_genesis_config_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `GenesisConfig` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_genesis_config_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Config},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Config},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_system::GenesisConfig;
+18 + use frame_system::GenesisConfig;
    |
-1  + use test_pallet::GenesisConfig;
+18 + use test_pallet::GenesisConfig;
    |

substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_inherent_part.stderr

@@ -1,34 +1,34 @@
 error: `Pallet` does not have #[pallet::inherent] defined, perhaps you should remove `Inherent` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_inherent_check::is_inherent_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `create_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `create_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -37,19 +37,19 @@ error[E0599]: no function or associated item named `create_inherent` found for s
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -58,19 +58,19 @@ error[E0599]: no function or associated item named `is_inherent` found for struc
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `check_inherent` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `check_inherent` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -79,19 +79,19 @@ error[E0599]: no function or associated item named `check_inherent` found for st
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- associated item `INHERENT_IDENTIFIER` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope
@@ -100,19 +100,19 @@ error[E0599]: no associated item named `INHERENT_IDENTIFIER` found for struct `p
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `is_inherent_required` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_inherent_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_inherent_part.rs:65:1
    |
-11 |       pub struct Pallet<T>(_);
+28 |       pub struct Pallet<T>(_);
    |       -------------------- function or associated item `is_inherent_required` not found for this struct
 ...
-48 |   construct_runtime! {
+65 |   construct_runtime! {
    |  _^
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
-53 | |     }
-54 | | }
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Inherent},
+70 | |     }
+71 | | }
    | |_^ function or associated item not found in `Pallet<Runtime>`
    |
    = help: items from traits can only be used if the trait is implemented and in scope

substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_origin_part.stderr

@@ -1,36 +1,36 @@
 error: `Pallet` does not have #[pallet::origin] defined, perhaps you should remove `Origin` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_origin_check::is_origin_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0412]: cannot find type `Origin` in module `pallet`
-  --> tests/construct_runtime_ui/undefined_origin_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_origin_part.rs:65:1
    |
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system expanded::{}::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet expanded::{}::{Pallet, Origin},
+70 | |     }
+71 | | }
    | |_^ not found in `pallet`
    |
    = note: this error originates in the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 help: consider importing one of these items
    |
-1  + use frame_support_test::Origin;
+18 + use frame_support_test::Origin;
    |
-1  + use frame_system::Origin;
+18 + use frame_system::Origin;
    |

substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_core::sr25519;
 use sp_runtime::{generic, traits::BlakeTwo256};

substrate/frame/support/test/tests/construct_runtime_ui/undefined_validate_unsigned_part.stderr

@@ -1,49 +1,49 @@
 error: `Pallet` does not have #[pallet::validate_unsigned] defined, perhaps you should remove `ValidateUnsigned` from construct_runtime?
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:5:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:22:1
    |
-5  |   #[frame_support::pallet]
+22 |   #[frame_support::pallet]
    |   ^^^^^^^^^^^^^^^^^^^^^^^^
 ...
-48 | / construct_runtime! {
-49 | |     pub struct Runtime
-50 | |     {
-51 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | |     }
-54 | | }
+65 | / construct_runtime! {
+66 | |     pub struct Runtime
+67 | |     {
+68 | |         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | |         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | |     }
+71 | | }
    | |_- in this macro invocation
    |
    = note: this error originates in the macro `pallet::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no variant or associated item named `Pallet` found for enum `RuntimeCall` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:52:3
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:69:3
    |
-48 | // construct_runtime! {
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+65 | // construct_runtime! {
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
    | ||        -^^^^^^ variant or associated item not found in `RuntimeCall`
    | ||________|
    | |
 ...  |
 
 error[E0599]: no function or associated item named `pre_dispatch` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
    |
-11 |        pub struct Pallet<T>(_);
+28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `pre_dispatch` not found for this struct
 ...
-48 |    construct_runtime! {
+65 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | ||     }
-54 | || }
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | ||     }
+71 | || }
    | ||_- in this macro invocation
 ...  |
    |
@@ -54,21 +54,21 @@ error[E0599]: no function or associated item named `pre_dispatch` found for stru
    = note: this error originates in the macro `frame_support::construct_runtime` which comes from the expansion of the macro `construct_runtime` (in Nightly builds, run with -Z macro-backtrace for more info)
 
 error[E0599]: no function or associated item named `validate_unsigned` found for struct `pallet::Pallet` in the current scope
-  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:48:1
+  --> tests/construct_runtime_ui/undefined_validate_unsigned_part.rs:65:1
    |
-11 |        pub struct Pallet<T>(_);
+28 |        pub struct Pallet<T>(_);
    |        -------------------- function or associated item `validate_unsigned` not found for this struct
 ...
-48 |    construct_runtime! {
+65 |    construct_runtime! {
    |  __^
    | | _|
    | ||
-49 | ||     pub struct Runtime
-50 | ||     {
-51 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
-52 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
-53 | ||     }
-54 | || }
+66 | ||     pub struct Runtime
+67 | ||     {
+68 | ||         System: frame_system::{Pallet, Call, Storage, Config<T>, Event<T>},
+69 | ||         Pallet: pallet::{Pallet, ValidateUnsigned},
+70 | ||     }
+71 | || }
    | ||_- in this macro invocation
 ...  |
    |

substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/unsupported_meta_structure.stderr

@@ -1,6 +1,6 @@
 error: feature(test)
               ^ expected one of `=`, `,`, `)` here
- --> tests/construct_runtime_ui/unsupported_meta_structure.rs:7:3
-  |
-7 |         #[cfg(feature(test))]
-  |         ^
+  --> tests/construct_runtime_ui/unsupported_meta_structure.rs:24:3
+   |
+24 |         #[cfg(feature(test))]
+   |         ^

substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 
 construct_runtime! {

substrate/frame/support/test/tests/construct_runtime_ui/unsupported_pallet_attr.stderr

@@ -1,5 +1,5 @@
 error: Unsupported attribute, only #[cfg] is supported on pallet declarations in `construct_runtime`
- --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:7:3
-  |
-7 |         #[attr]
-  |         ^
+  --> tests/construct_runtime_ui/unsupported_pallet_attr.rs:24:3
+   |
+24 |         #[attr]
+   |         ^

substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.rs

@@ -1,3 +1,20 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
 use frame_support::construct_runtime;
 use sp_runtime::{generic, traits::BlakeTwo256};
 use sp_core::sr25519;

substrate/frame/support/test/tests/construct_runtime_ui/use_undefined_part.stderr

@@ -1,22 +1,22 @@
 error: Invalid pallet part specified, the pallet `Pallet` doesn't have the `Call` part. Available parts are: `Pallet`, `Storage`.
-  --> tests/construct_runtime_ui/use_undefined_part.rs:31:30
+  --> tests/construct_runtime_ui/use_undefined_part.rs:48:30
    |
-31 |         Pallet: pallet use_parts { Call },
+48 |         Pallet: pallet use_parts { Call },
    |                                    ^^^^
 
 error[E0412]: cannot find type `RuntimeCall` in this scope
-  --> tests/construct_runtime_ui/use_undefined_part.rs:23:64
+  --> tests/construct_runtime_ui/use_undefined_part.rs:40:64
    |
-23 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                                                                ^^^^^^^^^^^ not found in this scope
    |
 help: you might be missing a type parameter
    |
-23 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
+40 | pub type UncheckedExtrinsic<RuntimeCall> = generic::UncheckedExtrinsic<u32, RuntimeCall, Signature, ()>;
    |                            +++++++++++++
 
 error[E0412]: cannot find type `Runtime` in this scope
-  --> tests/construct_runtime_ui/use_undefined_part.rs:25:25
+  --> tests/construct_runtime_ui/use_undefined_part.rs:42:25
    |
-25 | impl pallet::Config for Runtime {}
+42 | impl pallet::Config for Runtime {}
    |                         ^^^^^^^ not found in this scope