Skip to content

Commit 1c3ce97

Browse files
Update lock file
1 parent 7eb1e98 commit 1c3ce97

File tree

1 file changed

+61
-0
lines changed

1 file changed

+61
-0
lines changed

Cargo.lock

+61
Original file line numberDiff line numberDiff line change
@@ -3855,7 +3855,10 @@ dependencies = [
38553855
"rustc_ast_pretty",
38563856
"rustc_attr",
38573857
"rustc_data_structures",
3858+
<<<<<<< HEAD
38583859
"rustc_errors",
3860+
=======
3861+
>>>>>>> Update lock file
38593862
"rustc_feature",
38603863
"rustc_hir",
38613864
"rustc_index",
@@ -4005,9 +4008,12 @@ name = "rustc_plugin_impl"
40054008
version = "0.0.0"
40064009
dependencies = [
40074010
"rustc",
4011+
<<<<<<< HEAD
40084012
"rustc_errors",
40094013
"rustc_hir",
40104014
"rustc_lint",
4015+
=======
4016+
>>>>>>> Update lock file
40114017
"rustc_metadata",
40124018
"rustc_span",
40134019
"syntax",
@@ -4021,9 +4027,12 @@ dependencies = [
40214027
"rustc",
40224028
"rustc_attr",
40234029
"rustc_data_structures",
4030+
<<<<<<< HEAD
40244031
"rustc_errors",
40254032
"rustc_hir",
40264033
"rustc_span",
4034+
=======
4035+
>>>>>>> Update lock file
40274036
"rustc_typeck",
40284037
"syntax",
40294038
]
@@ -4696,6 +4705,58 @@ dependencies = [
46964705
"scoped-tls",
46974706
"serialize",
46984707
"smallvec 1.0.0",
4708+
<<<<<<< HEAD
4709+
=======
4710+
"syntax_pos",
4711+
]
4712+
4713+
[[package]]
4714+
name = "syntax_expand"
4715+
version = "0.0.0"
4716+
dependencies = [
4717+
"log",
4718+
"rustc_data_structures",
4719+
"rustc_errors",
4720+
"rustc_feature",
4721+
"rustc_lexer",
4722+
"rustc_parse",
4723+
"serialize",
4724+
"smallvec 1.0.0",
4725+
"syntax",
4726+
"syntax_pos",
4727+
]
4728+
4729+
[[package]]
4730+
name = "syntax_ext"
4731+
version = "0.0.0"
4732+
dependencies = [
4733+
"fmt_macros",
4734+
"log",
4735+
"rustc_data_structures",
4736+
"rustc_errors",
4737+
"rustc_feature",
4738+
"rustc_parse",
4739+
"rustc_target",
4740+
"smallvec 1.0.0",
4741+
"syntax",
4742+
"syntax_expand",
4743+
"syntax_pos",
4744+
]
4745+
4746+
[[package]]
4747+
name = "syntax_pos"
4748+
version = "0.0.0"
4749+
dependencies = [
4750+
"arena",
4751+
"cfg-if",
4752+
"log",
4753+
"rustc_data_structures",
4754+
"rustc_index",
4755+
"rustc_macros",
4756+
"scoped-tls",
4757+
"serialize",
4758+
"unicode-width",
4759+
>>>>>>> Update lock file
46994760
]
47004761

47014762
[[package]]

0 commit comments

Comments
 (0)