OpenE2K
/
rust
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update Cargo.lock

This commit is contained in:
Aaron Hill 2019-12-11 09:50:46 -05:00
parent 9245182420
commit 150d328d2e
No known key found for this signature in database
GPG Key ID: B4087E510E98B164
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Cargo.lock
View File

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