Skip to content

Commit 46c8a2c

Browse files
committed
Remove -Z incremental.
`-C incremental` was introduced over two years ago. `-Z incremental` was kept for transitioning, but it's been long enough now that it should be ok to remove it.
1 parent a378267 commit 46c8a2c

17 files changed

+29
-60
lines changed

src/librustc_interface/tests.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -546,8 +546,6 @@ fn test_debugging_options_tracking_hash() {
546546
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
547547
opts.debugging_opts.parse_only = true;
548548
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
549-
opts.debugging_opts.incremental = Some(String::from("abc"));
550-
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
551549
opts.debugging_opts.dump_dep_graph = true;
552550
assert_eq!(reference.dep_tracking_hash(), opts.dep_tracking_hash());
553551
opts.debugging_opts.query_dep_graph = true;

src/librustc_session/config.rs

Lines changed: 1 addition & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1286,33 +1286,6 @@ fn check_thread_count(debugging_opts: &DebuggingOptions, error_format: ErrorOutp
12861286
}
12871287
}
12881288

1289-
fn select_incremental_path(
1290-
debugging_opts: &DebuggingOptions,
1291-
cg: &CodegenOptions,
1292-
error_format: ErrorOutputType,
1293-
) -> Option<PathBuf> {
1294-
match (&debugging_opts.incremental, &cg.incremental) {
1295-
(Some(path1), Some(path2)) => {
1296-
if path1 != path2 {
1297-
early_error(
1298-
error_format,
1299-
&format!(
1300-
"conflicting paths for `-Z incremental` and \
1301-
`-C incremental` specified: {} versus {}",
1302-
path1, path2
1303-
),
1304-
);
1305-
} else {
1306-
Some(path1)
1307-
}
1308-
}
1309-
(Some(path), None) => Some(path),
1310-
(None, Some(path)) => Some(path),
1311-
(None, None) => None,
1312-
}
1313-
.map(PathBuf::from)
1314-
}
1315-
13161289
fn collect_print_requests(
13171290
cg: &mut CodegenOptions,
13181291
dopts: &mut DebuggingOptions,
@@ -1677,7 +1650,7 @@ pub fn build_session_options(matches: &getopts::Matches) -> Options {
16771650

16781651
check_thread_count(&debugging_opts, error_format);
16791652

1680-
let incremental = select_incremental_path(&debugging_opts, &cg, error_format);
1653+
let incremental = cg.incremental.as_ref().map(|m| PathBuf::from(m));
16811654

16821655
if debugging_opts.profile && incremental.is_some() {
16831656
early_error(

src/librustc_session/options.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -789,8 +789,6 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
789789
"support compiling tests with panic=abort"),
790790
dep_tasks: bool = (false, parse_bool, [UNTRACKED],
791791
"print tasks that execute and the color their dep node gets (requires debug build)"),
792-
incremental: Option<String> = (None, parse_opt_string, [UNTRACKED],
793-
"enable incremental compilation (experimental)"),
794792
incremental_info: bool = (false, parse_bool, [UNTRACKED],
795793
"print high-level information about incremental reuse (or the lack thereof)"),
796794
incremental_verify_ich: bool = (false, parse_bool, [UNTRACKED],

src/test/codegen-units/partitioning/extern-drop-glue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
// ignore-tidy-linelength
22

3-
// We specify -Z incremental here because we want to test the partitioning for
3+
// We specify -C incremental here because we want to test the partitioning for
44
// incremental compilation
55
// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
6-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/extern-drop-glue
6+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/extern-drop-glue
77
// compile-flags:-Zinline-in-all-cgus -Copt-level=0
88

99
#![allow(dead_code)]

src/test/codegen-units/partitioning/extern-generic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=eager -Zincremental=tmp/partitioning-tests/extern-generic -Zshare-generics=y
4+
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/extern-generic -Zshare-generics=y
55

66
#![allow(dead_code)]
77
#![crate_type="lib"]

src/test/codegen-units/partitioning/inlining-from-extern-crate.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/inlining-from-extern-crate
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/inlining-from-extern-crate
55
// compile-flags:-Zinline-in-all-cgus
66

77
#![crate_type="lib"]

src/test/codegen-units/partitioning/local-drop-glue.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
44
// We specify opt-level=0 because `drop_in_place` is `Internal` when optimizing
5-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-drop-glue
5+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-drop-glue
66
// compile-flags:-Zinline-in-all-cgus -Copt-level=0
77

88
#![allow(dead_code)]

src/test/codegen-units/partitioning/local-generic.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=eager -Zincremental=tmp/partitioning-tests/local-generic
4+
// compile-flags:-Zprint-mono-items=eager -Cincremental=tmp/partitioning-tests/local-generic
55

66
#![allow(dead_code)]
77
#![crate_type="lib"]

src/test/codegen-units/partitioning/local-inlining-but-not-all.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-inlining-but-not-all
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining-but-not-all
55
// compile-flags:-Zinline-in-all-cgus=no
66

77
#![allow(dead_code)]

src/test/codegen-units/partitioning/local-inlining.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// ignore-tidy-linelength
2-
// We specify -Z incremental here because we want to test the partitioning for
2+
// We specify -C incremental here because we want to test the partitioning for
33
// incremental compilation
4-
// compile-flags:-Zprint-mono-items=lazy -Zincremental=tmp/partitioning-tests/local-inlining
4+
// compile-flags:-Zprint-mono-items=lazy -Cincremental=tmp/partitioning-tests/local-inlining
55
// compile-flags:-Zinline-in-all-cgus
66

77
#![allow(dead_code)]

0 commit comments

Comments
 (0)