Skip to content
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

fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use #118709

Merged
merged 1 commit into from
Dec 8, 2023

Conversation

oksbsb
Copy link
Contributor

@oksbsb oksbsb commented Dec 7, 2023

override #118589, resolve merge conflict

@petrochenkov @SparrowLii

Thanks!

@rustbot
Copy link
Collaborator

rustbot commented Dec 7, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @cjgillot (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Dec 7, 2023
@rust-log-analyzer

This comment has been minimized.

@rust-log-analyzer

This comment has been minimized.

@petrochenkov
Copy link
Contributor

It's not necessary to create new PRs on conflicts, rebasing and force pushing is enough.
I'll r+ when CI is green.
r? @petrochenkov

@rustbot rustbot assigned petrochenkov and unassigned cjgillot Dec 7, 2023
@rust-log-analyzer

This comment has been minimized.

@oksbsb
Copy link
Contributor Author

oksbsb commented Dec 7, 2023

@bors retry

@bors
Copy link
Contributor

bors commented Dec 7, 2023

@oksbsb: 🔑 Insufficient privileges: not in try users

@petrochenkov
Copy link
Contributor

@bors r+
(Assuming #118706 lands successfully.)

@bors
Copy link
Contributor

bors commented Dec 7, 2023

📌 Commit cf1cecc has been approved by petrochenkov

It is now in the queue for this repository.

@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 Dec 7, 2023
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Dec 7, 2023
fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override rust-lang#118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
@compiler-errors
Copy link
Member

Possibly the reason for failure in #118716 (comment) ? If not, sorry, my pattern matching is poor in this part of the compiler.

@bors r-

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Dec 7, 2023
2. jobserver::initialize_checked should call before build_session, still should use EarlyErrorHandler, so revert stderr change in rust-lang#118635
@oksbsb
Copy link
Contributor Author

oksbsb commented Dec 8, 2023

Possibly the reason for failure in #118716 (comment) ? If not, sorry, my pattern matching is poor in this part of the compiler.

@bors r-

resloved, caused by #118635, it change stderr output.

@oksbsb
Copy link
Contributor Author

oksbsb commented Dec 8, 2023

@rustbot review

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Dec 8, 2023
@SparrowLii
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Dec 8, 2023

📌 Commit dabedb7 has been approved by SparrowLii

It is now in the queue for this repository.

@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 Dec 8, 2023
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 8, 2023
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#118505 (Elaborate on ip_addr bit conversion endianness)
 - rust-lang#118581 (OnceLock: Add note about drop and statics)
 - rust-lang#118677 ([rustdoc] Fix display of features)
 - rust-lang#118690 (coverage: Avoid unnecessary macros in unit tests)
 - rust-lang#118693 (Tell MirUsedCollector that the pointer alignment checks calls its panic symbol)
 - rust-lang#118695 (coverage: Merge refined spans in a separate final pass)
 - rust-lang#118709 (fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use)
 - rust-lang#118722 (rustdoc: remove unused parameter `reversed` from onEach(Lazy))

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit beabb5e into rust-lang:master Dec 8, 2023
11 checks passed
@rustbot rustbot added this to the 1.76.0 milestone Dec 8, 2023
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Dec 8, 2023
Rollup merge of rust-lang#118709 - oksbsb:fix-job-server, r=SparrowLii

fix jobserver GLOBAL_CLIENT_CHECKED uninitialized before use

override rust-lang#118589, resolve merge conflict

`@petrochenkov` `@SparrowLii`

Thanks!
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants