deps: bump rustc-ap* to v666

This commit is contained in:
Caleb Cartwright 2020-06-27 13:15:54 -05:00
parent a36e7c7981
commit da18032ba4
5 changed files with 148 additions and 157 deletions

256
Cargo.lock generated
View File

@ -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"
version = "666.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)",
"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"

View File

@ -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"

View File

@ -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<ast::Expr> {
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, _)

View File

@ -595,23 +595,16 @@ impl<'a> FmtVisitor<'a> {
}
fn is_type(ty: &Option<rustc_ast::ptr::P<ast::Ty>>) -> 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<rustc_ast::ptr::P<ast::Ty>>) -> bool {
match ty {
None => false,
Some(lty) => match lty.kind.opaque_top_hack() {
None => false,
Some(_) => true,
},
}
!is_type(ty)
}
fn both_type(

View File

@ -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);