about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEric Huss <eric@huss.org>2022-01-25 16:24:21 -0800
committerEric Huss <eric@huss.org>2022-01-25 16:24:21 -0800
commitaf8048b21d865af3f3168e3d7c03bd658edc7b5c (patch)
tree912f72be7f5341a243a554a49888164bddc814c2
parent8cdb3cd94efece1e17cbd8f6edb1dc1a482779a0 (diff)
downloadrust-af8048b21d865af3f3168e3d7c03bd658edc7b5c.tar.gz
rust-af8048b21d865af3f3168e3d7c03bd658edc7b5c.zip
Update cargo
-rw-r--r--Cargo.lock36
m---------src/tools/cargo0
2 files changed, 34 insertions, 2 deletions
diff --git a/Cargo.lock b/Cargo.lock
index da34271a2b4..aa942065845 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -379,7 +379,7 @@ dependencies = [
  "tar",
  "tempfile",
  "termcolor",
- "toml",
+ "toml_edit",
  "unicode-width",
  "unicode-xid",
  "url 2.2.2",
@@ -465,7 +465,7 @@ dependencies = [
  "serde_json",
  "tar",
  "termcolor",
- "toml",
+ "toml_edit",
  "url 2.2.2",
 ]
 
@@ -732,6 +732,16 @@ dependencies = [
 ]
 
 [[package]]
+name = "combine"
+version = "4.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50b727aacc797f9fc28e355d21f34709ac4fc9adecfe470ad07b8f4464f53062"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
+[[package]]
 name = "commoncrypto"
 version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -1954,6 +1964,15 @@ dependencies = [
 ]
 
 [[package]]
+name = "kstring"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b310ccceade8121d7d77fee406160e457c2f4e7c7982d589da3499bc7ea4526"
+dependencies = [
+ "serde",
+]
+
+[[package]]
 name = "lazy_static"
 version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
@@ -5224,6 +5243,19 @@ dependencies = [
 ]
 
 [[package]]
+name = "toml_edit"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3b80ac5e1b91e3378c63dab121962472b5ca20cf9ab1975e3d588548717807a8"
+dependencies = [
+ "combine",
+ "indexmap",
+ "itertools 0.10.1",
+ "kstring",
+ "serde",
+]
+
+[[package]]
 name = "topological-sort"
 version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 95bb3c92bf516017e812e7f1c14c2dea3845b30
+Subproject 1c034752de0df744fcd7788fcbca158830b8bf8