Skip to content

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Sep 7, 2019

This should be reviewed by-commit.

The last commit moves all fields into an inner struct behind a single lock; this is done to prevent possible deadlocks in a multi-threaded compiler, as well as inconsistent state observation.

@Mark-Simulacrum
Copy link
Member Author

cc @aturon as part of parallel rustc efforts

@Mark-Simulacrum Mark-Simulacrum added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Sep 7, 2019
@rust-highfive

This comment has been minimized.

@Mark-Simulacrum

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@rust-highfive

This comment has been minimized.

@Mark-Simulacrum
Copy link
Member Author

CI is green here and this is good to go for review

@bors
Copy link
Collaborator

bors commented Sep 14, 2019

☔ The latest upstream changes (presumably #64456) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member Author

Rebased.

@bors
Copy link
Collaborator

bors commented Sep 15, 2019

☔ The latest upstream changes (presumably #60584) made this pull request unmergeable. Please resolve the merge conflicts.

@Mark-Simulacrum
Copy link
Member Author

Rebased, again.

@Mark-Simulacrum Mark-Simulacrum force-pushed the parallel-handler branch 2 times, most recently from 5802065 to 71f9add Compare September 16, 2019 20:43
@rust-highfive

This comment has been minimized.

@estebank
Copy link
Contributor

Sorry for the radio silence, I'll review this tomorrow.

@estebank
Copy link
Contributor

Thanks for the clean commit history. It all makes sense, but making it stand alone merge to minimize the chance for conflicts.

@bors r+ rollup=never

@bors
Copy link
Collaborator

bors commented Sep 22, 2019

📌 Commit 4cc5aaa has been approved by estebank

@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 Sep 22, 2019
@bors
Copy link
Collaborator

bors commented Sep 23, 2019

⌛ Testing commit 4cc5aaa with merge 66bf391...

bors added a commit that referenced this pull request Sep 23, 2019
Refactor librustc_errors::Handler API

This should be reviewed by-commit.

The last commit moves all fields into an inner struct behind a single lock; this is done to prevent possible deadlocks in a multi-threaded compiler, as well as inconsistent state observation.
@bors
Copy link
Collaborator

bors commented Sep 23, 2019

☀️ Test successful - checks-azure
Approved by: estebank
Pushing 66bf391 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 23, 2019
@bors bors merged commit 4cc5aaa into rust-lang:master Sep 23, 2019
phansch added a commit to phansch/rust that referenced this pull request Oct 15, 2019
rust-lang#64272 replaced
`DiagnosticBuilder` with `Diagnostic` in some places. This commit just
renames the DB variable from `db` to `diag` where it wasn't renamed.
Centril added a commit to Centril/rust that referenced this pull request Oct 15, 2019
Refactor: Rename `db` locals to `diag`

rust-lang#64272 replaced `DiagnosticBuilder` with `Diagnostic` in some places. This PR just renames the db variable from `db` to `diag` where it wasn't renamed.

r? @Mark-Simulacrum
Centril added a commit to Centril/rust that referenced this pull request Oct 15, 2019
Refactor: Rename `db` locals to `diag`

rust-lang#64272 replaced `DiagnosticBuilder` with `Diagnostic` in some places. This PR just renames the db variable from `db` to `diag` where it wasn't renamed.

r? @Mark-Simulacrum
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.

5 participants