Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Jun 14, 2021

This includes a backport of:

And includes patches to:

r? @Mark-Simulacrum

Mark-Simulacrum and others added 7 commits June 14, 2021 18:08
This disables incremental (i.e., -Cincremental) taking effect unless an
environment variable, RUSTC_FORCE_INCREMENTAL, is set to 1 in the environment of
the running rustc. Currently incremental causes errors for many users, and we do
not have an expectation of being able to quickly fix these errors in a
backportable way - so, for now, disable incremental entirely. The user can still
opt-in, but this way the majority of users merely get slower builds, not broken
builds.
This won't enable incremental if -Cincremental is not already passed, but is
seemingly necessary in the presence of -Zincremental-verify-ich which does not
check for incremental being enabled before accessing incremental data
structures, leading to an ICE.
@rust-highfive
Copy link
Contributor

⚠️ Warning ⚠️

  • Pull requests are usually filed against the master branch for this repo, but this one is against stable. Please double check that you specified the right target!

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 14, 2021
@Mark-Simulacrum
Copy link
Member Author

@bors r+ rollup=never p=100

@bors
Copy link
Collaborator

bors commented Jun 15, 2021

📌 Commit 196e185 has been approved by Mark-Simulacrum

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 15, 2021
@bors
Copy link
Collaborator

bors commented Jun 15, 2021

⌛ Testing commit 196e185 with merge dbe03e2...

@bors
Copy link
Collaborator

bors commented Jun 15, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing dbe03e2 to stable...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 15, 2021
@bors bors merged commit dbe03e2 into rust-lang:stable Jun 15, 2021
@rustbot rustbot added this to the 1.53.0 milestone Jun 15, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants