Merge remote-tracking branch 'origin/master' into bkchr-rust-1.54

frame/support/test/tests/pallet_ui/duplicate_storage_prefix.stderr

@@ -28,8 +28,8 @@ error[E0412]: cannot find type `_GeneratedPrefixForStorageFoo` in this scope
 13 |     type Foo<T> = StorageValue<_, u8>;
    |          ^^^ not found in this scope
 
-error[E0121]: the type placeholder `_` is not allowed within types on item signatures for type aliases
-  --> $DIR/duplicate_storage_prefix.rs:17:35
+error[E0412]: cannot find type `_GeneratedPrefixForStorageNotFoo` in this scope
+  --> $DIR/duplicate_storage_prefix.rs:17:7
    |
 17 |     type NotFoo<T> = StorageValue<_, u16>;
    |          ^^^^^^ not found in this scope

frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen.stderr

@@ -5,12 +5,12 @@ error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
     |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
     |
     = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -20,12 +20,12 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
     |
     = note: required because of the requirements on the impl of `Decode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -35,12 +35,12 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
     |
     = note: required because of the requirements on the impl of `FullEncode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:20:12
@@ -51,12 +51,12 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
     = note: required because of the requirements on the impl of `Encode` for `Bar`
     = note: required because of the requirements on the impl of `FullEncode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen.rs:9:12

frame/support/test/tests/pallet_ui/storage_ensure_span_are_ok_on_wrong_gen_unnamed.stderr

@@ -5,12 +5,12 @@ error[E0277]: the trait bound `Bar: TypeInfo` is not satisfied
     |               ^^^^^^^ the trait `TypeInfo` is not implemented for `Bar`
     |
     = note: required because of the requirements on the impl of `StaticTypeInfo` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -20,12 +20,12 @@ error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
     |
     = note: required because of the requirements on the impl of `Decode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -35,12 +35,12 @@ error[E0277]: the trait bound `Bar: EncodeLike` is not satisfied
     |
     = note: required because of the requirements on the impl of `FullEncode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
    --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:20:12
@@ -51,12 +51,12 @@ error[E0277]: the trait bound `Bar: WrapperTypeEncode` is not satisfied
     = note: required because of the requirements on the impl of `Encode` for `Bar`
     = note: required because of the requirements on the impl of `FullEncode` for `Bar`
     = note: required because of the requirements on the impl of `FullCodec` for `Bar`
-    = note: required because of the requirements on the impl of `frame_support::storage::StorageEntryMetadata` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
-note: required by `NAME`
-   --> $DIR/mod.rs:111:2
+    = note: required because of the requirements on the impl of `StorageEntryMetadataBuilder` for `frame_support::pallet_prelude::StorageValue<_GeneratedPrefixForStorageFoo<T>, Bar>`
+note: required by `build_metadata`
+   --> $DIR/mod.rs:113:2
     |
-111 |     const NAME: &'static str;
-    |     ^^^^^^^^^^^^^^^^^^^^^^^^^
+113 |     fn build_metadata(doc: Vec<&'static str>, entries: &mut Vec<StorageEntryMetadata>);
+    |     ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 error[E0277]: the trait bound `Bar: WrapperTypeDecode` is not satisfied
   --> $DIR/storage_ensure_span_are_ok_on_wrong_gen_unnamed.rs:9:12