Skip to content

Rollup of 5 pull requests #70412

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Merged
merged 10 commits into from
Mar 26, 2020
Merged

Rollup of 5 pull requests #70412

merged 10 commits into from
Mar 26, 2020

Conversation

Dylan-DPC-zz
Copy link

Successful merges:

Failed merges:

r? @ghost

anyska and others added 10 commits March 25, 2020 15:06
Python 3.8 removes the time.clock() function, use time.perf_counter() instead.
…-obk

Rename LayoutDetails to just Layout.
Make x.py compatible with python 3.8.

Python 3.8 removes the `time.clock()` function, use `time.perf_counter()` instead.
…state-breakage, r=Mark-Simulacrum

Avoid tagging as I-nominated on toolstate breakage

r? @Mark-Simulacrum
…r=Mark-Simulacrum

gitignore: allow target to be a symlink

Following rust-lang/cargo#4944.
@Dylan-DPC-zz
Copy link
Author

@bors r+ rollup=never p=5

@bors
Copy link
Collaborator

bors commented Mar 25, 2020

📌 Commit 84a2865 has been approved by Dylan-DPC

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 25, 2020
@Dylan-DPC-zz Dylan-DPC-zz added the rollup A PR which is a rollup label Mar 25, 2020
@bors
Copy link
Collaborator

bors commented Mar 25, 2020

⌛ Testing commit 84a2865 with merge e4519e2...

@bors
Copy link
Collaborator

bors commented Mar 26, 2020

☀️ Test successful - checks-azure
Approved by: Dylan-DPC
Pushing e4519e2 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 26, 2020
@bors bors merged commit e4519e2 into rust-lang:master Mar 26, 2020
# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup 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.

7 participants