Skip to content

Commit febc2d5

Browse files
Rollup merge of rust-lang#42055 - michaelwoerister:reenable-incremental-cc, r=nikomatsakis
Enable cross-crate incremental compilation by default. Now that direct metadata hashing has been implemented for a while and we haven't seen any problems with it over at [rust-icci](https://travis-ci.org/rust-icci/), let's re-enable cross crate support for incremental compilation again. r? @nikomatsakis
2 parents 02cc460 + af0c900 commit febc2d5

File tree

10 files changed

+1
-17
lines changed
  • src
    • librustc/session
    • test/incremental
      • add_private_fn_at_krate_root_cc/auxiliary
      • callee_caller_cross_crate/auxiliary
      • change_private_fn_cc/auxiliary
      • change_private_impl_method_cc/auxiliary
      • remapped_paths_cc/auxiliary
      • remove-private-item-cross-crate/auxiliary
      • rlib_cross_crate/auxiliary
      • struct_change_field_type_cross_crate/auxiliary
      • type_alias_cross_crate/auxiliary

10 files changed

+1
-17
lines changed

src/librustc/session/config.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -963,7 +963,7 @@ options! {DebuggingOptions, DebuggingSetter, basic_debugging_options,
963963
"attempt to recover from parse errors (experimental)"),
964964
incremental: Option<String> = (None, parse_opt_string, [UNTRACKED],
965965
"enable incremental compilation (experimental)"),
966-
incremental_cc: bool = (false, parse_bool, [UNTRACKED],
966+
incremental_cc: bool = (true, parse_bool, [UNTRACKED],
967967
"enable cross-crate incremental compilation (even more experimental)"),
968968
incremental_info: bool = (false, parse_bool, [UNTRACKED],
969969
"print high-level information about incremental reuse (or the lack thereof)"),

src/test/incremental/add_private_fn_at_krate_root_cc/auxiliary/point.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
pub struct Point {
1412
pub x: f32,
1513
pub y: f32,

src/test/incremental/callee_caller_cross_crate/auxiliary/a.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
#![crate_type="rlib"]
1412

1513
#[cfg(rpass1)]

src/test/incremental/change_private_fn_cc/auxiliary/point.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
pub struct Point {
1412
pub x: f32,
1513
pub y: f32,

src/test/incremental/change_private_impl_method_cc/auxiliary/point.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
pub struct Point {
1412
pub x: f32,
1513
pub y: f32,

src/test/incremental/remapped_paths_cc/auxiliary/extern_crate.rs

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010

1111
// ignore-tidy-linelength
1212

13-
// aux-build:extern_crate.rs
1413
//[rpass1] compile-flags: -g
1514
//[rpass2] compile-flags: -g
1615
//[rpass3] compile-flags: -g -Zremap-path-prefix-from={{src-base}} -Zremap-path-prefix-to=/the/src

src/test/incremental/remove-private-item-cross-crate/auxiliary/a.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
#![allow(warnings)]
1412
#![crate_name = "a"]
1513
#![crate_type = "rlib"]

src/test/incremental/rlib_cross_crate/auxiliary/a.rs

-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
1211
// no-prefer-dynamic
1312

1413
#![crate_type="rlib"]

src/test/incremental/struct_change_field_type_cross_crate/auxiliary/a.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
#![crate_type="rlib"]
1412

1513
#[cfg(rpass1)]

src/test/incremental/type_alias_cross_crate/auxiliary/a.rs

-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,6 @@
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
1010

11-
// compile-flags: -Z incremental-cc
12-
1311
#![crate_type="rlib"]
1412

1513
#[cfg(rpass1)]

0 commit comments

Comments
 (0)