diff --git a/Cargo.lock b/Cargo.lock
index 6e65d5626a2..0bf7db5aa59 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,5 +1,7 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
+version = 3
+
 [[package]]
 name = "aho-corasick"
 version = "0.7.6"
@@ -885,6 +887,15 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "rustc-ap-rustc_arena"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7c0f30a24b4e286e7f691e444484b985f93bb4724e1c8f656ebb3f3a725472c6"
+dependencies = [
+ "smallvec",
+]
+
 [[package]]
 name = "rustc-ap-rustc_ast"
 version = "706.0.0"
@@ -892,32 +903,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5579379dd7e34bb522cbab946df43921f3d6fa587fc9101358db0a26b177b24"
 dependencies = [
  "bitflags",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_index",
- "rustc-ap-rustc_lexer",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_index 706.0.0",
+ "rustc-ap-rustc_lexer 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "smallvec",
+ "tracing",
+]
+
+[[package]]
+name = "rustc-ap-rustc_ast"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5415b0026ca0198717b04d9a579c941ca34089bc921d3f02cff1b6cf63fa95c9"
+dependencies = [
+ "bitflags",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_index 708.0.0",
+ "rustc-ap-rustc_lexer 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "smallvec",
  "tracing",
 ]
 
 [[package]]
 name = "rustc-ap-rustc_ast_passes"
-version = "706.0.0"
+version = "708.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad87c7440fb916a699cc21a2d0957485a1174cc07a8eb5a7c7ecec9416d4cae3"
+checksum = "1737c6420474739cb89f557ed8d1231f0b6068620fb3c0fd0a09f0dd79aebbb9"
 dependencies = [
  "itertools 0.9.0",
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_ast_pretty",
- "rustc-ap-rustc_attr",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
- "rustc-ap-rustc_feature",
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_ast_pretty 708.0.0",
+ "rustc-ap-rustc_attr 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
+ "rustc-ap-rustc_feature 708.0.0",
  "rustc-ap-rustc_parse",
- "rustc-ap-rustc_session",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_session 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "tracing",
 ]
 
@@ -927,8 +955,19 @@ version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "11fe1dbcfbb58ea768a9a05a9df27093b4a8fe03b715d3d96df84ae1093b3859"
 dependencies = [
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_ast 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "tracing",
+]
+
+[[package]]
+name = "rustc-ap-rustc_ast_pretty"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e86b6a279fd02e57590834a489eb4a4fe31d03c176f755072505977a4d5f202"
+dependencies = [
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "tracing",
 ]
 
@@ -938,16 +977,34 @@ version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9429e42aaf0b12e133b93411bb8205388fba4fe3dd819199ae52672ad21b81a0"
 dependencies = [
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_ast_pretty",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
- "rustc-ap-rustc_feature",
- "rustc-ap-rustc_lexer",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_session",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_ast 706.0.0",
+ "rustc-ap-rustc_ast_pretty 706.0.0",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_errors 706.0.0",
+ "rustc-ap-rustc_feature 706.0.0",
+ "rustc-ap-rustc_lexer 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_session 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+]
+
+[[package]]
+name = "rustc-ap-rustc_attr"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f31de4bc77d5fc437a50451ac12d3e2459f6794d8e7f50bd6c0f48ec6744b96f"
+dependencies = [
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_ast_pretty 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
+ "rustc-ap-rustc_feature 708.0.0",
+ "rustc-ap-rustc_lexer 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_session 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
 ]
 
 [[package]]
@@ -966,10 +1023,41 @@ dependencies = [
  "libc",
  "measureme",
  "parking_lot",
- "rustc-ap-rustc_graphviz",
- "rustc-ap-rustc_index",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
+ "rustc-ap-rustc_graphviz 706.0.0",
+ "rustc-ap-rustc_index 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-hash",
+ "rustc-rayon",
+ "rustc-rayon-core",
+ "smallvec",
+ "stable_deref_trait",
+ "stacker",
+ "tempfile",
+ "tracing",
+ "winapi",
+]
+
+[[package]]
+name = "rustc-ap-rustc_data_structures"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "49cf54eb2d79d729a9c191ac7d94855585756b2e17a470ddd2b19cba91643070"
+dependencies = [
+ "arrayvec 0.5.1",
+ "bitflags",
+ "cfg-if 0.1.10",
+ "crossbeam-utils 0.7.0",
+ "ena",
+ "indexmap",
+ "jobserver",
+ "libc",
+ "measureme",
+ "parking_lot",
+ "rustc-ap-rustc_graphviz 708.0.0",
+ "rustc-ap-rustc_index 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
  "rustc-hash",
  "rustc-rayon",
  "rustc-rayon-core",
@@ -989,11 +1077,31 @@ checksum = "988c7a3ecba53728d383c6bd8268c7a4c957244944c05a3f0e448795747d9db9"
 dependencies = [
  "annotate-snippets 0.8.0",
  "atty",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_lint_defs",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_lint_defs 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "termcolor",
+ "termize",
+ "tracing",
+ "unicode-width",
+ "winapi",
+]
+
+[[package]]
+name = "rustc-ap-rustc_errors"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5973e5ebae02c6a22f19176946e7a5b520270f8e9caff7e97e2e1de95c06eb79"
+dependencies = [
+ "annotate-snippets 0.8.0",
+ "atty",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_lint_defs 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "termcolor",
  "termize",
  "tracing",
@@ -1003,24 +1111,24 @@ dependencies = [
 
 [[package]]
 name = "rustc-ap-rustc_expand"
-version = "706.0.0"
+version = "708.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc3de9e78a60f4d280d7d9193dc9f679489fac17fc338ac02657a6de6295f2ab"
+checksum = "d112553937beffff6c801441bed60ba07cce72ce40687de722fc54e2880cd63d"
 dependencies = [
- "rustc-ap-rustc_ast",
+ "rustc-ap-rustc_ast 708.0.0",
  "rustc-ap-rustc_ast_passes",
- "rustc-ap-rustc_ast_pretty",
- "rustc-ap-rustc_attr",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
- "rustc-ap-rustc_feature",
- "rustc-ap-rustc_lexer",
- "rustc-ap-rustc_lint_defs",
- "rustc-ap-rustc_macros",
+ "rustc-ap-rustc_ast_pretty 708.0.0",
+ "rustc-ap-rustc_attr 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
+ "rustc-ap-rustc_feature 708.0.0",
+ "rustc-ap-rustc_lexer 708.0.0",
+ "rustc-ap-rustc_lint_defs 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
  "rustc-ap-rustc_parse",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_session",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_session 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "smallvec",
  "tracing",
 ]
@@ -1031,8 +1139,18 @@ version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10224171d523b2fb814e549b256ab53734abdb4d285f113cd0af887bc73150f3"
 dependencies = [
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+]
+
+[[package]]
+name = "rustc-ap-rustc_feature"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0caa284fd8f72aaf8e04aad950ced072ba46aa88fcfa454f195e5fc02811b6b4"
+dependencies = [
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
 ]
 
 [[package]]
@@ -1041,12 +1159,24 @@ version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e05d63d5678f4e01bbf61189d86112783357d405a1fb63d52a70be03a8713395"
 
+[[package]]
+name = "rustc-ap-rustc_fs_util"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8aecdc1324ccbb7f67a015ee6fd6d267cc189045ff3779fb63880e4f51f58711"
+
 [[package]]
 name = "rustc-ap-rustc_graphviz"
 version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2f13a83a674d50c3a2400138e4aaecd4d712921f3b8925c22691c85ae2bde235"
 
+[[package]]
+name = "rustc-ap-rustc_graphviz"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a21bff3ba32d853fbc930bebbc3c2c3bf66788873c2183a57160e2c9c7b9063d"
+
 [[package]]
 name = "rustc-ap-rustc_index"
 version = "706.0.0"
@@ -1054,8 +1184,19 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "469c83791194b83a480b18441da1f04dbd2671d062a9f2a1c6bc5369b2185360"
 dependencies = [
  "arrayvec 0.5.1",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+]
+
+[[package]]
+name = "rustc-ap-rustc_index"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26daf768bf9ad1a492a6a93404d17c34aee58b692fd7515b6b654897e71704c5"
+dependencies = [
+ "arrayvec 0.5.1",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
 ]
 
 [[package]]
@@ -1067,18 +1208,42 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "rustc-ap-rustc_lexer"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2706fc7106c75eaea49efe9f35f719a6fdfdb95212122ec2b543659406bae7ea"
+dependencies = [
+ "unicode-xid",
+]
+
 [[package]]
 name = "rustc-ap-rustc_lint_defs"
 version = "706.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "10363995e377811d2bd42a4700c7ffe1b8fec88c7f207036fc4b797b01941ea4"
 dependencies = [
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_span",
- "rustc-ap-rustc_target",
+ "rustc-ap-rustc_ast 706.0.0",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "rustc-ap-rustc_target 706.0.0",
+ "tracing",
+]
+
+[[package]]
+name = "rustc-ap-rustc_lint_defs"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "493863f3a69509b0cd53f337215ed13a459dd3687c3782fc79f7f02ad021b8d2"
+dependencies = [
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
+ "rustc-ap-rustc_target 708.0.0",
  "tracing",
 ]
 
@@ -1095,20 +1260,32 @@ dependencies = [
 ]
 
 [[package]]
-name = "rustc-ap-rustc_parse"
-version = "706.0.0"
+name = "rustc-ap-rustc_macros"
+version = "708.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1258eef1563a45a6b319aa91311507402bbe26cf7d8eef4e5d06cc4af9edd9c"
+checksum = "288eaa669e90ebbe0d8343a4f7d09307acd68ed921c5627660f522970677a9da"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+ "synstructure",
+]
+
+[[package]]
+name = "rustc-ap-rustc_parse"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d76291d0a578f974e4ef4d31db587b35db6613b057cb18e5717ed8d0781a678"
 dependencies = [
  "bitflags",
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_ast_pretty",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
- "rustc-ap-rustc_feature",
- "rustc-ap-rustc_lexer",
- "rustc-ap-rustc_session",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_ast_pretty 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
+ "rustc-ap-rustc_feature 708.0.0",
+ "rustc-ap-rustc_lexer 708.0.0",
+ "rustc-ap-rustc_session 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "smallvec",
  "tracing",
  "unicode-normalization",
@@ -1124,6 +1301,16 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "rustc-ap-rustc_serialize"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8727f854a5ce1459c5b4fbd19b66e9a7cad81d7515374be8b5eb47f4ae799a9"
+dependencies = [
+ "indexmap",
+ "smallvec",
+]
+
 [[package]]
 name = "rustc-ap-rustc_session"
 version = "706.0.0"
@@ -1133,16 +1320,38 @@ dependencies = [
  "bitflags",
  "getopts",
  "num_cpus",
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
- "rustc-ap-rustc_feature",
- "rustc-ap-rustc_fs_util",
- "rustc-ap-rustc_lint_defs",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_span",
- "rustc-ap-rustc_target",
+ "rustc-ap-rustc_ast 706.0.0",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_errors 706.0.0",
+ "rustc-ap-rustc_feature 706.0.0",
+ "rustc-ap-rustc_fs_util 706.0.0",
+ "rustc-ap-rustc_lint_defs 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "rustc-ap-rustc_target 706.0.0",
+ "tracing",
+]
+
+[[package]]
+name = "rustc-ap-rustc_session"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f1ef866957e601a40bdf4da70df294747384f66fda66a98bb92b4376668d44c1"
+dependencies = [
+ "bitflags",
+ "getopts",
+ "num_cpus",
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
+ "rustc-ap-rustc_feature 708.0.0",
+ "rustc-ap-rustc_fs_util 708.0.0",
+ "rustc-ap-rustc_lint_defs 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
+ "rustc-ap-rustc_target 708.0.0",
  "tracing",
 ]
 
@@ -1154,11 +1363,31 @@ checksum = "12314b0cb62961245fb6f103095f0584877e54439a62cf66278a4c83d6133e1d"
 dependencies = [
  "cfg-if 0.1.10",
  "md-5",
- "rustc-ap-rustc_arena",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_index",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
+ "rustc-ap-rustc_arena 706.0.0",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_index 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "scoped-tls",
+ "sha-1",
+ "sha2",
+ "tracing",
+ "unicode-width",
+]
+
+[[package]]
+name = "rustc-ap-rustc_span"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c9af35a8e82b7445d5ce593bd93437aa3a93c97a34845c17395c85744531e82"
+dependencies = [
+ "cfg-if 0.1.10",
+ "md-5",
+ "rustc-ap-rustc_arena 708.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_index 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
  "scoped-tls",
  "sha-1",
  "sha2",
@@ -1173,11 +1402,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e0b33190c2f2cb83aea78d78c90ee5b29404ecc46abb2d9ce7c270a7c0f132e1"
 dependencies = [
  "bitflags",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_index",
- "rustc-ap-rustc_macros",
- "rustc-ap-rustc_serialize",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_data_structures 706.0.0",
+ "rustc-ap-rustc_index 706.0.0",
+ "rustc-ap-rustc_macros 706.0.0",
+ "rustc-ap-rustc_serialize 706.0.0",
+ "rustc-ap-rustc_span 706.0.0",
+ "tracing",
+]
+
+[[package]]
+name = "rustc-ap-rustc_target"
+version = "708.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4d7984c64589b94ba3b192fc97b288ed8c5d549176f264ffe11774c27cecf3fd"
+dependencies = [
+ "bitflags",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_index 708.0.0",
+ "rustc-ap-rustc_macros 708.0.0",
+ "rustc-ap-rustc_serialize 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "tracing",
 ]
 
@@ -1259,15 +1503,15 @@ dependencies = [
  "lazy_static",
  "log",
  "regex",
- "rustc-ap-rustc_ast",
- "rustc-ap-rustc_ast_pretty",
- "rustc-ap-rustc_attr",
- "rustc-ap-rustc_data_structures",
- "rustc-ap-rustc_errors",
+ "rustc-ap-rustc_ast 708.0.0",
+ "rustc-ap-rustc_ast_pretty 708.0.0",
+ "rustc-ap-rustc_attr 706.0.0",
+ "rustc-ap-rustc_data_structures 708.0.0",
+ "rustc-ap-rustc_errors 708.0.0",
  "rustc-ap-rustc_expand",
  "rustc-ap-rustc_parse",
- "rustc-ap-rustc_session",
- "rustc-ap-rustc_span",
+ "rustc-ap-rustc_session 708.0.0",
+ "rustc-ap-rustc_span 708.0.0",
  "rustc-workspace-hack",
  "rustfmt-config_proc_macro",
  "serde",
@@ -1383,9 +1627,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.4.2"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbee7696b84bbf3d89a1c2eccff0850e3047ed46bfcd2e92c29a2d074d57e252"
+checksum = "fe0f37c9e8f3c5a4a66ad655a93c74daac4ad00c441533bf5c6e7990bb42604e"
 
 [[package]]
 name = "stable_deref_trait"
diff --git a/Cargo.toml b/Cargo.toml
index 89aa311c52c..554fc70e8ec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -66,11 +66,11 @@ rustc-workspace-hack = "1.0.0"
 
 [dependencies.rustc_ast]
 package = "rustc-ap-rustc_ast"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_ast_pretty]
 package = "rustc-ap-rustc_ast_pretty"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_attr]
 package = "rustc-ap-rustc_attr"
@@ -78,24 +78,24 @@ version = "706.0.0"
 
 [dependencies.rustc_data_structures]
 package = "rustc-ap-rustc_data_structures"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_errors]
 package = "rustc-ap-rustc_errors"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_expand]
 package = "rustc-ap-rustc_expand"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_parse]
 package = "rustc-ap-rustc_parse"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_session]
 package = "rustc-ap-rustc_session"
-version = "706.0.0"
+version = "708.0.0"
 
 [dependencies.rustc_span]
 package = "rustc-ap-rustc_span"
-version = "706.0.0"
+version = "708.0.0"