Merged
Conversation
rust-highfive
added
the
S-waiting-on-review
Collaborator
|
☔ The latest upstream changes (presumably #68034) made this pull request unmergeable. Please resolve the merge conflicts. |
wesleywiser
approved these changes
Jan 9, 2020
Member
wesleywiser
left a comment
wesleywiser
left a comment
There was a problem hiding this comment.
Looks good but I think this needs a rebase. r=me after rebasing
Contributor
Author
|
Tweaked the timers some too. |
Member
|
@bors r+ |
Collaborator
|
📌 Commit 5918c18 has been approved by |
bors
added
S-waiting-on-bors
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
Add some missing timers Based on rust-lang#67988 r? @wesleywiser
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jan 11, 2020
Add some missing timers Based on rust-lang#67988 r? @wesleywiser
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
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Based on #67988
r? @wesleywiser