X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.toml;h=4e332ec43b91906b92760d0636a1f1950f1eb72a;hb=7a711b357e6aa9095a973e3609a566dbfaf7dd2c;hp=5e8e90b3750a0fb8ee58eca8bbbeb4bd88133520;hpb=e39bd35ae14ff228a002e36ead0f94194d8f7247;p=rust.git

diff --git a/Cargo.toml b/Cargo.toml
index 5e8e90b3750..4e332ec43b9 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,14 +1,15 @@
 [package]
 
 name = "rustfmt-nightly"
-version = "0.99.4"
+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-nursery/rustfmt"
+repository = "https://github.com/rust-lang/rustfmt"
 readme = "README.md"
 license = "Apache-2.0/MIT"
 build = "build.rs"
 categories = ["development-tools"]
+edition = "2018"
 
 [[bin]]
 name = "rustfmt"
@@ -30,28 +31,40 @@ path = "src/git-rustfmt/main.rs"
 default = ["cargo-fmt", "rustfmt-format-diff"]
 cargo-fmt = []
 rustfmt-format-diff = []
+generic-simd = ["bytecount/generic-simd"]
 
 [dependencies]
-isatty = "0.1"
-itertools = "0.7"
-toml = "0.4"
-serde = "1.0"
-serde_derive = "1.0"
+atty = "0.2"
+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 = "253.0.0"
-rustc-ap-syntax = "253.0.0"
-rustc-ap-syntax_pos = "253.0.0"
-failure = "0.1.1"
+cargo_metadata = "0.7"
+rustc-ap-rustc_target = "407.0.0"
+rustc-ap-syntax = "407.0.0"
+rustc-ap-syntax_pos = "407.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"] }
+
+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`
+# for more information.
+rustc-workspace-hack = "1.0.0"
 
 [dev-dependencies]
-assert_cli = "0.6"
 lazy_static = "1.0.0"