Companion: restructure macro related exports (#7626)

* move RuntimeDebug out of frame_support

* move RuntimeDebug out of frame_support

* fix xcm export

* ".git/.scripts/commands/fmt/fmt.sh"

* fix xcm intefration tests

* fix cargo lock for xcm intefration tests

* wip

* restructure benchmarking macro related exports

* update cargo lock

---------

Co-authored-by: parity-processbot <>

polkadot/xcm/xcm-executor/integration-tests/Cargo.toml

@@ -8,6 +8,7 @@ version.workspace = true
 publish = false
 
 [dependencies]
+codec = { package = "parity-scale-codec", version = "3.6.1" }
 frame-support = { git = "https://github.com/paritytech/substrate", branch = "master", default-features = false }
 frame-system = { git = "https://github.com/paritytech/substrate", branch = "master" }
 futures = "0.3.21"

polkadot/xcm/xcm-executor/integration-tests/src/lib.rs

@@ -17,7 +17,8 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 #![cfg(test)]
 
-use frame_support::{codec::Encode, dispatch::GetDispatchInfo, weights::Weight};
+use codec::Encode;
+use frame_support::{dispatch::GetDispatchInfo, weights::Weight};
 use polkadot_test_client::{
 	BlockBuilderExt, ClientBlockImportExt, DefaultTestClientBuilderExt, InitPolkadotBlockBuilder,
 	TestClientBuilder, TestClientBuilderExt,

polkadot/xcm/xcm-simulator/example/src/lib.rs

@@ -17,8 +17,8 @@
 mod parachain;
 mod relay_chain;
 
-use frame_support::sp_tracing;
 use sp_runtime::BuildStorage;
+use sp_tracing;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 use xcm_simulator::{decl_test_network, decl_test_parachain, decl_test_relay_chain, TestExt};