Skip to content

incr.comp.: Let the compiler ignore incompatible incr. comp. cache artifacts #36758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 27, 2016

Conversation

michaelwoerister
Copy link
Member

Implements #35720.

cc @nikomatsakis

@michaelwoerister michaelwoerister added the A-incr-comp Area: Incremental compilation label Sep 26, 2016
@rust-highfive
Copy link
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@eddyb
Copy link
Member

eddyb commented Sep 26, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 26, 2016

📌 Commit 1e5c253 has been approved by eddyb

@sophiajt
Copy link
Contributor

I'm seeing travis fail with this:

error: environment variable `CFG_VERSION` not defined
  --> src/librustc_incremental/persist/file_format.rs:38:37
   |
38 | const RUSTC_VERSION: &'static str = env!("CFG_VERSION");
   |                                     ^^^^^^^^^^^^^^^^^^^

error: aborting due to previous error

Build failed, waiting for other jobs to finish...
error: Could not compile `rustc_incremental`.

@eddyb
Copy link
Member

eddyb commented Sep 26, 2016

Blargh, I should've seen that coming. @bors r-

/// A version string that hopefully is always different for compiler versions
/// with different encodings of incremental compilation artifacts. Contains
/// the git commit hash.
const RUSTC_VERSION: &'static str = env!("CFG_VERSION");
Copy link
Member

@eddyb eddyb Sep 27, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I thought you had a reason for not following suit, but it appears rustc_incremental is also tested.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah yes, I ran across this and then forgot about again. Should be fixed now (but let's wait for travis).

@eddyb
Copy link
Member

eddyb commented Sep 27, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Sep 27, 2016

📌 Commit 263ba92 has been approved by eddyb

@bors
Copy link
Collaborator

bors commented Sep 27, 2016

⌛ Testing commit 263ba92 with merge 8467e8d...

bors added a commit that referenced this pull request Sep 27, 2016
incr.comp.: Let the compiler ignore incompatible incr. comp. cache artifacts

Implements #35720.

cc @nikomatsakis
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-incr-comp Area: Incremental compilation
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants