Skip to content
/ rust Public
forked from rust-lang/rust

Commit 9bd77a3

Browse files
author
The Miri Conjob Bot
committed
Merge from rustc
2 parents 4533adf + 078b942 commit 9bd77a3

File tree

436 files changed

+6889
-3379
lines changed

Some content is hidden

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

436 files changed

+6889
-3379
lines changed

‎.gitmodules

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
[submodule "src/llvm-project"]
3434
path = src/llvm-project
3535
url = https://github.com/rust-lang/llvm-project.git
36-
branch = rustc/16.0-2023-06-05
36+
branch = rustc/17.0-2023-07-29
3737
shallow = true
3838
[submodule "src/doc/embedded-book"]
3939
path = src/doc/embedded-book

‎Cargo.lock

+27-83
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@ version = "1.0.0"
154154
source = "registry+https://github.com/rust-lang/crates.io-index"
155155
checksum = "5ca11d4be1bab0c8bc8734a9aa7bf4ee8316d462a08c6ac5052f888fef5b494b"
156156
dependencies = [
157-
"windows-sys 0.48.0",
157+
"windows-sys",
158158
]
159159

160160
[[package]]
@@ -164,7 +164,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
164164
checksum = "180abfa45703aebe0093f79badacc01b8fd4ea2e35118747e5811127f926e188"
165165
dependencies = [
166166
"anstyle",
167-
"windows-sys 0.48.0",
167+
"windows-sys",
168168
]
169169

170170
[[package]]
@@ -797,7 +797,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
797797
checksum = "2a011bbe2c35ce9c1f143b7af6f94f29a167beb4cd1d29e6740ce836f723120e"
798798
dependencies = [
799799
"nix",
800-
"windows-sys 0.48.0",
800+
"windows-sys",
801801
]
802802

803803
[[package]]
@@ -1108,7 +1108,7 @@ checksum = "4bcfec3a70f97c962c307b2d2c56e358cf1d00b558d74262b5f929ee8cc7e73a"
11081108
dependencies = [
11091109
"errno-dragonfly",
11101110
"libc",
1111-
"windows-sys 0.48.0",
1111+
"windows-sys",
11121112
]
11131113

11141114
[[package]]
@@ -1191,7 +1191,7 @@ dependencies = [
11911191
"cfg-if",
11921192
"libc",
11931193
"redox_syscall 0.2.16",
1194-
"windows-sys 0.48.0",
1194+
"windows-sys",
11951195
]
11961196

11971197
[[package]]
@@ -1910,7 +1910,7 @@ checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
19101910
dependencies = [
19111911
"hermit-abi 0.3.2",
19121912
"libc",
1913-
"windows-sys 0.48.0",
1913+
"windows-sys",
19141914
]
19151915

19161916
[[package]]
@@ -1927,7 +1927,7 @@ checksum = "24fddda5af7e54bf7da53067d6e802dbcc381d0a8eef629df528e3ebf68755cb"
19271927
dependencies = [
19281928
"hermit-abi 0.3.2",
19291929
"rustix 0.38.2",
1930-
"windows-sys 0.48.0",
1930+
"windows-sys",
19311931
]
19321932

19331933
[[package]]
@@ -2320,16 +2320,16 @@ checksum = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2"
23202320
dependencies = [
23212321
"libc",
23222322
"wasi",
2323-
"windows-sys 0.48.0",
2323+
"windows-sys",
23242324
]
23252325

23262326
[[package]]
23272327
name = "miow"
2328-
version = "0.5.0"
2328+
version = "0.6.0"
23292329
source = "registry+https://github.com/rust-lang/crates.io-index"
2330-
checksum = "52ffbca2f655e33c08be35d87278e5b18b89550a37dbd598c20db92f6a471123"
2330+
checksum = "359f76430b20a79f9e20e115b3428614e654f04fab314482fc0fda0ebd3c6044"
23312331
dependencies = [
2332-
"windows-sys 0.42.0",
2332+
"windows-sys",
23332333
]
23342334

23352335
[[package]]
@@ -4046,6 +4046,7 @@ dependencies = [
40464046
"rustc_index",
40474047
"rustc_macros",
40484048
"rustc_middle",
4049+
"rustc_mir_build",
40494050
"rustc_mir_dataflow",
40504051
"rustc_serialize",
40514052
"rustc_session",
@@ -4561,7 +4562,7 @@ dependencies = [
45614562
"io-lifetimes",
45624563
"libc",
45634564
"linux-raw-sys 0.3.8",
4564-
"windows-sys 0.48.0",
4565+
"windows-sys",
45654566
]
45664567

45674568
[[package]]
@@ -4574,7 +4575,7 @@ dependencies = [
45744575
"errno",
45754576
"libc",
45764577
"linux-raw-sys 0.4.3",
4577-
"windows-sys 0.48.0",
4578+
"windows-sys",
45784579
]
45794580

45804581
[[package]]
@@ -4611,11 +4612,11 @@ dependencies = [
46114612

46124613
[[package]]
46134614
name = "schannel"
4614-
version = "0.1.21"
4615+
version = "0.1.22"
46154616
source = "registry+https://github.com/rust-lang/crates.io-index"
4616-
checksum = "713cfb06c7059f3588fb8044c0fad1d09e3c01d225e25b9220dbfdcf16dbb1b3"
4617+
checksum = "0c3733bf4cf7ea0880754e19cb5a462007c4a8c1914bff372ccc95b464f1df88"
46174618
dependencies = [
4618-
"windows-sys 0.42.0",
4619+
"windows-sys",
46194620
]
46204621

46214622
[[package]]
@@ -5044,7 +5045,7 @@ dependencies = [
50445045
"fastrand",
50455046
"redox_syscall 0.3.5",
50465047
"rustix 0.37.22",
5047-
"windows-sys 0.48.0",
5048+
"windows-sys",
50485049
]
50495050

50505051
[[package]]
@@ -5085,7 +5086,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
50855086
checksum = "8e6bf6f19e9f8ed8d4048dc22981458ebcf406d67e94cd422e5ecd73d63b3237"
50865087
dependencies = [
50875088
"rustix 0.37.22",
5088-
"windows-sys 0.48.0",
5089+
"windows-sys",
50895090
]
50905091

50915092
[[package]]
@@ -5264,7 +5265,7 @@ dependencies = [
52645265
"num_cpus",
52655266
"pin-project-lite",
52665267
"socket2",
5267-
"windows-sys 0.48.0",
5268+
"windows-sys",
52685269
]
52695270

52705271
[[package]]
@@ -5872,21 +5873,6 @@ version = "0.49.0"
58725873
source = "registry+https://github.com/rust-lang/crates.io-index"
58735874
checksum = "2f5bca94a32bf1e6a376522b6601275a3b611ee885ec0f1b6a05f17e8cfd3385"
58745875

5875-
[[package]]
5876-
name = "windows-sys"
5877-
version = "0.42.0"
5878-
source = "registry+https://github.com/rust-lang/crates.io-index"
5879-
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
5880-
dependencies = [
5881-
"windows_aarch64_gnullvm 0.42.2",
5882-
"windows_aarch64_msvc 0.42.2",
5883-
"windows_i686_gnu 0.42.2",
5884-
"windows_i686_msvc 0.42.2",
5885-
"windows_x86_64_gnu 0.42.2",
5886-
"windows_x86_64_gnullvm 0.42.2",
5887-
"windows_x86_64_msvc 0.42.2",
5888-
]
5889-
58905876
[[package]]
58915877
name = "windows-sys"
58925878
version = "0.48.0"
@@ -5902,13 +5888,13 @@ version = "0.48.1"
59025888
source = "registry+https://github.com/rust-lang/crates.io-index"
59035889
checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f"
59045890
dependencies = [
5905-
"windows_aarch64_gnullvm 0.48.0",
5906-
"windows_aarch64_msvc 0.48.0",
5907-
"windows_i686_gnu 0.48.0",
5908-
"windows_i686_msvc 0.48.0",
5909-
"windows_x86_64_gnu 0.48.0",
5910-
"windows_x86_64_gnullvm 0.48.0",
5911-
"windows_x86_64_msvc 0.48.0",
5891+
"windows_aarch64_gnullvm",
5892+
"windows_aarch64_msvc",
5893+
"windows_i686_gnu",
5894+
"windows_i686_msvc",
5895+
"windows_x86_64_gnu",
5896+
"windows_x86_64_gnullvm",
5897+
"windows_x86_64_msvc",
59125898
]
59135899

59145900
[[package]]
@@ -5917,84 +5903,42 @@ version = "0.48.0"
59175903
source = "registry+https://github.com/rust-lang/crates.io-index"
59185904
checksum = "b34c9a3b28cb41db7385546f7f9a8179348dffc89923dde66857b1ba5312f6b4"
59195905

5920-
[[package]]
5921-
name = "windows_aarch64_gnullvm"
5922-
version = "0.42.2"
5923-
source = "registry+https://github.com/rust-lang/crates.io-index"
5924-
checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
5925-
59265906
[[package]]
59275907
name = "windows_aarch64_gnullvm"
59285908
version = "0.48.0"
59295909
source = "registry+https://github.com/rust-lang/crates.io-index"
59305910
checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc"
59315911

5932-
[[package]]
5933-
name = "windows_aarch64_msvc"
5934-
version = "0.42.2"
5935-
source = "registry+https://github.com/rust-lang/crates.io-index"
5936-
checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
5937-
59385912
[[package]]
59395913
name = "windows_aarch64_msvc"
59405914
version = "0.48.0"
59415915
source = "registry+https://github.com/rust-lang/crates.io-index"
59425916
checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3"
59435917

5944-
[[package]]
5945-
name = "windows_i686_gnu"
5946-
version = "0.42.2"
5947-
source = "registry+https://github.com/rust-lang/crates.io-index"
5948-
checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
5949-
59505918
[[package]]
59515919
name = "windows_i686_gnu"
59525920
version = "0.48.0"
59535921
source = "registry+https://github.com/rust-lang/crates.io-index"
59545922
checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241"
59555923

5956-
[[package]]
5957-
name = "windows_i686_msvc"
5958-
version = "0.42.2"
5959-
source = "registry+https://github.com/rust-lang/crates.io-index"
5960-
checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
5961-
59625924
[[package]]
59635925
name = "windows_i686_msvc"
59645926
version = "0.48.0"
59655927
source = "registry+https://github.com/rust-lang/crates.io-index"
59665928
checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00"
59675929

5968-
[[package]]
5969-
name = "windows_x86_64_gnu"
5970-
version = "0.42.2"
5971-
source = "registry+https://github.com/rust-lang/crates.io-index"
5972-
checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
5973-
59745930
[[package]]
59755931
name = "windows_x86_64_gnu"
59765932
version = "0.48.0"
59775933
source = "registry+https://github.com/rust-lang/crates.io-index"
59785934
checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1"
59795935

5980-
[[package]]
5981-
name = "windows_x86_64_gnullvm"
5982-
version = "0.42.2"
5983-
source = "registry+https://github.com/rust-lang/crates.io-index"
5984-
checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
5985-
59865936
[[package]]
59875937
name = "windows_x86_64_gnullvm"
59885938
version = "0.48.0"
59895939
source = "registry+https://github.com/rust-lang/crates.io-index"
59905940
checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953"
59915941

5992-
[[package]]
5993-
name = "windows_x86_64_msvc"
5994-
version = "0.42.2"
5995-
source = "registry+https://github.com/rust-lang/crates.io-index"
5996-
checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
5997-
59985942
[[package]]
59995943
name = "windows_x86_64_msvc"
60005944
version = "0.48.0"

‎compiler/rustc_ast/src/expand/allocator.rs

+17-5
Original file line numberDiff line numberDiff line change
@@ -33,29 +33,41 @@ pub enum AllocatorTy {
3333

3434
pub struct AllocatorMethod {
3535
pub name: Symbol,
36-
pub inputs: &'static [AllocatorTy],
36+
pub inputs: &'static [AllocatorMethodInput],
3737
pub output: AllocatorTy,
3838
}
3939

40+
pub struct AllocatorMethodInput {
41+
pub name: &'static str,
42+
pub ty: AllocatorTy,
43+
}
44+
4045
pub static ALLOCATOR_METHODS: &[AllocatorMethod] = &[
4146
AllocatorMethod {
4247
name: sym::alloc,
43-
inputs: &[AllocatorTy::Layout],
48+
inputs: &[AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout }],
4449
output: AllocatorTy::ResultPtr,
4550
},
4651
AllocatorMethod {
4752
name: sym::dealloc,
48-
inputs: &[AllocatorTy::Ptr, AllocatorTy::Layout],
53+
inputs: &[
54+
AllocatorMethodInput { name: "ptr", ty: AllocatorTy::Ptr },
55+
AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout },
56+
],
4957
output: AllocatorTy::Unit,
5058
},
5159
AllocatorMethod {
5260
name: sym::realloc,
53-
inputs: &[AllocatorTy::Ptr, AllocatorTy::Layout, AllocatorTy::Usize],
61+
inputs: &[
62+
AllocatorMethodInput { name: "ptr", ty: AllocatorTy::Ptr },
63+
AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout },
64+
AllocatorMethodInput { name: "new_size", ty: AllocatorTy::Usize },
65+
],
5466
output: AllocatorTy::ResultPtr,
5567
},
5668
AllocatorMethod {
5769
name: sym::alloc_zeroed,
58-
inputs: &[AllocatorTy::Layout],
70+
inputs: &[AllocatorMethodInput { name: "layout", ty: AllocatorTy::Layout }],
5971
output: AllocatorTy::ResultPtr,
6072
},
6173
];

0 commit comments

Comments
 (0)