Skip to content

Commit 6232478

Browse files
committed
Auto merge of #51334 - Mark-Simulacrum:rollup, r=Mark-Simulacrum
Rollup of 6 pull requests Successful merges: - #51288 (Remove rustdoc-specific is_import field from HIR) - #51299 (const fn integer operations) - #51317 (Allow enabling incremental via config.toml) - #51323 (Generate br for all two target SwitchInts) - #51326 (Various minor slice iterator cleanups) - #51329 (Remove the unused `-Z trans-time-graph` flag.) Failed merges:
2 parents 01a9b30 + dd1096f commit 6232478

File tree

14 files changed

+363
-51
lines changed

14 files changed

+363
-51
lines changed

config.toml.example

+3
Original file line numberDiff line numberDiff line change
@@ -279,6 +279,9 @@
279279
# Whether or not `panic!`s generate backtraces (RUST_BACKTRACE)
280280
#backtrace = true
281281

282+
# Whether to always use incremental compilation when building rustc
283+
#incremental = false
284+
282285
# Build rustc with experimental parallelization
283286
#experimental-parallel-queries = false
284287

src/bootstrap/config.rs

+5
Original file line numberDiff line numberDiff line change
@@ -303,6 +303,7 @@ struct Rust {
303303
dist_src: Option<bool>,
304304
quiet_tests: Option<bool>,
305305
test_miri: Option<bool>,
306+
incremental: Option<bool>,
306307
save_toolstates: Option<String>,
307308
codegen_backends: Option<Vec<String>>,
308309
codegen_backends_dir: Option<String>,
@@ -529,6 +530,10 @@ impl Config {
529530
set(&mut config.rust_dist_src, rust.dist_src);
530531
set(&mut config.quiet_tests, rust.quiet_tests);
531532
set(&mut config.test_miri, rust.test_miri);
533+
// in the case "false" is set explicitly, do not overwrite the command line args
534+
if let Some(true) = rust.incremental {
535+
config.incremental = true;
536+
}
532537
set(&mut config.wasm_syscall, rust.wasm_syscall);
533538
set(&mut config.lld_enabled, rust.lld);
534539
config.rustc_parallel_queries = rust.experimental_parallel_queries.unwrap_or(false);

src/libcore/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@
8181
#![feature(cfg_target_has_atomic)]
8282
#![feature(concat_idents)]
8383
#![feature(const_fn)]
84+
#![feature(const_int_ops)]
8485
#![feature(core_float)]
8586
#![feature(custom_attribute)]
8687
#![feature(doc_cfg)]

0 commit comments

Comments
 (0)