Skip to content

Revert "Revert "std: Re-enable at_exit()"" #23267

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.

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

Merged
merged 1 commit into from
Mar 20, 2015

Conversation

alexcrichton
Copy link
Member

This reverts commit aec67c2.

Closes #20012

This is temporarily rebased on #23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.

@alexcrichton
Copy link
Member Author

r? @aturon

@rust-highfive rust-highfive assigned aturon and unassigned brson Mar 11, 2015
@rust-highfive
Copy link
Contributor

r? @brson

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

@alexcrichton
Copy link
Member Author

I should also point out that this has bounced many times on windows previously, but I've run it through my own windows VM and it passed through try with only win32 timing out (this has been seen before as well). Not to say that it'll actually pass though...

@brson
Copy link
Contributor

brson commented Mar 11, 2015

@bors: r+

@bors
Copy link
Collaborator

bors commented Mar 11, 2015

@bors r=brson 2d60fcb

Manishearth added a commit to Manishearth/rust that referenced this pull request Mar 11, 2015
 This reverts commit aec67c2.

Closes rust-lang#20012

This is temporarily rebased on rust-lang#23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.
@bors
Copy link
Collaborator

bors commented Mar 12, 2015

⌛ Testing commit 2d60fcb with merge d782c29...

@bors
Copy link
Collaborator

bors commented Mar 12, 2015

💔 Test failed - auto-mac-64-nopt-t

@Manishearth
Copy link
Member

/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/backtrace.rs:87:5: 87:26 error: unused import, #[deny(unused_imports)] on by default
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/backtrace.rs:87 use os::unix::prelude::*;
                                                                                                          ^~~~~~~~~~~~~~~~~~~~~
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/backtrace.rs:89:17: 89:24 error: unused import, #[deny(unused_imports)] on by default
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/backtrace.rs:89 use ffi::{CStr, AsOsStr};
                                                                                                                      ^~~~~~~
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:61:13: 65:14 error: unnecessary `unsafe` block, #[deny(unused_unsafe)] on by default
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:61             unsafe {
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:62                 let info = info();
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:63                 let diff = self.t as i64 - other.t as i64;
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:64                 Duration::nanoseconds(diff * info.numer as i64 / info.denom as i64)
/Users/rustbuild/src/rust-buildbot/slave/auto-mac-64-nopt-t/build/src/libstd/sys/unix/time.rs:65             }
error: aborting due to 3 previous errors
make: *** [x86_64-apple-darwin/stage1/lib/rustlib/x86_64-apple-darwin/lib/stamp.std] Error 101

@alexcrichton
Copy link
Member Author

@bors: r=aturon cceac1b

@alexcrichton
Copy link
Member Author

@bors: r=aturon ce4d068

@bors
Copy link
Collaborator

bors commented Mar 12, 2015

⌛ Testing commit ce4d068 with merge e147106...

@bors
Copy link
Collaborator

bors commented Mar 13, 2015

💔 Test failed - auto-win-64-opt

@alexcrichton
Copy link
Member Author

@bors: retry

@bors
Copy link
Collaborator

bors commented Mar 13, 2015

⌛ Testing commit ce4d068 with merge 4a5101a...

bors added a commit that referenced this pull request Mar 13, 2015
This reverts commit aec67c2.

Closes #20012

This is temporarily rebased on #23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.
@bors
Copy link
Collaborator

bors commented Mar 13, 2015

💔 Test failed - auto-win-64-opt

@alexcrichton
Copy link
Member Author

@bors: retry

On Thu, Mar 12, 2015 at 10:33 PM, bors [email protected] wrote:

[image: 💔] Test failed - auto-win-64-opt
http://buildbot.rust-lang.org/builders/auto-win-64-opt/builds/2549


Reply to this email directly or view it on GitHub
#23267 (comment).

@bors
Copy link
Collaborator

bors commented Mar 13, 2015

@bors
Copy link
Collaborator

bors commented Mar 13, 2015

💔 Test failed - auto-win-64-nopt-t

@Manishearth
Copy link
Member

@bors: retry

@bors
Copy link
Collaborator

bors commented Mar 13, 2015

@bors
Copy link
Collaborator

bors commented Mar 14, 2015

💔 Test failed - auto-win-64-opt

@Manishearth
Copy link
Member

@bors: retry

shakes fist at buildbot

@bors
Copy link
Collaborator

bors commented Mar 14, 2015

⌛ Testing commit a793f87 with merge f9c6454...

@bors
Copy link
Collaborator

bors commented Mar 14, 2015

💔 Test failed - auto-win-32-opt

@sfackler
Copy link
Member

Seems like it's probably a legit problem at this point.

@Manishearth
Copy link
Member

Yeah, probably.

@alexcrichton
Copy link
Member Author

@bors: r=aturon 9c18736

(btw I would not recommend putting this PR into a rollup)

@Manishearth
Copy link
Member

@bors: p=1

(not included in rollup, might as well prioritize it over the other rolled up PRs)

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 9c18736 with merge 197e3fc...

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 9c18736 with merge 254a7b5...

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⛄ The build was interrupted to prioritize another pull request.

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

⌛ Testing commit 9c18736 with merge b733a42...

@bors
Copy link
Collaborator

bors commented Mar 19, 2015

💔 Test failed - auto-win-32-opt

@alexcrichton
Copy link
Member Author

@bors: r=aturon 1cc9718

@bors
Copy link
Collaborator

bors commented Mar 20, 2015

⌛ Testing commit 1cc9718 with merge 68d6941...

bors added a commit that referenced this pull request Mar 20, 2015
This reverts commit aec67c2.

Closes #20012

This is temporarily rebased on #23245 as it would otherwise conflict, the last commit is the only one relevant to this PR though.
@bors bors merged commit 1cc9718 into rust-lang:master Mar 20, 2015
@alexcrichton
Copy link
Member Author

40th time's the charm!

@alexcrichton alexcrichton deleted the issue-20012 branch March 20, 2015 22:57
Sign up for free to 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.

Resolve at_exit strategy after std::thread lands
7 participants