Skip to content

Commit 8a676e9

Browse files
committed
Auto merge of rust-lang#120271 - fmease:rollup-nbm2e8h, r=fmease
Rollup of 13 pull requests Successful merges: - rust-lang#119028 (Add more weirdness to weird-exprs.rs) - rust-lang#119805 (Suggest array::from_fn for array initialization) - rust-lang#120124 (Split assembly tests for ELF and MachO) - rust-lang#120177 (Remove duplicate dependencies for rustc) - rust-lang#120185 (coverage: Don't instrument `#[automatically_derived]` functions) - rust-lang#120188 (compiler: update freebsd and netbsd base specs.) - rust-lang#120201 (Bump some deps with syn 1.0 dependencies) - rust-lang#120215 (Update some deps with `bitflags` v1 dependencies) - rust-lang#120244 (Use `Self` in `NonZero*` implementations.) - rust-lang#120246 (Re-add estebank to review rotation) - rust-lang#120252 (rename `RawTy` to `LoweredTy`) - rust-lang#120255 (correct my mailmap entry) - rust-lang#120270 (A bunch of random modifications) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 6265a95 + 9ff82a8 commit 8a676e9

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+425
-383
lines changed

.mailmap

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ Clement Miao <clementmiao@gmail.com>
129129
Clément Renault <renault.cle@gmail.com>
130130
Cliff Dyer <jcd@sdf.org>
131131
Clinton Ryan <clint.ryan3@gmail.com>
132-
Corey Richardson <corey@octayn.net> Elaine "See More" Nemo <corey@octayn.net>
132+
ember arlynx <ember@lunar.town> <corey@octayn.net>
133133
Crazycolorz5 <Crazycolorz5@gmail.com>
134134
csmoe <35686186+csmoe@users.noreply.github.com>
135135
Cyryl Płotnicki <cyplo@cyplo.net>

Cargo.lock

+108-58
Original file line numberDiff line numberDiff line change
@@ -310,13 +310,12 @@ dependencies = [
310310

311311
[[package]]
312312
name = "bstr"
313-
version = "1.5.0"
313+
version = "1.9.0"
314314
source = "registry+https://github.com/rust-lang/crates.io-index"
315-
checksum = "a246e68bb43f6cd9db24bea052a53e40405417c5fb372e3d1a8a7f770a564ef5"
315+
checksum = "c48f0051a4b4c5e0b6d365cd04af53aeaa209e3cc15ec2cdb69e73cc87fbd0dc"
316316
dependencies = [
317317
"memchr",
318-
"once_cell",
319-
"regex-automata 0.1.10",
318+
"regex-automata 0.4.3",
320319
"serde",
321320
]
322321

@@ -373,9 +372,9 @@ dependencies = [
373372

374373
[[package]]
375374
name = "byteorder"
376-
version = "1.4.3"
375+
version = "1.5.0"
377376
source = "registry+https://github.com/rust-lang/crates.io-index"
378-
checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610"
377+
checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
379378

380379
[[package]]
381380
name = "bytes"
@@ -878,12 +877,12 @@ dependencies = [
878877

879878
[[package]]
880879
name = "ctrlc"
881-
version = "3.4.0"
880+
version = "3.4.2"
882881
source = "registry+https://github.com/rust-lang/crates.io-index"
883-
checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
882+
checksum = "b467862cc8610ca6fc9a1532d7777cee0804e678ab45410897b9396495994a0b"
884883
dependencies = [
885884
"nix",
886-
"windows-sys 0.48.0",
885+
"windows-sys 0.52.0",
887886
]
888887

889888
[[package]]
@@ -1589,11 +1588,11 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
15891588

15901589
[[package]]
15911590
name = "globset"
1592-
version = "0.4.10"
1591+
version = "0.4.13"
15931592
source = "registry+https://github.com/rust-lang/crates.io-index"
1594-
checksum = "029d74589adefde59de1a0c4f4732695c32805624aec7b68d91503d4dba79afc"
1593+
checksum = "759c97c1e17c55525b57192c06a267cda0ac5210b222d6b82189a2338fa1c13d"
15951594
dependencies = [
1596-
"aho-corasick 0.7.20",
1595+
"aho-corasick 1.0.2",
15971596
"bstr",
15981597
"fnv",
15991598
"log",
@@ -2370,9 +2369,9 @@ dependencies = [
23702369

23712370
[[package]]
23722371
name = "memchr"
2373-
version = "2.5.0"
2372+
version = "2.7.1"
23742373
source = "registry+https://github.com/rust-lang/crates.io-index"
2375-
checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d"
2374+
checksum = "523dc4f511e55ab87b694dc30d0f820d60906ef06413f93d4d7a1385599cc149"
23762375
dependencies = [
23772376
"compiler_builtins",
23782377
"rustc-std-workspace-core",
@@ -2512,14 +2511,13 @@ checksum = "e4a24736216ec316047a1fc4252e27dabb04218aa4a3f37c6e7ddbf1f9782b54"
25122511

25132512
[[package]]
25142513
name = "nix"
2515-
version = "0.26.2"
2514+
version = "0.27.1"
25162515
source = "registry+https://github.com/rust-lang/crates.io-index"
2517-
checksum = "bfdda3d196821d6af13126e40375cdf7da646a96114af134d5f417a9a1dc8e1a"
2516+
checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
25182517
dependencies = [
2519-
"bitflags 1.3.2",
2518+
"bitflags 2.4.1",
25202519
"cfg-if",
25212520
"libc",
2522-
"static_assertions",
25232521
]
25242522

25252523
[[package]]
@@ -2588,9 +2586,9 @@ checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"
25882586

25892587
[[package]]
25902588
name = "object"
2591-
version = "0.32.1"
2589+
version = "0.32.2"
25922590
source = "registry+https://github.com/rust-lang/crates.io-index"
2593-
checksum = "9cf5f9dd3933bd50a9e1f149ec995f39ae2c496d31fd772c1fd45ebc27e902b0"
2591+
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
25942592
dependencies = [
25952593
"compiler_builtins",
25962594
"crc32fast",
@@ -2641,11 +2639,11 @@ dependencies = [
26412639

26422640
[[package]]
26432641
name = "openssl"
2644-
version = "0.10.55"
2642+
version = "0.10.63"
26452643
source = "registry+https://github.com/rust-lang/crates.io-index"
2646-
checksum = "345df152bc43501c5eb9e4654ff05f794effb78d4efe3d53abc158baddc0703d"
2644+
checksum = "15c9d69dd87a29568d4d017cfe8ec518706046a05184e5aea92d0af890b803c8"
26472645
dependencies = [
2648-
"bitflags 1.3.2",
2646+
"bitflags 2.4.1",
26492647
"cfg-if",
26502648
"foreign-types",
26512649
"libc",
@@ -2673,9 +2671,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
26732671

26742672
[[package]]
26752673
name = "openssl-sys"
2676-
version = "0.9.90"
2674+
version = "0.9.99"
26772675
source = "registry+https://github.com/rust-lang/crates.io-index"
2678-
checksum = "374533b0e45f3a7ced10fcaeccca020e66656bc03dac384f852e4e5a7a8104a6"
2676+
checksum = "22e1bf214306098e4832460f797824c05d25aacdf896f64a985fb0fd992454ae"
26792677
dependencies = [
26802678
"cc",
26812679
"libc",
@@ -3183,6 +3181,12 @@ dependencies = [
31833181
"memchr",
31843182
]
31853183

3184+
[[package]]
3185+
name = "regex-automata"
3186+
version = "0.4.3"
3187+
source = "registry+https://github.com/rust-lang/crates.io-index"
3188+
checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
3189+
31863190
[[package]]
31873191
name = "regex-syntax"
31883192
version = "0.6.29"
@@ -4789,12 +4793,12 @@ checksum = "4f3208ce4d8448b3f3e7d168a73f5e0c43a61e32930de3bceeccedb388b6bf06"
47894793

47904794
[[package]]
47914795
name = "ruzstd"
4792-
version = "0.4.0"
4796+
version = "0.5.0"
47934797
source = "registry+https://github.com/rust-lang/crates.io-index"
4794-
checksum = "ac3ffab8f9715a0d455df4bbb9d21e91135aab3cd3ca187af0cd0c3c3f868fdc"
4798+
checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
47954799
dependencies = [
47964800
"byteorder",
4797-
"thiserror-core",
4801+
"derive_more",
47984802
"twox-hash",
47994803
]
48004804

@@ -5357,26 +5361,6 @@ dependencies = [
53575361
"thiserror-impl",
53585362
]
53595363

5360-
[[package]]
5361-
name = "thiserror-core"
5362-
version = "1.0.38"
5363-
source = "registry+https://github.com/rust-lang/crates.io-index"
5364-
checksum = "0d97345f6437bb2004cd58819d8a9ef8e36cdd7661c2abc4bbde0a7c40d9f497"
5365-
dependencies = [
5366-
"thiserror-core-impl",
5367-
]
5368-
5369-
[[package]]
5370-
name = "thiserror-core-impl"
5371-
version = "1.0.38"
5372-
source = "registry+https://github.com/rust-lang/crates.io-index"
5373-
checksum = "10ac1c5050e43014d16b2f94d0d2ce79e65ffdd8b38d8048f9c8f6a8a6da62ac"
5374-
dependencies = [
5375-
"proc-macro2",
5376-
"quote",
5377-
"syn 1.0.109",
5378-
]
5379-
53805364
[[package]]
53815365
name = "thiserror-impl"
53825366
version = "1.0.47"
@@ -5424,7 +5408,7 @@ name = "tidy"
54245408
version = "0.1.0"
54255409
dependencies = [
54265410
"cargo-platform",
5427-
"cargo_metadata 0.15.4",
5411+
"cargo_metadata 0.18.0",
54285412
"ignore",
54295413
"lazy_static",
54305414
"miropt-test-tools",
@@ -5749,28 +5733,28 @@ dependencies = [
57495733

57505734
[[package]]
57515735
name = "unic-langid"
5752-
version = "0.9.1"
5736+
version = "0.9.4"
57535737
source = "registry+https://github.com/rust-lang/crates.io-index"
5754-
checksum = "398f9ad7239db44fd0f80fe068d12ff22d78354080332a5077dc6f52f14dcf2f"
5738+
checksum = "238722e6d794ed130f91f4ea33e01fcff4f188d92337a21297892521c72df516"
57555739
dependencies = [
57565740
"unic-langid-impl",
57575741
"unic-langid-macros",
57585742
]
57595743

57605744
[[package]]
57615745
name = "unic-langid-impl"
5762-
version = "0.9.1"
5746+
version = "0.9.4"
57635747
source = "registry+https://github.com/rust-lang/crates.io-index"
5764-
checksum = "e35bfd2f2b8796545b55d7d3fd3e89a0613f68a0d1c8bc28cb7ff96b411a35ff"
5748+
checksum = "4bd55a2063fdea4ef1f8633243a7b0524cbeef1905ae04c31a1c9b9775c55bc6"
57655749
dependencies = [
57665750
"tinystr",
57675751
]
57685752

57695753
[[package]]
57705754
name = "unic-langid-macros"
5771-
version = "0.9.1"
5755+
version = "0.9.4"
57725756
source = "registry+https://github.com/rust-lang/crates.io-index"
5773-
checksum = "055e618bf694161ffff0466d95cef3e1a5edc59f6ba1888e97801f2b4ebdc4fe"
5757+
checksum = "5c854cefb82ff2816410ce606acbad1b3af065140907b29be9229040752b83ec"
57745758
dependencies = [
57755759
"proc-macro-hack",
57765760
"tinystr",
@@ -5780,13 +5764,13 @@ dependencies = [
57805764

57815765
[[package]]
57825766
name = "unic-langid-macros-impl"
5783-
version = "0.9.1"
5767+
version = "0.9.4"
57845768
source = "registry+https://github.com/rust-lang/crates.io-index"
5785-
checksum = "1f5cdec05b907f4e2f6843f4354f4ce6a5bebe1a56df320a49134944477ce4d8"
5769+
checksum = "fea2a4c80deb4fb3ca51f66b5e2dd91e3642bbce52234bcf22e41668281208e4"
57865770
dependencies = [
57875771
"proc-macro-hack",
57885772
"quote",
5789-
"syn 1.0.109",
5773+
"syn 2.0.32",
57905774
"unic-langid-impl",
57915775
]
57925776

@@ -6143,6 +6127,15 @@ dependencies = [
61436127
"windows-targets 0.48.1",
61446128
]
61456129

6130+
[[package]]
6131+
name = "windows-sys"
6132+
version = "0.52.0"
6133+
source = "registry+https://github.com/rust-lang/crates.io-index"
6134+
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
6135+
dependencies = [
6136+
"windows-targets 0.52.0",
6137+
]
6138+
61466139
[[package]]
61476140
name = "windows-targets"
61486141
version = "0.42.2"
@@ -6173,6 +6166,21 @@ dependencies = [
61736166
"windows_x86_64_msvc 0.48.0",
61746167
]
61756168

6169+
[[package]]
6170+
name = "windows-targets"
6171+
version = "0.52.0"
6172+
source = "registry+https://github.com/rust-lang/crates.io-index"
6173+
checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd"
6174+
dependencies = [
6175+
"windows_aarch64_gnullvm 0.52.0",
6176+
"windows_aarch64_msvc 0.52.0",
6177+
"windows_i686_gnu 0.52.0",
6178+
"windows_i686_msvc 0.52.0",
6179+
"windows_x86_64_gnu 0.52.0",
6180+
"windows_x86_64_gnullvm 0.52.0",
6181+
"windows_x86_64_msvc 0.52.0",
6182+
]
6183+
61766184
[[package]]
61776185
name = "windows_aarch64_gnullvm"
61786186
version = "0.42.2"
@@ -6185,6 +6193,12 @@ version = "0.48.0"
61856193
source = "registry+https://github.com/rust-lang/crates.io-index"
61866194
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
61876195

6196+
[[package]]
6197+
name = "windows_aarch64_gnullvm"
6198+
version = "0.52.0"
6199+
source = "registry+https://github.com/rust-lang/crates.io-index"
6200+
checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea"
6201+
61886202
[[package]]
61896203
name = "windows_aarch64_msvc"
61906204
version = "0.42.2"
@@ -6197,6 +6211,12 @@ version = "0.48.0"
61976211
source = "registry+https://github.com/rust-lang/crates.io-index"
61986212
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
61996213

6214+
[[package]]
6215+
name = "windows_aarch64_msvc"
6216+
version = "0.52.0"
6217+
source = "registry+https://github.com/rust-lang/crates.io-index"
6218+
checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef"
6219+
62006220
[[package]]
62016221
name = "windows_i686_gnu"
62026222
version = "0.42.2"
@@ -6209,6 +6229,12 @@ version = "0.48.0"
62096229
source = "registry+https://github.com/rust-lang/crates.io-index"
62106230
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
62116231

6232+
[[package]]
6233+
name = "windows_i686_gnu"
6234+
version = "0.52.0"
6235+
source = "registry+https://github.com/rust-lang/crates.io-index"
6236+
checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313"
6237+
62126238
[[package]]
62136239
name = "windows_i686_msvc"
62146240
version = "0.42.2"
@@ -6221,6 +6247,12 @@ version = "0.48.0"
62216247
source = "registry+https://github.com/rust-lang/crates.io-index"
62226248
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
62236249

6250+
[[package]]
6251+
name = "windows_i686_msvc"
6252+
version = "0.52.0"
6253+
source = "registry+https://github.com/rust-lang/crates.io-index"
6254+
checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a"
6255+
62246256
[[package]]
62256257
name = "windows_x86_64_gnu"
62266258
version = "0.42.2"
@@ -6233,6 +6265,12 @@ version = "0.48.0"
62336265
source = "registry+https://github.com/rust-lang/crates.io-index"
62346266
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
62356267

6268+
[[package]]
6269+
name = "windows_x86_64_gnu"
6270+
version = "0.52.0"
6271+
source = "registry+https://github.com/rust-lang/crates.io-index"
6272+
checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd"
6273+
62366274
[[package]]
62376275
name = "windows_x86_64_gnullvm"
62386276
version = "0.42.2"
@@ -6245,6 +6283,12 @@ version = "0.48.0"
62456283
source = "registry+https://github.com/rust-lang/crates.io-index"
62466284
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
62476285

6286+
[[package]]
6287+
name = "windows_x86_64_gnullvm"
6288+
version = "0.52.0"
6289+
source = "registry+https://github.com/rust-lang/crates.io-index"
6290+
checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e"
6291+
62486292
[[package]]
62496293
name = "windows_x86_64_msvc"
62506294
version = "0.42.2"
@@ -6257,6 +6301,12 @@ version = "0.48.0"
62576301
source = "registry+https://github.com/rust-lang/crates.io-index"
62586302
checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a"
62596303

6304+
[[package]]
6305+
name = "windows_x86_64_msvc"
6306+
version = "0.52.0"
6307+
source = "registry+https://github.com/rust-lang/crates.io-index"
6308+
checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04"
6309+
62606310
[[package]]
62616311
name = "winnow"
62626312
version = "0.4.7"

0 commit comments

Comments
 (0)