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.

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

Rollup of 24 pull requests #59012

Merged
merged 62 commits into from
Mar 9, 2019
Merged

Rollup of 24 pull requests #59012

merged 62 commits into from
Mar 9, 2019

Conversation

pietroalbini
Copy link
Member

Successful merges:

Failed merges:

r? @ghost

MikaelUrankar and others added 30 commits February 13, 2019 12:19
The example had a potential race condition that would still pass the test.
If the thread which was supposed to modify it's own thread local was slower than the instruction to
modify in the main thread, then the test would pass even in case of a failure.
This is would be minor if the child thread was waited for since it check using an `assert_eq` for
the same thing, but vice versa.
However, if the `assert_eq` failed this would trigger a panic, which is not at all caught by the
example since the thread is not waited on.

Signed-off-by: benaryorg <binary@benary.org>
This code no longer ICEs, and @yodaldevoid found that it was fixed by
commit fe5710a. While that added a similar test, we can explicitly test
this reproducer too.

Closes rust-lang#50582.
Was then able to the minimise the reproduction a little further.
JSBackend is implied when building the emscripten backend, and not available for the standard llvm backend.  This commit also puts the example config in sync with the defaults in src/bootstrap/native.rs
(Update: Fixed test; revision is meant to introduce compile-failure, w/o ICE.)
…bug.

(It is possible that there is a more fundamental invariant being
violated, in terms of the `check_type_defn` code assuming that lifting
to tcx will always succeed. But I am unaware of any test input that
hits this that isn't already type-incorrect in some fashion.)
`-Z treat-err-as-bug=0` will cause `rustc` to panic after the first
error is reported. `-Z treat-err-as-bug=2` will cause `rustc` to
panic after 3 errors have been reported.
@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 8, 2019
@bors
Copy link
Contributor

bors commented Mar 8, 2019

⌛ Testing commit 961e378 with merge d227bbc1e3b7ff8d00aeaeeef269a83c56d223bd...

@bors
Copy link
Contributor

bors commented Mar 8, 2019

💔 Test failed - checks-travis

@bors bors 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 Mar 8, 2019
@rust-highfive
Copy link
Collaborator

The job i686-gnu of your PR failed on Travis (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.
[01:49:45] test [ui] ui/wf/wf-inherent-impl-method-where-clause.rs ... ok
[01:49:45] test [ui] ui/wf/wf-inherent-impl-where-clause.rs ... ok
[01:49:45] test [ui] ui/wf/wf-object-safe.rs ... ok
[01:49:45] test [ui] ui/wf/wf-misc-methods-issue-28609.rs ... ok
[01:49:45] test [ui] ui/wf/wf-packed-on-proj-of-type-as-unimpl-trait.rs ... ok
[01:49:45] test [ui] ui/wf/wf-static-method.rs ... ok
[01:49:45] test [ui] ui/wf/wf-static-type.rs ... ok
[01:49:45] test [ui] ui/wf/wf-struct-bound.rs ... ok
[01:49:45] test [ui] ui/wf/wf-struct-field.rs ... ok
---
[02:02:14] test [incremental] incremental/change_pub_inherent_method_body/struct_point.rs ... ok
[02:02:14] test [incremental] incremental/change_private_impl_method_cc/struct_point.rs ... ok
[02:02:14] test [incremental] incremental/change_pub_inherent_method_sig/struct_point.rs ... ok
[02:02:14] test [incremental] incremental/change_symbol_export_status.rs ... ok
[02:02:15] test [incremental] incremental/cyclic-trait-hierarchy.rs ... ok
[02:02:15] test [incremental] incremental/commandline-args.rs ... ok
[02:02:15] test [incremental] incremental/crate_hash_reorder.rs ... ok
[02:02:15] test [incremental] incremental/extern_static/issue-49153.rs ... ok
[02:02:16] test [incremental] incremental/feature_gate.rs ... ok
---
[02:58:15]    Compiling mdbook v0.2.3
[02:58:52] [RUSTC-TIMING] mdbook test:false 36.662
[02:59:00] [RUSTC-TIMING] mdbook test:false 45.097
[02:59:00]    Compiling rustbook v0.1.0 (/checkout/src/tools/rustbook)
The job exceeded the maximum time limit for jobs, and has been terminated.

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)

@Centril
Copy link
Contributor

Centril commented Mar 8, 2019

@bors retry

@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 8, 2019
@bors
Copy link
Contributor

bors commented Mar 8, 2019

⌛ Testing commit 961e378 with merge 594d4d8a08c414381a385994db80c838da811568...

@bors
Copy link
Contributor

bors commented Mar 8, 2019

💔 Test failed - checks-travis

@bors bors 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 Mar 8, 2019
@rust-highfive
Copy link
Collaborator

The job i686-gnu of your PR failed on Travis (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.
[02:54:11] [RUSTC-TIMING] parking_lot_core test:false 3.152
[02:54:11]    Compiling parking_lot v0.7.1
[02:54:12] [RUSTC-TIMING] parking_lot test:false 1.767
[02:54:12]    Compiling rustdoc v0.0.0 (/checkout/src/librustdoc)
The job exceeded the maximum time limit for jobs, and has been terminated.

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)

@Centril
Copy link
Contributor

Centril commented Mar 9, 2019

@bors retry

@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 9, 2019
@bors
Copy link
Contributor

bors commented Mar 9, 2019

⌛ Testing commit 961e378 with merge c9f8304...

bors added a commit that referenced this pull request Mar 9, 2019
Rollup of 24 pull requests

Successful merges:

 - #58080 (Add FreeBSD armv6 and armv7 targets)
 - #58204 (On return type `impl Trait` for block with no expr point at last semi)
 - #58269 (Add librustc and libsyntax to rust-src distribution.)
 - #58369 (Make the Entry API of HashMap<K, V> Sync and Send)
 - #58861 (Expand where negative supertrait specific error is shown)
 - #58877 (Suggest removal of `&` when borrowing macro and appropriate)
 - #58883 (Suggest appropriate code for unused field when destructuring pattern)
 - #58891 (Remove stray ` in the docs for the FromIterator implementation for Option)
 - #58893 (race condition in thread local storage example)
 - #58906 (Monomorphize generator field types for debuginfo)
 - #58911 (Regression test for #58435.)
 - #58912 (Regression test for #58813)
 - #58916 (Fix release note problems noticed after merging.)
 - #58918 (Regression test added for an async ICE.)
 - #58921 (Add an explicit test for issue #50582)
 - #58926 (Make the lifetime parameters of tcx consistent.)
 - #58931 (Elide invalid method receiver error when it contains TyErr)
 - #58940 (Remove JSBackend from config.toml)
 - #58950 (Add self to mailmap)
 - #58961 (On incorrect cfg literal/identifier, point at the right span)
 - #58963 (libstd: implement Error::source for io::Error)
 - #58970 (delay_span_bug in wfcheck's ty.lift_to_tcx unwrap)
 - #58984 (Teach `-Z treat-err-as-bug` to take a number of errors to emit)
 - #59007 (Add a test for invalid const arguments)

Failed merges:

 - #58959 (Add release notes for PR #56243)

r? @ghost
@bors
Copy link
Contributor

bors commented Mar 9, 2019

☀️ Test successful - checks-travis, status-appveyor
Approved by: pietroalbini
Pushing c9f8304 to master...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
merged-by-bors This PR was explicitly merged by bors. rollup A PR which is a rollup S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.