Skip to content

Commit 7631958

Browse files
authored
Rollup merge of rust-lang#61270 - michaelwoerister:remove-incr-comp-warning, r=oli-obk
Remove warnings about incr. comp. generating less debugging output. This PR removes the > `-C save-temps` might not produce all requested temporary products when incremental compilation is enabled.` warning and others similar to it. I think these warnings have annoyed lots of people over the past ~3 years; while not helping a single one of them `:P` r? @oli-obk
2 parents 036b7e3 + 0d67510 commit 7631958

File tree

1 file changed

+2
-18
lines changed

1 file changed

+2
-18
lines changed

src/librustc/session/config.rs

+2-18
Original file line numberDiff line numberDiff line change
@@ -330,14 +330,6 @@ macro_rules! hash_option {
330330
bug!("Duplicate key in CLI DepTrackingHash: {}", stringify!($opt_name))
331331
}
332332
});
333-
($opt_name:ident,
334-
$opt_expr:expr,
335-
$sub_hashes:expr,
336-
[UNTRACKED_WITH_WARNING $warn_val:expr, $warn_text:expr, $error_format:expr]) => ({
337-
if *$opt_expr == $warn_val {
338-
early_warn($error_format, $warn_text)
339-
}
340-
});
341333
}
342334

343335
macro_rules! top_level_options {
@@ -383,10 +375,6 @@ macro_rules! top_level_options {
383375
// [UNTRACKED]
384376
// Incremental compilation is not influenced by this option.
385377
//
386-
// [UNTRACKED_WITH_WARNING(val, warning)]
387-
// The option is incompatible with incremental compilation in some way. If it
388-
// has the value `val`, the string `warning` is emitted as a warning.
389-
//
390378
// If you add a new option to this struct or one of the sub-structs like
391379
// CodegenOptions, think about how it influences incremental compilation. If in
392380
// doubt, specify [TRACKED], which is always "correct" but might lead to
@@ -1163,9 +1151,7 @@ options! {CodegenOptions, CodegenSetter, basic_codegen_options,
11631151
"a list of extra LLVM passes to run (space separated)"),
11641152
llvm_args: Vec<String> = (Vec::new(), parse_list, [TRACKED],
11651153
"a list of arguments to pass to llvm (space separated)"),
1166-
save_temps: bool = (false, parse_bool, [UNTRACKED_WITH_WARNING(true,
1167-
"`-C save-temps` might not produce all requested temporary products \
1168-
when incremental compilation is enabled.")],
1154+
save_temps: bool = (false, parse_bool, [UNTRACKED],
11691155
"save all temporary output files during compilation"),
11701156
rpath: bool = (false, parse_bool, [UNTRACKED],
11711157
"set rpath values in libs/exes"),
@@ -1241,9 +1227,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
12411227
"measure time of each rustc pass"),
12421228
time: bool = (false, parse_bool, [UNTRACKED],
12431229
"measure time of rustc processes"),
1244-
time_llvm_passes: bool = (false, parse_bool, [UNTRACKED_WITH_WARNING(true,
1245-
"The output of `-Z time-llvm-passes` will only reflect timings of \
1246-
re-codegened modules when used with incremental compilation" )],
1230+
time_llvm_passes: bool = (false, parse_bool, [UNTRACKED],
12471231
"measure time of each LLVM pass"),
12481232
input_stats: bool = (false, parse_bool, [UNTRACKED],
12491233
"gather statistics about the input"),

0 commit comments

Comments
 (0)