Companion for paritytech/substrate#12219 (#5987)

* Companion for paritytech/substrate#12219

* Fixes

* update lockfile for {"substrate"}

* Fixes

* cargo fmt

Co-authored-by: parity-processbot <>

polkadot/runtime/common/src/auctions.rs

@@ -80,7 +80,7 @@ type WinnersData<T> =
 #[frame_support::pallet]
 pub mod pallet {
 	use super::*;
-	use frame_support::{pallet_prelude::*, traits::EnsureOrigin, weights::DispatchClass};
+	use frame_support::{dispatch::DispatchClass, pallet_prelude::*, traits::EnsureOrigin};
 	use frame_system::{ensure_root, ensure_signed, pallet_prelude::*};
 
 	#[pallet::pallet]

polkadot/runtime/common/src/claims.rs

@@ -715,10 +715,9 @@ mod tests {
 	use claims::Call as ClaimsCall;
 	use frame_support::{
 		assert_err, assert_noop, assert_ok,
-		dispatch::DispatchError::BadOrigin,
+		dispatch::{DispatchError::BadOrigin, GetDispatchInfo, Pays},
 		ord_parameter_types, parameter_types,
 		traits::{ExistenceRequirement, GenesisBuild},
-		weights::{GetDispatchInfo, Pays},
 	};
 	use pallet_balances;
 	use sp_runtime::{

polkadot/runtime/common/src/impls.rs

@@ -61,10 +61,7 @@ where
 mod tests {
 	use super::*;
 	use frame_support::{
-		parameter_types,
-		traits::FindAuthor,
-		weights::{DispatchClass, Weight},
-		PalletId,
+		dispatch::DispatchClass, parameter_types, traits::FindAuthor, weights::Weight, PalletId,
 	};
 	use frame_system::limits;
 	use primitives::v2::AccountId;

polkadot/runtime/common/src/lib.rs

@@ -103,7 +103,7 @@ pub type SlowAdjustingFeeUpdate<R> =
 #[macro_export]
 macro_rules! impl_runtime_weights {
 	($runtime:ident) => {
-		use frame_support::weights::{DispatchClass, Weight};
+		use frame_support::{dispatch::DispatchClass, weights::Weight};
 		use frame_system::limits;
 		use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 		pub use runtime_common::{