From 22139a3c0359b391bd39c2a7e92f9cd39151419e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <bkchr@users.noreply.github.com>
Date: Mon, 29 Mar 2021 17:05:06 +0200
Subject: [PATCH] Prepare UI tests for Rust 1.51 & new CI image (#8474)

* Prepare UI tests for Rust 1.51 & new CI image

* another stderr to be fixed

Co-authored-by: Denis P <denis.pisarev@parity.io>
---
 .../missing_system_module.stderr              |  3 +--
 .../test/tests/derive_no_bound_ui/eq.stderr   |  5 +++++
 .../tests/pallet_ui/hooks_invalid_item.stderr | 20 ++++++++++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
index c5319da8510..7648f5c1bfb 100644
--- a/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
+++ b/substrate/frame/support/test/tests/construct_runtime_ui/missing_system_module.stderr
@@ -1,7 +1,6 @@
 error: `System` pallet declaration is missing. Please add this line: `System: frame_system::{Pallet, Call, Storage, Config, Event<T>},`
  --> $DIR/missing_system_module.rs:8:2
   |
-8 |       {
-  |  _____^
+8 | /     {
 9 | |     }
   | |_____^
diff --git a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
index bbd907adecb..36384178d46 100644
--- a/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
+++ b/substrate/frame/support/test/tests/derive_no_bound_ui/eq.stderr
@@ -4,4 +4,9 @@ error[E0277]: can't compare `Foo<T>` with `Foo<T>`
 6   | struct Foo<T: Config> {
     |        ^^^ no implementation for `Foo<T> == Foo<T>`
     |
+   ::: $RUST/core/src/cmp.rs
+    |
+    | pub trait Eq: PartialEq<Self> {
+    |               --------------- required by this bound in `Eq`
+    |
     = help: the trait `PartialEq` is not implemented for `Foo<T>`
diff --git a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
index 0379448f694..3812b433e20 100644
--- a/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
+++ b/substrate/frame/support/test/tests/pallet_ui/hooks_invalid_item.stderr
@@ -1,5 +1,15 @@
-error[E0107]: wrong number of type arguments: expected 1, found 0
-  --> $DIR/hooks_invalid_item.rs:12:18
-   |
-12 |     impl<T: Config> Hooks for Pallet<T> {}
-   |                     ^^^^^ expected 1 type argument
+error[E0107]: missing generics for trait `Hooks`
+   --> $DIR/hooks_invalid_item.rs:12:18
+    |
+12  |     impl<T: Config> Hooks for Pallet<T> {}
+    |                     ^^^^^ expected 1 type argument
+    |
+note: trait defined here, with 1 type parameter: `BlockNumber`
+   --> $DIR/hooks.rs:206:11
+    |
+206 | pub trait Hooks<BlockNumber> {
+    |           ^^^^^ -----------
+help: use angle brackets to add missing type argument
+    |
+12  |     impl<T: Config> Hooks<BlockNumber> for Pallet<T> {}
+    |                          ^^^^^^^^^^^^^
-- 
GitLab