From d956980de4e99cfb1d596d6f6f061a1deab1f12d Mon Sep 17 00:00:00 2001
From: topecongiro <seuchida@gmail.com>
Date: Fri, 8 Feb 2019 00:22:34 +0900
Subject: [PATCH] Use edition 2018

---
 Cargo.toml        | 1 +
 ci/integration.sh | 2 +-
 rustfmt.toml      | 1 -
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Cargo.toml b/Cargo.toml
index b1e83e93b0996..0c2ba5d8dd7f0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -9,6 +9,7 @@ readme = "README.md"
 license = "Apache-2.0/MIT"
 build = "build.rs"
 categories = ["development-tools"]
+edition = "2018"
 
 [[bin]]
 name = "rustfmt"
diff --git a/ci/integration.sh b/ci/integration.sh
index 1e050218905a6..48a652b8dfbe4 100755
--- a/ci/integration.sh
+++ b/ci/integration.sh
@@ -15,7 +15,7 @@ set -ex
 # it again.
 #
 #which cargo-fmt || cargo install --force
-cargo install --force
+cargo install --path . --force 
 
 echo "Integration tests for: ${INTEGRATION}"
 cargo fmt -- --version
diff --git a/rustfmt.toml b/rustfmt.toml
index eaa109c29dad7..eccd5f9bd19ee 100644
--- a/rustfmt.toml
+++ b/rustfmt.toml
@@ -1,4 +1,3 @@
 error_on_line_overflow = true
 error_on_unformatted = true
 version = "Two"
-edition = "2018"