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

scampi · web-flow · commit e28fae99747a · 2019-02-08T09:35:27.000+01:00
Use edition 2018
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"

Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ set -ex`
`15`	`15`	`# it again.`
`16`	`16`	`#`
`17`	`17`	`#which cargo-fmt \|\| cargo install --force`
`18`		`-cargo install --force`
	`18`	`+cargo install --path . --force`
`19`	`19`
`20`	`20`	`echo "Integration tests for: ${INTEGRATION}"`
`21`	`21`	`cargo fmt -- --version`