@@ -1955,7 +1955,7 @@ dependencies = [
1955
1955
1956
1956
[[package ]]
1957
1957
name = " mimalloc-sys"
1958
- version = " 0.1.4 "
1958
+ version = " 0.1.5 "
1959
1959
source = " registry+https://github.com/rust-lang/crates.io-index"
1960
1960
dependencies = [
1961
1961
" cc 1.0.35 (registry+https://github.com/rust-lang/crates.io-index)" ,
@@ -3209,6 +3209,7 @@ name = "rustc-main"
3209
3209
version = " 0.0.0"
3210
3210
dependencies = [
3211
3211
<<<<<<< HEAD
3212
+ <<<<<<< HEAD
3212
3213
<<<<<<< HEAD
3213
3214
" jemalloc-sys" ,
3214
3215
" rustc_codegen_ssa" ,
@@ -3218,6 +3219,9 @@ dependencies = [
3218
3219
" mimalloc-sys 0.1.2 (registry+https://github.com/rust-lang/crates.io-index)" ,
3219
3220
=======
3220
3221
" mimalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" ,
3222
+ >>>>>>> Update Cargo.lock
3223
+ =======
3224
+ " mimalloc-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" ,
3221
3225
>>>>>>> Update Cargo.lock
3222
3226
" rustc_codegen_ssa 0.0.0" ,
3223
3227
" rustc_driver 0.0.0" ,
@@ -5179,7 +5183,7 @@ checksum = "e66366e18dc58b46801afbf2ca7661a9f59cc8c5962c29892b6039b4f86fa992"
5179
5183
"checksum memchr 2.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = " 2efc7bc57c883d4a4d6e3246905283d8dae951bb3bd32f49d6ef297f546e1c39"
5180
5184
"checksum memmap 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = " e2ffa2c986de11a9df78620c01eeaaf27d94d3ff02bf81bfcca953102dd0c6ff"
5181
5185
"checksum memoffset 0.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = " 0f9dc261e2b62d7a622bf416ea3c5245cdd5d9a7fcc428c0d06804dfce1775b3"
5182
- "checksum mimalloc-sys 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = " 4f4aefba6246579f1d6636d62b9541c0c8bb7c0a27c0b5fd84f497078aef1556 "
5186
+ "checksum mimalloc-sys 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = " b95f8e6d03de63db3537f5e0b59b9ca5247d8d42b1bd8b7db5f36ec49b885351 "
5183
5187
"checksum minifier 0.0.30 (registry+https://github.com/rust-lang/crates.io-index)" = " 4c909e78edf61f3aa0dd2086da168cdf304329044bbf248768ca3d20253ec8c0"
5184
5188
"checksum miniz-sys 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = " 0300eafb20369952951699b68243ab4334f4b10a88f411c221d444b36c40e649"
5185
5189
"checksum miniz_oxide 0.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = " 5ad30a47319c16cde58d0314f5d98202a80c9083b5f61178457403dfb14e509c"
0 commit comments