Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Jump to bottom

std: Cleanup the sys module a bit #25136

Merged
merged 3 commits into from
May 8, 2015
Merged

std: Cleanup the sys module a bit #25136

merged 3 commits into from
May 8, 2015

Conversation

alexcrichton
Copy link
Member

  • Remove the 2-suffix from some modules
  • Remove some unused files
  • Remove double-boxing for ReentrantMutex

@alexcrichton
Copy link
Member Author

r? @aturon

@rust-highfive rust-highfive assigned aturon and unassigned huonw May 5, 2015
@rust-highfive
Copy link
Collaborator

r? @huonw

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

@bors
Copy link
Contributor

bors commented May 7, 2015

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

@aturon
Copy link
Member

aturon commented May 7, 2015

Great PR. r=me after a rebase.

@alexcrichton
std: Rename sys::foo2 modules to sys::foo
377b1ad 
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.
@alexcrichton
std: Remove unused helper_thread.rs file
a031325 
This module has been removed for quite some time!
@alexcrichton
std: Remove a double-box in ReentrantMutex
7529bd6 
Perform unsafe initialization up front and then only afterward the mutex is in
place do we initialize it.
@alexcrichton
Copy link
Member Author

@bors: r=aturon 7529bd6

bors added a commit that referenced this pull request May 8, 2015
@bors
Auto merge of #25136 - alexcrichton:drop-the-two, r=aturon
cf76e63 
* Remove the 2-suffix from some modules
* Remove some unused files
* Remove double-boxing for `ReentrantMutex`
@bors
Copy link
Contributor

bors commented May 8, 2015

⌛ Testing commit 7529bd6 with merge cf76e63...

@tshepang
Copy link
Member

tshepang commented May 8, 2015

Wow, 8 hours testing! How is this happening?

@alexcrichton
Copy link
Member Author

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:master May 8, 2015
@alexcrichton alexcrichton deleted the drop-the-two branch May 8, 2015 17:12
This was referenced May 8, 2015
Closed
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@aturon aturon

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@alexcrichton @rust-highfive @bors @aturon @tshepang @huonw