cargo +nightly fmt (#3540)

* cargo +nightly fmt * add cargo-fmt check to ci * update ci * fmt * fmt * skip macro * ignore bridges
2026-04-26 15:47:58 +00:00 · 2021-08-02 12:47:33 +02:00
parent 30e3012270
commit ff5d56fb76
350 changed files with 20617 additions and 21266 deletions
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with Polkadot.  If not, see <http://www.gnu.org/licenses/>.

-use log::info;
-use service::{IdentifyVariant, self};
-use sc_cli::{SubstrateCli, RuntimeVersion, Role};
 use crate::cli::{Cli, Subcommand};
 use futures::future::TryFutureExt;
+use log::info;
+use sc_cli::{Role, RuntimeVersion, SubstrateCli};
+use service::{self, IdentifyVariant};

 #[derive(thiserror::Error, Debug)]
 pub enum Error {
@@ -51,28 +51,45 @@ fn get_exec_name() -> Option<String> {
 }

 impl SubstrateCli for Cli {
-	fn impl_name() -> String { "Parity Polkadot".into() }
+	fn impl_name() -> String {
+		"Parity Polkadot".into()
+	}

-	fn impl_version() -> String { env!("SUBSTRATE_CLI_IMPL_VERSION").into() }
+	fn impl_version() -> String {
+		env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+	}

-	fn description() -> String { env!("CARGO_PKG_DESCRIPTION").into() }
+	fn description() -> String {
+		env!("CARGO_PKG_DESCRIPTION").into()
+	}

-	fn author() -> String { env!("CARGO_PKG_AUTHORS").into() }
+	fn author() -> String {
+		env!("CARGO_PKG_AUTHORS").into()
+	}

-	fn support_url() -> String { "https://github.com/paritytech/polkadot/issues/new".into() }
+	fn support_url() -> String {
+		"https://github.com/paritytech/polkadot/issues/new".into()
+	}

-	fn copyright_start_year() -> i32 { 2017 }
+	fn copyright_start_year() -> i32 {
+		2017
+	}

-	fn executable_name() -> String { "polkadot".into() }
+	fn executable_name() -> String {
+		"polkadot".into()
+	}

 	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
 		let id = if id == "" {
 			let n = get_exec_name().unwrap_or_default();
-			["polkadot", "kusama", "westend", "rococo"].iter()
+			["polkadot", "kusama", "westend", "rococo"]
+				.iter()
 				.cloned()
 				.find(|&chain| n.starts_with(chain))
 				.unwrap_or("polkadot")
-		} else { id };
+		} else {
+			id
+		};
 		Ok(match id {
 			"kusama" => Box::new(service::chain_spec::kusama_config()?),
 			#[cfg(feature = "kusama-native")]
@@ -119,7 +136,8 @@ impl SubstrateCli for Cli {
 			path => {
 				let path = std::path::PathBuf::from(path);

-				let chain_spec = Box::new(service::PolkadotChainSpec::from_json_file(path.clone())?) as Box<dyn service::ChainSpec>;
+				let chain_spec = Box::new(service::PolkadotChainSpec::from_json_file(path.clone())?)
+					as Box<dyn service::ChainSpec>;

 				// When `force_*` is given or the file name starts with the name of one of the known chains,
 				// we use the chain spec for the specific chain.
@@ -152,7 +170,11 @@ impl SubstrateCli for Cli {
 			return &service::rococo_runtime::VERSION
 		}

-		#[cfg(not(all(feature = "rococo-native", feature = "westend-native", feature = "kusama-native")))]
+		#[cfg(not(all(
+			feature = "rococo-native",
+			feature = "westend-native",
+			feature = "kusama-native"
+		)))]
 		let _ = spec;

 		&service::polkadot_runtime::VERSION
@@ -193,8 +215,7 @@ pub fn run_node(cli: Cli, overseer_gen: impl service::OverseerGen) -> Result<()>
 }

 fn run_node_inner(cli: Cli, overseer_gen: impl service::OverseerGen) -> Result<()> {
-	let runner = cli.create_runner(&cli.run.base)
-		.map_err(Error::from)?;
+	let runner = cli.create_runner(&cli.run.base).map_err(Error::from)?;
 	let chain_spec = &runner.config().chain_spec;

 	set_default_ss58_version(chain_spec);
@@ -220,7 +241,9 @@ fn run_node_inner(cli: Cli, overseer_gen: impl service::OverseerGen) -> Result<(

 		match role {
 			#[cfg(feature = "browser")]
-			Role::Light => service::build_light(config).map(|(task_manager, _)| task_manager).map_err(Into::into),
+			Role::Light => service::build_light(config)
+				.map(|(task_manager, _)| task_manager)
+				.map_err(Into::into),
 			#[cfg(not(feature = "browser"))]
 			Role::Light => Err(Error::Other("Light client not enabled".into())),
 			_ => service::build_full(
@@ -231,7 +254,9 @@ fn run_node_inner(cli: Cli, overseer_gen: impl service::OverseerGen) -> Result<(
 				jaeger_agent,
 				None,
 				overseer_gen,
-			).map(|full| full.task_manager).map_err(Into::into)
+			)
+			.map(|full| full.task_manager)
+			.map_err(Into::into),
 		}
 	})
 }
@@ -244,19 +269,17 @@ pub fn run() -> Result<()> {
 		None => run_node_inner(cli, service::RealOverseerGen),
 		Some(Subcommand::BuildSpec(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
-			Ok(runner.sync_run(|config| {
-				cmd.run(config.chain_spec, config.network)
-			})?)
+			Ok(runner.sync_run(|config| cmd.run(config.chain_spec, config.network))?)
 		},
 		Some(Subcommand::CheckBlock(cmd)) => {
-			let runner = cli.create_runner(cmd)
-				.map_err(Error::SubstrateCli)?;
+			let runner = cli.create_runner(cmd).map_err(Error::SubstrateCli)?;
 			let chain_spec = &runner.config().chain_spec;

 			set_default_ss58_version(chain_spec);

 			runner.async_run(|mut config| {
-				let (client, _, import_queue, task_manager) = service::new_chain_ops(&mut config, None)?;
+				let (client, _, import_queue, task_manager) =
+					service::new_chain_ops(&mut config, None)?;
 				Ok((cmd.run(client, import_queue).map_err(Error::SubstrateCli), task_manager))
 			})
 		},
@@ -267,8 +290,8 @@ pub fn run() -> Result<()> {
 			set_default_ss58_version(chain_spec);

 			Ok(runner.async_run(|mut config| {
-				let (client, _, _, task_manager) = service::new_chain_ops(&mut config, None)
-					.map_err(Error::PolkadotService)?;
+				let (client, _, _, task_manager) =
+					service::new_chain_ops(&mut config, None).map_err(Error::PolkadotService)?;
 				Ok((cmd.run(client, config.database).map_err(Error::SubstrateCli), task_manager))
 			})?)
 		},
@@ -290,7 +313,8 @@ pub fn run() -> Result<()> {
 			set_default_ss58_version(chain_spec);

 			Ok(runner.async_run(|mut config| {
-				let (client, _, import_queue, task_manager) = service::new_chain_ops(&mut config, None)?;
+				let (client, _, import_queue, task_manager) =
+					service::new_chain_ops(&mut config, None)?;
 				Ok((cmd.run(client, import_queue).map_err(Error::SubstrateCli), task_manager))
 			})?)
 		},
@@ -316,9 +340,10 @@ pub fn run() -> Result<()> {

 			#[cfg(any(target_os = "android", feature = "browser"))]
 			{
-				return Err(
-					sc_cli::Error::Input("PVF preparation workers are not supported under this platform".into()).into()
-				);
+				return Err(sc_cli::Error::Input(
+					"PVF preparation workers are not supported under this platform".into(),
+				)
+				.into())
 			}

 			#[cfg(not(any(target_os = "android", feature = "browser")))]
@@ -334,9 +359,10 @@ pub fn run() -> Result<()> {

 			#[cfg(any(target_os = "android", feature = "browser"))]
 			{
-				return Err(
-					sc_cli::Error::Input("PVF execution workers are not supported under this platform".into()).into()
-				);
+				return Err(sc_cli::Error::Input(
+					"PVF execution workers are not supported under this platform".into(),
+				)
+				.into())
 			}

 			#[cfg(not(any(target_os = "android", feature = "browser")))]
@@ -383,45 +409,51 @@ pub fn run() -> Result<()> {

 			use sc_service::TaskManager;
 			let registry = &runner.config().prometheus_config.as_ref().map(|cfg| &cfg.registry);
-			let task_manager = TaskManager::new(
-				runner.config().task_executor.clone(),
-				*registry,
-			).map_err(|e| Error::SubstrateService(sc_service::Error::Prometheus(e)))?;
+			let task_manager =
+				TaskManager::new(runner.config().task_executor.clone(), *registry)
+					.map_err(|e| Error::SubstrateService(sc_service::Error::Prometheus(e)))?;

 			ensure_dev(chain_spec).map_err(Error::Other)?;

 			#[cfg(feature = "kusama-native")]
 			if chain_spec.is_kusama() {
 				return runner.async_run(|config| {
-					Ok((cmd.run::<
-						service::kusama_runtime::Block,
-						service::KusamaExecutor,
-					>(config).map_err(Error::SubstrateCli), task_manager))
+					Ok((
+						cmd.run::<service::kusama_runtime::Block, service::KusamaExecutor>(config)
+							.map_err(Error::SubstrateCli),
+						task_manager,
+					))
 				})
 			}

 			#[cfg(feature = "westend-native")]
 			if chain_spec.is_westend() {
 				return runner.async_run(|config| {
-					Ok((cmd.run::<
-						service::westend_runtime::Block,
-						service::WestendExecutor,
-					>(config).map_err(Error::SubstrateCli), task_manager))
+					Ok((
+						cmd.run::<service::westend_runtime::Block, service::WestendExecutor>(
+							config,
+						)
+						.map_err(Error::SubstrateCli),
+						task_manager,
+					))
 				})
 			}
 			// else we assume it is polkadot.
 			runner.async_run(|config| {
-				Ok((cmd.run::<
-					service::polkadot_runtime::Block,
-					service::PolkadotExecutor,
-				>(config).map_err(Error::SubstrateCli), task_manager))
+				Ok((
+					cmd.run::<service::polkadot_runtime::Block, service::PolkadotExecutor>(config)
+						.map_err(Error::SubstrateCli),
+					task_manager,
+				))
 			})
 		},
 		#[cfg(not(feature = "try-runtime"))]
-		Some(Subcommand::TryRuntime) => {
-			Err(Error::Other("TryRuntime wasn't enabled when building the node. \
-				You can enable it with `--features try-runtime`.".into()).into())
-		},
+		Some(Subcommand::TryRuntime) => Err(Error::Other(
+			"TryRuntime wasn't enabled when building the node. \
+				You can enable it with `--features try-runtime`."
+				.into(),
+		)
+		.into()),
 	}?;
 	Ok(())
 }