Merge branch 'master' of github.com:paritytech/substrate into gupnik/…

…derive-impl-improvements

frame/examples/default-config/src/lib.rs

@@ -132,7 +132,8 @@ pub mod pallet {
 #[cfg(any(test, doc))]
 pub mod tests {
 	use super::*;
-	use frame_support::derive_impl;
+	use frame_support::{derive_impl, parameter_types};
+	use pallet::{self as pallet_default_config_example, config_preludes::*};
 
 	type Block = frame_system::mocking::MockBlock<Runtime>;
 
@@ -144,7 +145,7 @@ pub mod tests {
 	);
 
 	#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
-	impl frame_system::Config for Test {
+	impl frame_system::Config for Runtime {
 		// all of this is coming from `frame_system::config_preludes::TestDefaultConfig`.
 
 		// type Nonce = u32;

frame/multisig/Cargo.toml

@@ -40,7 +40,6 @@ std = [
 	"sp-runtime/std",
 	"sp-std/std",
 	"pallet-balances/std",
-	"sp-core/std"
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",

frame/support/procedural/src/pallet/expand/config.rs

@@ -49,40 +49,49 @@ Consequently, a runtime that wants to include this pallet must implement this tr
 	);
 
 	// we only emit `DefaultConfig` if there are trait items, so an empty `DefaultConfig` is
-	// impossible consequently
-	if config.default_sub_trait.len() > 0 {
-		let trait_items = &config
-			.default_sub_trait
-			.iter()
-			.map(|item| {
-				if item.1 {
-					if let syn::TraitItem::Type(item) = item.0.clone() {
-						let mut item = item.clone();
-						item.bounds.clear();
-						syn::TraitItem::Type(item)
+	// impossible consequently.
+	match &config.default_sub_trait {
+		Some(default_sub_trait) if default_sub_trait.items.len() > 0 => {
+			let trait_items = &config
+				.default_sub_trait
+				.iter()
+				.map(|item| {
+					if item.1 {
+						if let syn::TraitItem::Type(item) = item.0.clone() {
+							let mut item = item.clone();
+							item.bounds.clear();
+							syn::TraitItem::Type(item)
+						} else {
+							item.0.clone()
+						}
 					} else {
 						item.0.clone()
 					}
-				} else {
-					item.0.clone()
+				})
+				.collect::<Vec<_>>();
+
+			let type_param_bounds = if default_sub_trait.has_system {
+				let system = &def.frame_system;
+				quote::quote!(: #system::DefaultConfig)
+			} else {
+				quote::quote!()
+			};
+
+			quote!(
+				/// Based on [`Config`]. Auto-generated by
+				/// [`#[pallet::config(with_default)]`](`frame_support::pallet_macros::config`).
+				/// Can be used in tandem with
+				/// [`#[register_default_config]`](`frame_support::register_default_config`) and
+				/// [`#[derive_impl]`](`frame_support::derive_impl`) to derive test config traits
+				/// based on existing pallet config traits in a safe and developer-friendly way.
+				///
+				/// See [here](`frame_support::pallet_macros::config`) for more information and caveats about
+				/// the auto-generated `DefaultConfig` trait and how it is generated.
+				pub trait DefaultConfig #type_param_bounds {
+					#(#trait_items)*
 				}
-			})
-			.collect::<Vec<_>>();
-		quote!(
-			/// Based on [`Config`]. Auto-generated by
-			/// [`#[pallet::config(with_default)]`](`frame_support::pallet_macros::config`).
-			/// Can be used in tandem with
-			/// [`#[register_default_config]`](`frame_support::register_default_config`) and
-			/// [`#[derive_impl]`](`frame_support::derive_impl`) to derive test config traits
-			/// based on existing pallet config traits in a safe and developer-friendly way.
-			///
-			/// See [here](`frame_support::pallet_macros::config`) for more information and caveats about
-			/// the auto-generated `DefaultConfig` trait and how it is generated.
-			pub trait DefaultConfig {
-				#(#trait_items)*
-			}
-		)
-	} else {
-		Default::default()
+			)
+		},
+		_ => Default::default(),
 	}
 }

frame/support/procedural/src/pallet/parse/config.rs

@@ -40,7 +40,10 @@ mod keyword {
 
 #[derive(Default)]
 pub struct DefaultTrait {
-	pub items: Vec<syn::TraitItem>,
+	/// A bool for each sub-trait item indicates whether the item has
+	/// `#[pallet::no_default_bounds]` attached to it. If true, the item will not have any bounds
+	/// in the generated default sub-trait.
+	pub items: Vec<(syn::TraitItem, bool)>,
 	pub has_system: bool,
 }
 
@@ -65,12 +68,8 @@ pub struct ConfigDef {
 	///
 	/// Contains default sub-trait items (instantiated by `#[pallet::config(with_default)]`).
 	/// Vec will be empty if `#[pallet::config(with_default)]` is not specified or if there are
-	/// no trait items
-	///
-	/// A bool for each sub-trait item indicates whether the item has
-	/// `#[pallet::no_default_bounds]` attached to it. If true, the item will not have any bounds
-	/// in the generated default sub-trait.
-	pub default_sub_trait: Vec<(syn::TraitItem, bool)>,
+	/// no trait items.
+	pub default_sub_trait: Option<DefaultTrait>,
 }
 
 /// Input definition for a constant in pallet config.
@@ -431,7 +430,11 @@ impl ConfigDef {
 			}
 
 			if !already_no_default && enable_default {
-				default_sub_trait.push((trait_item.clone(), already_no_default_bounds));
+				default_sub_trait
+					.as_mut()
+					.expect("is 'Some(_)' if 'enable_default'; qed")
+					.items
+					.push((trait_item.clone(), already_no_default_bounds));
 			}
 		}