Skip to content

Commit dd2df8f

Browse files
committed
Auto merge of #65793 - Centril:rollup-v40xke9, r=Centril
Rollup of 9 pull requests Successful merges: - #62959 (Add by-value iterator for arrays ) - #65390 (Add long error explanation for E0576) - #65408 (reorder config.toml.example options and add one missing option) - #65414 (ignore uninhabited non-exhaustive variant fields) - #65666 (Deprecated proc_macro doesn't trigger warning on build library) - #65742 (Pre-expansion gate most of the things) - #65747 (Adjust the tracking issue for `untagged_unions`.) - #65763 (Changed APIT with explicit generic args span to specific arg spans) - #65775 (Fix more `ReEmpty` ICEs) Failed merges: - #65519 (trait-based structural match implementation) r? @ghost
2 parents d54111a + 100c924 commit dd2df8f

File tree

71 files changed

+1215
-278
lines changed

Some content is hidden

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

71 files changed

+1215
-278
lines changed

config.toml.example

+6-4
Original file line numberDiff line numberDiff line change
@@ -258,10 +258,9 @@
258258
[rust]
259259

260260
# Whether or not to optimize the compiler and standard library.
261-
#
262-
# Note: the slowness of the non optimized compiler compiling itself usually
263-
# outweighs the time gains in not doing optimizations, therefore a
264-
# full bootstrap takes much more time with `optimize` set to false.
261+
# WARNING: Building with optimize = false is NOT SUPPORTED. Due to bootstrapping,
262+
# building without optimizations takes much longer than optimizing. Further, some platforms
263+
# fail to build without this optimization (c.f. #65352).
265264
#optimize = true
266265

267266
# Indicates that the build should be configured for debugging Rust. A
@@ -341,6 +340,9 @@
341340
# nightly features
342341
#channel = "dev"
343342

343+
# The root location of the MUSL installation directory.
344+
#musl-root = "..."
345+
344346
# By default the `rustc` executable is built with `-Wl,-rpath` flags on Unix
345347
# platforms to ensure that the compiler is usable by default from the build
346348
# directory (as it links to a number of dynamic libraries). This may not be

src/bootstrap/config.rs

+15-15
Original file line numberDiff line numberDiff line change
@@ -200,23 +200,23 @@ struct Build {
200200
target: Vec<String>,
201201
cargo: Option<String>,
202202
rustc: Option<String>,
203-
low_priority: Option<bool>,
204-
compiler_docs: Option<bool>,
205203
docs: Option<bool>,
204+
compiler_docs: Option<bool>,
206205
submodules: Option<bool>,
207206
fast_submodules: Option<bool>,
208207
gdb: Option<String>,
209-
locked_deps: Option<bool>,
210-
vendor: Option<bool>,
211208
nodejs: Option<String>,
212209
python: Option<String>,
210+
locked_deps: Option<bool>,
211+
vendor: Option<bool>,
213212
full_bootstrap: Option<bool>,
214213
extended: Option<bool>,
215214
tools: Option<HashSet<String>>,
216215
verbose: Option<usize>,
217216
sanitizers: Option<bool>,
218217
profiler: Option<bool>,
219218
cargo_native_static: Option<bool>,
219+
low_priority: Option<bool>,
220220
configure_args: Option<Vec<String>>,
221221
local_rebuild: Option<bool>,
222222
print_step_timings: Option<bool>,
@@ -228,11 +228,11 @@ struct Build {
228228
struct Install {
229229
prefix: Option<String>,
230230
sysconfdir: Option<String>,
231-
datadir: Option<String>,
232231
docdir: Option<String>,
233232
bindir: Option<String>,
234233
libdir: Option<String>,
235234
mandir: Option<String>,
235+
datadir: Option<String>,
236236

237237
// standard paths, currently unused
238238
infodir: Option<String>,
@@ -243,14 +243,14 @@ struct Install {
243243
#[derive(Deserialize, Default)]
244244
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
245245
struct Llvm {
246-
ccache: Option<StringOrBool>,
247-
ninja: Option<bool>,
248-
assertions: Option<bool>,
249246
optimize: Option<bool>,
250247
thin_lto: Option<bool>,
251248
release_debuginfo: Option<bool>,
249+
assertions: Option<bool>,
250+
ccache: Option<StringOrBool>,
252251
version_check: Option<bool>,
253252
static_libstdcpp: Option<bool>,
253+
ninja: Option<bool>,
254254
targets: Option<String>,
255255
experimental_targets: Option<String>,
256256
link_jobs: Option<u32>,
@@ -293,6 +293,7 @@ impl Default for StringOrBool {
293293
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
294294
struct Rust {
295295
optimize: Option<bool>,
296+
debug: Option<bool>,
296297
codegen_units: Option<u32>,
297298
codegen_units_std: Option<u32>,
298299
debug_assertions: Option<bool>,
@@ -301,25 +302,24 @@ struct Rust {
301302
debuginfo_level_std: Option<u32>,
302303
debuginfo_level_tools: Option<u32>,
303304
debuginfo_level_tests: Option<u32>,
304-
parallel_compiler: Option<bool>,
305305
backtrace: Option<bool>,
306+
incremental: Option<bool>,
307+
parallel_compiler: Option<bool>,
306308
default_linker: Option<String>,
307309
channel: Option<String>,
308310
musl_root: Option<String>,
309311
rpath: Option<bool>,
312+
verbose_tests: Option<bool>,
310313
optimize_tests: Option<bool>,
311314
codegen_tests: Option<bool>,
312315
ignore_git: Option<bool>,
313-
debug: Option<bool>,
314316
dist_src: Option<bool>,
315-
verbose_tests: Option<bool>,
316-
incremental: Option<bool>,
317317
save_toolstates: Option<String>,
318318
codegen_backends: Option<Vec<String>>,
319319
codegen_backends_dir: Option<String>,
320320
lld: Option<bool>,
321-
lldb: Option<bool>,
322321
llvm_tools: Option<bool>,
322+
lldb: Option<bool>,
323323
deny_warnings: Option<bool>,
324324
backtrace_on_ice: Option<bool>,
325325
verify_llvm_ir: Option<bool>,
@@ -333,13 +333,13 @@ struct Rust {
333333
#[derive(Deserialize, Default)]
334334
#[serde(deny_unknown_fields, rename_all = "kebab-case")]
335335
struct TomlTarget {
336-
llvm_config: Option<String>,
337-
llvm_filecheck: Option<String>,
338336
cc: Option<String>,
339337
cxx: Option<String>,
340338
ar: Option<String>,
341339
ranlib: Option<String>,
342340
linker: Option<String>,
341+
llvm_config: Option<String>,
342+
llvm_filecheck: Option<String>,
343343
android_ndk: Option<String>,
344344
crt_static: Option<bool>,
345345
musl_root: Option<String>,

0 commit comments

Comments
 (0)