Skip to content

Make x.py compatible with python 3.8.#70392

Merged
bors merged 1 commit intorust-lang:masterfrom
brain0:fixxpy
Mar 26, 2020
Merged

Make x.py compatible with python 3.8.#70392
bors merged 1 commit intorust-lang:masterfrom
brain0:fixxpy

Conversation

@brain0
Copy link

@brain0 brain0 commented Mar 25, 2020

Python 3.8 removes the time.clock() function, use time.perf_counter() instead.

Make x.py compatible with python 3.8.
a9484d4 
Python 3.8 removes the time.clock() function, use time.perf_counter() instead.
@rust-highfive
Copy link
Contributor

rust-highfive commented Mar 25, 2020

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

If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes.

Please see the contribution instructions for more information.

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 25, 2020
@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Mar 25, 2020

Can you confirm this works with Python 2 as well? (Seems so, based on the PR builders).

If so, r=me

@brain0
Copy link
Author

brain0 commented Mar 25, 2020

Sorry, I cannot test this with python2. On my system, lldb -P points to the python3 package directory, so I cannot use python2 for x.py test. I would guess that it's fine, and the PR builders work, so we should be okay.

@Mark-Simulacrum
Copy link
Member

Mark-Simulacrum commented Mar 25, 2020

@bors r+

Okay, I've done some more checking and it seems like this is correct. Thanks.

@bors
Copy link
Collaborator

bors commented Mar 25, 2020

📌 Commit a9484d4 has been approved by Mark-Simulacrum

@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 Mar 25, 2020
@Dylan-DPC-zz Dylan-DPC-zz mentioned this pull request Mar 25, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2020
@bors
Auto merge of rust-lang#70412 - Dylan-DPC:rollup-yuq2mfy, r=Dylan-DPC
e4519e2 
Rollup of 5 pull requests

Successful merges:

 - rust-lang#69700 (Rename LayoutDetails to just Layout.)
 - rust-lang#70392 (Make x.py compatible with python 3.8.)
 - rust-lang#70406 (Clean up E0458 explanation)
 - rust-lang#70407 (Avoid tagging as I-nominated on toolstate breakage)
 - rust-lang#70409 (gitignore: allow target to be a symlink)

Failed merges:

 - rust-lang#70375 (avoid catching InterpError)

r? @ghost
@bors bors merged commit 0fa57e4 into rust-lang:master Mar 26, 2020
@brain0 brain0 deleted the fixxpy branch April 8, 2020 12:58
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@Mark-Simulacrum Mark-Simulacrum

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@brain0 @rust-highfive @Mark-Simulacrum @bors