Merge pull request rust-lang#3328 from topecongiro/edition-2018

Use edition 2018
rust-lang-ci · Feb 8, 2019 · e28fae9 · e28fae9
2 parents 44d6f7c + d956980
commit e28fae9
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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
@@ -1,4 +1,3 @@
 error_on_line_overflow = true
 error_on_unformatted = true
 version = "Two"
-edition = "2018"