X-Git-Url: https://git.lizzy.rs/?a=blobdiff_plain;f=Cargo.lock;h=f639095fae75984792f72b3540d1e127eabe740c;hb=c839a7b4c26e58319b0c40448dd423facff34cd0;hp=beda3993353f4820024f20e7c3c2e971668bf787;hpb=b680a5e7c2aa9821287a699f3e60183086c42643;p=rust.git

diff --git a/Cargo.lock b/Cargo.lock
index beda3993353..f639095fae7 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3119,6 +3119,7 @@ dependencies = [
  "rustc-rayon",
  "rustc-rayon-core",
  "rustc_apfloat",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
@@ -3132,7 +3133,6 @@ dependencies = [
  "scoped-tls",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3469,12 +3469,28 @@ dependencies = [
  "smallvec 1.0.0",
 ]
 
+[[package]]
+name = "rustc_ast"
+version = "0.0.0"
+dependencies = [
+ "log",
+ "rustc_data_structures",
+ "rustc_index",
+ "rustc_lexer",
+ "rustc_macros",
+ "rustc_span",
+ "scoped-tls",
+ "serialize",
+ "smallvec 1.0.0",
+]
+
 [[package]]
 name = "rustc_ast_lowering"
 version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_data_structures",
  "rustc_errors",
@@ -3484,7 +3500,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3492,6 +3507,7 @@ name = "rustc_ast_passes"
 version = "0.0.0"
 dependencies = [
  "log",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3500,7 +3516,6 @@ dependencies = [
  "rustc_parse",
  "rustc_session",
  "rustc_span",
- "syntax",
 ]
 
 [[package]]
@@ -3508,15 +3523,16 @@ name = "rustc_ast_pretty"
 version = "0.0.0"
 dependencies = [
  "log",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_span",
- "syntax",
 ]
 
 [[package]]
 name = "rustc_attr"
 version = "0.0.0"
 dependencies = [
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_data_structures",
  "rustc_errors",
@@ -3526,7 +3542,6 @@ dependencies = [
  "rustc_span",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3535,6 +3550,7 @@ version = "0.0.0"
 dependencies = [
  "fmt_macros",
  "log",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3546,7 +3562,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3560,6 +3575,7 @@ dependencies = [
  "measureme",
  "rustc",
  "rustc-demangle",
+ "rustc_ast",
  "rustc_attr",
  "rustc_codegen_ssa",
  "rustc_codegen_utils",
@@ -3576,7 +3592,6 @@ dependencies = [
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3592,6 +3607,7 @@ dependencies = [
  "num_cpus",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
  "rustc_attr",
  "rustc_codegen_utils",
  "rustc_data_structures",
@@ -3604,7 +3620,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "serialize",
- "syntax",
  "tempfile",
 ]
 
@@ -3616,12 +3631,12 @@ dependencies = [
  "punycode",
  "rustc",
  "rustc-demangle",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_metadata",
  "rustc_span",
  "rustc_target",
- "syntax",
 ]
 
 [[package]]
@@ -3657,6 +3672,7 @@ dependencies = [
  "lazy_static 1.4.0",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_codegen_ssa",
  "rustc_codegen_utils",
@@ -3675,7 +3691,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "serialize",
- "syntax",
  "winapi 0.3.8",
 ]
 
@@ -3704,6 +3719,7 @@ name = "rustc_expand"
 version = "0.0.0"
 dependencies = [
  "log",
+ "rustc_ast",
  "rustc_ast_passes",
  "rustc_ast_pretty",
  "rustc_attr",
@@ -3716,7 +3732,6 @@ dependencies = [
  "rustc_span",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3737,6 +3752,7 @@ name = "rustc_hir"
 version = "0.0.0"
 dependencies = [
  "lazy_static 1.4.0",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_data_structures",
  "rustc_errors",
@@ -3746,7 +3762,6 @@ dependencies = [
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3757,13 +3772,13 @@ dependencies = [
  "log",
  "rand 0.7.3",
  "rustc",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_fs_util",
  "rustc_hir",
  "rustc_session",
  "rustc_span",
  "serialize",
- "syntax",
 ]
 
 [[package]]
@@ -3782,6 +3797,7 @@ dependencies = [
  "graphviz",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_error_codes",
@@ -3793,7 +3809,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3804,6 +3819,7 @@ dependencies = [
  "once_cell",
  "rustc",
  "rustc-rayon",
+ "rustc_ast",
  "rustc_ast_lowering",
  "rustc_ast_passes",
  "rustc_attr",
@@ -3834,7 +3850,6 @@ dependencies = [
  "rustc_typeck",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
  "tempfile",
  "winapi 0.3.8",
 ]
@@ -3852,6 +3867,7 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3863,7 +3879,6 @@ dependencies = [
  "rustc_session",
  "rustc_span",
  "rustc_target",
- "syntax",
  "unicode-security",
 ]
 
@@ -3894,6 +3909,7 @@ dependencies = [
  "log",
  "memmap",
  "rustc",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3907,7 +3923,6 @@ dependencies = [
  "serialize",
  "smallvec 1.0.0",
  "stable_deref_trait",
- "syntax",
  "winapi 0.3.8",
 ]
 
@@ -3923,6 +3938,7 @@ dependencies = [
  "polonius-engine",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3936,7 +3952,6 @@ dependencies = [
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3947,6 +3962,7 @@ dependencies = [
  "log",
  "rustc",
  "rustc_apfloat",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
@@ -3959,7 +3975,6 @@ dependencies = [
  "rustc_target",
  "serialize",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -3968,6 +3983,7 @@ version = "0.0.0"
 dependencies = [
  "bitflags",
  "log",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_attr",
  "rustc_data_structures",
@@ -3977,7 +3993,6 @@ dependencies = [
  "rustc_session",
  "rustc_span",
  "smallvec 1.0.0",
- "syntax",
  "unicode-normalization",
 ]
 
@@ -3987,6 +4002,7 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
@@ -3997,7 +4013,6 @@ dependencies = [
  "rustc_session",
  "rustc_span",
  "rustc_target",
- "syntax",
 ]
 
 [[package]]
@@ -4005,12 +4020,12 @@ name = "rustc_plugin_impl"
 version = "0.0.0"
 dependencies = [
  "rustc",
+ "rustc_ast",
  "rustc_errors",
  "rustc_hir",
  "rustc_lint",
  "rustc_metadata",
  "rustc_span",
- "syntax",
 ]
 
 [[package]]
@@ -4019,13 +4034,13 @@ version = "0.0.0"
 dependencies = [
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_hir",
  "rustc_span",
  "rustc_typeck",
- "syntax",
 ]
 
 [[package]]
@@ -4036,6 +4051,7 @@ dependencies = [
  "bitflags",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_ast_lowering",
  "rustc_ast_pretty",
  "rustc_attr",
@@ -4049,7 +4065,6 @@ dependencies = [
  "rustc_session",
  "rustc_span",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -4060,6 +4075,7 @@ dependencies = [
  "rls-data",
  "rls-span",
  "rustc",
+ "rustc_ast",
  "rustc_ast_pretty",
  "rustc_codegen_utils",
  "rustc_data_structures",
@@ -4067,7 +4083,6 @@ dependencies = [
  "rustc_parse",
  "rustc_span",
  "serde_json",
- "syntax",
 ]
 
 [[package]]
@@ -4076,6 +4091,7 @@ version = "0.0.0"
 dependencies = [
  "log",
  "num_cpus",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_errors",
  "rustc_feature",
@@ -4084,7 +4100,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "serialize",
- "syntax",
 ]
 
 [[package]]
@@ -4132,6 +4147,7 @@ dependencies = [
  "chalk-engine",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_data_structures",
  "rustc_hir",
  "rustc_infer",
@@ -4139,7 +4155,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -4162,6 +4177,7 @@ dependencies = [
  "arena",
  "log",
  "rustc",
+ "rustc_ast",
  "rustc_attr",
  "rustc_data_structures",
  "rustc_errors",
@@ -4171,7 +4187,6 @@ dependencies = [
  "rustc_span",
  "rustc_target",
  "smallvec 1.0.0",
- "syntax",
 ]
 
 [[package]]
@@ -4683,21 +4698,6 @@ dependencies = [
  "unicode-xid 0.2.0",
 ]
 
-[[package]]
-name = "syntax"
-version = "0.0.0"
-dependencies = [
- "log",
- "rustc_data_structures",
- "rustc_index",
- "rustc_lexer",
- "rustc_macros",
- "rustc_span",
- "scoped-tls",
- "serialize",
- "smallvec 1.0.0",
-]
-
 [[package]]
 name = "tar"
 version = "0.4.26"