Skip to content

Commit 100ac12

Browse files
liwaguliwagu
authored
Merge branch 'rust-lang:master' into unify
2 parents 59620dd + 7608018 commit 100ac12

File tree

37 files changed

+557
-422
lines changed

37 files changed

+557
-422
lines changed

‎Cargo.lock

+45-45
Original file line numberDiff line numberDiff line change
@@ -207,9 +207,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
207207

208208
[[package]]
209209
name = "autocfg"
210-
version = "1.3.0"
210+
version = "1.4.0"
211211
source = "registry+https://github.com/rust-lang/crates.io-index"
212-
checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
212+
checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
213213

214214
[[package]]
215215
name = "backtrace"
@@ -505,7 +505,7 @@ dependencies = [
505505
"heck 0.5.0",
506506
"proc-macro2",
507507
"quote",
508-
"syn 2.0.77",
508+
"syn 2.0.79",
509509
]
510510

511511
[[package]]
@@ -534,7 +534,7 @@ dependencies = [
534534
"rustc_tools_util",
535535
"serde",
536536
"serde_json",
537-
"syn 2.0.77",
537+
"syn 2.0.79",
538538
"tempfile",
539539
"termize",
540540
"tokio",
@@ -643,7 +643,7 @@ dependencies = [
643643
"nom",
644644
"proc-macro2",
645645
"quote",
646-
"syn 2.0.77",
646+
"syn 2.0.79",
647647
]
648648

649649
[[package]]
@@ -861,7 +861,7 @@ dependencies = [
861861
"proc-macro2",
862862
"quote",
863863
"strsim",
864-
"syn 2.0.77",
864+
"syn 2.0.79",
865865
]
866866

867867
[[package]]
@@ -872,7 +872,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
872872
dependencies = [
873873
"darling_core",
874874
"quote",
875-
"syn 2.0.77",
875+
"syn 2.0.79",
876876
]
877877

878878
[[package]]
@@ -898,7 +898,7 @@ version = "0.1.83"
898898
dependencies = [
899899
"itertools",
900900
"quote",
901-
"syn 2.0.77",
901+
"syn 2.0.79",
902902
]
903903

904904
[[package]]
@@ -918,7 +918,7 @@ checksum = "62d671cc41a825ebabc75757b62d3d168c577f9149b2d49ece1dad1f72119d25"
918918
dependencies = [
919919
"proc-macro2",
920920
"quote",
921-
"syn 2.0.77",
921+
"syn 2.0.79",
922922
]
923923

924924
[[package]]
@@ -939,7 +939,7 @@ dependencies = [
939939
"darling",
940940
"proc-macro2",
941941
"quote",
942-
"syn 2.0.77",
942+
"syn 2.0.79",
943943
]
944944

945945
[[package]]
@@ -949,7 +949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
949949
checksum = "4abae7035bf79b9877b779505d8cf3749285b80c43941eda66604841889451dc"
950950
dependencies = [
951951
"derive_builder_core",
952-
"syn 2.0.77",
952+
"syn 2.0.79",
953953
]
954954

955955
[[package]]
@@ -961,7 +961,7 @@ dependencies = [
961961
"darling",
962962
"proc-macro2",
963963
"quote",
964-
"syn 2.0.77",
964+
"syn 2.0.79",
965965
]
966966

967967
[[package]]
@@ -1039,7 +1039,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
10391039
dependencies = [
10401040
"proc-macro2",
10411041
"quote",
1042-
"syn 2.0.77",
1042+
"syn 2.0.79",
10431043
]
10441044

10451045
[[package]]
@@ -1192,9 +1192,9 @@ dependencies = [
11921192

11931193
[[package]]
11941194
name = "flate2"
1195-
version = "1.0.33"
1195+
version = "1.0.34"
11961196
source = "registry+https://github.com/rust-lang/crates.io-index"
1197-
checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253"
1197+
checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0"
11981198
dependencies = [
11991199
"crc32fast",
12001200
"miniz_oxide 0.8.0",
@@ -1330,7 +1330,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
13301330
dependencies = [
13311331
"proc-macro2",
13321332
"quote",
1333-
"syn 2.0.77",
1333+
"syn 2.0.79",
13341334
]
13351335

13361336
[[package]]
@@ -1554,7 +1554,7 @@ dependencies = [
15541554
"markup5ever",
15551555
"proc-macro2",
15561556
"quote",
1557-
"syn 2.0.77",
1557+
"syn 2.0.79",
15581558
]
15591559

15601560
[[package]]
@@ -1686,7 +1686,7 @@ checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
16861686
dependencies = [
16871687
"proc-macro2",
16881688
"quote",
1689-
"syn 2.0.77",
1689+
"syn 2.0.79",
16901690
]
16911691

16921692
[[package]]
@@ -2661,7 +2661,7 @@ dependencies = [
26612661
"pest_meta",
26622662
"proc-macro2",
26632663
"quote",
2664-
"syn 2.0.77",
2664+
"syn 2.0.79",
26652665
]
26662666

26672667
[[package]]
@@ -2763,9 +2763,9 @@ dependencies = [
27632763

27642764
[[package]]
27652765
name = "portable-atomic"
2766-
version = "1.8.0"
2766+
version = "1.9.0"
27672767
source = "registry+https://github.com/rust-lang/crates.io-index"
2768-
checksum = "d30538d42559de6b034bc76fd6dd4c38961b1ee5c6c56e3808c50128fdbc22ce"
2768+
checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
27692769

27702770
[[package]]
27712771
name = "powerfmt"
@@ -3073,7 +3073,7 @@ dependencies = [
30733073
"rinja_parser",
30743074
"rustc-hash 2.0.0",
30753075
"serde",
3076-
"syn 2.0.77",
3076+
"syn 2.0.79",
30773077
]
30783078

30793079
[[package]]
@@ -3671,7 +3671,7 @@ dependencies = [
36713671
"fluent-syntax",
36723672
"proc-macro2",
36733673
"quote",
3674-
"syn 2.0.77",
3674+
"syn 2.0.79",
36753675
"unic-langid",
36763676
]
36773677

@@ -3805,7 +3805,7 @@ version = "0.0.0"
38053805
dependencies = [
38063806
"proc-macro2",
38073807
"quote",
3808-
"syn 2.0.77",
3808+
"syn 2.0.79",
38093809
]
38103810

38113811
[[package]]
@@ -3954,7 +3954,7 @@ version = "0.0.0"
39543954
dependencies = [
39553955
"proc-macro2",
39563956
"quote",
3957-
"syn 2.0.77",
3957+
"syn 2.0.79",
39583958
"synstructure",
39593959
]
39603960

@@ -4535,7 +4535,7 @@ version = "0.0.0"
45354535
dependencies = [
45364536
"proc-macro2",
45374537
"quote",
4538-
"syn 2.0.77",
4538+
"syn 2.0.79",
45394539
"synstructure",
45404540
]
45414541

@@ -4623,7 +4623,7 @@ dependencies = [
46234623
"proc-macro2",
46244624
"quote",
46254625
"serde",
4626-
"syn 2.0.77",
4626+
"syn 2.0.79",
46274627
]
46284628

46294629
[[package]]
@@ -4760,7 +4760,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
47604760
dependencies = [
47614761
"proc-macro2",
47624762
"quote",
4763-
"syn 2.0.77",
4763+
"syn 2.0.79",
47644764
]
47654765

47664766
[[package]]
@@ -5024,9 +5024,9 @@ dependencies = [
50245024

50255025
[[package]]
50265026
name = "syn"
5027-
version = "2.0.77"
5027+
version = "2.0.79"
50285028
source = "registry+https://github.com/rust-lang/crates.io-index"
5029-
checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed"
5029+
checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
50305030
dependencies = [
50315031
"proc-macro2",
50325032
"quote",
@@ -5041,7 +5041,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
50415041
dependencies = [
50425042
"proc-macro2",
50435043
"quote",
5044-
"syn 2.0.77",
5044+
"syn 2.0.79",
50455045
]
50465046

50475047
[[package]]
@@ -5078,9 +5078,9 @@ dependencies = [
50785078

50795079
[[package]]
50805080
name = "tempfile"
5081-
version = "3.12.0"
5081+
version = "3.13.0"
50825082
source = "registry+https://github.com/rust-lang/crates.io-index"
5083-
checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64"
5083+
checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
50845084
dependencies = [
50855085
"cfg-if",
50865086
"fastrand",
@@ -5174,7 +5174,7 @@ checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
51745174
dependencies = [
51755175
"proc-macro2",
51765176
"quote",
5177-
"syn 2.0.77",
5177+
"syn 2.0.79",
51785178
]
51795179

51805180
[[package]]
@@ -5365,7 +5365,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
53655365
dependencies = [
53665366
"proc-macro2",
53675367
"quote",
5368-
"syn 2.0.77",
5368+
"syn 2.0.79",
53695369
]
53705370

53715371
[[package]]
@@ -5536,7 +5536,7 @@ checksum = "1ed7f4237ba393424195053097c1516bd4590dc82b84f2f97c5c69e12704555b"
55365536
dependencies = [
55375537
"proc-macro-hack",
55385538
"quote",
5539-
"syn 2.0.77",
5539+
"syn 2.0.79",
55405540
"unic-langid-impl",
55415541
]
55425542

@@ -5734,7 +5734,7 @@ dependencies = [
57345734
"once_cell",
57355735
"proc-macro2",
57365736
"quote",
5737-
"syn 2.0.77",
5737+
"syn 2.0.79",
57385738
"wasm-bindgen-shared",
57395739
]
57405740

@@ -5756,7 +5756,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
57565756
dependencies = [
57575757
"proc-macro2",
57585758
"quote",
5759-
"syn 2.0.77",
5759+
"syn 2.0.79",
57605760
"wasm-bindgen-backend",
57615761
"wasm-bindgen-shared",
57625762
]
@@ -5923,7 +5923,7 @@ dependencies = [
59235923
"rayon",
59245924
"serde",
59255925
"serde_json",
5926-
"syn 2.0.77",
5926+
"syn 2.0.79",
59275927
"windows-metadata",
59285928
]
59295929

@@ -5956,7 +5956,7 @@ checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
59565956
dependencies = [
59575957
"proc-macro2",
59585958
"quote",
5959-
"syn 2.0.77",
5959+
"syn 2.0.79",
59605960
]
59615961

59625962
[[package]]
@@ -5967,7 +5967,7 @@ checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
59675967
dependencies = [
59685968
"proc-macro2",
59695969
"quote",
5970-
"syn 2.0.77",
5970+
"syn 2.0.79",
59715971
]
59725972

59735973
[[package]]
@@ -6234,7 +6234,7 @@ checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
62346234
dependencies = [
62356235
"proc-macro2",
62366236
"quote",
6237-
"syn 2.0.77",
6237+
"syn 2.0.79",
62386238
"synstructure",
62396239
]
62406240

@@ -6256,7 +6256,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
62566256
dependencies = [
62576257
"proc-macro2",
62586258
"quote",
6259-
"syn 2.0.77",
6259+
"syn 2.0.79",
62606260
]
62616261

62626262
[[package]]
@@ -6276,7 +6276,7 @@ checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
62766276
dependencies = [
62776277
"proc-macro2",
62786278
"quote",
6279-
"syn 2.0.77",
6279+
"syn 2.0.79",
62806280
"synstructure",
62816281
]
62826282

@@ -6299,5 +6299,5 @@ checksum = "6eafa6dfb17584ea3e2bd6e76e0cc15ad7af12b09abdd1ca55961bed9b1063c6"
62996299
dependencies = [
63006300
"proc-macro2",
63016301
"quote",
6302-
"syn 2.0.77",
6302+
"syn 2.0.79",
63036303
]

‎compiler/rustc_codegen_cranelift/patches/0027-stdlib-128bit-atomic-operations.patch

-13
Original file line numberDiff line numberDiff line change
@@ -82,19 +82,6 @@ index d9de37e..8293fce 100644
8282
#[cfg(target_has_atomic_load_store = "ptr")]
8383
macro_rules! atomic_int_ptr_sized {
8484
( $($target_pointer_width:literal $align:literal)* ) => { $(
85-
diff --git a/library/core/src/cell.rs b/library/core/src/cell.rs
86-
index 58b9ba4..91bbd0a 100644
87-
--- a/library/core/src/cell.rs
88-
+++ b/library/core/src/cell.rs
89-
@@ -2246,8 +2246,6 @@ unsafe_cell_primitive_into_inner! {
90-
u32 "32"
91-
i64 "64"
92-
u64 "64"
93-
- i128 "128"
94-
- u128 "128"
95-
isize "ptr"
96-
usize "ptr"
97-
}
9885
--
9986
2.26.2.7.g19db9cfb68
10087

0 commit comments

Comments
 (0)