From a36e7c7981c2058474734887e83a04de43e741ac Mon Sep 17 00:00:00 2001 From: Seiichi Uchida Date: Sun, 22 Dec 2019 00:31:59 +0900 Subject: [PATCH 1/5] Use correct span for match arms with the leading pipe and attributes (#3975) --- src/matches.rs | 1 + tests/target/issue-3974.rs | 10 ++++++++++ 2 files changed, 11 insertions(+) create mode 100644 tests/target/issue-3974.rs diff --git a/src/matches.rs b/src/matches.rs index c6b17122326..b5ca49b38bc 100644 --- a/src/matches.rs +++ b/src/matches.rs @@ -45,6 +45,7 @@ impl<'a> ArmWrapper<'a> { impl<'a> Spanned for ArmWrapper<'a> { fn span(&self) -> Span { if let Some(lo) = self.beginning_vert { + let lo = std::cmp::min(lo, self.arm.span().lo()); mk_sp(lo, self.arm.span().hi()) } else { self.arm.span() diff --git a/tests/target/issue-3974.rs b/tests/target/issue-3974.rs new file mode 100644 index 00000000000..a9f992ebd5c --- /dev/null +++ b/tests/target/issue-3974.rs @@ -0,0 +1,10 @@ +fn emulate_foreign_item() { + match link_name { + // A comment here will duplicate the attribute + #[rustfmt::skip] + | "pthread_mutexattr_init" + | "pthread_mutexattr_settype" + | "pthread_mutex_init" + => {} + } +} From da18032ba4756dfc670fff2232ca2269b94e24ff Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Sat, 27 Jun 2020 13:15:54 -0500 Subject: [PATCH 2/5] deps: bump rustc-ap* to v666 --- Cargo.lock | 260 ++++++++++++++++++++++++------------------------- Cargo.toml | 18 ++-- src/chains.rs | 4 +- src/items.rs | 19 ++-- src/visitor.rs | 8 +- 5 files changed, 150 insertions(+), 159 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9f028ed24de..b1765938bde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -503,7 +503,7 @@ dependencies = [ "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", "memmap 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.9.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -739,79 +739,79 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_passes" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_attr" -version = "664.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +version = "666.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_data_structures" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -826,10 +826,10 @@ dependencies = [ "measureme 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_graphviz 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_graphviz 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -840,15 +840,15 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "annotate-snippets 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "termize 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -857,57 +857,57 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_passes 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_passes 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_feature" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_fs_util" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_graphviz" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_index" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_lexer" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -926,25 +926,25 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_serialize" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -953,35 +953,36 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ + "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_fs_util 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_fs_util 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_span" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_arena 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_arena 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -989,16 +990,16 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "664.0.0" +version = "666.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1008,11 +1009,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-hash" -version = "1.0.1" +version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "byteorder 1.3.2 (registry+https://github.com/rust-lang/crates.io-index)", -] [[package]] name = "rustc-rayon" @@ -1076,15 +1074,15 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_expand 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_expand 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-config_proc_macro 0.2.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1519,27 +1517,27 @@ dependencies = [ "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -"checksum rustc-ap-rustc_arena 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0c6683b49209f8b132bec33dc6b6c8f9958c8c94eb3586d4cb495e092b61c1da" -"checksum rustc-ap-rustc_ast 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b21784d92fb2d584800f528866f00fe814f73abda794f406bfd1fbb2f1ca7f7" -"checksum rustc-ap-rustc_ast_passes 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "820c46fde7ef1df0432073090d775f097b7279ca75ea34ba954081ce4b884d4c" -"checksum rustc-ap-rustc_ast_pretty 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "013db7dd198fe95962d2cefa5bd0b350cf2028af77c169b17b4baa9c3bbf77d1" -"checksum rustc-ap-rustc_attr 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "35b5a85c90eb341eec543600ffdd9e262da5ea72a73a23ae4ca2f4ab8cd1a188" -"checksum rustc-ap-rustc_data_structures 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b92e4c6cb6c43ee9031a71709dc12853b358253c2b41d12a26379994fab625e0" -"checksum rustc-ap-rustc_errors 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0aa79423260c1b9e2f856e144e040f606b0f5d43644408375becf9d7bcdf86" -"checksum rustc-ap-rustc_expand 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c07d76ba2a1b7d4325a2ed21d6345ccebd89ddc6666a1535a6edd489fb4cbc11" -"checksum rustc-ap-rustc_feature 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1bbd625705c1db42a0c7503736292813d7b76ada5da20578fb55c63228c80ab5" -"checksum rustc-ap-rustc_fs_util 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "34cca6e2942fa0b059c582437ead666d5bcf20fa7c242599e2bbea9b609f29ae" -"checksum rustc-ap-rustc_graphviz 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "13d6a029b81f5e02da85763f82c135507f278a4a0c776432c728520563059529" -"checksum rustc-ap-rustc_index 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bae50852d303e230b2781c994513788136dc6c2fe4ebe032959f0b990a425767" -"checksum rustc-ap-rustc_lexer 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b7186e74aa2d31bf0e2454325fefcdf0a3da77d9344134592144b9e40d45b15d" -"checksum rustc-ap-rustc_macros 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4fc1add04e9d2301164118660ee0bc3266e9a7b1973fc2303fdbe002a12e5401" -"checksum rustc-ap-rustc_parse 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9cd7fc4968bd60084f2fa4f280fa450b0cf98660a7983d6b93a7ae41b6d1d322" -"checksum rustc-ap-rustc_serialize 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "00bf4c110271d9a2b7dfd2c6eb82e56fd80606a8bad6c102e158c54e44044046" -"checksum rustc-ap-rustc_session 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "431cf962de71d4c03fb877d54f331ec36eca77350b0539017abc40a4410d6501" -"checksum rustc-ap-rustc_span 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b912039640597624f4bcb75f1e1fcfa5710267d715a7f73a6336baef341b23d1" -"checksum rustc-ap-rustc_target 664.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "51347a9dadc5ad0b5916cc12d42624b31955285ad13745dbe72f0140038b84e9" +"checksum rustc-ap-rustc_arena 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cee1cd09e7ade1ad3b8ab554aa339dcc47cdbb8782275eef92dcf50090865d97" +"checksum rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fe6eb9ce5def918609f3548ee5f96c1cd56e8caadb765d2611e414a0bdb52df" +"checksum rustc-ap-rustc_ast_passes 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b630662cc3812e757f6f0cc72f1c3b928ac231a50a0bd34ed7f460b5781f090b" +"checksum rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55ddb88f73c74d5e695ae5541aab044e69d608984acbbebd9a59f4a55dfee4f7" +"checksum rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "40f0668c1974f76ebd7e1cf566b62959ee7ea374a46e4136632b27ed6d80ead2" +"checksum rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a5aa565bf5c940bfe1b9be9974e898cf90e01746186e17f6d103b40107804416" +"checksum rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f78e3c17e3d2e8fc004ebcf57fe5b688554635211c3346f8c70fe664545fa777" +"checksum rustc-ap-rustc_expand 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4ec52e2e7af6aef362fc9defaa3f618a84689d0f6865f9f322976cd8dab3112" +"checksum rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca4764c14f84aaede3eac0d2d546c3b5592705a1b8bf23ccf025de5bf98d0f" +"checksum rustc-ap-rustc_fs_util 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5c19245e259a656c5bf8a51a94598db41c36563c9f7968c54ece91a8918bb71" +"checksum rustc-ap-rustc_graphviz 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd9fa221daaaf6828ee914b1fa4ef20839e8e8fcba9414205a0a3f06cec8a470" +"checksum rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "666e394504050d1242869fe1d4880ea6d856183927d999b739c8cd32c8f046f0" +"checksum rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4e00c526f9f8430ea4cd2178d25b02bfc7debe6677350c57292f92f50e65d2fe" +"checksum rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4395519245c4a45193c2f15df08e6523188db7eafd29d21646dff99335ce50" +"checksum rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fc28692867433a3201ce7f1505c2abfca689dcb7394ed1fc64e121485bf7ef3" +"checksum rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "026a99c3a6a3d477b69696102722806082913ea90f40f7bfc4b97c1ae0d60bbd" +"checksum rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55db1b56890f90b58f894b53e9fbe821b735a094f7e10f9e60dc1b9801c4f457" +"checksum rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e78345ae6f0905dded335db76cd082edfcf1b383f7e2c218f6f7d4f5583073c5" +"checksum rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98d935fb3584b36ace9e981d58a59efeda22d9439dce6ea9303f4fd24e45f954" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" -"checksum rustc-hash 1.0.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7540fc8b0c49f096ee9c961cda096467dce8084bec6bdca2fc83895fd9b28cb8" +"checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" "checksum rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" "checksum rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ea2427831f0053ea3ea73559c8eabd893133a51b251d142bacee53c62a288cb3" "checksum rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc71d2faa173b74b232dedc235e3ee1696581bb132fc116fa3626d6151a1a8fb" diff --git a/Cargo.toml b/Cargo.toml index 0b454f0103e..f33eb7244d5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,36 +66,36 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "664.0.0" +version = "666.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "664.0.0" +version = "666.0.0" diff --git a/src/chains.rs b/src/chains.rs index ebf562c093d..8a0b416632b 100644 --- a/src/chains.rs +++ b/src/chains.rs @@ -145,7 +145,7 @@ impl ChainItemKind { fn from_ast(context: &RewriteContext<'_>, expr: &ast::Expr) -> (ChainItemKind, Span) { let (kind, span) = match expr.kind { - ast::ExprKind::MethodCall(ref segment, ref expressions) => { + ast::ExprKind::MethodCall(ref segment, ref expressions, _) => { let types = if let Some(ref generic_args) = segment.args { if let ast::GenericArgs::AngleBracketed(ref data) = **generic_args { data.args @@ -399,7 +399,7 @@ impl Chain { // is a try! macro, we'll convert it to shorthand when the option is set. fn pop_expr_chain(expr: &ast::Expr, context: &RewriteContext<'_>) -> Option { match expr.kind { - ast::ExprKind::MethodCall(_, ref expressions) => { + ast::ExprKind::MethodCall(_, ref expressions, _) => { Some(Self::convert_try(&expressions[0], context)) } ast::ExprKind::Field(ref subexpr, _) diff --git a/src/items.rs b/src/items.rs index 4a1af8e09a1..e772164862d 100644 --- a/src/items.rs +++ b/src/items.rs @@ -595,23 +595,16 @@ impl<'a> FmtVisitor<'a> { } fn is_type(ty: &Option>) -> bool { - match ty { - None => true, - Some(lty) => match lty.kind.opaque_top_hack() { - None => true, - Some(_) => false, - }, + if let Some(lty) = ty { + if let ast::TyKind::ImplTrait(..) = lty.kind { + return false; + } } + true } fn is_opaque(ty: &Option>) -> bool { - match ty { - None => false, - Some(lty) => match lty.kind.opaque_top_hack() { - None => false, - Some(_) => true, - }, - } + !is_type(ty) } fn both_type( diff --git a/src/visitor.rs b/src/visitor.rs index ef6a7ff7ba6..39421491697 100644 --- a/src/visitor.rs +++ b/src/visitor.rs @@ -671,15 +671,15 @@ impl<'b, 'a: 'b> FmtVisitor<'a> { }; let rewrite = match ty { None => rewrite_associated(), - Some(ty) => match ty.kind.opaque_top_hack() { - Some(generic_bounds) => rewrite_opaque_impl_type( + Some(ty) => match ty.kind { + ast::TyKind::ImplTrait(_, ref bounds) => rewrite_opaque_impl_type( &self.get_context(), ii.ident, generics, - generic_bounds, + bounds, self.block_indent, ), - None => rewrite_associated(), + _ => rewrite_associated(), }, }; self.push_rewrite(ii.span, rewrite); From b243075d756e0b77e88a03fd839475b3b4ef5318 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Thu, 9 Jul 2020 23:15:08 -0500 Subject: [PATCH 3/5] deps: bump rustc-ap-* to v668 --- Cargo.lock | 248 +++++++++++++++++++++++++-------------------------- Cargo.toml | 18 ++-- src/types.rs | 2 +- 3 files changed, 134 insertions(+), 134 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index b1765938bde..5c28ad4412d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -739,79 +739,79 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_passes" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_attr" -version = "666.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +version = "668.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_data_structures" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -826,9 +826,9 @@ dependencies = [ "measureme 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_graphviz 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_graphviz 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -840,15 +840,15 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "annotate-snippets 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "termize 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -857,57 +857,57 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_passes 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_passes 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_feature" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_fs_util" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_graphviz" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_index" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_lexer" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -926,25 +926,25 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_serialize" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -953,36 +953,36 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_fs_util 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_fs_util 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_span" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_arena 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_arena 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -990,16 +990,16 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "666.0.0" +version = "668.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1074,15 +1074,15 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_expand 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_expand 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-config_proc_macro 0.2.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1517,25 +1517,25 @@ dependencies = [ "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -"checksum rustc-ap-rustc_arena 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "cee1cd09e7ade1ad3b8ab554aa339dcc47cdbb8782275eef92dcf50090865d97" -"checksum rustc-ap-rustc_ast 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0fe6eb9ce5def918609f3548ee5f96c1cd56e8caadb765d2611e414a0bdb52df" -"checksum rustc-ap-rustc_ast_passes 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b630662cc3812e757f6f0cc72f1c3b928ac231a50a0bd34ed7f460b5781f090b" -"checksum rustc-ap-rustc_ast_pretty 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55ddb88f73c74d5e695ae5541aab044e69d608984acbbebd9a59f4a55dfee4f7" -"checksum rustc-ap-rustc_attr 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "40f0668c1974f76ebd7e1cf566b62959ee7ea374a46e4136632b27ed6d80ead2" -"checksum rustc-ap-rustc_data_structures 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a5aa565bf5c940bfe1b9be9974e898cf90e01746186e17f6d103b40107804416" -"checksum rustc-ap-rustc_errors 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f78e3c17e3d2e8fc004ebcf57fe5b688554635211c3346f8c70fe664545fa777" -"checksum rustc-ap-rustc_expand 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c4ec52e2e7af6aef362fc9defaa3f618a84689d0f6865f9f322976cd8dab3112" -"checksum rustc-ap-rustc_feature 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "90ca4764c14f84aaede3eac0d2d546c3b5592705a1b8bf23ccf025de5bf98d0f" -"checksum rustc-ap-rustc_fs_util 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e5c19245e259a656c5bf8a51a94598db41c36563c9f7968c54ece91a8918bb71" -"checksum rustc-ap-rustc_graphviz 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fd9fa221daaaf6828ee914b1fa4ef20839e8e8fcba9414205a0a3f06cec8a470" -"checksum rustc-ap-rustc_index 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "666e394504050d1242869fe1d4880ea6d856183927d999b739c8cd32c8f046f0" -"checksum rustc-ap-rustc_lexer 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4e00c526f9f8430ea4cd2178d25b02bfc7debe6677350c57292f92f50e65d2fe" -"checksum rustc-ap-rustc_macros 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1c4395519245c4a45193c2f15df08e6523188db7eafd29d21646dff99335ce50" -"checksum rustc-ap-rustc_parse 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9fc28692867433a3201ce7f1505c2abfca689dcb7394ed1fc64e121485bf7ef3" -"checksum rustc-ap-rustc_serialize 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "026a99c3a6a3d477b69696102722806082913ea90f40f7bfc4b97c1ae0d60bbd" -"checksum rustc-ap-rustc_session 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "55db1b56890f90b58f894b53e9fbe821b735a094f7e10f9e60dc1b9801c4f457" -"checksum rustc-ap-rustc_span 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e78345ae6f0905dded335db76cd082edfcf1b383f7e2c218f6f7d4f5583073c5" -"checksum rustc-ap-rustc_target 666.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "98d935fb3584b36ace9e981d58a59efeda22d9439dce6ea9303f4fd24e45f954" +"checksum rustc-ap-rustc_arena 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79b7d24b41029c11d1d79368f1c1c6e7acbb7ff40554da4f091964c3340eb794" +"checksum rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a42e3e05d840698e07e2052fe5bfb575f61e1160f11f0734c7209dd90fcbd17" +"checksum rustc-ap-rustc_ast_passes 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ab9f322794f18a44f71f3e20c4566e4f735a3badcc9a4ccf9b7cbd4ab1b9fd4" +"checksum rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5799f73bcac25f15037edbf1f4d6edbe24c9403a900067aacc48f362392c4b5c" +"checksum rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c275a20c4ddd0bbec902aeb7ea2aebf3b2323441459322675ce633356507cde6" +"checksum rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab8a1aef54b9321d653658f9c4e6b590943b5b89fa625fd865503a600ffc400" +"checksum rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f25b0fba0b1d4fa4c8f136e4d4acb8c35f18b6b8881f1a3cd4fbde34e8ea74f5" +"checksum rustc-ap-rustc_expand 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39e017224cea39e1b640935744cc1357570c764d7f2fff61621a5a45e23ad718" +"checksum rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "207325803daade8f890b761332a205424c104767f09d7bdf19adca4dc3ac14a2" +"checksum rustc-ap-rustc_fs_util 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f484c1a004b450ccf59d64efe990b316a3a57f4f39c5067879ddacc0828e4fb3" +"checksum rustc-ap-rustc_graphviz 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "947e7b4fa40dbe9a022df622ad496c21a5fac3b52d28ea136391c223e7bd2402" +"checksum rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3e3ed199bbaa7af3caf36f1531bade1bbd6731c0a33131f031cd0502620e776" +"checksum rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76cb944b7f9b2a38be799e47c901d422af0e1eb4a7bd63de06d1e6adc8288bd4" +"checksum rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8768562a84e6f4e1ae0eb150a10121aff84d132c54f62b8a7d286912d73f558f" +"checksum rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f0af9238c85a6e6c5cd3115b2d7b8767e5545ac537e5287e922d6275989ef27" +"checksum rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b783d2f4de0f3949107790a639d8857870887806b64e6a7e377c0c0679102a2" +"checksum rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb8ec18beea3488bc8f9812836e6a14f10987ea22d86c1d0f48ad03a1b70bc13" +"checksum rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9df93c4eec4329d96aea413056a98e2d6a907957249fd8c32ab259bea775c905" +"checksum rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fca772a06ad1d1489c061ea62b6f954e6dcc62b4e97717968eea711a28f8807c" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" "checksum rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" diff --git a/Cargo.toml b/Cargo.toml index f33eb7244d5..982c4ea5856 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -66,36 +66,36 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "666.0.0" +version = "668.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "666.0.0" +version = "668.0.0" diff --git a/src/types.rs b/src/types.rs index 96e331779c4..4e2b87ebfc8 100644 --- a/src/types.rs +++ b/src/types.rs @@ -560,7 +560,7 @@ impl Rewrite for ast::GenericParam { _ => (), } - if let rustc_ast::ast::GenericParamKind::Const { ref ty } = &self.kind { + if let rustc_ast::ast::GenericParamKind::Const { ref ty, .. } = &self.kind { result.push_str("const "); result.push_str(rewrite_ident(context, self.ident)); result.push_str(": "); From 391cd3e3243c31d126597b2a3fb97897ae2cf607 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Tue, 14 Jul 2020 21:36:24 -0500 Subject: [PATCH 4/5] deps: bump rustc-ap to v669 --- Cargo.lock | 250 +++++++++++++++++++++++----------------------- Cargo.toml | 20 ++-- src/formatting.rs | 2 +- 3 files changed, 136 insertions(+), 136 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 5c28ad4412d..94dc996ec84 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -739,79 +739,79 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_arena" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_passes" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_ast_pretty" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_attr" -version = "668.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -dependencies = [ - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", +version = "669.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +dependencies = [ + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_data_structures" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", @@ -826,9 +826,9 @@ dependencies = [ "measureme 0.7.1 (registry+https://github.com/rust-lang/crates.io-index)", "once_cell 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_graphviz 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_graphviz 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-rayon-core 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -840,15 +840,15 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_errors" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "annotate-snippets 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", "atty 0.2.13 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "termcolor 1.0.5 (registry+https://github.com/rust-lang/crates.io-index)", "termize 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -857,57 +857,57 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_expand" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_passes 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_passes 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_feature" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_fs_util" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_graphviz" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "rustc-ap-rustc_index" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "smallvec 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_lexer" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "unicode-xid 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -915,7 +915,7 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_macros" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "proc-macro2 1.0.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -926,25 +926,25 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_parse" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_lexer 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-normalization 0.1.12 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_serialize" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "indexmap 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)", @@ -953,36 +953,36 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_session" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "getopts 0.2.21 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "num_cpus 1.10.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_fs_util 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_fs_util 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_target 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "rustc-ap-rustc_span" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "md-5 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_arena 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_arena 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "scoped-tls 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "sha-1 0.8.2 (registry+https://github.com/rust-lang/crates.io-index)", "unicode-width 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -990,16 +990,16 @@ dependencies = [ [[package]] name = "rustc-ap-rustc_target" -version = "668.0.0" +version = "669.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" dependencies = [ "bitflags 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_index 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_macros 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] @@ -1058,7 +1058,7 @@ dependencies = [ [[package]] name = "rustfmt-nightly" -version = "1.4.18" +version = "1.4.19" dependencies = [ "annotate-snippets 0.6.1 (registry+https://github.com/rust-lang/crates.io-index)", "anyhow 1.0.25 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1074,15 +1074,15 @@ dependencies = [ "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", "log 0.4.8 (registry+https://github.com/rust-lang/crates.io-index)", "regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_expand 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_attr 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_expand 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_parse 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", + "rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustc-workspace-hack 1.0.0 (registry+https://github.com/rust-lang/crates.io-index)", "rustfmt-config_proc_macro 0.2.0", "serde 1.0.101 (registry+https://github.com/rust-lang/crates.io-index)", @@ -1517,25 +1517,25 @@ dependencies = [ "checksum regex 1.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "dc220bd33bdce8f093101afe22a037b8eb0e5af33592e6a9caafff0d4cb81cbd" "checksum regex-syntax 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "11a7e20d1cce64ef2fed88b66d347f88bd9babb82845b2b858f3edbf59a4f716" "checksum rust-argon2 0.5.1 (registry+https://github.com/rust-lang/crates.io-index)" = "4ca4eaef519b494d1f2848fc602d18816fed808a981aedf4f1f00ceb7c9d32cf" -"checksum rustc-ap-rustc_arena 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "79b7d24b41029c11d1d79368f1c1c6e7acbb7ff40554da4f091964c3340eb794" -"checksum rustc-ap-rustc_ast 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a42e3e05d840698e07e2052fe5bfb575f61e1160f11f0734c7209dd90fcbd17" -"checksum rustc-ap-rustc_ast_passes 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8ab9f322794f18a44f71f3e20c4566e4f735a3badcc9a4ccf9b7cbd4ab1b9fd4" -"checksum rustc-ap-rustc_ast_pretty 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5799f73bcac25f15037edbf1f4d6edbe24c9403a900067aacc48f362392c4b5c" -"checksum rustc-ap-rustc_attr 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c275a20c4ddd0bbec902aeb7ea2aebf3b2323441459322675ce633356507cde6" -"checksum rustc-ap-rustc_data_structures 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9ab8a1aef54b9321d653658f9c4e6b590943b5b89fa625fd865503a600ffc400" -"checksum rustc-ap-rustc_errors 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f25b0fba0b1d4fa4c8f136e4d4acb8c35f18b6b8881f1a3cd4fbde34e8ea74f5" -"checksum rustc-ap-rustc_expand 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "39e017224cea39e1b640935744cc1357570c764d7f2fff61621a5a45e23ad718" -"checksum rustc-ap-rustc_feature 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "207325803daade8f890b761332a205424c104767f09d7bdf19adca4dc3ac14a2" -"checksum rustc-ap-rustc_fs_util 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f484c1a004b450ccf59d64efe990b316a3a57f4f39c5067879ddacc0828e4fb3" -"checksum rustc-ap-rustc_graphviz 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "947e7b4fa40dbe9a022df622ad496c21a5fac3b52d28ea136391c223e7bd2402" -"checksum rustc-ap-rustc_index 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d3e3ed199bbaa7af3caf36f1531bade1bbd6731c0a33131f031cd0502620e776" -"checksum rustc-ap-rustc_lexer 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "76cb944b7f9b2a38be799e47c901d422af0e1eb4a7bd63de06d1e6adc8288bd4" -"checksum rustc-ap-rustc_macros 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8768562a84e6f4e1ae0eb150a10121aff84d132c54f62b8a7d286912d73f558f" -"checksum rustc-ap-rustc_parse 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "4f0af9238c85a6e6c5cd3115b2d7b8767e5545ac537e5287e922d6275989ef27" -"checksum rustc-ap-rustc_serialize 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8b783d2f4de0f3949107790a639d8857870887806b64e6a7e377c0c0679102a2" -"checksum rustc-ap-rustc_session 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fb8ec18beea3488bc8f9812836e6a14f10987ea22d86c1d0f48ad03a1b70bc13" -"checksum rustc-ap-rustc_span 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "9df93c4eec4329d96aea413056a98e2d6a907957249fd8c32ab259bea775c905" -"checksum rustc-ap-rustc_target 668.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fca772a06ad1d1489c061ea62b6f954e6dcc62b4e97717968eea711a28f8807c" +"checksum rustc-ap-rustc_arena 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c9cdd301e9dcb15ead384fc07196c850fd22829fae81d296b2ed6b4b10bf3278" +"checksum rustc-ap-rustc_ast 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3f7c0d0537ca69dfe4a49212035295dfb37a235b5df01aa877d50b247f4775b8" +"checksum rustc-ap-rustc_ast_passes 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d4cf4dca95f55f70eeb193fb08554026d79d0628de771fd726bb609e36887b82" +"checksum rustc-ap-rustc_ast_pretty 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "202bd2886d0cfa48baa3711042c14843f1b4852555b7ee7e5376bf66b276cb8d" +"checksum rustc-ap-rustc_attr 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b11ee1d92b3214e8a8c7829eff84cc1b03925da0ea5c6900cefe05b99edb4682" +"checksum rustc-ap-rustc_data_structures 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7a45d43b974d4cb9e32e5a15119c5eb7672c306ef09b064f2125b6a0399f6656" +"checksum rustc-ap-rustc_errors 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8cd895d440820aaa04e6dc5486105494920a1e9779b9b051e8dba4ca5c182f94" +"checksum rustc-ap-rustc_expand 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "71a0cc7820860d6691bf0aa7a95cdbc60f6587b495c18e0fa15a888fdabbf171" +"checksum rustc-ap-rustc_feature 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5473d5106401aa46f881eb91772f0a41fd5f28ae6134cf4b450eb1370ea6af22" +"checksum rustc-ap-rustc_fs_util 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8da1d57ee7a7ef55f31a97d99c7f919f02fc9a60ab96faa8cf45a7ae3ab1ccbf" +"checksum rustc-ap-rustc_graphviz 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e3af62b20460908378cd1d354917acd9553376c5363bbb4e465f949bd82bdef9" +"checksum rustc-ap-rustc_index 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3af7d4c456fe7647453d3fcd58335c9d512d1ff9a239a370b7ebdd353d69f66f" +"checksum rustc-ap-rustc_lexer 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "456af5f09c006cf6c22c1a433ee0232c4bb74bdc6c647a010166a47c94ed2a63" +"checksum rustc-ap-rustc_macros 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "64f6acd192f313047759a346b892998b626466b93fe04f415da5f38906bb3b4c" +"checksum rustc-ap-rustc_parse 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "c006e8117c1c55e42bb56386c86ce6f7e4b47349e0bec7888c1d24784272e61b" +"checksum rustc-ap-rustc_serialize 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "306ced69beaeebe4de9552ee751eb54ea25b5f34a73fe80f5f9cbbe15ccebc48" +"checksum rustc-ap-rustc_session 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "dbff48435f5a476365e3ab5f49e07f98715cecb2d8c5bbcafeaf3aec638407be" +"checksum rustc-ap-rustc_span 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ec4273af0abbe78fc4585316ab193445c848c555e9203ddc28af02330918bf30" +"checksum rustc-ap-rustc_target 669.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "6f9a2d6004ce6ad492a8eeacc2569b1c008169434b8828996d8dade4e5c6b6ee" "checksum rustc-demangle 0.1.16 (registry+https://github.com/rust-lang/crates.io-index)" = "4c691c0e608126e00913e33f0ccf3727d5fc84573623b8d65b2df340b5201783" "checksum rustc-hash 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2" "checksum rustc-rayon 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "f32767f90d938f1b7199a174ef249ae1924f6e5bbdb9d112fea141e016f25b3a" diff --git a/Cargo.toml b/Cargo.toml index 982c4ea5856..f55b91df032 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "rustfmt-nightly" -version = "1.4.18" +version = "1.4.19" authors = ["Nicholas Cameron ", "The Rustfmt developers"] description = "Tool to find and fix Rust formatting issues" repository = "https://github.com/rust-lang/rustfmt" @@ -66,36 +66,36 @@ rustc-workspace-hack = "1.0.0" [dependencies.rustc_ast] package = "rustc-ap-rustc_ast" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_ast_pretty] package = "rustc-ap-rustc_ast_pretty" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_attr] package = "rustc-ap-rustc_attr" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_data_structures] package = "rustc-ap-rustc_data_structures" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_errors] package = "rustc-ap-rustc_errors" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_expand] package = "rustc-ap-rustc_expand" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_parse] package = "rustc-ap-rustc_parse" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_session] package = "rustc-ap-rustc_session" -version = "668.0.0" +version = "669.0.0" [dependencies.rustc_span] package = "rustc-ap-rustc_span" -version = "668.0.0" +version = "669.0.0" diff --git a/src/formatting.rs b/src/formatting.rs index 28d111ba623..19affc3e3e1 100644 --- a/src/formatting.rs +++ b/src/formatting.rs @@ -29,7 +29,7 @@ impl<'b, T: Write + 'b> Session<'b, T> { return Err(ErrorKind::VersionMismatch); } - rustc_ast::with_globals(self.config.edition().to_libsyntax_pos_edition(), || { + rustc_ast::with_session_globals(self.config.edition().to_libsyntax_pos_edition(), || { if self.config.disable_all_formatting() { // When the input is from stdin, echo back the input. if let Input::Text(ref buf) = input { From bf359c6ebc1be862ab2f91c5b5e5770963a3b786 Mon Sep 17 00:00:00 2001 From: Caleb Cartwright Date: Wed, 15 Jul 2020 09:19:21 -0500 Subject: [PATCH 5/5] chore: backport 8157a3f0afe978d3e953420577f8344db7e905bf --- src/config/mod.rs | 3 +++ tests/config/issue-3779.toml | 1 - tests/source/issue-3779/lib.rs | 1 + tests/target/issue-3779/lib.rs | 1 + 4 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/config/mod.rs b/src/config/mod.rs index cf00eed0565..07c5612e26e 100644 --- a/src/config/mod.rs +++ b/src/config/mod.rs @@ -481,6 +481,9 @@ mod test { #[test] fn test_valid_license_template_path() { + if !crate::is_nightly_channel!() { + return; + } let toml = r#"license_template_path = "tests/license-template/lt.txt""#; let config = Config::from_toml(toml, Path::new("")).unwrap(); assert!(config.license_template.is_some()); diff --git a/tests/config/issue-3779.toml b/tests/config/issue-3779.toml index 83505f409af..6ca52aee322 100644 --- a/tests/config/issue-3779.toml +++ b/tests/config/issue-3779.toml @@ -1,4 +1,3 @@ -unstable_features = true ignore = [ "tests/**/issue-3779/ice.rs" ] diff --git a/tests/source/issue-3779/lib.rs b/tests/source/issue-3779/lib.rs index d7c2ae28975..16e9d48337b 100644 --- a/tests/source/issue-3779/lib.rs +++ b/tests/source/issue-3779/lib.rs @@ -1,3 +1,4 @@ +// rustfmt-unstable: true // rustfmt-config: issue-3779.toml #[path = "ice.rs"] diff --git a/tests/target/issue-3779/lib.rs b/tests/target/issue-3779/lib.rs index ebebce417d1..a5673a4db7e 100644 --- a/tests/target/issue-3779/lib.rs +++ b/tests/target/issue-3779/lib.rs @@ -1,3 +1,4 @@ +// rustfmt-unstable: true // rustfmt-config: issue-3779.toml #[path = "ice.rs"]