From 183f6d1b7404091319ac3a5ac7d42aeef2995840 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bastian=20K=C3=B6cher?= <git@kchr.de>
Date: Tue, 9 Jun 2020 15:16:02 +0200
Subject: [PATCH] Fix ui tests for latest rust stable

---
 .../tests/ui/mock_only_one_error_type.stderr  | 41 +++++++++++--------
 1 file changed, 23 insertions(+), 18 deletions(-)

diff --git a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
index b190c2134fafa..281f0024ee7eb 100644
--- a/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
+++ b/primitives/api/test/tests/ui/mock_only_one_error_type.stderr
@@ -5,21 +5,26 @@ error: Error type can not change between runtime apis
    |         ^^^^
 
 error[E0277]: the trait bound `u32: std::convert::From<std::string::String>` is not satisfied
-  --> $DIR/mock_only_one_error_type.rs:15:1
-   |
-15 | / sp_api::mock_impl_runtime_apis! {
-16 | |     impl Api<Block> for MockApi {
-17 | |         type Error = u32;
-18 | |
-...  |
-26 | |     }
-27 | | }
-   | |_^ the trait `std::convert::From<std::string::String>` is not implemented for `u32`
-   |
-   = help: the following implementations were found:
-             <u32 as std::convert::From<bool>>
-             <u32 as std::convert::From<char>>
-             <u32 as std::convert::From<h2::frame::reason::Reason>>
-             <u32 as std::convert::From<h2::frame::reason::Reason>>
-           and 18 others
-   = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)
+   --> $DIR/mock_only_one_error_type.rs:15:1
+    |
+15  | / sp_api::mock_impl_runtime_apis! {
+16  | |     impl Api<Block> for MockApi {
+17  | |         type Error = u32;
+18  | |
+...   |
+26  | |     }
+27  | | }
+    | |_^ the trait `std::convert::From<std::string::String>` is not implemented for `u32`
+    | 
+   ::: $WORKSPACE/primitives/api/src/lib.rs:347:35
+    |
+347 |       type Error: std::fmt::Debug + From<String>;
+    |                                     ------------ required by this bound in `sp_api_hidden_includes_DECL_RUNTIME_APIS::sp_api::ApiErrorExt`
+    |
+    = help: the following implementations were found:
+              <u32 as std::convert::From<bool>>
+              <u32 as std::convert::From<char>>
+              <u32 as std::convert::From<h2::frame::reason::Reason>>
+              <u32 as std::convert::From<h2::frame::reason::Reason>>
+            and 18 others
+    = note: this error originates in a macro (in Nightly builds, run with -Z macro-backtrace for more info)