Skip to content

Commit f12c620

Browse files
authored
Merge pull request #1148 from rust-lang/maint
Maintenance
2 parents 2c09240 + b107b0b commit f12c620

File tree

12 files changed

+669
-535
lines changed

12 files changed

+669
-535
lines changed

compiler/base/Cargo.toml

+100-92
Large diffs are not rendered by default.

compiler/base/asm-cleanup/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,6 @@ edition = "2018"
66
[workspace]
77

88
[dependencies]
9-
petgraph = "0.7.0"
9+
petgraph = "0.8.1"
1010
regex = "1.0.0"
1111
rustc-demangle = "0.1.5"

compiler/base/asm-cleanup/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ pub fn filter_asm(block: &str) -> String {
7575
let mut line_info = Vec::new();
7676
let mut labels = HashSet::new();
7777
let mut opcode_operands = HashSet::new();
78-
let mut label_graph = DiGraphMap::new();
78+
let mut label_graph: DiGraphMap<_, _> = Default::default();
7979

8080
// Note the type of data held on each line of the block
8181
for line in block.lines() {

compiler/base/crate-information.json

+49-44
Original file line numberDiff line numberDiff line change
@@ -111,12 +111,12 @@
111111
},
112112
{
113113
"name": "aws-lc-rs",
114-
"version": "1.12.6",
114+
"version": "1.13.0",
115115
"id": "aws_lc_rs"
116116
},
117117
{
118118
"name": "aws-lc-sys",
119-
"version": "0.27.1",
119+
"version": "0.28.0",
120120
"id": "aws_lc_sys"
121121
},
122122
{
@@ -166,7 +166,7 @@
166166
},
167167
{
168168
"name": "borsh",
169-
"version": "1.5.5",
169+
"version": "1.5.7",
170170
"id": "borsh"
171171
},
172172
{
@@ -186,7 +186,7 @@
186186
},
187187
{
188188
"name": "bytemuck_derive",
189-
"version": "1.8.1",
189+
"version": "1.9.3",
190190
"id": "bytemuck_derive"
191191
},
192192
{
@@ -211,7 +211,7 @@
211211
},
212212
{
213213
"name": "cc",
214-
"version": "1.2.16",
214+
"version": "1.2.18",
215215
"id": "cc"
216216
},
217217
{
@@ -231,12 +231,12 @@
231231
},
232232
{
233233
"name": "clap",
234-
"version": "4.5.32",
234+
"version": "4.5.35",
235235
"id": "clap"
236236
},
237237
{
238238
"name": "clap_builder",
239-
"version": "4.5.32",
239+
"version": "4.5.35",
240240
"id": "clap_builder"
241241
},
242242
{
@@ -356,7 +356,7 @@
356356
},
357357
{
358358
"name": "deranged",
359-
"version": "0.3.11",
359+
"version": "0.4.0",
360360
"id": "deranged"
361361
},
362362
{
@@ -421,7 +421,7 @@
421421
},
422422
{
423423
"name": "env_logger",
424-
"version": "0.11.7",
424+
"version": "0.11.8",
425425
"id": "env_logger"
426426
},
427427
{
@@ -431,7 +431,7 @@
431431
},
432432
{
433433
"name": "errno",
434-
"version": "0.3.10",
434+
"version": "0.3.11",
435435
"id": "errno"
436436
},
437437
{
@@ -486,7 +486,7 @@
486486
},
487487
{
488488
"name": "flate2",
489-
"version": "1.1.0",
489+
"version": "1.1.1",
490490
"id": "flate2"
491491
},
492492
{
@@ -596,7 +596,7 @@
596596
},
597597
{
598598
"name": "getrandom",
599-
"version": "0.3.1",
599+
"version": "0.3.2",
600600
"id": "getrandom"
601601
},
602602
{
@@ -721,12 +721,12 @@
721721
},
722722
{
723723
"name": "hyper-util",
724-
"version": "0.1.10",
724+
"version": "0.1.11",
725725
"id": "hyper_util"
726726
},
727727
{
728728
"name": "iana-time-zone",
729-
"version": "0.1.61",
729+
"version": "0.1.63",
730730
"id": "iana_time_zone"
731731
},
732732
{
@@ -746,7 +746,7 @@
746746
},
747747
{
748748
"name": "icu_locid_transform_data",
749-
"version": "1.5.0",
749+
"version": "1.5.1",
750750
"id": "icu_locid_transform_data"
751751
},
752752
{
@@ -756,7 +756,7 @@
756756
},
757757
{
758758
"name": "icu_normalizer_data",
759-
"version": "1.5.0",
759+
"version": "1.5.1",
760760
"id": "icu_normalizer_data"
761761
},
762762
{
@@ -766,7 +766,7 @@
766766
},
767767
{
768768
"name": "icu_properties_data",
769-
"version": "1.5.0",
769+
"version": "1.5.1",
770770
"id": "icu_properties_data"
771771
},
772772
{
@@ -791,7 +791,7 @@
791791
},
792792
{
793793
"name": "image",
794-
"version": "0.25.5",
794+
"version": "0.25.6",
795795
"id": "image"
796796
},
797797
{
@@ -806,7 +806,7 @@
806806
},
807807
{
808808
"name": "indexmap",
809-
"version": "2.8.0",
809+
"version": "2.9.0",
810810
"id": "indexmap"
811811
},
812812
{
@@ -841,12 +841,12 @@
841841
},
842842
{
843843
"name": "jiff",
844-
"version": "0.2.4",
844+
"version": "0.2.5",
845845
"id": "jiff"
846846
},
847847
{
848848
"name": "jobserver",
849-
"version": "0.1.32",
849+
"version": "0.1.33",
850850
"id": "jobserver"
851851
},
852852
{
@@ -901,7 +901,7 @@
901901
},
902902
{
903903
"name": "log",
904-
"version": "0.4.26",
904+
"version": "0.4.27",
905905
"id": "log"
906906
},
907907
{
@@ -986,7 +986,7 @@
986986
},
987987
{
988988
"name": "miniz_oxide",
989-
"version": "0.8.5",
989+
"version": "0.8.7",
990990
"id": "miniz_oxide"
991991
},
992992
{
@@ -1081,12 +1081,12 @@
10811081
},
10821082
{
10831083
"name": "once_cell",
1084-
"version": "1.21.1",
1084+
"version": "1.21.3",
10851085
"id": "once_cell"
10861086
},
10871087
{
10881088
"name": "openssl",
1089-
"version": "0.10.71",
1089+
"version": "0.10.72",
10901090
"id": "openssl"
10911091
},
10921092
{
@@ -1101,7 +1101,7 @@
11011101
},
11021102
{
11031103
"name": "openssl-sys",
1104-
"version": "0.9.106",
1104+
"version": "0.9.107",
11051105
"id": "openssl_sys"
11061106
},
11071107
{
@@ -1131,7 +1131,7 @@
11311131
},
11321132
{
11331133
"name": "petgraph",
1134-
"version": "0.7.1",
1134+
"version": "0.8.1",
11351135
"id": "petgraph"
11361136
},
11371137
{
@@ -1351,7 +1351,7 @@
13511351
},
13521352
{
13531353
"name": "reqwest",
1354-
"version": "0.12.14",
1354+
"version": "0.12.15",
13551355
"id": "reqwest"
13561356
},
13571357
{
@@ -1381,12 +1381,12 @@
13811381
},
13821382
{
13831383
"name": "rustix",
1384-
"version": "1.0.2",
1384+
"version": "1.0.5",
13851385
"id": "rustix"
13861386
},
13871387
{
13881388
"name": "rustls",
1389-
"version": "0.23.24",
1389+
"version": "0.23.25",
13901390
"id": "rustls"
13911391
},
13921392
{
@@ -1431,7 +1431,7 @@
14311431
},
14321432
{
14331433
"name": "select",
1434-
"version": "0.6.0",
1434+
"version": "0.6.1",
14351435
"id": "select"
14361436
},
14371437
{
@@ -1536,17 +1536,17 @@
15361536
},
15371537
{
15381538
"name": "smallvec",
1539-
"version": "1.14.0",
1539+
"version": "1.15.0",
15401540
"id": "smallvec"
15411541
},
15421542
{
15431543
"name": "socket2",
1544-
"version": "0.5.8",
1544+
"version": "0.5.9",
15451545
"id": "socket2"
15461546
},
15471547
{
15481548
"name": "spin",
1549-
"version": "0.9.8",
1549+
"version": "0.10.0",
15501550
"id": "spin"
15511551
},
15521552
{
@@ -1561,7 +1561,7 @@
15611561
},
15621562
{
15631563
"name": "string_cache",
1564-
"version": "0.8.8",
1564+
"version": "0.8.9",
15651565
"id": "string_cache"
15661566
},
15671567
{
@@ -1611,7 +1611,7 @@
16111611
},
16121612
{
16131613
"name": "tempfile",
1614-
"version": "3.19.0",
1614+
"version": "3.19.1",
16151615
"id": "tempfile"
16161616
},
16171617
{
@@ -1661,17 +1661,17 @@
16611661
},
16621662
{
16631663
"name": "time",
1664-
"version": "0.3.39",
1664+
"version": "0.3.41",
16651665
"id": "time"
16661666
},
16671667
{
16681668
"name": "time-core",
1669-
"version": "0.1.3",
1669+
"version": "0.1.4",
16701670
"id": "time_core"
16711671
},
16721672
{
16731673
"name": "time-macros",
1674-
"version": "0.2.20",
1674+
"version": "0.2.22",
16751675
"id": "time_macros"
16761676
},
16771677
{
@@ -1691,7 +1691,7 @@
16911691
},
16921692
{
16931693
"name": "tokio",
1694-
"version": "1.44.1",
1694+
"version": "1.44.2",
16951695
"id": "tokio"
16961696
},
16971697
{
@@ -1936,7 +1936,7 @@
19361936
},
19371937
{
19381938
"name": "rustls-webpki",
1939-
"version": "0.103.0",
1939+
"version": "0.103.1",
19401940
"id": "webpki"
19411941
},
19421942
{
@@ -1946,14 +1946,19 @@
19461946
},
19471947
{
19481948
"name": "whoami",
1949-
"version": "1.5.2",
1949+
"version": "1.6.0",
19501950
"id": "whoami"
19511951
},
19521952
{
19531953
"name": "wide",
19541954
"version": "0.7.32",
19551955
"id": "wide"
19561956
},
1957+
{
1958+
"name": "windows_i686_msvc",
1959+
"version": "0.53.0",
1960+
"id": "windows_i686_msvc"
1961+
},
19571962
{
19581963
"name": "windows-sys",
19591964
"version": "0.59.0",
@@ -2016,7 +2021,7 @@
20162021
},
20172022
{
20182023
"name": "zerocopy",
2019-
"version": "0.8.23",
2024+
"version": "0.8.24",
20202025
"id": "zerocopy"
20212026
},
20222027
{
@@ -2026,7 +2031,7 @@
20262031
},
20272032
{
20282033
"name": "zerocopy-derive",
2029-
"version": "0.8.23",
2034+
"version": "0.8.24",
20302035
"id": "zerocopy_derive"
20312036
},
20322037
{

0 commit comments

Comments
 (0)