.gitignore: Don't ignore a file that exists in the repository

[rust.git] / Cargo.lock

diff --git a/Cargo.lock b/Cargo.lock
index 10e19f9f54ca13d4464ae3bfc1b3366520a31963..1af0442dde7fc85fdd9d432a3f0df77d51791afd 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -3445,10 +3445,12 @@ dependencies = [
  "rustc_codegen_utils",
  "rustc_data_structures",
  "rustc_errors",
+ "rustc_feature",
  "rustc_fs_util",
  "rustc_incremental",
  "rustc_index",
  "rustc_llvm",
+ "rustc_session",
  "rustc_target",
  "smallvec 0.6.10",
  "syntax",
@@ -3614,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",
@@ -3674,6 +3672,7 @@ version = "0.0.0"
 dependencies = [
  "build_helper",
  "cc",
+ "libc",
 ]
 
 [[package]]
@@ -3947,6 +3946,8 @@ dependencies = [
  "minifier",
  "pulldown-cmark 0.5.3",
  "rustc-rayon",
+ "serde",
+ "serde_json",
  "tempfile",
 ]