Skip to content

Commit 532d3cd

Browse files
borsbors
committed
Auto merge of #94286 - matthiaskrgr:rollup-6i1spjg, r=matthiaskrgr
Rollup of 12 pull requests Successful merges: - #94128 (rustdoc: several minor fixes) - #94137 (rustdoc-json: Better Header Type) - #94213 (fix names in feature(...) suggestion) - #94240 (Suggest calling .display() on `PathBuf` too) - #94253 (Use 2021 edition in ./x.py fmt) - #94259 (Bump download-ci-llvm-stamp for llvm-nm inclusion) - #94260 (Fix rustdoc infinite redirection generation) - #94263 (Typo fix: Close inline-code backtick) - #94264 (Fix typo.) - #94271 (Miri: extend comments on downcast operation) - #94280 (Rename `region_should_not_be_omitted` to `should_print_region`) - #94285 (Sync rustc_codegen_cranelift) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
2 parents c651ba8 + 8f53bdb commit 532d3cd

File tree

57 files changed

+1188
-972
lines changed

Some content is hidden

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

57 files changed

+1188
-972
lines changed

‎compiler/rustc_ast/src/ast.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ impl ParenthesizedArgs {
285285

286286
pub use crate::node_id::{NodeId, CRATE_NODE_ID, DUMMY_NODE_ID};
287287

288-
/// A modifier on a bound, e.g., `?Sized` or `~const Trait`.
288+
/// A modifier on a bound, e.g., `?Trait` or `~const Trait`.
289289
///
290290
/// Negative bounds should also be handled here.
291291
#[derive(Copy, Clone, PartialEq, Eq, Encodable, Decodable, Debug)]

‎compiler/rustc_codegen_cranelift/Cargo.lock

Lines changed: 32 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = 3
44

55
[[package]]
66
name = "anyhow"
7-
version = "1.0.51"
7+
version = "1.0.53"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "8b26702f315f53b6071259e15dd9d64528213b44d61de1ec926eca7715d62203"
9+
checksum = "94a45b455c14666b85fc40a019e8ab9eb75e3a124e05494f5397122bc9eb06e0"
1010

1111
[[package]]
1212
name = "ar"
@@ -33,18 +33,18 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
3333

3434
[[package]]
3535
name = "cranelift-bforest"
36-
version = "0.78.0"
36+
version = "0.81.0"
3737
source = "registry+https://github.com/rust-lang/crates.io-index"
38-
checksum = "cc0cb7df82c8cf8f2e6a8dd394a0932a71369c160cc9b027dca414fced242513"
38+
checksum = "71447555acc6c875c52c407d572fc1327dc5c34cba72b4b2e7ad048aa4e4fd19"
3939
dependencies = [
4040
"cranelift-entity",
4141
]
4242

4343
[[package]]
4444
name = "cranelift-codegen"
45-
version = "0.78.0"
45+
version = "0.81.0"
4646
source = "registry+https://github.com/rust-lang/crates.io-index"
47-
checksum = "fe4463c15fa42eee909e61e5eac4866b7c6d22d0d8c621e57a0c5380753bfa8c"
47+
checksum = "ec9a10261891a7a919b0d4f6aa73582e88441d9a8f6173c88efbe4a5a362ea67"
4848
dependencies = [
4949
"cranelift-bforest",
5050
"cranelift-codegen-meta",
@@ -59,31 +59,30 @@ dependencies = [
5959

6060
[[package]]
6161
name = "cranelift-codegen-meta"
62-
version = "0.78.0"
62+
version = "0.81.0"
6363
source = "registry+https://github.com/rust-lang/crates.io-index"
64-
checksum = "793f6a94a053a55404ea16e1700202a88101672b8cd6b4df63e13cde950852bf"
64+
checksum = "815755d76fcbcf6e17ab888545b28ab775f917cb12ce0797e60cd41a2288692c"
6565
dependencies = [
6666
"cranelift-codegen-shared",
67-
"cranelift-entity",
6867
]
6968

7069
[[package]]
7170
name = "cranelift-codegen-shared"
72-
version = "0.78.0"
71+
version = "0.81.0"
7372
source = "registry+https://github.com/rust-lang/crates.io-index"
74-
checksum = "44aa1846df275bce5eb30379d65964c7afc63c05a117076e62a119c25fe174be"
73+
checksum = "23ea92f2a67335a2e4d3c9c65624c3b14ae287d595b0650822c41824febab66b"
7574

7675
[[package]]
7776
name = "cranelift-entity"
78-
version = "0.78.0"
77+
version = "0.81.0"
7978
source = "registry+https://github.com/rust-lang/crates.io-index"
80-
checksum = "a3a45d8d6318bf8fc518154d9298eab2a8154ec068a8885ff113f6db8d69bb3a"
79+
checksum = "bd25847875e388c500ad3624b4d2e14067955c93185194a7222246a25b91c975"
8180

8281
[[package]]
8382
name = "cranelift-frontend"
84-
version = "0.78.0"
83+
version = "0.81.0"
8584
source = "registry+https://github.com/rust-lang/crates.io-index"
86-
checksum = "e07339bd461766deb7605169de039e01954768ff730fa1254e149001884a8525"
85+
checksum = "308bcfb7eb47bdf5ff6e1ace262af4ed39ec19f204c751fffb037e0e82a0c8bf"
8786
dependencies = [
8887
"cranelift-codegen",
8988
"log",
@@ -93,9 +92,9 @@ dependencies = [
9392

9493
[[package]]
9594
name = "cranelift-jit"
96-
version = "0.78.0"
95+
version = "0.81.0"
9796
source = "registry+https://github.com/rust-lang/crates.io-index"
98-
checksum = "0e8f0d60fb5d67f7a1e5c49db38ba96d1c846921faef02085fc5590b74781747"
97+
checksum = "f560b3a314b8d15facf411e5d29b917c3e787a2bbc3fcdc5183bc0c5b7d4fe01"
9998
dependencies = [
10099
"anyhow",
101100
"cranelift-codegen",
@@ -111,21 +110,19 @@ dependencies = [
111110

112111
[[package]]
113112
name = "cranelift-module"
114-
version = "0.78.0"
113+
version = "0.81.0"
115114
source = "registry+https://github.com/rust-lang/crates.io-index"
116-
checksum = "825ac7e0959cbe7ddc9cc21209f0319e611a57f9fcb2b723861fe7ef2017e651"
115+
checksum = "3a57aba9e603d694d1430ff38bd914bae23ef9c2e44b25a65e318905807e654c"
117116
dependencies = [
118117
"anyhow",
119118
"cranelift-codegen",
120-
"cranelift-entity",
121-
"log",
122119
]
123120

124121
[[package]]
125122
name = "cranelift-native"
126-
version = "0.78.0"
123+
version = "0.81.0"
127124
source = "registry+https://github.com/rust-lang/crates.io-index"
128-
checksum = "03e2fca76ff57e0532936a71e3fc267eae6a19a86656716479c66e7f912e3d7b"
125+
checksum = "12cdc799aee673be2317e631d4569a1ba0a7e77a07a7ce45557086d2e02e9514"
129126
dependencies = [
130127
"cranelift-codegen",
131128
"libc",
@@ -134,9 +131,9 @@ dependencies = [
134131

135132
[[package]]
136133
name = "cranelift-object"
137-
version = "0.78.0"
134+
version = "0.81.0"
138135
source = "registry+https://github.com/rust-lang/crates.io-index"
139-
checksum = "55500d0fc9bb05c0944fc4506649249d28f55bd4fe95b87f0e55bf41058f0e6d"
136+
checksum = "502a7333836052fcdf4425d7f7a21264d99f862d32b9c3a0e47cd920487a9b60"
140137
dependencies = [
141138
"anyhow",
142139
"cranelift-codegen",
@@ -148,18 +145,18 @@ dependencies = [
148145

149146
[[package]]
150147
name = "crc32fast"
151-
version = "1.3.0"
148+
version = "1.3.1"
152149
source = "registry+https://github.com/rust-lang/crates.io-index"
153-
checksum = "738c290dfaea84fc1ca15ad9c168d083b05a714e1efddd8edaab678dc28d2836"
150+
checksum = "a2209c310e29876f7f0b2721e7e26b84aff178aa3da5d091f9bfbf47669e60e3"
154151
dependencies = [
155152
"cfg-if",
156153
]
157154

158155
[[package]]
159156
name = "gimli"
160-
version = "0.25.0"
157+
version = "0.26.1"
161158
source = "registry+https://github.com/rust-lang/crates.io-index"
162-
checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
159+
checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4"
163160
dependencies = [
164161
"indexmap",
165162
]
@@ -182,9 +179,9 @@ dependencies = [
182179

183180
[[package]]
184181
name = "libc"
185-
version = "0.2.112"
182+
version = "0.2.116"
186183
source = "registry+https://github.com/rust-lang/crates.io-index"
187-
checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
184+
checksum = "565dbd88872dbe4cc8a46e527f26483c1d1f7afa6b884a3bd6cd893d4f98da74"
188185

189186
[[package]]
190187
name = "libloading"
@@ -233,9 +230,9 @@ dependencies = [
233230

234231
[[package]]
235232
name = "regalloc"
236-
version = "0.0.32"
233+
version = "0.0.34"
237234
source = "registry+https://github.com/rust-lang/crates.io-index"
238-
checksum = "a6304468554ed921da3d32c355ea107b8d13d7b8996c3adfb7aab48d3bc321f4"
235+
checksum = "62446b1d3ebf980bdc68837700af1d77b37bc430e524bf95319c6eada2a4cc02"
239236
dependencies = [
240237
"log",
241238
"rustc-hash",
@@ -281,9 +278,9 @@ dependencies = [
281278

282279
[[package]]
283280
name = "smallvec"
284-
version = "1.7.0"
281+
version = "1.8.0"
285282
source = "registry+https://github.com/rust-lang/crates.io-index"
286-
checksum = "1ecab6c735a6bb4139c0caafd0cc3635748bbb3acf4550e8138122099251f309"
283+
checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83"
287284

288285
[[package]]
289286
name = "target-lexicon"

‎compiler/rustc_codegen_cranelift/Cargo.toml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -8,14 +8,14 @@ crate-type = ["dylib"]
88

99
[dependencies]
1010
# These have to be in sync with each other
11-
cranelift-codegen = { version = "0.78.0", features = ["unwind", "all-arch"] }
12-
cranelift-frontend = "0.78.0"
13-
cranelift-module = "0.78.0"
14-
cranelift-native = "0.78.0"
15-
cranelift-jit = { version = "0.78.0", optional = true }
16-
cranelift-object = "0.78.0"
11+
cranelift-codegen = { version = "0.81.0", features = ["unwind", "all-arch"] }
12+
cranelift-frontend = "0.81.0"
13+
cranelift-module = "0.81.0"
14+
cranelift-native = "0.81.0"
15+
cranelift-jit = { version = "0.81.0", optional = true }
16+
cranelift-object = "0.81.0"
1717
target-lexicon = "0.12.0"
18-
gimli = { version = "0.25.0", default-features = false, features = ["write"]}
18+
gimli = { version = "0.26.0", default-features = false, features = ["write"]}
1919
object = { version = "0.27.0", default-features = false, features = ["std", "read_core", "write", "archive", "coff", "elf", "macho", "pe"] }
2020

2121
ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }

‎compiler/rustc_codegen_cranelift/build_sysroot/Cargo.lock

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,15 @@ dependencies = [
3434

3535
[[package]]
3636
name = "autocfg"
37-
version = "1.0.1"
37+
version = "1.1.0"
3838
source = "registry+https://github.com/rust-lang/crates.io-index"
39-
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
39+
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
4040

4141
[[package]]
4242
name = "cc"
43-
version = "1.0.72"
43+
version = "1.0.73"
4444
source = "registry+https://github.com/rust-lang/crates.io-index"
45-
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
45+
checksum = "2fff2a6927b3bb87f9595d67196a70493f627687a71d87a0d692242c33f58c11"
4646

4747
[[package]]
4848
name = "cfg-if"
@@ -56,7 +56,7 @@ dependencies = [
5656

5757
[[package]]
5858
name = "compiler_builtins"
59-
version = "0.1.66"
59+
version = "0.1.70"
6060
dependencies = [
6161
"rustc-std-workspace-core",
6262
]
@@ -110,9 +110,9 @@ dependencies = [
110110

111111
[[package]]
112112
name = "hashbrown"
113-
version = "0.11.2"
113+
version = "0.12.0"
114114
source = "registry+https://github.com/rust-lang/crates.io-index"
115-
checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e"
115+
checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758"
116116
dependencies = [
117117
"compiler_builtins",
118118
"rustc-std-workspace-alloc",
@@ -121,9 +121,9 @@ dependencies = [
121121

122122
[[package]]
123123
name = "hermit-abi"
124-
version = "0.1.19"
124+
version = "0.2.0"
125125
source = "registry+https://github.com/rust-lang/crates.io-index"
126-
checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
126+
checksum = "1ab7905ea95c6d9af62940f9d7dd9596d54c334ae2c15300c482051292d5637f"
127127
dependencies = [
128128
"compiler_builtins",
129129
"libc",
@@ -132,9 +132,9 @@ dependencies = [
132132

133133
[[package]]
134134
name = "libc"
135-
version = "0.2.112"
135+
version = "0.2.119"
136136
source = "registry+https://github.com/rust-lang/crates.io-index"
137-
checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125"
137+
checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4"
138138
dependencies = [
139139
"rustc-std-workspace-core",
140140
]
@@ -319,9 +319,9 @@ dependencies = [
319319

320320
[[package]]
321321
name = "wasi"
322-
version = "0.9.0+wasi-snapshot-preview1"
322+
version = "0.11.0+wasi-snapshot-preview1"
323323
source = "registry+https://github.com/rust-lang/crates.io-index"
324-
checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519"
324+
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
325325
dependencies = [
326326
"compiler_builtins",
327327
"rustc-std-workspace-alloc",

‎compiler/rustc_codegen_cranelift/build_system/build_backend.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ pub(crate) fn build_backend(
4949
cmd.env("RUSTFLAGS", rustflags);
5050

5151
eprintln!("[BUILD] rustc_codegen_cranelift");
52-
crate::utils::spawn_and_wait(cmd);
52+
super::utils::spawn_and_wait(cmd);
5353

5454
Path::new("target").join(host_triple).join(channel)
5555
}

‎compiler/rustc_codegen_cranelift/build_system/build_sysroot.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,9 @@ use std::fs;
33
use std::path::{Path, PathBuf};
44
use std::process::{self, Command};
55

6-
use crate::rustc_info::{get_file_name, get_rustc_version};
7-
use crate::utils::{spawn_and_wait, try_hard_link};
8-
use crate::SysrootKind;
6+
use super::rustc_info::{get_file_name, get_rustc_version};
7+
use super::utils::{spawn_and_wait, try_hard_link};
8+
use super::SysrootKind;
99

1010
pub(crate) fn build_sysroot(
1111
channel: &str,
@@ -52,7 +52,7 @@ pub(crate) fn build_sysroot(
5252
.arg("-g");
5353
spawn_and_wait(build_cargo_wrapper_cmd);
5454

55-
let default_sysroot = crate::rustc_info::get_default_sysroot();
55+
let default_sysroot = super::rustc_info::get_default_sysroot();
5656

5757
let rustlib = target_dir.join("lib").join("rustlib");
5858
let host_rustlib_lib = rustlib.join(host_triple).join("lib");
@@ -167,7 +167,7 @@ fn build_clif_sysroot_for_triple(
167167

168168
let build_dir = Path::new("build_sysroot").join("target").join(triple).join(channel);
169169

170-
if !crate::config::get_bool("keep_sysroot") {
170+
if !super::config::get_bool("keep_sysroot") {
171171
// Cleanup the target dir with the exception of build scripts and the incremental cache
172172
for dir in ["build", "deps", "examples", "native"] {
173173
if build_dir.join(dir).exists() {

0 commit comments

Comments
 (0)