Skip to content

std: Cleanup the sys module a bit - #25136

Merged
alexcrichton merged 3 commits into
rust-lang:masterfrom
alexcrichton:drop-the-two
May 8, 2015
Merged

std: Cleanup the sys module a bit#25136
alexcrichton merged 3 commits into
rust-lang:masterfrom
alexcrichton:drop-the-two

Conversation

@alexcrichton

Copy link
Copy Markdown
Member
  • Remove the 2-suffix from some modules
  • Remove some unused files
  • Remove double-boxing for ReentrantMutex

@alexcrichton

Copy link
Copy Markdown
MemberAuthor

r? @aturon

@rust-highfiverust-highfive assigned aturon and unassigned huonwMay 5, 2015
@rust-highfive

Copy link
Copy Markdown
Contributor

r? @huonw

(rust_highfive has picked a reviewer for you, use r? to override)

@bors

bors commented May 7, 2015

Copy link
Copy Markdown
Collaborator

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

@aturon

Copy link
Copy Markdown
Contributor

Great PR. r=me after a rebase.

Now that `std::old_io` has been removed for quite some time the naming real
estate here has opened up to allow these modules to move back to their proper
names.
This module has been removed for quite some time!
Perform unsafe initialization up front and then only afterward the mutex is in
place do we initialize it.
@alexcrichton

Copy link
Copy Markdown
MemberAuthor

@bors: r=aturon 7529bd6

bors added a commit that referenced this pull request May 8, 2015
* Remove the 2-suffix from some modules
* Remove some unused files
* Remove double-boxing for `ReentrantMutex`
@bors

bors commented May 8, 2015

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7529bd6 with merge cf76e63...

@tshepang

Copy link
Copy Markdown
Member

Wow, 8 hours testing! How is this happening?

@alexcrichton

Copy link
Copy Markdown
MemberAuthor

Looks like @bors got confused when testing this as some windows slaves were lost. It passed one of the windows slaves, however, so I'm going to assume that this would have passed the others as well, and as a result I'm going to merge this manually.

@alexcrichton
alexcrichton merged commit 7529bd6 into rust-lang:masterMay 8, 2015
@alexcrichton
alexcrichton deleted the drop-the-two branch May 8, 2015 17:12
This was referenced May 8, 2015
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants

@alexcrichton@rust-highfive@bors@aturon@tshepang@huonw