Add a rustfmt.toml

rustfmt.toml

@@ -0,0 +1,22 @@
+# Basic
+hard_tabs = true
+max_width = 100
+use_small_heuristics = "Max"
+# Imports
+imports_granularity = "Crate"
+reorder_imports = true
+# Consistency
+newline_style = "Unix"
+normalize_comments = true
+normalize_doc_attributes = true
+# Misc
+chain_width = 80
+spaces_around_ranges = false
+binop_separator = "Back"
+reorder_impl_items = false
+match_arm_leading_pipes = "Preserve"
+match_arm_blocks = false
+match_block_trailing_comma = true
+trailing_comma = "Vertical"
+trailing_semicolon = false
+use_field_init_shorthand = true

utils/browser/src/lib.rs

@@ -15,25 +15,27 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+use std::pin::Pin;
+
+pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
+use futures::{
+	channel::{mpsc, oneshot},
+	compat::*,
+	future::{ok, ready, select},
+	prelude::*,
+};
 use futures01::sync::mpsc as mpsc01;
+use libp2p_wasm_ext::{ffi, ExtTransport};
 use log::{debug, info};
+use sc_chain_spec::Extension;
 use sc_network::config::TransportConfig;
 use sc_service::{
-	RpcSession, Role, Configuration, TaskManager, RpcHandlers,
 	config::{DatabaseConfig, KeystoreConfig, NetworkConfiguration},
-	GenericChainSpec, RuntimeGenesis,
-	KeepBlocks, TransactionStorageMode,
+	Configuration, GenericChainSpec, KeepBlocks, Role, RpcHandlers, RpcSession, RuntimeGenesis,
+	TaskManager, TransactionStorageMode,
 };
 use sc_tracing::logging::LoggerBuilder;
 use wasm_bindgen::prelude::*;
-use futures::{
-	prelude::*, channel::{oneshot, mpsc}, compat::*, future::{ready, ok, select}
-};
-use std::pin::Pin;
-use sc_chain_spec::Extension;
-use libp2p_wasm_ext::{ExtTransport, ffi};
-
-pub use console_error_panic_hook::set_once as set_console_error_panic_hook;
 
 /// Initialize the logger and return a `TelemetryWorker` and a wasm `ExtTransport`.
 pub fn init_logging(pattern: &str) -> Result<(), sc_tracing::logging::Error> {
@@ -73,7 +75,8 @@ where
 		task_executor: (|fut, _| {
 			wasm_bindgen_futures::spawn_local(fut);
 			async {}
-		}).into(),
+		})
+		.into(),
 		telemetry_external_transport: Some(transport),
 		role: Role::Light,
 		database: {
@@ -114,9 +117,7 @@ where
 		max_runtime_instances: 8,
 		announce_block: true,
 		base_path: None,
-		informant_output_format: sc_informant::OutputFormat {
-			enable_color: false,
-		},
+		informant_output_format: sc_informant::OutputFormat { enable_color: false },
 		disable_log_reloading: false,
 	};
 
@@ -153,12 +154,11 @@ pub fn start_client(mut task_manager: TaskManager, rpc_handlers: RpcHandlers) ->
 			Box::pin(async move {
 				let _ = task_manager.future().await;
 			}),
-		).map(drop)
+		)
+		.map(drop),
 	);
 
-	Client {
-		rpc_send_tx,
-	}
+	Client { rpc_send_tx }
 }
 
 #[wasm_bindgen]
@@ -175,12 +175,8 @@ impl Client {
 		});
 		wasm_bindgen_futures::future_to_promise(async {
 			match rx.await {
-				Ok(fut) => {
-					fut.await
-						.map(|s| JsValue::from_str(&s))
-						.ok_or_else(|| JsValue::NULL)
-				},
-				Err(_) => Err(JsValue::NULL)
+				Ok(fut) => fut.await.map(|s| JsValue::from_str(&s)).ok_or_else(|| JsValue::NULL),
+				Err(_) => Err(JsValue::NULL),
 			}
 		})
 	}
@@ -203,7 +199,8 @@ impl Client {
 		});
 
 		wasm_bindgen_futures::spawn_local(async move {
-			let _ = rx.compat()
+			let _ = rx
+				.compat()
 				.try_for_each(|s| {
 					let _ = callback.call1(&callback, &JsValue::from_str(&s));
 					ok(())

utils/build-script-utils/src/git.rs

@@ -33,16 +33,16 @@ pub fn rerun_if_git_head_changed() {
 			Err(err) => {
 				eprintln!("cargo:warning=Unable to read the Git repository: {}", err);
 
-				return;
-			}
-			Ok(None) => {}
+				return
+			},
+			Ok(None) => {},
 			Ok(Some(paths)) => {
 				for p in paths {
 					println!("cargo:rerun-if-changed={}", p.display());
 				}
 
-				return;
-			}
+				return
+			},
 		}
 
 		manifest_dir.pop();

utils/build-script-utils/src/lib.rs

@@ -17,8 +17,8 @@
 
 //! Crate with utility functions for `build.rs` scripts.
 
-mod version;
 mod git;
+mod version;
 
 pub use git::*;
 pub use version::*;

utils/build-script-utils/src/version.rs

@@ -15,20 +15,19 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-use platforms::*;
 use std::{borrow::Cow, process::Command};
 
+use platforms::*;
+
 /// Generate the `cargo:` key output
 pub fn generate_cargo_keys() {
-	let output = Command::new("git")
-		.args(&["rev-parse", "--short", "HEAD"])
-		.output();
+	let output = Command::new("git").args(&["rev-parse", "--short", "HEAD"]).output();
 
 	let commit = match output {
 		Ok(o) if o.status.success() => {
 			let sha = String::from_utf8_lossy(&o.stdout).trim().to_owned();
 			Cow::from(sha)
-		}
+		},
 		Ok(o) => {
 			println!("cargo:warning=Git command failed with status: {}", o.status);
 			Cow::from("unknown")