Skip to content

Commit 68790c0

Browse files
committed
Auto merge of #3920 - ChrisDenton:cc, r=RalfJung
Update cc to 1.1.22 This version of `cc` contains a fix to prevent spurious rebuilds. Hopefully this should help avoid the CI issues rustc has been having.
2 parents c361d52 + 74d7b22 commit 68790c0

File tree

3 files changed

+33
-6
lines changed

3 files changed

+33
-6
lines changed

Diff for: src/tools/miri/Cargo.lock

+11-2
Original file line numberDiff line numberDiff line change
@@ -137,9 +137,12 @@ dependencies = [
137137

138138
[[package]]
139139
name = "cc"
140-
version = "1.1.7"
140+
version = "1.1.22"
141141
source = "registry+https://github.com/rust-lang/crates.io-index"
142-
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
142+
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
143+
dependencies = [
144+
"shlex",
145+
]
143146

144147
[[package]]
145148
name = "cfg-if"
@@ -947,6 +950,12 @@ dependencies = [
947950
"lazy_static",
948951
]
949952

953+
[[package]]
954+
name = "shlex"
955+
version = "1.3.0"
956+
source = "registry+https://github.com/rust-lang/crates.io-index"
957+
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
958+
950959
[[package]]
951960
name = "siphasher"
952961
version = "0.3.11"

Diff for: src/tools/miri/bench-cargo-miri/backtraces/Cargo.lock

+11-2
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,12 @@ dependencies = [
4141

4242
[[package]]
4343
name = "cc"
44-
version = "1.0.73"
44+
version = "1.1.22"
4545
source = "registry+https://github.com/rust-lang/crates.io-index"
46-
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
46+
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
47+
dependencies = [
48+
"shlex",
49+
]
4750

4851
[[package]]
4952
name = "cfg-if"
@@ -92,3 +95,9 @@ name = "rustc-demangle"
9295
version = "0.1.21"
9396
source = "registry+https://github.com/rust-lang/crates.io-index"
9497
checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
98+
99+
[[package]]
100+
name = "shlex"
101+
version = "1.3.0"
102+
source = "registry+https://github.com/rust-lang/crates.io-index"
103+
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

Diff for: src/tools/miri/test_dependencies/Cargo.lock

+11-2
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,12 @@ checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
5252

5353
[[package]]
5454
name = "cc"
55-
version = "1.1.7"
55+
version = "1.1.22"
5656
source = "registry+https://github.com/rust-lang/crates.io-index"
57-
checksum = "26a5c3fd7bfa1ce3897a3a3501d362b2d87b7f2583ebcb4a949ec25911025cbc"
57+
checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0"
58+
dependencies = [
59+
"shlex",
60+
]
5861

5962
[[package]]
6063
name = "cfg-if"
@@ -261,6 +264,12 @@ dependencies = [
261264
"windows-sys",
262265
]
263266

267+
[[package]]
268+
name = "shlex"
269+
version = "1.3.0"
270+
source = "registry+https://github.com/rust-lang/crates.io-index"
271+
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
272+
264273
[[package]]
265274
name = "signal-hook-registry"
266275
version = "1.4.2"

0 commit comments

Comments
 (0)