Update deps

Cargo.toml

@@ -34,7 +34,6 @@ rustfmt-format-diff = []
 generic-simd = ["bytecount/generic-simd"]
 
 [dependencies]
-atty = "0.2"
 itertools = "0.8"
 toml = "0.5"
 serde = { version = "1.0", features = ["derive"] }
@@ -48,19 +47,19 @@ env_logger = "0.6"
 getopts = "0.2"
 derive-new = "0.5"
 cargo_metadata = "0.8"
-rustc-ap-rustc_target = "581.0.0"
-rustc-ap-syntax = "581.0.0"
-rustc-ap-syntax_pos = "581.0.0"
+rustc-ap-rustc_target = "583.0.0"
+rustc-ap-syntax = "583.0.0"
+rustc-ap-syntax_pos = "583.0.0"
 failure = "0.1.3"
-bytecount = "0.5"
+bytecount = "0.6"
 unicode-width = "0.1.5"
 unicode_categories = "0.1.1"
 dirs = "2.0.1"
 ignore = "0.4.6"
 annotate-snippets = { version = "0.6", features = ["ansi_term"] }
-structopt = "0.2.18"
+structopt = "0.3"
 
-rustfmt-config_proc_macro = { version = "0.1.2", path = "config_proc_macro" }
+rustfmt-config_proc_macro = { version = "0.2", 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`

config_proc_macro/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "rustfmt-config_proc_macro"
-version = "0.1.2"
+version = "0.2.0"
 authors = ["topecongiro <[email protected]>"]
 edition = "2018"
 description = "A collection of procedural macros for rustfmt"
@@ -12,9 +12,9 @@ repository = "https://github.com/rust-lang/rustfmt"
 proc-macro = true
 
 [dependencies]
-proc-macro2 = "0.4"
-quote = "0.6"
-syn = { version = "0.15", features = ["full", "visit"] }
+proc-macro2 = "1.0"
+quote = "1.0"
+syn = { version = "1.0", features = ["full", "visit"] }
 
 [dev-dependencies]
 serde = { version = "1.0", features = ["derive"] }

config_proc_macro/src/attrs.rs

@@ -39,19 +39,19 @@ pub fn is_config_value(attr: &syn::Attribute) -> bool {
 }
 
 fn is_attr_name_value(attr: &syn::Attribute, name: &str) -> bool {
-    attr.interpret_meta().map_or(false, |meta| match meta {
-        syn::Meta::NameValue(syn::MetaNameValue { ref ident, .. }) if ident == name => true,
+    attr.parse_meta().ok().map_or(false, |meta| match meta {
+        syn::Meta::NameValue(syn::MetaNameValue { ref path, .. }) if path.is_ident(name) => true,
         _ => false,
     })
 }
 
 fn get_name_value_str_lit(attr: &syn::Attribute, name: &str) -> Option<String> {
-    attr.interpret_meta().and_then(|meta| match meta {
+    attr.parse_meta().ok().and_then(|meta| match meta {
         syn::Meta::NameValue(syn::MetaNameValue {
-            ref ident,
+            ref path,
             lit: syn::Lit::Str(ref lit_str),
             ..
-        }) if ident == name => Some(lit_str.value()),
+        }) if path.is_ident(name) => Some(lit_str.value()),
         _ => None,
     })
 }

src/cargo-fmt/main.rs

@@ -20,7 +20,6 @@ use structopt::StructOpt;
 #[derive(StructOpt, Debug)]
 #[structopt(
     bin_name = "cargo fmt",
-    author = "",
     about = "This utility formats all bin and lib files of \
              the current crate using rustfmt."
 )]
@@ -51,7 +50,7 @@ pub struct Opts {
 
     /// Options passed to rustfmt
     // 'raw = true' to make `--` explicit.
-    #[structopt(name = "rustfmt_options", raw(raw = "true"))]
+    #[structopt(name = "rustfmt_options", raw(true))]
     rustfmt_options: Vec<String>,
 
     /// Format all packages (only usable in workspaces)

src/config/options.rs

@@ -2,7 +2,6 @@ use std::collections::{hash_set, HashSet};
 use std::fmt;
 use std::path::{Path, PathBuf};
 
-use atty;
 use itertools::Itertools;
 use rustfmt_config_proc_macro::config_type;
 use serde::de::{SeqAccess, Visitor};
@@ -147,17 +146,16 @@ pub enum Color {
 pub enum Version {
     /// 1.x.y. When specified, rustfmt will format in the same style as 1.0.0.
     One,
-    /// 2.x.y. When specified, rustfmt will formatin the the latest style.
+    /// 2.x.y. When specified, rustfmt will format in the the latest style.
     Two,
 }
 
 impl Color {
     /// Whether we should use a coloured terminal.
     pub fn use_colored_tty(self) -> bool {
         match self {
-            Color::Always => true,
+            Color::Always | Color::Auto => true,
             Color::Never => false,
-            Color::Auto => atty::is(atty::Stream::Stdout),
         }
     }
 }