X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=92418a49ec57de3181a21bd791f4b3ebd8e855ea;hb=5607178d0a6d1136faf2bad63cc3cc2448752f1b;hp=3c93e26c714cb71c77b330a24a2e761fdfef402c;hpb=bbc380b1e6b0e41042c8c259dfad49cea7af0b35;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 3c93e26c714..92418a49ec5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "1.0.0"
+version = "1.2.2"
 authors = ["Nicholas Cameron <ncameron@mozilla.com>", "The Rustfmt developers"]
 description = "Tool to find and fix Rust formatting issues"
 repository = "https://github.com/rust-lang/rustfmt"
@@ -9,6 +9,7 @@ readme = "README.md"
 license = "Apache-2.0/MIT"
 build = "build.rs"
 categories = ["development-tools"]
+edition = "2018"
 
 [[bin]]
 name = "rustfmt"
@@ -34,25 +35,32 @@ generic-simd = ["bytecount/generic-simd"]
 
 [dependencies]
 atty = "0.2"
-itertools = "0.7"
-toml = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
+itertools = "0.8"
+toml = "0.5"
+serde = { version = "1.0", features = ["derive"] }
 serde_json = "1.0"
 unicode-segmentation = "1.0.0"
 regex = "1.0"
 term = "0.5"
 diff = "0.1"
 log = "0.4"
-env_logger = "0.5"
+env_logger = "0.6"
 getopts = "0.2"
 derive-new = "0.5"
-cargo_metadata = "0.6"
-rustc-ap-rustc_target = "297.0.0"
-rustc-ap-syntax = "297.0.0"
-rustc-ap-syntax_pos = "297.0.0"
-failure = "0.1.1"
-bytecount = "0.4"
+cargo_metadata = "0.7"
+rustc-ap-rustc_target = "486.0.0"
+rustc-ap-syntax = "486.0.0"
+rustc-ap-syntax_pos = "486.0.0"
+failure = "0.1.3"
+bytecount = "0.5"
+unicode-width = "0.1.5"
+unicode_categories = "0.1.1"
+dirs = "1.0.4"
+ignore = "0.4.6"
+annotate-snippets = { version = "0.5.0", features = ["ansi_term"] }
+structopt = "0.2.15"
+
+config_proc_macro = { path = "config_proc_macro" }
 
 # A noop dependency that changes in the Rust repository, it's a bit of a hack.
 # See the `src/tools/rustc-workspace-hack/README.md` file in `rust-lang/rust`
@@ -60,5 +68,4 @@ bytecount = "0.4"
 rustc-workspace-hack = "1.0.0"
 
 [dev-dependencies]
-assert_cli = "0.6"
 lazy_static = "1.0.0"