Only pass -Zincremental to nightly rustc. #4000
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @brson (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
|
@bors: r? @alexcrichton |
|
📌 Commit 357bb2d has been approved by |
Only pass -Zincremental to nightly rustc. `-Z` can only be used on nightly builds; other builds complain loudly. Since incremental builds only work on nightly anyway, we should silently ignore `CARGO_INCREMENTAL` on anything but nightly. This allows users to always have `CARGO_INCREMENTAL` set without getting unexpected errors on stable/beta builds. Fixes #3835.
|
☀️ Test successful - status-appveyor, status-travis |
|
Out of curiosity, when are new nightly versions of cargo released? Doesn't seem to actually be nightly like rustc? |
|
Oh right now it's still somewhat manual, there's a Cargo submodule in the main rust-lang/rust repo which is what's used for Cargo nightlies. Want to send a PR to rust-lang/rust updating the Cargo submodule to pull in these changes? |
|
@alexcrichton filed as rust-lang/rust#41830 |
…richton Bring test of nightly in line with tests #4000 passes `-Zincremental` to `rustc` only on nightly, but uses a different mechanism for detecting nightly than [cargotest does](https://github.com/rust-lang/cargo/blob/9bf9bddd9297cfb5098be6146d85be551c6d4eff/tests/cargotest/lib.rs#L37). This PR brings the two in line, which should hopefully fix the build failure observed in rust-lang/rust#41830 (comment).
Also relies on rust-lang/cargo#4010
Bump cargo for rust-lang/cargo#4000 rust-lang/cargo#4000 recently landed, which fixes warnings about using `-Z` when `CARGO_INCREMENTAL` is set while running stable/beta builds. As #41751 has now landed, these warnings will turn to errors in the next release, so getting the cargo fix in place is necessary unless we want people confused about why they can no longer compile anything on stable/beta.
-Zcan only be used on nightly builds; other builds complain loudly. Since incremental builds only work on nightly anyway, we should silently ignoreCARGO_INCREMENTALon anything but nightly. This allows users to always haveCARGO_INCREMENTALset without getting unexpected errors on stable/beta builds.Fixes #3835.