]> git.lizzy.rs Git - rust.git/blobdiff - Cargo.lock
Fix documentation typo
[rust.git] / Cargo.lock
index f7fe347a0a52f100f1bfb5430072629c6643b0c1..1af0442dde7fc85fdd9d432a3f0df77d51791afd 100644 (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",
@@ -3676,6 +3672,7 @@ version = "0.0.0"
 dependencies = [
  "build_helper",
  "cc",
+ "libc",
 ]
 
 [[package]]
@@ -3949,6 +3946,8 @@ dependencies = [
  "minifier",
  "pulldown-cmark 0.5.3",
  "rustc-rayon",
+ "serde",
+ "serde_json",
  "tempfile",
 ]