Update Cargo.lock
This commit is contained in:
parent
9245182420
commit
150d328d2e
|
@ -3616,12 +3616,8 @@ dependencies = [
|
|||
"log",
|
||||
"once_cell",
|
||||
"rustc",
|
||||
<<<<<<< HEAD
|
||||
"rustc-rayon",
|
||||
=======
|
||||
"rustc-rayon 0.3.0",
|
||||
"rustc_codegen_llvm",
|
||||
>>>>>>> rustc: Link LLVM directly into rustc again
|
||||
"rustc_codegen_ssa",
|
||||
"rustc_codegen_utils",
|
||||
"rustc_data_structures",
|
||||
|
|
Loading…
Reference in New Issue