Skip to content

macOS: avoid calling pthread_self() twice - #68767

Merged
bors merged 1 commit into
rust-lang:masterfrom
kubo39:patch-macos
Feb 18, 2020
Merged

macOS: avoid calling pthread_self() twice#68767
bors merged 1 commit into
rust-lang:masterfrom
kubo39:patch-macos

Conversation

@kubo39

Copy link
Copy Markdown
Contributor

No description provided.

@rust-highfive

Copy link
Copy Markdown
Contributor

r? @shepmaster

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

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Feb 2, 2020
@rust-highfive

Copy link
Copy Markdown
Contributor

The job x86_64-gnu-llvm-7 of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2020-02-02T12:29:53.6992893Z ========================== Starting Command Output ===========================
2020-02-02T12:29:53.6994619Z [command]/bin/bash --noprofile --norc /home/vsts/work/_temp/63e80b83-af7f-403f-9f5c-9845f9d19677.sh
2020-02-02T12:29:53.6994658Z 2020-02-02T12:29:53.6999317Z ##[section]Finishing: Disable git automatic line ending conversion
2020-02-02T12:29:53.7006047Z ##[section]Starting: Checkout rust-lang/rust@refs/pull/68767/merge to s
2020-02-02T12:29:53.7007654Z Task : Get sources
2020-02-02T12:29:53.7007690Z Description : Get sources from a repository. Supports Git, TfsVC, and SVN repositories.
2020-02-02T12:29:53.7007848Z Version : 1.0.0
2020-02-02T12:29:53.7007883Z Author : Microsoft
---
2020-02-02T12:29:54.7002577Z ##[command]git remote add origin https://github.com/rust-lang/rust
2020-02-02T12:29:54.7016133Z ##[command]git config gc.auto 0
2020-02-02T12:29:54.7018875Z ##[command]git config --get-all http.https://github.com/rust-lang/rust.extraheader
2020-02-02T12:29:54.7021230Z ##[command]git config --get-all http.proxy
2020-02-02T12:29:54.7031788Z ##[command]git -c http.extraheader="AUTHORIZATION: basic ***" fetch --force --tags --prune --progress --no-recurse-submodules --depth=2 origin +refs/heads/*:refs/remotes/origin/* +refs/pull/68767/merge:refs/remotes/pull/68767/merge

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@JohnCSimonJohnCSimon 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-review Status: Awaiting review from the assignee but also interested parties. labels Feb 10, 2020
@JohnCSimon

Copy link
Copy Markdown

Ping from triage: @kubo39 - the build has failed.
Your code is for MacOS only but it's failing under Linux x86_64-gnu-llvm-7 ....

@JohnTitorJohnTitor 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 Feb 12, 2020
@shepmaster

Copy link
Copy Markdown
Member

This seems reasonable, but can you share a little about why this change is important or why you noticed it?

@shepmaster

Copy link
Copy Markdown
Member

You can go ahead and squash your two commits together now as well.

@kubo39

Copy link
Copy Markdown
ContributorAuthor

I noticed this while reading the code. To be honest, this is not so important change(maybe slightly faster).

@shepmaster

Copy link
Copy Markdown
Member

@bors r+ rollup

@bors

bors commented Feb 16, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 67068f3 has been approved by shepmaster

@borsbors 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 Feb 16, 2020
@shepmaster

Copy link
Copy Markdown
Member

Thanks!

JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 16, 2020
@JohnTitorJohnTitor mentioned this pull request Feb 16, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 16, 2020
@JohnTitorJohnTitor mentioned this pull request Feb 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 16, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Feb 17, 2020
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
@JohnTitorJohnTitor mentioned this pull request Feb 18, 2020
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 8 pull requests
Successful merges:
- #67272 (recursion_limit parsing handles overflows)
- #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
- #68767 (macOS: avoid calling pthread_self() twice)
- #69175 (Do not ICE when encountering `yield` inside `async` block)
- #69223 (Ignore GDB versions with broken str printing.)
- #69244 (configure: set LLVM flags with a value)
- #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
- #69252 (Clean out unused directories for extra disk space)
Failed merges:
r? @ghost
JohnTitor added a commit to JohnTitor/rust that referenced this pull request Feb 18, 2020
@JohnTitorJohnTitor mentioned this pull request Feb 18, 2020
bors added a commit that referenced this pull request Feb 18, 2020
Rollup of 8 pull requests
Successful merges:
- #67272 (recursion_limit parsing handles overflows)
- #68597 (Simplify `Skip::nth` and `Skip::last` implementations)
- #68767 (macOS: avoid calling pthread_self() twice)
- #69175 (Do not ICE when encountering `yield` inside `async` block)
- #69223 (Ignore GDB versions with broken str printing.)
- #69244 (configure: set LLVM flags with a value)
- #69249 (Stabilize {f32, f64}::{LOG2_10, LOG10_2})
- #69252 (Clean out unused directories for extra disk space)
Failed merges:
r? @ghost
@bors
bors merged commit 67068f3 into rust-lang:masterFeb 18, 2020
@kubo39
kubo39 deleted the patch-macos branch March 11, 2021 23:50
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-borsStatus: 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.

6 participants

@kubo39@rust-highfive@JohnCSimon@shepmaster@bors@JohnTitor