Skip to content

Refactor libtest - #65503

Merged
bors merged 8 commits into
rust-lang:masterfrom
popzxc:refactor-libtest
Oct 22, 2019
Merged

Refactor libtest#65503
bors merged 8 commits into
rust-lang:masterfrom
popzxc:refactor-libtest

Conversation

@popzxc

@popzxcpopzxc commented Oct 17, 2019

Copy link
Copy Markdown
Contributor

Short overview

libtest got refactored and splitted into smaller modules

Description

libtest module is already pretty big and hard to understand. Everything is mixed up: CLI, console output, test execution, etc.

This PR splits libtest into smaller logically-consistent modules, makes big functions smaller and more readable, and adds more comments, so libtest will be easier to understand and maintain.

Although there are a lot of changes, all the refactoring is "soft", meaning that no public interfaces were affected and nothing should be broken.

Thus this PR (at least should be) completely backward-compatible.

r? @wesleywiser
cc @Centril

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 17, 2019
@popzxc

popzxc commented Oct 17, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Well, seems like I've broken something =_= I will investigate it and fix tomorrow.

@popzxc

popzxc commented Oct 18, 2019

Copy link
Copy Markdown
ContributorAuthor

Well, I forgot to re-export public bench interface. Everything is OK now (I hope).

wesleywiser
wesleywiser approved these changes Oct 18, 2019
View reviewed changes

@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 and ci is green

@wesleywiser

wesleywiser commented Oct 18, 2019

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 18, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit a06b205 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 Oct 18, 2019
@bors

bors commented Oct 20, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit a06b205 with merge 2f58955296a705deee35afb6edd0edad6f489650...

@rust-highfive

rust-highfive commented Oct 20, 2019

Copy link
Copy Markdown
Contributor

The job dist-various-1 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.
2019-10-20T19:42:13.8332950Z local time: Sun Oct 20 19:42:13 UTC 2019
2019-10-20T19:42:13.8333154Z network time: Sun, 20 Oct 2019 19:42:13 GMT
2019-10-20T19:42:13.8333335Z == end clock drift check ==
2019-10-20T19:42:15.1997551Z 2019-10-20T19:42:15.2103341Z ##[error]Bash exited with code '1'.
2019-10-20T19:42:15.2141335Z ##[section]Starting: Upload CPU usage statistics
2019-10-20T19:42:15.2158367Z ==============================================================================
2019-10-20T19:42:15.2158464Z Task : Bash
2019-10-20T19:42:15.2158713Z Description : Run a Bash script on macOS, Linux, or Windows

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)

@bors

bors commented Oct 20, 2019

Copy link
Copy Markdown
Collaborator

💔 Test failed - checks-azure

@borsbors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 20, 2019
@popzxc

popzxc commented Oct 21, 2019•
edited
Loading

Copy link
Copy Markdown
ContributorAuthor

Hm. There was cfg(unix) attr for get_concurrency which was not required for cfg(target_os = "redox").

Should be fixed now.

P.S. It would be nice to have a tool which will check any configuration combination to be valid to detect things like this without waiting a merge queue to fail.

@wesleywiser

wesleywiser commented Oct 21, 2019

Copy link
Copy Markdown
Member

@bors r+

@bors

bors commented Oct 21, 2019

Copy link
Copy Markdown
Collaborator

📌 Commit ae04dc8 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 Oct 21, 2019
@Centril

Centril commented Oct 21, 2019

Copy link
Copy Markdown
Contributor

@bors rollup=never p=1

@bors

bors commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

⌛ Testing commit ae04dc8 with merge 57bfb80...

bors added a commit that referenced this pull request Oct 22, 2019
@bors
Auto merge of#65503- popzxc:refactor-libtest, r=wesleywiser
57bfb80
Refactor libtest
## Short overview
`libtest` got refactored and splitted into smaller modules
## Description
`libtest` module is already pretty big and hard to understand. Everything is mixed up: CLI, console output, test execution, etc.
This PR splits `libtest` into smaller logically-consistent modules, makes big functions smaller and more readable, and adds more comments, so `libtest` will be easier to understand and maintain.
Although there are a lot of changes, all the refactoring is "soft", meaning that no public interfaces were affected and nothing should be broken.
Thus this PR (at least should be) completely backward-compatible.
r? @wesleywiser
cc @Centril
@bors

bors commented Oct 22, 2019

Copy link
Copy Markdown
Collaborator

☀️ Test successful - checks-azure
Approved by: wesleywiser
Pushing 57bfb80 to master...

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Oct 22, 2019
@bors
bors merged commit ae04dc8 into rust-lang:masterOct 22, 2019
@borsbors mentioned this pull request Oct 22, 2019
Merged
@popzxc
popzxc deleted the refactor-libtest branch October 22, 2019 15:48
@tesujitesuji mentioned this pull request Oct 23, 2019
Merged
bors added a commit that referenced this pull request Oct 23, 2019
@bors
Auto merge of#65713- lzutao:clippy-up, r=Manishearth
d6e4028
Update clippy
Replaces #65690
cc #65503Closes#65683
@RalfJungRalfJung mentioned this pull request Oct 23, 2019
Closed
@RalfJung

RalfJung commented Oct 24, 2019•
edited
Loading

Copy link
Copy Markdown
Member

Looks like this broke the external compiletest-rs crate (used by Clippy and Miri): Manishearth/compiletest-rs#197

Miri is fine right now by using the "stable" feature flag. EDIT: looks like some types were made public again for clippy.

@Mark-SimulacrumMark-Simulacrum mentioned this pull request Nov 2, 2019
Closed
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@wesleywiserwesleywiserwesleywiser approved these changes

Assignees

@wesleywiserwesleywiser

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: 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.

6 participants

@popzxc@wesleywiser@bors@rust-highfive@Centril@RalfJung