Skip to content

Add some missing timers - #68043

Merged
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:missing-timers
Jan 11, 2020
Merged

Add some missing timers#68043
bors merged 2 commits into
rust-lang:masterfrom
Zoxc:missing-timers

Conversation

@Zoxc

@ZoxcZoxc commented Jan 9, 2020

Copy link
Copy Markdown
Contributor

Based on #67988

r? @wesleywiser

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

bors commented Jan 9, 2020

Copy link
Copy Markdown
Collaborator

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

@wesleywiserwesleywiser left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good but I think this needs a rebase. r=me after rebasing

@Zoxc

Zoxc commented Jan 10, 2020

Copy link
Copy Markdown
ContributorAuthor

Tweaked the timers some too.

@wesleywiser

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Jan 10, 2020

Copy link
Copy Markdown
Collaborator

📌 Commit 5918c18 has been approved by wesleywiser

@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 Jan 10, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@CentrilCentril mentioned this pull request Jan 11, 2020
Centril added a commit to Centril/rust that referenced this pull request Jan 11, 2020
@CentrilCentril mentioned this pull request Jan 11, 2020
bors added a commit that referenced this pull request Jan 11, 2020
Rollup of 8 pull requests
Successful merges:
- #67666 (make use of pointer::is_null)
- #67806 (Extract `rustc_ast_passes`, move gating, & refactor linting)
- #68043 (Add some missing timers)
- #68074 (Add `llvm-skip-rebuild` flag to `x.py`)
- #68079 (Clarify suggestion for E0013)
- #68084 (Do not ICE on unicode next point)
- #68102 (Inline some conversion methods around OsStr)
- #68106 (Fix issue with using `self` module via indirection)
Failed merges:
r? @ghost
@bors
bors merged commit 5918c18 into rust-lang:masterJan 11, 2020
@Zoxc
Zoxc deleted the missing-timers branch January 11, 2020 06:29
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.

4 participants

@Zoxc@bors@wesleywiser@rust-highfive