From 9b6db48a42624d01bf18bd55bc1ddb289eccdf80 Mon Sep 17 00:00:00 2001
From: Liu-Cheng Xu <xuliuchengxlc@gmail.com>
Date: Tue, 16 Nov 2021 22:12:50 +0800
Subject: [PATCH] Specify edition 2021 in .rustfmt.yml (#760)

This PR is mainly to fix the error `[E0670]: async fn is not permitted in the 2015 edition` when
using Vim along with rust-analyzer, it also removes an unused dependency from parachain-template.

Ref: https://github.com/rust-analyzer/rust-analyzer/issues/1959
---
 .rustfmt.toml                      | 1 +
 Cargo.lock                         | 1 -
 parachain-template/node/Cargo.toml | 1 -
 3 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.rustfmt.toml b/.rustfmt.toml
index 3018614bb1..bfa2448ee1 100644
--- a/.rustfmt.toml
+++ b/.rustfmt.toml
@@ -1,4 +1,5 @@
 # Basic
+edition = "2021"
 hard_tabs = true
 max_width = 100
 use_small_heuristics = "Max"
diff --git a/Cargo.lock b/Cargo.lock
index c2441f42c0..7f2053f84b 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -6054,7 +6054,6 @@ dependencies = [
  "polkadot-parachain",
  "polkadot-primitives",
  "polkadot-service",
- "polkadot-test-service",
  "sc-basic-authorship",
  "sc-chain-spec",
  "sc-cli",
diff --git a/parachain-template/node/Cargo.toml b/parachain-template/node/Cargo.toml
index cde7f16f4f..9e6508437d 100644
--- a/parachain-template/node/Cargo.toml
+++ b/parachain-template/node/Cargo.toml
@@ -92,4 +92,3 @@ polkadot-cli = { git = "https://github.com/paritytech/polkadot", branch = "maste
 polkadot-parachain = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 polkadot-primitives = { git = "https://github.com/paritytech/polkadot", branch = "master" }
 polkadot-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }
-polkadot-test-service = { git = "https://github.com/paritytech/polkadot", branch = "master" }